clevic 0.13.0.b3 → 0.13.0.b5

data/lib/clevic/qt/delegate.rb

@@ -0,0 +1,25 @@
+module Clevic
+
+class Delegate < Qt::ItemDelegate
+  # Figure out where to put the editor widget, taking into
+  # account the sizes of the headers
+  # TODO most of the subclasses are probably the same as this
+  def updateEditorGeometry( editor, style_option_view_item, model_index )
+    rect = style_option_view_item.rect
+    rect.set_width( [editor.size_hint.width,rect.width].max )
+    rect.set_height( editor.size_hint.height )
+    editor.set_geometry( rect )
+  end
+
+  # This catches the event that begins the edit process.
+  def editorEvent( event, model, style_option_view_item, model_index )
+    # See qt Clevic::TableView
+    parent.respond_to?( "before_edit_index=" ) && parent.before_edit_index = model_index
+    super
+  end
+
+end
+
+end
+
+require 'clevic/delegate'

data/lib/clevic/qt/distinct_delegate.rb

@@ -1,35 +1,17 @@
 require 'clevic/qt/combo_delegate.rb'
+require 'clevic/qt/simplest_delegate.rb'
 
 module Clevic
 
-# Provide a list of all values in this field,
-# and allow new values to be entered.
-# :frequency can be set as an option. Boolean. If it's true
-# the options are sorted in order of most frequently used first.
 class DistinctDelegate < ComboDelegate
+  include SimplestDelegate
   
-  def needs_combo?
-    # works except when there is a '' in the column
-    entity_class.adaptor.count( attribute.to_s, find_options ) > 0
-  end
-  
-  def populate_current( editor, model_index )
-    # already done in the SQL query in populate, so don't even check
-  end
-  
-  def populate( editor, model_index )
-    # we only use the first column, so use the second
-    # column to sort by, since SQL requires the order by clause
-    # to be in the select list where distinct is involved
-    entity_class.adaptor.attribute_list( attribute, model_index.attribute_value, field.description, field.frequency, find_options ) do |row|
-      value = row[attribute]
-      editor.add_item( value, value.to_variant )
-    end
-  end
-  
+  # This might be unnecessary.
   def translate_from_editor_text( editor, text )
     text
   end
 end
 
 end
+
+require 'clevic/delegates/distinct_delegate.rb'

data/lib/clevic/qt/extensions.rb

@@ -13,7 +13,13 @@ module Qt
     def full_edit
     end
   end
-  
+
+  class KeyEvent
+    def inspect
+      "<Qt::KeyEvent text=#{text} key=#{key}"
+    end
+  end
+
   # This provides a bunch of methods to get easy access to the entity
   # and it's values directly from the index without having to keep
   # asking the model and jumping through other unncessary hoops
@@ -44,4 +50,5 @@ module Qt
   class MessageBox
     include Clevic::AcceptReject
   end
+
 end

data/lib/clevic/qt/qt_combo_box.rb

@@ -0,0 +1,58 @@
+module Qt
+  # Implement the methods needed for ComboBox to work with the
+  # various Clevic::Delegate classes.
+  class ComboBox
+    def no_insert=( bool )
+      self.insert_policy = Qt::ComboBox::NoInsert if bool
+    end
+    
+    def <<( item )
+      text, data = item_to_editor( item )
+      add_item( text, data.to_variant )
+    end
+    
+    def include?( item )
+      text, data = item_to_editor( item )
+      find_data( data.to_variant ) != -1
+    end
+    
+    def selected_item=( item )
+      text, data = item_to_editor( item )
+      self.current_index = find_data( data.to_variant )
+    end
+    
+    def selected_item
+      delegate.editor_to_item( item_data( self.current_index ).value )
+    end
+    
+    # wrapper for the delegate method so we don't have
+    # to keep checking for nil values
+    def item_to_editor( item )
+      if item
+        delegate.item_to_editor( item )
+      else
+        ['', nil ]
+      end
+    end
+    
+    # wrapper for the delegate method so we don't have
+    # to keep checking for nil values
+    def editor_to_item( data )
+      if data
+        delegate.editor_to_item( data )
+      else
+        nil
+      end
+    end
+  end
+  
+  # Adding these to Qt::Widget as the superclass
+  # doesn't work for some reason.
+  class ComboBox
+    attr_accessor :delegate
+  end
+
+  class LineEdit
+    attr_accessor :delegate
+  end
+end

data/lib/clevic/qt/relational_delegate.rb

@@ -9,79 +9,39 @@ module Clevic
 # The ids of the model objects are stored in the item data
 # and the item text is fetched from them using attribute_path.
 class RelationalDelegate < ComboDelegate
