clevic 0.13.0.b9 → 0.13.0.b10

data/lib/clevic/qt/table_view.rb

@@ -14,31 +14,31 @@ module Clevic
 # TODO not sure if we still need override_next_index and friends
 class TableView < Qt::TableView
   include ActionBuilder
-  
+
   # status_text is emitted when this object was to display something in the status bar
   # filter_status is emitted when the filtering changes. Param is true for filtered, false for not filtered.
   signals 'status_text_signal(QString)', 'filter_status_signal(bool)'
-  
+
   def emit_filter_status( bool )
     emit filter_status_signal( bool )
   end
-  
+
   def emit_status_text( string )
     emit status_text_signal( string )
   end
-  
+
   # arg is:
   # - an instance of Clevic::View
   # - an instance of TableModel
   def initialize( arg, parent = nil, &block )
     # need the empty block here, otherwise Qt bindings grab &block
     super( parent ) {}
-    
+
     framework_init( arg, &block )
-    
+
     # see closeEditor
     @next_index = nil
-    
+
     # set some Qt things
     self.horizontal_header.movable = false
     # TODO might be useful to allow movable vertical rows,
@@ -46,7 +46,7 @@ class TableView < Qt::TableView
     self.vertical_header.movable = false
     self.vertical_header.default_alignment = Qt::AlignTop | Qt::AlignRight
     self.sorting_enabled = false
-    
+
     # set fonts
     # TODO leave this here, but commented so we can see how to do it
     # properly later.
@@ -54,10 +54,10 @@ class TableView < Qt::TableView
       #~ self.font = fnt
       #~ self.horizontal_header.font = fnt
     #~ end 
-    
+
     self.context_menu_policy = Qt::ActionsContextMenu
   end
-  
+
   def connect_view_signals( entity_view )
     model.connect SIGNAL( 'dataChanged ( const QModelIndex &, const QModelIndex & )' ) do |top_left, bottom_right|
       begin
@@ -69,7 +69,7 @@ class TableView < Qt::TableView
       end
     end
   end
-  
+
   # return a collection of collections of TableIndex objects
   # indicating the indices of the current selection
   def selected_rows
@@ -83,22 +83,22 @@ class TableView < Qt::TableView
     end
     rows
   end
-  
+
   def status_text( msg )
     emit status_text( msg )
   end
-  
+
   def open_editor
     edit( current_index )
     delegate = item_delegate( current_index )
     delegate.full_edit
   end
-  
+
   def itemDelegate( model_index )
     @pre_delegate_index = model_index
     super
   end
-  
+
   # set the size of the column from the sample
   def auto_size_column( col, sample )
     self.set_column_width( col, column_size( col, sample ).width )
@@ -107,72 +107,72 @@ class TableView < Qt::TableView
   def metrics
     @metrics = Qt::FontMetrics.new( font )
   end
-  
+
   # set the size of the column from the string value of the data
   # mostly copied from qheaderview.cpp:2301
   def column_size( col, data )
     opt = Qt::StyleOptionHeader.new
-    
+
     # fetch font size
     opt.fontMetrics = metrics
     opt.rect = opt.fontMetrics.bounding_rect( data.to_s )
-    
+
     # set data
     opt.text = data.to_s
-    
+
     opt.section =
     case
       when col == 0
         Qt::StyleOptionHeader::Beginning
-        
+
       when col > 0 && col < model.fields.size - 1
         Qt::StyleOptionHeader::Middle
-        
+
       when col == model.fields.size - 1
         Qt::StyleOptionHeader::End
     end
-    
+
     size = Qt::Size.new( opt.fontMetrics.width( data.to_s ), opt.fontMetrics.height )
-    
+
     # final parameter could be header section
     style.sizeFromContents( Qt::Style::CT_HeaderSection, opt, size )
   end
-  
+
   # make sure row size is correct
   # show error messages for data
   def setModel( model )
     # must do this otherwise model gets garbage collected
     @model = model
-    
+
     # make sure we get nice spacing
     vertical_header.default_section_size = metrics.height
     vertical_header.minimum_section_size = metrics.height
     super
-    
+
     # set delegates
     model.fields.each_with_index do |field, index|
       set_item_delegate_for_column( index, field.delegate )
     end
-    
+
     # data errors
     model.connect( SIGNAL( 'data_error(QModelIndex, QVariant, QString)' ) ) do |index,variant,msg|
       show_error( "Incorrect value '#{variant.value}' entered for field [#{index.attribute.to_s}].\nMessage was: #{msg}" )
     end
   end
