clevic 0.13.0.b9 → 0.13.0.b10

data/lib/clevic/qt/qt_combo_box.rb

@@ -5,26 +5,26 @@ module Qt
     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 )
@@ -34,7 +34,7 @@ module Qt
         ['', nil ]
       end
     end
-    
+
     # wrapper for the delegate method so we don't have
     # to keep checking for nil values
     def editor_to_item( data )
@@ -45,7 +45,7 @@ module Qt
       end
     end
   end
-  
+
   # Adding these to Qt::Widget as the superclass
   # doesn't work for some reason.
   class ComboBox

data/lib/clevic/qt/relational_delegate.rb

@@ -12,11 +12,11 @@ class RelationalDelegate < ComboDelegate
   def item_to_editor( item )
     [ field.transform_attribute( item ), item.pk.to_variant ]
   end
-  
+
   def editor_to_item( data )
     entity.related_class[ data ]
   end
-  
+
   # 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 )
@@ -26,11 +26,11 @@ class RelationalDelegate < ComboDelegate
       editor_widget.line_edit.andand.select_all
     end
   end
-  
+
   # 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_widget item_data
     item_data = editor_widget.item_data( item_index )
     if item_data.valid?
@@ -39,7 +39,7 @@ class RelationalDelegate < ComboDelegate
       field.related_class[ item_data.to_int ]
     end
   end
-  
+
 end
 
 end

data/lib/clevic/qt/search_dialog.rb

@@ -8,68 +8,68 @@ module Clevic
   class SearchDialog
     include AcceptReject
     include QtFlags
-    
+
     attr_reader :match_flags, :layout
     attr_accessor :result
-    
+
     def initialize( parent )
       @layout = Ui_SearchDialog.new
       @dialog = Qt::Dialog.new
       @layout.setupUi( @dialog )
     end
-    
+
     def from_start?
       layout.from_start.value
     end
-    
+
     def from_start=( value )
       layout.from_start.value = value
     end
-    
+
     def regex?
       layout.regex.value
     end
-    
+
     def whole_words?
       layout.whole_words.value
     end
-    
+
     def search_combo
       layout.search_combo
     end
-    
+
     def forwards?
       layout.forwards.checked?
     end
-    
+
     def backwards?
       layout.backwards.checked?
     end
-    
+
     # return either :backwards or :forwards
     def direction
       return :forwards if forwards?
       return :backwards if backwards?
       raise "direction not known"
     end
-    
+
     def exec( text = '' )
       search_combo.edit_text = text.to_s
       search_combo.set_focus
       self.result = @dialog.exec
-      
+
       # remember previous searches
       if search_combo.find_text( search_combo.current_text ) == -1
         search_combo.add_item( search_combo.current_text )
       end
-      
+
       self
     end
-    
+
     def search_text
       search_combo.current_text
     end
-    
+
   end
 
 end

data/lib/clevic/qt/simplest_delegate.rb

@@ -9,8 +9,8 @@ module SimplestDelegate
       [ item, item ]
     end
   end
-  
-  
+
+
   def editor_to_item( data )
     data.value
   end

data/lib/clevic/qt/table_model.rb

@@ -18,43 +18,43 @@ including the Clevic::Record module in a Sequel::Model subclass.
 =end
 class TableModel < Qt::AbstractTableModel
   include QtFlags
-  
+
   signals(
     # index where error occurred, value, message
     'data_error(QModelIndex,QVariant,QString)'
   )
-  
+
   def emit_data_error( index, data, string )
     emit data_error( index, data.to_variant, string )
   end
-  
+
   def initialize( parent = nil )
     super
   end
-  
+
   # add a new item, and set defaults from the Clevic::View
   def add_new_item_start
     begin_insert_rows( Qt::ModelIndex.invalid, row_count, row_count )
   end
-  
+
   def add_new_item_end
     # notify listeners that the model has changed
     end_insert_rows
   end
-  
+
   def remove_notify( rows, &block )
     begin_remove_rows( Qt::ModelIndex.invalid, rows.first, rows.last )
     # do the removal
     yield
     end_remove_rows
   end
-  
+
   # save the AR model at the given index, if it's dirty
   def update_vertical_header( index )
     raise "preferably use data_changed here, if possible"
     emit headerDataChanged( Qt::Vertical, index.row, index.row )
   end
-  
+
   def rowCount( parent = nil )
     collection.size
   end
@@ -63,34 +63,34 @@ class TableModel < Qt::AbstractTableModel
   def row_count
     collection.size
   end
-  
+
   def columnCount( parent = nil )
     fields.size
   end
-  
+
   # Not looked up or aliased properly by Qt bindings
   def column_count
     fields.size
   end
-  
+
   def flags( model_index )
     retval = super
-    
+
     # sometimes this actually happens. 
     # TODO probably a bug in the combo editor exit code
     return retval if model_index.column >= columnCount
-    
+
     # TODO don't return IsEditable if the model is read-only
     if model_index.meta.type == :boolean
       retval = item_boolean_flags
     end
