gnue designer/src/Designer.py designer/src/form...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/02/18 00:24:09

Modified files:
        designer/src   : Designer.py 
        designer/src/forms: Instance.py 
        designer/src/forms/LayoutEditor: LayoutEditor.py 
        forms/src/uidrivers/_base: UIdriver.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        brought Designer up to par with the new UIdriver formats

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Designer.py.diff?cvsroot=OldCVS&tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/forms/Instance.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.147&tr2=1.148&r1=text&r2=text

Patches:
Index: gnue/designer/src/Designer.py
diff -c gnue/designer/src/Designer.py:1.35 gnue/designer/src/Designer.py:1.36
*** gnue/designer/src/Designer.py:1.35  Mon Feb 11 22:59:20 2002
--- gnue/designer/src/Designer.py       Mon Feb 18 00:24:08 2002
***************
*** 66,73 ****
  from gnue.common.GClientApp import GClientApp
  
  # TODO: Must go!!
! from gnue.forms import UIwxpython, GFForm
  from gnue.designer import forms
  
  
  class Designer(GClientApp, wxApp):
--- 66,75 ----
  from gnue.common.GClientApp import GClientApp
  
  # TODO: Must go!!
! from gnue.forms import GFForm
! 
  from gnue.designer import forms
+ from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
  
  
  class Designer(GClientApp, wxApp):
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.5 
gnue/designer/src/forms/Instance.py:1.6
*** gnue/designer/src/forms/Instance.py:1.5     Mon Jan 28 19:27:16 2002
--- gnue/designer/src/forms/Instance.py Mon Feb 18 00:24:08 2002
***************
*** 42,48 ****
  from gnue.designer.PopupMenu import ObjectMenu
  
  from gnue.forms import GFInstance
! from gnue.forms import GFForm, GFParser, GFObjects, GFTrigger, GFLibrary, 
UIwxpython
  
  
  class Instance(BaseInstance, GFInstance.GFInstance):
--- 42,48 ----
  from gnue.designer.PopupMenu import ObjectMenu
  
  from gnue.forms import GFInstance
! from gnue.forms import GFForm, GFParser, GFObjects, GFTrigger, GFLibrary
  
  
  class Instance(BaseInstance, GFInstance.GFInstance):
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.13 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.14
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.13   Wed Jan 30 
12:29:46 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Mon Feb 18 
00:24:09 2002
***************
*** 29,35 ****
  import sys, os
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
! from gnue.forms import UIwxpython, GFObjects
  from gnue.designer.PopupMenu import PageMenu
  from gnue.designer import Incubator
  
--- 29,36 ----
  import sys, os
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
! from gnue.forms import GFObjects
! from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
  from gnue.designer.PopupMenu import PageMenu
  from gnue.designer import Incubator
  
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.59 
gnue/forms/src/uidrivers/_base/UIdriver.py:1.60
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.59     Sun Feb 17 17:25:31 2002
--- gnue/forms/src/uidrivers/_base/UIdriver.py  Mon Feb 18 00:24:09 2002
***************
*** 28,35 ****
  # NOTES:
  #
  
! from GFForm import *
! from GFEvent import *
  from gnue.common.GObjects import *
  
  # Used in updating the status bar
--- 28,35 ----
  # NOTES:
  #
  
! from gnue.forms.GFForm import *
! from gnue.forms.GFEvent import *
  from gnue.common.GObjects import *
  
  # Used in updating the status bar
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.147 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.148
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.147       Mon Feb 18 00:11:38 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Feb 18 00:24:09 2002
***************
*** 31,42 ****
  from wxPython.wx import *
  from wxPython.lib.splashscreen import SplashScreen
  
! from GFForm import *
! from GFEvent import *
  from gnue.forms.uidrivers._base.UIdriver import *
  from gnue.forms.uidrivers._base.UIWidget import *
  
- import GFKeyMapper
  
  import os
  import sys
--- 31,42 ----
  from wxPython.wx import *
  from wxPython.lib.splashscreen import SplashScreen
  
! from gnue.forms.GFForm import *
! from gnue.forms.GFEvent import *
! from gnue.forms import GFKeyMapper
  from gnue.forms.uidrivers._base.UIdriver import *
  from gnue.forms.uidrivers._base.UIWidget import *
  
  
  import os
  import sys
***************
*** 54,59 ****
--- 54,60 ----
  _IdToGFObj = {}
  _IdToUIObj = {}
  
+ 
  # hack for wxPython 2.2 (2.3+ doesn't need this)
  def _eventObjTowxWindow(event):
    eo = event.GetEventObject()
***************
*** 103,117 ****
  #
  class GFUserInterface(GFUserInterfaceBase):
    def __init__(self, eventController, disableSplash = None):
!     self._WIDGETS = {'GFLabel'     : UILabel,
!                      'GFBox'       : UIBox,
!                      'GFPage'      : UIPage,
!                      'GFForm'      : UIForm,
!                      'GFEntry'     : UIEntry,
!                      'GFButton'    : UIButton,
!                      'GFScrollBar' : UIScrollBar,
!                      }
!     
      self._DIALOGS = {'about'       :UIAbout,
                       'messageBox'  :UIMessageBox,
                       }
--- 104,112 ----
  #
  class GFUserInterface(GFUserInterfaceBase):
    def __init__(self, eventController, disableSplash = None):
! 
!     self._WIDGETS = WIDGETS
! 
      self._DIALOGS = {'about'       :UIAbout,
                       'messageBox'  :UIMessageBox,
                       }
***************
*** 862,868 ****
  ## Keymapper Support
  ##
  #####################################################################
! from GFKeyMapper import vk
  
  # Translate from wx keystrokes to our virtual keystrokes
  wxKeyTranslations = {
--- 857,863 ----
  ## Keymapper Support
  ##
  #####################################################################
! from gnue.forms.GFKeyMapper import vk
  
  # Translate from wx keystrokes to our virtual keystrokes
  wxKeyTranslations = {
***************
*** 1153,1158 ****
--- 1148,1162 ----
  
  
  
+ # Needed by Designer
+ WIDGETS = {'GFLabel'     : UILabel,
+            'GFBox'       : UIBox,
+            'GFPage'      : UIPage,
+            'GFForm'      : UIForm,
+            'GFEntry'     : UIEntry,
+            'GFButton'    : UIButton,
+            'GFScrollBar' : UIScrollBar,
+           }