-  
+
   def show_error( msg )
     error_message = Qt::ErrorMessage.new( self )
     error_message.show_message( msg )
     error_message.show
   end
-  
+
   # and override this because the Qt bindings don't call
   # setModel otherwise
   def model=( model )
     setModel( model )
     resize_columns
   end
-  
+
   def moveCursor( cursor_action, modifiers )
     # TODO use this as a preload indicator
     super
@@ -190,12 +190,12 @@ class TableView < Qt::TableView
     msg.exec
     msg
   end
-  
+
   def keyPressEvent( event )
     handle_key_press( event )
     super
   end
-  
+
   def set_model_data( table_index, value )
     model.setData( table_index, value.to_variant, Qt::PasteRole )
   end
@@ -208,7 +208,7 @@ class TableView < Qt::TableView
     error_message.show_message( msg )
     error_message.show
   end
-  
+
   # work around situation where an ItemDelegate is open
   # when the surrouding tab is changed, but the right events
   # don't arrive.
@@ -217,7 +217,7 @@ class TableView < Qt::TableView
     # super
     @hiding = true
   end
-  
+
   # work around situation where an ItemDelegate is open
   # when the surrouding tab is changed, but the right events
   # don't arrive.
@@ -225,12 +225,12 @@ class TableView < Qt::TableView
     super
     @hiding = false
   end
-    
+
   def focusOutEvent( event )
     super
     #~ save_current_row
   end
-  
+
   # this is the only method that is called when an itemDelegate is open
   # and the tabs are changed.
   # Work around situation where an ItemDelegate is open
@@ -244,7 +244,7 @@ class TableView < Qt::TableView
     puts $!.backtrace
     show_error "Error saving data from #{editor.inspect}: #{$!.message}"
   end
-  
+
   # bool QAbstractItemView::edit ( const QModelIndex & index, EditTrigger trigger, QEvent * event )
   def edit( model_index, trigger = nil, event = nil )
     self.before_edit_index = model_index
@@ -256,11 +256,11 @@ class TableView < Qt::TableView
     else
       super( model_index, trigger, event )
     end
-    
+
     rescue Exception => e
       raise RuntimeError, "#{model.entity_view.class.name}.#{model_index.field.id}: #{e.message}", e.backtrace
   end
-  
+
   attr_accessor :before_edit_index
   attr_reader :next_index
   def next_index=( other_index )
@@ -272,14 +272,14 @@ class TableView < Qt::TableView
     end
     @next_index = other_index
   end
-  
+
   # set and move to index. Leave index value in next_index
   # so that it's not overridden later.
   # TODO All this next_index stuff is becoming a horrible hack.
   def next_index!( model_index )
     self.current_index = self.next_index = model_index
   end
-  
+
   # override to prevent tab pressed from editing next field
   # also takes into account that override_next_index may have been called
   def closeEditor( editor, end_edit_hint )
@@ -287,22 +287,22 @@ class TableView < Qt::TableView
       puts "end_edit_hint: #{Qt::AbstractItemDelegate.constants.find {|x| Qt::AbstractItemDelegate.const_get(x) == end_edit_hint } }"
       puts "next_index: #{next_index.inspect}"
     end
-    
+
     subsequent_index =
     case end_edit_hint
       when Qt::AbstractItemDelegate.EditNextItem
         super( editor, Qt::AbstractItemDelegate.NoHint )
         before_edit_index.choppy { |i| i.column += 1 }
-        
+
       when Qt::AbstractItemDelegate.EditPreviousItem
         super( editor, Qt::AbstractItemDelegate.NoHint )
         before_edit_index.choppy { |i| i.column -= 1 }
-      
+
       else
         super
         nil
     end
-    
+
     unless subsequent_index.nil?
       puts "subsequent_index: #{subsequent_index.inspect}" if $options[:debug]
       # TODO all this really does is reset next_index
@@ -310,7 +310,7 @@ class TableView < Qt::TableView
       self.before_edit_index = nil
     end
   end
-  
+
   # find the TableView instance for the given entity_view
   # or entity_model. Return nil if no match found.
   # TODO doesn't really belong here because TableView will not always
@@ -322,7 +322,7 @@ class TableView < Qt::TableView
       end
     end
   end
