freightrain 0.5.13 → 0.5.14

data/Rakefile

@@ -9,7 +9,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'freightrain'
-  s.version = '0.5.13'
+  s.version = '0.5.14'
   s.add_dependency('require_all', '>= 1.1.0')
   s.add_dependency('needle', '>= 1.3.0')  
   s.has_rdoc = false

data/lib/extensions/gtk/binding_base.rb

@@ -0,0 +1,17 @@
+
+module BindingBase
+
+  def bind(binding_options)
+    @bindings ||= {}
+    binding = FreightBinding.new(self, binding_options)
+    #TODO: send out warning on override?
+    @bindings[binding_options[:property]] = binding
+    return binding
+  end
+
+  def bindings
+    @bindings ||= {}
+    return @bindings.values
+  end
+
+end

data/lib/extensions/gtk/gtk_bootstrapper.rb

@@ -1,7 +1,9 @@
 
 #TODO: use require all
+#TODO: use File.join for god's sake!
 
 require 'libglade2'
+require File.dirname(__FILE__) + "/binding_base.rb"
 require File.dirname(__FILE__) + "/widgets/gtk_image.rb"
 require File.dirname(__FILE__) + "/widgets/gtk_toggle_button.rb"
 require File.dirname(__FILE__) + "/widgets/gtk_toggle_tool_button.rb"
@@ -11,6 +13,7 @@ require File.dirname(__FILE__) + "/widgets/gtk_calendar.rb"
 require File.dirname(__FILE__) + "/widgets/gtk_treeview.rb"
 require File.dirname(__FILE__) + "/widgets/gtk_treeviewcolumn.rb"
 require File.dirname(__FILE__) + "/widgets/gtk_layout.rb"
+require File.dirname(__FILE__) + "/widgets/gtk_statusicon.rb"
 require File.dirname(__FILE__) + "/interface_builder.rb"
 require File.dirname(__FILE__) + "/dialog_helper.rb"
 

data/lib/extensions/gtk/interface_builder.rb

@@ -15,14 +15,16 @@ module Freightrain
 
       def create_objects_from_file(file_name)
         @builder.add_from_file(get_glade_file(file_name))
-        @control = @builder.objects.first.toplevel
-        return @builder.objects.select do
-          |obj| obj.respond_to?(:name)
-        end.map
+        if @builder.objects.first.respond_to? :toplevel
+          @control = @builder.objects.first.toplevel
+        end
+        return @builder.objects.select do |obj|
+          obj.respond_to? :name
+        end
       end
 
       def create_object_accessors(widgets, view)
-        widgets.each do |widget|
+        widgets.select { |widget| widget.respond_to? :name }.each do |widget|
           name = widget.name
           view.instance_eval "def #{name}; @widgets.select { |w| w.name == '#{name}'  }.first ;end;"
         end

data/lib/extensions/gtk/widgets/gtk_statusicon.rb

@@ -0,0 +1,28 @@
+
+module Gtk
+
+  class StatusIcon
+    include BindingBase
+
+    #Gtk::StatusIcon is NOT a Gtk::Widget, but a more basic
+    #GLib::Object. That implies that statusicons do not have
+    #a 'name' method, which is necessary for a lot of stuff
+    #in freightrain, such as method accessor creation and
+    #binding. Since, in most other aspect, statusicons behave
+    #very likely other widgets, i decided to hard patch the problem
+    #as follows.
+    #This means that ALL the Gtk::StatusIcon you define will
+    #be called 'status_icon', regardless of the name you define
+    #in Glade. If, for some weird reason, you need to use TWO
+    #statusicons inside the same view, you can either fix
+    #this yourself (and send me a patch :-) ) or contact me.
+    def name
+      return "status_icon"
+    end
+
+    def icon_path=(path)
+      self.pixbuf = Gdk::Pixbuf.new(path)
+    end
+
+  end
+end

data/lib/extensions/gtk/widgets/gtk_widget.rb

@@ -2,19 +2,7 @@
 module Gtk
 
   class Widget
-
-    def bind(binding_options)
-      @bindings ||= {}
-      binding = FreightBinding.new(self, binding_options)
-      #TODO: send out warning on override?
-      @bindings[binding_options[:property]] = binding
-      return binding
-    end
-
-    def bindings
-      @bindings ||= {}
-      return @bindings.values
-    end
+    include BindingBase
 
     def color_from_rgb(string)
       red   = ((string[0..1].hex.to_i + 1) * 256) - 1

data/lib/freightrain/binding/freight_binding.rb

@@ -22,9 +22,9 @@ module Freightrain
           @cache = value
         end
       rescue Exception => ex
-#        p "#{@widget.name} - update"
-#        p ex.message
-#        p @path
+        p "#{@widget.name} - update"
+        p ex.message
+        p @path
       end
     end
 

data/lib/freightrain/freight_view.rb

@@ -10,7 +10,7 @@ module Freightrain
 #    attr_reader :widgets
 
     def widgets
-      return @widgets.select { |widget| widget.kind_of? Gtk::Widget}
+      return @widgets.select { |widget| widget.kind_of? BindingBase }
     end
 
     def self.container_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freightrain
 version: !ruby/object:Gem::Version 
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors: 
 - Andrea Dallera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 +01:00
+date: 2010-03-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,10 +58,12 @@ files:
 - lib/extensions/gtk/interface_builder.rb
 - lib/extensions/gtk/dialog_helper.rb
 - lib/extensions/gtk/gtk_bootstrapper.rb
+- lib/extensions/gtk/binding_base.rb
 - lib/extensions/gtk/widgets/gtk_layout.rb
 - lib/extensions/gtk/widgets/gtk_image.rb
 - lib/extensions/gtk/widgets/gtk_combo_box.rb
 - lib/extensions/gtk/widgets/gtk_calendar.rb
+- lib/extensions/gtk/widgets/gtk_statusicon.rb
 - lib/extensions/gtk/widgets/gtk_treeview.rb
 - lib/extensions/gtk/widgets/gtk_widget.rb
 - lib/extensions/gtk/widgets/gtk_toggle_button.rb