Merge lp:~alasdair-macleod/jokosher/store-window-size into lp:jokosher

[alasdair.macleod]

[alasdair.macleod (alasdair-macleod)]

Added the storing of the window size for add instrument

[Laszlo Pandy (laszlok)]

What is the purpose of the OnDestroy function and the following comment:
"the current project can't be properly closed. This stops signal propagation."

Can you explain this more?

[lp:~alasdair-macleod/jokosher/store-window-size]

1081. By alasdair.macleod on 2009-04-03

Made changes requested from code review. Added the saving of window size after resize
to the Instrument Effects dialog.

=== modified file 'Jokosher/AddInstrumentDialog.py'
--- Jokosher/AddInstrumentDialog.py	2008-12-18 19:07:15 +0000
+++ Jokosher/AddInstrumentDialog.py	2009-04-03 13:31:25 +0000
@@ -44,6 +44,7 @@
 			"on_OK_clicked" : self.OnOK,
 			"on_Cancel_clicked" : self.OnCancel,
 			"on_instrument_search_changed" : self.OnSearchChange,
+			"on_AddInstrument_configure_event" : self.OnResize,
 		}
 		
 		self.res.signal_autoconnect(self.signals)
@@ -87,8 +88,11 @@
 			
 		self.tree.set_item_width(90)
 		self.tree.set_size_request(72, -1)
-		self.dlg.resize(350, 300)
-		
+
+		self.width = int(Globals.settings.general["addinstrumentwindowwidth"])
+		self.height = int(Globals.settings.general["addinstrumentwindowheight"])
+		self.dlg.resize(self.width, self.height)
+				
 		self.dlg.set_icon(self.parent.icon)
 		self.dlg.set_transient_for(self.parent.window)
 		self.dlg.show()
@@ -130,6 +134,10 @@
 			instrItem = [x for x in Globals.getCachedInstruments() if x[1] == item[1]][0]
 			self.instr.ChangeType(instrItem[1], instrItem[0])
 
+		Globals.settings.general["addinstrumentwindowwidth"] = self.width
+		Globals.settings.general["addinstrumentwindowheight"] = self.height
+		Globals.settings.write()
+
 		self.dlg.destroy()
 		
 	#_____________________________________________________________________
@@ -141,6 +149,7 @@
 		Parameters:
 			button -- reserved for GTK callbacks, dont't use it explicity.
 		"""
+
 		self.dlg.destroy()
 		
 	#_____________________________________________________________________
@@ -181,4 +190,45 @@
 		
 	#_____________________________________________________________________
 
+
+	def OnResize(self, widget, event):
+		"""
+		This method is called when the add instrument window is resized
+
+		Parameters:
+			widget -- GTK callback parameter.
+			event -- GTK callback parameter.
+			
+		Returns:
+			False -- continue GTK signal propagation.
+		"""		
+
+		(self.width, self.height) = widget.get_size()
+
+		Globals.settings.general["addinstrumentwindowwidth"] = self.width
+		Globals.settings.general["addinstrumentwindowheight"] = self.height
+		Globals.settings.write()
+		
+		return False
+
+
+	def OnDestroy(self, widget=None, event=None):
+		"""
+		Called when the add instrument window is called
+
+		Parameters: 
+			widget -- reserved for GTK callbacks, don't use it explicitly.
+			event -- reserved for GTK callbacks, don't use it explicitly.
+		
+		Returns:
+			True -- the current project can't be properly closed.
+					This stops signal propagation.
+		"""
+		
+		
+		
+		return True
+
+
+
 #=========================================================================
 
=== modified file 'Jokosher/Globals.py'
--- Jokosher/Globals.py	2009-03-19 23:39:14 +0000
+++ Jokosher/Globals.py	2009-04-03 13:31:25 +0000
@@ -37,6 +37,8 @@
 				"projectfolder" : "",
 				"windowheight" : 550,
 				"windowwidth" : 900,
+				"addinstrumentwindowheight" : 350,
+				"addinstrumentwindowwidth" : 300,
 				}
 
 	recording = {
 
=== modified file 'Jokosher/Jokosher.glade'
--- Jokosher/Jokosher.glade	2009-03-17 02:09:31 +0000
+++ Jokosher/Jokosher.glade	2009-04-03 13:31:25 +0000
@@ -1329,6 +1329,8 @@
   <property name="gravity">GDK_GRAVITY_CENTER</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
+  <signal name="configure_event" handler="on_AddInstrument_configure_event" />
+
 
   <child>
     <widget class="GtkVBox" id="vbox2">