clevic 0.13.0.b1 → 0.13.0.b2

data/Manifest.txt

@@ -27,121 +27,16 @@ test/test_order_attribute.rb
 test/test_sql_dialects.rb
 test/test_table_model.rb
 test/test_table_searcher.rb
+lib/clevic.rb
 lib/clevic/qt/ui/browser.ui
 lib/clevic/qt/ui/search_dialog_ui.rb
 lib/clevic/qt/ui/search_dialog.ui
 lib/clevic/qt/ui/browser_ui.rb
+lib/clevic/qt/model_builder.rb
 lib/clevic/qt/table_model.rb
 lib/clevic/qt/text_area_delegate.rb
 lib/clevic/qt/browser.rb
-lib/clevic/qt/action_builder.rb
-lib/clevic/qt/field.rb
-lib/clevic/qt/set_delegate.rb
-lib/clevic/qt/item_delegate.rb
-lib/clevic/qt/clipboard.rb
-lib/clevic/qt/text_delegate.rb
-lib/clevic/qt/distinct_delegate.rb
-lib/clevic/qt/boolean_delegate.rb
-lib/clevic/qt/table_view.rb
-lib/clevic/qt/search_dialog.rb
-lib/clevic/qt/combo_delegate.rb
-lib/clevic/qt/extensions.rb
-lib/clevic/qt/delegates.rb
-lib/clevic/qt/relational_delegate.rb
-lib/clevic/table_view_paste.rb
-lib/clevic/sequel_ar_adapter.rb
-lib/clevic/model_builder.rb
-lib/clevic/rails_models_loaders.rb
-lib/clevic/sequel_length_validation.rb
-lib/clevic/cache_table.rb
-lib/clevic/table_model.rb
-lib/clevic/icons
-lib/clevic/icons/icon.png
-lib/clevic/qt.rb
-lib/clevic/swing
-lib/clevic/swing/ui
-lib/clevic/swing/ui/src
-lib/clevic/swing/ui/src/SearchDialog.form
-lib/clevic/swing/ui/src/SearchDialog.java
-lib/clevic/swing/ui/src/resources
-lib/clevic/swing/ui/src/resources/SearchDialog.properties
-lib/clevic/swing/ui/src/TagEditor.form
-lib/clevic/swing/ui/src/TagEditor.java
-lib/clevic/swing/ui/dist
-lib/clevic/swing/ui/dist/lib
-lib/clevic/swing/ui/dist/lib/swing-layout-1.0.3.jar
-lib/clevic/swing/ui/dist/README.TXT
-lib/clevic/swing/ui/nbproject
-lib/clevic/swing/ui/nbproject/genfiles.properties
-lib/clevic/swing/ui/nbproject/build-impl.xml
-lib/clevic/swing/ui/nbproject/project.xml
-lib/clevic/swing/ui/nbproject/project.properties
-lib/clevic/swing/ui/nbproject/private
-lib/clevic/swing/ui/nbproject/private/private.properties
-lib/clevic/swing/ui/nbproject/private/config.properties
-lib/clevic/swing/ui/nbproject/private/private.xml
-lib/clevic/swing/ui/build.xml
-lib/clevic/swing/ui/manifest.mf
-lib/clevic/swing/table_model.rb
-lib/clevic/swing/text_area_delegate.rb
-lib/clevic/swing/browser.rb
-lib/clevic/swing/cell_renderer.rb
-lib/clevic/swing/tag_editor.rb
-lib/clevic/swing/action_builder.rb
-lib/clevic/swing/field.rb
-lib/clevic/swing/set_delegate.rb
-lib/clevic/swing/clipboard.rb
-lib/clevic/swing/text_delegate.rb
-lib/clevic/swing/tag_delegate.rb
-lib/clevic/swing/selection_model.rb
-lib/clevic/swing/distinct_delegate.rb
-lib/clevic/swing/boolean_delegate.rb
-lib/clevic/swing/confirm_dialog.rb
-lib/clevic/swing/table_view.rb
-lib/clevic/swing/search_dialog.rb
-lib/clevic/swing/combo_delegate.rb
-lib/clevic/swing/swing_table_index.rb
-lib/clevic/swing/table_view_focus.rb
-lib/clevic/swing/cell_editor.rb
-lib/clevic/swing/extensions.rb
-lib/clevic/swing/delegate.rb
-lib/clevic/swing/action.rb
-lib/clevic/swing/relational_delegate.rb
-lib/clevic/swing/row_header.rb
-lib/clevic/ar_methods.rb
-lib/clevic/swing.rb
-lib/clevic/action_builder.rb
-lib/clevic/order_attribute.rb
-lib/clevic/dirty.rb
-lib/clevic/field.rb
-lib/clevic/attribute_list.rb
-lib/clevic/record.rb
-lib/clevic/sampler.rb
-lib/clevic/model_column.rb
-lib/clevic/table_searcher.rb
-lib/clevic/table_view.rb
-lib/clevic/field_valuer.rb
-lib/clevic/sequel_naked.rb
-lib/clevic/table_index.rb
-lib/clevic/view.rb
-lib/clevic/sequel_meta.rb
-lib/clevic/extensions.rb
-lib/clevic/delegate.rb
-lib/clevic/sql_dialects.rb
-lib/clevic/default_view.rb
-lib/clevic/many_field.rb
-lib/clevic/filter_command.rb
-lib/clevic/version.rb
-lib/clevic/generic_format.rb
-lib/clevic/emitter.rb
-lib/clevic/qt/ui/browser.ui
-lib/clevic/qt/ui/.gitignore
-lib/clevic/qt/ui/search_dialog_ui.rb
-lib/clevic/qt/ui/search_dialog.ui
-lib/clevic/qt/ui/browser_ui.rb
-lib/clevic/qt/table_model.rb
-lib/clevic/qt/text_area_delegate.rb
-lib/clevic/qt/browser.rb
+lib/clevic/qt/accept_reject.rb
 lib/clevic/qt/action_builder.rb
 lib/clevic/qt/field.rb
 lib/clevic/qt/set_delegate.rb
