clevic 0.13.0.b9 → 0.13.0.b10

data/lib/clevic/model_column.rb

@@ -8,9 +8,9 @@ a hash instead of a class.
 class ModelColumn
   # these are from AR
   attr_accessor :primary, :scale, :sql_type, :name, :precision, :default, :type, :meta
-  
+
   attr_writer :limit
-  
+
   # if it's not here, it's probably from Sequel, so figure it out from
   # the db_type
   def limit
@@ -20,22 +20,22 @@ class ModelColumn
     end
     @limit
   end
-  
+
   # these are from Sequel::Model.columns_hash
   attr_accessor :ruby_default, :primary_key, :allow_null, :db_type
-  
+
   # sequel::Model.reflections
   attr_accessor :key, :eager_block, :type, :eager_grapher, :before_add, :model, :graph_join_type, :class_name, :before_remove, :eager_loader, :uses_composite_keys, :order_eager_graph, :dataset, :cartesian_product_number, :after_add, :cache, :keys, :after_remove, :extend, :graph_conditions, :name, :orig_opts, :after_load, :before_set, :after_set, :reciprocal, :reciprocal_type
-  
+
   # for many_to_one targets
   attr_accessor :primary_keys
-  
+
   # TODO not sure where these are from
   attr_accessor :order, :class, :conditions
-  
+
   # a enw one in sequel 3.25.0
   attr_accessor :block
-  
+
   # For Sequel many_to_many
   attr_accessor :left_key,
     :left_keys,
@@ -50,25 +50,25 @@ class ModelColumn
     :left_key_alias,
     :graph_join_table_conditions,
     :graph_join_table_join_type
-  
+
   # added by us
   attr_accessor :association
   def association?; association; end
-  
+
   def initialize( name, hash )
     @hash = hash
     @hash.each do |key,value|
       send( "#{key}=", value )
     end
-    
+
     # must be after hash so it takes precedence
     @name = name
   end
-  
+
   def name
     @name
   end
-  
+
   def related_class
     @related_class ||= eval class_name
   end

data/lib/clevic/ordered_dataset.rb

@@ -1,11 +1,11 @@
 module Clevic
-  
+
   # Provides a nice way of getting to Sequel::Dataset's
   # opts[:order] information
   #
   # Including class must call dataset= before calling order_attributes
   module OrderedDataset
-  
+
     # returns a collection of [ attribute, (1|-1) ]
     # where 1 is forward/asc (>) and -1 is backward/desc (<)
     def order_attributes
@@ -15,10 +15,10 @@ module Clevic
           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
@@ -26,9 +26,9 @@ module Clevic
       end
       @order_attributes
     end
-  
+
     attr_reader :dataset
-    
+
     # Set default dataset ordering to primary key if it doesn't
     # already have an order.
     def dataset=( other )
@@ -39,7 +39,7 @@ module Clevic
         other
       end
     end
-  
+
   end
 
 end

data/lib/clevic/qt/action_builder.rb

@@ -9,11 +9,11 @@ module ActionBuilder
       collect_actions << action
     end
   end
-    
+
   def create_action( &block )
     Qt::Action.new( parent, &block )
   end
-  
+
   # TODO move this into Action, like the swing adapter
   def create_key_sequence( sequence )
     Qt::KeySequence.new( sequence )
@@ -22,7 +22,7 @@ module ActionBuilder
   # set up the code to be executed when an action is triggered,
   def action_method_or_block( qt_action, options, &block )
     signal_name = "triggered(#{options.has_key?( :checkable ) ? 'bool' : ''})"
-    
+
     # connect the action to some code
     if options.has_key?( :method )
       qt_action.connect SIGNAL( signal_name ) do |active|

data/lib/clevic/qt/browser.rb

@@ -12,29 +12,29 @@ added.
 =end
 class Browser < Qt::Widget
   slots *%w{dump() refresh_table() filter_by_current(bool) next_tab() previous_tab() current_changed(int)}
-  
+
   attr_reader :tables_tab
-  
+
   def initialize( main_window )
     super( main_window )
-    
+
     # do menus and widgets
     @layout = Ui::Browser.new
     @layout.setup_ui( main_window )
-    
+
     # set icon. MUST come after call to setup_ui
     icon_path = Pathname.new( __FILE__ ).parent + "../icons/icon.png"
     Kernel::raise "icon.png not found" unless icon_path.file?
     main_window.window_icon = Qt::Icon.new( icon_path.realpath.to_s )
