From aa61abf715d8a883465fea38ce5e592c048f9387 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 19 Jul 2011 03:28:22 +0000 Subject: [PATCH] Additional layout improvement to the properties panel --- po/de.po | 50 ++++++++++++++++++++-------------------- po/es.po | 50 ++++++++++++++++++++-------------------- po/fr.po | 59 ++++++++++++++++++++++++++++-------------------- po/it.po | 50 ++++++++++++++++++++-------------------- src/properties.c | 29 ++++++++++++++++-------- 5 files changed, 129 insertions(+), 109 deletions(-) diff --git a/po/de.po b/po/de.po index 8a07773..897c0a4 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-19 05:11+0200\n" +"POT-Creation-Date: 2011-07-19 05:28+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: English\n" @@ -188,7 +188,7 @@ msgstr "" #: ../src/browser.c:700 ../src/browser.c:705 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 #: ../src/desktop.c:1647 ../src/desktop.c:1652 ../src/move.c:452 -#: ../src/move.c:456 ../src/properties.c:300 ../src/properties.c:304 +#: ../src/move.c:456 ../src/properties.c:314 ../src/properties.c:318 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" msgstr "Fehler" @@ -412,7 +412,7 @@ msgstr "" msgid "Omitting directory" msgstr "" -#: ../src/copy.c:590 ../src/properties.c:506 +#: ../src/copy.c:590 ../src/properties.c:517 msgid "kB" msgstr "" @@ -420,7 +420,7 @@ msgstr "" msgid "0.0 kB/s" msgstr "" -#: ../src/copy.c:615 ../src/properties.c:508 +#: ../src/copy.c:615 ../src/properties.c:519 msgid "MB" msgstr "" @@ -610,11 +610,11 @@ msgstr "" msgid "Size:" msgstr "Größe:" -#: ../src/properties.c:182 ../src/properties.c:230 +#: ../src/properties.c:182 ../src/properties.c:244 msgid "Owner:" msgstr "" -#: ../src/properties.c:188 ../src/properties.c:233 +#: ../src/properties.c:188 ../src/properties.c:247 msgid "Group:" msgstr "Gruppe:" @@ -634,43 +634,43 @@ msgstr "" msgid "Permissions:" msgstr "" -#: ../src/properties.c:236 +#: ../src/properties.c:216 +msgid "Read:" +msgstr "" + +#: ../src/properties.c:220 +msgid "Write:" +msgstr "" + +#: ../src/properties.c:224 +msgid "Execute:" +msgstr "" + +#: ../src/properties.c:250 msgid "Others:" msgstr "" -#: ../src/properties.c:417 +#: ../src/properties.c:431 msgid "Unknown type" msgstr "" -#: ../src/properties.c:436 -msgid "read" -msgstr "" - -#: ../src/properties.c:440 -msgid "write" -msgstr "" - -#: ../src/properties.c:444 -msgid "execute" -msgstr "" - -#: ../src/properties.c:500 +#: ../src/properties.c:511 msgid "bytes" msgstr "" -#: ../src/properties.c:510 +#: ../src/properties.c:521 msgid "GB" msgstr "" -#: ../src/properties.c:514 +#: ../src/properties.c:525 msgid "TB" msgstr "" -#: ../src/properties.c:550 +#: ../src/properties.c:561 msgid "Properties of " msgstr "Eigenschaften von " -#: ../src/properties.c:636 +#: ../src/properties.c:647 msgid "Usage: properties file...\n" msgstr "" diff --git a/po/es.po b/po/es.po index dbe3890..30d55a2 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-19 05:11+0200\n" +"POT-Creation-Date: 2011-07-19 05:28+0200\n" "PO-Revision-Date: 2010-03-30 01:04+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -188,7 +188,7 @@ msgstr "" #: ../src/browser.c:700 ../src/browser.c:705 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 #: ../src/desktop.c:1647 ../src/desktop.c:1652 ../src/move.c:452 -#: ../src/move.c:456 ../src/properties.c:300 ../src/properties.c:304 +#: ../src/move.c:456 ../src/properties.c:314 ../src/properties.c:318 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" msgstr "" @@ -412,7 +412,7 @@ msgstr "" msgid "Omitting directory" msgstr "" -#: ../src/copy.c:590 ../src/properties.c:506 +#: ../src/copy.c:590 ../src/properties.c:517 msgid "kB" msgstr "" @@ -420,7 +420,7 @@ msgstr "" msgid "0.0 kB/s" msgstr "" -#: ../src/copy.c:615 ../src/properties.c:508 +#: ../src/copy.c:615 ../src/properties.c:519 msgid "MB" msgstr "" @@ -610,11 +610,11 @@ msgstr "" msgid "Size:" msgstr "" -#: ../src/properties.c:182 ../src/properties.c:230 +#: ../src/properties.c:182 ../src/properties.c:244 msgid "Owner:" msgstr "" -#: ../src/properties.c:188 ../src/properties.c:233 +#: ../src/properties.c:188 ../src/properties.c:247 msgid "Group:" msgstr "" @@ -634,43 +634,43 @@ msgstr "" msgid "Permissions:" msgstr "" -#: ../src/properties.c:236 +#: ../src/properties.c:216 +msgid "Read:" +msgstr "" + +#: ../src/properties.c:220 +msgid "Write:" +msgstr "" + +#: ../src/properties.c:224 +msgid "Execute:" +msgstr "" + +#: ../src/properties.c:250 msgid "Others:" msgstr "" -#: ../src/properties.c:417 +#: ../src/properties.c:431 msgid "Unknown type" msgstr "" -#: ../src/properties.c:436 -msgid "read" -msgstr "" - -#: ../src/properties.c:440 -msgid "write" -msgstr "" - -#: ../src/properties.c:444 -msgid "execute" -msgstr "" - -#: ../src/properties.c:500 +#: ../src/properties.c:511 msgid "bytes" msgstr "" -#: ../src/properties.c:510 +#: ../src/properties.c:521 msgid "GB" msgstr "" -#: ../src/properties.c:514 +#: ../src/properties.c:525 msgid "TB" msgstr "" -#: ../src/properties.c:550 +#: ../src/properties.c:561 msgid "Properties of " msgstr "Propriedades con " -#: ../src/properties.c:636 +#: ../src/properties.c:647 msgid "Usage: properties file...\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index d60cef4..a597ce7 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-19 05:11+0200\n" +"POT-Creation-Date: 2011-07-19 05:28+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: French\n" @@ -188,7 +188,7 @@ msgstr " Chemin : " #: ../src/browser.c:700 ../src/browser.c:705 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 #: ../src/desktop.c:1647 ../src/desktop.c:1652 ../src/move.c:452 -#: ../src/move.c:456 ../src/properties.c:300 ../src/properties.c:304 +#: ../src/move.c:456 ../src/properties.c:314 ../src/properties.c:318 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" msgstr "Erreur" @@ -412,7 +412,7 @@ msgstr "Fichier %u sur %u" msgid "Omitting directory" msgstr "Omission du dossier" -#: ../src/copy.c:590 ../src/properties.c:506 +#: ../src/copy.c:590 ../src/properties.c:517 msgid "kB" msgstr "Kio" @@ -420,7 +420,7 @@ msgstr "Kio" msgid "0.0 kB/s" msgstr "0.0 Kio/s" -#: ../src/copy.c:615 ../src/properties.c:508 +#: ../src/copy.c:615 ../src/properties.c:519 msgid "MB" msgstr "Mio" @@ -644,11 +644,11 @@ msgstr "" msgid "Size:" msgstr "Taille:" -#: ../src/properties.c:182 ../src/properties.c:230 +#: ../src/properties.c:182 ../src/properties.c:244 msgid "Owner:" msgstr "Propriétaire:" -#: ../src/properties.c:188 ../src/properties.c:233 +#: ../src/properties.c:188 ../src/properties.c:247 msgid "Group:" msgstr "Groupe:" @@ -668,43 +668,43 @@ msgstr "Changé:" msgid "Permissions:" msgstr "Permissions:" -#: ../src/properties.c:236 +#: ../src/properties.c:216 +msgid "Read:" +msgstr "Lecture :" + +#: ../src/properties.c:220 +msgid "Write:" +msgstr "Écriture :" + +#: ../src/properties.c:224 +msgid "Execute:" +msgstr "Exécution :" + +#: ../src/properties.c:250 msgid "Others:" msgstr "Autres:" -#: ../src/properties.c:417 +#: ../src/properties.c:431 msgid "Unknown type" msgstr "Type de fichier inconnu" -#: ../src/properties.c:436 -msgid "read" -msgstr "lecture" - -#: ../src/properties.c:440 -msgid "write" -msgstr "écriture" - -#: ../src/properties.c:444 -msgid "execute" -msgstr "exécution" - -#: ../src/properties.c:500 +#: ../src/properties.c:511 msgid "bytes" msgstr "octets" -#: ../src/properties.c:510 +#: ../src/properties.c:521 msgid "GB" msgstr "Gio" -#: ../src/properties.c:514 +#: ../src/properties.c:525 msgid "TB" msgstr "Tio" -#: ../src/properties.c:550 +#: ../src/properties.c:561 msgid "Properties of " msgstr "Propriétés de " -#: ../src/properties.c:636 +#: ../src/properties.c:647 msgid "Usage: properties file...\n" msgstr "Usage: properties fichier...\n" @@ -747,3 +747,12 @@ msgstr "Périphériques" #: ../src/plugins/devices.c:207 msgid "Root filesystem" msgstr "Racine" + +#~ msgid "read" +#~ msgstr "lecture" + +#~ msgid "write" +#~ msgstr "écriture" + +#~ msgid "execute" +#~ msgstr "exécution" diff --git a/po/it.po b/po/it.po index 9b68850..d0fa4ed 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-19 05:11+0200\n" +"POT-Creation-Date: 2011-07-19 05:28+0200\n" "PO-Revision-Date: 2010-04-07 23:18+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -188,7 +188,7 @@ msgstr "" #: ../src/browser.c:700 ../src/browser.c:705 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 #: ../src/desktop.c:1647 ../src/desktop.c:1652 ../src/move.c:452 -#: ../src/move.c:456 ../src/properties.c:300 ../src/properties.c:304 +#: ../src/move.c:456 ../src/properties.c:314 ../src/properties.c:318 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" msgstr "" @@ -412,7 +412,7 @@ msgstr "" msgid "Omitting directory" msgstr "" -#: ../src/copy.c:590 ../src/properties.c:506 +#: ../src/copy.c:590 ../src/properties.c:517 msgid "kB" msgstr "" @@ -420,7 +420,7 @@ msgstr "" msgid "0.0 kB/s" msgstr "" -#: ../src/copy.c:615 ../src/properties.c:508 +#: ../src/copy.c:615 ../src/properties.c:519 msgid "MB" msgstr "" @@ -610,11 +610,11 @@ msgstr "" msgid "Size:" msgstr "" -#: ../src/properties.c:182 ../src/properties.c:230 +#: ../src/properties.c:182 ../src/properties.c:244 msgid "Owner:" msgstr "" -#: ../src/properties.c:188 ../src/properties.c:233 +#: ../src/properties.c:188 ../src/properties.c:247 msgid "Group:" msgstr "" @@ -634,43 +634,43 @@ msgstr "" msgid "Permissions:" msgstr "" -#: ../src/properties.c:236 +#: ../src/properties.c:216 +msgid "Read:" +msgstr "" + +#: ../src/properties.c:220 +msgid "Write:" +msgstr "" + +#: ../src/properties.c:224 +msgid "Execute:" +msgstr "" + +#: ../src/properties.c:250 msgid "Others:" msgstr "" -#: ../src/properties.c:417 +#: ../src/properties.c:431 msgid "Unknown type" msgstr "" -#: ../src/properties.c:436 -msgid "read" -msgstr "" - -#: ../src/properties.c:440 -msgid "write" -msgstr "" - -#: ../src/properties.c:444 -msgid "execute" -msgstr "" - -#: ../src/properties.c:500 +#: ../src/properties.c:511 msgid "bytes" msgstr "" -#: ../src/properties.c:510 +#: ../src/properties.c:521 msgid "GB" msgstr "" -#: ../src/properties.c:514 +#: ../src/properties.c:525 msgid "TB" msgstr "" -#: ../src/properties.c:550 +#: ../src/properties.c:561 msgid "Properties of " msgstr "" -#: ../src/properties.c:636 +#: ../src/properties.c:647 msgid "Usage: properties file...\n" msgstr "" diff --git a/src/properties.c b/src/properties.c index f25a58a..6727834 100644 --- a/src/properties.c +++ b/src/properties.c @@ -156,7 +156,7 @@ static Properties * _properties_new(char const * filename, Mime * mime) gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW( properties->view), GTK_SHADOW_NONE); vbox = gtk_vbox_new(FALSE, 4); - table = gtk_table_new(12, 2, FALSE); + table = gtk_table_new(13, 2, FALSE); gtk_container_set_border_width(GTK_CONTAINER(table), 4); gtk_table_set_row_spacings(GTK_TABLE(table), 4); gtk_table_set_col_spacings(GTK_TABLE(table), 4); @@ -213,6 +213,20 @@ static Properties * _properties_new(char const * filename, Mime * mime) gtk_widget_modify_font(widget, bold); gtk_table_attach_defaults(GTK_TABLE(table), widget, 0, 1, 8, 9); hbox = gtk_hbox_new(TRUE, 4); + widget = gtk_label_new(_("Read:")); + gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); + gtk_widget_modify_font(widget, bold); + gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); + widget = gtk_label_new(_("Write:")); + gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); + gtk_widget_modify_font(widget, bold); + gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); + widget = gtk_label_new(_("Execute:")); + gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); + gtk_widget_modify_font(widget, bold); + gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); + gtk_table_attach_defaults(GTK_TABLE(table), hbox, 1, 2, 9, 10); + hbox = gtk_hbox_new(TRUE, 4); for(i = 0; i < sizeof(properties->mode) / sizeof(*properties->mode); i++) { @@ -224,25 +238,25 @@ static Properties * _properties_new(char const * filename, Mime * mime) if((i % 3) != 2) continue; gtk_table_attach_defaults(GTK_TABLE(table), hbox, 1, 2, - 11 - (i / 3), 12 - (i / 3)); + 12 - (i / 3), 13 - (i / 3)); hbox = NULL; } widget = gtk_label_new(_("Owner:")); gtk_widget_modify_font(widget, bold); - gtk_table_attach_defaults(GTK_TABLE(table), widget, 0, 1, 9, 10); + gtk_table_attach_defaults(GTK_TABLE(table), widget, 0, 1, 10, 11); widget = gtk_label_new(_("Group:")); gtk_widget_modify_font(widget, bold); - gtk_table_attach_defaults(GTK_TABLE(table), widget, 0, 1, 10, 11); + gtk_table_attach_defaults(GTK_TABLE(table), widget, 0, 1, 11, 12); widget = gtk_label_new(_("Others:")); gtk_widget_modify_font(widget, bold); - gtk_table_attach_defaults(GTK_TABLE(table), widget, 0, 1, 11, 12); + gtk_table_attach_defaults(GTK_TABLE(table), widget, 0, 1, 12, 13); pango_font_description_free(bold); if(filename != NULL) _properties_set_filename(properties, filename); gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, TRUE, 0); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW( properties->view), vbox); - gtk_widget_set_size_request(properties->view, 300, 300); + gtk_widget_set_size_request(properties->view, 200, 320); gtk_widget_show_all(properties->view); return properties; } @@ -433,15 +447,12 @@ static void _refresh_type(Properties * properties, struct stat * st) static void _refresh_mode(GtkWidget ** widget, mode_t mode, gboolean sensitive) { - gtk_button_set_label(GTK_BUTTON(widget[2]), _("read")); /* read */ gtk_widget_set_sensitive(widget[2], sensitive); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget[2]), mode & S_IROTH); - gtk_button_set_label(GTK_BUTTON(widget[1]), _("write")); /* write */ gtk_widget_set_sensitive(widget[1], sensitive); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget[1]), mode & S_IWOTH); - gtk_button_set_label(GTK_BUTTON(widget[0]), _("execute")); /* execute */ gtk_widget_set_sensitive(widget[0], sensitive); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget[0]), mode & S_IXOTH);