[Pythoncard-cvs] PythonCard/templates/dialogs runOptionsDialog.py,NONE,1.1 runOptionsDialog.rsrc.py,

Update of /cvsroot/pythoncard/PythonCard/templates/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15583/dialogs

Modified Files:
	findDialog.py loginDialog.py 
Added Files:
	runOptionsDialog.py runOptionsDialog.rsrc.py 
Log Message:
runOptionsDialog moved to templates.dialogs.runOptionsDialog.py
dialog.py is now a thin wrapper around wx.lib.dialogs.py
  all dialog results now use DialogResults class instead of dictionary
  e.g. result.accepted instead of result['accepted']
  see dialogs sample and other samples and tools for examples of change


Index: loginDialog.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/templates/dialogs/loginDialog.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** loginDialog.py	27 Apr 2004 23:07:56 -0000	1.1
--- loginDialog.py	12 Aug 2004 19:12:39 -0000	1.2
***************
*** 19,28 ****
  def loginDialog(parent, host="127.0.0.1", port=80, username="guest", password="guest"):
      dlg = LoginDialog(parent, host, port, username, password)
!     dlg.showModal()
!     result = {'accepted':dlg.accepted()}
!     result['host'] = dlg.components.fldHost.text
!     result['port'] = int(dlg.components.fldPort.text)
!     result['username'] = dlg.components.fldUsername.text
!     result['password'] = dlg.components.fldPassword.text
      dlg.destroy()
      return result
--- 19,27 ----
  def loginDialog(parent, host="127.0.0.1", port=80, username="guest", password="guest"):
      dlg = LoginDialog(parent, host, port, username, password)
!     result = dlg.showModal()
!     result.host = dlg.components.fldHost.text
!     result.port = int(dlg.components.fldPort.text)
!     result.username = dlg.components.fldUsername.text
!     result.password = dlg.components.fldPassword.text
      dlg.destroy()
      return result

--- NEW FILE: runOptionsDialog.py ---

"""
__version__ = "$Revision: 1.1 $"
__date__ = "$Date: 2004/08/12 19:12:39 $"
"""

from PythonCard import model
import os
import wx

class RunOptionsDialog(model.CustomDialog):
    def __init__(self, aBg, cmdLineArgs):
        model.CustomDialog.__init__(self, aBg)
        
        self.parent = aBg
        
        self.components.chkDebugMenu.checked = cmdLineArgs['debugmenu']
        self.components.chkLogging.checked = cmdLineArgs['logging']
        self.components.chkMessageWatcher.checked = cmdLineArgs['messagewatcher']
        self.components.chkNamespaceViewer.checked = cmdLineArgs['namespaceviewer']
        self.components.chkPropertyEditor.checked = cmdLineArgs['propertyeditor']
        self.components.chkShell.checked = cmdLineArgs['shell']
        self.components.fldOtherArgs.text = cmdLineArgs['otherargs']

        self.initSizers()

    def initSizers(self):
        sizer1 = wx.BoxSizer(wx.VERTICAL)
        sizer2 = wx.BoxSizer(wx.VERTICAL)
        sizer3 = wx.BoxSizer(wx.HORIZONTAL)
        sizer4 = wx.BoxSizer(wx.HORIZONTAL)
        comp = self.components
        
        btnFlags = wx.LEFT | wx.ALIGN_BOTTOM
        vertFlags = wx.LEFT | wx.TOP | wx.ALIGN_LEFT
        fldFlags = wx.LEFT | wx.TOP | wx.ALIGN_CENTER

        sizer4.Add(comp.stcOtherArgs, 0, fldFlags, 5)
        sizer4.Add(comp.fldOtherArgs, 1, fldFlags, 5)

        sizer3.Add(comp.btnOK, 0, btnFlags, 5)
        sizer3.Add(comp.btnCancel, 0, btnFlags, 5)

        sizer2.Add(comp.stcCmdLineArgs, 0, wx.LEFT | wx.BOTTOM | wx.ALIGN_TOP, 5)
        sizer2.Add(comp.chkDebugMenu, 0, vertFlags, 5)
        sizer2.Add(comp.chkLogging, 0, vertFlags, 5)
        sizer2.Add(comp.chkMessageWatcher, 0, vertFlags, 5)
        sizer2.Add(comp.chkNamespaceViewer, 0, vertFlags, 5)
        sizer2.Add(comp.chkPropertyEditor, 0, vertFlags, 5)
        sizer2.Add(comp.chkShell, 0, vertFlags, 5)
        sizer2.Add(sizer4, 0, vertFlags)
        sizer2.Add((5, 5), 1)  # spacer
        sizer2.Add(sizer3, 1, wx.ALIGN_BOTTOM)

        sizer1.Add(sizer2, 0, vertFlags)
        
        sizer1.Fit(self)
        sizer1.SetSizeHints(self)
        self.panel.SetSizer(sizer1)
        self.panel.SetAutoLayout(1)
        self.panel.Layout()

