Merge lp:~anantzoid/gtg/cool-new-feature into lp:~gtg/gtg/old-trunk

[Anant Gupta]

Bug #539037 fixed.

[Izidor Matušov (izidor)]

Firstly, thanks for your fix. Have you committed and pushed all your changes? After your changes, GTG does not remember the size of its window any more (that is a regression).

To solve this bug, you need to store if the window is maximized and on the start maximize it if needed. You can find more information about maximization there:

http://www.pygtk.org/docs/pygtk/class-gtkwindow.html#method-gtkwindow--maximize

You found the place where you have to change things, keep working on it!

review: Needs Fixing (running, code)

[Anant Gupta (anantzoid)]

I am not facing the bug now. Please see if the problem still exists.

[Izidor Matušov (izidor)]

I've played with your code. I use Ubuntu & Unity and the bug seems to be solved there: if the window is the size of screen, it is maximized by Unity. However, not every window manager has that feature. Try to install other WMs, e.g. XFCE or FluxBox, and reproduce it there. It doesn't work it there.

In other words, without using method maximize() you are not able to solve this bug.

review: Needs Fixing (running, code)

[Anant Gupta (anantzoid)]

I've used what you told me to and now there is again no problem. I don't have the test environments(XFCE or FluxBox). So please test it on different environments and let me know.

review: Needs Resubmitting

[Izidor Matušov (izidor)]

Your code looks much more better now! You are able to detect when your window is maximized. on_window_state_event is called during the process of maximization and therefore you don't need to maximize the window (it is already happening)

You should instead save the fact that window is maximized: set a special values to width and height in config or introduce your new boolean variable to check if window was maximized. Don't forget to add back the code for maximizing of the window in restore_state_from_conf

Keep working on it, you are near the solution!

review: Needs Fixing (code)

[Anant Gupta (anantzoid)]

That was a minor change to make. No trouble doing that. Please review the code.

[Izidor Matušov (izidor)]

Could you change on_window_state_event to store state in config instead of trying to return value? (It doesn't work because of concept of GTK callbacks anyway)

review: Needs Fixing (code)

[Anant Gupta (anantzoid)]

Sorry for the delay. Please check if this was what you asked for.

[Anant Gupta (anantzoid)]

review: Needs Resubmitting

[lp:~anantzoid/gtg/cool-new-feature]

1119. By Anant Gupta on 2012-03-26

using boolean values in self.config

1120. By Anant Gupta on 2012-03-26

used string in config

1121. By Anant Gupta on 2012-03-26

used string in config

1122. By Anant Gupta on 2012-03-26

used string value in config.max:

1123. By Anant Gupta on 2012-03-26

used string value in config.max:

[Izidor Matušov (izidor)]

It works now. Thanks for the patch!

review: Approve (running, code)

[Anant Gupta (anantzoid)]

review: Approve

=== modified file 'AUTHORS'
--- AUTHORS	2012-03-26 16:09:56 +0000
+++ AUTHORS	2012-03-26 16:59:18 +0000
@@ -95,6 +95,10 @@
 * dAnjou <https://launchpad.net/~danjou> (no email provided)
 * Paul Kishimoto <[e-mail]>
 * Wolter Hellmund <[e-mail]>
+<<<<<<< TREE
 * huxuan <[e-mail]>
 * Nimit Shah <[e-mail]>
 * Abdul Rauf <[e-mail]>
+=======
+* Anant Gupta <[e-mail]>
+>>>>>>> MERGE-SOURCE

=== modified file 'CHANGELOG'
--- CHANGELOG	2012-03-22 13:50:35 +0000
+++ CHANGELOG	2012-03-26 16:59:18 +0000
@@ -186,3 +186,6 @@
 
 2009-03-01 Getting Things Gnome! 0.0.9rc1
 	* First official release 0.1rc1
+
[phone] Getting Things Gnome! 0.3
+	*Bug #539037 fixed

=== modified file 'GTG/gtk/browser/browser.py'
--- GTG/gtk/browser/browser.py	2012-03-22 13:32:49 +0000
+++ GTG/gtk/browser/browser.py	2012-03-26 16:59:18 +0000
@@ -32,6 +32,7 @@
 pygtk.require('2.0')
 import gobject
 import gtk
+import gtk.gdk as gdk
 
 #our own imports
 from GTG import _, info, ngettext
@@ -132,6 +133,7 @@
         self.last_added_tags = "NewTag"
         self.last_apply_tags_to_subtasks = False
         
+        
         self.restore_state_from_conf()
 
         self.on_select_tag()
@@ -438,6 +440,23 @@
 
     def quit(self,widget=None):
         self.vmanager.close_browser()
+    
+          
+    def on_window_state_event(self,widget,event,data=None):
+
+         """This event checks for the window state: maximized?
+	    and stores the state in self.config.max
+	    This is used to check the window state afterwards
+	     and maximize it if needed
+	"""
+ 	
+	mask = gtk.gdk.WINDOW_STATE_MAXIMIZED
+	if widget.get_window().get_state() & mask == mask:	
+	   self.config.set("max","True")
+	else:
+	   self.config.set("max","False") 
+
+	
         
     def restore_state_from_conf(self):
 
@@ -448,11 +467,21 @@
 #            self.builder.get_object("hpaned1").set_position(250)
 #            return
 
-        width = self.config.get('width')
+			
+	width = self.config.get('width')
         height = self.config.get('height')
-        if width and height:
-            self.window.resize(width, height)
-
+	
+	if width and height:
+           self.window.resize(width, height)
+#	checks for maximum size of window
+        self.window.connect('window-state-event',self.on_window_state_event)
+	state = self.config.get("max")
+	if state == "True":
+	   print "Maximize"
+           self.window.maximize()
+	   	
+	
+	
         xpos = self.config.get("x_pos")
         ypos = self.config.get("y_pos")
         if ypos and xpos:
@@ -669,7 +698,7 @@
         width, height = self.window.get_size()
         self.config.set('width',width)
         self.config.set('height',height)
-
+	
     def on_bottom_pane_position(self, widget, data = None):
         self.config.set('bottom_pane_position', widget.get_position())