From: tavmjong-free <tavmjong@free.fr>
Date: Thu, 13 May 2010 12:16:04 +0000 (+0200)
Subject: Get rid of unneeded labels when the icons are self-explanatory.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1f722049a2d5e841f11456674a44a2abcacce56d;p=inkscape.git

Get rid of unneeded labels when the icons are self-explanatory.
---

diff --git a/src/ege-select-one-action.cpp b/src/ege-select-one-action.cpp
index 32c1ef9b4..199b0cf68 100644
--- a/src/ege-select-one-action.cpp
+++ b/src/ege-select-one-action.cpp
@@ -665,7 +665,10 @@ GtkWidget* create_tool_item( GtkAction* action )
 
             gchar*  sss = 0;
             g_object_get( G_OBJECT(action), "short_label", &sss, NULL );
-            if (sss) {
+            // If short_label not defined, g_object_get will return label.
+            // This hack allows a label to be used with a drop-down menu when
+            // no label is used with a set of icons that are self-explanatory.
+            if (sss && strcmp( sss, "NotUsed" ) != 0 ) {
                 GtkWidget* lbl;
                 lbl = gtk_label_new(sss);
                 gtk_box_pack_start( GTK_BOX(holder), lbl, FALSE, FALSE, 4 );
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 8aed18d7b..6a5ac6ebe 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -7304,7 +7304,7 @@ static void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
                                                              _("Text Alignment"),     // Tooltip
                                                              NULL,                    // StockID
                                                              GTK_TREE_MODEL(model) ); // Model
-        g_object_set( act, "short_label", _("Align"), NULL );
+        g_object_set( act, "short_label", "NotUsed", NULL );
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
         g_object_set_data( holder, "TextAlignAction", act );
 
@@ -7346,7 +7346,7 @@ static void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
                                                              NULL,                    // StockID
                                                              GTK_TREE_MODEL(model) ); // Model
 
-        g_object_set( act, "short_label", _("O:"), NULL );
+        g_object_set( act, "short_label", "NotUsed", NULL );
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
         g_object_set_data( holder, "TextOrientationAction", act );