Changeset 1187

Timestamp:

03/13/10 13:49:04 (5 months ago)

Author:

erikj

Message:

first functional expanded search

Location:

trunk/camelot/view

Files:

• controls/delegates/comboboxdelegate.py (modified) (1 diff)
• controls/filter_operator.py (added)
• controls/tableview.py (modified) (6 diffs)
• field_attributes.py (modified) (13 diffs)
• filters.py (modified) (1 diff)

trunk/camelot/view/controls/delegates/comboboxdelegate.py

@@ -41 +41 @@
     editor = editors.ChoicesEditor
 
-    def __init__(self, parent, choices, editable=True, **kwargs):
+    def __init__(self, parent=None, choices=[], editable=True, **kwargs):
         CustomDelegate.__init__(self, parent, editable=editable, **kwargs)
         self.choices = choices

trunk/camelot/view/controls/tableview.py

@@ -37 +37 @@
 
 from camelot.view.proxy.queryproxy import QueryTableProxy
+from camelot.view.controls.filterlist import filter_changed_signal
 from camelot.view.controls.view import AbstractView
 from camelot.view.controls.user_translatable_label import UserTranslatableLabel
@@ -113 +114 @@
     def __init__( self, parent, admin ):
         QtGui.QWidget.__init__( self, parent )
+        self._admin = admin
         layout = QtGui.QVBoxLayout()
         widget_layout = QtGui.QHBoxLayout()
@@ -136 +138 @@
     
     def _fill_expanded_search_options(self, columns):
+        from camelot.view.controls.filter_operator import FilterOperator
         layout = QtGui.QHBoxLayout()
         for field, attributes in columns:
             if 'operators' in attributes:
-                widget = QtGui.QLabel(field)
+                widget = FilterOperator( self._admin.entity, field, attributes, self)
+                self.connect( widget, filter_changed_signal,  self._filter_changed )
                 layout.addWidget( widget )
+        layout.addStretch()
         self._expanded_search.setLayout( layout )
         
+    def _filter_changed(self):
+        self.emit(QtCore.SIGNAL('filters_changed'))
         
+    def decorate_query(self, query):
+        """Apply expanded filters on the query"""
+        for i in range(self._expanded_search.layout().count()):
+            if self._expanded_search.layout().itemAt(i).widget():
+                query = self._expanded_search.layout().itemAt(i).widget().decorate_query(query)
+        return query
+            
     def expand_search_options(self):
         if self._expanded_search.isHidden():
@@ -245 +259 @@
         shortcut = QtGui.QShortcut(QtGui.QKeySequence(QtGui.QKeySequence.Find), self)
         self.connect( shortcut, QtCore.SIGNAL( 'activated()' ), self.activate_search )
+        self.connect( self.header, QtCore.SIGNAL('filters_changed'),  self.rebuildQuery )
         # give the table widget focus to prevent the header and its search control to
         # receive default focus, as this would prevent the displaying of 'Search...' in the
@@ -416 +431 @@
         workspace.addSubWindow( form )
         form.show()
-    
-
-    
-#    @gui_function
-#    def set_filters_and_actions( self, filters_and_actions ):
-#        """sets filters for the tableview"""
-#        filters, actions = filters_and_actions
-#        from filterlist import FilterList
-#        from actionsbox import ActionsBox
-#        logger.debug( 'setting filters for tableview' )
-#        if self.filters:
-#          self.disconnect( self.filters, SIGNAL( 'filters_changed' ), self.rebuildQuery )
-#          self.filters.deleteLater()
-#          self.filters = None
-#        if self.actions:
-#          self.actions.deleteLater()
-#          self.actions = None          
-#        if filters:
-#          self.filters = FilterList( filters, parent=self )
-#          self.splitter.insertWidget( 2, self.filters )
-#          self.connect( self.filters, SIGNAL( 'filters_changed' ), self.rebuildQuery )
-#        if actions:
-#          self.actions = ActionsBox( self, self._table_model.collection_getter, lambda:[] )
-#          self.actions.setActions( actions )
-#          self.splitter.insertWidget( 2, self.filters )
 
     def toHtml( self ):
@@ -538 +528 @@
         def rebuild_query():
             query = self.admin.entity.query
+            query = self.header.decorate_query(query)
             if self.filters:
                 query = self.filters.decorate_query( query )

trunk/camelot/view/field_attributes.py

@@ -46 +46 @@
 )
 
-_numerical_operators = (operator.eq, operator.lt, operator.le, operator.gt, operator.ge)
+_numerical_operators = (operator.eq, operator.ne, operator.lt, operator.le, operator.gt, operator.ge)
+_text_operators = (operator.eq, operator.ne)
 
 _sqlalchemy_to_python_type_ = {
@@ -149 +150 @@
         'widget': 'str',
         'from_string': string_from_string,
+        'operators' : _text_operators,
     },
 
