elementaryart team mailing list archive

[Robert Roth <evfool@xxxxxxxxx>]

Robert Roth has proposed merging lp:~evfool/marlin/fixsettings into lp:marlin.

Requested reviews:
  The elementary Project (elementaryproject)
Related bugs:
  Bug #802051 in Marlin: "fix spacing around tabs in settings"
  https://bugs.launchpad.net/marlin/+bug/802051

For more details, see:
https://code.launchpad.net/~evfool/marlin/fixsettings/+merge/66687

Added padding to the notebook in settings, as requested in bug #802051.
-- 
https://code.launchpad.net/~evfool/marlin/fixsettings/+merge/66687
Your team The elementary Project is requested to review the proposed merge of lp:~evfool/marlin/fixsettings into lp:marlin.

=== modified file 'libwidgets/LocationBar.vala'
--- libwidgets/LocationBar.vala	2011-06-24 23:26:10 +0000
+++ libwidgets/LocationBar.vala	2011-07-02 11:26:33 +0000
@@ -714,7 +714,10 @@
             }
             
             newelements[0].text = protocol + newelements[0].text;
-            
+            if (newelements[0].text == "trash:///") 
+            {
+                newelements[0].text = N_("Trash");
+            }
             int max_path = 0;
             if(newelements.size > elements.size)
             {

=== modified file 'src/View/SettingsDialog.vala'
--- src/View/SettingsDialog.vala	2011-06-01 15:52:03 +0000
+++ src/View/SettingsDialog.vala	2011-07-02 11:26:33 +0000
@@ -228,8 +228,10 @@
 
 
             mai_notebook.append_page(first_vbox, new Gtk.Label(_("Plugins")));
-
-            ((Gtk.Box)get_content_area()).pack_start(mai_notebook);
+            Gtk.Alignment alignment = new Gtk.Alignment(0.5f, 0.5f, 1.0f, 1.0f);
+            alignment.set_padding(6, 6, 6, 6);
+            alignment.add(mai_notebook);
+            ((Gtk.Box)get_content_area()).pack_start(alignment);
 
             this.show_all();