gtk3assist 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     diff-lcs (1.1.3)
     ffi (1.0.11)
+    ffi (1.0.11-java)
     gir_ffi (0.4.0)
       ffi (~> 1.0.8)
       indentation (~> 0.0.6)
@@ -16,6 +17,7 @@ GEM
       rake
       rdoc
     json (1.7.5)
+    json (1.7.5-java)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -30,6 +32,7 @@ GEM
     xml-simple (1.1.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/gtk3assist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gtk3assist"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2012-09-16"
+  s.date = "2012-09-19"
   s.description = "A class for making it easier to develop Gtk3 based applications with the 'gir_ffi-gtk'-gem."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [

data/lib/gtk3assist_treeview.rb

@@ -39,7 +39,7 @@ class Gtk3assist::Treeview
   def init_liststore
     liststore_args = []
     @columns.each do |col_data|
-      if col_data[:type] == :string
+      if col_data[:type] == :string or !col_data[:type]
         liststore_args << GObject::TYPE_STRING
       else
         raise "Unknown column-type: '#{col_data[:type]}'."
@@ -81,6 +81,9 @@ class Gtk3assist::Treeview
   
   #Add a new row to the treeview.
   def add_row(args)
+    raise "''args' wasnt a hash." if !args.is_a?(Hash)
+    raise "No ':data'-array was given." if !args[:data]
+    
     if @model.is_a?(Gtk::ListStore)
       data = []
       @columns.each do |col_data|
@@ -101,7 +104,7 @@ class Gtk3assist::Treeview
       data.each do |val|
         col_data = @columns[count]
         
-        if col_data[:type] == :string
+        if col_data[:type] == :string or !col_data[:type]
           @model.set_value(iter, count, val.to_s)
         else
           raise "Unknown column-type: '#{col_data[:type]}'."
@@ -109,6 +112,8 @@ class Gtk3assist::Treeview
         
         count += 1
       end
+      
+      return {:iter => iter}
     else
       raise "Unknown model: '#{@model.class.name}'."
     end
@@ -121,18 +126,28 @@ class Gtk3assist::Treeview
       
       while iter_cur
         match = true
+        sel_val = @tv.get_selection.iter_is_selected(iter_cur) rescue false
+        match = false if args and args[:selected] and !sel_val
         
         if match
-          data = []
+          data = {}
+          count = 0
+          
           @columns.each do |col_data|
-            if col_data[:type] == :string
-              data << @model.get_value(iter_cur, 1).get_string
+            if col_data[:type] == :string or !col_data[:type]
+              data[col_data[:id]] = @model.get_value(iter_cur, count).get_string
             else
               raise "Unknown column-type: '#{col_data[:type]}'."
             end
+            
+            count += 1
           end
           
-          y << {:data => data}
+          y << {
+            :sel => sel_val,
+            :data => data,
+            :iter => iter_cur
+          }
         end
         
         break if !@model.iter_next(iter_cur)
@@ -145,4 +160,13 @@ class Gtk3assist::Treeview
       return enum
     end
   end
+  
+  #Returns the first selected row found.
+  def sel
+    self.rows(:selected => true).each do |data|
+      return data if data[:sel]
+    end
+    
+    return nil
+  end
 end

data/spec/gtk3assist_combobox_spec.rb

@@ -30,7 +30,7 @@ describe "Gtk3assist_combobox" do
     raise "Expected selected title to be 'Kasper' but it wasnt: '#{data[:data][:title]}'." if data[:data][:title] != "Christina"
     
     count = 0
-    cba.rows do |data|
+    cba.items do |data|
       #puts data
       count += 1
     end

metadata

@@ -2,7 +2,7 @@
 name: gtk3assist
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-16 00:00:00 Z
+date: 2012-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gir_ffi-gtk
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4372892411458411621
+      hash: -4051244528406198022
       segments: 
       - 0
       version: "0"