aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-07-25 05:32:48 +0800
committerChristian Persch <chpe@src.gnome.org>2005-07-25 05:32:48 +0800
commitdadad030dc244a53b6e275cb5b022ed676eaf51c (patch)
tree6c0f7888eb7d89ea248d1637ae2cc66a4af4b22e
parent55d7c7356ea035cb11163b4994e8fec77a77a844 (diff)
downloadgsoc2013-epiphany-dadad030dc244a53b6e275cb5b022ed676eaf51c.tar
gsoc2013-epiphany-dadad030dc244a53b6e275cb5b022ed676eaf51c.tar.gz
gsoc2013-epiphany-dadad030dc244a53b6e275cb5b022ed676eaf51c.tar.bz2
gsoc2013-epiphany-dadad030dc244a53b6e275cb5b022ed676eaf51c.tar.lz
gsoc2013-epiphany-dadad030dc244a53b6e275cb5b022ed676eaf51c.tar.xz
gsoc2013-epiphany-dadad030dc244a53b6e275cb5b022ed676eaf51c.tar.zst
gsoc2013-epiphany-dadad030dc244a53b6e275cb5b022ed676eaf51c.zip
Also ellipsise the menu entries in the toolbar overflow menu.
2005-07-24 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmark-action.c: (connect_proxy): * src/bookmarks/ephy-topic-action.c: (append_bookmarks_menu), (connect_proxy): Also ellipsise the menu entries in the toolbar overflow menu.
-rw-r--r--ChangeLog8
-rw-r--r--src/bookmarks/ephy-bookmark-action.c5
-rw-r--r--src/bookmarks/ephy-topic-action.c14
3 files changed, 26 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ffc9fdb3..7c18db060 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2005-07-24 Christian Persch <chpe@cvs.gnome.org>
+ * src/bookmarks/ephy-bookmark-action.c: (connect_proxy):
+ * src/bookmarks/ephy-topic-action.c: (append_bookmarks_menu),
+ (connect_proxy):
+
+ Also ellipsise the menu entries in the toolbar overflow menu.
+
+2005-07-24 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-lockdown.c: (update_location_editable):
* src/ephy-shell.c: (ephy_shell_new_tab_full):
* src/ephy-tab.c: (ephy_tab_set_property), (ephy_tab_get_property),
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index e1964a8a7..983b2aedb 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -55,6 +55,7 @@
/* FIXME tweak this, or make it configurable? (bug 148093) */
#define ENTRY_WIDTH_CHARS 12
#define TOOLITEM_WIDTH_CHARS 20
+#define LABEL_WIDTH_CHARS 32
static void ephy_bookmark_action_init (EphyBookmarkAction *action);
static void ephy_bookmark_action_class_init (EphyBookmarkActionClass *class);
@@ -716,7 +717,11 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
GtkLabel *label;
label = (GtkLabel *) ((GtkBin *) proxy)->child;
+
gtk_label_set_use_underline (label, FALSE);
+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
+ gtk_label_set_max_width_chars (label, LABEL_WIDTH_CHARS);
+
g_signal_connect (proxy, "activate", G_CALLBACK (activate_cb), action);
}
}
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index d170c634c..55f8953aa 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -50,6 +50,7 @@
#define TOOLITEM_WIDTH_CHARS 24
#define MENUITEM_WIDTH_CHARS 32
+#define LABEL_WIDTH_CHARS 32
#define EPHY_TOPIC_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TOPIC_ACTION, EphyTopicActionPrivate))
@@ -295,8 +296,9 @@ append_bookmarks_menu (EphyTopicAction *action, GtkWidget *menu, EphyNode *node,
item = gtk_image_menu_item_new_with_label (title);
label = (GtkLabel *) ((GtkBin *) item)->child;
- gtk_label_set_max_width_chars (label, MENUITEM_WIDTH_CHARS);
+ gtk_label_set_max_width_chars (label, LABEL_WIDTH_CHARS);
gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
+ gtk_label_set_use_underline (label, FALSE);
if (icon_location)
{
@@ -909,6 +911,16 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
g_signal_connect (button, "drag_data_delete",
G_CALLBACK (drag_data_delete_cb), action);
}
+ else if (GTK_IS_MENU_ITEM (proxy))
+ {
+ GtkLabel *label;
+
+ label = (GtkLabel *) ((GtkBin *) proxy)->child;
+
+ gtk_label_set_use_underline (label, FALSE);
+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
+ gtk_label_set_max_width_chars (label, LABEL_WIDTH_CHARS);
+ }
}
static void