[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/ROADMAP.in forms/src/uidrivers/qt/T...
|
From: |
Jason Cater |
|
Subject: |
gnue common/ROADMAP.in forms/src/uidrivers/qt/T... |
|
Date: |
Tue, 11 Mar 2003 20:13:52 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 03/03/11 20:13:52
Modified files:
common : ROADMAP.in
forms/src/uidrivers/qt: ToolBar.py UIdriver.py common.py
forms/src/uidrivers/qt/widgets: _base.py
forms/src/uidrivers/qt/widgets/form: widget.py wrappers.py
Log message:
more work on QT driver
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/ROADMAP.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/ToolBar.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/UIdriver.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/common.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/widgets/_base.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/widgets/form/widget.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: gnue/common/ROADMAP.in
diff -c gnue/common/ROADMAP.in:1.2 gnue/common/ROADMAP.in:1.3
*** gnue/common/ROADMAP.in:1.2 Mon Dec 16 22:07:25 2002
--- gnue/common/ROADMAP.in Tue Mar 11 20:13:52 2003
***************
*** 62,68 ****
GOALS
! The focus during the 0.5.x series of GNUe Common releases
will concentrate on cleanup, documentation, and fixing broken
or partially implemented features or other incompatabilities
with tools.
--- 62,68 ----
GOALS
! The focus during the 0.6.x series of GNUe Common releases
will concentrate on cleanup, documentation, and fixing broken
or partially implemented features or other incompatabilities
with tools.
Index: gnue/forms/src/uidrivers/qt/ToolBar.py
diff -c gnue/forms/src/uidrivers/qt/ToolBar.py:1.5
gnue/forms/src/uidrivers/qt/ToolBar.py:1.6
*** gnue/forms/src/uidrivers/qt/ToolBar.py:1.5 Tue Mar 11 16:03:02 2003
--- gnue/forms/src/uidrivers/qt/ToolBar.py Tue Mar 11 20:13:52 2003
***************
*** 52,65 ****
except KeyError:
icon = QIconSet(QPixmap(iconloc))
_cachedIcons[iconloc] = icon
else:
print "** WARNING: Cannot add '%s' to toolbar; no icon" %
userAction.event
return
-
- if grayloc:
- icon.setPixmap(QPixmap(grayloc), QIconSet.Normal, QIconSet.Disabled)
- else:
- print "** WARNING: No gray version of '%s' to toolbar; no icon" %
userAction.event
button = QToolButton(self.toolbar, name)
button.setIconSet(icon)
--- 52,65 ----
except KeyError:
icon = QIconSet(QPixmap(iconloc))
_cachedIcons[iconloc] = icon
+ if grayloc:
+ icon.setPixmap(QPixmap(grayloc), QIconSet.Normal, QIconSet.Disabled)
+ else:
+ print "** WARNING: No gray version of '%s' to toolbar; no icon" %
userAction.event
+
else:
print "** WARNING: Cannot add '%s' to toolbar; no icon" %
userAction.event
return
button = QToolButton(self.toolbar, name)
button.setIconSet(icon)
Index: gnue/forms/src/uidrivers/qt/UIdriver.py
diff -c gnue/forms/src/uidrivers/qt/UIdriver.py:1.6
gnue/forms/src/uidrivers/qt/UIdriver.py:1.7
*** gnue/forms/src/uidrivers/qt/UIdriver.py:1.6 Sat Mar 8 00:11:22 2003
--- gnue/forms/src/uidrivers/qt/UIdriver.py Tue Mar 11 20:13:52 2003
***************
*** 47,53 ****
from common import *
!
#
# GFUserInterface
#
--- 47,53 ----
from common import *
!
#
# GFUserInterface
#
***************
*** 57,72 ****
class GFUserInterface(commonToolkit.GFUserInterface):
def __init__(self, eventController, disableSplash = None):
commonToolkit.GFUserInterface.__init__(self,eventController)
! self._disabledColour = Qt.lightGray
def initialize(self):
self._qtapp = getQtApp()
!
! font = QFont("Courier")
font.setPointSize(int(gConfig('pointSize')))
setWidgetBaseFont(font)
!
#
# SplashScreen
#
--- 57,73 ----
class GFUserInterface(commonToolkit.GFUserInterface):
def __init__(self, eventController, disableSplash = None):
commonToolkit.GFUserInterface.__init__(self,eventController)
! self._disabledColour = None
def initialize(self):
self._qtapp = getQtApp()
!
! font = QFont("Courier", int(gConfigForms('pointSize')))
!
font.setPointSize(int(gConfig('pointSize')))
setWidgetBaseFont(font)
!
#
# SplashScreen
#
***************
*** 79,89 ****
maxHeight = fm.height()
maxDescent = fm.descent()
maxLeading = fm.leading()
!
self.textWidth = int(maxWidth+maxLeading) # The pixel width of text
inside a widget
self.textHeight = int(maxHeight+maxDescent) # The pixel height of text
inside a widget
self.widgetWidth = self.textWidth # The pixel width of a 1
char widget (for things like buttons)
! self.widgetHeight = self.textHeight + 3 # The pixel height of a 1
char widget (for things like buttons)
--- 80,90 ----
maxHeight = fm.height()
maxDescent = fm.descent()
maxLeading = fm.leading()
!
self.textWidth = int(maxWidth+maxLeading) # The pixel width of text
inside a widget
self.textHeight = int(maxHeight+maxDescent) # The pixel height of text
inside a widget
self.widgetWidth = self.textWidth # The pixel width of a 1
char widget (for things like buttons)
! self.widgetHeight = self.textHeight + 4 # The pixel height of a 1
char widget (for things like buttons)
***************
*** 110,117 ****
if exitApp:
for child in self._children:
! child.mainWindow.close(true)
!
#############################################################################
--- 111,118 ----
if exitApp:
for child in self._children:
! child.mainWindow.close(1)
!
#############################################################################
Index: gnue/forms/src/uidrivers/qt/common.py
diff -c gnue/forms/src/uidrivers/qt/common.py:1.6
gnue/forms/src/uidrivers/qt/common.py:1.7
*** gnue/forms/src/uidrivers/qt/common.py:1.6 Sat Mar 8 23:08:50 2003
--- gnue/forms/src/uidrivers/qt/common.py Tue Mar 11 20:13:52 2003
***************
*** 74,85 ****
global _font
widget.setFont(_font)
- _font = QFont("Courier")
-
def setWidgetBaseFont(font):
global _font
_font = font
!
#####################################################################
##
--- 74,83 ----
global _font
widget.setFont(_font)
def setWidgetBaseFont(font):
global _font
_font = font
!
#####################################################################
##
***************
*** 161,167 ****
pass
elif not (control or alt):
char = "%s" % event.text()
! if char:
action = events.Event('requestKEYPRESS', char,
text=char,
code=keycode)
--- 159,165 ----
pass
elif not (control or alt):
char = "%s" % event.text()
! if char:
action = events.Event('requestKEYPRESS', char,
text=char,
code=keycode)
***************
*** 178,198 ****
def mousePressEvent(self, event):
uiwidget = self._uiwidget
gfObject = uiwidget._gfObject
!
! if self.hasFocus():
! print "** Move cursor"
! # Move cursor
! ## cursorPosition = self.getInsertionPoint()
! ##
self._eventHandler('requestCURSORMOVE',position=cursorPosition,_form=gfObject._form)
! else:
! # Request Focus
!
self._eventHandler('requestFOCUS',gfObject,_form=gfObject._form)
! print "** Jump to Record"
!
! ## count =
self._uiwidget._uiDriver._IdToUIObj[id(self)].widgets.index(uiwidget)
! ## self._eventHandler('requestJUMPRECORD',count -
gfObject._visibleIndex,_form=gfObject._form)
--- 176,192 ----
def mousePressEvent(self, event):
uiwidget = self._uiwidget
gfObject = uiwidget._gfObject
!
! if not self.hasFocus():
! # Request Focus
self._eventHandler('requestFOCUS',gfObject,_form=gfObject._form)
! count = uiwidget._uiDriver._IdToUIObj[id(self)].widgets.index(self)
! self._eventHandler('requestJUMPRECORD',count -
gfObject._visibleIndex,_form=gfObject._form)
+ # TODO: HACK!!! does QT not have a way to translate a
+ # TODO: mouse click into text insertion point?
+ cursorPosition = int(event.x() / float(uiwidget._uiDriver.textWidth)+0.5)
+
self._eventHandler('requestCURSORMOVE',position=cursorPosition,_form=gfObject._form)
Index: gnue/forms/src/uidrivers/qt/widgets/_base.py
diff -c gnue/forms/src/uidrivers/qt/widgets/_base.py:1.4
gnue/forms/src/uidrivers/qt/widgets/_base.py:1.5
*** gnue/forms/src/uidrivers/qt/widgets/_base.py:1.4 Tue Mar 4 23:12:02 2003
--- gnue/forms/src/uidrivers/qt/widgets/_base.py Tue Mar 11 20:13:52 2003
***************
*** 86,92 ****
print "hiding", self.widgets
for widget in self.widgets:
widget.show(0)
!
def showModal(self):
self.setModal(1)
--- 86,92 ----
print "hiding", self.widgets
for widget in self.widgets:
widget.show(0)
!
def showModal(self):
self.setModal(1)
***************
*** 101,107 ****
# These must be here or dropdown style controls
# will get events they shouldn't and break.
widget = self.widgets[index]
- ## widget.SetEvtHandlerEnabled(FALSE)
# Check if foreign key changed
object = self._uiDriver._IdToGFObj[id(widget)]
--- 101,106 ----
***************
*** 116,123 ****
pass
widget.setText(value)
! ## widget.enable(enabled)
!
## if enabled:
## widget.setBackgroundColor(widget.__origBackgroundColor)
## else:
--- 115,122 ----
pass
widget.setText(value)
! widget.setEnabled(enabled)
!
## if enabled:
## widget.setBackgroundColor(widget.__origBackgroundColor)
## else:
Index: gnue/forms/src/uidrivers/qt/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.7
gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.8
*** gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.7 Sat Mar 8
23:08:50 2003
--- gnue/forms/src/uidrivers/qt/widgets/form/widget.py Tue Mar 11 20:13:52 2003
***************
*** 62,68 ****
formHeight = int(self._form._layout.Char__height)
self._visibleSize = (formWidth*self._uiDriver.widgetWidth,
formHeight*self._uiDriver.widgetHeight)
!
self._formSize = formSize = (formWidth*self._uiDriver.widgetWidth,
(formHeight+self.menu_sb_space)*self._uiDriver.widgetHeight)
--- 62,68 ----
formHeight = int(self._form._layout.Char__height)
self._visibleSize = (formWidth*self._uiDriver.widgetWidth,
formHeight*self._uiDriver.widgetHeight)
!
self._formSize = formSize = (formWidth*self._uiDriver.widgetWidth,
(formHeight+self.menu_sb_space)*self._uiDriver.widgetHeight)
***************
*** 92,97 ****
--- 92,98 ----
self._wrapper = wrappers.PlainWrapper(self)
newWidget = self._wrapper.pane
+ ## self._uiDriver._disabledColour = newWidget.paletteBackgroundColor()
self._containerToolkitWidget = newWidget
***************
*** 118,124 ****
# back an event closing the application
#`
def closeTrap(self,event):
! form = self._form
if event.CanVeto():
self._uiDriver.dispatchEvent('requestEXIT',_form=self._form)
--- 119,125 ----
# back an event closing the application
#`
def closeTrap(self,event):
! form = self._form
if event.CanVeto():
self._uiDriver.dispatchEvent('requestEXIT',_form=self._form)
***************
*** 126,132 ****
object = _eventObjToQtWindow(event)
object.Destroy()
# wxExit() TODO: Try and work this into navigator or here if it still
hangs
!
#
# gotoPage
--- 127,133 ----
object = _eventObjToQtWindow(event)
object.Destroy()
# wxExit() TODO: Try and work this into navigator or here if it still
hangs
!
#
# gotoPage
Index: gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py:1.5
gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py:1.6
*** gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py:1.5 Sat Mar 8
00:11:27 2003
--- gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py Tue Mar 11
20:13:52 2003
***************
*** 70,75 ****
--- 70,78 ----
self.move(self.margin, self.margin)
self.resize(w,h)
+ # TODO: *cough* Hack!!! *cough*
+ self.frame.resize(w*1.2, h*1.2)
+
self.show()
## self.fixScrollbars()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue common/ROADMAP.in forms/src/uidrivers/qt/T...,
Jason Cater <=