clevic 0.13.0.b2 → 0.13.0.b3

data/lib/clevic/filter_command.rb

@@ -1,5 +1,7 @@
 module Clevic
   class FilterCommand
+    # TODO seems like either filter_indexes, filter_conditions can be
+    # passed. Better docs needed, and better api.
     def initialize( table_view, filter_indexes, filter_conditions )
       @table_view = table_view
       @filter_conditions = filter_conditions
@@ -7,7 +9,12 @@ module Clevic
       
       # Better make the status message now, before the indexes become invalid
       @status_message =
-      "Filtered on #{filter_indexes.first.field.label} = #{filter_indexes.first.display_value}"
+      if filter_indexes.empty?
+        # no indexes, so use filter_conditions.
+        "Filtered on #{filter_conditions.inspect}"
+      else
+        "Filtered on #{filter_indexes.first.field.label} = #{filter_indexes.first.display_value}"
+      end
     end
     
     # Do the filtering. Return true if successful, false otherwise.

data/lib/clevic/qt/table_view.rb

@@ -348,7 +348,7 @@ class TableView < Qt::TableView
   
   # make this window visible if it's in a TabWidget
   # TODO doesn't really belong here because TableView will not always
-  # be in a TabWidget context.
+  # be in a TabWidget context. Should emit a signal which is a request to raise
   def raise_widget
     # the tab's parent is a StackedWiget, and its parent is TabWidget
     tab_widget = parent.parent

data/lib/clevic/table_view.rb

@@ -312,7 +312,7 @@ class TableView
   end
   
   def selected_rows_or_current
-    indexes_or_current( selection_model.row_indexes )
+    indexes_or_current( selection_model.row_indexes.map{|row| model.create_index( row, 0 ) } )
   end
   
   # alternative access for auto_size_column
@@ -482,7 +482,7 @@ class TableView
   def filter_by_options( args )
     filtered.undo if filtered?
     self.filtered = FilterCommand.new( self, [], args )
-    emit filter_status( filtered.doit )
+    emit_filter_status( filtered.doit )
   end
   
   # Save the current entity, do something, then restore
@@ -584,8 +584,10 @@ class TableView
   # or entity_model. Return nil if no match found.
   # TODO doesn't really belong here because TableView will not always
   # be in a TabWidget context.
-  def find_table_view( entity_model_or_view )
-    raise "framework responsibility"
+  unless instance_methods.include?( 'find_table_view' )
+    def find_table_view( entity_model_or_view )
+      raise "framework responsibility"
+    end
   end
   
   # execute the block with the TableView instance
@@ -593,15 +595,19 @@ class TableView
   # Don't execute the block if nothing is found.
   # TODO doesn't really belong here because TableView will not always
   # be in a TabWidget context.
-  def with_table_view( entity_model_or_view, &block )
-    raise "framework responsibility"
+  unless instance_methods.include?( 'with_table_view' )
+    def with_table_view( entity_model_or_view, &block )
+      raise "framework responsibility"
+    end
   end
   
   # make this window visible if it's in a TabWidget
   # TODO doesn't really belong here because TableView will not always
   # be in a TabWidget context.
-  def raise_widget
-    raise "framework responsibility"
+  unless instance_methods.include?( 'raise_widget' )
+    def raise_widget
+      raise "framework responsibility"
+    end
   end
   
   # set next_index for certain operations. Is only activated when

data/lib/clevic/version.rb

@@ -3,7 +3,7 @@ module Clevic #:nodoc:
     MAJOR = 0
     MINOR = 13
     TINY  = 0
-    PRE   = 'b2'
+    PRE   = 'b3'
 
     STRING = [MAJOR, MINOR, TINY, PRE].join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: clevic
 version: !ruby/object:Gem::Version 
-  hash: 163
+  hash: 161
   prerelease: 7
   segments: 
   - 0
   - 13
   - 0
   - b
-  - 2
-  version: 0.13.0.b2
+  - 3
+  version: 0.13.0.b3
 platform: ruby
 authors: 
 - John Anderson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +02:00
+date: 2011-01-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency