From 2ea8e07a2741ea5be36a2516ff0f09ede1dcdb64 Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 4 Nov 2015 01:23:00 +0000
Subject: [PATCH] Fine-tuned border widths and padding

---
 usr/lib/linuxmint/mintMenu/mintMenu.glade     |  6 ++-
 usr/lib/linuxmint/mintMenu/mintMenu.py        |  3 +-
 .../mintMenu/plugins/applications.glade       |  5 +++
 .../linuxmint/mintMenu/plugins/places.glade   | 14 +++---
 .../linuxmint/mintMenu/plugins/recent.glade   | 45 ++++++++++++++-----
 .../mintMenu/plugins/system_management.glade  | 20 ++++++---
 6 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.glade b/usr/lib/linuxmint/mintMenu/mintMenu.glade
index c8ef20d..b29b943 100644
--- a/usr/lib/linuxmint/mintMenu/mintMenu.glade
+++ b/usr/lib/linuxmint/mintMenu/mintMenu.glade
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 2.10 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="mainWindow">
+    <property name="can_focus">False</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK</property>
-    <property name="type">toplevel</property>
     <property name="resizable">False</property>
     <property name="type_hint">menu</property>
     <property name="skip_taskbar_hint">True</property>
@@ -14,9 +14,11 @@
     <child>
       <object class="GtkAlignment" id="border">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <child>
           <object class="GtkHBox" id="paneholder">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py
index 499ba70..9abbf77 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenu.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenu.py
@@ -569,7 +569,7 @@ class MenuWin( object ):
 
     def createPanelButton( self ):
         self.button_icon = Gtk.Image.new_from_file( self.buttonIcon )
-        self.systemlabel = Gtk.Label(label= self.buttonText )
+        self.systemlabel = Gtk.Label(label= "%s " % self.buttonText )
         if os.path.exists("/etc/linuxmint/info"):
             import commands
             tooltip = commands.getoutput("cat /etc/linuxmint/info | grep DESCRIPTION")
@@ -597,6 +597,7 @@ class MenuWin( object ):
             self.button_box.pack_start( self.button_icon , False, False, 0)
             self.button_icon.set_padding( 0, 5 )
 
+        
         self.button_box.set_homogeneous( False )
         self.button_box.show_all()
         self.sizeButton()
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.glade b/usr/lib/linuxmint/mintMenu/plugins/applications.glade
index 1ccdf96..3986a83 100644
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.glade
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.glade
@@ -29,6 +29,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="border_width">3</property>
+                    <property name="spacing">3</property>
                     <child>
                       <object class="GtkHBox" id="hbox8">
                         <property name="visible">True</property>
@@ -150,6 +152,8 @@
                   <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="border_width">3</property>
+                    <property name="spacing">3</property>
                     <child>
                       <object class="GtkHBox" id="hbox3">
                         <property name="visible">True</property>
@@ -297,6 +301,7 @@
                                   <object class="GtkVBox" id="applicationsBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="border_width">6</property>
                                   </object>
                                 </child>
                               </object>
diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.glade b/usr/lib/linuxmint/mintMenu/plugins/places.glade
index f1801f6..569388c 100644
--- a/usr/lib/linuxmint/mintMenu/plugins/places.glade
+++ b/usr/lib/linuxmint/mintMenu/plugins/places.glade
@@ -1,10 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.16 -->
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="mainWindow">
     <property name="can_focus">False</property>
-    <signal handler="on_window1_destroy" name="destroy" swapped="no"/>
+    <property name="border_width">3</property>
+    <signal name="destroy" handler="on_window1_destroy" swapped="no"/>
     <child>
       <object class="GtkEventBox" id="Places">
         <property name="visible">True</property>
@@ -13,11 +14,12 @@
           <object class="GtkScrolledWindow" id="scrolledwindow2">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="border_width">3</property>
             <property name="hscrollbar_policy">automatic</property>
             <property name="vscrollbar_policy">automatic</property>
