freightrain 0.6.6 → 0.6.7

data/README.rdoc

@@ -15,7 +15,7 @@ Long story short: you should get the latest version from the ruby/gnome2 svn. At
 == HOW DO I USE IT?
 For now, you should take a look at http://github.com/bolthar/rubydraulica
 (broken - callback handling doesn't work like that anymore. doc coming really really soon)
-
+An up to date example : http://github.com/bolthar/intersect
 Note that the project is currently in ALPHA state. Use it in production at your own risk :-) 
 
 To get a working stub, install the gem and then:

data/Rakefile

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

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

@@ -4,6 +4,15 @@ module Gtk
   class Widget
     include Freightrain::BindingBase
 
+    #made for easier compatibility (other toolkits use show/hide)
+    def show
+      self.visible = true
+    end
+
+    def hide
+      self.visible = false
+    end
+
     def color_from_rgb(rgb_array)
       red   = rgb_array[0] * 255
       green = rgb_array[1] * 255

data/lib/extensions/wx/interface_builder.rb

@@ -1,3 +1,4 @@
+require 'rexml/document'
 
 module Freightrain
   module Toolkit
@@ -21,22 +22,28 @@ module Freightrain
       end
 
       def create_objects_from_file(file_name)
-        builder = Wx::XmlResource.new(get_xrc_files(file_name))
-        toplevel_name = get_toplevel_name(file_name)
+        xrc_file = get_xrc_files(file_name)
+        builder = Wx::XmlResource.new(xrc_file)
+        toplevel_name = get_toplevel_name(xrc_file)
         @toplevel = builder.load_frame(nil, toplevel_name)
         return get_all_objects(@toplevel)
       end
 
       def create_object_accessors(widgets, view)
         widgets.each do |widget|
-          view.instance_eval "def #{name}; @widgets.select { |w| w.name == '#{widget.name}'  }.first ;end;"
+          view.instance_eval "def #{widget.name}; @widgets.select { |w| w.name == '#{widget.name}'  }.first ;end;"
         end
       end
 
       def connect_to_callback(widget, event_name, callback)
-#        widget.connect(SIGNAL(widget.get_event_signature(event_name))) do |*args|
-#          callback.call(*args)
-#        end
+        connector_method_name = "evt_#{event_name}".to_sym
+        if widget.respond_to? connector_method_name
+          connector_method = widget.method(connector_method_name)
+          args = [widget]
+          connector_method.call(*args.take(connector_method.arity.abs - 1)) do |event|
+            callback.call(*[event].take(callback.arity))
+          end
+        end
       end
 
       def control
@@ -53,7 +60,10 @@ module Freightrain
       end
 
       def get_toplevel_name(file_name)
-        return "my_frame"
+        File.open(file_name, "r") do |file|
+          doc = REXML::Document.new(file)
+          return doc.root.children[1].attributes['name']
+        end
       end
 
     end

data/lib/extensions/wx/widgets/wx_sizer.rb

@@ -0,0 +1,12 @@
+
+module Wx
+
+  class Sizer
+
+    def plug_in(region_widget)
+      self.remove(self.get_children.first) if self.get_children.length != 0
+      self.add_child(region_widget)
+    end
+
+  end
+end

data/lib/extensions/wx/wx_bootstrapper.rb

@@ -3,6 +3,7 @@ require 'wx'
 
 require File.join(File.dirname(__FILE__), "interface_builder.rb")
 require File.join(File.dirname(__FILE__), "dialog_helper.rb")
+require File.join(File.dirname(__FILE__), "widgets", "wx_sizer.rb")
 
 module Freightrain
 

data/lib/freightrain/regions/freight_region.rb

@@ -16,7 +16,7 @@ module Freightrain
 
     def on_show(view)
       container = view.send(@container)
-      container.plug_in(@viewmodel.show)
+      container.plug_in(@viewmodel.view.control)
     end
 
     def connect_to(host)

data/lib/freightrain/viewmodels/freight_view_model.rb

@@ -40,16 +40,21 @@ module Freightrain
     end
 
     def show      