@@ -181,6 +76,7 @@ lib/clevic/swing/ui/nbproject/private/config.properties
 lib/clevic/swing/ui/nbproject/private/private.xml
 lib/clevic/swing/ui/build.xml
 lib/clevic/swing/ui/manifest.mf
+lib/clevic/swing/model_builder.rb
 lib/clevic/swing/table_model.rb
 lib/clevic/swing/text_area_delegate.rb
 lib/clevic/swing/browser.rb

data/Rakefile

@@ -7,7 +7,7 @@ $hoe = Hoe.new('clevic', Clevic::VERSION::STRING) do |p|
   p.developer('John Anderson', 'panic@semiosix.com')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.rubyforge_name       = p.name # TODO this is default value
-  p.description          = "SQL table GUI with Qt, Swing, Sequel"
+  p.description          = "SQL table GUI with Qt / Java Swing and Sequel"
   p.extra_deps         = [
     ['activesupport','>= 2.0.2'],
     ['fastercsv', '>=1.2.3'],

data/TODO

@@ -1,4 +1,5 @@
 use Sequel::Dataset for filtering instead of find options
+can't use find on certain fields, ie code in adjustments
 
 export to CSV
 Accounts not landing after Ditto with auto-fill-in

data/lib/clevic.rb

@@ -0,0 +1,13 @@
+# This provides enough to define UIs.
+
+module Clevic
+  def self.base_entity_class
+    Sequel::Model
+  end
+end
+
+require 'clevic/sequel_ar_adapter.rb'
+require 'clevic/sequel_length_validation.rb'
+require 'clevic/record.rb'
+require 'clevic/view.rb'
+require 'clevic/sequel_meta.rb'

data/lib/clevic/cache_table.rb

@@ -49,7 +49,7 @@ class CacheTable < Array
   # If no order attributes are specified, the primary key will be used.
   # TODO what about compound primary keys?
   def order_attributes
-    # This is sorted in @options[:order], so use that for the search
+    # This is sorted in @find_options[:order], so use that for the search
     if @order_attributes.nil?
       @order_attributes = find_options[:order].to_s.split( /, */ ).map{|x| OrderAttribute.new(@entity_class, x)}
       

data/lib/clevic/model_builder.rb

@@ -438,13 +438,13 @@ class ModelBuilder
   # an ordinary field, edited in place with a text box
   def plain( attribute, options = {}, &block )
     read_only_default!( attribute, options )
-    field = @fields[attribute] = Clevic::Field.new( attribute.to_sym, entity_class, options, &block )
-    field.delegate = 
-    if field.meta.type == :boolean
-      BooleanDelegate.new( field )
-    else
-      TextDelegate.new( field )
-    end
+    field = Clevic::Field.new( attribute.to_sym, entity_class, options, &block )
+    
+    # plain_delegate will be defined in a framework-specific file.
+    # This is becoming a kind of poor man's inheritance. I don't
+    # think I like that.
+    field.delegate = plain_delegate( field )
+    @fields[attribute] = field
   end
   
   # an ordinary field like plain, except that a larger edit area can be used

data/lib/clevic/qt.rb

@@ -7,6 +7,8 @@ require 'pathname'
 # require these first, so TableModel and TableView get the correct ancestors
 require 'clevic/qt/table_model.rb'
 require 'clevic/qt/table_view.rb'
+
+# all other files in the qt subdirectory
 ( Pathname.new( __FILE__ ).parent + 'qt' ).children.grep( /.rb$/ ).each do |child|
   require child.to_s
 end
@@ -15,21 +17,3 @@ end
 require 'clevic/table_model'
 require 'clevic/table_view'
 require 'clevic.rb'
-
-module Clevic
-
-def self.tahoma
-  if @font.nil?
-    @font = 
-    begin
-      found = java.awt.GraphicsEnvironment.local_graphics_environment.all_fonts.select {|f| f.font_name == "Tahoma"}.first
-      found.deriveFont( 13.0 )
-      java.awt.Font.new( 'DialogInput', java.awt.Font::PLAIN, 13 )
-  rescue
-      java.awt.Font.new( 'DialogInput', java.awt.Font::PLAIN, 13 )
-    end
-  end
-  @font
-end
-
-end

data/lib/clevic/qt/accept_reject.rb

@@ -0,0 +1,12 @@
+# Qt-specific accept/reject. Including class must provide #result
+module Clevic
+  module AcceptReject
+    def accepted?
+      [ Qt::Dialog::Accepted, Qt::MessageBox::Yes, Qt::MessageBox::Ok ].include?( result )
+    end
+
+    def rejected?
+      [ Qt::Dialog::Rejected, Qt::MessageBox::No, Qt::MessageBox::Cancel ].include?( result )
+    end
+  end
+end

data/lib/clevic/qt/extensions.rb

@@ -2,6 +2,7 @@ require 'set'
 
 require 'qtext/flags.rb'
 require 'clevic/table_index.rb'
+require 'clevic/qt/accept_reject'
 
 # convenience methods
 module Qt
@@ -41,12 +42,6 @@ module Qt
   
   # implement accepted? and rejected? for TableView#confirm_dialog and friends
   class MessageBox
-    def accepted?
-      [ Qt::Dialog::Accepted, Qt::MessageBox::Yes, Qt::MessageBox::Ok ].include?( result )
-    end
-
-    def rejected?
-      [ Qt::Dialog::Rejected, Qt::MessageBox::No, Qt::MessageBox::Cancel ].include?( result )
-    end
+    include Clevic::AcceptReject
   end
 end

data/lib/clevic/qt/model_builder.rb

@@ -0,0 +1,9 @@
+module Clevic
+
+class ModelBuilder
+  # no special delegate needed for Qt
+  def plain_delegate( field )
+  end
+end
+
+end

data/lib/clevic/qt/search_dialog.rb

@@ -1,14 +1,18 @@
 require 'Qt4'
 require 'clevic/qt/ui/search_dialog_ui.rb'
 require 'qtext/flags.rb'
+require 'clevic/qt/accept_reject.rb'
 
 module Clevic
 
   class SearchDialog
+    include AcceptReject
     include QtFlags
+    
     attr_reader :match_flags, :layout
+    attr_accessor :result
     
-    def initialize
+    def initialize( parent )
       @layout = Ui_SearchDialog.new
       @dialog = Qt::Dialog.new
       @layout.setupUi( @dialog )
@@ -52,14 +56,14 @@ module Clevic
     def exec( text = '' )
       search_combo.edit_text = text.to_s
       search_combo.set_focus
-      retval = @dialog.exec
+      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
       
-      retval
+      self
     end
     
     def search_text

data/lib/clevic/qt/table_model.rb

@@ -136,11 +136,13 @@ class TableModel < Qt::AbstractTableModel
       when qt_background_role
         if orientation == Qt::Vertical
           item = collection[section]
-          case
-            when !item.errors.empty?
-              Qt::Color.new( 'orange' )
-            when item.changed?
-              Qt::Color.new( 'yellow' )
+          unless item.nil?
+            case
+              when !item.errors.empty?
+                Qt::Color.new( 'orange' )
+              when item.changed?
+                Qt::Color.new( 'yellow' )
+              end
           end
         end
         
@@ -236,20 +238,19 @@ class TableModel < Qt::AbstractTableModel
         end
         
         begin
-          index.attribute_value =
           case
-            when value.class.name == 'Qt::Date'
-              Date.new( value.year, value.month, value.day )
+            when variant.class.name == 'Qt::Date'
+              index.attribute_value = Date.new( variant.year, variant.month, variant.day )
               
-            when value.class.name == 'Qt::Time'
-              Time.new( value.hour, value.min, value.sec )
+            when variant.class.name == 'Qt::Time'
+              index.attribute_value = Time.new( variant.hour, variant.min, variant.sec )
             
             else
-              translate_to_db_object( index, variant.value )
+              index.edit_value = variant.value
           end
           
           # value conversion was successful
-          data_changed( table_index )
+          data_changed( index )
           true
         rescue Exception => e
           puts e.backtrace.join( "\n" )
@@ -261,7 +262,7 @@ class TableModel < Qt::AbstractTableModel
 
       when qt_checkstate_role
         if index.meta.type == :boolean
-          index.entity.toggle( index.attribute )
+          index.attribute_value = !index.attribute_value
           true
         else
           false

data/lib/clevic/qt/table_view.rb

@@ -42,8 +42,15 @@ class TableView < Qt::TableView
     # TODO might be useful to allow movable vertical rows,
     # but need to change the shortcut ideas of next and previous rows
     self.vertical_header.movable = false
+    self.vertical_header.default_alignment = Qt::AlignTop | Qt::AlignRight
     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 
+    
     self.context_menu_policy = Qt::ActionsContextMenu
   end
   
@@ -93,28 +100,38 @@ class TableView < Qt::TableView
     self.set_column_width( col, column_size( col, sample ).width )
   end
 
+  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
-    fnt = font
-    fnt.bold = true
-    opt.fontMetrics = Qt::FontMetrics.new( fnt )
+    opt.fontMetrics = metrics
+    opt.rect = opt.fontMetrics.bounding_rect( data.to_s )
     
     # set data
     opt.text = data.to_s
     
-    # icon size. Not needed 
-    #~ variant = d->model->headerData(logicalIndex, d->orientation, Qt::DecorationRole);
-    #~ opt.icon = qvariant_cast<QIcon>(variant);
-    #~ if (opt.icon.isNull())
-        #~ opt.icon = qvariant_cast<QPixmap>(variant);
+    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 )
     
