[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r8528 - in trunk/gnue-forms/src/uidrivers: _base _base/widgets cu
|
From: |
johannes |
|
Subject: |
[gnue] r8528 - in trunk/gnue-forms/src/uidrivers: _base _base/widgets curses/widgets gtk2/widgets gtk2/widgets/form html/widgets html/widgets/form qt/widgets qt/widgets/form win32/widgets win32/widgets/form wx/widgets wx/widgets/form wx26/widgets |
|
Date: |
Thu, 6 Jul 2006 08:02:25 -0500 (CDT) |
Author: johannes
Date: 2006-07-06 08:02:22 -0500 (Thu, 06 Jul 2006)
New Revision: 8528
Modified:
trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
trunk/gnue-forms/src/uidrivers/curses/widgets/_base.py
trunk/gnue-forms/src/uidrivers/curses/widgets/button.py
trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
trunk/gnue-forms/src/uidrivers/curses/widgets/page.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/box.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/component.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/image.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py
trunk/gnue-forms/src/uidrivers/html/widgets/_base.py
trunk/gnue-forms/src/uidrivers/html/widgets/box.py
trunk/gnue-forms/src/uidrivers/html/widgets/button.py
trunk/gnue-forms/src/uidrivers/html/widgets/entry.py
trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/html/widgets/image.py
trunk/gnue-forms/src/uidrivers/html/widgets/label.py
trunk/gnue-forms/src/uidrivers/html/widgets/page.py
trunk/gnue-forms/src/uidrivers/qt/widgets/_base.py
trunk/gnue-forms/src/uidrivers/qt/widgets/box.py
trunk/gnue-forms/src/uidrivers/qt/widgets/button.py
trunk/gnue-forms/src/uidrivers/qt/widgets/entry.py
trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/qt/widgets/label.py
trunk/gnue-forms/src/uidrivers/qt/widgets/page.py
trunk/gnue-forms/src/uidrivers/qt/widgets/scrollbar.py
trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
trunk/gnue-forms/src/uidrivers/win32/widgets/box.py
trunk/gnue-forms/src/uidrivers/win32/widgets/button.py
trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/win32/widgets/image.py
trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
trunk/gnue-forms/src/uidrivers/win32/widgets/page.py
trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py
trunk/gnue-forms/src/uidrivers/wx/widgets/box.py
trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/wx/widgets/image.py
trunk/gnue-forms/src/uidrivers/wx/widgets/label.py
trunk/gnue-forms/src/uidrivers/wx/widgets/page.py
trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py
trunk/gnue-forms/src/uidrivers/wx/widgets/tree.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/button.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/gridline.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/image.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/label.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/scrollbar.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py
Log:
Further cleanup and pep8-ifying
issue87 in-progress
Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -339,10 +339,10 @@
if object: # Some pages might not have any widgets that can be active
if self._uiFocusWidget:
index = self._uiFocusIndex
- self._uiFocusWidget.loseFocus (index)
+ self._uiFocusWidget.lose_focus (index)
self._uiFocusWidget = self._gfObjToUIWidget [object]
self._uiFocusIndex = object._visibleIndex
- self._uiFocusWidget.indexedFocus (object._visibleIndex)
+ self._uiFocusWidget.indexed_focus (object._visibleIndex)
# ---------------------------------------------------------------------------
@@ -373,13 +373,13 @@
value = handler.getDisplayFiller (record.getField (field.field))
assert gDebug (5, "UPD-ENTRY %s prior: '%s' (%s)" % (entry, value,
count))
- uiWidget.setValue(value, count)
+ uiWidget.set_value(value, count)
# Fill current spot
value = handler.getDisplayFiller (entry.getValue ())
assert gDebug (5, "UPD-ENTRY %s current: %s (%s)" % (entry, repr(value),
index))
- uiWidget.setValue(value, index)
+ uiWidget.set_value(value, index)
# Fill trailing spots
#
@@ -402,7 +402,7 @@
value = handler.getDisplayFiller (rec.getField (field.field))
assert gDebug (5, "UPD-ENTRY %s trail: '%s' (%s)" % (entry, value,
count))
- uiWidget.setValue(value, count, cr <= lastRow)
+ uiWidget.set_value(value, count, cr <= lastRow)
count += 1
@@ -417,12 +417,12 @@
index = event.object._visibleIndex
widget = self._gfObjToUIWidget [event.object]
assert gDebug (5, "UPD-ENTRY-ED %s '%s' %s" % (event.object,
event.display, index))
- widget.setValue (event.display, index)
- widget.setCursorPosition (event.cursor, index)
+ widget.set_value (event.display, index)
+ widget.set_cursor_position (event.cursor, index)
if event.selection != None:
selection1, selection2 = event.selection
- widget.setSelectedArea (selection1, selection2, index)
+ widget.set_selected_area (selection1, selection2, index)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -119,7 +119,7 @@
if not getattr(self._gfObject, 'hidden', False):
for spacer in range(int(self._gfObject._rows)):
- widget = self.createWidget(self._creationEvent, spacer)
+ widget = self.create_widget(self._creationEvent, spacer)
self.widgets.append(widget)
@@ -204,13 +204,13 @@
# -------------------------------------------------------------------------
# TODO: add docstrings to these methods and pep8-ify them
- def createWidget(self, event, spacer):
+ def create_widget(self, event, spacer):
assert gDebug(1,"UI doesn't support %s" % self.__class__)
- def indexedFocus(self, index):
+ def indexed_focus(self, index):
pass
- def loseFocus(self, index):
+ def lose_focus(self, index):
pass
def showModal(self):
@@ -219,11 +219,11 @@
def destroy(self):
pass
- def setValue(self, value, index=0, enabled=1):
+ def set_value(self, value, index=0, enabled=1):
pass
- def setCursorPosition(self, position, index=0):
+ def set_cursor_position(self, position, index=0):
pass
- def setSelectedArea(self, selection1, selection2, index=0):
+ def set_selected_area(self, selection1, selection2, index=0):
pass
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/_base.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/_base.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -52,7 +52,7 @@
# Initialize widget
# ---------------------------------------------------------------------------
- def createWidget (self, event, spacer):
+ def create_widget (self, event, spacer):
# should go in base uidriver
self._init (spacer)
@@ -61,7 +61,7 @@
# Set focus to widget
# ---------------------------------------------------------------------------
- def indexedFocus (self, index):
+ def indexed_focus (self, index):
# should go in base uidriver
self._focusIndex = index
@@ -74,10 +74,10 @@
# Remove focus from widget
# ---------------------------------------------------------------------------
- def loseFocus (self, index):
+ def lose_focus (self, index):
self._focusIndex = None
- self._loseFocus (index)
+ self._lose_focus (index)
# ---------------------------------------------------------------------------
# Set text for widget
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/button.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/button.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -67,7 +67,7 @@
# Focus has changed away from this button
# ---------------------------------------------------------------------------
- def _loseFocus (self, index):
+ def _lose_focus (self, index):
self.__repaint (index)
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -104,7 +104,7 @@
# Focus has changed away from this entry
# ---------------------------------------------------------------------------
- def _loseFocus (self, index):
+ def _lose_focus (self, index):
if self.__style == 'listbox':
curses.curs_set (self.__oldCursor)
@@ -115,7 +115,7 @@
# Set value for entry
# ---------------------------------------------------------------------------
- def setValue (self, value, index = 0, enabled = True):
+ def set_value (self, value, index = 0, enabled = True):
if self.__style == 'listbox' and value in self.__data:
if self.__value [index] <> value:
@@ -131,7 +131,7 @@
# Set cursor position
# ---------------------------------------------------------------------------
- def setCursorPosition (self, position, index = 0):
+ def set_cursor_position (self, position, index = 0):
assert gDebug (2, "----- new position: %s" % position)
assert gDebug (2, " Value : %r" % self.__value [index])
@@ -228,7 +228,7 @@
# Set start and end of selection area
# ---------------------------------------------------------------------------
- def setSelectedArea (self, selection1, selection2, index = 0):
+ def set_selected_area (self, selection1, selection2, index = 0):
if selection1 == selection2:
self.__selection [index] = None
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -59,7 +59,7 @@
# Initialize form
# ---------------------------------------------------------------------------
- def createWidget (self, event, spacer):
+ def create_widget (self, event, spacer):
(x, y) = event.interface.screenSize ()
self.__window = curses.newpad (y, x)
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/page.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/page.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -35,7 +35,7 @@
# Initialize page
# ---------------------------------------------------------------------------
- def createWidget (self, event, spacer):
+ def create_widget (self, event, spacer):
if hasattr (event.object, 'caption'):
caption = event.object.caption
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -44,7 +44,7 @@
# Create a new GTK widget
# ---------------------------------------------------------------------------
- def createWidget (self, event, spacer):
+ def create_widget (self, event, spacer):
"""
This function creates a new GTK widget and adds it to the cross reference
table.
@@ -60,7 +60,7 @@
if hasattr (gfObject, 'Char__height'):
self.itemHeight = gfObject.Char__height * event.widgetHeight
- newWidget = self._createWidget (event, spacer)
+ newWidget = self._create_widget (event, spacer)
if event.initialize:
self._addToCrossRef (newWidget, gfObject, self)
@@ -189,7 +189,7 @@
# Set the focus to a given widget
# ---------------------------------------------------------------------------
- def indexedFocus (self, index):
+ def indexed_focus (self, index):
"""
This function set's the focus to the gtk-widget specified by index. If the
widget has a focusHandler it will be blocked and unblocked to prevent a
@@ -197,7 +197,7 @@
in gnue.conf.
"""
widget = self.widgets [index]
- assert gDebug (6, "indexedFocus: %s [%s]" % (widget, index))
+ assert gDebug (6, "indexed_focus: %s [%s]" % (widget, index))
item = isinstance (widget, gtk.ComboBoxEntry) and widget.child or widget
@@ -233,7 +233,7 @@
# On lose of the focus we un-select ComboBox-Entries
# ---------------------------------------------------------------------------
- def loseFocus (self, index):
+ def lose_focus (self, index):
for widget in self.widgets:
assert gDebug (6, "Lose focus: %s" % widget)
@@ -250,13 +250,13 @@
# Set the value of a widget
# ---------------------------------------------------------------------------
- def setValue (self, value, index = 0, enabled = True):
+ def set_value (self, value, index = 0, enabled = True):
"""
This function sets the value of a widget and optionally enables or disables
the widget.
"""
widget = self.widgets [index]
- assert gDebug (6, "setValue %s [%s] %s" % (repr (value), index, widget))
+ assert gDebug (6, "set_value %s [%s] %s" % (repr (value), index, widget))
if not isinstance (widget, gtk.CheckButton) and \
type (value) != types.UnicodeType:
@@ -327,7 +327,7 @@
# --------------------------------------------------------------------------
# Set the cursor's location in a widget
# --------------------------------------------------------------------------
- def setCursorPosition (self, position, index = 0):
+ def set_cursor_position (self, position, index = 0):
"""
Sets the cursor's position to the given location inside a capable widget.
"""
@@ -338,7 +338,7 @@
# --------------------------------------------------------------------------
# Set the selection inside a widget
# --------------------------------------------------------------------------
- def setSelectedArea (self, selection1, selection2, index=0):
+ def set_selected_area (self, selection1, selection2, index=0):
"""
Sets the selection start/end inside a capable widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/box.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/box.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -35,7 +35,7 @@
# Create the GTK widget
# ---------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget (self, event, spacer):
gfObject = event.object
text = None
if hasattr (gfObject, 'label') and len (gfObject.label):
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -37,7 +37,7 @@
# Create a gtk widget
# ---------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget (self, event, spacer):
object = event.object
text = "%s" % object.label
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/component.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/component.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/component.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -39,7 +39,7 @@
#
class UIComponent(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
oafiid = ""
@@ -70,7 +70,7 @@
- def setValue(self, value, index=0, enabled=1):
+ def set_value(self, value, index=0, enabled=1):
widget = self.widgets[index]
try:
obj = widget.get_objref().queryInterface("IDL:Nautilus/View:1.0")
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -35,7 +35,7 @@
class UIEntry (UIHelper):
- def _createWidget (self, event, spacer):
+ def _create_widget (self, event, spacer):
gfObject = event.object
style = gfObject.style
@@ -218,13 +218,13 @@
# Set the cursor position in a widget to position
# ---------------------------------------------------------------------------
- def setCursorPosition (self, position, index = 0):
+ def set_cursor_position (self, position, index = 0):
widget = self.widgets [index]
entry = isinstance (widget, gtk.ComboBox) and widget.child or widget
- assert gDebug (6, "setCursorPosition to %s in %s [%s] (%s)" % \
+ assert gDebug (6, "set_cursor_position to %s in %s [%s] (%s)" % \
(position, entry, index, widget))
if isinstance (entry, gtk.Entry):
@@ -242,7 +242,7 @@
# set the selected area
# ---------------------------------------------------------------------------
- def setSelectedArea (self, selection1, selection2, index = 0):
+ def set_selected_area (self, selection1, selection2, index = 0):
assert gDebug (6, "Set Selected Area %s/%s in %s [%s]" % \
(selection1, selection2, self, index))
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -53,7 +53,7 @@
# GTK-Widget creation
# ---------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget (self, event, spacer):
gfObject = event.object
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/image.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/image.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -40,7 +40,7 @@
# Create the gtk-widget
# ---------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget (self, event, spacer):
image = gtk.Image ()
self.pane = gtk.ScrolledWindow ()
@@ -59,7 +59,7 @@
# Set the widget's PIL
# ---------------------------------------------------------------------------
- def setValue (self, value, index = 0, enabled = True):
+ def set_value (self, value, index = 0, enabled = True):
if PILImage is None:
return
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -47,7 +47,7 @@
# Create a GTK widget
# ---------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget (self, event, spacer):
gfObject = event.object
newWidget = gtk.Label (self._makeSafe ("%s" % gfObject.text))
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -36,7 +36,7 @@
# create a new page
# ---------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget (self, event, spacer):
gfObject = event.object
newWidget = self._uiForm._wrapper.createPage (gfObject)
self._containerToolkitWidget = newWidget
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -36,7 +36,7 @@
# Create the GTK widget
# ---------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget (self, event, spacer):
gfObject = event.object
(crec, recs, page) = gfObject.get_record_and_page_count ()
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/_base.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/_base.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -114,22 +114,22 @@
self.Destroy()
- def indexedFocus(self, index):
+ def indexed_focus(self, index):
pass
- def setValue(self, value, index=0, enabled=1):
+ def set_value(self, value, index=0, enabled=1):
value = textEncode(value)
widget = self.widgets[index]
widget.SetValue(value)
- def setCursorPosition(self, position, index=0):
+ def set_cursor_position(self, position, index=0):
pass
- def setSelectedArea(self, selection1, selection2, index=0):
+ def set_selected_area(self, selection1, selection2, index=0):
pass
- def createWidget(self, event, spacer):
- newWidget = self._createWidget(event, spacer)
+ def create_widget(self, event, spacer):
+ newWidget = self._create_widget(event, spacer)
self._addToCrossRef(newWidget,event.object,self)
return newWidget
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/box.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/box.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -32,7 +32,7 @@
class UIBox(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
dhtml = '<div id="" \
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/button.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/button.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -32,7 +32,7 @@
class UIButton(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
dhtml = '<input type="button" name="entGnueName"
id="blkGnue_class_fldCGnueName_field" \
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/entry.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/entry.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -32,7 +32,7 @@
class UIEntry(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
if object.style == 'dropdown':
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -41,7 +41,7 @@
UIHelper.__init__(self, event)
self.controls = []
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
#
# Size based upon the form definition
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/image.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/image.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -31,7 +31,7 @@
class UIImage(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
dhtml = '<image>'
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/label.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/label.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -32,7 +32,7 @@
class UILabel(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
dhtml = '<div style="position:absolute;\
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/page.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/page.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -30,7 +30,7 @@
from gnue.forms.uidrivers.html.common import *
class UIPage(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/_base.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/_base.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -94,10 +94,10 @@
## self.Destroy()
pass
- def indexedFocus(self, index):
+ def indexed_focus(self, index):
self.widgets[index].setFocus()
- def setValue(self, value, index=0, enabled=1):
+ def set_value(self, value, index=0, enabled=1):
# These must be here or dropdown style controls
# will get events they shouldn't and break.
widget = self.widgets[index]
@@ -126,20 +126,20 @@
## widget.setBackgroundColor(self._uiDriver._disabledColour)
## widget.Refresh()
- def setCursorPosition(self, position, index=0):
+ def set_cursor_position(self, position, index=0):
try:
- self.widgets[index].setCursorPosition(position)
+ self.widgets[index].set_cursor_position(position)
except AttributeError:
pass # For label-style entries
- def setSelectedArea(self, selection1, selection2, index=0):
+ def set_selected_area(self, selection1, selection2, index=0):
try:
self.widgets[index].setSelection(selection1, selection2-selection1)
except (AttributeError, TypeError):
pass # For label-style & dropdown entries
- def createWidget(self, event, spacer):
- newWidget = self._createWidget(event, spacer)
+ def create_widget(self, event, spacer):
+ newWidget = self._create_widget(event, spacer)
initFont(newWidget)
self._addToCrossRef(newWidget,event.object,self)
return newWidget
Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/box.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/box.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -37,7 +37,7 @@
#
class UIBox(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
# Create a group box..
Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/button.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/button.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -39,7 +39,7 @@
# Widget set specific function that creates a single instance of a button
#
class UIButton(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
# Create a button..
Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/entry.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/entry.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -40,7 +40,7 @@
# Widget set specific function that creates a single instance of a data entry
widget
#
class UIEntry(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
style = object.style
Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -50,7 +50,7 @@
UIHelper.__init__(self, event)
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
#
Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/label.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/label.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -45,7 +45,7 @@
class UILabel(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
# Create a label..
Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/page.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/page.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -48,7 +48,7 @@
# Note: The event trap for changing notebook pages is attached to the UIForm
#
class UIPage(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/scrollbar.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/scrollbar.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -45,7 +45,7 @@
# to navigate multiple records
#
class UIScrollBar(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
# Create a vertical scrollbar..
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -537,10 +537,10 @@
else:
return win32gui.GetWindowText(self._hwnd)
- def setCursorPosition(self, position):
+ def set_cursor_position(self, position):
win32gui.SendMessage(self._hwnd, win32con.EM_SETSEL, position, position)
- def setSelectedArea(self, selection1, selection2):
+ def set_selected_area(self, selection1, selection2):
win32gui.SendMessage(self._hwnd, win32con.EM_SETSEL, selection1,
selection2)
def getSelectedArea(self):
@@ -695,10 +695,10 @@
self.Destroy()
- def indexedFocus(self, index):
+ def indexed_focus(self, index):
self.widgets[index].SetFocus()
- def setValue(self, value, index=0, enabled=1):
+ def set_value(self, value, index=0, enabled=1):
widget = self.widgets[index]
# Check if foreign key changed
gfObject = self._uiDriver._IdToGFObj[widget.GetId()]
@@ -727,13 +727,13 @@
widget.Enable(enabled)
- def setCursorPosition(self, position, index=0):
- self.widgets[index].setCursorPosition(position)
+ def set_cursor_position(self, position, index=0):
+ self.widgets[index].set_cursor_position(position)
- def setSelectedArea(self, selection1, selection2, index=0):
- self.widgets[index].setSelectedArea(selection1, selection2)
+ def set_selected_area(self, selection1, selection2, index=0):
+ self.widgets[index].set_selected_area(selection1, selection2)
- def createWidget(self, event, spacer):
+ def create_widget(self, event, spacer):
gfObject = event.object
if hasattr (gfObject, 'Char__y'):
@@ -741,7 +741,7 @@
gap = gfObject._gap + 1
self.itemY = (posY + spacer * gap) * event.widgetHeight
- newWidget = self._createWidget(event, spacer)
+ newWidget = self._create_widget(event, spacer)
newWidget.SetFont(self._uiDriver._font)
if event.initialize:
self._eventHandler = event.eventHandler
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/box.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/box.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -36,7 +36,7 @@
#
class UIBox(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
w = int (event.widgetWidth / 2)
h = int (event.widgetHeight / 8)
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/button.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/button.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -37,7 +37,7 @@
# Widget set specific function that creates a single instance of a button
#
class UIButton(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
style = win32con.BS_PUSHBUTTON | win32con.WS_CHILD
styleEx = 0
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -38,7 +38,7 @@
# Widget set specific function that creates a single instance of a data entry
widget
#
class UIEntry(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
ostyle = object.style
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -53,7 +53,7 @@
UIHelper.__init__(self, event)
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
#
# Size based upon the form definition
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/image.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/image.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -37,7 +37,7 @@
#
class UIImage(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
style = win32con.WS_CHILD | win32con.WS_VISIBLE | win32con.SS_BITMAP
styleEx = 0
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/label.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/label.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -40,7 +40,7 @@
'center': win32con.SS_CENTER,
'right' : win32con.SS_RIGHT}
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
if self.itemWidth == -1:
self.itemWidth = len(str(textEncode(object.text)))*event.widgetWidth
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/page.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/page.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -35,7 +35,7 @@
# Note: The event trap for changing notebook pages is attached to the UIForm
#
class UIPage(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
object = event.object
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -43,7 +43,7 @@
# Create a new scrollbar widget
# ---------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget (self, event, spacer):
object = event.object
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -116,7 +116,7 @@
# --------------------------------------------------------------------------
# Set the focus to a given widget
# --------------------------------------------------------------------------
- def indexedFocus(self, index):
+ def indexed_focus(self, index):
"""
Sets the focus to the wx widget specified by index.
The focused widget will have a highlight color if it is set in gnue.conf.
@@ -141,7 +141,7 @@
# --------------------------------------------------------------------------
# On lose of the focus we un-select ComboBox-Entries
# --------------------------------------------------------------------------
- def loseFocus(self, index):
+ def lose_focus(self, index):
"""
Releases focus from the widget that currently had it.
Resets the widget's color to normal if focus highlighting is used.
@@ -158,7 +158,7 @@
# --------------------------------------------------------------------------
# Set the value of a widget
# --------------------------------------------------------------------------
- def setValue(self, value, index=0, enabled=True):
+ def set_value(self, value, index=0, enabled=True):
"""
Sets the value of a widget and optionally enables or disables the widget.
"""
@@ -211,7 +211,7 @@
# --------------------------------------------------------------------------
# Set the cursor's location in a widget
# --------------------------------------------------------------------------
- def setCursorPosition(self, position, index=0):
+ def set_cursor_position(self, position, index=0):
"""
Sets the cursor's position to the given location inside a capable widget.
"""
@@ -223,7 +223,7 @@
# --------------------------------------------------------------------------
# Set the selection inside a widget
# --------------------------------------------------------------------------
- def setSelectedArea(self, selection1, selection2, index=0):
+ def set_selected_area(self, selection1, selection2, index=0):
"""
Sets the selection start/end inside a capable widget.
"""
@@ -236,7 +236,7 @@
# --------------------------------------------------------------------------
# Create a new widget and add it to the cross reference table
# --------------------------------------------------------------------------
- def createWidget(self, event, spacer):
+ def create_widget(self, event, spacer):
"""
Creates a new WX widget and adds it to the cross reference table.
"""
@@ -246,7 +246,7 @@
else:
self.itemY = -1
- newWidget = self._createWidget(event, spacer)
+ newWidget = self._create_widget(event, spacer)
initFont(newWidget)
if event.initialize:
self._addToCrossRef(newWidget,event.object,self)
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/box.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/box.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -41,7 +41,7 @@
# --------------------------------------------------------------------------
# Create a staticbox widget
# --------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
"""
Creates a new Static Box widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -43,7 +43,7 @@
# --------------------------------------------------------------------------
# Create a button widget
# --------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
"""
Creates a new Button widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -46,7 +46,7 @@
# --------------------------------------------------------------------------
# Create a data entry widget
# --------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
"""
Creates a new data entry widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -57,7 +57,7 @@
# --------------------------------------------------------------------------
# Create a wx form widget
# --------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
"""
Creates a new wx form widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/image.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/image.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -44,7 +44,7 @@
# --------------------------------------------------------------------------
# Create an image widget
# --------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
"""
Creates a new StaticBitmap widget.
"""
@@ -108,7 +108,7 @@
# --------------------------------------------------------------------------
# Set the widget's PIL
# --------------------------------------------------------------------------
- def setValue(self, value, index=0, enabled=1):
+ def set_value(self, value, index=0, enabled=1):
"""
Loads an image.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/label.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/label.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -48,7 +48,7 @@
# --------------------------------------------------------------------------
# Create a button widget
# --------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
"""
Creates a new StaticText widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/page.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/page.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -42,7 +42,7 @@
# --------------------------------------------------------------------------
# Create a page widget
# --------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
"""
Creates a new Page widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -44,7 +44,7 @@
# --------------------------------------------------------------------------
# Create a scrollbar widget
# --------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget (self, event, spacer):
"""
Creates a new wxScrollBar widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/tree.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/tree.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/tree.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -47,7 +47,7 @@
#
class UITree(UIHelper):
- def _createWidget(self, event, spacer):
+ def _create_widget(self, event, spacer):
self._gftree = object = event.object
app = wx.wxGetApp()
self._eventHandler = self._sendEvt = event.eventHandler
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -55,13 +55,13 @@
# This class implements the common behaviour of wx 2.6 widgets
# =============================================================================
-class UIHelper (UIWidget):
+class UIHelper(UIWidget):
"""
Implements the common behaviour of wx 2.6 widgets
@ivar label: if not None, this is the wx.StaticText instance representing
the label for this widget.
- @ivar label: if not None, this is the instance of a wx.Window subclass
+ @ivar widget: if not None, this is the instance of a wx.Window subclass
representing the control of this widget
@ivar growable: if True, the widget is growable in both directions (like a
multiline text entry). This means if the owning container gets more
@@ -106,19 +106,16 @@
# Create a new wx widget
# -------------------------------------------------------------------------
- def createWidget(self, event, spacer):
+ def create_widget(self, event, spacer):
"""
This function creates a new wx widget and adds it to the cross
reference table.
"""
- self._eventHandler = event.eventHandler
-
self.__prepare_for_layout(spacer)
+ return self._create_widget_(event, spacer)
- return self._createWidget(event, spacer)
-
# -------------------------------------------------------------------------
# Prepare a widget for the layout-manager
# -------------------------------------------------------------------------
@@ -200,7 +197,7 @@
# Set the focus to a given widget
# -------------------------------------------------------------------------
- def indexedFocus (self, index):
+ def indexed_focus (self, index):
"""
Set the focus to the wx widget specified by index. For entries having
no rows the index will always be 0.
@@ -233,7 +230,7 @@
# On lose of the focus we un-select ComboBox-Entries
# -------------------------------------------------------------------------
- def loseFocus (self, index):
+ def lose_focus(self, index):
"""
Take away the focus of the wx widget with the given index. If this
object is used within a grid, losing the focus means hiding the entry
@@ -253,7 +250,7 @@
# Set the value of a widget
# -------------------------------------------------------------------------
- def setValue(self, value, index=0, enabled=True):
+ def set_value(self, value, index=0, enabled=True):
"""
This function sets the value of a widget and optionally enables or
disables the widget.
@@ -303,7 +300,7 @@
# Set the cursor's location in a widget
# ------------------------------------------------------------------------
- def setCursorPosition (self, position, index = 0):
+ def set_cursor_position (self, position, index = 0):
"""
Set the cursor position to the given location inside a capable widget.
@@ -327,7 +324,7 @@
# Set the selection inside a widget
# ------------------------------------------------------------------------
- def setSelectedArea (self, selection1, selection2, index=0):
+ def set_selected_area (self, selection1, selection2, index=0):
"""
Sets the selection start/end inside a capable widget.
@@ -351,13 +348,50 @@
widget.SetSelection (selection1, selection2)
+
+ # -------------------------------------------------------------------------
+ # Add a widget into a vertical box sizer
+ # -------------------------------------------------------------------------
+
def add_to_vbox(self, widget, expand=True, flags=0):
+ """
+ Add a widget into a vertical BoxSizer so that the widget is surrounded
+ by stretchable spacers of the same proportion. So the widget will be
+ centered.
+
+ @param widget: the wx widget to be 'centered'
+ @param expand: if True, the widget will expand it's size to fit the
+ available space
+ @param flags: additional flags passed to the Add-Method of the sizer
+
+ @returns: the created BoxSizer
+ """
return self.__add_to_sizer(wx.VERTICAL, widget, expand, flags)
+
+ # -------------------------------------------------------------------------
+ # Add a widget to a horizontal box
+ # -------------------------------------------------------------------------
+
def add_to_hbox(self, widget, expand=True, flags=0):
+ """
+ Add a widget into a horizontal BoxSizer so that the widget is
+ surrounded by stretchable spacers of the same proportion. So the
+ widget will be centered.
+
+ @param widget: the wx widget to be 'centered'
+ @param expand: if True, the widget will expand it's size to fit the
+ available space
+ @param flags: additional flags passed to the Add-Method of the sizer
+
+ @returns: the created BoxSizer
+ """
return self.__add_to_sizer(wx.HORIZONTAL, widget, expand, flags)
+ # -------------------------------------------------------------------------
+
def __add_to_sizer(self, direction, widget, expand, flags = 0):
+
flags |= expand and wx.EXPAND or 0
sizer = wx.BoxSizer(direction)
sizer.AddSpacer((0, 0), 1)
@@ -457,3 +491,24 @@
return (-1, -1)
else:
return (self._uiDriver.cellWidth * self.chr_w, -1)
+
+
+ # -------------------------------------------------------------------------
+ # Widget creation
+ # -------------------------------------------------------------------------
+
+ def _create_widget_(self, event, spacer):
+ """
+ Create a real wx widget for the given spacer. The spacer is the index
+ of the widget if it is embedded into a rows-environment (either using
+ rows of a block/entry or as child of a grid).
+
+ @param event: the creation-event instance carrying information like
+ container (parent-widget)
+ @param spacer: the index of the widget being created
+
+ @returns: the wx widget which should be added to the widget-collection
+ """
+
+ raise NotImplementedError("No implementation for %s (%s/%s)" \
+ % (self.__class__, event.container, spacer))
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -56,7 +56,7 @@
# Create a wx box widget
# -------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget_(self, event, spacer):
top, left = self.chr_pos
height, width = self.chr_span
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/button.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/button.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -44,7 +44,7 @@
# Create a button widget
# -------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget_(self, event, spacer):
"""
Creates a new Button widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -46,7 +46,7 @@
# Create the real wx widget
# -------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget_ (self, event, spacer):
"""
Create the wx widget. The actual creation will be dispatched to a
method called '__build_<style>' depending on the object's style.
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -65,7 +65,7 @@
# Create a new wx frame widget
# -------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget_ (self, event, spacer):
if self._form.style != 'dialog':
self.main_window = self._uiDriver._parentContainer
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -36,7 +36,7 @@
# Create a wx box widget
# -------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget_ (self, event, spacer):
self.growable = True
parent = event.container
@@ -174,7 +174,7 @@
if item == self:
return
- widget = item.createWidget(item._creationEvent, spacer)
+ widget = item.create_widget(item._creationEvent, spacer)
item.widgets.append(widget)
@@ -206,10 +206,10 @@
if self._uiDriver._uiFocusIndex > self._visible - 1:
focus = self._uiDriver._uiFocusWidget
- focus.loseFocus(self._uiDriver._uiFocusIndex)
+ focus.lose_focus(self._uiDriver._uiFocusIndex)
self._uiDriver._uiFocusIndex = self._visible - 1
- focus.indexedFocus(self._visible - 1)
+ focus.indexed_focus(self._visible - 1)
self._uiForm.main_window.Layout()
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/gridline.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/gridline.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/gridline.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -41,7 +41,7 @@
# Create a wx box widget
# -------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget_ (self, event, spacer):
owner = self.getParent()
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -36,7 +36,7 @@
# Create a wx box widget
# -------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget_ (self, event, spacer):
parent = event.container
owner = self.getParent()
@@ -78,7 +78,8 @@
if ui_widget.label:
add = 1
- self.container_sizer.Add(ui_widget.label, pos, span, wx.EXPAND)
+ self.container_sizer.Add(ui_widget.label, pos, span,
+ wx.ALIGN_BOTTOM)
if ui_widget.widget:
add = 1
@@ -90,12 +91,14 @@
span = (1, 1)
item = ui_widget.widget
+ flags = wx.ALIGN_TOP | wx.EXPAND
if isinstance(ui_widget, button.UIButton):
item = self.add_to_hbox(item)
+
elif not ui_widget.growable:
item = self.add_to_vbox(item)
- self.container_sizer.Add(item, pos, span, wx.EXPAND)
+ self.container_sizer.Add(item, pos, span, flags)
if add:
self.container_sizer.AddGrowableCol(self.__current_col,
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/image.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/image.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -57,7 +57,7 @@
# Create an image widget
# ------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget_ (self, event, spacer):
"""
Creates a new StaticBitmap widget.
"""
@@ -105,7 +105,7 @@
# Set the widget's PIL
# ------------------------------------------------------------------------
- def setValue (self, value, index = 0, enabled = True):
+ def set_value (self, value, index = 0, enabled = True):
"""
Loads an image.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/label.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/label.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -40,7 +40,7 @@
# Create a label widget
# ---------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget_ (self, event, spacer):
flags = self._ALIGNMENT [self._gfObject.alignment] | wx.ST_NO_AUTORESIZE
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -39,7 +39,7 @@
# Create a menu widget
# -------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget_(self, event, spacer):
"""
Creates a new Menu widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -39,7 +39,7 @@
# Create a menu item widget
# -------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget_(self, event, spacer):
"""
Creates a new MenuItem widget.
"""
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -40,7 +40,7 @@
# Create a new page widget
# -------------------------------------------------------------------------
- def _createWidget(self, event, spacer):
+ def _create_widget_(self, event, spacer):
self._pageIndex = len(self._uiForm.pages)
parent = event.container
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/scrollbar.py 2006-07-06
09:46:51 UTC (rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/scrollbar.py 2006-07-06
13:02:22 UTC (rev 8528)
@@ -35,7 +35,7 @@
# Create the wx widget
# ---------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget_ (self, event, spacer):
parent = event.container
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py 2006-07-06 09:46:51 UTC
(rev 8527)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py 2006-07-06 13:02:22 UTC
(rev 8528)
@@ -36,7 +36,7 @@
# Create a wx box widget
# -------------------------------------------------------------------------
- def _createWidget (self, event, spacer):
+ def _create_widget_ (self, event, spacer):
parent = event.container
owner = self.getParent()
@@ -81,11 +81,10 @@
if ui_widget.label:
add = 1
- if not ui_widget.growable:
- item = self.add_to_vbox(ui_widget.label)
- else:
- item = ui_widget.label
- self.container_sizer.Add(item, pos, span, wx.EXPAND)
+ flags = wx.ALIGN_CENTER_VERTICAL
+ if ui_widget.growable:
+ flags |= wx.EXPAND
+ self.container_sizer.Add(ui_widget.label, pos, span, flags)
if ui_widget.widget:
add = 1
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r8528 - in trunk/gnue-forms/src/uidrivers: _base _base/widgets curses/widgets gtk2/widgets gtk2/widgets/form html/widgets html/widgets/form qt/widgets qt/widgets/form win32/widgets win32/widgets/form wx/widgets wx/widgets/form wx26/widgets,
johannes <=