[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/gnuef/src UIbase.py UIwxpython.py
|
From: |
James Thompson |
|
Subject: |
gnue/gnuef/src UIbase.py UIwxpython.py |
|
Date: |
Wed, 20 Jun 2001 16:34:51 -0700 |
CVSROOT: /cvs
Module name: gnue
Changes by: James Thompson <address@hidden> 01/06/20 16:34:50
Modified files:
gnuef/src : UIbase.py UIwxpython.py
Log message:
Initial attempt to get designer working again after I unleashed the
insane ruminants into the cvs tree.
Tabbed forms are now broken.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIbase.py.diff?cvsroot=OldCVS&tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.97&tr2=1.98&r1=text&r2=text
Patches:
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.39 gnue/gnuef/src/UIbase.py:1.40
--- gnue/gnuef/src/UIbase.py:1.39 Wed Jun 20 14:43:16 2001
+++ gnue/gnuef/src/UIbase.py Wed Jun 20 16:34:50 2001
@@ -68,13 +68,7 @@
global UI
UI = __import__(self.getModule(), globals(), locals(), ['UIAbout'])
- self.widgets = {'GFLabel' : UI.UILabel,
- 'GFBox' : UI.UIBox,
- 'GFPage' : UI.UIPage,
- 'GFForm' : UI.UIForm,
- 'GFEntry' : UI.UIEntry,
- 'GFButton' : UI.UIButton,
- 'GFScrollBar' : UI.UIScrollBar}
+ self.widgets = UI.WIDGETS
self._loginHandler = None
@@ -356,7 +350,7 @@
#
class UIWidget:
- def __init__(self, object, container, textWidth, textHeight, widgetWidth,
widgetHeight, interface):
+ def __init__(self, object, container, textWidth, textHeight, widgetWidth,
widgetHeight, interface, initialize=1):
self.widgets = []
if not hasattr(object,'visibleCount'):
@@ -378,10 +372,10 @@
if not object.hidden:
for spacer in range(int(object.visibleCount)):
- newWidget = self.createWidget(object, container, textWidth,
textHeight, widgetWidth, widgetHeight, interface, spacer)
+ newWidget = self.createWidget(object, container, textWidth,
textHeight, widgetWidth, widgetHeight, interface, spacer, initialize)
self.widgets.append(newWidget)
- def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight, interface, spacer):
+ def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight, interface, spacer,initialize=1):
GDebug.printMesg(1,"UI doesn't support %s" % self.__class__)
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.97 gnue/gnuef/src/UIwxpython.py:1.98
--- gnue/gnuef/src/UIwxpython.py:1.97 Wed Jun 20 14:55:37 2001
+++ gnue/gnuef/src/UIwxpython.py Wed Jun 20 16:34:50 2001
@@ -39,10 +39,6 @@
from gnue.common import GDebug, GLoginHandler
from gnue.common import GConfig
-
-_NOTEBOOK = None
-_LOOPTRAP = 0
-
#
# Little global helper routine to set font according to options
#
@@ -277,11 +273,9 @@
self.mainWindow.panel = wxPanel(self.mainWindow,-1,
wxDefaultPosition,self.mainWindow.GetSize())
- #self.mainWindow.panel = None
EVT_CHAR(self.mainWindow.panel, self.uiEventTrap)
self.currentWidget = [self.mainWindow.panel]
- #self.currentWidget = [self.mainWindow]
self.SetTopWindow(self.mainWindow)
EVT_CLOSE(self.mainWindow,self.closeTrap)
@@ -308,7 +302,6 @@
self.mainWindow.panel = self._pageList[0]
self.mainWindow.panel.SetSize(wxSize(width*int(self.widgetWidth),
int(height+self.menu_sb_space)*int(self.widgetHeight)))
-
self._pageList[0].Show(TRUE)
self.dispatchEvent(GFEvent('requestPREVRECORD'))
self.dispatchEvent(GFEvent('requestNEXTRECORD'))
@@ -316,16 +309,7 @@
# Only one page at a time can be visible
self.visiblePage = self._pageList[0]
- if _NOTEBOOK: # Adjust sizes
- #self.mainWindow.SetSize(wxSize(width*int(self.widgetWidth)+10,
- #
int(height+self.menu_sb_space)*int(self.widgetHeight)))
- #self.mainWindow.panel.SetSize(wxSize(width*int(self.widgetWidth)+10,
- #
int(height+self.menu_sb_space)*int(self.widgetHeight)))
- _NOTEBOOK.SetSize(wxSize(width*int(self.widgetWidth),
-
int(height+self.menu_sb_space)*int(self.widgetHeight)))
- #print self.mainWindow.GetSize()
- #print self.mainWindow.panel.GetSize()
- #print _NOTEBOOK.GetSize()
+
#############################################################################
#
@@ -398,20 +382,13 @@
#
def gotoPage(self, event):
index = self._formToUI[event.data][1]
+ self.visiblePage.Show(FALSE)
+ self._formToUI[event.data][0][index].Show(TRUE)
- if not _NOTEBOOK:
- self.visiblePage.Show(FALSE)
- self.visiblePage = self._formToUI[event.data][0][index]
-
self.visiblePage.SetSize(wxSize(int(self._form.getOption('width'))*int(self.widgetWidth),
-
int(int(self._form.getOption('height'))+self.menu_sb_space)*int(self.widgetHeight)))
- else:
- self.visiblePage = self._formToUI[event.data][0][index]
- for count in range(_NOTEBOOK.GetPageCount()):
- if self.visiblePage.GetId() == _NOTEBOOK.GetPage(count).GetId():
- _NOTEBOOK.SetSelection(count)
- break
-
+ self.visiblePage = self._formToUI[event.data][0][index]
self.visiblePage.Show(TRUE)
+
self.visiblePage.SetSize(wxSize(int(self._form.getOption('width'))*int(self.widgetWidth),
+
int(int(self._form.getOption('height'))+self.menu_sb_space)*int(self.widgetHeight)))
#
# formAlert
@@ -574,19 +551,7 @@
for count in range(len(self._formToUI[key][0])):
if self._formToUI[key][0][count].GetId() == object.GetId():
action = GFEvent('fireTRIGGER',key._trigger)
-
- #
- # Notebook tab events
- #
- elif event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING:
- global _LOOPTRAP
- if _LOOPTRAP == 0:
- _LOOPTRAP = 1
- action = GFEvent('requestPAGE',event.GetSelection())
- else:
- _LOOPTRAP = 0
-
#
# Unhandled events
#
@@ -627,7 +592,7 @@
self.textctrlList = []
- messageField = wxStaticText(self.dlg, 1010, loginMesg)
+ messageField = wxStaticText(self.dlg, 1010, str(loginMesg))
labelList = []
dlgWidth = getLargest(bmp.GetWidth(), messageField.GetSize().GetWidth()+20)
@@ -800,7 +765,7 @@
# Widget set specific function that creates a single instance of a label
#
class UILabel(UIWidget, UIHelper):
- def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer):
+ def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer,initialize=1):
style = wxALIGN_LEFT|wxST_NO_AUTORESIZE
if hasattr(object,'alignment'):
@@ -814,7 +779,6 @@
(int(object.y)+spacer+(spacer*object.gap))*int(widgetHeight)),
wxSize(self.itemWidth,self.itemHeight), style)
initFont(newWidget)
-# newWidget.Show(FALSE)
return newWidget
#
@@ -823,14 +787,13 @@
# Widget set specific function that creates a single instance of a border box
#
class UIBox(UIWidget, UIHelper):
- def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer):
+ def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer,initialize=1):
newWidget = wxStaticBox(container,-1,str(object.label),
wxPoint(int(object.x)*int(widgetWidth)+(int(widgetWidth)/2),
(int(object.y)+spacer)*int(widgetHeight)+(int(widgetHeight)/2)),
wxSize(int(object.width)*int(widgetWidth)-(int(widgetWidth)/2),
int(object.height)*int(widgetHeight)-(int(widgetHeight)/2)))
initFont(newWidget)
- # newWidget.Show(FALSE)
return newWidget
#
@@ -840,13 +803,12 @@
# to navigate multiple records
#
class UIScrollBar(UIWidget, UIHelper):
- def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer):
+ def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer,initialize=1):
newWidget =wxScrollBar(container,-1,
wxPoint(int(object.x)*int(widgetWidth),(int(object.y)+spacer)*int(widgetHeight)),
wxSize(int(object.width)*int(widgetWidth),int(object.height)*int(widgetHeight)),
wxSB_VERTICAL)
initFont(newWidget)
- # newWidget.Show(FALSE)
return newWidget
#
# UIButton
@@ -854,15 +816,15 @@
# Widget set specific function that creates a single instance of a button
#
class UIButton(UIWidget, UIHelper):
- def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer):
+ def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer,initialize=1):
newWidget = wxButton(container,-1,str(object.label),
wxPoint(int(object.x)*int(widgetWidth),(int(object.y)+spacer)*int(widgetHeight)),
wxSize(int(object.width)*int(widgetWidth),int(object.height)*int(widgetHeight))
)
initFont(newWidget)
- EVT_BUTTON(newWidget,newWidget.GetId(),interface.uiEventTrap)
-# newWidget.Show(FALSE)
+ if initialize:
+ EVT_BUTTON(newWidget,newWidget.GetId(),interface.uiEventTrap)
return newWidget
#
@@ -871,17 +833,12 @@
# Widget set specific function that creates a single instance of a page
#
class UIPage(UIWidget, UIHelper):
- def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer):
-
- if _NOTEBOOK:
- newWidget = wxPanel(_NOTEBOOK, -1,wxDefaultPosition,_NOTEBOOK.GetSize())
- _NOTEBOOK.AddPage(newWidget,object.name)
- newWidget.Show(TRUE)
- else:
- newWidget = wxPanel(container, -1,wxDefaultPosition,container.GetSize())
- newWidget.Show(FALSE)
+ def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer,initialize=1):
+ newWidget = wxPanel(container, -1,wxDefaultPosition,container.GetSize())
+ newWidget.Show(FALSE)
- EVT_CHAR(newWidget, interface.uiEventTrap)
+ if initialize:
+ EVT_CHAR(newWidget, interface.uiEventTrap)
initFont(newWidget)
interface._pageList.append(newWidget)
return newWidget
@@ -892,7 +849,7 @@
# Widget set specific function that creates a single instance of a data entry
widget
#
class UIEntry(UIWidget, UIHelper):
- def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer):
+ def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer,initialize=1):
if hasattr(object,'style'):
style = object.style
else:
@@ -900,10 +857,11 @@
if style == 'dropdown':
choices = []
- values = object.allowedValues()
- for key in values.keys():
- choices.append(values[key])
- choices.sort()
+ if initialize:
+ values = object.allowedValues()
+ for key in values.keys():
+ choices.append(values[key])
+ choices.sort()
newWidget = wxComboBox(container, -1, "",
wxPoint(int(object.x)*int(widgetWidth),
@@ -913,8 +871,9 @@
choices, wxCB_DROPDOWN)
newWidget.SetValue("")
- EVT_CHAR(newWidget, interface.uiEventTrap)
- EVT_COMBOBOX(newWidget, newWidget.GetId(), interface.uiEventTrap)
+ if initialize:
+ EVT_CHAR(newWidget, interface.uiEventTrap)
+ EVT_COMBOBOX(newWidget, newWidget.GetId(), interface.uiEventTrap)
elif style == 'checkbox':
style = object.style
@@ -926,13 +885,18 @@
# wxSize(int(object.width)*int(self.textWidth),
#
int(object.height)*int(self.textHeight)), wxNO_BORDER)
newWidget.SetValue(0)
+
- EVT_CHECKBOX(newWidget, newWidget.GetId(), interface.uiEventTrap)
+ if initialize:
+ EVT_CHECKBOX(newWidget, newWidget.GetId(), interface.uiEventTrap)
else:
- styles = wxTE_PROCESS_TAB
- if int(object.height) > 1:
- styles = styles|wxTE_MULTILINE
+ if initialize:
+ styles = wxTE_PROCESS_TAB
+ if int(object.height) > 1:
+ styles = styles|wxTE_MULTILINE
+ else:
+ styles = 0
newWidget = wxTextCtrl(container, -1, object._value,
wxPoint(int(object.x)*int(widgetWidth),
@@ -940,11 +904,11 @@
wxSize(int(object.width)*int(textWidth),
int(object.height)*int(textHeight)+1),
styles)
- EVT_CHAR(newWidget, interface.uiEventTrap)
- EVT_MOUSE_EVENTS(newWidget, interface.uiEventTrap)
+ if initialize:
+ EVT_CHAR(newWidget, interface.uiEventTrap)
+ EVT_MOUSE_EVENTS(newWidget, interface.uiEventTrap)
initFont(newWidget)
-# newWidget.Show(FALSE)
return newWidget
#
@@ -953,31 +917,11 @@
# Widget set specific function that creates a single instance of a Form widget
#
class UIForm(UIWidget, UIHelper):
- def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer):
- global _NOTEBOOK
-
- if object.tabbed:
- print object.tabbed
- if object.tabbed == 'left':
- tabstyle = wxNB_LEFT
- elif object.tabbed == 'right':
- tabstyle = wxNB_RIGHT
- elif object.tabbed == 'bottom':
- tabstyle = wxNB_BOTTOM
- else:
- tabstyle = 0
-
- _NOTEBOOK =
wxNotebook(container,-1,wxPoint(10,10),size=container.GetSize(),style=tabstyle)
- newWidget = _NOTEBOOK
- _NOTEBOOK.Show(TRUE)
- EVT_NOTEBOOK_PAGE_CHANGING(newWidget, newWidget.GetId(),
interface.uiEventTrap)
-
- else:
- newWidget = wxPanel(interface.mainWindow.panel,-1,
wxDefaultPosition,size=container.GetSize())
-
- EVT_CLOSE(interface.mainWindow,interface.closeTrap)
-
- newWidget.Show(TRUE)
+ def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer,initialize=1):
+ newWidget = wxPanel(interface.mainWindow.panel,-1, wxDefaultPosition)
+ if initialize:
+ EVT_CLOSE(interface.mainWindow,interface.closeTrap)
+
return newWidget
#
@@ -1034,9 +978,12 @@
raise GLoginHandler.UserCanceledLogin
-
-
-
-
+WIDGETS = {'GFLabel' : UILabel,
+ 'GFBox' : UIBox,
+ 'GFPage' : UIPage,
+ 'GFForm' : UIForm,
+ 'GFEntry' : UIEntry,
+ 'GFButton' : UIButton,
+ 'GFScrollBar' : UIScrollBar}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/gnuef/src UIbase.py UIwxpython.py,
James Thompson <=