[nautilus-sendto] Bug 582924 – Fix UI with long plugin descriptions
- From: Bastien Nocera <hadess src gnome org>
- To: svn-commits-list gnome org
- Subject: [nautilus-sendto] Bug 582924 – Fix UI with long plugin descriptions
- Date: Tue, 19 May 2009 07:55:10 -0400 (EDT)
commit 9499b437dc43de780001d759db46a22503fa5020
Author: Bastien Nocera <hadess hadess net>
Date: Tue May 19 12:51:48 2009 +0100
Bug 582924 â?? Fix UI with long plugin descriptions
- Ellipsise the plugin descriptions to avoid them resizing the
combo box bizarrely
- Make the dialogue resizeable
- Fix plugin loading for the uninstalled case
- Use a GtkListStore instead of a GtkTreeStore
---
src/nautilus-sendto-command.c | 25 ++++++++++++++++---------
src/nautilus-sendto.glade | 2 +-
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c
index 2b396ce..8171509 100644
--- a/src/nautilus-sendto-command.c
+++ b/src/nautilus-sendto-command.c
@@ -36,9 +36,15 @@
#define NAUTILUS_SENDTO_LAST_COMPRESS NAUTILUS_SENDTO_GCONF"/last_compress"
#define NAUTILUS_SENDTO_STATUS_LABEL_TIMEOUT_SECONDS 10
-#define UNINSTALLED_PLUGINDIR "plugins/sylpheed-claws"
+#define UNINSTALLED_PLUGINDIR "plugins/removable-devices"
#define UNINSTALLED_SOURCE "nautilus-sendto-command.c"
+enum {
+ COLUMN_ICON,
+ COLUMN_DESCRIPTION,
+ NUM_COLUMNS,
+};
+
/* Options */
static char **filenames = NULL;
@@ -418,7 +424,7 @@ set_model_for_options_combobox (NS_ui *ui)
{
GdkPixbuf *pixbuf;
GtkTreeIter iter;
- GtkTreeStore *model;
+ GtkListStore *model;
GtkIconTheme *it;
GtkCellRenderer *renderer;
GList *aux;
@@ -429,7 +435,7 @@ set_model_for_options_combobox (NS_ui *ui)
it = gtk_icon_theme_get_default ();
- model = gtk_tree_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+ model = gtk_list_store_new (NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING);
last_used = gconf_client_get_string (gconf_client,
NAUTILUS_SENDTO_LAST_MEDIUM, NULL);
@@ -438,10 +444,10 @@ set_model_for_options_combobox (NS_ui *ui)
p = (NstPlugin *) aux->data;
pixbuf = gtk_icon_theme_load_icon (it, p->info->icon, 16,
GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
- gtk_tree_store_append (model, &iter, NULL);
- gtk_tree_store_set (model, &iter,
- 0, pixbuf,
- 1, _(p->info->description),
+ gtk_list_store_append (model, &iter);
+ gtk_list_store_set (model, &iter,
+ COLUMN_ICON, pixbuf,
+ COLUMN_DESCRIPTION, _(p->info->description),
-1);
if (last_used != NULL && !strcmp(last_used, p->info->id)) {
option = i;
@@ -459,15 +465,16 @@ set_model_for_options_combobox (NS_ui *ui)
FALSE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ui->options_combobox),
renderer,
- "pixbuf", 0,
+ "pixbuf", COLUMN_ICON,
NULL);
renderer = gtk_cell_renderer_text_new ();
+ g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (ui->options_combobox),
renderer,
TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ui->options_combobox),
renderer,
- "text", 1,
+ "text", COLUMN_DESCRIPTION,
NULL);
g_signal_connect (G_OBJECT (ui->options_combobox), "changed",
diff --git a/src/nautilus-sendto.glade b/src/nautilus-sendto.glade
index ee29663..6f26a6a 100644
--- a/src/nautilus-sendto.glade
+++ b/src/nautilus-sendto.glade
@@ -11,7 +11,7 @@
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
- <property name="resizable">False</property>
+ <property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]