[Pythoncard-cvs] PythonCard/samples/jabberChat conferenceDialog.py,1.4,1.5 jabberChat.py,1.31,1.32

[Kevin A. <ka...@us...>]

Update of /cvsroot/pythoncard/PythonCard/samples/jabberChat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16511/jabberChat

Modified Files:
	conferenceDialog.py jabberChat.py 
Log Message:
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: jabberChat.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/samples/jabberChat/jabberChat.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** jabberChat.py	10 May 2004 00:45:19 -0000	1.31
--- jabberChat.py	12 Aug 2004 19:18:53 -0000	1.32
***************
*** 68,73 ****
      def on_doSetFont_command(self, event):
          result = dialog.fontDialog(self, self.components.fldDocument.font)
!         if result['accepted']:
!             self.config['font'] = result['font']
              self.setChatWindowFont()
  
--- 68,73 ----
      def on_doSetFont_command(self, event):
          result = dialog.fontDialog(self, self.components.fldDocument.font)
!         if result.accepted:
!             self.config['font'] = result.font
              self.setChatWindowFont()
  
***************
*** 322,329 ****
          nickname = self.jabberConnection.username
          result = conferenceDialog.conferenceDialog(self, '', server, nickname)
!         if result['accepted']:
!             room = result['room']
!             server = result['server']
!             nickname = result['nickname']
              jid = room + '@' + server
              self.createGroupChatWindow(jid, nickname)
--- 322,329 ----
          nickname = self.jabberConnection.username
          result = conferenceDialog.conferenceDialog(self, '', server, nickname)
!         if result.accepted:
!             room = result.room
!             server = result.server
!             nickname = result.nickname
              jid = room + '@' + server
              self.createGroupChatWindow(jid, nickname)

Index: conferenceDialog.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/samples/jabberChat/conferenceDialog.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** conferenceDialog.py	22 Apr 2004 16:42:42 -0000	1.4
--- conferenceDialog.py	12 Aug 2004 19:18:53 -0000	1.5
***************
*** 20,28 ****
  def conferenceDialog(parent, room='', server=None, nickname=''):
      dlg = ConferenceDialog(parent, room, server, nickname)
!     dlg.showModal()
!     result = {'accepted':dlg.accepted()}
!     result['room'] = dlg.components.fldRoomName.text
!     result['server'] = dlg.components.cmbRoomServer.stringSelection
!     result['nickname'] = dlg.components.fldNickname.text
      dlg.destroy()
      return result
--- 20,27 ----
  def conferenceDialog(parent, room='', server=None, nickname=''):
      dlg = ConferenceDialog(parent, room, server, nickname)
!     result = dlg.showModal()
!     result.room = dlg.components.fldRoomName.text
!     result.server = dlg.components.cmbRoomServer.stringSelection
!     result.nickname = dlg.components.fldNickname.text
      dlg.destroy()
      return result