From c656c6248e5daad410a52eeb2d43f55564f5c345 Mon Sep 17 00:00:00 2001
From: Chris Kiehl <audionautic@gmail.com>
Date: Mon, 3 Feb 2014 23:01:01 -0500
Subject: [PATCH] Updated advanced_config

---
 src/app/dialogs/advanced_config.py  |   2 +-
 src/app/dialogs/advanced_config.pyc | Bin 5233 -> 5222 bytes
 src/app/dialogs/base_window.py      |  13 +++++++++----
 src/app/dialogs/controller.py       |   5 +++++
 src/app/images/image_store.pyc      | Bin 1295 -> 1295 bytes
 src/languages/eng.py                |   1 -
 src/model/gooey.py                  |  23 +++++++++++++++--------
 7 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/app/dialogs/advanced_config.py b/src/app/dialogs/advanced_config.py
index 7b696cb..ae41dcb 100644
--- a/src/app/dialogs/advanced_config.py
+++ b/src/app/dialogs/advanced_config.py
@@ -19,7 +19,7 @@ class AdvancedConfigPanel(ScrolledPanel, OptionReader):
 	'''
 	Abstract class for the Footer panels. 
 	'''
-	def __init__(self, parent, params, model=None, **kwargs):
+	def __init__(self, parent, model=None, **kwargs):
 		ScrolledPanel.__init__(self, parent, **kwargs)
 		self.SetupScrolling()
 		
diff --git a/src/app/dialogs/advanced_config.pyc b/src/app/dialogs/advanced_config.pyc
index 8f34ad6c7d5fc1fd4360bd2d1b136517180ddf28..be400fd2e73e7dee60c5e7e78e724e515d8d4b60 100644
GIT binary patch
delta 325
zcmeyU@l1oA`7<w9vBvw2?B+}k%nS?+EKuwXq>J-`L<s{!79&Fq149jvWM=4PVqgSv
zvX~f}8GtM%kW4%?LkSB*4b$d2CSFEHmdQQL5}VgEJF)PIgY<(;bxcVKlAQdX-Iq~n
zvoD7$6Qj}O$y~LJ5|ahFw@Rr36$A-@2sscT4<Zymgv#Ux+_H?)lmBsdFse^(=V@k>
z0SU`a7U0#AQU@|MSV4SY5Wxi^pwc0{*^FA75AZ57GOA5}#5af0ak3(7?B+ZCE18TX
zfa*#>+T0Rzic^CWLE1n@1!;i@H4q^LA_74~IFQg_0BN2qDs09WHQ7hFmkq3ib@Do)
Jw8^d_Ism+8Jo5km

delta 367
zcmaE+@lk`F`7<w<?8$c<+0B_8SQr=>Sb-QsdjoNCK9DG3V8~)*s9|8J0g@~Xy-W;@
zKu#7DLo)-A#SD^(XJ#m2VW?r=T*t)A$jCamhgpJ)4XCvsu_!UOc=KXrXBIvQkWtJ)
z!Z9T!NNVyIc3(#6%}yMyOpL~pJGg2YB`33SZ?#YZDhLt)5%M5H0YoT*2vs1V!46^x
z1BnulD~mI$Qj3DPKw>hJKXZ35YD})-X=alJ3CK-m<<*kX05UZ|O2L{SN}<x8yxEM}
zo44{RGBT=9zRov?#R;fvvLa8^=8OC*nam`CJg_Bhi8;loK}sMqK&Az0g9vpHAp|0V
hKtu$P07-)NPv#OfV~n2cDBQ~p)&;gca`H{#UH}&?LA?L~

diff --git a/src/app/dialogs/base_window.py b/src/app/dialogs/base_window.py
index 6e58ced..cd11477 100644
--- a/src/app/dialogs/base_window.py
+++ b/src/app/dialogs/base_window.py
@@ -28,8 +28,7 @@ class BaseWindow(wx.Frame):
 				self, 
 				parent=None, 
 				id=-1, 
-				title=os.path.basename(__file__),
-				size=(610,530)
+				
 		)
 		
 		self._params = params
@@ -47,6 +46,12 @@ class BaseWindow(wx.Frame):
 		self.registerControllers()
 		
 	def _init_properties(self):
