qt4_compat and qt4_editor: more pyqt/pyside fixes

efiring · efiring · commit bd245ef1541c · 2011-07-04T11:28:34.000-10:00
diff --git a/lib/matplotlib/backends/qt4_compat.py b/lib/matplotlib/backends/qt4_compat.py
@@ -52,19 +52,20 @@ def prepare_pyqt4():
     __version__ = QtCore.PYQT_VERSION_STR
 
     # Use new getSaveFileNameAndFilter()
-    _getSaveFileName = lambda self, msg, start, filters, \
-                              selectedFilter : \
-                        QtGui.QFileDialog.getSaveFileNameAndFilter( \
-                        self, msg, start, filters, selectedFilter)[0]
-
-
+    _get_save = QtGui.QFileDialog.getSaveFileNameAndFilter
 
 elif QT_API == QT_API_PYSIDE:
     from PySide import QtCore, QtGui, __version__, __version_info__
     if __version_info__ < (1,0,3):
         raise ImportError(
             "Matplotlib backend_qt4 and backend_qt4agg require PySide >=1.0.3")
 
+    _get_save = QtGui.QFileDialog.getSaveFileName
+
 else:
     raise RuntimeError('Invalid Qt API %r, valid values are: %r or %r' %
                        (QT_API, QT_API_PYQT, QT_API_PYSIDE))
+
+def _getSaveFileName(self, msg, start, filters, selectedFilter):
+    return _get_save(self, msg, start, filters, selectedFilter)[0]
+
diff --git a/lib/matplotlib/backends/qt4_editor/formlayout.py b/lib/matplotlib/backends/qt4_editor/formlayout.py
@@ -62,10 +62,10 @@
  QtGui.QTabWidget, QtGui.QApplication, QtGui.QStackedWidget, QtGui.QDateEdit,
  QtGui.QDateTimeEdit, QtGui.QFont, QtGui.QFontComboBox, QtGui.QFontDatabase,
  QtGui.QGridLayout, QtGui.QFormLayout, QtGui.QDoubleValidator)
-                         
+
 (Qt, SIGNAL, SLOT, QObject, QSize,pyqtSignature, pyqtProperty) =\
-(QtCore.Qt, QtCore.SIGNAL, QtCore.SLOT, QtCore.QObject, QtCore.QSize, 
- QtCore.pyqtSignature, QtCore.pyqtProperty)
+(QtCore.Qt, QtCore.SIGNAL, QtCore.SLOT, QtCore.QObject, QtCore.QSize,
+ QtCore.Slot, QtCore.Property)
 
 import datetime
 