-    
+
     # add the tables tab
     @tables_tab = Qt::TabWidget.new( @layout.main_widget )
     @layout.main_widget.layout.add_widget @tables_tab
     @tables_tab.tab_bar.focus_policy = Qt::NoFocus
-    
+
     # hide the file menu, for now
     @layout.menubar.remove_action( @layout.menu_file.menu_action )
-    
+
     # tab navigation
     @layout.action_next.connect       SIGNAL( 'triggered()' ),          &method( :next_tab )
     @layout.action_previous.connect   SIGNAL( 'triggered()' ),          &method( :previous_tab )
@@ -42,51 +42,51 @@ class Browser < Qt::Widget
     # dump model for current tab
     @layout.action_dump.visible = $options[:debug]
     @layout.action_dump.connect       SIGNAL( 'triggered()' ),          &method( :dump )
-    
+
     tables_tab.connect                SIGNAL( 'currentChanged(int)' ),  &method( :current_changed )
-    
+
     load_views
     update_menus
     main_window.window_title = [database_name, 'Clevic'].compact.join ' '
   end
-  
+
   # Set the main window title to the name of the database, if we can find it.
   def database_name
     table_view.model.entity_class.db.url rescue ''
   end  
-  
+
   def update_menus
     # update edit menu
     @layout.menu_edit.clear
-    
+
     # do the model-specific menu items first
     table_view.model_actions.each do |action|
       @layout.menu_edit.add_action( action )
     end
-    
+
     # now do the generic edit items
     table_view.edit_actions.each do |action|
       @layout.menu_edit.add_action( action )
     end
-    
+
     # update search menu
     @layout.menu_search.clear
     table_view.search_actions.each do |action|
       @layout.menu_search.add_action( action )
     end
   end
-  
+
   # activated by Ctrl-Shift-D for debugging
   def dump
     puts "table_view.model: #{table_view.model.inspect}"
     puts "table_view.model.entity_class: #{table_view.model.entity_class.inspect}"
   end
-  
+
   # return the Clevic::TableView object in the currently displayed tab
   def table_view
     tables_tab.current_widget
   end
-  
+
   # slot to handle Ctrl-Tab and move to next tab, or wrap around
   def next_tab
     tables_tab.current_index = 
@@ -106,14 +106,14 @@ class Browser < Qt::Widget
       tables_tab.current_index - 1
     end
   end
-  
+
   # slot to handle the currentChanged signal from tables_tab, and
   # set focus on the grid
   def current_changed( current_tab_index )
     update_menus
     tables_tab.current_widget.set_focus
   end
-  
+
   # shortcut for the Qt translate call
   def translate( st )
     Qt::Application.translate("Browser", st, nil, Qt::Application::UnicodeUTF8)
@@ -124,26 +124,26 @@ class Browser < Qt::Widget
   def load_views
     views = Clevic::View.order.uniq
     Kernel.raise "no views to display" if views.empty?
-    
+
     # Add all existing model objects as tabs, one each
     views.each do |view_class|
       begin
         view = view_class.new
-        
+
         # This will raise an exception if we can't talk to the
         # table. Returns nil if there is an empty table, which is
         # also fine.
         view.entity_class.first
-          
+
         # create the the table_view and the table_model for the entity_class
         tab = Clevic::TableView.new( view )
-        
+
         # show status messages
         tab.connect( SIGNAL( 'status_text_signal(QString)' ) ) { |msg| @layout.statusbar.show_message( msg, 10000 ) }
-        
+
         # add a new tab
         tables_tab.add_tab( tab, translate( tab.title ) )
-        
+
         # add the table to the Table menu
         action = Qt::Action.new( @layout.menu_model )
         action.text = translate( tab.title )
@@ -151,7 +151,7 @@ class Browser < Qt::Widget
           tables_tab.current_widget = tab
         end
         @layout.menu_model.add_action( action )
-        
+
         # handle filter status changed, so we can provide a visual indication
         tab.connect SIGNAL( 'filter_status_signal(bool)' ) do |status|
           # update the tab, so there's a visual indication of filtering
@@ -166,12 +166,12 @@ class Browser < Qt::Widget
       end
     end
   end