-    size = Qt::Size.new( 100, 30 )
     # final parameter could be header section
-    style.sizeFromContents( Qt::Style::CT_HeaderSection, opt, size );
+    style.sizeFromContents( Qt::Style::CT_HeaderSection, opt, size )
   end
   
   # make sure row size is correct
@@ -124,7 +141,8 @@ class TableView < Qt::TableView
     @model = model
     
     # make sure we get nice spacing
-    vertical_header.default_section_size = vertical_header.minimum_section_size
+    vertical_header.default_section_size = metrics.height
+    vertical_header.minimum_section_size = metrics.height
     super
     
     # set delegates
@@ -233,6 +251,8 @@ class TableView < Qt::TableView
     super
     save_current_row if @hiding
   rescue
+    puts $!.message
+    puts $!.backtrace
     show_error "Error saving data from #{editor.inspect}: #{$!.message}"
   end
   

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

@@ -0,0 +1,133 @@
+=begin
+** Form generated from reading ui file 'browser.ui'
+**
+** Created: Mon Jan 24 21:13:34 2011
+**      by: Qt User Interface Compiler version 4.5.1
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+=end
+
+class Ui_Browser
+    attr_reader :action_open
+    attr_reader :action_close
+    attr_reader :action_recent
+    attr_reader :action_dump
+    attr_reader :action_refresh
+    attr_reader :action_next
+    attr_reader :action_previous
+    attr_reader :action_new_window
+    attr_reader :main_widget
+    attr_reader :vboxLayout
+    attr_reader :statusbar
+    attr_reader :menubar
+    attr_reader :menu_file
+    attr_reader :menu_edit
+    attr_reader :menu_search
+    attr_reader :menu_model
+
+    def setupUi(browser)
+    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.objectName = "action_open"
+    @action_open.visible = false
+    @action_close = Qt::Action.new(browser)
+    @action_close.objectName = "action_close"
+    @action_close.visible = false
+    @action_recent = Qt::Action.new(browser)
+    @action_recent.objectName = "action_recent"
+    @action_recent.visible = false
+    @action_dump = Qt::Action.new(browser)
+    @action_dump.objectName = "action_dump"
+    @action_refresh = Qt::Action.new(browser)
+    @action_refresh.objectName = "action_refresh"
+    @action_next = Qt::Action.new(browser)
+    @action_next.objectName = "action_next"
+    @action_previous = Qt::Action.new(browser)
+    @action_previous.objectName = "action_previous"
+    @action_new_window = Qt::Action.new(browser)
+    @action_new_window.objectName = "action_new_window"
+    @action_new_window.visible = false
+    @main_widget = Qt::Widget.new(browser)
+    @main_widget.objectName = "main_widget"
+    @vboxLayout = Qt::VBoxLayout.new(@main_widget)
+    @vboxLayout.objectName = "vboxLayout"
+    browser.centralWidget = @main_widget
+    @statusbar = Qt::StatusBar.new(browser)
+    @statusbar.objectName = "statusbar"
+    browser.statusBar = @statusbar
+    @menubar = Qt::MenuBar.new(browser)
+    @menubar.objectName = "menubar"
+    @menubar.geometry = Qt::Rect.new(0, 0, 727, 31)
+    @menu_file = Qt::Menu.new(@menubar)
+    @menu_file.objectName = "menu_file"
+    @menu_file.enabled = false
+    @menu_edit = Qt::Menu.new(@menubar)
+    @menu_edit.objectName = "menu_edit"
+    @menu_search = Qt::Menu.new(@menubar)
+    @menu_search.objectName = "menu_search"
+    @menu_model = Qt::Menu.new(@menubar)
+    @menu_model.objectName = "menu_model"
+    browser.setMenuBar(@menubar)
+
+    @menubar.addAction(@menu_file.menuAction())
+    @menubar.addAction(@menu_edit.menuAction())
+    @menubar.addAction(@menu_search.menuAction())
+    @menubar.addAction(@menu_model.menuAction())
+    @menu_file.addAction(@action_open)
+    @menu_file.addAction(@action_close)
+    @menu_file.addAction(@action_recent)
+    @menu_file.addAction(@action_new_window)
+    @menu_model.addAction(@action_next)
+    @menu_model.addAction(@action_previous)
+    @menu_model.addAction(@action_dump)
+    @menu_model.addSeparator()
+
+    retranslateUi(browser)
+
+    Qt::MetaObject.connectSlotsByName(browser)
+    end # setupUi
+
+    def setup_ui(browser)
+        setupUi(browser)
+    end
+
+    def retranslateUi(browser)
+    @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)
+        retranslateUi(browser)
+    end
+
+end
+
+module Ui
+    class Browser < Ui_Browser
+    end
+end  # module Ui
+

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

