Author: reinhard
Date: 2009-12-09 10:27:29 -0600 (Wed, 09 Dec 2009)
New Revision: 10106
Modified:
trunk/gnue-forms/src/GFObjects/GFTabStop.py
trunk/gnue-forms/src/GFObjects/commanders.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/menuitem.py
trunk/gnue-forms/src/uidrivers/qt3/widgets/button.py
trunk/gnue-forms/src/uidrivers/qt3/widgets/entry.py
trunk/gnue-forms/src/uidrivers/qt3/widgets/menuitem.py
trunk/gnue-forms/src/uidrivers/qt3/widgets/toolbutton.py
trunk/gnue-forms/src/uidrivers/qt4/widgets/button.py
trunk/gnue-forms/src/uidrivers/qt4/widgets/entry.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/menuitem.py
trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py
Log:
Replaced _ui_enable_() and _ui_disable_() methods in uidrivers by
_ui_set_enabled_().
Modified: trunk/gnue-forms/src/GFObjects/GFTabStop.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFTabStop.py 2009-12-08 15:24:24 UTC (rev
10105)
+++ trunk/gnue-forms/src/GFObjects/GFTabStop.py 2009-12-09 16:27:29 UTC (rev
10106)
@@ -271,7 +271,7 @@
# Re-enable old current row if it was disabled
if not self.__current_row_enabled:
- self.uiWidget._ui_enable_(old_visible_index)
+ self.uiWidget._ui_set_enabled_(old_visible_index, True)
self.__current_row_enabled = True
last_enabled_row = self._visibleIndex + \
@@ -280,17 +280,17 @@
# Disable rows if necessary
for i in range(last_enabled_row+1, self.__last_enabled_row+1):
- self.uiWidget._ui_disable_(i)
+ self.uiWidget._ui_set_enabled_(i, False)
# Enable rows if necessary
for i in range(self.__last_enabled_row+1, last_enabled_row+1):
- self.uiWidget._ui_enable_(i)
+ self.uiWidget._ui__set_enabled_(i, False)
self.__last_enabled_row = last_enabled_row
# Disable current row if current record is -1
if cur_record == -1:
- self.uiWidget._ui_disable_(self._visibleIndex)
+ self.uiWidget._ui_set_enabled_(self._visibleIndex, False)
self.__current_row_enabled = False
first_visible_record = cur_record - self._visibleIndex
Modified: trunk/gnue-forms/src/GFObjects/commanders.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/commanders.py 2009-12-08 15:24:24 UTC
(rev 10105)
+++ trunk/gnue-forms/src/GFObjects/commanders.py 2009-12-09 16:27:29 UTC
(rev 10106)
@@ -280,10 +280,7 @@
if new_ui_enabled != self._ui_enabled:
if self.uiWidget is not None:
- if new_ui_enabled:
- self.uiWidget._ui_enable_()
- else:
- self.uiWidget._ui_disable_()
+ self.uiWidget._ui_set_enabled_(new_ui_enabled)
self._ui_enabled = new_ui_enabled
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/button.py 2009-12-08
15:24:24 UTC (rev 10105)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/button.py 2009-12-09
16:27:29 UTC (rev 10106)
@@ -56,17 +56,11 @@
# Enable/disable this button
# -------------------------------------------------------------------------
- def _ui_enable_(self, index):
- self.__enabled[index] = True
+ def _ui_set_enabled_(self, index, value):
+ self.__enabled[index] = value
self.__repaint(index, False)
# -------------------------------------------------------------------------
-
- def _ui_disable_(self, index):
- self.__enabled[index] = False
- self.__repaint(index, False)
-
- # -------------------------------------------------------------------------
# Focus has changed to this button
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py 2009-12-08
15:24:24 UTC (rev 10105)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py 2009-12-09
16:27:29 UTC (rev 10106)
@@ -102,17 +102,11 @@
# Enable/disable this entry
# -------------------------------------------------------------------------
- def _ui_enable_(self, index):
+ def _ui_set_enabled_(self, index, value):
- self.widgets[index]._ui_enable_()
+ self.widgets[index]._ui_set_enabled_(value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self, index):
-
- self.widgets[index]._ui_disable_()
-
-
# -------------------------------------------------------------------------
# Set "editable" status for this widget
# -------------------------------------------------------------------------
@@ -299,19 +293,12 @@
# -------------------------------------------------------------------------
- def _ui_enable_(self):
+ def _ui_set_enabled_(self, value):
- self.enabled = True
+ self.enabled = value
self._repaint_()
- # -------------------------------------------------------------------------
- def _ui_disable_(self):
-
- self.enabled = False
- self._repaint_()
-
-
# -------------------------------------------------------------------------
# Properties
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/menuitem.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/menuitem.py 2009-12-08
15:24:24 UTC (rev 10105)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/menuitem.py 2009-12-09
16:27:29 UTC (rev 10106)
@@ -99,21 +99,13 @@
# Enable/disable menu item
# -------------------------------------------------------------------------
- def _ui_enable_(self):
+ def _ui_set_enabled_(self, value):
- self.is_enabled = True
+ self.is_enabled = value
self._uiForm.update_fkey_bar()
return
- # -------------------------------------------------------------------------
- def _ui_disable_(self):
-
- self.is_enabled = False
- self._uiForm.update_fkey_bar()
- return
-
-
# =============================================================================
# Definition of the available hotkeys
# =============================================================================
Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/button.py 2009-12-08
15:24:24 UTC (rev 10105)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/button.py 2009-12-09
16:27:29 UTC (rev 10106)
@@ -68,15 +68,11 @@
# Enable/disable this button
# -------------------------------------------------------------------------
- def _ui_enable_(self, index):
- self.widgets[index].setEnabled(True)
+ def _ui_set_enabled_(self, index, value):
+ self.widgets[index].setEnabled(value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self, index):
- self.widgets[index].setEnabled(False)
-
# =============================================================================
# QT Button class
# =============================================================================
Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/entry.py 2009-12-08 15:24:24 UTC
(rev 10105)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/entry.py 2009-12-09 16:27:29 UTC
(rev 10106)
@@ -146,15 +146,10 @@
# Enable/disable this entry
# -------------------------------------------------------------------------
- def _ui_enable_(self, index):
- self.widgets[index].setEnabled(True)
+ def _ui_set_enabled_(self, index, value):
+ self.widgets[index].setEnabled(value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self, index):
- self.widgets[index].setEnabled(False)
-
-
# -------------------------------------------------------------------------
# Set "editable" status for this widget
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/menuitem.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/menuitem.py 2009-12-08
15:24:24 UTC (rev 10105)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/menuitem.py 2009-12-09
16:27:29 UTC (rev 10106)
@@ -112,19 +112,12 @@
# Enable/disable menu item
# -------------------------------------------------------------------------
- def _ui_enable_(self):
+ def _ui_set_enabled_(self, value):
if self.__widget is not None:
- self.parent.setItemEnabled(self.__widget, True)
+ self.parent.setItemEnabled(self.__widget, value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self):
-
- if self.__widget is not None:
- self.parent.setItemEnabled(self.__widget, False)
-
-
# -------------------------------------------------------------------------
# The keymap for hotkeys
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/toolbutton.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/toolbutton.py 2009-12-08
15:24:24 UTC (rev 10105)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/toolbutton.py 2009-12-09
16:27:29 UTC (rev 10106)
@@ -109,17 +109,11 @@
# Enable/disable menu item
# -------------------------------------------------------------------------
- def _ui_enable_(self):
+ def _ui_set_enabled_(self, value):
if self.__widget is not None:
- self.__widget.setEnabled(True)
+ self.__widget.setEnabled(value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self):
- if self.__widget is not None:
- self.__widget.setEnabled(False)
-
-
# =============================================================================
# Configuration data
# =============================================================================
Modified: trunk/gnue-forms/src/uidrivers/qt4/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt4/widgets/button.py 2009-12-08
15:24:24 UTC (rev 10105)
+++ trunk/gnue-forms/src/uidrivers/qt4/widgets/button.py 2009-12-09
16:27:29 UTC (rev 10106)
@@ -65,15 +65,10 @@
# Enable/disable this button
# -------------------------------------------------------------------------
- def _ui_enable_(self, index):
- self.widgets[index].setEnabled(True)
+ def _ui_set_enabled_(self, index, value):
+ self.widgets[index].setEnabled(value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self, index):
- self.widgets[index].setEnabled(False)
-
-
# =============================================================================
# QT Button class
# =============================================================================
Modified: trunk/gnue-forms/src/uidrivers/qt4/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt4/widgets/entry.py 2009-12-08 15:24:24 UTC
(rev 10105)
+++ trunk/gnue-forms/src/uidrivers/qt4/widgets/entry.py 2009-12-09 16:27:29 UTC
(rev 10106)
@@ -138,15 +138,10 @@
# Enable/disable this entry
# -------------------------------------------------------------------------
- def _ui_enable_(self, index):
- self.widgets[index].setEnabled(True)
+ def _ui_set_enabled_(self, index, value):
+ self.widgets[index].setEnabled(value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self, index):
- self.widgets[index].setEnabled(False)
-
-
# -------------------------------------------------------------------------
# Set "editable" status for this widget
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2009-12-08 15:24:24 UTC
(rev 10105)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2009-12-09 16:27:29 UTC
(rev 10106)
@@ -143,15 +143,10 @@
# Enable/disable this button
# -------------------------------------------------------------------------
- def _ui_enable_(self, index):
- self.widgets[index].Enable(True)
+ def _ui_set_enabled_(self, index, value):
+ self.widgets[index].Enable(value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self, index):
- self.widgets[index].Enable(False)
-
-
# -------------------------------------------------------------------------
# Indicate whether this control is growable
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py 2009-12-08 15:24:24 UTC
(rev 10105)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py 2009-12-09 16:27:29 UTC
(rev 10106)
@@ -448,15 +448,10 @@
# Enable/disable this entry
# -------------------------------------------------------------------------
- def _ui_enable_(self, index):
- self.widgets[index].Enable(True)
+ def _ui_set_enabled_(self, index, value):
+ self.widgets[index].Enable(value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self, index):
- self.widgets[index].Enable(False)
-
-
# -------------------------------------------------------------------------
# Set "editable" status for this widget
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py 2009-12-08
15:24:24 UTC (rev 10105)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py 2009-12-09
16:27:29 UTC (rev 10106)
@@ -120,17 +120,11 @@
# Enable/disable menu item
# -------------------------------------------------------------------------
- def _ui_enable_(self):
+ def _ui_set_enabled_(self, value):
if self.__widget is not None:
- self.__widget.Enable(True)
+ self.__widget.Enable(value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self):
- if self.__widget is not None:
- self.__widget.Enable(False)
-
-
# =============================================================================
# Configuration data
# =============================================================================
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py 2009-12-08
15:24:24 UTC (rev 10105)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py 2009-12-09
16:27:29 UTC (rev 10106)
@@ -110,21 +110,13 @@
# Enable/disable menu item
# -------------------------------------------------------------------------
- def _ui_enable_(self):
+ def _ui_set_enabled_(self, value):
if self.__widget is not None:
# FIXME: why doesn't the next line work?
- # self.__widget.Enable(True)
- self.__widget.GetToolBar().EnableTool(self.__widget.GetId(), True)
+ # self.__widget.Enable(value)
+ self.__widget.GetToolBar().EnableTool(self.__widget.GetId(), value)
- # -------------------------------------------------------------------------
- def _ui_disable_(self):
- if self.__widget is not None:
- # FIXME: why doesn't the next line work?
- # self.__widget.Enable(False)
- self.__widget.GetToolBar().EnableTool(self.__widget.GetId(), False)
-
-
# =============================================================================
# Configuration data
# =============================================================================
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
