gtk3assist 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/gtk3assist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gtk3assist"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2012-09-19"
+  s.date = "2012-09-30"
   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.rb

@@ -9,4 +9,13 @@ class Gtk3assist
     raise "Still not defined: '#{name}'." if !Gtk3assist.const_defined?(name)
     return Gtk3assist.const_get(name)
   end
+  
+  #Sends the given text to GetText or returns the string if GetText is not loaded.
+  def self._(str)
+    if ::Kernel.const_defined?(:GetText)
+      ::GetText._(str)
+    else
+      return str
+    end
+  end
 end

data/lib/gtk3assist_msgbox.rb

@@ -11,6 +11,15 @@ class Gtk3assist::Msgbox
   #The result of the dialog.
   attr_reader :result
   
+  def self.error(e, args = {})
+    msg = Gtk3assist._("An error occurred.")
+    msg << "\n\n"
+    msg << "<#{e.class.name}: #{e.message}>\n"
+    msg << e.backtrace.join("\n")
+    
+    return Gtk3assist::Msgbox.new(args.merge(:type => :warning, :msg => msg))
+  end
+  
   def self.current
     raise "No current showing message-box." if !DATA[:current]
   end
@@ -28,11 +37,11 @@ class Gtk3assist::Msgbox
     if !args[:title]
       case args[:type]
         when :warning
-          args[:title] = _("Warning")
+          args[:title] = Gtk3assist._("Warning")
         when :yesno
-          args[:title] = _("Question")
+          args[:title] = Gtk3assist._("Question")
         when :info
-          args[:title] = _("Information")
+          args[:title] = Gtk3assist._("Information")
         else
           raise "Unknown type: '#{args[:type]}'."
       end
@@ -139,14 +148,4 @@ class Gtk3assist::Msgbox
     raise "No result yet." if !@result
     return Gtk::ResponseType[@result].to_sym
   end
-  
-  #Contains a fallback method for '_' which is used to translate texts in the GetText-library.
-  def method_missing(method, *args, &block)
-    case method
-      when :_
-        return args[0]
-      else
-        raise NameError, "No such method: '#{method}'."
-    end
-  end
 end

data/lib/gtk3assist_threadding.rb

@@ -24,11 +24,17 @@ class Gtk3assist::Threadding
     Thread.pass
     t_run = Time.now.to_f - t_begin
     
-    if t_run < 0.0001
+    if t_run < 0.00001
+      #Somehow the idle or timeout gets ignored unless this is here.
+      Thread.pass
+      
       #Run again after a small amount of time to prevent 100% CPU.
       GLib.timeout_add(GLib::PRIORITY_DEFAULT_IDLE, @time, self.method(:enable_threadding_pass), nil, nil)
       return false
     else
+      #Somehow the idle or timeout gets ignored unless this is here.
+      Thread.pass
+      
       #Run again on next idle.
       GLib.idle_add(GLib::PRIORITY_DEFAULT_IDLE, self.method(:enable_threadding_pass), nil, nil)
       return false

data/lib/gtk3assist_treeview.rb

@@ -7,7 +7,7 @@ class Gtk3assist::Treeview
   attr_reader :model
   
   #An array of allowed arguments for the 'initialize'-method.
-  ALLOWED_ARGS = [:tv, :cols, :model]
+  ALLOWED_ARGS = [:tv, :cols, :model, :sort_col]
   
   #Constructor.
   def initialize(args)
@@ -17,6 +17,7 @@ class Gtk3assist::Treeview
     end
     
     @columns = []
+    @column_count = 0
     @tv = args[:tv]
     raise "No ':tv' argument was given." if !@tv.is_a?(Gtk::TreeView)
     
@@ -33,6 +34,8 @@ class Gtk3assist::Treeview
         raise "Unknown model: '#{args[:model]}'."
       end
     end
+    
+    self.sort_col = args[:sort_col] if args.key?(:sort_col)
   end
   
   #Initializes a new list-store on the treeview.
@@ -50,6 +53,20 @@ class Gtk3assist::Treeview
     @tv.set_model(@model)
   end
   
