clevic 0.8.0 → 0.11.1

data/lib/clevic/ui/.gitignore

@@ -0,0 +1 @@
+*_ui.rb

data/lib/clevic/ui/browser_ui.rb

@@ -1,8 +1,8 @@
 =begin
 ** Form generated from reading ui file 'browser.ui'
 **
-** Created: Fri Aug 8 22:32:38 2008
-**      by: Qt User Interface Compiler version 4.3.2
+** Created: Sun Aug 10 20:25:20 2008
+**      by: Qt User Interface Compiler version 4.3.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 =end
@@ -17,7 +17,7 @@ class Ui_Browser
     attr_reader :action_previous
     attr_reader :action_new_window
     attr_reader :main_widget
-    attr_reader :qvboxLayout
+    attr_reader :vboxLayout
     attr_reader :statusbar
     attr_reader :menubar
     attr_reader :menu_file
@@ -26,48 +26,52 @@ class Ui_Browser
     attr_reader :menu_model
 
     def setupUi(browser)
-    browser.setObjectName("browser")
-    browser.setWindowIcon(Qt::Icon.new("icon.png"))
+    if browser.objectName.nil?
+        browser.objectName = "browser"
+    end
+    browser.resize(727, 740)
+    icon = Qt::Icon.new("icon.png")
+    browser.windowIcon = icon
     @action_open = Qt::Action.new(browser)
-    @action_open.setObjectName("action_open")
-    @action_open.setVisible(false)
+    @action_open.objectName = "action_open"
+    @action_open.visible = false
     @action_close = Qt::Action.new(browser)
-    @action_close.setObjectName("action_close")
-    @action_close.setVisible(false)
+    @action_close.objectName = "action_close"
+    @action_close.visible = false
     @action_recent = Qt::Action.new(browser)
-    @action_recent.setObjectName("action_recent")
-    @action_recent.setVisible(false)
+    @action_recent.objectName = "action_recent"
+    @action_recent.visible = false
     @action_dump = Qt::Action.new(browser)
-    @action_dump.setObjectName("action_dump")
+    @action_dump.objectName = "action_dump"
     @action_refresh = Qt::Action.new(browser)
-    @action_refresh.setObjectName("action_refresh")
+    @action_refresh.objectName = "action_refresh"
     @action_next = Qt::Action.new(browser)
-    @action_next.setObjectName("action_next")
+    @action_next.objectName = "action_next"
     @action_previous = Qt::Action.new(browser)
-    @action_previous.setObjectName("action_previous")
+    @action_previous.objectName = "action_previous"
     @action_new_window = Qt::Action.new(browser)
-    @action_new_window.setObjectName("action_new_window")
-    @action_new_window.setVisible(false)
+    @action_new_window.objectName = "action_new_window"
+    @action_new_window.visible = false
     @main_widget = Qt::Widget.new(browser)
-    @main_widget.setObjectName("main_widget")
-    @qvboxLayout = Qt::VBoxLayout.new(@main_widget)
-    @qvboxLayout.setObjectName("qvboxLayout")
-    browser.setCentralWidget(@main_widget)
+    @main_widget.objectName = "main_widget"
+    @vboxLayout = Qt::VBoxLayout.new(@main_widget)
+    @vboxLayout.objectName = "vboxLayout"
+    browser.centralWidget = @main_widget
     @statusbar = Qt::StatusBar.new(browser)
-    @statusbar.setObjectName("statusbar")
-    browser.setStatusBar(@statusbar)
+    @statusbar.objectName = "statusbar"
+    browser.statusBar = @statusbar
     @menubar = Qt::MenuBar.new(browser)
-    @menubar.setObjectName("menubar")
-    @menubar.setGeometry(Qt::Rect.new(0, 0, 727, 31))
+    @menubar.objectName = "menubar"
+    @menubar.geometry = Qt::Rect.new(0, 0, 727, 31)
     @menu_file = Qt::Menu.new(@menubar)
-    @menu_file.setObjectName("menu_file")
-    @menu_file.setEnabled(false)
+    @menu_file.objectName = "menu_file"
+    @menu_file.enabled = false
     @menu_edit = Qt::Menu.new(@menubar)
