clevic 0.13.0.b3 → 0.13.0.b5

data/lib/clevic/table_searcher.rb

@@ -1,3 +1,5 @@
+require 'clevic/ordered_dataset'
+
 module Clevic
 
 =begin
@@ -6,7 +8,8 @@ criteria will be a starting record, and the search method should return
 the matching record next after this.
 =end
 class TableSearcher
-  attr_reader :dataset, :search_criteria, :field
+  include OrderedDataset
+  attr_reader :search_criteria, :field
   
   # dataset is a Sequel::Dataset, which has an associated Sequel::Model
   # field is an instance of Clevic::Field
@@ -14,15 +17,8 @@ class TableSearcher
   def initialize( dataset, search_criteria, field )
     raise "field must be specified" if field.nil?
     raise "unknown order #{search_criteria.direction}" unless [:forwards, :backwards].include?( search_criteria.direction )
-    raise "dataset has no model" unless dataset.respond_to?( :model )
     
-    # set default dataset ordering if it's not there
-    @dataset =
-    if dataset.opts[:order].nil?
-      dataset.order( dataset.model.primary_key )
-    else
-      dataset
-    end
+    self.dataset = dataset
     
     @search_criteria = search_criteria
     @field = field
@@ -38,13 +34,13 @@ protected
   # return a Sequel expression for the name of the field to use as a comparison
   def search_field_expression
     if field.association?
-      # for related tables
+      raise "display not specified for #{field}" if field.display.nil?
+      
+      # for related table displays as procs
       unless [String,Symbol].include?( field.display.class )
         raise( "search field #{field.inspect} cannot search lambda display" ) 
       end
       
-      raise "display not specified for #{field}" if field.display.nil?
-      
       # TODO this will only work with a path value with no dots
       # otherwise the SQL gets complicated with joins etc
       field.related_class \
@@ -80,10 +76,10 @@ protected
     dataset.filter( expression => true )
   end
   
-  # return a dataset based on @dataset which filters on search_criteria
+  # return a dataset based on dataset which filters on search_criteria
   def search_dataset( start_entity )
     likes = Array[*search_text_expression].map{|ste| Sequel::SQL::StringExpression.like(search_field_expression, ste, {:case_insensitive=>true})}
-    rv = @dataset.filter( Sequel::SQL::BooleanExpression.new(:OR, *likes ) )
+    rv = dataset.filter( Sequel::SQL::BooleanExpression.new(:OR, *likes ) )
     
     # if we're not searching from the start, we need
     # to find the next match. Which is complicated from an SQL point of view.
@@ -140,23 +136,6 @@ protected
     ['','>','<'][comparator_direction]
   end
   
-  # returns a collection of [ attribute, (1|-1) ]
-  # where 1 is forward/asc (>) and -1 is backward/desc (<)
-  def order_attributes
-    if @order_attributes.nil?
-      @order_attributes =
-      @dataset.opts[:order].map do |order_expr|
-        case order_expr
-          when Symbol; [ order_expr, 1 ]
-          when Sequel::SQL::OrderedExpression; [ order_expr.expression, order_expr.descending ? -1 : 1 ]
-          else
-            raise "unknown order_expr: #{order_expr.inspect}"
-        end
-      end
-    end
-    @order_attributes
-  end
 end
 
 end
-

data/lib/clevic/table_view.rb

@@ -10,9 +10,13 @@ module Clevic
 class TableView
   include ActionBuilder
   
-  # the current filter command
-  attr_accessor :filtered
-  def filtered?; !@filtered.nil?; end
+  # the current stack of filter commands
+  def filters
+    @filtered ||= []
+  end
+  attr_writer :filters
+  
+  def filtered?; !filters.empty?; end
   
   # Called from the gui-framework adapter code in this class
   # arg is:
@@ -70,10 +74,10 @@ class TableView
       yield
     end
     
