[gnue] r7770 - in trunk/gnue-forms/src/uidrivers: curses qt qt/widgets/form

[jamest]

Author: jamest
Date: 2005-08-01 21:43:03 -0500 (Mon, 01 Aug 2005)
New Revision: 7770

Modified:
   trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
   trunk/gnue-forms/src/uidrivers/qt/ToolBar.py
   trunk/gnue-forms/src/uidrivers/qt/UIdriver.py
   trunk/gnue-forms/src/uidrivers/qt/widgets/form/wrappers.py
Log:
added missing bell function to curses
changes needed to get intro.gfd displaying w/ qt driver again


Modified: trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2005-08-01 09:01:45 UTC 
(rev 7769)
+++ trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2005-08-02 02:43:03 UTC 
(rev 7770)
@@ -230,6 +230,13 @@
     curses.beep ()
 
   # ---------------------------------------------------------------------------
+  # Cause console to beep
+  # ---------------------------------------------------------------------------
+
+  def formBeep (self, event):
+    curses.beep ()
+
+  # ---------------------------------------------------------------------------
   # Indicate start of nonresponsive phase
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/qt/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/ToolBar.py        2005-08-01 09:01:45 UTC 
(rev 7769)
+++ trunk/gnue-forms/src/uidrivers/qt/ToolBar.py        2005-08-02 02:43:03 UTC 
(rev 7770)
@@ -51,7 +51,7 @@
         icon = QIconSet(QPixmap(iconloc))
         _cachedIcons[iconloc] = icon
         if grayloc:
-          icon.setPixmap(QPixmap(grayloc), QIconSet.Normal, QIconSet.Disabled)
+          icon.setPixmap(QPixmap(grayloc), QIconSet.Automatic, 
QIconSet.Normal, QIconSet.Off)
         else:
           print "** WARNING: No gray version of '%s' to toolbar; no icon" % 
userAction.event
 

Modified: trunk/gnue-forms/src/uidrivers/qt/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/UIdriver.py       2005-08-01 09:01:45 UTC 
(rev 7769)
+++ trunk/gnue-forms/src/uidrivers/qt/UIdriver.py       2005-08-02 02:43:03 UTC 
(rev 7770)
@@ -61,6 +61,14 @@
 # All UIs must provide this class
 #
 class GFUserInterface(commonToolkit.GFUserInterface):
+  _MBOX_KIND = {'Info'    : {'style': QMessageBox.information,
+                                 'title': _("Information")},
+                'Warning' : {'style': QMessageBox.warning,
+                             'title': _("Warning")},
+                'Question': {'style': QInputDialog.getText,
+                             'title': _("Question")},
+                'Error'   : {'style': QMessageBox.critical,
+                             'title': _("Error")}}
 
   def initialize(self):
 
@@ -179,7 +187,6 @@
   def endWait (self, event):
     self._qtapp.restoreOverrideCursor()
 
-
   #
   # Clipboard routines
   #
@@ -201,7 +208,6 @@
   #
   # Processes the events from the widget set
   #
-
   #
   # closeTrap
   #
@@ -215,5 +221,15 @@
     else:
       object = _eventObjToQtWindow(event)
       object.Destroy()
-      # wxExit() TODO: Try and work this into navigator or here if it still 
hangs
+  
+  def _showMessage (self, message, kind = 'Info', title = None, cancel = 
False):
 
+    boxClass = self._MBOX_KIND [kind]['style']
+
+    if title is None:
+      title = self._MBOX_KIND [kind]['title']
+    result = boxClass (None, title, lineWrap(message,80))
+
+  def _showException (self, group, name, message, detail):
+    self._showMessage (detail, 'Error')
+

Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/form/wrappers.py  2005-08-01 
09:01:45 UTC (rev 7769)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/form/wrappers.py  2005-08-02 
02:43:03 UTC (rev 7770)
@@ -189,8 +189,8 @@
         p.show()
 
         
-_tabStyles = {'left': 0, ##Top,
-              'right':0, ##Top,
-              'bottom':0, ##Bottom,
-              'top':0, ##Top,
+_tabStyles = {'left': QTabWidget.Top, ##Top,
+              'right': QTabWidget.Top, ##Top,
+              'bottom': QTabWidget.Bottom, ##Bottom,
+              'top':QTabWidget.Top, ##Top,
               }