[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-forms/src GFParser.py GFObjects/GFEntry.py...
From: |
Bajusz Tamás |
Subject: |
gnue-forms/src GFParser.py GFObjects/GFEntry.py... |
Date: |
Sat, 18 Oct 2003 06:03:41 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue-forms
Branch:
Changes by: Bajusz Tamás <address@hidden> 03/10/18 06:03:39
Modified files:
src : GFParser.py
src/GFObjects : GFEntry.py
src/uidrivers/gtk2/widgets: _base.py entry.py
src/uidrivers/qt/widgets: _base.py entry.py
src/uidrivers/win32/widgets: entry.py
src/uidrivers/wx/widgets: entry.py
Log message:
on win32 current focus is invisible on checkbox entry if it has
no label, so label support added to checkboxes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFParser.py.diff?tr1=1.113&tr2=1.114&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFObjects/GFEntry.py.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/gtk2/widgets/_base.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/gtk2/widgets/entry.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/qt/widgets/_base.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/qt/widgets/entry.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/widgets/entry.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/wx/widgets/entry.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnue-forms/src/GFObjects/GFEntry.py
diff -c gnue-forms/src/GFObjects/GFEntry.py:1.89
gnue-forms/src/GFObjects/GFEntry.py:1.90
*** gnue-forms/src/GFObjects/GFEntry.py:1.89 Fri Sep 5 15:33:58 2003
--- gnue-forms/src/GFObjects/GFEntry.py Sat Oct 18 06:03:38 2003
***************
*** 48,53 ****
--- 48,54 ----
self.Char__height = int(gConfigForms('widgetHeight'))
self.Char__width = int(gConfigForms('widgetWidth'))
self.style = "default"
+ self.label = ""
self._inits = [self.initialize]
Index: gnue-forms/src/GFParser.py
diff -c gnue-forms/src/GFParser.py:1.113 gnue-forms/src/GFParser.py:1.114
*** gnue-forms/src/GFParser.py:1.113 Tue Aug 19 22:23:04 2003
--- gnue-forms/src/GFParser.py Sat Oct 18 06:03:38 2003
***************
*** 442,447 ****
--- 442,451 ----
'Unique': 1,
'Typecast': GTypecast.name,
'Description': 'The unique ID of the entry.' },
+ 'label': {
+ 'Required': 0,
+ 'Typecast': GTypecast.text,
+ 'Description': 'The optional label displayed next to
checkbox.' },
'field': {
'Typecast': GTypecast.name,
'References': 'field.name',
Index: gnue-forms/src/uidrivers/gtk2/widgets/_base.py
diff -c gnue-forms/src/uidrivers/gtk2/widgets/_base.py:1.7
gnue-forms/src/uidrivers/gtk2/widgets/_base.py:1.8
*** gnue-forms/src/uidrivers/gtk2/widgets/_base.py:1.7 Thu Oct 9 18:21:35 2003
--- gnue-forms/src/uidrivers/gtk2/widgets/_base.py Sat Oct 18 06:03:39 2003
***************
*** 122,131 ****
def setValue(self, value, index=0, enabled=1):
- # fix for 0.5.1 (Unicode is not internal encoding)
- value = unicode(value,gConfigForms('textEncoding'))
-
widget = self.widgets[index]
if widget.get_name()=='GtkCombo':
--- 122,132 ----
def setValue(self, value, index=0, enabled=1):
widget = self.widgets[index]
+
+ # fix for 0.5.1 (Unicode is not internal encoding)
+ if widget.get_name()!='GtkCheckButton':
+ value = unicode(value,gConfigForms('textEncoding'))
if widget.get_name()=='GtkCombo':
Index: gnue-forms/src/uidrivers/gtk2/widgets/entry.py
diff -c gnue-forms/src/uidrivers/gtk2/widgets/entry.py:1.8
gnue-forms/src/uidrivers/gtk2/widgets/entry.py:1.9
*** gnue-forms/src/uidrivers/gtk2/widgets/entry.py:1.8 Thu Oct 9 18:21:35 2003
--- gnue-forms/src/uidrivers/gtk2/widgets/entry.py Sat Oct 18 06:03:39 2003
***************
*** 84,91 ****
* event.widgetHeight)
elif style == 'checkbox':
! newWidget = gtk.CheckButton()
! newWidget.set_size_request(2 * event.textWidth, event.textHeight)
event.container.put(newWidget, object.Char__x * event.widgetWidth,
(object.Char__y + spacer + (object._gap * spacer)) *
event.widgetHeight)
newWidget._clicked_handler = newWidget.connect('clicked',
self.checkboxHandler, newWidget)
--- 84,91 ----
* event.widgetHeight)
elif style == 'checkbox':
! newWidget = gtk.CheckButton(object.label)
! newWidget.set_size_request(self.itemWidth, event.textHeight)
event.container.put(newWidget, object.Char__x * event.widgetWidth,
(object.Char__y + spacer + (object._gap * spacer)) *
event.widgetHeight)
newWidget._clicked_handler = newWidget.connect('clicked',
self.checkboxHandler, newWidget)
Index: gnue-forms/src/uidrivers/qt/widgets/_base.py
diff -c gnue-forms/src/uidrivers/qt/widgets/_base.py:1.5
gnue-forms/src/uidrivers/qt/widgets/_base.py:1.6
*** gnue-forms/src/uidrivers/qt/widgets/_base.py:1.5 Tue Mar 11 20:13:52 2003
--- gnue-forms/src/uidrivers/qt/widgets/_base.py Sat Oct 18 06:03:39 2003
***************
*** 114,120 ****
except AttributeError:
pass
! widget.setText(value)
widget.setEnabled(enabled)
## if enabled:
--- 114,123 ----
except AttributeError:
pass
! if object.style == "checkbox":
! widget.setChecked(value)
! else:
! widget.setText(value)
widget.setEnabled(enabled)
## if enabled:
Index: gnue-forms/src/uidrivers/qt/widgets/entry.py
diff -c gnue-forms/src/uidrivers/qt/widgets/entry.py:1.5
gnue-forms/src/uidrivers/qt/widgets/entry.py:1.6
*** gnue-forms/src/uidrivers/qt/widgets/entry.py:1.5 Sat Mar 8 00:11:26 2003
--- gnue-forms/src/uidrivers/qt/widgets/entry.py Sat Oct 18 06:03:39 2003
***************
*** 68,74 ****
elif style == 'checkbox':
newWidget = _CheckBox(event, self)
!
if event.initialize:
newWidget.setChecked(0)
--- 68,77 ----
elif style == 'checkbox':
newWidget = _CheckBox(event, self)
!
! # .. set the label text..
! newWidget.setText(object.label)
!
if event.initialize:
newWidget.setChecked(0)
***************
*** 134,140 ****
def setText(self, text):
self.setCurrentItem(self.__choices.index(text))
!
#
#
#
--- 137,148 ----
def setText(self, text):
self.setCurrentItem(self.__choices.index(text))
!
! class _CheckBox (_Base, QCheckBox):
! def __init__(self, event, uiwidget):
! QCheckBox.__init__(self, event.container)
! _Base.__init__(self, event, uiwidget)
!
#
#
#
Index: gnue-forms/src/uidrivers/win32/widgets/entry.py
diff -c gnue-forms/src/uidrivers/win32/widgets/entry.py:1.10
gnue-forms/src/uidrivers/win32/widgets/entry.py:1.11
*** gnue-forms/src/uidrivers/win32/widgets/entry.py:1.10 Wed May 28
17:54:57 2003
--- gnue-forms/src/uidrivers/win32/widgets/entry.py Sat Oct 18 06:03:39 2003
***************
*** 45,50 ****
--- 45,51 ----
ostyle = object.style
height = self.itemHeight+2
width = self.itemWidth+8
+ title = ""
if ostyle == 'dropdown':
style = win32con.WS_CHILD | win32con.WS_VSCROLL | win32con.WS_BORDER |
win32con.LBS_NOTIFY | \
***************
*** 62,70 ****
style = win32con.WS_CHILD | win32con.BS_AUTOCHECKBOX
styleEx = 0
className = "BUTTON"
! ## width = event.textWidth
! height = event.textHeight
! width = height
else: # Normal text box
style = win32con.WS_CHILD | win32con.ES_NOHIDESEL #| \
--- 63,69 ----
style = win32con.WS_CHILD | win32con.BS_AUTOCHECKBOX
styleEx = 0
className = "BUTTON"
! title = object.label
else: # Normal text box
style = win32con.WS_CHILD | win32con.ES_NOHIDESEL #| \
***************
*** 77,83 ****
styleEx = win32con.WS_EX_CLIENTEDGE
className = "EDIT"
! newWidget = Win32Entry(self._uiDriver, styleEx, className, "", style,
object.Char__x*event.widgetWidth,
(object.Char__y+spacer+(object._gap*spacer))*event.widgetHeight,
width,
--- 76,82 ----
styleEx = win32con.WS_EX_CLIENTEDGE
className = "EDIT"
! newWidget = Win32Entry(self._uiDriver, styleEx, className, title, style,
object.Char__x*event.widgetWidth,
(object.Char__y+spacer+(object._gap*spacer))*event.widgetHeight,
width,
Index: gnue-forms/src/uidrivers/wx/widgets/entry.py
diff -c gnue-forms/src/uidrivers/wx/widgets/entry.py:1.3
gnue-forms/src/uidrivers/wx/widgets/entry.py:1.4
*** gnue-forms/src/uidrivers/wx/widgets/entry.py:1.3 Sat Mar 8 23:08:51 2003
--- gnue-forms/src/uidrivers/wx/widgets/entry.py Sat Oct 18 06:03:39 2003
***************
*** 70,77 ****
newWidget.GetValue = newWidget.GetLabel
elif style == 'checkbox':
! newWidget = wxCheckBox(event.container, -1, "",defaultPoint,
! wxSize(2*event.textWidth,event.textHeight),
wxNO_BORDER|wxWANTS_CHARS)
if event.initialize:
newWidget.SetValue(0)
--- 70,77 ----
newWidget.GetValue = newWidget.GetLabel
elif style == 'checkbox':
! newWidget = wxCheckBox(event.container, -1, object.label,defaultPoint,
! wxSize(self.itemWidth,event.textHeight),
wxNO_BORDER|wxWANTS_CHARS)
if event.initialize:
newWidget.SetValue(0)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-forms/src GFParser.py GFObjects/GFEntry.py...,
Bajusz Tamás <=