Changeset ea35bd52bc71644dba1fac27bbff6289b7dcce05

Timestamp:

08/05/08 19:52:16 (4 years ago)

Author:

Gabriel Falcão <gabriel@…>

Children:

967b133d04de12c7b465281f7b8a7adf4ffaa7a7

Parents:

44337aba824f099bf146275830ff6beb5b6a14ac, d7ebb04002b10e3f35f2ea7459937c7f19c12942

git-committer:

Gabriel Falcão <gabriel@…> (08/05/08 19:52:16)

Message:

Merge branch 'easily_resizing' into gconf_listening

Files:

• ChangeLog (modified) (1 diff)
• data/guake.glade (modified) (2 diffs)
• data/guake.schemas (modified) (1 diff)
• src/guake.py (modified) (5 diffs)

ChangeLog

@@ +1 @@
+2008-08-05  Gabriel Falcão <gabriel@nacaolivre.org>
+
+        * src/guake.py: Now guake can be resized with a resizer :)
+        * data/guake.glade: Adding a GtkHPaned as resizer for guake
+        * data/guake.schemas: Adding two new boolean keys: show_toolbar and show_resizer
+
 2008-08-04  Lincoln de Sousa  <lincoln@minaslivre.org>
 

data/guake.glade

@@ -30 +30 @@
           <widget class="GtkHBox" id="toolbar">
             <property name="visible">True</property>
+            <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
+            <property name="extension_events">GDK_EXTENSION_EVENTS_ALL</property>
             <child>
               <widget class="GtkImage" id="image1">
@@ -78 +80 @@
           </packing>
         </child>
+        <child>
+          <widget class="GtkVPaned" id="resizer">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="no_show_all">True</property>
+            <child>
+              <widget class="GtkFixed" id="fixed1">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkFixed" id="fixed2">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </widget>
     </child>

data/guake.schemas

@@ -317 +317 @@
         </schema>
 
+        <schema>
+            <key>/schemas/apps/guake/general/show_resizer</key>
+            <applyto>/apps/guake/general/show_resizer</applyto>
+            <owner>guake</owner>
+            <type>bool</type>
+            <default>true</default>
+            <locale name="C">
+                <short>If guake must show a control to make resizing more handful</short>
+                <long>When true, guake shows a resizer on its bottom to allow user 
+                resize guake.</long>
+            </locale>
+        </schema>
+
+        <schema>
+            <key>/schemas/apps/guake/general/show_toolbar</key>
+            <applyto>/apps/guake/general/show_toolbar</applyto>
+            <owner>guake</owner>
+            <type>bool</type>
+            <default>true</default>
+            <locale name="C">
+                <short>If the tabs bar must be visible</short>
+                <long>When true, the tabs bar is visible</long>
+            </locale>
+        </schema>
     </schemalist>
 </gconfschemafile>

src/guake.py

@@ -636 +636 @@
         self.toolbar = self.get_widget('toolbar')
         self.mainframe = self.get_widget('mainframe')
+        self.resizer = self.get_widget('resizer')
 
         # List of vte.Terminal widgets, it will be useful when needed
@@ -666 +667 @@
         self.window.set_geometry_hints(min_width=1, min_height=1)
         self.window.connect('focus-out-event', self.on_window_lostfocus)
+
+        # resizer stuff
+        self.resizer.connect('motion-notify-event', self.on_resizer_drag)
+            
         self.get_widget('context-menu').set_accel_group(self.accel_group)
 
@@ -674 +679 @@
         self.add_tab()
         self.toggle_ontop()
+
+    def on_resizer_drag(self, widget, event):
+        (x, y), mod = event.device.get_state(widget.window)
+
+        max_height = self.window.get_screen().get_height()
+        percent = y / (max_height / 100)
+        
+        if percent < 1:
+            percent = 1
+            
+        if int(mod) > 1:
+            self.client.set_int(GCONF_PATH + 'general/window_size', int(percent))
+            self.resize(*self.get_final_window_size())
 
     def on_window_lostfocus(self,window, event):
@@ -686 +704 @@
         self.window.show_all()
         self.window.hide()
+        show_resizer = self.client.get_bool(GCONF_PATH+'general/show_resizer')
+        if not show_resizer:
+            self.resizer.hide()
 
     def show_menu(self, *args):
@@ -762 +783 @@
         width = self.window.get_screen().get_width()
         height = self.client.get_int(GCONF_PATH+'general/window_size')
+        # avoiding X Window system error
+        max_height = self.window.get_screen().get_height()
+
+        if height > max_height:
+            height = max_height
+
         return width, height