-    rescue Exception => e
-      puts
-      puts "#{model.entity_view.class.name}: #{e.message}"
-      puts e.backtrace
+  rescue Exception => e
+    puts
+    puts "#{model.entity_view.class.name}: #{e.message}"
+    puts e.backtrace
   end
   
   
@@ -104,7 +108,7 @@ class TableView
       action :action_delete_rows, 'Delete Rows', :shortcut => 'Ctrl+Delete', :method => :delete_rows
       
       if $options[:debug]
-        action :action_dump, 'D&ump', :shortcut => 'Ctrl+Shift+D' do
+        action :action_dump, 'Du&mp', :shortcut => 'Ctrl+Shift+D' do
           puts model.collection[current_index.row].inspect
         end
       end
@@ -116,8 +120,9 @@ class TableView
     list( :search ) do
       action :action_find, '&Find', :shortcut => 'Ctrl+F', :method => :find
       action :action_find_next, 'Find &Next', :shortcut => 'Ctrl+G', :method => :find_next
-      action :action_filter, 'Fil&ter', :checkable => true, :shortcut => 'Ctrl+L', :method => :filter_by_current
-      action :action_highlight, '&Highlight', :visible => false, :shortcut => 'Ctrl+H'
+      action :action_filter, 'Fil&ter', :shortcut => 'Ctrl+L', :method => :filter_by_current
+      action :action_unfilter, '&Un-Filter', :enabled => false, :shortcut => 'Ctrl+K', :method => :unfilter
+      #~ action :action_highlight, '&Highlight', :visible => false, :shortcut => 'Ctrl+H'
     end
   end
   
@@ -181,7 +186,7 @@ class TableView
   # from and to are ModelIndex instances. Throws :insane if
   # their fields don't have the same attribute_type.
   def sanity_check_types( from, to )
-    unless from.field.attribute_type == to.field.attribute_type
+    unless from.field.meta.type == to.field.meta.type
       emit_status_text( 'Incompatible data' )
       throw :insane
     end
@@ -475,14 +480,18 @@ class TableView
   end
   
   # toggle the filter, based on current selection.
-  def filter_by_current( bool_filter )
+  def filter_by_current
     filter_by_indexes( selection_or_current )
   end
   
+  # This is used by entity view classes.
+  # Keep it as a compatibility / deprecated option?
   def filter_by_options( args )
-    filtered.undo if filtered?
-    self.filtered = FilterCommand.new( self, [], args )
-    emit_filter_status( filtered.doit )
+    puts "#{self.class.name}#filter_by_options is deprecated. Use filter_by_dataset( message, &block ) instead."
+    
+    filter_by_dataset( "#{args.inspect}" ) do |dataset|
+      dataset.translate( args )
+    end
   end
   
   # Save the current entity, do something, then restore
@@ -502,41 +511,67 @@ class TableView
     
     retval
   end
+  
+  def unfilter
+    restore_entity do
+      filters.pop.undo
+    end
+    update_filter_status_bar
+  end
+  
+  def unfilter_action
+    search_actions.find{|a| a.object_name == 'action_unfilter' }
+  end
+  
+  def filter_message
+    "Filter: " + filters.map( &:message ).join(' / ') unless filters.empty?
+  end
 
+  # update status bar with a message of all filters concatenated
+  def update_filter_status_bar
+    emit_status_text( filter_message )
+    emit_filter_status( filtered? )
+    unfilter_action.enabled = filtered?
+  end
+  
+  def filter_by_dataset( message, &dataset_block )
+    # clean this up and make it work AND for multiple columns, OR for multiple rows
+    self.filters << FilterCommand.new( self, message, &dataset_block )
+    
+    # try to end up on the same entity, even after the filter
+    restore_entity { filters.last.doit }
+    
+    # make sure status bar shows status
+    update_filter_status_bar
+  end
+  
   # Filter by the value in the current index.
   # indexes is a collection of TableIndex instances
   def filter_by_indexes( indexes )
     case