+  def sort_col=(col_id)
+    count = 0
+    @columns.each do |col_data|
+      if col_data[:id] == col_id
+        @model.set_sort_column_id(count, Gtk::SortType[:ascending])
+        return nil
+      end
+      
+      count += 1
+    end
+    
+    raise "Could not find a column by that ID: '#{col_id}'."
+  end
+  
   #Adds a new column to the treeview.
   def add_column(args)
     if args.is_a?(Hash)
@@ -70,6 +87,7 @@ class Gtk3assist::Treeview
     
     lab.show
     @tv.append_column(col)
+    count = @column_count
     
     @columns << {
       :col => col,
@@ -119,6 +137,33 @@ class Gtk3assist::Treeview
     end
   end
   
+  def rows_remove(args = nil)
+    #Containing the ID's that should be removed (minus length to account for cursor changes).
+    removes = []
+    
+    #Avoid counting length of 'removes' all the time.
+    removes_count = 0
+    
+    #Calculate which rows should be removed by yield'ing and checking for true. Then adding ID (minus remove-count) to 'removes'-array.
+    self.rows(args) do |data|
+      res = yield(data)
+      
+      if res == true
+        removes << @model.path(data[:iter]).to_string.to_i - removes_count
+        removes_count += 1
+      end
+    end
+    
+    #Remove rows by their IDs (minus removes-count).
+    removes.each do |id|
+      path = Gtk::TreePath.new_from_string(id.to_s)
+      iter = @model.iter(path).last
+      @model.remove(iter)
+    end
+    
+    return nil
+  end
+  
   #Enumerates over every row in the treeview.
   def rows(args = nil, &block)
     enum = Enumerator.new do |y|
@@ -156,6 +201,7 @@ class Gtk3assist::Treeview
     
     if block
       enum.each(&block)
+      return nil
     else
       return enum
     end

data/spec/gtk3assist_msgbox_spec.rb

@@ -17,5 +17,13 @@ describe "Gtk3assist_msgbox" do
     msg.respond(:yes)
     res = msg.result_text
     raise "Expected yes but got: '#{res}'." if res != :yes
+    
+    
+    begin
+      raise "test"
+    rescue => e
+      msg = Gtk3assist::Msgbox.error(e, :run => false)
+      msg.respond(:ok)
+    end
   end
 end

data/spec/gtk3assist_treeview_spec.rb

@@ -22,6 +22,14 @@ describe "Gtk3assist_treeview" do
       :id => 2,
       :name => "Christina"
     })
+    tva.add_row(:data => {
+      :id => 3,
+      :name => "Matti"
+    })
+    tva.add_row(:data => {
+      :id => 4,
+      :name => "Nancy"
+    })
     
     count = 0
     tva.rows do |data|
@@ -29,7 +37,33 @@ describe "Gtk3assist_treeview" do
       #puts data
     end
     
-    raise "Expected count to be 2 but it wasnt: '#{count}'." if count != 2
+    raise "Expected count to be 4 but it wasnt: '#{count}'." if count != 4
+    
+    kasper_removed = false
+    last_data = nil
+    
+    tva.rows_remove do |data|
+      last_data = data
+      
+      if data[:data][:name] == "Kasper" or data[:data][:name] == "Matti"
+        kasper_removed = true
+        true
+      else
+        false
+      end
+    end
+    
+    raise "Expected 'Kasper' to be removed but it wasnt." if !kasper_removed
+    raise "Expected last item to be 'Nancy' but it wasnt." if last_data[:data][:name] != "Nancy"
+    
+    kasper_found = false
+    count = 0
+    tva.rows do |data|
+      raise "Didnt expect 'Kasper' or 'Matti' to still exist but it did." if data[:data][:name] == "Kasper" or data[:data][:name] == "Matti"
+      count += 1
+    end
+    
+    raise "Expected count to be 4 but it wasnt: '#{count}'." if count != 2
     
     win.resize(640, 480)
     win.add(tv)

metadata

@@ -2,7 +2,7 @@
 name: gtk3assist
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-19 00:00:00 Z
+date: 2012-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gir_ffi-gtk
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4599824558676846179
+      hash: -535183420519401515
       segments: 
       - 0
       version: "0"