@@ -0,0 +1,106 @@
+=begin
+** Form generated from reading ui file 'search_dialog.ui'
+**
+** Created: Mon Jan 24 21:13:34 2011
+**      by: Qt User Interface Compiler version 4.5.1
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+=end
+
+class Ui_SearchDialog
+    attr_reader :button_box
+    attr_reader :selected_rows
+    attr_reader :selected_columns
+    attr_reader :search_label
+    attr_reader :search_combo
+    attr_reader :from_start
+    attr_reader :regex
+    attr_reader :whole_words
+    attr_reader :forwards
+    attr_reader :backwards
+
+    def setupUi(searchDialog)
+    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.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.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.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.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.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.objectName = "from_start"
+    @from_start.geometry = Qt::Rect.new(90, 50, 191, 21)
+    @regex = Qt::CheckBox.new(searchDialog)
+    @regex.objectName = "regex"
+    @regex.geometry = Qt::Rect.new(90, 80, 191, 21)
+    @whole_words = Qt::CheckBox.new(searchDialog)
+    @whole_words.objectName = "whole_words"
+    @whole_words.geometry = Qt::Rect.new(90, 110, 191, 21)
+    @forwards = Qt::RadioButton.new(searchDialog)
+    @forwards.objectName = "forwards"
+    @forwards.geometry = Qt::Rect.new(90, 140, 171, 26)
+    @forwards.checked = true
+    @backwards = Qt::RadioButton.new(searchDialog)
+    @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)
+    Qt::Object.connect(@button_box, SIGNAL('accepted()'), searchDialog, SLOT('accept()'))
+    Qt::Object.connect(@button_box, SIGNAL('rejected()'), searchDialog, SLOT('reject()'))
+
+    Qt::MetaObject.connectSlotsByName(searchDialog)
+    end # setupUi
+
+    def setup_ui(searchDialog)
+        setupUi(searchDialog)
+    end
+
+    def retranslateUi(searchDialog)
+    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)
+        retranslateUi(searchDialog)
+    end
+
+end
+
+module Ui
+    class SearchDialog < Ui_SearchDialog
+    end
+end  # module Ui
+