-      when filtered?
-        # unfilter
-        restore_entity do
-          filtered.undo
-          self.filtered = nil
-          # update status bar
-          emit_status_text( nil )
-          emit_filter_status( false )
-        end
-        
-      when indexes.empty?
-        emit_status_text( "No field selected for filter" )
-        
-      when !indexes.first.field.filterable?
-        emit_status_text( "Can't filter on #{indexes.first.field.label}" )
+    when indexes.empty?
+      emit_status_text( "No field selected for filter" )
       
-      when indexes.size > 1
-        emit_status_text( "Can't do multiple selection filters yet" )
+    when !indexes.first.field.filterable?
+      emit_status_text( "Can't filter on #{indexes.first.field.label}" )
+    
+    when indexes.size > 1
+      emit_status_text( "Can't do multiple selection filters yet" )
+    
+    when indexes.first.entity.new_record?
+      emit_status_text( "Can't filter on a new row" )
       
-      when indexes.first.entity.new_record?
-        emit_status_text( "Can't filter on a new row" )
-        
-      else
-        self.filtered = FilterCommand.new( self, indexes, :conditions => { indexes.first.field_name => indexes.first.field_value } )
-        # try to end up on the same entity, even after the filter
-        restore_entity do
-          emit_filter_status( filtered.doit )
+    else
+      message = "#{indexes.first.field_name} = #{indexes.first.display_value}"
+      filter_by_dataset( message ) do |dataset|
+        indexes.first.field.with do |field|
+          if field.association?
+            dataset.filter( field.meta.keys => indexes.first.attribute_value.andand.pk )
+          else
+            dataset.filter( indexes.first.field_name.to_sym => indexes.first.attribute_value )
+          end
         end
-        # update status bar
-        emit_status_text( filtered.status_message )
+      end
     end
     filtered?
   end
@@ -558,7 +593,11 @@ class TableView
     
     # create a new index and move to it
     unless found_row.nil?
-      column = model.field_column( column ) if column.is_a? Symbol
+      if column.is_a? Symbol
+        column = model.field_column( column )
+      else
+        raise "column #{column} does not exist" if column >= model.fields.size
+      end
       selection_model.clear
       self.current_index = model.create_index( found_row, column || 0 )
     end
@@ -614,6 +653,21 @@ class TableView
   # to_next_index is called.
   attr_accessor :next_index
 
+  # This is to allow entity model UI handlers to tell the view
+  # whence to move the cursor when the current editor closes
+  # (see closeEditor).
+  # TODO not used?
+  def override_next_index( model_index )
+    self.next_index = model_index
+  end
+  
+  # Call set_current_index with next_index ( from override_next_index )
+  # or model_index, in that order. Set next_index to nil afterwards.
+  def set_current_unless_override( model_index )
+    set_current_index( @next_index || model_index )
+    self.next_index = nil
+  end
+  
 protected
   
   # show a busy cursor, do the block, back to normal cursor

data/lib/clevic/ui/browser_ui.rb

