freightrain 0.6.7 → 0.6.8

data/Rakefile

@@ -9,9 +9,9 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'freightrain'
-  s.version = '0.6.7'
+  s.version = '0.6.8'
   s.add_dependency('require_all', '>= 1.1.0')
-  s.add_dependency('needle', '>= 1.3.0')  
+  s.add_dependency('needle', '>= 1.3.0')
   s.has_rdoc = false
   s.homepage = "http://github.com/bolthar/freightrain"
   s.executables = ['ftrain']

data/lib/extensions/gtk/gtk_bootstrapper.rb

@@ -1,7 +1,7 @@
 
 #TODO: use require all
 
-require 'libglade2'
+require 'gtk2'
 require File.join(File.dirname(__FILE__), "widgets/gtk_image.rb")
 require  File.join(File.dirname(__FILE__), "widgets/gtk_toggle_button.rb")
 require  File.join(File.dirname(__FILE__), "widgets/gtk_toggle_tool_button.rb")

data/lib/extensions/wx/interface_builder.rb

@@ -25,7 +25,12 @@ module Freightrain
         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)
+        if toplevel_name == "panel_1"
+          @toplevel = builder.load_panel(Wx::Frame.new(nil), "panel_1")
+        else
+          @toplevel = builder.load_frame(nil, toplevel_name)
+        end
+        
         return get_all_objects(@toplevel)
       end
 

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

@@ -0,0 +1,9 @@
+
+module Wx
+
+  class Object
+    include Freightrain::BindingBase
+
+  end
+  
+end

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

@@ -0,0 +1,14 @@
+
+module Wx
+
+  class Panel
+
+    def plug_in(region_widget)
+      self.remove_child(self.get_children.first) if self.get_children.length != 0
+      region_widget.reparent(self)
+      region_widget.layout
+      self.layout
+    end
+    
+  end
+end

data/lib/extensions/wx/wx_bootstrapper.rb

@@ -3,7 +3,8 @@ 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")
+require File.join(File.dirname(__FILE__), "widgets", "wx_object.rb")
+require File.join(File.dirname(__FILE__), "widgets", "wx_panel.rb")
 
 module Freightrain
 

data/lib/freightrain/bootstrapper.rb

@@ -11,7 +11,7 @@ module Freightrain
     return base_path
   end
 
-  def load_extensions!()
+  def load_extensions!
     begin
       require File.dirname(__FILE__) + "/../extensions/#{@toolkit.to_s}/#{@toolkit.to_s}_bootstrapper.rb"
     rescue Exception => ex

metadata

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

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

@@ -1,12 +0,0 @@
-
-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