clevic 0.13.0.b11 → 0.13.0.b12

data/History.txt

@@ -1,3 +1,6 @@
+== 0.13.0.b12
+* fix for qt-4.7 related to variants in combo boxes
+
 == 0.13.0.b11
 * updates for sequel-3.30.0
 

data/lib/clevic/qt/combo_delegate.rb

@@ -105,7 +105,7 @@ class ComboDelegate < Clevic::Delegate
   def setModelData( editor, abstract_item_model, model_index )
     if is_combo?( editor )
       dump_editor_state( editor )
-      value = 
+      value =
       if editor.completer.current_row == -1
         # item doesn't exist in the list, add it if not restricted
         editor.current_text unless restricted?

data/lib/clevic/qt/qt_combo_box.rb

@@ -8,7 +8,12 @@ module Qt
 
     def <<( item )
       text, data = item_to_editor( item )
-      add_item( text, data.to_variant )
+      if data.is_a?( Qt::Variant )
+        add_item( text, data )
+      else
+        puts "#{__FILE__}:#{__LINE__}:warning: #{data} is not a variant"
+        add_item( text, data.to_variant )
+      end
     end
 
     def include?( item )

data/lib/clevic/qt/relational_delegate.rb

@@ -5,7 +5,7 @@ module Clevic
 # Edit a relation from an id and display a list of relevant entries.
 #
 # attribute is the method to call on the row entity to retrieve the related object.
-# 
+#
 # The ids of the model objects are stored in the item data
 # and the item text is fetched from them using attribute_path.
 class RelationalDelegate < ComboDelegate

data/lib/clevic/version.rb

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

data/models/times_psql_models.rb

@@ -1,4 +1,5 @@
 $options ||= {}
+$options[:debug] = true
 
 require 'clevic.rb'
 require 'sequel'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clevic
 version: !ruby/object:Gem::Version
-  version: 0.13.0.b11
+  version: 0.13.0.b12
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-31 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &67725380 !ruby/object:Gem::Requirement
+  requirement: &86247150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *67725380
+  version_requirements: *86247150
 - !ruby/object:Gem::Dependency
   name: gather
-  requirement: &67724830 !ruby/object:Gem::Requirement
+  requirement: &86246920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *67724830
+  version_requirements: *86246920
 - !ruby/object:Gem::Dependency
   name: andand
-  requirement: &68142100 !ruby/object:Gem::Requirement
+  requirement: &86246680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *68142100
+  version_requirements: *86246680
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &68141500 !ruby/object:Gem::Requirement
+  requirement: &86246450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *68141500
+  version_requirements: *86246450
 - !ruby/object:Gem::Dependency
   name: bsearch
-  requirement: &68140970 !ruby/object:Gem::Requirement
+  requirement: &86245880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *68140970
+  version_requirements: *86245880
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &68140360 !ruby/object:Gem::Requirement
+  requirement: &86245470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *68140360
+  version_requirements: *86245470
 - !ruby/object:Gem::Dependency
   name: hashery
-  requirement: &68139710 !ruby/object:Gem::Requirement
+  requirement: &86243900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *68139710
+  version_requirements: *86243900
 - !ruby/object:Gem::Dependency
   name: io-like
-  requirement: &68138730 !ruby/object:Gem::Requirement
+  requirement: &86242870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *68138730
+  version_requirements: *86242870
 - !ruby/object:Gem::Dependency
   name: qtbindings
-  requirement: &68138180 !ruby/object:Gem::Requirement
+  requirement: &86066020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 4.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *68138180
+  version_requirements: *86066020
 - !ruby/object:Gem::Dependency
   name: qtext
-  requirement: &68137630 !ruby/object:Gem::Requirement
+  requirement: &86065690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 0.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *68137630
+  version_requirements: *86065690
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &68136940 !ruby/object:Gem::Requirement
+  requirement: &86065320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 2.4.3
   type: :development
   prerelease: false
-  version_requirements: *68136940
+  version_requirements: *86065320
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &68136390 !ruby/object:Gem::Requirement
+  requirement: &86065010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *68136390
+  version_requirements: *86065010
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &68135390 !ruby/object:Gem::Requirement
+  requirement: &86064640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,18 +153,18 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *68135390
+  version_requirements: *86064640
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &68134800 !ruby/object:Gem::Requirement
+  requirement: &86064310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *68134800
+  version_requirements: *86064310
 description: SQL table GUI with Qt / Java Swing and Sequel
 email: panic@semiosix.com
 executables: