[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/gnuef/src GFForm.py GFParser.py GFTrigger....
From: |
Jason Cater |
Subject: |
gnue/gnuef/src GFForm.py GFParser.py GFTrigger.... |
Date: |
Wed, 20 Jun 2001 14:55:38 -0700 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Jason Cater <address@hidden> 01/06/20 14:55:37
Modified files:
gnuef/src : GFForm.py GFParser.py GFTrigger.py
UIwxpython.py
Log message:
Added work-around for the splashscreen crashing problem and made minor
changes related to designer
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFParser.py.diff?cvsroot=OldCVS&tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFTrigger.py.diff?cvsroot=OldCVS&tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.96&tr2=1.97&r1=text&r2=text
Patches:
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.103 gnue/gnuef/src/GFForm.py:1.104
--- gnue/gnuef/src/GFForm.py:1.103 Wed Jun 20 14:43:16 2001
+++ gnue/gnuef/src/GFForm.py Wed Jun 20 14:55:37 2001
@@ -250,6 +250,7 @@
def initTriggers(self, object):
if object.getObjectType() == "GFTrigger":
+ object.initialize()
object._triggerns.update( self._triggerns )
if object.src != None:
object.setFunctionFrom(self._triggerDictionary[object.src])
@@ -264,7 +265,7 @@
def initializeDatasources(self):
for key in self._datasourceDictionary.keys():
object = self._datasourceDictionary[key]
- object.initialize()
+ object.initialize()
def updateUIEntry(self,entry):
self._app.dispatchEvent(GFEvent('updateENTRY',entry));
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.36 gnue/gnuef/src/GFParser.py:1.37
--- gnue/gnuef/src/GFParser.py:1.36 Wed Jun 20 14:54:35 2001
+++ gnue/gnuef/src/GFParser.py Wed Jun 20 14:55:37 2001
@@ -93,7 +93,7 @@
{ 'name': (1, 1, char, None),
'master': (0, 0, char, None),
'detail': (0, 0, char, None),
- 'rows': (0, 0, int, None),
+ 'rows': (0, 0, int, 1),
'rowSpacer': (0, 0, int, None),
'transparentBlock':(0, 0, bool, 0),
'datasource': (0, 0, char, None)},
@@ -101,7 +101,7 @@
'label': ( GFObjects.GFLabel,
{ 'name': (0, 1, char, None),
'text': (1, 0, char, None),
- 'alignment': (0, 0, char, None),
+ 'alignment': (0, 0, char, "left"),
'width': (0, 0, int, None),
'x': (1, 0, int, None),
'y': (1, 0, int, None)},
Index: gnue/gnuef/src/GFTrigger.py
diff -u gnue/gnuef/src/GFTrigger.py:1.32 gnue/gnuef/src/GFTrigger.py:1.33
--- gnue/gnuef/src/GFTrigger.py:1.32 Mon Jun 18 12:41:55 2001
+++ gnue/gnuef/src/GFTrigger.py Wed Jun 20 14:55:37 2001
@@ -107,12 +107,14 @@
def buildObject (self):
self.type=string.upper(self.type)
-
+
+ # This is a hack for old forms that use "id" attr instead of "name"
if hasattr(self, 'id'):
if self.name == None:
self.name = self.id
- del self.__dict__['id']
+ del self.__dict__['id']
+ def initialize(self):
self.__call__ = self.dummyFunction
if self.type!="NAMED":
@@ -158,7 +160,7 @@
self._code = compile(revisedTriggerCode, '<string>', 'exec')
except SyntaxError, err:
print revisedTriggerCode
- print "Syntax error in line %d of trigger in element ??" \
+ print "Syntax error in line %s of trigger in element ??" \
% ( err.lineno )
sys.exit()
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.96 gnue/gnuef/src/UIwxpython.py:1.97
--- gnue/gnuef/src/UIwxpython.py:1.96 Wed Jun 20 14:43:16 2001
+++ gnue/gnuef/src/UIwxpython.py Wed Jun 20 14:55:37 2001
@@ -139,7 +139,8 @@
#
if not self._disableSplash:
self.splash =
SplashScreen(None,bitmapfile=GConfig.get('splashScreenPNG'),
- # duration=1, # callback=self.onMain,
+ # duration=65535, callback=self.onMain,
+ duration = 2000, callback=self.onCloseSplash,
style=wxSIMPLE_BORDER|wxCENTRE_ON_SCREEN )
swidth,sheight = self.splash.GetSizeTuple()
@@ -287,6 +288,14 @@
self.mainWindow.Show(true)
return true
+
+
+ # Called by SplashScreen when timer expires
+ def onCloseSplash(self):
+ # For some reason, a simple Close() doesn't cooperate with
+ # the modal login box and all hell breaks loose
+ self.splash.Show(0)
+ self.splash.Destroy()
def activateForm(self, form):
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/gnuef/src GFForm.py GFParser.py GFTrigger....,
Jason Cater <=