gnue common/src/GConfig.py designer/src/DataSou...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/05/14 21:27:08

Modified files:
        common/src     : GConfig.py 
        designer/src   : DataSourceEditor.py Designer.py 
                         TemplateParser.py TriggerEditor.py 
        designer/src/forms/LayoutEditor: LayoutEditor.py 

Log message:
        Fixed config system to do the right thing with systems loading
        multiple configs (designer)
        Changes wizard size in designer to better fit contents

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GConfig.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/DataSourceEditor.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Designer.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/TemplateParser.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/TriggerEditor.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: gnue/common/src/GConfig.py
diff -c gnue/common/src/GConfig.py:1.22 gnue/common/src/GConfig.py:1.23
*** gnue/common/src/GConfig.py:1.22     Mon May  6 22:27:04 2002
--- gnue/common/src/GConfig.py  Tue May 14 21:27:08 2002
***************
*** 53,67 ****
      __builtin__.__dict__['gConfig'] = self.gConfig
      __builtin__.__dict__['gConfigDict'] =  self.gConfigDict
      
- 
    def loadApplicationConfig(self, configFilename="gnue.conf", 
homeConfigDir=".gnue", section="DEFAULT", defaults = None):
  
      GDebug.printMesg(1,'Reading configuration info from %s section %s' 
%(configFilename,section))
  
      defaultValues = self._buildDefaults(defaults)
!     parser = ConfigParser(defaultValues)
!     self._loadedConfigs[configFilename]=parser
  
      # Build valid file list
      fileLocations = []
      etc_base = getInstalledBase('%s_etc' % section, 'common_etc')
--- 53,82 ----
      __builtin__.__dict__['gConfig'] = self.gConfig
      __builtin__.__dict__['gConfigDict'] =  self.gConfigDict
      
    def loadApplicationConfig(self, configFilename="gnue.conf", 
homeConfigDir=".gnue", section="DEFAULT", defaults = None):
  
      GDebug.printMesg(1,'Reading configuration info from %s section %s' 
%(configFilename,section))
  
+     # Create parser if it doesn't exist
+     readFiles = 0
+     if not self._loadedConfigs.has_key(configFilename):
+       parser = ConfigParser()
+       self._loadedConfigs[configFilename]=parser
+       readFiles = 1
+ 
+     # Load any passed in defaults to the requested section
      defaultValues = self._buildDefaults(defaults)
!     try:
!       self._loadedConfigs[configFilename].add_section(section)
!     except DuplicateSectionError:
!       pass
!     for key in defaultValues.keys():
!       self._loadedConfigs[configFilename].set(section,key,defaultValues[key])
  
+     # Skip reading the files if the parser for that section already existed
+     if not readFiles:
+       return
+     
      # Build valid file list
      fileLocations = []
      etc_base = getInstalledBase('%s_etc' % section, 'common_etc')
***************
*** 94,112 ****
      if not configFilename: configFilename = self._defaultConfigFilename
      if not section: section = self._defaultSection
  
-     #try:
-     #  print self._loadedConfigs[configFilename].options('forms')
-     #except:
-     #  pass
- 
-     #try:
      try:
        return self._loadedConfigs[configFilename].get(section,varName)
      except NoSectionError:
        self._loadedConfigs[configFilename].add_section(section)
        return self._loadedConfigs[configFilename].get(section,varName)
-     #except NoOptionError:
-     #    return self._loadedConfigs[configFilename].get('DEFAULT',varName)
  
    def gConfigDict(self, configFilename=None, section=None):
      if not configFilename: configFilename = self._defaultConfigFilename
--- 109,119 ----
Index: gnue/designer/src/DataSourceEditor.py
diff -c gnue/designer/src/DataSourceEditor.py:1.22 
gnue/designer/src/DataSourceEditor.py:1.23
*** gnue/designer/src/DataSourceEditor.py:1.22  Sat May  4 12:45:08 2002
--- gnue/designer/src/DataSourceEditor.py       Tue May 14 21:27:08 2002
***************
*** 542,548 ****
      conn = self.editor.current.database
  
      if not self.editor.connections.isConnectionActive(conn) and \
!        not int(gConfig("AutoConnect",section="reports")):
  
        # TODO: Some other form of feedback
        if not hasattr(self.editor,'_schemaMessageDisplayed'):
--- 542,548 ----
      conn = self.editor.current.database
  
      if not self.editor.connections.isConnectionActive(conn) and \
!        not int(gConfig("AutoConnect",section="designer")):
  
        # TODO: Some other form of feedback
        if not hasattr(self.editor,'_schemaMessageDisplayed'):
