From f44226bcf8f87b985768be13c26bdc9f6cb0d6d7 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 26 Jul 2011 12:34:02 +0000 Subject: [PATCH] Fixed sizing issues --- po/de.po | 24 ++++++++++++------------ po/es.po | 24 ++++++++++++------------ po/fr.po | 24 ++++++++++++------------ po/it.po | 24 ++++++++++++------------ src/plugins/cvs.c | 23 ++++++++++++----------- 5 files changed, 60 insertions(+), 59 deletions(-) diff --git a/po/de.po b/po/de.po index 0ea51f5..4bed32a 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 13:04+0200\n" +"POT-Creation-Date: 2011-07-26 14:31+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: English\n" @@ -706,47 +706,47 @@ msgstr "" msgid "CVS" msgstr "CVS" -#: ../src/plugins/cvs.c:161 +#: ../src/plugins/cvs.c:162 msgid "Root:" msgstr "" -#: ../src/plugins/cvs.c:163 +#: ../src/plugins/cvs.c:164 msgid "Repository:" msgstr "Repository:" -#: ../src/plugins/cvs.c:165 +#: ../src/plugins/cvs.c:166 msgid "Tag:" msgstr "" -#: ../src/plugins/cvs.c:167 ../src/plugins/cvs.c:184 +#: ../src/plugins/cvs.c:168 ../src/plugins/cvs.c:185 msgid "Request diff" msgstr "" -#: ../src/plugins/cvs.c:170 ../src/plugins/cvs.c:187 +#: ../src/plugins/cvs.c:171 ../src/plugins/cvs.c:188 msgid "Update" msgstr "" -#: ../src/plugins/cvs.c:173 ../src/plugins/cvs.c:190 +#: ../src/plugins/cvs.c:174 ../src/plugins/cvs.c:191 msgid "Commit" msgstr "" -#: ../src/plugins/cvs.c:182 +#: ../src/plugins/cvs.c:183 msgid "Revision:" msgstr "" -#: ../src/plugins/cvs.c:197 +#: ../src/plugins/cvs.c:198 msgid "Add to CVS" msgstr "" -#: ../src/plugins/cvs.c:200 +#: ../src/plugins/cvs.c:201 msgid "Run make" msgstr "" -#: ../src/plugins/cvs.c:325 ../src/plugins/cvs.c:394 +#: ../src/plugins/cvs.c:326 ../src/plugins/cvs.c:395 msgid "Not a CVS repository" msgstr "Kein CVS Inhalt" -#: ../src/plugins/cvs.c:417 +#: ../src/plugins/cvs.c:418 msgid "Not managed by CVS" msgstr "" diff --git a/po/es.po b/po/es.po index d0d8cfc..c940e98 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 13:04+0200\n" +"POT-Creation-Date: 2011-07-26 14:31+0200\n" "PO-Revision-Date: 2010-03-30 01:04+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -706,47 +706,47 @@ msgstr "" msgid "CVS" msgstr "CVS" -#: ../src/plugins/cvs.c:161 +#: ../src/plugins/cvs.c:162 msgid "Root:" msgstr "" -#: ../src/plugins/cvs.c:163 +#: ../src/plugins/cvs.c:164 msgid "Repository:" msgstr "" -#: ../src/plugins/cvs.c:165 +#: ../src/plugins/cvs.c:166 msgid "Tag:" msgstr "" -#: ../src/plugins/cvs.c:167 ../src/plugins/cvs.c:184 +#: ../src/plugins/cvs.c:168 ../src/plugins/cvs.c:185 msgid "Request diff" msgstr "" -#: ../src/plugins/cvs.c:170 ../src/plugins/cvs.c:187 +#: ../src/plugins/cvs.c:171 ../src/plugins/cvs.c:188 msgid "Update" msgstr "" -#: ../src/plugins/cvs.c:173 ../src/plugins/cvs.c:190 +#: ../src/plugins/cvs.c:174 ../src/plugins/cvs.c:191 msgid "Commit" msgstr "" -#: ../src/plugins/cvs.c:182 +#: ../src/plugins/cvs.c:183 msgid "Revision:" msgstr "" -#: ../src/plugins/cvs.c:197 +#: ../src/plugins/cvs.c:198 msgid "Add to CVS" msgstr "" -#: ../src/plugins/cvs.c:200 +#: ../src/plugins/cvs.c:201 msgid "Run make" msgstr "" -#: ../src/plugins/cvs.c:325 ../src/plugins/cvs.c:394 +#: ../src/plugins/cvs.c:326 ../src/plugins/cvs.c:395 msgid "Not a CVS repository" msgstr "" -#: ../src/plugins/cvs.c:417 +#: ../src/plugins/cvs.c:418 msgid "Not managed by CVS" msgstr "" diff --git a/po/fr.po b/po/fr.po index 87c0e73..7a8e9cd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 13:04+0200\n" +"POT-Creation-Date: 2011-07-26 14:31+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: French\n" @@ -740,47 +740,47 @@ msgstr "Usage: view fichier...\n" msgid "CVS" msgstr "CVS" -#: ../src/plugins/cvs.c:161 +#: ../src/plugins/cvs.c:162 msgid "Root:" msgstr "Racine :" -#: ../src/plugins/cvs.c:163 +#: ../src/plugins/cvs.c:164 msgid "Repository:" msgstr "Dépôt :" -#: ../src/plugins/cvs.c:165 +#: ../src/plugins/cvs.c:166 msgid "Tag:" msgstr "Tag :" -#: ../src/plugins/cvs.c:167 ../src/plugins/cvs.c:184 +#: ../src/plugins/cvs.c:168 ../src/plugins/cvs.c:185 msgid "Request diff" msgstr "Différences" -#: ../src/plugins/cvs.c:170 ../src/plugins/cvs.c:187 +#: ../src/plugins/cvs.c:171 ../src/plugins/cvs.c:188 msgid "Update" msgstr "Actualiser" -#: ../src/plugins/cvs.c:173 ../src/plugins/cvs.c:190 +#: ../src/plugins/cvs.c:174 ../src/plugins/cvs.c:191 msgid "Commit" msgstr "Soumettre" -#: ../src/plugins/cvs.c:182 +#: ../src/plugins/cvs.c:183 msgid "Revision:" msgstr "Révision :" -#: ../src/plugins/cvs.c:197 +#: ../src/plugins/cvs.c:198 msgid "Add to CVS" msgstr "Ajouter à CVS" -#: ../src/plugins/cvs.c:200 +#: ../src/plugins/cvs.c:201 msgid "Run make" msgstr "Exécuter make" -#: ../src/plugins/cvs.c:325 ../src/plugins/cvs.c:394 +#: ../src/plugins/cvs.c:326 ../src/plugins/cvs.c:395 msgid "Not a CVS repository" msgstr "Pas un dépôt CVS" -#: ../src/plugins/cvs.c:417 +#: ../src/plugins/cvs.c:418 msgid "Not managed by CVS" msgstr "Pas maintenu par CVS" diff --git a/po/it.po b/po/it.po index 1950d99..bb50e7f 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 13:04+0200\n" +"POT-Creation-Date: 2011-07-26 14:31+0200\n" "PO-Revision-Date: 2010-04-07 23:18+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -706,47 +706,47 @@ msgstr "" msgid "CVS" msgstr "CVS" -#: ../src/plugins/cvs.c:161 +#: ../src/plugins/cvs.c:162 msgid "Root:" msgstr "" -#: ../src/plugins/cvs.c:163 +#: ../src/plugins/cvs.c:164 msgid "Repository:" msgstr "" -#: ../src/plugins/cvs.c:165 +#: ../src/plugins/cvs.c:166 msgid "Tag:" msgstr "" -#: ../src/plugins/cvs.c:167 ../src/plugins/cvs.c:184 +#: ../src/plugins/cvs.c:168 ../src/plugins/cvs.c:185 msgid "Request diff" msgstr "" -#: ../src/plugins/cvs.c:170 ../src/plugins/cvs.c:187 +#: ../src/plugins/cvs.c:171 ../src/plugins/cvs.c:188 msgid "Update" msgstr "" -#: ../src/plugins/cvs.c:173 ../src/plugins/cvs.c:190 +#: ../src/plugins/cvs.c:174 ../src/plugins/cvs.c:191 msgid "Commit" msgstr "" -#: ../src/plugins/cvs.c:182 +#: ../src/plugins/cvs.c:183 msgid "Revision:" msgstr "" -#: ../src/plugins/cvs.c:197 +#: ../src/plugins/cvs.c:198 msgid "Add to CVS" msgstr "" -#: ../src/plugins/cvs.c:200 +#: ../src/plugins/cvs.c:201 msgid "Run make" msgstr "" -#: ../src/plugins/cvs.c:325 ../src/plugins/cvs.c:394 +#: ../src/plugins/cvs.c:326 ../src/plugins/cvs.c:395 msgid "Not a CVS repository" msgstr "" -#: ../src/plugins/cvs.c:417 +#: ../src/plugins/cvs.c:418 msgid "Not managed by CVS" msgstr "" diff --git a/src/plugins/cvs.c b/src/plugins/cvs.c index 55b9ac4..7c0998e 100644 --- a/src/plugins/cvs.c +++ b/src/plugins/cvs.c @@ -133,6 +133,7 @@ static GtkWidget * _cvs_init(BrowserPlugin * plugin) CVS * cvs; PangoFontDescription * font; GtkSizeGroup * group; + GtkSizeGroup * bgroup; GtkWidget * widget; if((cvs = object_new(sizeof(*cvs))) == NULL) @@ -145,6 +146,7 @@ static GtkWidget * _cvs_init(BrowserPlugin * plugin) font = pango_font_description_new(); pango_font_description_set_weight(font, PANGO_WEIGHT_BOLD); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + bgroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* label */ cvs->name = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(cvs->name), PANGO_ELLIPSIZE_MIDDLE); @@ -155,7 +157,6 @@ static GtkWidget * _cvs_init(BrowserPlugin * plugin) gtk_label_set_ellipsize(GTK_LABEL(cvs->status), PANGO_ELLIPSIZE_END); gtk_misc_set_alignment(GTK_MISC(cvs->status), 0.0, 0.5); gtk_box_pack_start(GTK_BOX(cvs->widget), cvs->status, FALSE, TRUE, 0); - group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* directory */ cvs->directory = gtk_vbox_new(FALSE, 4); widget = _init_label(group, _("Root:"), &cvs->d_root); @@ -164,13 +165,13 @@ static GtkWidget * _cvs_init(BrowserPlugin * plugin) gtk_box_pack_start(GTK_BOX(cvs->directory), widget, FALSE, TRUE, 0); widget = _init_label(group, _("Tag:"), &cvs->d_tag); gtk_box_pack_start(GTK_BOX(cvs->directory), widget, FALSE, TRUE, 0); - widget = _init_button(group, NULL, _("Request diff"), G_CALLBACK( + widget = _init_button(bgroup, NULL, _("Request diff"), G_CALLBACK( _cvs_on_diff), plugin); gtk_box_pack_start(GTK_BOX(cvs->directory), widget, FALSE, TRUE, 0); - widget = _init_button(group, GTK_STOCK_REFRESH, _("Update"), G_CALLBACK( - _cvs_on_update), plugin); + widget = _init_button(bgroup, GTK_STOCK_REFRESH, _("Update"), + G_CALLBACK(_cvs_on_update), plugin); gtk_box_pack_start(GTK_BOX(cvs->directory), widget, FALSE, TRUE, 0); - widget = _init_button(group, NULL, _("Commit"), G_CALLBACK( + widget = _init_button(bgroup, NULL, _("Commit"), G_CALLBACK( _cvs_on_commit), plugin); gtk_box_pack_start(GTK_BOX(cvs->directory), widget, FALSE, TRUE, 0); gtk_widget_show_all(cvs->directory); @@ -181,23 +182,23 @@ static GtkWidget * _cvs_init(BrowserPlugin * plugin) cvs->file = gtk_vbox_new(FALSE, 4); widget = _init_label(group, _("Revision:"), &cvs->f_revision); gtk_box_pack_start(GTK_BOX(cvs->file), widget, FALSE, TRUE, 0); - widget = _init_button(group, NULL, _("Request diff"), G_CALLBACK( + widget = _init_button(bgroup, NULL, _("Request diff"), G_CALLBACK( _cvs_on_diff), plugin); gtk_box_pack_start(GTK_BOX(cvs->file), widget, FALSE, TRUE, 0); - widget = _init_button(group, GTK_STOCK_REFRESH, _("Update"), G_CALLBACK( - _cvs_on_update), plugin); + widget = _init_button(bgroup, GTK_STOCK_REFRESH, _("Update"), + G_CALLBACK(_cvs_on_update), plugin); gtk_box_pack_start(GTK_BOX(cvs->file), widget, FALSE, TRUE, 0); - widget = _init_button(group, NULL, _("Commit"), G_CALLBACK( + widget = _init_button(bgroup, NULL, _("Commit"), G_CALLBACK( _cvs_on_commit), plugin); gtk_box_pack_start(GTK_BOX(cvs->file), widget, FALSE, TRUE, 0); gtk_widget_show_all(cvs->file); gtk_widget_set_no_show_all(cvs->file, TRUE); gtk_box_pack_start(GTK_BOX(cvs->widget), cvs->file, FALSE, TRUE, 0); /* additional actions */ - cvs->add = _init_button(group, GTK_STOCK_ADD, _("Add to CVS"), + cvs->add = _init_button(bgroup, GTK_STOCK_ADD, _("Add to CVS"), G_CALLBACK(_cvs_on_add), plugin); gtk_box_pack_start(GTK_BOX(cvs->widget), cvs->add, FALSE, TRUE, 0); - cvs->make = _init_button(group, GTK_STOCK_EXECUTE, _("Run make"), + cvs->make = _init_button(bgroup, GTK_STOCK_EXECUTE, _("Run make"), G_CALLBACK(_cvs_on_make), plugin); gtk_box_pack_start(GTK_BOX(cvs->widget), cvs->make, FALSE, TRUE, 0); gtk_widget_show_all(cvs->widget);