-    
+
     unless model_index.field.read_only? || read_only?
       retval |= qt_item_is_editable.to_i 
     end
     retval
   end
-  
+
   # values for horizontal and vertical headers
   def headerData( section, orientation, role )
     value = 
@@ -103,22 +103,22 @@ class TableModel < Qt::AbstractTableModel
             # display record number. Object id is in tooltip.
             section+1
         end
-        
+
       when qt_text_alignment_role
         case orientation
           when Qt::Vertical
             Qt::AlignRight | Qt::AlignVCenter
         end
-          
+
       when Qt::SizeHintRole
         # anything other than nil here makes the headers disappear.
         nil
-        
+
       when qt_tooltip_role
         case orientation
           when Qt::Horizontal
             fields[section].tooltip
-            
+
           when Qt::Vertical
             case
               when !collection[section].errors.empty?
@@ -131,7 +131,7 @@ class TableModel < Qt::AbstractTableModel
                 end
             end
         end
-        
+
       when qt_background_role
         if orientation == Qt::Vertical
           item = collection[section]
@@ -144,15 +144,15 @@ class TableModel < Qt::AbstractTableModel
               end
           end
         end
-        
+
       else
         #~ puts "headerData section: #{section}, role: #{const_as_string(role)}" if $options[:debug]
         nil
     end
-    
+
     return value.to_variant
   end
-  
+
   # Provide data to UI.
   def data( index, role = qt_display_role )
     #~ puts "data for index: #{index.inspect}, field #{index.field.attribute.inspect} and role: #{const_as_string role}"
@@ -166,18 +166,18 @@ class TableModel < Qt::AbstractTableModel
           unless index.meta.type == :boolean
             value = index.display_value
           end
-          
+
         when qt_edit_role
           # see comment for qt_display_role
           unless index.meta.type == :boolean
             value = index.edit_value
           end
-          
+
         when qt_checkstate_role
           if index.meta.type == :boolean
             index.raw_value ? qt_checked : qt_unchecked
           end
-          
+
         when qt_text_alignment_role
           case index.field.alignment
             when :left; qt_alignleft
@@ -185,34 +185,34 @@ class TableModel < Qt::AbstractTableModel
             when :centre; qt_aligncenter
             when :justified; qt_alignjustified
           end
-        
+
         # just here to make debug output quieter
         when qt_size_hint_role;
-        
+
         # show field with a red background if there's an error
         when qt_background_role
           index.field.background_for( index.entity ) || Qt::Color.new( 'red' ) if index.has_errors?
-        
+
         when qt_font_role;
-        
+
         when qt_foreground_role
           index.field.foreground_for( index.entity ) ||
           if index.field.read_only? || read_only?
             Qt::Color.new( 'dimgray' )
           end
-        
+
         when qt_decoration_role;
           index.field.decoration_for( index.entity )
-        
+
         when qt_tooltip_role
           index.tooltip
-        
+
         else
           puts "data index: #{index}, role: #{const_as_string(role)}" if $options[:debug]
           nil
       # return the variant
       end.to_variant
-        
+
     rescue Exception => e
       # this can generate a lot of errors from view code, so don't emit data_error every one
       puts "#{entity_view.class.name}.#{index.field.id}: #{index.inspect} for role: #{const_as_string role} #{value.inspect} #{index.entity.inspect}"
@@ -231,23 +231,23 @@ class TableModel < Qt::AbstractTableModel
       when qt_edit_role
         # Don't allow the primary key to be changed
         return false if index.attribute == entity_class.primary_key.to_sym
-        
+
         if ( index.column < 0 || index.column >= column_count )
           raise "invalid column #{index.column}" 
         end
-        
+
         begin
           case
             when variant.class.name == 'Qt::Date'
               index.attribute_value = Date.new( variant.year, variant.month, variant.day )
-              
+
             when variant.class.name == 'Qt::Time'
               index.attribute_value = Time.new( variant.hour, variant.min, variant.sec )
-            
+
             else
               index.edit_value = variant.value
           end
-          
+
           # value conversion was successful
           data_changed( index )
           true
@@ -266,7 +266,7 @@ class TableModel < Qt::AbstractTableModel
         else
           false
         end
-      
+
       # user-defined role
       # TODO this only works with single-dotted paths
       when qt_paste_role
@@ -283,17 +283,17 @@ class TableModel < Qt::AbstractTableModel
           index.attribute_value = variant.value
         end
         true
-        
+
       else
         puts "role: #{role.inspect}"
         true
-        
+
       end
     else
       false
     end
   end
-  
+
   # A rubyish way of doing dataChanged
   # - if args has one element, it's either a single ModelIndex
   #   or something that understands top_left and bottom_right. These
@@ -313,10 +313,10 @@ class TableModel < Qt::AbstractTableModel
           # assume it's a ModelIndex
           emit dataChanged( arg, arg )
         end
-      
+
       when 2
         emit dataChanged( args.first, args.last )
-      
+
       else
         unless block.nil?
           change = DataChange.new
@@ -326,7 +326,7 @@ class TableModel < Qt::AbstractTableModel
         end
     end
   end
-  
+
 end
 
 end #module