-      @view.control.visible = true
+      @view.control.show
       @regions.values.each do |region|
         region.on_show(@view)
+        region.viewmodel.show
       end
       return @view.control
     end
 
     def hide
-      @view.control.visible = false
+      @view.control.hide
     end
 
+    def view
+      return @view
+    end
+    
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: freightrain
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Andrea Dallera
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 +02:00
+date: 2010-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: require_all
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: needle
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: ruby desktop development made easy
 email: andrea@andreadallera.com
 executables: 
@@ -44,74 +57,75 @@ files:
 - README.rdoc
 - Rakefile
 - bin/ftrain
-- lib/freightrain.rb
+- lib/scaffolding/commands/triad.rb
+- lib/scaffolding/commands/app.rb
 - lib/scaffolding/scaffolding.rb
 - lib/scaffolding/generator.rb
+- lib/scaffolding/templates/view_bnd.ftt
 - lib/scaffolding/templates/view_toplevel.ftt
-- lib/scaffolding/templates/view_model.ftt
-- lib/scaffolding/templates/viewmodel_toplevel.ftt
 - lib/scaffolding/templates/view_toplevel_glade.ftt
+- lib/scaffolding/templates/view_model.ftt
 - lib/scaffolding/templates/view_control_glade.ftt
-- lib/scaffolding/templates/application.ftt
-- lib/scaffolding/templates/view_bnd.ftt
+- lib/scaffolding/templates/viewmodel_toplevel.ftt
 - lib/scaffolding/templates/view.ftt
-- lib/scaffolding/commands/triad.rb
-- lib/scaffolding/commands/app.rb
-- lib/extensions/wx/interface_builder.rb
-- lib/extensions/wx/wx_bootstrapper.rb
-- lib/extensions/wx/dialog_helper.rb
-- lib/extensions/gtk/interface_builder.rb
-- lib/extensions/gtk/dialog_helper.rb
-- lib/extensions/gtk/widgets/gtk_toggle_button.rb
-- lib/extensions/gtk/widgets/gtk_toggle_tool_button.rb
-- lib/extensions/gtk/widgets/gtk_treeview.rb
-- lib/extensions/gtk/widgets/gtk_widget.rb
-- lib/extensions/gtk/widgets/gtk_image.rb
-- lib/extensions/gtk/widgets/gtk_treeviewcolumn.rb
-- lib/extensions/gtk/widgets/gtk_calendar.rb
-- lib/extensions/gtk/widgets/gtk_layout.rb
-- lib/extensions/gtk/widgets/gtk_combo_box.rb
-- lib/extensions/gtk/widgets/gtk_statusicon.rb
-- lib/extensions/gtk/gtk_bootstrapper.rb
-- lib/extensions/qt/interface_builder.rb
-- lib/extensions/qt/dialog_helper.rb
-- lib/extensions/qt/widgets/qt_calendar_widget.rb
-- lib/extensions/qt/widgets/qt_abstract_button.rb
-- lib/extensions/qt/widgets/qt_base.rb
-- lib/extensions/qt/widgets/qt_layout.rb
-- lib/extensions/qt/widgets/qt_line_edit.rb
-- lib/extensions/qt/widgets/qt_label.rb
-- lib/extensions/qt/qt_bootstrapper.rb
-- lib/freightrain/testhelpers/auto_stubber.rb
-- lib/freightrain/viewmodels/dialog_extension.rb
-- lib/freightrain/viewmodels/freight_view_model.rb
-- lib/freightrain/ioc/container.rb
-- lib/freightrain/ioc/container_hookable.rb
-- lib/freightrain/testhelpers.rb
-- lib/freightrain/string_patch.rb
-- lib/freightrain/regions/freight_region.rb
-- lib/freightrain/regions/region_host.rb
-- lib/freightrain/services/freight_service.rb
-- lib/freightrain/services/service_host.rb
-- lib/freightrain/binding/converters/float_converter.rb
+- lib/scaffolding/templates/application.ftt
 - lib/freightrain/binding/converters/boolean_converter.rb