-            <signal handler="on_scrolledwindow_drag_drop" name="drag_drop" swapped="no"/>
-            <signal handler="on_scrolledwindow_drag_data_received" name="drag_data_received" swapped="no"/>
-            <signal handler="on_scrolledwindow_drag_motion" name="drag_motion" swapped="no"/>
+            <signal name="drag-drop" handler="on_scrolledwindow_drag_drop" swapped="no"/>
+            <signal name="drag-data-received" handler="on_scrolledwindow_drag_data_received" swapped="no"/>
+            <signal name="drag-motion" handler="on_scrolledwindow_drag_motion" swapped="no"/>
             <child>
               <object class="GtkViewport" id="viewport2">
                 <property name="visible">True</property>
diff --git a/usr/lib/linuxmint/mintMenu/plugins/recent.glade b/usr/lib/linuxmint/mintMenu/plugins/recent.glade
index 495425a..a567995 100644
--- a/usr/lib/linuxmint/mintMenu/plugins/recent.glade
+++ b/usr/lib/linuxmint/mintMenu/plugins/recent.glade
@@ -1,32 +1,41 @@
-<?xml version="1.0"?>
-<!--*- mode: xml -*-->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="border_width">3</property>
     <property name="title" translatable="yes">window1</property>
     <child>
       <object class="GtkEventBox" id="eventbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">3</property>
             <child>
               <object class="GtkNotebook" id="RecentTabs">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="show_tabs">False</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkVButtonBox" id="RecentApps">
                             <property name="visible">True</property>
-                            <property name="layout_style">GTK_BUTTONBOX_START</property>
+                            <property name="can_focus">False</property>
+                            <property name="layout_style">start</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -39,6 +48,7 @@
                 <child type="tab">
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Applications</property>
                   </object>
                   <packing>
@@ -49,25 +59,31 @@
                   <object class="GtkScrolledWindow" id="scrolledwindow2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
                         <property name="visible">True</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="can_focus">False</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkVButtonBox" id="RecentBox">
                             <property name="visible">True</property>
-                            <property name="layout_style">GTK_BUTTONBOX_START</property>
+                            <property name="can_focus">False</property>
+                            <property name="layout_style">start</property>
                           </object>
                         </child>
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Documents</property>
                   </object>
                   <packing>
@@ -76,19 +92,26 @@
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="ClrBtn">
+                <property name="label">gtk-clear</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-clear</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
-                <signal handler="on_ClrBtn_clicked" name="clicked"/>
+                <signal name="clicked" handler="on_ClrBtn_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.glade b/usr/lib/linuxmint/mintMenu/plugins/system_management.glade
index 467c4d9..31bc2ce 100644
--- a/usr/lib/linuxmint/mintMenu/plugins/system_management.glade
+++ b/usr/lib/linuxmint/mintMenu/plugins/system_management.glade
@@ -1,41 +1,51 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="mainWindow">
-    <signal handler="on_window1_destroy" name="destroy"/>
+    <property name="can_focus">False</property>
+    <property name="border_width">3</property>
+    <signal name="destroy" handler="on_window1_destroy" swapped="no"/>
     <child>
       <object class="GtkEventBox" id="System">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow2">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="border_width">3</property>
             <property name="hscrollbar_policy">automatic</property>
             <property name="vscrollbar_policy">automatic</property>
-            <signal handler="on_scrolledwindow_drag_motion" name="drag_motion"/>
-            <signal handler="on_scrolledwindow_drag_drop" name="drag_drop"/>
-            <signal handler="on_scrolledwindow_drag_data_received" name="drag_data_received"/>
+            <signal name="drag-drop" handler="on_scrolledwindow_drag_drop" swapped="no"/>
+            <signal name="drag-data-received" handler="on_scrolledwindow_drag_data_received" swapped="no"/>
+            <signal name="drag-motion" handler="on_scrolledwindow_drag_motion" swapped="no"/>
             <child>
               <object class="GtkViewport" id="viewport2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkVBox" id="system_button_holder">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">2</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVButtonBox" id="editable_button_holder">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="layout_style">start</property>
                       </object>
                       <packing>