Ticket #10: 0001-Renamed-window_size-property-to-window_height.patch

data/guake.schemas

@@ -93 +93 @@
         </schema>
 
         <schema>
-            <key>/schemas/apps/guake/general/window_size</key>
-            <applyto>/apps/guake/general/window_size</applyto>
+            <key>/schemas/apps/guake/general/window_height</key>
+            <applyto>/apps/guake/general/window_height</applyto>
             <owner>guake</owner>
             <type>int</type>
             <default>50</default>

data/prefs.glade

@@ -319 +319 @@
                             <property name="visible">True</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkHScale" id="window_size">
+                              <widget class="GtkHScale" id="window_height">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
@@ -327 +327 @@
                                 <property name="digits">0</property>
                                 <property name="draw_value">False</property>
                                 <property name="value_pos">GTK_POS_RIGHT</property>
-                                <signal name="value_changed" handler="on_window_size_value_changed"/>
+                                <signal name="value_changed" handler="on_window_height_value_changed"/>
                               </widget>
                             </child>
                           </widget>

src/guake.py

@@ -95 +95 @@
         notify_add(KEY('/general/use_trayicon'), self.trayicon_toggled)
         notify_add(KEY('/general/window_ontop'), self.ontop_toggled)
         notify_add(KEY('/general/window_tabbar'), self.tabbar_toggled)
-        notify_add(KEY('/general/window_size'), self.size_changed)
+        notify_add(KEY('/general/window_height'), self.size_changed)
 
         notify_add(KEY('/general/use_scrollbar'), self.scrollbar_toggled)
         notify_add(KEY('/general/history_size'), self.history_size_changed)
@@ -145 +145 @@
             self.guake.toolbar.hide()
 
     def size_changed(self, client, connection_id, entry, data):
-        """If the gconf var window_size be changed, this method will
+        """If the gconf var window_height be changed, this method will
         be called and will call the resize function in guake.
         """
         window_rect = self.guake.get_final_window_rect()
@@ -621 +621 @@
         if percent < 1:
             percent = 1
 
-        self.client.set_int(KEY('/general/window_size'), int(percent))
+        self.client.set_int(KEY('/general/window_height'), int(percent))
 
     def on_window_losefocus(self, window, event):
         """Hides terminal main window when it loses the focus and if
@@ -738 +738 @@
 
     def get_final_window_rect(self):
         """Gets the final size of the main window of guake. The height
-        is just the window_size property. But width is calculated as
+        is just the window_height property. But width is calculated as
         100% of the screen and tested against the monitor geometry
         width.
         """
         screen = self.window.get_screen()
-        height = self.client.get_int(KEY('/general/window_size'))
+        height = self.client.get_int(KEY('/general/window_height'))
 
         # get the rectangle just from the first/default monitor in the
         # future we might create a field to select which monitor you
@@ -761 +761 @@
         self.client.notify(KEY('/general/use_trayicon'))
         self.client.notify(KEY('/general/window_tabbar'))
         self.client.notify(KEY('/general/window_ontop'))
-        self.client.notify(KEY('/general/window_size'))
+        self.client.notify(KEY('/general/window_height'))
         self.client.notify(KEY('/general/use_scrollbar'))
         self.client.notify(KEY('/general/history_size'))
         self.client.notify(KEY('/general/show_resizer'))

src/prefs.py

@@ -138 +138 @@
         """
         self.client.set_bool(KEY('/general/window_tabbar'), chk.get_active())
 
-    def on_window_size_value_changed(self, hscale):
-        """Changes the value of window_size in gconf
+    def on_window_height_value_changed(self, hscale):
+        """Changes the value of window_height in gconf
         """
         val = hscale.get_value()
-        self.client.set_int(KEY('/general/window_size'), int(val))
+        self.client.set_int(KEY('/general/window_height'), int(val))
 
     # scrolling tab
 
@@ -398 +398 @@
         self.get_widget('window_tabbar').set_active(value)
 
         # size
-        value = float(self.client.get_int(KEY('/general/window_size')))
-        self.get_widget('window_size').set_value(value)
+        value = float(self.client.get_int(KEY('/general/window_height')))
+        self.get_widget('window_height').set_value(value)
 
         # scrollbar
         value = self.client.get_bool(KEY('/general/use_scrollbar'))