-    @menu_edit.setObjectName("menu_edit")
+    @menu_edit.objectName = "menu_edit"
     @menu_search = Qt::Menu.new(@menubar)
-    @menu_search.setObjectName("menu_search")
+    @menu_search.objectName = "menu_search"
     @menu_model = Qt::Menu.new(@menubar)
-    @menu_model.setObjectName("menu_model")
+    @menu_model.objectName = "menu_model"
     browser.setMenuBar(@menubar)
 
     @menubar.addAction(@menu_file.menuAction())
@@ -85,11 +89,6 @@ class Ui_Browser
 
     retranslateUi(browser)
 
-    size = Qt::Size.new(727, 740)
-    size = size.expandedTo(browser.minimumSizeHint())
-    browser.resize(size)
-
-
     Qt::MetaObject.connectSlotsByName(browser)
     end # setupUi
 
@@ -98,27 +97,27 @@ class Ui_Browser
     end
 
     def retranslateUi(browser)
-    @action_open.setText(Qt::Application.translate("Browser", "&Open", nil, Qt::Application::UnicodeUTF8))
-    @action_close.setText(Qt::Application.translate("Browser", "&Close", nil, Qt::Application::UnicodeUTF8))
-    @action_recent.setText(Qt::Application.translate("Browser", "&Recent", nil, Qt::Application::UnicodeUTF8))
-    @action_dump.setText(Qt::Application.translate("Browser", "&Dump", nil, Qt::Application::UnicodeUTF8))
-    @action_dump.setShortcut(Qt::Application.translate("Browser", "Alt+Shift+D", nil, Qt::Application::UnicodeUTF8))
-    @action_refresh.setText(Qt::Application.translate("Browser", "&Refresh", nil, Qt::Application::UnicodeUTF8))
-    @action_refresh.setIconText(Qt::Application.translate("Browser", "Refresh current table from database", nil, Qt::Application::UnicodeUTF8))
-    @action_refresh.setToolTip(Qt::Application.translate("Browser", "Refresh current table from database", nil, Qt::Application::UnicodeUTF8))
-    @action_refresh.setShortcut(Qt::Application.translate("Browser", "Ctrl+R", nil, Qt::Application::UnicodeUTF8))
-    @action_next.setText(Qt::Application.translate("Browser", "&Next", nil, Qt::Application::UnicodeUTF8))
-    @action_next.setIconText(Qt::Application.translate("Browser", "Next", nil, Qt::Application::UnicodeUTF8))
-    @action_next.setToolTip(Qt::Application.translate("Browser", "Next  Model", nil, Qt::Application::UnicodeUTF8))
-    @action_next.setShortcut(Qt::Application.translate("Browser", "Ctrl+Tab", nil, Qt::Application::UnicodeUTF8))
-    @action_previous.setText(Qt::Application.translate("Browser", "&Previous", nil, Qt::Application::UnicodeUTF8))
-    @action_previous.setToolTip(Qt::Application.translate("Browser", "Previous Model", nil, Qt::Application::UnicodeUTF8))
-    @action_previous.setShortcut(Qt::Application.translate("Browser", "Ctrl+Shift+Backtab", nil, Qt::Application::UnicodeUTF8))
-    @action_new_window.setText(Qt::Application.translate("Browser", "&New Window", nil, Qt::Application::UnicodeUTF8))
-    @menu_file.setTitle(Qt::Application.translate("Browser", "&File", nil, Qt::Application::UnicodeUTF8))
-    @menu_edit.setTitle(Qt::Application.translate("Browser", "&Edit", nil, Qt::Application::UnicodeUTF8))
-    @menu_search.setTitle(Qt::Application.translate("Browser", "&Search", nil, Qt::Application::UnicodeUTF8))
-    @menu_model.setTitle(Qt::Application.translate("Browser", "&Table", nil, Qt::Application::UnicodeUTF8))
+    @action_open.text = Qt::Application.translate("Browser", "&Open", nil, Qt::Application::UnicodeUTF8)
+    @action_close.text = Qt::Application.translate("Browser", "&Close", nil, Qt::Application::UnicodeUTF8)
+    @action_recent.text = Qt::Application.translate("Browser", "&Recent", nil, Qt::Application::UnicodeUTF8)
+    @action_dump.text = Qt::Application.translate("Browser", "&Dump", nil, Qt::Application::UnicodeUTF8)
+    @action_dump.shortcut = Qt::Application.translate("Browser", "Alt+Shift+D", nil, Qt::Application::UnicodeUTF8)
+    @action_refresh.text = Qt::Application.translate("Browser", "&Refresh", nil, Qt::Application::UnicodeUTF8)
+    @action_refresh.iconText = Qt::Application.translate("Browser", "Refresh current table from database", nil, Qt::Application::UnicodeUTF8)
+    @action_refresh.toolTip = Qt::Application.translate("Browser", "Refresh current table from database", nil, Qt::Application::UnicodeUTF8)
+    @action_refresh.shortcut = Qt::Application.translate("Browser", "Ctrl+R", nil, Qt::Application::UnicodeUTF8)
+    @action_next.text = Qt::Application.translate("Browser", "&Next", nil, Qt::Application::UnicodeUTF8)
+    @action_next.iconText = Qt::Application.translate("Browser", "Next", nil, Qt::Application::UnicodeUTF8)
+    @action_next.toolTip = Qt::Application.translate("Browser", "Next  Model", nil, Qt::Application::UnicodeUTF8)
+    @action_next.shortcut = Qt::Application.translate("Browser", "Ctrl+Tab", nil, Qt::Application::UnicodeUTF8)
+    @action_previous.text = Qt::Application.translate("Browser", "&Previous", nil, Qt::Application::UnicodeUTF8)
+    @action_previous.toolTip = Qt::Application.translate("Browser", "Previous Model", nil, Qt::Application::UnicodeUTF8)
+    @action_previous.shortcut = Qt::Application.translate("Browser", "Ctrl+Shift+Backtab", nil, Qt::Application::UnicodeUTF8)
+    @action_new_window.text = Qt::Application.translate("Browser", "&New Window", nil, Qt::Application::UnicodeUTF8)
+    @menu_file.title = Qt::Application.translate("Browser", "&File", nil, Qt::Application::UnicodeUTF8)
+    @menu_edit.title = Qt::Application.translate("Browser", "&Edit", nil, Qt::Application::UnicodeUTF8)
+    @menu_search.title = Qt::Application.translate("Browser", "&Search", nil, Qt::Application::UnicodeUTF8)
+    @menu_model.title = Qt::Application.translate("Browser", "&Table", nil, Qt::Application::UnicodeUTF8)
     end # retranslateUi
 
     def retranslate_ui(browser)