data/lib/clevic/swing.rb

@@ -10,6 +10,8 @@ require 'java'
 # require these first, so TableModel and TableView get the correct ancestors
 require 'clevic/swing/table_model.rb'
 require 'clevic/swing/table_view.rb'
+
+# all other files in the swing subdirectory
 ( Pathname.new( __FILE__ ).parent + 'swing' ).children.grep( /.rb$/ ).each do |child|
   require child.to_s
 end

data/lib/clevic/swing/model_builder.rb

@@ -0,0 +1,15 @@
+module Clevic
+
+class ModelBuilder
+  # Not sure if this is the right place to put it, but
+  # try here and see if it works out.
+  def plain_delegate( field )
+    if field.meta.type == :boolean
+      BooleanDelegate.new( field )
+    else
+      TextDelegate.new( field )
+    end
+  end
+end
+
+end

data/lib/clevic/table_model.rb

@@ -117,7 +117,8 @@ class TableModel
     add_new_item if collection.empty? && auto_new?
   end
   
-  # save the AR model at the given index, if it's dirty
+  # save the model at the given index, if it's dirty
+  # TODO Sequel uses modified?
   def save( index )
     item = collection[index.row]
     return false if item.nil?
@@ -130,7 +131,7 @@ class TableModel
         false
       end
     else
