← Back to team overview

elementaryart team mailing list archive

[Merge] lp:~codygarver/marlin/add-pref-spacing into lp:marlin

 

Cody Garver has proposed merging lp:~codygarver/marlin/add-pref-spacing into lp:marlin.

Requested reviews:
  The elementary Project (elementaryproject)

For more details, see:
https://code.launchpad.net/~codygarver/marlin/add-pref-spacing/+merge/79318

This change is minor and adds a space to 2 labels in Marlin Settings to avoid text-cutoff and improve the overall look of the window.
-- 
https://code.launchpad.net/~codygarver/marlin/add-pref-spacing/+merge/79318
Your team The elementary Project is requested to review the proposed merge of lp:~codygarver/marlin/add-pref-spacing into lp:marlin.
=== modified file 'src/View/SettingsDialog.vala'
--- src/View/SettingsDialog.vala	2011-10-13 14:25:58 +0000
+++ src/View/SettingsDialog.vala	2011-10-13 17:16:45 +0000
@@ -26,6 +26,7 @@
     {
         public SettingsDialog(Window win)
         {
+            /* The following should be changed to "Marlin Preferences" or "Preferences" when the appmenu entry can be changed to "Preferences". */
             set_title(_("Marlin Settings"));
             /*height_request = 600;*/
             //width_request = 500;
@@ -88,7 +89,8 @@
             spin_icon_size.append(new Gtk.Label(_("small")));
             spin_icon_size.append(new Gtk.Label(_("medium")));
             spin_icon_size.append(new Gtk.Label(_("large")));
-            spin_icon_size.append(new Gtk.Label(_("extra-large")));
+            /* The following + (" ") has been added to avoid cutting off the text in the label. This may be fixed in eGTK someday and safely removed. */
+            spin_icon_size.append(new Gtk.Label(_("extra-large")) + (" "));
             switch((int)Preferences.settings.get_value("sidebar-icon-size"))
             {
             case 16:
@@ -122,7 +124,8 @@
             var mode_date_format = new Chrome.ModeButton();
             mode_date_format.append(new Gtk.Label(_("locale")));
             mode_date_format.append(new Gtk.Label(_("iso")));
-            mode_date_format.append(new Gtk.Label(_("informal")));
+            /* The following + (" ") has been added to avoid cutting off the text in the label. This may be fixed in eGTK someday and safely removed. */
+            mode_date_format.append(new Gtk.Label(_("informal")) + (" "));
             switch((string)Preferences.settings.get_value("date-format"))
             {
             case "locale":