| 1 |
eva 09/08/02 22:30:59 |
| 2 |
|
| 3 |
Added: nautilus-sendto-1.1.5-long-description.patch |
| 4 |
Removed: nautilus-sendto-0.8-thunderbird-binaries.patch |
| 5 |
nautilus-sendto-1.1.2-pidgin-plugin-versioning.patch |
| 6 |
nautilus-sendto-0.12-debug-statements.patch |
| 7 |
nautilus-sendto-0.12-configure-options.patch |
| 8 |
Log: |
| 9 |
Version bump. Fix long descriptions, bug #271100. Clean up old revisions. |
| 10 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-long-description.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-long-description.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-long-description.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: nautilus-sendto-1.1.5-long-description.patch |
| 19 |
=================================================================== |
| 20 |
From 9499b437dc43de780001d759db46a22503fa5020 Mon Sep 17 00:00:00 2001 |
| 21 |
From: Bastien Nocera <hadess@××××××.net> |
| 22 |
Date: Tue, 19 May 2009 11:51:48 +0000 |
| 23 |
Subject: Bug 582924 – Fix UI with long plugin descriptions |
| 24 |
|
| 25 |
- Ellipsise the plugin descriptions to avoid them resizing the |
| 26 |
combo box bizarrely |
| 27 |
- Make the dialogue resizeable |
| 28 |
- Fix plugin loading for the uninstalled case |
| 29 |
- Use a GtkListStore instead of a GtkTreeStore |
| 30 |
--- |
| 31 |
diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c |
| 32 |
index 2b396ce..8171509 100644 |
| 33 |
--- a/src/nautilus-sendto-command.c |
| 34 |
+++ b/src/nautilus-sendto-command.c |
| 35 |
@@ -36,9 +36,15 @@ |
| 36 |
#define NAUTILUS_SENDTO_LAST_COMPRESS NAUTILUS_SENDTO_GCONF"/last_compress" |
| 37 |
#define NAUTILUS_SENDTO_STATUS_LABEL_TIMEOUT_SECONDS 10 |
| 38 |
|
| 39 |
-#define UNINSTALLED_PLUGINDIR "plugins/sylpheed-claws" |
| 40 |
+#define UNINSTALLED_PLUGINDIR "plugins/removable-devices" |
| 41 |
#define UNINSTALLED_SOURCE "nautilus-sendto-command.c" |
| 42 |
|
| 43 |
+enum { |
| 44 |
+ COLUMN_ICON, |
| 45 |
+ COLUMN_DESCRIPTION, |
| 46 |
+ NUM_COLUMNS, |
| 47 |
+}; |
| 48 |
+ |
| 49 |
/* Options */ |
| 50 |
static char **filenames = NULL; |
| 51 |
|
| 52 |
@@ -418,7 +424,7 @@ set_model_for_options_combobox (NS_ui *ui) |
| 53 |
{ |
| 54 |
GdkPixbuf *pixbuf; |
| 55 |
GtkTreeIter iter; |
| 56 |
- GtkTreeStore *model; |
| 57 |
+ GtkListStore *model; |
| 58 |
GtkIconTheme *it; |
| 59 |
GtkCellRenderer *renderer; |
| 60 |
GList *aux; |
| 61 |
@@ -429,7 +435,7 @@ set_model_for_options_combobox (NS_ui *ui) |
| 62 |
|
| 63 |
it = gtk_icon_theme_get_default (); |
| 64 |
|
| 65 |
- model = gtk_tree_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING); |
| 66 |
+ model = gtk_list_store_new (NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING); |
| 67 |
|
| 68 |
last_used = gconf_client_get_string (gconf_client, |
| 69 |
NAUTILUS_SENDTO_LAST_MEDIUM, NULL); |
| 70 |
@@ -438,10 +444,10 @@ set_model_for_options_combobox (NS_ui *ui) |
| 71 |
p = (NstPlugin *) aux->data; |
| 72 |
pixbuf = gtk_icon_theme_load_icon (it, p->info->icon, 16, |
| 73 |
GTK_ICON_LOOKUP_USE_BUILTIN, NULL); |
| 74 |
- gtk_tree_store_append (model, &iter, NULL); |
| 75 |
- gtk_tree_store_set (model, &iter, |
| 76 |
- 0, pixbuf, |
| 77 |
- 1, _(p->info->description), |
| 78 |
+ gtk_list_store_append (model, &iter); |
| 79 |
+ gtk_list_store_set (model, &iter, |
| 80 |
+ COLUMN_ICON, pixbuf, |
| 81 |
+ COLUMN_DESCRIPTION, _(p->info->description), |
| 82 |
-1); |
| 83 |
if (last_used != NULL && !strcmp(last_used, p->info->id)) { |
| 84 |
option = i; |
| 85 |
@@ -459,15 +465,16 @@ set_model_for_options_combobox (NS_ui *ui) |
| 86 |
FALSE); |
| 87 |
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ui->options_combobox), |
| 88 |
renderer, |
| 89 |
- "pixbuf", 0, |
| 90 |
+ "pixbuf", COLUMN_ICON, |
| 91 |
NULL); |
| 92 |
renderer = gtk_cell_renderer_text_new (); |
| 93 |
+ g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); |
| 94 |
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (ui->options_combobox), |
| 95 |
renderer, |
| 96 |
TRUE); |
| 97 |
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ui->options_combobox), |
| 98 |
renderer, |
| 99 |
- "text", 1, |
| 100 |
+ "text", COLUMN_DESCRIPTION, |
| 101 |
NULL); |
| 102 |
|
| 103 |
g_signal_connect (G_OBJECT (ui->options_combobox), "changed", |
| 104 |
diff --git a/src/nautilus-sendto.glade b/src/nautilus-sendto.glade |
| 105 |
index ee29663..6f26a6a 100644 |
| 106 |
--- a/src/nautilus-sendto.glade |
| 107 |
+++ b/src/nautilus-sendto.glade |
| 108 |
@@ -11,7 +11,7 @@ |
| 109 |
<property name="type">GTK_WINDOW_TOPLEVEL</property> |
| 110 |
<property name="window_position">GTK_WIN_POS_CENTER</property> |
| 111 |
<property name="modal">False</property> |
| 112 |
- <property name="resizable">False</property> |
| 113 |
+ <property name="resizable">True</property> |
| 114 |
<property name="destroy_with_parent">False</property> |
| 115 |
<property name="decorated">True</property> |
| 116 |
<property name="skip_taskbar_hint">False</property> |
| 117 |
-- |
| 118 |
cgit v0.8.2 |
Archives