Index: gnue/designer/src/Designer.py
diff -c gnue/designer/src/Designer.py:1.38 gnue/designer/src/Designer.py:1.39
*** gnue/designer/src/Designer.py:1.38  Mon May  6 22:27:04 2002
--- gnue/designer/src/Designer.py       Tue May 14 21:27:08 2002
***************
*** 87,93 ****
      self.mru = MRUManager.MRUManager(self)
      self._instances = []
      GClientApp.__init__(self, application="forms",defaults=ConfigOptions)
!     
self.configurationManager.loadApplicationConfig(section="reports",defaults=DesignerConfigOptions)
      self.getConnectionManager().setLoginHandler(UIwxpython.UILoginHandler())
      self.loadToolInformation()
      wxApp.__init__(self,0)
--- 87,93 ----
      self.mru = MRUManager.MRUManager(self)
      self._instances = []
      GClientApp.__init__(self, application="forms",defaults=ConfigOptions)
!     
self.configurationManager.loadApplicationConfig(section="designer",defaults=DesignerConfigOptions)
      self.getConnectionManager().setLoginHandler(UIwxpython.UILoginHandler())
      self.loadToolInformation()
      wxApp.__init__(self,0)
Index: gnue/designer/src/TemplateParser.py
diff -c gnue/designer/src/TemplateParser.py:1.11 
gnue/designer/src/TemplateParser.py:1.12
*** gnue/designer/src/TemplateParser.py:1.11    Mon Apr  1 21:55:40 2002
--- gnue/designer/src/TemplateParser.py Tue May 14 21:27:08 2002
***************
*** 58,65 ****
      self.wizard = wxDialog(self.parent, -1, self.templateInformation['Name'],
         style=wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
  
!     self.panel = wxPanel(self.wizard, -1, wxPoint(0,0), wxSize(400,340))
!     self.wizard.SetClientSize(wxSize(400,340))
  
      self.wizardPage = WizardPage(self, self.panel)
  
--- 58,65 ----
      self.wizard = wxDialog(self.parent, -1, self.templateInformation['Name'],
         style=wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
  
!     self.panel = wxPanel(self.wizard, -1, wxPoint(0,0), wxSize(400,400))
!     self.wizard.SetClientSize(wxSize(400,400))
  
      self.wizardPage = WizardPage(self, self.panel)
  
***************
*** 79,86 ****
      self.cancelButton.SetPosition( (x, y) )
      self.nextButton.SetPosition( (x - dx, y) )
      self.prevButton.SetPosition( (x - dx*2, y) )
- 
- 
  
      EVT_BUTTON(self.wizard,self.prevButton.GetId(), 
self.wizardPage.OnPrevStep)
      EVT_BUTTON(self.wizard,self.nextButton.GetId(), 
self.wizardPage.OnNextStep)
--- 79,84 ----
Index: gnue/designer/src/TriggerEditor.py
diff -c gnue/designer/src/TriggerEditor.py:1.17 
gnue/designer/src/TriggerEditor.py:1.18
*** gnue/designer/src/TriggerEditor.py:1.17     Sat May  4 12:45:08 2002
--- gnue/designer/src/TriggerEditor.py  Tue May 14 21:27:08 2002
***************
*** 176,182 ****
  
  try:
  
!  if int(gConfig('ForceSimpleEditor',section="reports")):
     raise ImportError
     
   from wxPython.stc import *
--- 176,182 ----
  
  try:
  
!  if int(gConfig('ForceSimpleEditor',section="designer")):
     raise ImportError
     
   from wxPython.stc import *
***************
*** 231,237 ****
  
      # TODO: A lot of this should be configurable
  
!     if int(gConfig('ColorizeCode',section="reports")):
  
        # Global default styles for all languages
        self.StyleSetSpec(wxSTC_STYLE_DEFAULT,     
"face:%(helv)s,size:%(size)d" % faces)
--- 231,237 ----
  
      # TODO: A lot of this should be configurable
  
!     if int(gConfig('ColorizeCode',section="designer")):
  
        # Global default styles for all languages
        self.StyleSetSpec(wxSTC_STYLE_DEFAULT,     
"face:%(helv)s,size:%(size)d" % faces)
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.21 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.22
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.21   Sat May  4 
12:45:08 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Tue May 14 
21:27:08 2002
***************
*** 285,292 ****
        self.charWidth = maxWidth+maxLeading
        self.charHeight = maxHeight+maxDescent
  
!       self.borderPercentage = (int(gConfig('borderPercentage')) / 100.0)
!       self.textPercentage = (int(gConfig('textPercentage')) / 100.0)
  
        width = self.rootObject.width
        height = self.rootObject.height
--- 285,292 ----
        self.charWidth = maxWidth+maxLeading
        self.charHeight = maxHeight+maxDescent
  
!       self.borderPercentage = (float(gConfig('borderPercentage')) / 100)
!       self.textPercentage = (float(gConfig('textPercentage')) / 100)
  
        width = self.rootObject.width
        height = self.rootObject.height