[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-forms/src GFClient.py GFDisplayHandler.py ...
|
From: |
Jason Cater |
|
Subject: |
gnue-forms/src GFClient.py GFDisplayHandler.py ... |
|
Date: |
Fri, 05 Sep 2003 15:33:59 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue-forms
Branch:
Changes by: Jason Cater <address@hidden> 03/09/05 15:33:59
Modified files:
src : GFClient.py GFDisplayHandler.py
src/GFObjects : GFBlock.py GFComponent.py GFEntry.py GFField.py
GFImage.py GFLabel.py
src/uidrivers/gtk2: SplashScreen.py UIdriver.py
src/uidrivers/gtk2/widgets: _base.py entry.py
src/uidrivers/qt: UIdriver.py
src/uidrivers/wx: common.py
Log message:
changed new gConfig references to gConfigForms so I can fix Designer
again
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFClient.py.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFDisplayHandler.py.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFObjects/GFBlock.py.diff?tr1=1.87&tr2=1.88&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFObjects/GFComponent.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFObjects/GFEntry.py.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFObjects/GFField.py.diff?tr1=1.92&tr2=1.93&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFObjects/GFImage.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFObjects/GFLabel.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/gtk2/SplashScreen.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/gtk2/UIdriver.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/gtk2/widgets/_base.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/gtk2/widgets/entry.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/qt/UIdriver.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/wx/common.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: gnue-forms/src/GFClient.py
diff -c gnue-forms/src/GFClient.py:1.73 gnue-forms/src/GFClient.py:1.74
*** gnue-forms/src/GFClient.py:1.73 Sat Aug 9 21:24:35 2003
--- gnue-forms/src/GFClient.py Fri Sep 5 15:33:57 2003
***************
*** 123,129 ****
if not (string.split(string.lower(basename),'.')[0] in
('gnue-forms','gfclient')):
formfile = os.path.join (
GConfig.getInstalledBase('forms_appbase','common_appbase','install_prefix'),
! gConfig('FormDir'),basename+".gfd" )
else:
raise IndexError
except IndexError:
--- 123,129 ----
if not (string.split(string.lower(basename),'.')[0] in
('gnue-forms','gfclient')):
formfile = os.path.join (
GConfig.getInstalledBase('forms_appbase','common_appbase','install_prefix'),
! gConfigForms('FormDir'),basename+".gfd" )
else:
raise IndexError
except IndexError:
***************
*** 135,141 ****
userParameters = self.getCommandLineParameters(self.ARGUMENTS[1:])
! if gConfig('disableSplash') == '1':
self.disableSplash = 1
else:
self.disableSplash = self.OPTIONS['splash_screen']
--- 135,141 ----
userParameters = self.getCommandLineParameters(self.ARGUMENTS[1:])
! if gConfigForms('disableSplash') == '1':
self.disableSplash = 1
else:
self.disableSplash = self.OPTIONS['splash_screen']
Index: gnue-forms/src/GFDisplayHandler.py
diff -c gnue-forms/src/GFDisplayHandler.py:1.60
gnue-forms/src/GFDisplayHandler.py:1.61
*** gnue-forms/src/GFDisplayHandler.py:1.60 Tue Jul 29 17:07:37 2003
--- gnue-forms/src/GFDisplayHandler.py Fri Sep 5 15:33:57 2003
***************
*** 790,797 ****
def __init__(self, *args, **params):
! self.trueValue = gConfig("checkboxTrue")
! self.falseValue = gConfig("checkboxFalse")
self.trueValues = ('Y','y','T','t','1','x','X', self.trueValue)
self.falseValues = ('N','n','F','f','0','', ' ', self.falseValue)
--- 790,797 ----
def __init__(self, *args, **params):
! self.trueValue = gConfigForms("checkboxTrue")
! self.falseValue = gConfigForms("checkboxFalse")
self.trueValues = ('Y','y','T','t','1','x','X', self.trueValue)
self.falseValues = ('N','n','F','f','0','', ' ', self.falseValue)
Index: gnue-forms/src/GFObjects/GFBlock.py
diff -c gnue-forms/src/GFObjects/GFBlock.py:1.87
gnue-forms/src/GFObjects/GFBlock.py:1.88
*** gnue-forms/src/GFObjects/GFBlock.py:1.87 Sun Aug 31 00:36:59 2003
--- gnue-forms/src/GFObjects/GFBlock.py Fri Sep 5 15:33:58 2003
***************
*** 51,57 ****
GFContainer.__init__(self, parent, 'GFBlock')
self.mode = 'normal'
! self._convertAstericksToPercent = int(gConfig('AsterickWildcard'))
self._inits = [self.initialize]
--- 51,57 ----
GFContainer.__init__(self, parent, 'GFBlock')
self.mode = 'normal'
! self._convertAstericksToPercent = int(gConfigForms('AsterickWildcard'))
self._inits = [self.initialize]
***************
*** 64,70 ****
self._queryDefaults = {}
self._queryValues = {}
self._lastQueryValues = {}
! self._autocreate = int(gConfig('autocreate'))
self._gap = 0
self._rows = 1
--- 64,70 ----
self._queryDefaults = {}
self._queryValues = {}
self._lastQueryValues = {}
! self._autocreate = int(gConfigForms('autocreate'))
self._gap = 0
self._rows = 1
***************
*** 473,479 ****
if self.mode != 'query':
self.mode = 'query'
! self._query2 = int(gConfig("RememberLastQuery"))
self._queryValues = {}
self._queryValues.update(self._queryDefaults)
self.switchRecord(0)
--- 473,479 ----
if self.mode != 'query':
self.mode = 'query'
! self._query2 = int(gConfigForms("RememberLastQuery"))
self._queryValues = {}
self._queryValues.update(self._queryDefaults)
self.switchRecord(0)
Index: gnue-forms/src/GFObjects/GFComponent.py
diff -c gnue-forms/src/GFObjects/GFComponent.py:1.2
gnue-forms/src/GFObjects/GFComponent.py:1.3
*** gnue-forms/src/GFObjects/GFComponent.py:1.2 Sun Jul 6 17:35:00 2003
--- gnue-forms/src/GFObjects/GFComponent.py Fri Sep 5 15:33:58 2003
***************
*** 43,49 ****
# Default attributes (these may be replaced by parser)
self.type = "URL"
! self.Char__height = int(gConfig('widgetHeight'))
# Runtime Variables
self._inits = [self.initialize]
--- 43,49 ----
# Default attributes (these may be replaced by parser)
self.type = "URL"
! self.Char__height = int(gConfigForms('widgetHeight'))
# Runtime Variables
self._inits = [self.initialize]
Index: gnue-forms/src/GFObjects/GFEntry.py
diff -c gnue-forms/src/GFObjects/GFEntry.py:1.88
gnue-forms/src/GFObjects/GFEntry.py:1.89
*** gnue-forms/src/GFObjects/GFEntry.py:1.88 Sun Jul 6 17:35:00 2003
--- gnue-forms/src/GFObjects/GFEntry.py Fri Sep 5 15:33:58 2003
***************
*** 45,52 ****
GFTabStop.__init__(self, parent, 'GFEntry')
# Default attributes (these may be replaced by parser)
! self.Char__height = int(gConfig('widgetHeight'))
! self.Char__width = int(gConfig('widgetWidth'))
self.style = "default"
self._inits = [self.initialize]
--- 45,52 ----
GFTabStop.__init__(self, parent, 'GFEntry')
# Default attributes (these may be replaced by parser)
! self.Char__height = int(gConfigForms('widgetHeight'))
! self.Char__width = int(gConfigForms('widgetWidth'))
self.style = "default"
self._inits = [self.initialize]
Index: gnue-forms/src/GFObjects/GFField.py
diff -c gnue-forms/src/GFObjects/GFField.py:1.92
gnue-forms/src/GFObjects/GFField.py:1.93
*** gnue-forms/src/GFObjects/GFField.py:1.92 Tue Aug 19 22:23:04 2003
--- gnue-forms/src/GFObjects/GFField.py Fri Sep 5 15:33:58 2003
***************
*** 138,144 ****
if self.typecast == 'number':
self._numeric = 1
! self._allowFormulas = gConfig("AllowNumericFormulas")
if self.case == 'upper':
self._uppercase = 1
elif self.case == 'lower':
--- 138,144 ----
if self.typecast == 'number':
self._numeric = 1
! self._allowFormulas = gConfigForms("AllowNumericFormulas")
if self.case == 'upper':
self._uppercase = 1
elif self.case == 'lower':
***************
*** 295,301 ****
self._allowedValues = {"":""}
self._allowedValuesDescr = [""]
self._allowedValuesReverse = {"":""}
! dropdownSeparator = gConfig('DropdownSeparator')
while more:
try:
key = "%s" % rs.current.getField(self.fk_key)
--- 295,301 ----
self._allowedValues = {"":""}
self._allowedValuesDescr = [""]
self._allowedValuesReverse = {"":""}
! dropdownSeparator = gConfigForms('DropdownSeparator')
while more:
try:
key = "%s" % rs.current.getField(self.fk_key)
Index: gnue-forms/src/GFObjects/GFImage.py
diff -c gnue-forms/src/GFObjects/GFImage.py:1.5
gnue-forms/src/GFObjects/GFImage.py:1.6
*** gnue-forms/src/GFObjects/GFImage.py:1.5 Sun Jul 6 17:35:00 2003
--- gnue-forms/src/GFObjects/GFImage.py Fri Sep 5 15:33:58 2003
***************
*** 42,48 ****
# Default attributes (these may be replaced by parser)
self.type = "URL"
! self.Char__height = int(gConfig('widgetHeight'))
# Runtime Variables
self._inits = [self.initialize]
--- 42,48 ----
# Default attributes (these may be replaced by parser)
self.type = "URL"
! self.Char__height = int(gConfigForms('widgetHeight'))
# Runtime Variables
self._inits = [self.initialize]
Index: gnue-forms/src/GFObjects/GFLabel.py
diff -c gnue-forms/src/GFObjects/GFLabel.py:1.12
gnue-forms/src/GFObjects/GFLabel.py:1.13
*** gnue-forms/src/GFObjects/GFLabel.py:1.12 Sun Jul 6 17:35:00 2003
--- gnue-forms/src/GFObjects/GFLabel.py Fri Sep 5 15:33:58 2003
***************
*** 42,48 ****
# Default attributes (these may be replaced by parser)
self.alignment = "left"
! self.Char__height = int(gConfig('widgetHeight'))
# Runtime Variables
self._inits = [self.initialize]
--- 42,48 ----
# Default attributes (these may be replaced by parser)
self.alignment = "left"
! self.Char__height = int(gConfigForms('widgetHeight'))
# Runtime Variables
self._inits = [self.initialize]
Index: gnue-forms/src/uidrivers/gtk2/SplashScreen.py
diff -c gnue-forms/src/uidrivers/gtk2/SplashScreen.py:1.2
gnue-forms/src/uidrivers/gtk2/SplashScreen.py:1.3
*** gnue-forms/src/uidrivers/gtk2/SplashScreen.py:1.2 Mon May 19 20:06:35 2003
--- gnue-forms/src/uidrivers/gtk2/SplashScreen.py Fri Sep 5 15:33:58 2003
***************
*** 50,56 ****
self.set_modal(1)
self.set_position(1) # for center
img = gtk.Image()
! img.set_from_file(images_dir + gConfig('splashScreenPNG'))
box=gtk.VBox()
self.add(box)
box.add(img)
--- 50,56 ----
self.set_modal(1)
self.set_position(1) # for center
img = gtk.Image()
! img.set_from_file(images_dir + gConfigForms('splashScreenPNG'))
box=gtk.VBox()
self.add(box)
box.add(img)
Index: gnue-forms/src/uidrivers/gtk2/UIdriver.py
diff -c gnue-forms/src/uidrivers/gtk2/UIdriver.py:1.26
gnue-forms/src/uidrivers/gtk2/UIdriver.py:1.27
*** gnue-forms/src/uidrivers/gtk2/UIdriver.py:1.26 Mon Aug 4 11:37:30 2003
--- gnue-forms/src/uidrivers/gtk2/UIdriver.py Fri Sep 5 15:33:58 2003
***************
*** 94,103 ****
# Set default form font
#
! if gConfig('fixedWidthFont'):
! fontname = 'monospace %s' % gConfig('pointSize')
else:
! fontname = 'bitstream vera %s' % gConfig('pointSize')
self.mono_font = pango.FontDescription(fontname)
--- 94,103 ----
# Set default form font
#
! if gConfigForms('fixedWidthFont'):
! fontname = 'monospace %s' % gConfigForms('pointSize')
else:
! fontname = 'bitstream vera %s' % gConfigForms('pointSize')
self.mono_font = pango.FontDescription(fontname)
Index: gnue-forms/src/uidrivers/gtk2/widgets/_base.py
diff -c gnue-forms/src/uidrivers/gtk2/widgets/_base.py:1.5
gnue-forms/src/uidrivers/gtk2/widgets/_base.py:1.6
*** gnue-forms/src/uidrivers/gtk2/widgets/_base.py:1.5 Mon Aug 4 11:50:14 2003
--- gnue-forms/src/uidrivers/gtk2/widgets/_base.py Fri Sep 5 15:33:59 2003
***************
*** 123,129 ****
def setValue(self, value, index=0, enabled=1):
# fix for 0.5.1 (Unicode is not internal encoding)
! #value = value.decode(gConfig('textEncoding'))
widget = self.widgets[index]
--- 123,129 ----
def setValue(self, value, index=0, enabled=1):
# fix for 0.5.1 (Unicode is not internal encoding)
! #value = value.decode(gConfigForms('textEncoding'))
widget = self.widgets[index]
Index: gnue-forms/src/uidrivers/gtk2/widgets/entry.py
diff -c gnue-forms/src/uidrivers/gtk2/widgets/entry.py:1.6
gnue-forms/src/uidrivers/gtk2/widgets/entry.py:1.7
*** gnue-forms/src/uidrivers/gtk2/widgets/entry.py:1.6 Mon Aug 4 11:50:14 2003
--- gnue-forms/src/uidrivers/gtk2/widgets/entry.py Fri Sep 5 15:33:59 2003
***************
*** 162,168 ****
# Compatibility layer for 0.5.1
#text = newtext.decode('utf-8')
! text = newtext.decode('utf-8').encode(gConfig('textEncoding'))
action = events.Event('requestKEYPRESS', text, text=text,
code=0, _form=object._form)
--- 162,168 ----
# Compatibility layer for 0.5.1
#text = newtext.decode('utf-8')
! text = newtext.decode('utf-8').encode(gConfigForms('textEncoding'))
action = events.Event('requestKEYPRESS', text, text=text,
code=0, _form=object._form)
***************
*** 321,327 ****
# Compatibility layer for 0.5.1
#text = newtext.decode('utf-8')
! text = newtext.decode('utf-8').encode(gConfig('textEncoding'))
action = events.Event('requestKEYPRESS', text, text=text,
code=0, _form=object._form)
--- 321,327 ----
# Compatibility layer for 0.5.1
#text = newtext.decode('utf-8')
! text = newtext.decode('utf-8').encode(gConfigForms('textEncoding'))
action = events.Event('requestKEYPRESS', text, text=text,
code=0, _form=object._form)
Index: gnue-forms/src/uidrivers/qt/UIdriver.py
diff -c gnue-forms/src/uidrivers/qt/UIdriver.py:1.8
gnue-forms/src/uidrivers/qt/UIdriver.py:1.9
*** gnue-forms/src/uidrivers/qt/UIdriver.py:1.8 Wed Apr 23 23:37:11 2003
--- gnue-forms/src/uidrivers/qt/UIdriver.py Fri Sep 5 15:33:59 2003
***************
*** 84,90 ****
#info = QFontInfo(font)
#print "DATA:", info.family(),info.fixedPitch()
! font.setPointSize(int(gConfig('pointSize')))
setWidgetBaseFont(font)
#
--- 84,90 ----
#info = QFontInfo(font)
#print "DATA:", info.family(),info.fixedPitch()
! font.setPointSize(int(gConfigForms('pointSize')))
setWidgetBaseFont(font)
#
Index: gnue-forms/src/uidrivers/wx/common.py
diff -c gnue-forms/src/uidrivers/wx/common.py:1.6
gnue-forms/src/uidrivers/wx/common.py:1.7
*** gnue-forms/src/uidrivers/wx/common.py:1.6 Thu May 29 01:07:22 2003
--- gnue-forms/src/uidrivers/wx/common.py Fri Sep 5 15:33:59 2003
***************
*** 51,57 ****
def initFont(widget, affectsLayout=1):
if int(gConfigForms('fixedWidthFont')):
widget.SetFont(wxFont(getPointSize(),wxMODERN,wxNORMAL,\
!
wxNORMAL,FALSE,'',encodings[gConfig('textEncoding')]))
#####################################################################
--- 51,57 ----
def initFont(widget, affectsLayout=1):
if int(gConfigForms('fixedWidthFont')):
widget.SetFont(wxFont(getPointSize(),wxMODERN,wxNORMAL,\
!
wxNORMAL,FALSE,'',encodings[gConfigForms('textEncoding')]))
#####################################################################
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-forms/src GFClient.py GFDisplayHandler.py ...,
Jason Cater <=