Ticket #10: 0002-Allow-window-width-to-be-customized.patch

data/guake.schemas

@@ -92 +92 @@
             </locale>
         </schema>
 
-        <schema>
+        <schema>
+            <key>/schemas/apps/guake/general/window_width</key>
+            <applyto>/apps/guake/general/window_width</applyto>
+            <owner>guake</owner>
+            <type>int</type>
+            <default>100</default>
+            <locale name="C">
+                <short>Window height.</short>
+                <long>Percent of the screen that will be used by guake
+                  terminal horizontally.</long>
+            </locale>
+        </schema>
+
+        <schema>
             <key>/schemas/apps/guake/general/window_height</key>
             <applyto>/apps/guake/general/window_height</applyto>
             <owner>guake</owner>

data/prefs.glade

@@ -336 +336 @@
                           <widget class="GtkLabel" id="label24">
                             <property name="visible">True</property>
                             <property name="ypad">6</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Main Window size&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Main Window height&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
@@ -348 +348 @@
                         <property name="position">3</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkFrame" id="frame12">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment12">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkHScale" id="window_width">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                <property name="adjustment">50 10 110 10 10 10</property>
+                                <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_width_value_changed"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label25">
+                            <property name="visible">True</property>
+                            <property name="ypad">6</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Main Window width&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
                   </widget>
                 </child>
                 <child>

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_width'), self.size_changed)
         notify_add(KEY('/general/window_height'), self.size_changed)
 
         notify_add(KEY('/general/use_scrollbar'), self.scrollbar_toggled)
@@ -145 +146 @@
             self.guake.toolbar.hide()
 
     def size_changed(self, client, connection_id, entry, data):
-        """If the gconf var window_height be changed, this method will
-        be called and will call the resize function in guake.
+        """If the gconf var window_height or window_width are changed,
+        this method will be called and will call the resize function
+        in guake.
         """
         window_rect = self.guake.get_final_window_rect()
         self.guake.window.resize(window_rect.width, window_rect.height)
@@ -738 +740 @@
 
     def get_final_window_rect(self):
         """Gets the final size of the main window of guake. The height
-        is just the window_height property. But width is calculated as
-        100% of the screen and tested against the monitor geometry
-        width.
+        is the window_height property, while width is window_width.
         """
         screen = self.window.get_screen()
         height = self.client.get_int(KEY('/general/window_height'))
+        width = self.client.get_int(KEY('/general/window_width'))
 
         # get the rectangle just from the first/default monitor in the
         # future we might create a field to select which monitor you
@@ -751 +752 @@
         window_rect = screen.get_monitor_geometry(0)
 
         window_rect.height = window_rect.height * height / 100
+        window_rect.width = window_rect.width * width / 100
         return window_rect
 
     # -- configuration --
@@ -761 +763 @@
         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_width'))
         self.client.notify(KEY('/general/window_height'))
         self.client.notify(KEY('/general/use_scrollbar'))
         self.client.notify(KEY('/general/history_size'))

src/prefs.py

@@ -138 +138 @@
         """
         self.client.set_bool(KEY('/general/window_tabbar'), chk.get_active())
 
+    def on_window_width_value_changed(self, wscale):
+        """Changes the value of window_width in gconf
+        """
+        val = wscale.get_value()
+        self.client.set_int(KEY('/general/window_width'), int(val))
+
     def on_window_height_value_changed(self, hscale):
         """Changes the value of window_height in gconf
         """
@@ -397 +403 @@
         value = self.client.get_bool(KEY('/general/window_tabbar'))
         self.get_widget('window_tabbar').set_active(value)
 
-        # size
+        # width
+        value = float(self.client.get_int(KEY('/general/window_width')))
+        self.get_widget('window_width').set_value(value)
+
+        # height
         value = float(self.client.get_int(KEY('/general/window_height')))
         self.get_widget('window_height').set_value(value)