From d3a96e305e308ebc76c7d47bf1573003302d5fc3 Mon Sep 17 00:00:00 2001
From: clhodapp <clhodapp@live.com>
Date: Fri, 9 Oct 2009 13:32:23 -0500
Subject: [PATCH] Ability to disable scrollbar for/autoresize Places

---
 .../linuxmint/mintMenu/mintMenuConfig.glade    | 18 +++++++++++++++---
 usr/lib/linuxmint/mintMenu/mintMenuConfig.py   |  2 ++
 .../linuxmint/mintMenu/plugins/places.glade    | 17 ++++++++++-------
 usr/lib/linuxmint/mintMenu/plugins/places.py   |  9 +++++++--
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
index 233661e..b97c161 100644
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
@@ -837,6 +837,18 @@
                       <widget class="GtkVBox" id="vbox2">
                         <property name="visible">True</property>
                         <property name="orientation">vertical</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="allowscrollbarcheckbutton">
+                            <property name="label" translatable="yes">Allow Scrollbar</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
                         <child>
                           <widget class="GtkAlignment" id="alignment5">
                             <property name="visible">True</property>
@@ -878,7 +890,7 @@
                           </widget>
                           <packing>
                             <property name="padding">4</property>
-                            <property name="position">0</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
@@ -974,7 +986,7 @@
                             </child>
                           </widget>
                           <packing>
-                            <property name="position">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
@@ -1134,7 +1146,7 @@
                             </child>
                           </widget>
                           <packing>
-                            <property name="position">3</property>
+                            <property name="position">4</property>
                           </packing>
                         </child>
                       </widget>
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
index b280157..5b3fef7 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
@@ -122,6 +122,7 @@ class mintMenuConfig( object ):
 		self.desktoptoggle = wTree.get_widget( "desktopcheckbutton" )
 		self.trashtoggle = wTree.get_widget( "trashcheckbutton" )
 		self.customplacestree = wTree.get_widget( "customplacestree" )
+		self.allowScrollbarToggle = wTree.get_widget( "allowscrollbarcheckbutton" )
 		self.placesHeightBox = wTree.get_widget( "placesHeightSpinBox" ) 
 		wTree.get_widget( "closeButton" ).connect("clicked", gtk.main_quit )
 
@@ -164,6 +165,7 @@ class mintMenuConfig( object ):
 		self.bindGconfValueToWidget( self.gconfPlaces, "bool", "show_desktop", self.desktoptoggle, "toggled", self.desktoptoggle.set_active, self.desktoptoggle.get_active )
 		self.bindGconfValueToWidget( self.gconfPlaces, "bool", "show_trash", self.trashtoggle, "toggled", self.trashtoggle.set_active, self.trashtoggle.get_active )
 		self.bindGconfValueToWidget( self.gconfPlaces, "int", "height", self.placesHeightBox, "value-changed", self.placesHeightBox.set_value, self.placesHeightBox.get_value_as_int )
+		self.bindGconfValueToWidget( self.gconfPlaces, "bool", "allowScrollbar", self.allowScrollbarToggle, "toggled", self.allowScrollbarToggle.set_active, self.allowScrollbarToggle.get_active )
 		
 		self.customplacenames = self.gconfPlaces.get( "list-string", "custom_names", [ ] )
 		self.customplacepaths = self.gconfPlaces.get( "list-string", "custom_paths", [ ] )
diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.glade b/usr/lib/linuxmint/mintMenu/plugins/places.glade
index bd2b517..1fd8153 100644
--- a/usr/lib/linuxmint/mintMenu/plugins/places.glade
+++ b/usr/lib/linuxmint/mintMenu/plugins/places.glade
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="mainWindow">
     <signal name="destroy" handler="on_window1_destroy"/>
     <child>
@@ -11,15 +11,15 @@
           <widget class="GtkScrolledWindow" id="scrolledwindow2">
             <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>
             <signal name="drag_motion" handler="on_scrolledwindow_drag_motion"/>
             <signal name="drag_drop" handler="on_scrolledwindow_drag_drop"/>
             <signal name="drag_data_received" handler="on_scrolledwindow_drag_data_received"/>
             <child>
               <widget class="GtkViewport" id="viewport2">
                 <property name="visible">True</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <widget class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
@@ -29,11 +29,14 @@
                         <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>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkVButtonBox" id="editable_button_holder">
                         <property name="visible">True</property>
-                        <property name="layout_style">GTK_BUTTONBOX_START</property>
+                        <property name="layout_style">start</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/lib/linuxmint/mintMenu/plugins/places.py
index d1add7d..10401cb 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/places.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/places.py
@@ -30,7 +30,7 @@ class pluginclass( object ):
 		wTree 	= gtk.glade.XML( gladefile, "mainWindow" )
 		self.placesBtnHolder	= wTree.get_widget( "places_button_holder" )
 		self.editableBtnHolder 	= wTree.get_widget( "editable_button_holder" )
-
+		self.scrolledWindow=wTree.get_widget("scrolledwindow2")
 		# These properties are NECESSARY to maintain consistency
 
 		# Set 'window' property for the plugin (Must be the root widget)
@@ -82,7 +82,12 @@ class pluginclass( object ):
 	def GetGconfEntries( self ):
 
 		self.width = self.gconf.get( "int", "width", 200 )
-		self.height = self.gconf.get( "int", "height", 155 )
+		self.allowScrollbar = self.gconf.get( "bool", "allowScrollbar", False)
+		if (self.allowScrollbar == False):
+			self.height = -1
+			self.scrolledWindow.set_policy( gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER )
+		else:
+			self.height = self.gconf.get( "int", "height", 155 )
 		self.execapp = self.gconf.get( "string", "execute_app", "nautilus" )
 		self.iconsize = self.gconf.get( "int","icon_size", 2 )