+		if not self._params['program_name']:
+			title=os.path.basename(sys.argv[0].replace('.py', ''))
+		else:
+			title = self._params['program_name']
+		self.SetTitle(title)
+		self.SetSize((610,530))
 		self.SetMinSize((400,300))
 		self.icon = wx.Icon(image_store.icon, wx.BITMAP_TYPE_ICO)
 		self.SetIcon(self.icon)
@@ -103,8 +108,8 @@ class BaseWindow(wx.Frame):
 	def AttachPayload(self, payload):
 		self._payload = payload
 			
-# 	def OnXClose(self, event):
-# 		print 'adsfasdfadsf'
+	def ManualStart(self):
+		self._controller.ManualStart()
 			
 
 if __name__ == '__main__':
diff --git a/src/app/dialogs/controller.py b/src/app/dialogs/controller.py
index 8c3de53..887c70b 100644
--- a/src/app/dialogs/controller.py
+++ b/src/app/dialogs/controller.py
@@ -61,6 +61,11 @@ class Controller(object):
 		self._model.AddToArgv(cmd_line_args)
 		self._base.NextPage()
 		self._payload_runner()
+		
+	def ManualStart(self):
+		self._base.NextPage()
+		wx.CallAfter(wx.ActivateEvent)
+		self._payload_runner()
 
 	def OnCloseButton(self, event):
 		self._base.Destroy()
diff --git a/src/app/images/image_store.pyc b/src/app/images/image_store.pyc
index 6de841f4d42f8356b3d2c9a627368f7e68c3527a..0d562f812eb6eb0e76e9fee90487b6a2c059f501 100644
GIT binary patch
delta 16
XcmeC@>gQr-{>;neZTNm8I|nNOCvF6H

delta 16
XcmeC@>gQr-{>;m@=={5l>>R8BEq(=S

diff --git a/src/languages/eng.py b/src/languages/eng.py
index c071f4e..ac37a50 100644
--- a/src/languages/eng.py
+++ b/src/languages/eng.py
@@ -33,7 +33,6 @@ if __name__ == '__main__':
 						'optional_args_msg':'Optional Arguments',
 						
 						# popup dialogs
-						
 						"sure_you_want_to_exit":"Are you sure you want to exit?",
 						'close_program': 'Close Program?',
 						'status':'Status',
diff --git a/src/model/gooey.py b/src/model/gooey.py
index f7dd9ff..f03b2fe 100644
--- a/src/model/gooey.py
+++ b/src/model/gooey.py
@@ -18,7 +18,9 @@ from model.i18n import I18N
 from functools import partial
 
 
-def Gooey(f=None, advanced=False, language='english', noconfig=False):
+def Gooey(f=None, advanced=True, 
+				language='english', noconfig=True,
+				program_name=None):
 	'''
 	Decorator for client code's main function. 
 	Entry point for the GUI generator.  
@@ -26,16 +28,18 @@ def Gooey(f=None, advanced=False, language='english', noconfig=False):
 	Scans the client code for argparse data. 
 	If found, extracts it and build the proper 
 	configuration page (basic or advanced). 
+	'''
 	
-	Launched 
+	params= locals()
 	
-	'''
-	params = locals()
-	for k,v in params.iteritems(): 
-		print k, v
 	def build(f):
 		def inner():
 			module_path = get_caller_path()
+			
+			# User doesn't want to display configuration screen 
+			# Just straight to the run panel
+				
+			
 			try:
 				parser = source_parser.extract_parser(module_path)
 			except source_parser.ParserError:
@@ -50,7 +54,11 @@ def Gooey(f=None, advanced=False, language='english', noconfig=False):
 			
 			app = wx.App(False)  
 			frame = BaseWindow(BodyPanel, model, f, params)
-			frame.Show(True)     # Show the frame.
+			if noconfig:
+				# gah, ugly.. not sure how else to go 
+				# about it without rewriting a *bunch* of other stuff
+				frame.ManualStart()
+			frame.Show(True) 
 			app.MainLoop() 
 
 		inner.__name__ = f.__name__ 
@@ -62,7 +70,6 @@ def Gooey(f=None, advanced=False, language='english', noconfig=False):
 
 def get_program_name(path):
 	return '{}'.format(os.path.split(path)[-1])
-	
 
 def get_caller_path():
 	# utility func for decorator