def runOptionsDialog(parent, cmdLineArgs):
    dlg = RunOptionsDialog(parent, cmdLineArgs)
    result = dlg.showModal()
    if result.accepted:
        result.debugmenu = dlg.components.chkDebugMenu.checked
        result.logging = dlg.components.chkLogging.checked
        result.messagewatcher= dlg.components.chkMessageWatcher.checked
        result.namespaceviewer = dlg.components.chkNamespaceViewer.checked
        result.propertyeditor = dlg.components.chkPropertyEditor.checked
        result.shell = dlg.components.chkShell.checked
        result.otherargs = dlg.components.fldOtherArgs.text
    dlg.destroy()
    return result

--- NEW FILE: runOptionsDialog.rsrc.py ---
{'type':'CustomDialog',
          'name':'runOptions',
          'title':'Run Options',
          'size':(200, 220),
         'components': [

{'type':'StaticText', 
    'name':'stcCmdLineArgs', 
    'position':(10, 5), 
    'text':'Command line options:', 
    },

{'type':'CheckBox', 
    'name':'chkDebugMenu', 
    'position':(10, 25), 
    'label':'Debug Menu (-d)', 
    },

{'type':'CheckBox', 
    'name':'chkLogging', 
    'position':(10, 25), 
    'label':'Logging (-l)', 
    },

{'type':'CheckBox', 
    'name':'chkMessageWatcher', 
    'position':(10, 50), 
    'label':'Message Watcher (-m)', 
    },

{'type':'CheckBox', 
    'name':'chkNamespaceViewer', 
    'position':(10, 75), 
    'label':'Namespace Viewer (-n)', 
    },

{'type':'CheckBox', 
    'name':'chkPropertyEditor', 
    'position':(10, 100), 
    'label':'Property Editor (-p)', 
    },

{'type':'CheckBox', 
    'name':'chkShell', 
    'position':(10, 120), 
    'label':'Shell (-s)', 
    },

{'type':'StaticText', 
    'name':'stcOtherArgs', 
    'text':'Other args:', 
    },

{'type':'TextField', 
    'name':'fldOtherArgs', 
    'size':(200, -1),
    'text':'', 
    },

{'type':'Button', 
    'name':'btnOK', 
    'position':(8, 152), 
    'default':1,
    'id':5100,
    'label':'OK', 
    },

{'type':'Button', 
    'name':'btnCancel', 
    'position':(105, 152), 
    'id':5101,
    'label':'Cancel', 
    },

] # end components
}

Index: findDialog.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/templates/dialogs/findDialog.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** findDialog.py	22 Apr 2004 15:34:08 -0000	1.1
--- findDialog.py	12 Aug 2004 19:12:39 -0000	1.2
***************
*** 35,48 ****
      dlg = FindDialog(parent, searchText, wholeWordsOnly, caseSensitive, 
                          searchField, searchableFields)
!     dlg.showModal()
!     result = {'accepted':dlg.accepted()}
!     result['searchText'] = dlg.components.fldFind.text
!     result['wholeWordsOnly'] = dlg.components.chkMatchWholeWordOnly.checked
!     result['caseSensitive'] = dlg.components.chkMatchCase.checked
      sel = dlg.components.popSearchField.stringSelection
      if searchableFields is None or sel == 'All':
!         result['searchField'] = None
      else:
!         result['searchField'] = sel
      dlg.destroy()
      return result
--- 35,47 ----
      dlg = FindDialog(parent, searchText, wholeWordsOnly, caseSensitive, 
                          searchField, searchableFields)
!     result = dlg.showModal()
!     result.searchText= dlg.components.fldFind.text
!     result.wholeWordsOnly = dlg.components.chkMatchWholeWordOnly.checked
!     result.caseSensitive = dlg.components.chkMatchCase.checked
      sel = dlg.components.popSearchField.stringSelection
      if searchableFields is None or sel == 'All':
!         result.searchField = None
      else:
!         result.searchField = sel
      dlg.destroy()
      return result