data/lib/clevic/ui/search_dialog_ui.rb

@@ -1,8 +1,8 @@
 =begin
 ** Form generated from reading ui file 'search_dialog.ui'
 **
-** Created: Sun Aug 3 22:07:49 2008
-**      by: Qt User Interface Compiler version 4.3.2
+** Created: Wed Jul 23 11:45:29 2008
+**      by: Qt User Interface Compiler version 4.3.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 =end
@@ -20,58 +20,57 @@ class Ui_SearchDialog
     attr_reader :backwards
 
     def setupUi(searchDialog)
-    searchDialog.setObjectName("searchDialog")
-    searchDialog.setWindowModality(Qt::WindowModal)
-    searchDialog.setWindowIcon(Qt::Icon.new("../../hilfer/bin/hilfer-icon.png"))
+    if searchDialog.objectName.nil?
+        searchDialog.objectName = "searchDialog"
+    end
+    searchDialog.windowModality = Qt::WindowModal
+    searchDialog.resize(307, 400)
+    icon = Qt::Icon.new("../../hilfer/bin/hilfer-icon.png")
+    searchDialog.windowIcon = icon
     @button_box = Qt::DialogButtonBox.new(searchDialog)
-    @button_box.setObjectName("button_box")
-    @button_box.setGeometry(Qt::Rect.new(30, 240, 261, 32))
-    @button_box.setOrientation(Qt::Horizontal)
-    @button_box.setStandardButtons(Qt::DialogButtonBox::Cancel|Qt::DialogButtonBox::NoButton|Qt::DialogButtonBox::Ok)
+    @button_box.objectName = "button_box"
+    @button_box.geometry = Qt::Rect.new(30, 240, 261, 32)
+    @button_box.orientation = Qt::Horizontal
+    @button_box.standardButtons = Qt::DialogButtonBox::Cancel|Qt::DialogButtonBox::NoButton|Qt::DialogButtonBox::Ok
     @selected_rows = Qt::CheckBox.new(searchDialog)