-  
+
   # make sure all outstanding records are saved
   def save_all
     tables_tab.tabs.each {|x| x.save_row( x.current_index ) }
   end
-  
+
   def self.run( args )
     # load model files
     raise "no model definition file specified" if args.empty?

data/lib/clevic/qt/clipboard.rb

@@ -7,23 +7,23 @@ module Clevic
     def system
       Qt::Application::clipboard
     end
-    
+
     def text=( value )
       system.text = value
     end
-    
+
     def text
       system.text
     end
-    
+
     def text?
       system.mime_data.has_text
     end
-    
+
     def html?
       system.mime_data.has_html
     end
-    
+
     # TODO figure out why Qt never has anything other than text.
     # Could be because the event loop isn't running when testing
     # from irb.

data/lib/clevic/qt/combo_delegate.rb

@@ -19,7 +19,7 @@ class ComboDelegate < Clevic::Delegate
     end
     hs
   end
-    
+
   def dump_editor_state( editor )
     if $options[:debug]
       puts "#{self.class.name}"
@@ -33,23 +33,23 @@ class ComboDelegate < Clevic::Delegate
       puts
 		end
   end
-  
+
   # open the combo box, just like if f4 was pressed
   def full_edit
     editor.show_popup if is_combo?( editor )
   end
-  
+
   def is_combo?( editor )
     editor.is_a?( Qt::ComboBox )
   end
-  
+
   def create_combo_box( *args )
     Qt::ComboBox.new( parent ).tap do |combo|
       # all combos are editable so that prefix matching will work
       combo.editable = true
     end
   end
-  
+
   # Override the Qt method. Create a ComboBox widget and fill it with the possible values.
   def createEditor( parent_widget, style_option_view_item, model_index )
     self.parent = parent_widget
@@ -62,7 +62,7 @@ class ComboDelegate < Clevic::Delegate
   def line_editor( edit_value )
     @line_editor ||= Qt::LineEdit.new( edit_value, parent )
   end
-  
+
   def framework_setup( *args )
     # don't need to do anything here
     # might need to once prefix-matching is implemented
@@ -71,7 +71,7 @@ class ComboDelegate < Clevic::Delegate
   # Override the Qt::ItemDelegate method.
   def updateEditorGeometry( editor, style_option_view_item, model_index )
     rect = style_option_view_item.rect
-    
+
     # 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 ) if is_combo?( editor )
@@ -87,19 +87,19 @@ class ComboDelegate < Clevic::Delegate
       editor.text = model_index.edit_value
     end
   end
-  
+
   # This translates the text from the editor into something that is
   # stored in an underlying model. Intended to be overridden by subclasses.
   def translate_from_editor_text( editor, text )
     index = editor.find_text( text )
-    
+
     if index == -1
       text unless restricted?
     else
       editor.item_data( index ).value
     end
   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 )
@@ -116,11 +116,11 @@ class ComboDelegate < Clevic::Delegate
         # there is a matching completion, so use it
         editor.completer.current_completion
       end
-      
+
       if value != nil
         model_index.attribute_value = translate_from_editor_text( editor, value )
       end
-      
+
     else
       model_index.attribute_value = editor.text
     end

data/lib/clevic/qt/distinct_delegate.rb

@@ -5,7 +5,7 @@ module Clevic
 
 class DistinctDelegate < ComboDelegate
   include SimplestDelegate
-  
+
   # This might be unnecessary.
   def translate_from_editor_text( editor, text )
     text

data/lib/clevic/qt/extensions.rb

@@ -7,7 +7,7 @@ require 'clevic/qt/accept_reject'
 # convenience methods
 module Qt
   PasteRole = UserRole + 1 unless defined?( PasteRole )
-  
+
   class AbstractItemDelegate
     # overridden in EntryDelegate subclasses
     def full_edit
@@ -26,7 +26,7 @@ module Qt
   class ModelIndex
     include Clevic::TableIndex
   end
-  
+
   class ItemSelectionModel
     # return an array of integer indexes for currently selected rows
     def row_indexes
@@ -40,12 +40,12 @@ module Qt
     def ranges
       selection
     end
-    
+
     def single_cell?
       ranges.size == 1 && ranges.first.single_cell?
     end
   end
-  
+
   # implement accepted? and rejected? for TableView#confirm_dialog and friends
   class MessageBox
     include Clevic::AcceptReject