-  
+
   # execute the block with the TableView instance
   # currently handling the entity_model_or_view.
   # Don't execute the block if nothing is found.
@@ -334,7 +334,7 @@ class TableView < Qt::TableView
     tv = find_table_view( entity_model_or_view )
     yield( tv ) unless tv.nil?
   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. Should emit a signal which is a request to raise

data/lib/clevic/qt/text_delegate.rb

@@ -3,12 +3,12 @@ require 'clevic/qt/delegate.rb'
 module Clevic
 
   class TextDelegate < Delegate
-    
+
     # Doesn't do anything useful yet, but I'm leaving
     # it here so I don't have to change other code.
     class TextEditor < Qt::PlainTextEdit
     end
-    
+
     # this is overridden in Qt::ItemDelegate, but that
     # always catches the return key. Which we want for text editing.
     # Instead, we use Ctrl-Enter to save the edited text.
@@ -23,7 +23,7 @@ module Clevic
             emit commitData( object )
             emit closeEditor( object )
             true
-          
+
           # send an enter or return to the text editor
           when event.enter? || event.return?
             object.event( event )
@@ -32,12 +32,12 @@ module Clevic
       end
       retval || super
     end
-    
+
     # maybe open in a separate window?
     def full_edit
       puts "#{self.class.name} full_edit"
     end
-    
+
     # Override the Qt method
     def createEditor( parent_widget, style_option_view_item, model_index )
       if false && model_index.edit_value.count("\n") == 0
@@ -49,16 +49,16 @@ module Clevic
       end
       @editor
     end
-    
+
     # Override the Qt::ItemDelegate method.
     def updateEditorGeometry( editor, style_option_view_item, model_index )
       rect = Qt::Rect.new( style_option_view_item.rect.top_left, style_option_view_item.rect.size ) 
-      
+
       # ask the editor for how much space it wants, and set the editor
       # to that size when it displays in the table
       rect.set_width( [editor.size_hint.width,rect.width].max )
       rect.set_height( editor.size_hint.height )
-      
+
       unless editor.parent.rect.contains( rect )
         # 46 because TableView returns an incorrect bottom.
         # And I can't find out how to get the correct value.
@@ -71,7 +71,7 @@ module Clevic
     def setEditorData( editor, model_index )
       editor.plain_text = model_index.edit_value
     end
-    
+
     # Send the data from the editor to the model. The data will
     # be translated by translate_from_editor_text,
     def setModelData( editor, abstract_item_model, model_index )

data/lib/clevic/rails_models_loaders.rb

@@ -20,7 +20,7 @@ def load_rails_models( root, config, models )
   Rails::Initializer.run do |config|
     config.frameworks -= [ :action_mailer, :action_pack, :active_resource ]
   end
-  
+
   # load lib/ files for the rails project
   $: << ( root / 'lib' ).realpath.to_s
   ( root / 'lib' ).children.each do |filename|
@@ -33,7 +33,7 @@ def load_rails_models( root, config, models )
   rescue NameError
     ActiveRecord::Base.send(:include, ActiveRecord::Dirty)
   end
-  
+
   # load models
   models.find do |dir_entry|
     # don't load directory entries
@@ -47,7 +47,7 @@ def load_rails_models( root, config, models )
       puts e.backtrace
     end
   end
-  
+
   # include the Clevic::Record module in each descendant of
   # the entity class so that the default views will be created.
   subclasses( Clevic.base_entity_class ).each do |model|

data/lib/clevic/record.rb

@@ -14,7 +14,7 @@ module Clevic
       def default_view_class_name
         "::Clevic::Default#{name.gsub('::','')}View"
       end
-      
+
       def create_view_class
         # create the default view class
         # Don't use Class.new because even if you assign
@@ -26,31 +26,31 @@ module Clevic
           end
         EOF
         eval st, nil, __FILE__, line
-        
+
         # keep track of the order in which views are
         # defined, so that can be used as the default ordering
         # of the views.
         Clevic::View.order << eval( default_view_class_name )
       end
-      
+
       def default_view_class
         @default_view_class ||= eval( default_view_class_name )
       end
-      
+
       # Need to defer the execution of the view definition block
       # until related models have been defined.
       def define_ui( &block )
         default_view_class.define_ui_block( &block )
       end
-      
+
     end
-    
+
     def self.included( base )
       base.extend( ClassMethods )
-      
+
       # create the default view class
       base.create_view_class
     end
   end
-  
+
 end