-    @selected_rows.setObjectName("selected_rows")
-    @selected_rows.setEnabled(false)
-    @selected_rows.setGeometry(Qt::Rect.new(30, 280, 191, 21))
+    @selected_rows.objectName = "selected_rows"
+    @selected_rows.enabled = false
+    @selected_rows.geometry = Qt::Rect.new(30, 280, 191, 21)
     @selected_columns = Qt::CheckBox.new(searchDialog)
-    @selected_columns.setObjectName("selected_columns")
-    @selected_columns.setEnabled(false)
-    @selected_columns.setGeometry(Qt::Rect.new(30, 310, 191, 21))
+    @selected_columns.objectName = "selected_columns"
+    @selected_columns.enabled = false
+    @selected_columns.geometry = Qt::Rect.new(30, 310, 191, 21)
     @search_label = Qt::Label.new(searchDialog)
-    @search_label.setObjectName("search_label")
-    @search_label.setGeometry(Qt::Rect.new(20, 10, 51, 21))
-    @search_label.setTextFormat(Qt::PlainText)
+    @search_label.objectName = "search_label"
+    @search_label.geometry = Qt::Rect.new(20, 10, 51, 21)
+    @search_label.textFormat = Qt::PlainText
     @search_combo = Qt::ComboBox.new(searchDialog)
-    @search_combo.setObjectName("search_combo")
-    @search_combo.setGeometry(Qt::Rect.new(90, 10, 201, 25))
-    @search_combo.setFocusPolicy(Qt::StrongFocus)
-    @search_combo.setEditable(true)
+    @search_combo.objectName = "search_combo"
+    @search_combo.geometry = Qt::Rect.new(90, 10, 201, 25)
+    @search_combo.focusPolicy = Qt::StrongFocus
+    @search_combo.editable = true
     @from_start = Qt::CheckBox.new(searchDialog)
-    @from_start.setObjectName("from_start")
-    @from_start.setGeometry(Qt::Rect.new(90, 50, 191, 21))
+    @from_start.objectName = "from_start"
+    @from_start.geometry = Qt::Rect.new(90, 50, 191, 21)
     @regex = Qt::CheckBox.new(searchDialog)
-    @regex.setObjectName("regex")
-    @regex.setGeometry(Qt::Rect.new(90, 80, 191, 21))
+    @regex.objectName = "regex"
+    @regex.geometry = Qt::Rect.new(90, 80, 191, 21)
     @whole_words = Qt::CheckBox.new(searchDialog)
-    @whole_words.setObjectName("whole_words")
-    @whole_words.setGeometry(Qt::Rect.new(90, 110, 191, 21))
+    @whole_words.objectName = "whole_words"
+    @whole_words.geometry = Qt::Rect.new(90, 110, 191, 21)
     @forwards = Qt::RadioButton.new(searchDialog)
-    @forwards.setObjectName("forwards")
-    @forwards.setGeometry(Qt::Rect.new(90, 140, 171, 26))
-    @forwards.setChecked(true)
+    @forwards.objectName = "forwards"
+    @forwards.geometry = Qt::Rect.new(90, 140, 171, 26)
+    @forwards.checked = true
     @backwards = Qt::RadioButton.new(searchDialog)
-    @backwards.setObjectName("backwards")
-    @backwards.setGeometry(Qt::Rect.new(90, 170, 176, 26))
-    @search_label.setBuddy(@search_combo)
-    Qt::Widget::setTabOrder(@search_combo, @selected_columns)
-    Qt::Widget::setTabOrder(@selected_columns, @selected_rows)
-    Qt::Widget::setTabOrder(@selected_rows, @button_box)
+    @backwards.objectName = "backwards"
+    @backwards.geometry = Qt::Rect.new(90, 170, 176, 26)
+    @search_label.buddy = @search_combo
+    Qt::Widget.setTabOrder(@search_combo, @selected_columns)
+    Qt::Widget.setTabOrder(@selected_columns, @selected_rows)
+    Qt::Widget.setTabOrder(@selected_rows, @button_box)
 
     retranslateUi(searchDialog)