@@ -0,0 +1,133 @@
+=begin
+** Form generated from reading ui file 'browser.ui'
+**
+** Created: Fri Jan 28 11:08:53 2011
+**      by: Qt User Interface Compiler version 4.5.1
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+=end
+
+class Ui_Browser
+    attr_reader :action_open
+    attr_reader :action_close
+    attr_reader :action_recent
+    attr_reader :action_dump
+    attr_reader :action_refresh
+    attr_reader :action_next
+    attr_reader :action_previous
+    attr_reader :action_new_window
+    attr_reader :main_widget
+    attr_reader :vboxLayout
+    attr_reader :statusbar
+    attr_reader :menubar
+    attr_reader :menu_file
+    attr_reader :menu_edit
+    attr_reader :menu_search
+    attr_reader :menu_model
+
+    def setupUi(browser)
+    if browser.objectName.nil?
+        browser.objectName = "browser"
+    end
+    browser.resize(727, 740)
+    icon = Qt::Icon.new("icon.png")
+    browser.windowIcon = icon
+    @action_open = Qt::Action.new(browser)
+    @action_open.objectName = "action_open"
+    @action_open.visible = false
+    @action_close = Qt::Action.new(browser)
+    @action_close.objectName = "action_close"
+    @action_close.visible = false
+    @action_recent = Qt::Action.new(browser)
+    @action_recent.objectName = "action_recent"
+    @action_recent.visible = false
+    @action_dump = Qt::Action.new(browser)
+    @action_dump.objectName = "action_dump"
+    @action_refresh = Qt::Action.new(browser)
+    @action_refresh.objectName = "action_refresh"
+    @action_next = Qt::Action.new(browser)
+    @action_next.objectName = "action_next"
+    @action_previous = Qt::Action.new(browser)
+    @action_previous.objectName = "action_previous"
+    @action_new_window = Qt::Action.new(browser)
+    @action_new_window.objectName = "action_new_window"
+    @action_new_window.visible = false
+    @main_widget = Qt::Widget.new(browser)
+    @main_widget.objectName = "main_widget"
+    @vboxLayout = Qt::VBoxLayout.new(@main_widget)
+    @vboxLayout.objectName = "vboxLayout"
+    browser.centralWidget = @main_widget
+    @statusbar = Qt::StatusBar.new(browser)
+    @statusbar.objectName = "statusbar"
+    browser.statusBar = @statusbar
+    @menubar = Qt::MenuBar.new(browser)
+    @menubar.objectName = "menubar"
+    @menubar.geometry = Qt::Rect.new(0, 0, 727, 31)
+    @menu_file = Qt::Menu.new(@menubar)
+    @menu_file.objectName = "menu_file"
+    @menu_file.enabled = false
+    @menu_edit = Qt::Menu.new(@menubar)
+    @menu_edit.objectName = "menu_edit"
+    @menu_search = Qt::Menu.new(@menubar)
+    @menu_search.objectName = "menu_search"
+    @menu_model = Qt::Menu.new(@menubar)
+    @menu_model.objectName = "menu_model"
+    browser.setMenuBar(@menubar)
+
+    @menubar.addAction(@menu_file.menuAction())
+    @menubar.addAction(@menu_edit.menuAction())
+    @menubar.addAction(@menu_search.menuAction())
+    @menubar.addAction(@menu_model.menuAction())
+    @menu_file.addAction(@action_open)
+    @menu_file.addAction(@action_close)
+    @menu_file.addAction(@action_recent)
+    @menu_file.addAction(@action_new_window)
+    @menu_model.addAction(@action_next)
+    @menu_model.addAction(@action_previous)
+    @menu_model.addAction(@action_dump)
+    @menu_model.addSeparator()
+
+    retranslateUi(browser)
+
+    Qt::MetaObject.connectSlotsByName(browser)
+    end # setupUi
+
+    def setup_ui(browser)
+        setupUi(browser)
+    end
+
+    def retranslateUi(browser)
+    @action_open.text = Qt::Application.translate("Browser", "&Open", nil, Qt::Application::UnicodeUTF8)
+    @action_close.text = Qt::Application.translate("Browser", "&Close", nil, Qt::Application::UnicodeUTF8)
+    @action_recent.text = Qt::Application.translate("Browser", "&Recent", nil, Qt::Application::UnicodeUTF8)
+    @action_dump.text = Qt::Application.translate("Browser", "&Dump", nil, Qt::Application::UnicodeUTF8)
+    @action_dump.shortcut = Qt::Application.translate("Browser", "Alt+Shift+D", nil, Qt::Application::UnicodeUTF8)
+    @action_refresh.text = Qt::Application.translate("Browser", "&Refresh", nil, Qt::Application::UnicodeUTF8)
+    @action_refresh.iconText = Qt::Application.translate("Browser", "Refresh current table from database", nil, Qt::Application::UnicodeUTF8)
+    @action_refresh.toolTip = Qt::Application.translate("Browser", "Refresh current table from database", nil, Qt::Application::UnicodeUTF8)
+    @action_refresh.shortcut = Qt::Application.translate("Browser", "Ctrl+R", nil, Qt::Application::UnicodeUTF8)
+    @action_next.text = Qt::Application.translate("Browser", "&Next", nil, Qt::Application::UnicodeUTF8)
+    @action_next.iconText = Qt::Application.translate("Browser", "Next", nil, Qt::Application::UnicodeUTF8)
+    @action_next.toolTip = Qt::Application.translate("Browser", "Next  Model", nil, Qt::Application::UnicodeUTF8)
+    @action_next.shortcut = Qt::Application.translate("Browser", "Ctrl+Tab", nil, Qt::Application::UnicodeUTF8)
+    @action_previous.text = Qt::Application.translate("Browser", "&Previous", nil, Qt::Application::UnicodeUTF8)
+    @action_previous.toolTip = Qt::Application.translate("Browser", "Previous Model", nil, Qt::Application::UnicodeUTF8)
+    @action_previous.shortcut = Qt::Application.translate("Browser", "Ctrl+Shift+Backtab", nil, Qt::Application::UnicodeUTF8)
+    @action_new_window.text = Qt::Application.translate("Browser", "&New Window", nil, Qt::Application::UnicodeUTF8)
+    @menu_file.title = Qt::Application.translate("Browser", "&File", nil, Qt::Application::UnicodeUTF8)
+    @menu_edit.title = Qt::Application.translate("Browser", "&Edit", nil, Qt::Application::UnicodeUTF8)
+    @menu_search.title = Qt::Application.translate("Browser", "&Search", nil, Qt::Application::UnicodeUTF8)
+    @menu_model.title = Qt::Application.translate("Browser", "&Table", nil, Qt::Application::UnicodeUTF8)
+    end # retranslateUi
+
+    def retranslate_ui(browser)
+        retranslateUi(browser)
+    end
+
+end
+
+module Ui
+    class Browser < Ui_Browser
+    end
+end  # module Ui
+