-      # AR model not changed
+      # model not changed
       true
     end
   rescue
@@ -151,7 +152,7 @@ class TableModel
   # TODO could handle dataset creation better
   def search( start_index, search_criteria )
     ordered_dataset = entity_class.dataset.order( *cache_table.order_attributes.map{|oa| oa.attribute.to_sym.send( oa.direction ) } )
-    searcher = Clevic::TableSearcher.new(
+    searcher = TableSearcher.new(
       ordered_dataset,
       search_criteria,
       start_index.field
@@ -159,9 +160,10 @@ class TableModel
     entity = searcher.search( start_index.entity )
     
     # return matched indexes
-    if entity != nil
+    unless entity.nil?
       found_row = collection.index_for_entity( entity )
-      [ create_index( found_row, start_index.column ) ]
+      raise "found_row should find something" if found_row.nil?
+      [ create_index( found_row, start_index.column, 0 ) ]
     else
       []
     end

data/lib/clevic/table_view.rb

@@ -87,7 +87,6 @@ class TableView
     
     # list of actions in the edit menu
     list( :edit ) do
-      #~ new_action :action_cut, 'Cu&t', :shortcut => 'Ctrl-X'
       action :action_save, '&Save', :shortcut => 'Ctrl+S', :method => :save_current_rows
       #~ action :action_cut, 'Cu&t', :shortcut => 'Ctrl+X', :method => :cut_current_selection
       action :action_copy, '&Copy', :shortcut => 'Ctrl+C', :method => :copy_current_selection
@@ -263,7 +262,7 @@ class TableView
   end
   
   def search_dialog
-    @search_dialog ||= SearchDialog.new( nil )
+    @search_dialog ||= SearchDialog.new( self )
   end
   
   # display a search dialog, and find the entered text

data/lib/clevic/version.rb

@@ -3,7 +3,7 @@ module Clevic #:nodoc:
     MAJOR = 0
     MINOR = 13
     TINY  = 0
-    PRE   = 'b1'
+    PRE   = 'b2'
 
     STRING = [MAJOR, MINOR, TINY, PRE].join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: clevic
 version: !ruby/object:Gem::Version 
-  hash: 165
+  hash: 163
   prerelease: 7
   segments: 
   - 0
   - 13
   - 0
   - b
-  - 1
-  version: 0.13.0.b1
+  - 2
+  version: 0.13.0.b2
 platform: ruby
 authors: 
 - John Anderson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +02:00
+date: 2011-01-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -196,7 +196,7 @@ dependencies:
         version: 1.8.0
   type: :development
   version_requirements: *id011
-description: SQL table GUI with Qt, Swing, Sequel
+description: SQL table GUI with Qt / Java Swing and Sequel
 email: 
 - panic@semiosix.com
 executables: 
@@ -237,13 +237,16 @@ files:
 - test/test_sql_dialects.rb
 - test/test_table_model.rb
 - test/test_table_searcher.rb
+- lib/clevic.rb
 - lib/clevic/qt/ui/browser.ui
 - lib/clevic/qt/ui/search_dialog_ui.rb
 - lib/clevic/qt/ui/search_dialog.ui
 - lib/clevic/qt/ui/browser_ui.rb
+- lib/clevic/qt/model_builder.rb
 - lib/clevic/qt/table_model.rb
 - lib/clevic/qt/text_area_delegate.rb
 - lib/clevic/qt/browser.rb
+- lib/clevic/qt/accept_reject.rb
 - lib/clevic/qt/action_builder.rb
 - lib/clevic/qt/field.rb
 - lib/clevic/qt/set_delegate.rb
@@ -283,6 +286,7 @@ files:
 - lib/clevic/swing/ui/nbproject/private/private.xml
 - lib/clevic/swing/ui/build.xml
 - lib/clevic/swing/ui/manifest.mf
+- lib/clevic/swing/model_builder.rb
 - lib/clevic/swing/table_model.rb
 - lib/clevic/swing/text_area_delegate.rb
 - lib/clevic/swing/browser.rb
@@ -335,7 +339,6 @@ files:
 - lib/clevic/version.rb
 - lib/clevic/generic_format.rb
 - lib/clevic/emitter.rb
-- lib/clevic/qt/ui/.gitignore
 has_rdoc: true
 homepage: http://clevic.rubyforge.org
 licenses: []
@@ -374,10 +377,10 @@ signing_key:
 specification_version: 3
 summary: Database framework and Model/View GUI for data capture and editing of tables in a pre-existing relational DBMS
 test_files: 
+- test/test_sql_dialects.rb
+- test/test_order_attribute.rb
+- test/test_table_searcher.rb
 - test/test_model_index_extensions.rb
-- test/test_cache_table.rb
 - test/test_table_model.rb
-- test/test_table_searcher.rb
-- test/test_order_attribute.rb
 - test/test_helper.rb
-- test/test_sql_dialects.rb
+- test/test_cache_table.rb

data/lib/clevic/qt/ui/.gitignore

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