-
-    size = Qt::Size.new(307, 400)
-    size = size.expandedTo(searchDialog.minimumSizeHint())
-    searchDialog.resize(size)
-
     Qt::Object.connect(@button_box, SIGNAL('accepted()'), searchDialog, SLOT('accept()'))
     Qt::Object.connect(@button_box, SIGNAL('rejected()'), searchDialog, SLOT('reject()'))
 
@@ -83,15 +82,15 @@ class Ui_SearchDialog
     end
 
     def retranslateUi(searchDialog)
-    searchDialog.setWindowTitle(Qt::Application.translate("SearchDialog", "Search", nil, Qt::Application::UnicodeUTF8))
-    @selected_rows.setText(Qt::Application.translate("SearchDialog", "Selected Rows", nil, Qt::Application::UnicodeUTF8))
-    @selected_columns.setText(Qt::Application.translate("SearchDialog", "Selected Columns", nil, Qt::Application::UnicodeUTF8))
-    @search_label.setText(Qt::Application.translate("SearchDialog", "Search", nil, Qt::Application::UnicodeUTF8))
-    @from_start.setText(Qt::Application.translate("SearchDialog", "From &Start", nil, Qt::Application::UnicodeUTF8))
-    @regex.setText(Qt::Application.translate("SearchDialog", "&Regular Expression", nil, Qt::Application::UnicodeUTF8))
-    @whole_words.setText(Qt::Application.translate("SearchDialog", "&Whole Words", nil, Qt::Application::UnicodeUTF8))
-    @forwards.setText(Qt::Application.translate("SearchDialog", "&Forwards", nil, Qt::Application::UnicodeUTF8))
-    @backwards.setText(Qt::Application.translate("SearchDialog", "&Backwards", nil, Qt::Application::UnicodeUTF8))
+    searchDialog.windowTitle = Qt::Application.translate("SearchDialog", "Search", nil, Qt::Application::UnicodeUTF8)
+    @selected_rows.text = Qt::Application.translate("SearchDialog", "Selected Rows", nil, Qt::Application::UnicodeUTF8)
+    @selected_columns.text = Qt::Application.translate("SearchDialog", "Selected Columns", nil, Qt::Application::UnicodeUTF8)
+    @search_label.text = Qt::Application.translate("SearchDialog", "Search", nil, Qt::Application::UnicodeUTF8)
+    @from_start.text = Qt::Application.translate("SearchDialog", "From &Start", nil, Qt::Application::UnicodeUTF8)
+    @regex.text = Qt::Application.translate("SearchDialog", "&Regular Expression", nil, Qt::Application::UnicodeUTF8)
+    @whole_words.text = Qt::Application.translate("SearchDialog", "&Whole Words", nil, Qt::Application::UnicodeUTF8)
+    @forwards.text = Qt::Application.translate("SearchDialog", "&Forwards", nil, Qt::Application::UnicodeUTF8)
+    @backwards.text = Qt::Application.translate("SearchDialog", "&Backwards", nil, Qt::Application::UnicodeUTF8)
     end # retranslateUi
 
     def retranslate_ui(searchDialog)

data/lib/clevic/version.rb

@@ -1,8 +1,8 @@
 module Clevic #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 8
-    TINY  = 0
+    MINOR = 11
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/clevic/view.rb

