diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2010-05-13 12:16:04 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2010-05-13 12:16:04 +0000 |
| commit | 4e30cc37538c7d0c68a8183f352fa4c96476cc17 (patch) | |
| tree | 3a87902fac0169dcba44f7b8c8871de9cd5134a1 /src | |
| parent | i18n, extensions. Fix untranslatable XML elements when the value contains ent... (diff) | |
| download | inkscape-4e30cc37538c7d0c68a8183f352fa4c96476cc17.tar.gz inkscape-4e30cc37538c7d0c68a8183f352fa4c96476cc17.zip | |
Get rid of unneeded labels when the icons are self-explanatory.
(bzr r9410)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ege-select-one-action.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
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 ); |