Plane updates

src/app/dialogs/advanced_config.py

@@ -25,11 +25,16 @@ class AdvancedConfigPanel(ScrolledPanel, OptionReader):
 		
 		self.components = ComponentFactory(parser)
 		
-		self._msg_req_args = self.BuildHeaderMsg("Required Arguments")
-		self._msg_opt_args = self.BuildHeaderMsg("Optional Arguments")
+		self._controller = None
 		
+		self._init_components()
 		self._do_layout()
 		self.Bind(wx.EVT_SIZE, self.OnResize)
+
+		
+	def _init_components(self):
+		self._msg_req_args = self.BuildHeaderMsg("Required Arguments")
+		self._msg_opt_args = self.BuildHeaderMsg("Optional Arguments")
 		
 	def _do_layout(self):
 		STD_LAYOUT = (0, wx.LEFT | wx.RIGHT | wx.EXPAND, PADDING)
@@ -88,12 +93,20 @@ class AdvancedConfigPanel(ScrolledPanel, OptionReader):
 		for component in self.components:
 			component.Update(evt.m_size)
 		evt.Skip()
+	
+	def RegisterController(self, controller):
+		if self._controller is None:
+			self._controller = controller
 			
 	def GetOptions(self):
 		''' 
 		returns the collective values from all of the
 		widgets contained in the panel'''
-		raise NotImplementedError 
+		values = [(c._action, c.GetValue())
+							for c in self.components]
+		for i in values:
+			print (i[0].option_strings[-1], i[-1])
+		
 		
 		
 			

src/app/dialogs/base_window.py

@@ -1,6 +1,12 @@
 '''
 Created on Jan 19, 2014
 
+New plan: 
+
+	fuck the multi-component thing. 
+	
+	Bind and unbind the buttons on the panels. 
+
 @author: Chris
 '''
 
@@ -8,7 +14,7 @@ import os
 import wx
 import header
 import footer
-from model.controller import Controller
+from app.dialogs.controller import Controller
 from app.images import image_store
 
 class BaseWindow(wx.Frame):
@@ -23,11 +29,13 @@ class BaseWindow(wx.Frame):
 		)
 		
 		self._parser = parser
-		self._controller = Controller()
+		self._controller = None
 		
 		self._init_properties()
 		self._init_components(BodyPanel)
 		self._do_layout()
+		self._init_controller()
+		self.registerControllers()
 		
 	def _init_properties(self):
 		self.SetMinSize((400,300))
@@ -44,6 +52,8 @@ class BaseWindow(wx.Frame):
 																	size=(30,90))
 		self.body_panel = BodyPanel(self, self._parser)
 		self.cfg_foot_panel = footer.ConfigFooter(self, self._controller)
+		
+		self.panels = [self.head_panel, self.body_panel, self.cfg_foot_panel]
 # 		self.main_foot_panel = footer.MainFooter(self, self._controller)
 # 		self.main_foot_panel.Hide()
 		
@@ -56,18 +66,22 @@ class BaseWindow(wx.Frame):
 		sizer.Add(self.cfg_foot_panel, 0, wx.EXPAND)
 		self.SetSizer(sizer)
 		
-# 	def _init_panels(self):
-# 		self._frame_header = FrameHeader
-# 		self._basic_config_body = None
-# 		self._adv_config_body = None	
-# 		self._config_footer = None 
-# 		self._output_footer = None
-		
 	def _draw_horizontal_line(self, sizer):
 		line = wx.StaticLine(self, -1, style=wx.LI_HORIZONTAL)
 		line.SetSize((10, 10))
 		sizer.Add(line, 0, wx.EXPAND)
+	
+	def _init_controller(self):
+		self._controller = Controller(
+															base			 = self,
+															head_panel = self.head_panel, 
+															body_panel = self.body_panel, 
+															footer_panel = self.cfg_foot_panel)	
 		
+	def registerControllers(self):
+		for panel in self.panels:
+			panel.RegisterController(self._controller)
+			
 
 
 

src/app/dialogs/component_register.py

@@ -0,0 +1,14 @@
+'''
+Created on Jan 20, 2014
+
+@author: Chris
+'''
+
+class ComponentRegister(object):
+
+	def __init__(self, params):
+		pass 
+	
+	def Registercontroller(self, controller):
+		if self._controller in None: 
+			self._controller = controller

src/app/dialogs/controller.py

@@ -0,0 +1,41 @@
+'''
+Created on Dec 22, 2013
+
+@author: Chris
+'''
+
+class Controller(object):
+	'''
+	Main controller for the gui. 
+	
+	All controlls are delegated to this central control point. 
+	It's kind of a bi-directional observer sort of thing, thus 
+	weirdly initialized with references to the BaseWindows panels, 
+	and then 'registered' with the panels . 
+	
+	
+	
+	Args: 
+		base			 = Reference to the Basewindow
+		head_panel = reference to the BaseWindow's Head Panel 	  
+		body_panel = reference to the BaseWindow's Body Panel 	  
+		footer_panel = reference to the BaseWindow's Footer Panel 	  
+	'''
+	
+	def __init__(self, base, head_panel, body_panel, footer_panel):
+		self._base = base
+		self._head = head_panel
+		self._body = body_panel 
+		self._foot = footer_panel
+	
+	def OnConfigCancel(self, event):
+		print 'OnCongigCancel pressed!'
+	def OnConfigNext(self, event):
+		self._body.GetOptions()
+	def OnMainCancel(self, event):
+		print 'OnMaingCancel pressed!'
+	def OnMainNext(self, event):
+		print 'OnCongigNext pressed!'
+	
+		
+		