@@ -0,0 +1,89 @@
+require 'set'
+require 'clevic/model_builder.rb'
+
+module Clevic
+  # This contains the definition of a particular view of an entity.
+  # See Clevic::ModelBuilder.
+  class View
+    @order = []
+    def self.order
+      @order
+    end
+    
+    # Handle situations where the array passed to 
+    # Clevic::View.order = has ActiveRecord::Base
+    # objects in it. In other words, if there is one, pass back it's
+    # default view class rather than the ActiveRecord::Base subclass.
+    def self.order=( array )
+      @order = array.map do |x|
+        if x.ancestors.include?( ActiveRecord::Base )
+          x.default_view_class
+        else
+          x
+        end
+      end
+    end
+    
+    def self.entity_class( *args )
+      if args.size == 0
+        @entity_class || raise( "entity_class not specified for #{name}" )
+      else
+        @entity_class = args.first
+      end
+    end
+    
+    def self.entity_class=( some_class )
+      @entity_class = some_class
+    end
+    
+    def self.widget_name( *args )
+      if args.size == 0
+        # the class name by default
+        @widget_name || name
+      else
+        @widget_name = args.first
+      end
+    end
+    
+    # For descendants to override easily
+    def entity_class
+      self.class.entity_class
+    end
+    
+    # The title to display, eg in a tab
+    def title
+      self.class.name
+    end
+    
+    # used for the Qt object_name when ModelBuilder is constructing a widget
+    # here so it can be overridden by descendants
+    def widget_name
+      self.class.widget_name
+    end
+    
+    def model_builder( &block )
+      @model_builder ||= ModelBuilder.new( self )
+      @model_builder.exec_ui_block( &block )
+    end
+    
+    # return a default UI constructed from model metadata
+    def define_ui
+      model_builder do
+        default_ui
+      end
+    end
+    
+    # define view/model specific actions
+    def define_actions( table_view, action_builder )
+    end
+    
+    # define data changed events
+    def notify_data_changed( table_view, top_left_model_index, bottom_right_model_index )
+    end
+    
+    # be notified of key presses
+    def notify_key_press( table_view, key_press_event, current_model_index )
+    end
+    
+  end
+end

data/models/accounts_models.rb

@@ -12,10 +12,12 @@ Clevic::DbOptions.connect( $options ) do
   username 'accounts'
 end
 
-class Entry < Clevic::Record
+class Entry < ActiveRecord::Base
   belongs_to :debit, :class_name => 'Account', :foreign_key => 'debit_id'
   belongs_to :credit, :class_name => 'Account', :foreign_key => 'credit_id'
-
+  
+  include Clevic::Record
+  
   define_ui do
     plain       :date, :sample => '88-WWW-99'
     distinct    :description, :conditions => "now() - date <= '1 year'", :sample => 'm' * 26
@@ -45,7 +47,7 @@ class Entry < Clevic::Record
   # copy the values for the credit and debit fields
   # from the previous similar entry
   def self.update_credit_debit( current_index, view )
-    return if !current_index.valid?
+    return unless current_index.valid?
     current_field = current_index.attribute
     if current_field == :description
       # most recent entry, ordered in reverse
@@ -61,28 +63,29 @@ class Entry < Clevic::Record
         current_index.entity.category = similar.category
         
         # emit signal to update view from top_left to bottom_right
-        model = current_index.model
-        top_left_index = model.create_index( current_index.row, 0 )
-        bottom_right_index = model.create_index( current_index.row, view.builder.fields.size )
+        top_left_index = current_index.choppy( :column => 0 )
+        bottom_right_index = current_index.choppy( :column => view.model.column_count - 1 )
         view.dataChanged( top_left_index, bottom_right_index )
         
         # move edit cursor to amount field
         view.selection_model.clear
-        view.override_next_index( model.create_index( current_index.row, view.builder.index( :amount ) ) )
+        view.override_next_index( current_index.choppy( :column => view.field_column( :amount ) ) )
       end
     end
   end
 end
 
-class Account < Clevic::Record  
+class Account < ActiveRecord::Base
   has_many :debits, :class_name => 'Entry', :foreign_key => 'debit_id'
   has_many :credits, :class_name => 'Entry', :foreign_key => 'credit_id'
   
+  include Clevic::Record
+  
   # define how fields are displayed
   define_ui do
     plain       :name
     restricted  :vat, :label => 'VAT', :set => %w{ yes no all }
-    plain       :account_type
+    restricted  :account_type, :set => %w{Account Asset Assets Expenses Income Liability Opening Balance Personal Tax VAT}
     plain       :pastel_number, :alignment => Qt::AlignRight, :label => 'Pastel'
     plain       :fringe, :format => "%.1f"
     plain       :active