data/lib/clevic/ui/search_dialog_ui.rb

@@ -0,0 +1,106 @@
+=begin
+** Form generated from reading ui file 'search_dialog.ui'
+**
+** Created: Fri Jan 28 11:08:53 2011
+**      by: Qt User Interface Compiler version 4.5.1
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+=end
+
+class Ui_SearchDialog
+    attr_reader :button_box
+    attr_reader :selected_rows
+    attr_reader :selected_columns
+    attr_reader :search_label
+    attr_reader :search_combo
+    attr_reader :from_start
+    attr_reader :regex
+    attr_reader :whole_words
+    attr_reader :forwards
+    attr_reader :backwards
+
+    def setupUi(searchDialog)
+    if searchDialog.objectName.nil?
+        searchDialog.objectName = "searchDialog"
+    end
+    searchDialog.windowModality = Qt::WindowModal
+    searchDialog.resize(307, 400)
+    icon = Qt::Icon.new("../../hilfer/bin/hilfer-icon.png")
+    searchDialog.windowIcon = icon
+    @button_box = Qt::DialogButtonBox.new(searchDialog)
+    @button_box.objectName = "button_box"
+    @button_box.geometry = Qt::Rect.new(30, 240, 261, 32)
+    @button_box.orientation = Qt::Horizontal
+    @button_box.standardButtons = Qt::DialogButtonBox::Cancel|Qt::DialogButtonBox::NoButton|Qt::DialogButtonBox::Ok
+    @selected_rows = Qt::CheckBox.new(searchDialog)
+    @selected_rows.objectName = "selected_rows"
+    @selected_rows.enabled = false
+    @selected_rows.geometry = Qt::Rect.new(30, 280, 191, 21)
+    @selected_columns = Qt::CheckBox.new(searchDialog)
+    @selected_columns.objectName = "selected_columns"
+    @selected_columns.enabled = false
+    @selected_columns.geometry = Qt::Rect.new(30, 310, 191, 21)
+    @search_label = Qt::Label.new(searchDialog)
+    @search_label.objectName = "search_label"
+    @search_label.geometry = Qt::Rect.new(20, 10, 51, 21)
+    @search_label.textFormat = Qt::PlainText
+    @search_combo = Qt::ComboBox.new(searchDialog)
+    @search_combo.objectName = "search_combo"
+    @search_combo.geometry = Qt::Rect.new(90, 10, 201, 25)
+    @search_combo.focusPolicy = Qt::StrongFocus
+    @search_combo.editable = true
+    @from_start = Qt::CheckBox.new(searchDialog)
+    @from_start.objectName = "from_start"
+    @from_start.geometry = Qt::Rect.new(90, 50, 191, 21)
+    @regex = Qt::CheckBox.new(searchDialog)
+    @regex.objectName = "regex"
+    @regex.geometry = Qt::Rect.new(90, 80, 191, 21)
+    @whole_words = Qt::CheckBox.new(searchDialog)
+    @whole_words.objectName = "whole_words"
+    @whole_words.geometry = Qt::Rect.new(90, 110, 191, 21)
+    @forwards = Qt::RadioButton.new(searchDialog)
+    @forwards.objectName = "forwards"
+    @forwards.geometry = Qt::Rect.new(90, 140, 171, 26)
+    @forwards.checked = true
+    @backwards = Qt::RadioButton.new(searchDialog)
+    @backwards.objectName = "backwards"
+    @backwards.geometry = Qt::Rect.new(90, 170, 176, 26)
+    @search_label.buddy = @search_combo
+    Qt::Widget.setTabOrder(@search_combo, @selected_columns)
+    Qt::Widget.setTabOrder(@selected_columns, @selected_rows)
+    Qt::Widget.setTabOrder(@selected_rows, @button_box)
+
+    retranslateUi(searchDialog)
+    Qt::Object.connect(@button_box, SIGNAL('accepted()'), searchDialog, SLOT('accept()'))
+    Qt::Object.connect(@button_box, SIGNAL('rejected()'), searchDialog, SLOT('reject()'))
+
+    Qt::MetaObject.connectSlotsByName(searchDialog)
+    end # setupUi
+
+    def setup_ui(searchDialog)
+        setupUi(searchDialog)
+    end
+
+    def retranslateUi(searchDialog)
+    searchDialog.windowTitle = Qt::Application.translate("SearchDialog", "Search", nil, Qt::Application::UnicodeUTF8)
+    @selected_rows.text = Qt::Application.translate("SearchDialog", "Selected Rows", nil, Qt::Application::UnicodeUTF8)
+    @selected_columns.text = Qt::Application.translate("SearchDialog", "Selected Columns", nil, Qt::Application::UnicodeUTF8)
+    @search_label.text = Qt::Application.translate("SearchDialog", "Search", nil, Qt::Application::UnicodeUTF8)
+    @from_start.text = Qt::Application.translate("SearchDialog", "From &Start", nil, Qt::Application::UnicodeUTF8)
+    @regex.text = Qt::Application.translate("SearchDialog", "&Regular Expression", nil, Qt::Application::UnicodeUTF8)
+    @whole_words.text = Qt::Application.translate("SearchDialog", "&Whole Words", nil, Qt::Application::UnicodeUTF8)
+    @forwards.text = Qt::Application.translate("SearchDialog", "&Forwards", nil, Qt::Application::UnicodeUTF8)
+    @backwards.text = Qt::Application.translate("SearchDialog", "&Backwards", nil, Qt::Application::UnicodeUTF8)
+    end # retranslateUi
+
+    def retranslate_ui(searchDialog)
+        retranslateUi(searchDialog)
+    end
+
+end
+
+module Ui
+    class SearchDialog < Ui_SearchDialog
+    end
+end  # module Ui
+