src/app/dialogs/display_main.py

@@ -8,7 +8,7 @@ import wx
 import os
 import sys
 import threading
-from model.controller import Controller 
+from app.dialogs.controller import Controller 
 from app.images import image_store
 from app.dialogs.header import FrameHeader
 from app.dialogs.basic_config_panel import BasicDisplayPanel

src/app/dialogs/footer.py

@@ -14,6 +14,8 @@ class AbstractFooter(wx.Panel):
 		wx.Panel.__init__(self, parent, **kwargs)
 		self.SetMinSize((30, 53))
 		
+		self._controller = None
+		
 		self.cancel_button = self._button('Cancel', wx.ID_CANCEL)
 		self.next_button = self._button("Next", wx.ID_OK)
 		
@@ -40,6 +42,10 @@ class AbstractFooter(wx.Panel):
 				label=label,
 				style=style)
 
+	def RegisterController(self, controller):
+		if self._controller is None: 
+			self._controller = controller
+
 
 class ConfigFooter(AbstractFooter):
 	'''
@@ -54,8 +60,6 @@ class ConfigFooter(AbstractFooter):
 	def __init__(self, parent, controller, **kwargs):
 		AbstractFooter.__init__(self, parent, **kwargs)
 		
-		self._controller = controller
-		 
 		self.Bind(wx.EVT_BUTTON, self.OnConfigCancel, self.cancel_button)
 		self.Bind(wx.EVT_BUTTON, self.OnConfigNext, self.next_button)
 		
@@ -78,8 +82,6 @@ class MainFooter(AbstractFooter):
 	def __init__(self, parent, controller, **kwargs):
 		AbstractFooter.__init__(self, parent, **kwargs)
 		
-		self._controller = controller
-
 		self.Bind(wx.EVT_BUTTON, self.OnConfigCancel, self.cancel_button)
 		self.Bind(wx.EVT_BUTTON, self.OnConfigNext, self.next_button)
 	

src/app/dialogs/header.py

@@ -21,6 +21,8 @@ class FrameHeader(wx.Panel):
 
 		wx.Panel.__init__(self, **kwargs)
 		
+		self._controller = None
+		
 		self._init_properties()
 		self._init_components(heading, subheading, image_path)
 		self._do_layout()
@@ -33,10 +35,7 @@ class FrameHeader(wx.Panel):
 	def _init_components(self, heading, subheading, image_path):
 		self.header = self._bold_static_text(heading)
 		self.subheader = wx.StaticText(self, label=subheading)
-		self.img = wx.BitmapFromImage(imageutil.LoadAndResizeImage(image_path))
-		print '\n'
-		print 'Image returned from original method:', type(self._load_image(image_path))
-		print 'image returned from imageutil', type(self.img)
+		self.img = self._load_image(image_path)
 		
 	def _do_layout(self):
 		vsizer = wx.BoxSizer(wx.VERTICAL)
@@ -87,10 +86,12 @@ class FrameHeader(wx.Panel):
 				)
 		return wx.BitmapFromImage(image)
 
-	
 	def UpdateImage(self, image):
 		pass
-	
+
+	def RegisterController(self, controller):
+		if self._controller is None: 
+			self._controller = controller
 	
 	
 	

src/app/images/image_store.py

@@ -7,10 +7,10 @@ Convenience module for keeping the filepaths in one place.
 
 """
 
-computer = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\computer.png"
-computer2 = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\computer2.png"
-computer3 = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\computer3.png"
-icon = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\icon.ico"
-settings = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\settings.png"
-settings2 = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\settings2.png"
-terminal = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\terminal.png"
+computer = r"C:\Users\Chris\Documents\Gooey\src\app\images\computer.png"
+computer2 = r"C:\Users\Chris\Documents\Gooey\src\app\images\computer2.png"
+computer3 = r"C:\Users\Chris\Documents\Gooey\src\app\images\computer3.png"
+icon = r"C:\Users\Chris\Documents\Gooey\src\app\images\icon.ico"
+settings = r"C:\Users\Chris\Documents\Gooey\src\app\images\settings.png"
+settings2 = r"C:\Users\Chris\Documents\Gooey\src\app\images\settings2.png"
+terminal = r"C:\Users\Chris\Documents\Gooey\src\app\images\terminal.png"

src/model/controller.py

@@ -1,17 +0,0 @@
-'''
-Created on Dec 22, 2013
-
-@author: Chris
-'''
-
-class Controller(object):
-	'''
-	Main controller for the gui. 
-	
-	Serves as a delagation for all of the various buttons/panels/events. 
-	'''
-	
-	def __init__(self):
-		pass
-		
-