@@ -74,22 +74,22 @@ class ColorButton(QPushButton):
     Color choosing push button
     """
     __pyqtSignals__ = ("colorChanged(QColor)",)
-    
+
     def __init__(self, parent=None):
         QPushButton.__init__(self, parent)
         self.setFixedSize(20, 20)
         self.setIconSize(QSize(12, 12))
         self.connect(self, SIGNAL("clicked()"), self.choose_color)
         self._color = QColor()
-    
+
     def choose_color(self):
         color = QColorDialog.getColor(self._color,self.parentWidget(),'')
         if color.isValid():
             self.set_color(color)
-    
+
     def get_color(self):
         return self._color
-    
+
     @pyqtSignature("QColor")
     def set_color(self, color):
         if color != self._color:
@@ -98,7 +98,7 @@ def set_color(self, color):
             pixmap = QPixmap(self.iconSize())
             pixmap.fill(color)
             self.setIcon(QIcon(pixmap))
-    
+
     color = pyqtProperty("QColor", get_color, set_color)
 
 
@@ -146,11 +146,11 @@ def update_color(self, text):
 
     def update_text(self, color):
         self.lineedit.setText(color.name())
-        
+
     def text(self):
         return self.lineedit.text()
-    
-    
+
+
 def font_is_installed(font):
     """Check if font is installed"""
     return [fam for fam in QFontDatabase().families() if unicode(fam)==font]
@@ -184,12 +184,12 @@ def __init__(self, value, parent=None):
         QGridLayout.__init__(self)
         font = tuple_to_qfont(value)
         assert font is not None
-        
+
         # Font family
         self.family = QFontComboBox(parent)
         self.family.setCurrentFont(font)
         self.addWidget(self.family, 0, 0, 1, -1)
-        
+
         # Font size
         self.size = QComboBox(parent)
         self.size.setEditable(True)
@@ -201,17 +201,17 @@ def __init__(self, value, parent=None):
         self.size.addItems([str(s) for s in sizelist])
         self.size.setCurrentIndex(sizelist.index(size))
         self.addWidget(self.size, 1, 0)
-        
+
         # Italic or not
         self.italic = QCheckBox(self.tr("Italic"), parent)
         self.italic.setChecked(font.italic())
         self.addWidget(self.italic, 1, 1)
-        
+
         # Bold or not
         self.bold = QCheckBox(self.tr("Bold"), parent)
         self.bold.setChecked(font.bold())
         self.addWidget(self.bold, 1, 2)
-        
+
     def get_font(self):
         font = self.family.currentFont()
         font.setItalic(self.italic.isChecked())
@@ -223,7 +223,7 @@ def get_font(self):
 def is_edit_valid(edit):
     text = edit.text()
     state = edit.validator().validate(text, 0)[0]
-	
+
     return state == QDoubleValidator.Acceptable
 
 class FormWidget(QWidget):
@@ -242,7 +242,7 @@ def __init__(self, data, comment="", parent=None):
             print "*"*80
             print "COMMENT:", comment
             print "*"*80
-            
+
     def get_dialog(self):
         """Return FormDialog instance"""
         dialog = self.parent()
@@ -315,7 +315,7 @@ def setup(self):
                 field = QLineEdit(repr(value), self)
             self.formlayout.addRow(label, field)
             self.widgets.append(field)
-            
+
     def get(self):
         valuelist = []
         for index, (label, value) in enumerate(self.data):
@@ -356,26 +356,26 @@ def __init__(self, datalist, comment="", parent=None):
         self.setLayout(layout)
         self.combobox = QComboBox()
         layout.addWidget(self.combobox)
-        
+
         self.stackwidget = QStackedWidget(self)
         layout.addWidget(self.stackwidget)
         self.connect(self.combobox, SIGNAL("currentIndexChanged(int)"),
                      self.stackwidget, SLOT("setCurrentIndex(int)"))
-        
+
         self.widgetlist = []
         for data, title, comment in datalist:
             self.combobox.addItem(title)
             widget = FormWidget(data, comment=comment, parent=self)
             self.stackwidget.addWidget(widget)
             self.widgetlist.append(widget)
-            
+
     def setup(self):
         for widget in self.widgetlist:
             widget.setup()
 
     def get(self):
         return [ widget.get() for widget in self.widgetlist]
-        
+
 
 class FormTabWidget(QWidget):
     def __init__(self, datalist, comment="", parent=None):
@@ -393,11 +393,11 @@ def __init__(self, datalist, comment="", parent=None):
             index = self.tabwidget.addTab(widget, title)
             self.tabwidget.setTabToolTip(index, comment)
             self.widgetlist.append(widget)
-            
+
     def setup(self):
         for widget in self.widgetlist:
             widget.setup()
-            
+
     def get(self):
         return [ widget.get() for widget in self.widgetlist]
 
@@ -409,7 +409,7 @@ def __init__(self, data, title="", comment="",
         QDialog.__init__(self, parent)
 
         self.apply_callback = apply
-        
+
         # Form
         if isinstance(data[0][0], (list, tuple)):
             self.formwidget = FormTabWidget(data, comment=comment,
@@ -418,11 +418,11 @@ def __init__(self, data, title="", comment="",
             self.formwidget = FormComboWidget(data, comment=comment,
                                               parent=self)
         else:
-            self.formwidget = FormWidget(data, comment=comment, 
+            self.formwidget = FormWidget(data, comment=comment,
                                          parent=self)
         layout = QVBoxLayout()
         layout.addWidget(self.formwidget)
-        
+
         self.float_fields = []
         self.formwidget.setup()
 
@@ -439,15 +439,15 @@ def __init__(self, data, title="", comment="",
         layout.addWidget(bbox)
 
         self.setLayout(layout)
-        
+
         self.setWindowTitle(title)
         if not isinstance(icon, QIcon):
             icon = QWidget().style().standardIcon(QStyle.SP_MessageBoxQuestion)
         self.setWindowIcon(icon)
-        
+
     def register_float_field(self, field):
         self.float_fields.append(field)
-        
+
     def update_buttons(self):
         valid = True
         for field in self.float_fields:
@@ -457,18 +457,18 @@ def update_buttons(self):
             btn = self.bbox.button(btn_type)
             if btn is not None:
                 btn.setEnabled(valid)
-        
+
     def accept(self):
         self.data = self.formwidget.get()
         QDialog.accept(self)
-        
+
     def reject(self):
         self.data = None
         QDialog.reject(self)
-        
+
     def apply(self):
         self.apply_callback(self.formwidget.get())
-        
+
     def get(self):
         """Return form result"""
         return self.data
@@ -478,22 +478,22 @@ def fedit(data, title="", comment="", icon=None, parent=None, apply=None):
     """
     Create form dialog and return result
     (if Cancel button is pressed, return None)
-    
+
     data: datalist, datagroup
     title: string
     comment: string
     icon: QIcon instance
     parent: parent QWidget
     apply: apply callback (function)
-    
+
     datalist: list/tuple of (field_name, field_value)
     datagroup: list/tuple of (datalist *or* datagroup, title, comment)
-    
+
     -> one field for each member of a datalist
     -> one tab for each member of a top-level datagroup
     -> one page (of a multipage widget, each page can be selected with a combo
        box) for each member of a datagroup inside a datagroup
-       
+
     Supported types for field_value:
       - int, float, str, unicode, bool
       - colors: in Qt-compatible text form, i.e. in hex format or name (red,...)
@@ -502,12 +502,12 @@ def fedit(data, title="", comment="", icon=None, parent=None, apply=None):
           * the first element will be the selected index (or value)
           * the other elements can be couples (key, value) or only values
     """
-    
+
     # Create a QApplication instance if no instance currently exists
     # (e.g. if the module is used directly from the interpreter)
     if QApplication.startingUp():
         _app = QApplication([])
-        
+
     dialog = FormDialog(data, title, comment, icon, parent, apply)
     if dialog.exec_():
         return dialog.get()
@@ -531,25 +531,25 @@ def create_datalist_example():
                 ('date', datetime.date(2010, 10, 10)),
                 ('datetime', datetime.datetime(2010, 10, 10)),
                 ]
-        
+
     def create_datagroup_example():
         datalist = create_datalist_example()
         return ((datalist, "Category 1", "Category 1 comment"),
                 (datalist, "Category 2", "Category 2 comment"),
                 (datalist, "Category 3", "Category 3 comment"))
-    
+
     #--------- datalist example
     datalist = create_datalist_example()
     def apply_test(data):
         print "data:", data
     print "result:", fedit(datalist, title="Example",
                            comment="This is just an <b>example</b>.",
                            apply=apply_test)
-    
+
     #--------- datagroup example
     datagroup = create_datagroup_example()
     print "result:", fedit(datagroup, "Global title")
-        
+
     #--------- datagroup inside a datagroup example
     datalist = create_datalist_example()
     datagroup = create_datagroup_example()