@@ -159 +161 @@
         'widget': 'str',
         'from_string': string_from_string,
+        'operators' : _text_operators,
     },
 
@@ -169 +172 @@
         'widget': 'str',
         'from_string': string_from_string,
+        'operators' : _text_operators,
     },
 
@@ -178 +182 @@
         'storage': f.storage,
         'preview_width': 100,
-        'preview_height': 100
+        'preview_height': 100,
+        'operators' : _text_operators,
     },
 
@@ -186 +191 @@
         'delegate': delegates.CodeDelegate,
         'nullable': True,
-        'parts': f.parts
+        'parts': f.parts,
+        'operators' : _text_operators,
     },
 
@@ -195 +201 @@
         'parts': f.parts,
         'delegate': delegates.CodeDelegate,
-        'widget': 'code'
+        'widget': 'code',
+        'operators' : _text_operators,
     },
 
@@ -202 +209 @@
         'editable': True,
         'nullable': True,
-        'delegate': delegates.VirtualAddressDelegate
+        'delegate': delegates.VirtualAddressDelegate,
+        'operators' : _text_operators,
     },
 
@@ -211 +219 @@
         'delegate': delegates.RichTextDelegate,
         'from_string': string_from_string,
+        'operators' : _text_operators,
     },
 
@@ -218 +227 @@
         'editable': True,
         'nullable': True,
-        'widget': 'color'
+        'widget': 'color',
+        'operators' : _text_operators,
     },
 
@@ -227 +237 @@
         'python_type': int,
         'widget': 'star',
-        'from_string': int_from_string
+        'from_string': int_from_string,
+        'operators' : _numerical_operators,
     },
 
@@ -238 +249 @@
         'nullable': False,
         'widget': 'combobox',
+        'operators' : _numerical_operators,
     },
     
@@ -254 +266 @@
         'editable': True,
         'delegate': delegates.FileDelegate,
-        'storage': f.storage
+        'storage': f.storage,
+        'operators' : _text_operators,
     },
 }

trunk/camelot/view/filters.py

@@ -204 +204 @@
         
     def render(self, parent, name, options):
-        
-        from PyQt4 import QtCore, QtGui
-        from camelot.view.controls.filterlist import filter_changed_signal
-        from camelot.view.controls import editors
-                
-        class FilterWidget(QtGui.QGroupBox):
-            
-            def __init__(self, name, parent):
-                QtGui.QGroupBox.__init__(self, unicode(name), parent)
-                self._entity, self._field_name, self._field_attributes = options
-                self._field_attributes['editable'] = True
-                layout = QtGui.QVBoxLayout()
-                self._choices = [(0, ugettext('All')), (1, ugettext('None')), (2, ugettext('='))]
-                combobox = QtGui.QComboBox(self)
-                layout.addWidget(combobox)
-                for i,name in self._choices:
-                    combobox.insertItem(i, unicode(name))
-                self.connect(combobox, QtCore.SIGNAL('currentIndexChanged(int)'), self.combobox_changed)
-                delegate = self._field_attributes['delegate'](**self._field_attributes)
-                option = QtGui.QStyleOptionViewItem()
-                option.version = 5
-                self._editor = delegate.createEditor( self, option, None )
-                # explicitely set a value, otherways the current value remains ValueLoading
-                self._editor.set_value(None)
-                self.connect(self._editor, editors.editingFinished, self.editor_editing_finished)
-                layout.addWidget(self._editor)
-                self.setLayout(layout)
-                self._editor.setEnabled(False)
-                self._index = 0
-                self._value = None
-                
-            def combobox_changed(self, index):
-                self._index = index
-                if index==2:
-                    self._editor.setEnabled(True)
-                else:
-                    self._editor.setEnabled(False)
-                self.emit(filter_changed_signal)
-                
-            def editor_editing_finished(self):
-                self._value = self._editor.get_value()
-                self.emit(filter_changed_signal)
-            
-            def decorate_query(self, query):
-                if self._index==0:
-                    return query
-                if self._index==1:
-                    return query.filter(getattr(self._entity, self._field_name)==None)
-                return query.filter(getattr(self._entity, self._field_name)==self._value)
-                
-        return FilterWidget(name, parent)       
+        from camelot.view.controls.filter_operator import FilterOperator
+        entity, field_name, field_attributes = options
+        return FilterOperator(entity, field_name, field_attributes, parent)       
     
     def get_name_and_options(self, admin):