-- lib/freightrain/binding/converters/converter_factory.rb
-- lib/freightrain/binding/converters/default_converter.rb
+- lib/freightrain/binding/converters/float_converter.rb
 - lib/freightrain/binding/converters/integer_converter.rb
-- lib/freightrain/binding/binding_host.rb
-- lib/freightrain/binding/binding_loader.rb
-- lib/freightrain/binding/binding_base.rb
+- lib/freightrain/binding/converters/default_converter.rb
+- lib/freightrain/binding/converters/converter_factory.rb
 - lib/freightrain/binding/freight_binding.rb
+- lib/freightrain/binding/binding_base.rb
+- lib/freightrain/binding/binding_loader.rb
+- lib/freightrain/binding/binding_host.rb
+- lib/freightrain/views/interface_builder.rb
+- lib/freightrain/views/callback_wrapper.rb
+- lib/freightrain/views/freight_view.rb
 - lib/freightrain/bootstrapper.rb
-- lib/freightrain/signals/signal_host.rb
+- lib/freightrain/string_patch.rb
+- lib/freightrain/regions/freight_region.rb
+- lib/freightrain/regions/region_host.rb
 - lib/freightrain/signals/freight_signal.rb
-- lib/freightrain/elements/layout_widget.rb
+- lib/freightrain/signals/signal_host.rb
+- lib/freightrain/viewmodels/freight_view_model.rb
+- lib/freightrain/viewmodels/dialog_extension.rb
+- lib/freightrain/auto_requirer.rb
+- lib/freightrain/testhelpers.rb
+- lib/freightrain/testhelpers/auto_stubber.rb
+- lib/freightrain/ioc/container.rb
+- lib/freightrain/ioc/container_hookable.rb
+- lib/freightrain/services/service_host.rb
+- lib/freightrain/services/freight_service.rb
 - lib/freightrain/elements/freight_element_view.rb
 - lib/freightrain/elements/freight_element_view_model.rb
-- lib/freightrain/views/freight_view.rb
-- lib/freightrain/views/interface_builder.rb
-- lib/freightrain/views/callback_wrapper.rb
-- lib/freightrain/auto_requirer.rb
+- lib/freightrain/elements/layout_widget.rb
+- lib/extensions/qt/widgets/qt_calendar_widget.rb
+- lib/extensions/qt/widgets/qt_layout.rb
+- lib/extensions/qt/widgets/qt_label.rb
+- lib/extensions/qt/widgets/qt_base.rb
+- lib/extensions/qt/widgets/qt_line_edit.rb
+- lib/extensions/qt/widgets/qt_abstract_button.rb
+- lib/extensions/qt/interface_builder.rb
+- lib/extensions/qt/dialog_helper.rb
+- lib/extensions/qt/qt_bootstrapper.rb
+- lib/extensions/wx/widgets/wx_sizer.rb
+- lib/extensions/wx/interface_builder.rb
+- lib/extensions/wx/dialog_helper.rb
+- lib/extensions/wx/wx_bootstrapper.rb
+- lib/extensions/gtk/gtk_bootstrapper.rb
+- lib/extensions/gtk/widgets/gtk_calendar.rb
+- lib/extensions/gtk/widgets/gtk_toggle_button.rb
+- lib/extensions/gtk/widgets/gtk_treeviewcolumn.rb
+- lib/extensions/gtk/widgets/gtk_layout.rb
+- lib/extensions/gtk/widgets/gtk_statusicon.rb
+- lib/extensions/gtk/widgets/gtk_toggle_tool_button.rb
+- lib/extensions/gtk/widgets/gtk_widget.rb
+- lib/extensions/gtk/widgets/gtk_image.rb
+- lib/extensions/gtk/widgets/gtk_treeview.rb
+- lib/extensions/gtk/widgets/gtk_combo_box.rb
+- lib/extensions/gtk/interface_builder.rb
+- lib/extensions/gtk/dialog_helper.rb
+- lib/freightrain.rb
 has_rdoc: true
 homepage: http://github.com/bolthar/freightrain
 licenses: []
@@ -125,18 +139,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ruby desktop development made easy