-  def initialize( field )
-    super
-    unless find_options[:conditions].nil?
-      find_options[:conditions].gsub!( /true/, field.related_class.adaptor.quoted_true )
-      find_options[:conditions].gsub!( /false/, field.related_class.adaptor.quoted_false )
-    end
-  end
-  
-  def needs_combo?
-    field.related_class.adaptor.count( :conditions => find_options[:conditions] ) > 0
+  def item_to_editor( item )
+    [ field.transform_attribute( item ), item.pk.to_variant ]
   end
   
-  def empty_set_message
-    "There must be records in #{field.related_class.name.humanize} for this field to be editable."
+  def editor_to_item( data )
+    entity.related_class[ data ]
   end
   
-  # add the current item, unless it's already in the combo data
-  def populate_current( editor, model_index )
-    # always add the current selection, if it isn't already there
-    # and it makes sense. This is to make sure that if the list
-    # is filtered, we always have the current value if the filter
-    # excludes it
-    unless model_index.nil?
-      item = model_index.attribute_value
-      if item
-        item_index = editor.find_data( item.id.to_variant )
-        if item_index == -1
-          add_to_list( editor, model_index, item )
-        end
-      end
-    end
-  end
-
-  def populate( editor, model_index )
-    # add set of all possible related entities
-    field.related_class.adaptor.find( :all, find_options ).each do |x|
-      add_to_list( editor, model_index, x )
-    end
-  end
-  
-  def add_to_list( editor, model_index, item )
-    editor.add_item( model_index.field.transform_attribute( item ), item.id.to_variant )
-  end
-  
-  # send data to the editor
-  def setEditorData( editor, model_index )
-    if is_combo?( editor )
+  # called by Qt when it wants to give the delegate an index to edit
+  def setEditorData( editor_widget, model_index )
+    if is_combo?( editor_widget )
       unless model_index.attribute_value.nil?
-        editor.current_index = editor.find_data( model_index.attribute_value.id.to_variant )
+        editor_widget.selected_item = model_index.attribute_value
       end
-      editor.line_edit.select_all
+      editor_widget.line_edit.andand.select_all
     end
   end
   
-  # don't allow new values
-  def restricted?
-    true
-  end
-  
-  # return an AR entity object
-  def translate_from_editor_text( editor, text )
-    item_index = editor.find_text( text )
+  # return an entity object, given a text selection
+  def translate_from_editor_text( editor_widget, text )
+    item_index = editor_widget.find_text( text )
     
-    # fetch record id from editor item_data
-    item_data = editor.item_data( item_index )
+    # fetch record id from editor_widget item_data
+    item_data = editor_widget.item_data( item_index )
     if item_data.valid?
       # get the entity it refers to, if there is one
-      # use find_by_id so that if it's not found, nil will
-      # be returned
-      field.related_class.adaptor.find( item_data.to_int )
+      # return nil if nil was passed or the entity wasn't found
+      field.related_class[ item_data.to_int ]
     end
   end
   
 end
 
 end
+
+require 'clevic/delegates/relational_delegate.rb'

data/lib/clevic/qt/set_delegate.rb

@@ -1,44 +1,14 @@
 require 'clevic/qt/combo_delegate.rb'
+require 'clevic/qt/simplest_delegate.rb'
 
 module Clevic
 
 # A Combo box which allows a set of values. May or may not
 # be restricted to the set.
 class SetDelegate < ComboDelegate
-  # options must contain a :set => [ ... ] to specify the set of values.
-  def initialize( field )
-    raise "RestrictedDelegate must have a :set in options" if field.set.nil?
-    super
-  end
-  
-  def needs_combo?
-    true
-  end
-  
-  def restricted?
-    field.restricted || false
-  end
-  
-  def populate( editor, model_index )
-    field.set_for( model_index.entity ).each do |item|
-      if item.is_a?( Array )
-        # this is a hash-like set, so use key as db value
-        # and value as display value
-        editor.add_item( item.last, item.first.to_variant )
-      else
-        editor.add_item( item, item.to_variant )
-      end
-    end
-  end
-  
-  def createEditor( parent_widget, style_option_view_item, model_index )
-    editor = super
-    
-    # the set is provided, so never insert things
-    editor.insert_policy = Qt::ComboBox::NoInsert
-    editor
-  end
-    
+  include SimplestDelegate
 end
 
 end
+
+require 'clevic/delegates/set_delegate'

data/lib/clevic/qt/simplest_delegate.rb

