[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/gnuef/src GFForm.py GFObjects.py UIbase.py...
From: |
James Thompson |
Subject: |
gnue/gnuef/src GFForm.py GFObjects.py UIbase.py... |
Date: |
Sun, 25 Feb 2001 17:50:56 -0800 |
CVSROOT: /cvs
Module name: gnue
Changes by: James Thompson <address@hidden> 01/02/25 17:50:55
Modified files:
gnuef/src : GFForm.py GFObjects.py UIbase.py UIwxpython.py
Log message:
Bugs involving the new UIbase setup - statusbar updates, visibleCounts
and gap attached to wrong object
CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.73&r2=1.74
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.65&r2=1.66
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIbase.py.diff?r1=1.21&r2=1.22
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.73&r2=1.74
Patches:
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.73 gnue/gnuef/src/GFForm.py:1.74
--- gnue/gnuef/src/GFForm.py:1.73 Wed Feb 21 14:54:43 2001
+++ gnue/gnuef/src/GFForm.py Sun Feb 25 17:50:55 2001
@@ -101,6 +101,7 @@
self.walk(self.initBlocks)
self.walk(self.initPages)
self.walk(self.initEntries)
+ self.walk(self.initLabels)
GFDebug.printMesg(3, "Database Dictionary")
GFDebug.printMesg(3, "%s"%self.databaseDictionary)
@@ -155,6 +156,10 @@
if object.getObjectType() == 'GFEntry':
object.initialize()
object.value = object.block.dataSourceLink.getField(0,object.field)
+
+ def initLabels(self, object):
+ if object.getObjectType() == 'GFLabel':
+ object.initialize()
def initDatabaseObjects(self, object):
if object.getObjectType() =='GFDataSource':
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.65 gnue/gnuef/src/GFObjects.py:1.66
--- gnue/gnuef/src/GFObjects.py:1.65 Tue Feb 20 11:57:13 2001
+++ gnue/gnuef/src/GFObjects.py Sun Feb 25 17:50:55 2001
@@ -112,6 +112,15 @@
if not self.value:
GFValue.setValue(self,value)
+
+ def initialize(self):
+ self.block = self.findParentOfType('GFBlock')
+ if not hasattr(self,'visibleCount'):
+ if hasattr(self.block,'rows'):
+ self.visibleCount = self.block.rows
+ if hasattr(self.block,'rowSpacer'):
+ self.gap = self.block.rowSpacer
+
#
# GFPage
#
@@ -346,6 +355,12 @@
if hasattr(self,'foreign_key'):
datasourceName,self.fieldName = string.split(self.foreign_key,'.')
self.datasource = self.block.form.datasourceDictionary[datasourceName]
+
+ if not hasattr(self,'visibleCount'):
+ if hasattr(self.block,'rows'):
+ self.visibleCount = self.block.rows
+ if hasattr(self.block,'rowSpacer'):
+ self.gap = self.block.rowSpacer
def setValue(self, value):
self.value = value
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.21 gnue/gnuef/src/UIbase.py:1.22
--- gnue/gnuef/src/UIbase.py:1.21 Wed Feb 21 18:08:29 2001
+++ gnue/gnuef/src/UIbase.py Sun Feb 25 17:50:55 2001
@@ -166,8 +166,10 @@
'deleted':'DEL'}
tip, recordStatus, insertMode, currentRecord, maxRecord, currentPage,
maxPage =event.data
-
- status = statusValues[recordStatus]
+
+ status = None
+ if recordStatus != None:
+ status = statusValues[recordStatus]
insertValue = ""
if insertMode != None:
@@ -319,6 +321,7 @@
# you do not want to just add 1 to count
# as the formulas would then be off
count = index
+
while count < int(event.data.visibleCount):
if count != index:
if currentRecord+(count-index) > block.recordCount:
@@ -341,16 +344,16 @@
class UIWidget:
def __init__(self, object, container, textWidth, textHeight, widgetWidth,
widgetHeight, interface):
self.widgets = []
-
+
if not hasattr(object,'visibleCount'):
- self.visibleCount = 1
+ object.visibleCount = 1
else:
- self.visibleCount = int(object.visibleCount)
+ object.visibleCount = int(object.visibleCount)
if hasattr(object,'gap'):
- self.gap = int(object.gap)
+ object.gap = int(object.gap)
else:
- self.gap = 0
+ object.gap = 0
if hasattr(object,'width'):
self.itemWidth = int(object.width)*int(textWidth)
@@ -360,7 +363,7 @@
self.itemHeight = -1
if not hasattr(object,'hidden'):
- for spacer in range(int(self.visibleCount)):
+ for spacer in range(int(object.visibleCount)):
newWidget = self.createWidget(object, container, textWidth,
textHeight, widgetWidth, widgetHeight, interface, spacer)
self.widgets.append(newWidget)
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.73 gnue/gnuef/src/UIwxpython.py:1.74
--- gnue/gnuef/src/UIwxpython.py:1.73 Wed Feb 21 18:08:29 2001
+++ gnue/gnuef/src/UIwxpython.py Sun Feb 25 17:50:55 2001
@@ -588,7 +588,7 @@
newWidget = wxStaticText(container, -1, str(object.text),
wxPoint(int(object.x)*int(widgetWidth),
-
(int(object.y)+spacer+(spacer*self.gap))*int(widgetHeight)),
+
(int(object.y)+spacer+(spacer*object.gap))*int(widgetHeight)),
wxSize(self.itemWidth,self.itemHeight), style)
newWidget.SetFont(wxFont(GFOptions.pointSize,wxMODERN,wxNORMAL,wxNORMAL))
return newWidget
@@ -674,7 +674,7 @@
newWidget = wxComboBox(container, -1, "",
wxPoint(int(object.x)*int(widgetWidth),
-
(int(object.y)+spacer+(self.gap*spacer))*int(widgetHeight)),
+
(int(object.y)+spacer+(object.gap*spacer))*int(widgetHeight)),
wxSize(int(object.width)*int(textWidth),
int(object.height)*int(textHeight)),
choices, wxCB_DROPDOWN)
@@ -689,7 +689,7 @@
newWidget = wxTextCtrl(container, -1, object.value,
wxPoint(int(object.x)*int(widgetWidth),
-
(int(object.y)+spacer+(self.gap*spacer))*int(widgetHeight)),
+
(int(object.y)+spacer+(object.gap*spacer))*int(widgetHeight)),
wxSize(int(object.width)*int(textWidth),
int(object.height)*int(textHeight)),styles)
EVT_CHAR(newWidget, interface.uiEventTrap)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/gnuef/src GFForm.py GFObjects.py UIbase.py...,
James Thompson <=