@@ -0,0 +1,19 @@
+module Clevic
+
+# These methods are common between SetDelegate and DistinctDelegate
+module SimplestDelegate
+  def item_to_editor( item )
+    if item.is_a?( Array )
+      [ item.last, item.first ]
+    else
+      [ item, item ]
+    end
+  end
+  
+  
+  def editor_to_item( data )
+    data.value
+  end
+end
+
+end

data/lib/clevic/qt/table_model.rb

@@ -1,4 +1,3 @@
-require 'Qt4'
 require 'date'
 
 require 'andand'
@@ -86,7 +85,7 @@ class TableModel < Qt::AbstractTableModel
       retval = item_boolean_flags
     end
     
-    unless model_index.field.read_only? || model_index.entity.andand.readonly? || read_only?
+    unless model_index.field.read_only? || read_only?
       retval |= qt_item_is_editable.to_i 
     end
     retval
@@ -101,12 +100,8 @@ class TableModel < Qt::AbstractTableModel
           when Qt::Horizontal
             labels[section]
           when Qt::Vertical
-            # don't force a fetch from the db
-            if collection.cached_at?( section )
-              collection[section].id
-            else
-              section
-            end
+            # display record number. Object id is in tooltip.
+            section+1
         end
         
       when qt_text_alignment_role
@@ -128,8 +123,12 @@ class TableModel < Qt::AbstractTableModel
             case
               when !collection[section].errors.empty?
                 'Invalid data'
-              when collection[section].changed?
+              when collection[section].modified?
                 'Unsaved changes'
+              else
+                if collection.cached_at?( section )
+                  collection[section].pk.inspect
+                end
             end
         end
         
@@ -198,7 +197,7 @@ class TableModel < Qt::AbstractTableModel
         
         when qt_foreground_role
           index.field.foreground_for( index.entity ) ||
-          if index.field.read_only? || index.entity.andand.readonly? || read_only?
+          if index.field.read_only? || read_only?
             Qt::Color.new( 'dimgray' )
           end
         
@@ -271,6 +270,7 @@ class TableModel < Qt::AbstractTableModel
       # user-defined role
       # TODO this only works with single-dotted paths
       when qt_paste_role
+        puts "WARNING Qt::PasteRole Deprecated"
         if index.meta.type == :association
           field = index.field
           candidates = field.related_class.find( :all, :conditions => [ "#{field.attribute_path[1]} = ?", variant.value ] )

data/lib/clevic/qt/table_view.rb

@@ -1,8 +1,5 @@
-require 'rubygems'
-require 'Qt4'
 require 'fastercsv'
 require 'qtext/action_builder.rb'
-
 require 'clevic/model_builder.rb'
 require 'clevic/filter_command.rb'
 
@@ -46,10 +43,12 @@ class TableView < Qt::TableView
     self.sorting_enabled = false
     
     # set fonts
-    Qt::Font.new( font.family, font.point_size * 5 / 6 ).tap do |fnt|
-      self.font = fnt
-      self.horizontal_header.font = fnt
-    end 
+    # TODO leave this here, but commented so we can see how to do it
+    # properly later.
+    #~ Qt::Font.new( font.family, font.point_size * 5 / 6 ).tap do |fnt|
+      #~ self.font = fnt
+      #~ self.horizontal_header.font = fnt
+    #~ end 
     
     self.context_menu_policy = Qt::ActionsContextMenu
   end
@@ -205,21 +204,6 @@ class TableView < Qt::TableView
     error_message.show
   end
   
-  # 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
-  
   # work around situation where an ItemDelegate is open
   # when the surrouding tab is changed, but the right events
   # don't arrive.
@@ -269,7 +253,7 @@ class TableView < Qt::TableView
     end
     
     rescue Exception => e
-      raise RuntimeError, "#{model.entity_view.class.name}.#{model_index.field.id}: #{e.message}", caller(0)
+      raise RuntimeError, "#{model.entity_view.class.name}.#{model_index.field.id}: #{e.message}", e.backtrace
   end
   
   attr_accessor :before_edit_index

data/lib/clevic/qt/text_delegate.rb

@@ -1,8 +1,8 @@
-require 'clevic/qt/item_delegate.rb'
+require 'clevic/qt/delegate.rb'
 
 module Clevic
 
-  class TextDelegate < ItemDelegate
+  class TextDelegate < Delegate
     
     # Doesn't do anything useful yet, but I'm leaving
     # it here so I don't have to change other code.

data/lib/clevic/qt/ui/browser_ui.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'browser.ui'
 **
-** Created: Mon Jan 24 21:13:34 2011
+** Created: Mon Jan 31 16:10:23 2011
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!