freightrain 0.6.5 → 0.6.6

data/README.rdoc

@@ -27,6 +27,7 @@ containing the application stub. To run it, cd into the directory and:
 
 'ftrain' command not working? Look here => http://stackoverflow.com/questions/909673/gems-and-ubuntu-9-04
 
+
 Documentation coming soon.
 
 == WHERE DO I REPORT BUGS/FEATURE REQUESTS?
@@ -38,5 +39,7 @@ Would also be very appreciated:
 === Reports about installation issues (GTK2, ruby/gnome, ftrain)
 === Reports about different platforms (could you install on OSX? Let me know!)
 
-
+= THANKS TO:
+== Jan Pliz 
+For his help with the qtruby bindings
 

data/Rakefile

@@ -9,7 +9,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'freightrain'
-  s.version = '0.6.5'
+  s.version = '0.6.6'
   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_layout.rb

@@ -75,8 +75,8 @@ module Gtk
 
     def bind(options)
       if options[:property].to_s == "elements"
-        @viewmodel          = (options[:element].to_s + "_element_view_model").to_sym
-        options[:force]     = true
+        @viewmodel      = (options[:element].to_s + "_element_view_model").to_sym
+        options[:force] = true
       end
       super(options)
     end

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

@@ -4,10 +4,10 @@ module Gtk
   class Widget
     include Freightrain::BindingBase
 
-    def color_from_rgb(string)
-      red   = ((string[0..1].hex.to_i + 1) * 256) - 1
-      green = ((string[2..3].hex.to_i + 1) * 256) - 1
-      blue  = ((string[4..5].hex.to_i + 1) * 256) - 1
+    def color_from_rgb(rgb_array)
+      red   = rgb_array[0] * 255
+      green = rgb_array[1] * 255
+      blue  = rgb_array[2] * 255
       return Gdk::Color.new(red, green, blue)
     end
 

data/lib/extensions/qt/interface_builder.rb

@@ -7,10 +7,6 @@ module Freightrain
 
       attr_reader :toplevel
 
-      def initialize
-        @builder = Qt::UiLoader.new
-      end
-
       def file_found?(file_name)
         return get_ui_files(file_name)
       end
@@ -18,12 +14,13 @@ module Freightrain
       def create_objects_from_file(file_name)
         file = Qt::File.new(get_ui_files(file_name))
         file.open(Qt::File::ReadOnly)
-        @toplevel = @builder.load(file)
+        builder = Qt::UiLoader.new
+        @toplevel = builder.load(file)
+        builder.dispose
         file.close
-        widgets = get_all_objects(@toplevel).select do |widget|
+        return get_all_objects(@toplevel).select do |widget|
           widget.objectName && widget.objectName != ""
-        end.map
-        return widgets
+        end
       end
 
       def create_object_accessors(widgets, view)
@@ -33,17 +30,9 @@ module Freightrain
         end
       end
 
-      def connect_to_callback(widget, event_name, method)
-        begin
-        decoy_class = Class.new(Qt::Widget)
-        decoy_class.slots("#{widget.name}()")
-        decoy_class.send(:define_method, widget.name) do |*args|
-          method.call(*args)
-        end
-        decoy = decoy_class.new        
-        widget.connect(SIGNAL(widget.get_event_signature(event_name)), decoy, widget.name.to_sym)
-        rescue Exception => ex
-#          p ex
+      def connect_to_callback(widget, event_name, callback)
+        widget.connect(SIGNAL(widget.get_event_signature(event_name))) do |*args|
+          callback.call(*args)
         end
       end
 

data/lib/extensions/qt/qt_bootstrapper.rb

@@ -1,9 +1,11 @@
 
 require 'Qt4'
-require 'qtuitools'
+require 'qtuitools' unless RUBY_PLATFORM =~ /mswin/
+
 require File.join(File.dirname(__FILE__), "widgets/qt_base.rb")
-require File.join(File.dirname(__FILE__), "widgets/qt_widget.rb")
 require File.join(File.dirname(__FILE__), "widgets/qt_abstract_button.rb")
+require File.join(File.dirname(__FILE__), "widgets/qt_calendar_widget.rb")
+require File.join(File.dirname(__FILE__), "widgets/qt_layout.rb")
 require File.join(File.dirname(__FILE__), "widgets/qt_line_edit.rb")
 require File.join(File.dirname(__FILE__), "widgets/qt_label.rb")
 require File.join(File.dirname(__FILE__), "interface_builder.rb")

data/lib/extensions/qt/widgets/qt_abstract_button.rb

@@ -6,6 +6,7 @@ module Qt
     def signals
       base_list = super
       base_list[:toggled] = "toggled(bool)"
+      return base_list
     end
 
   end

data/lib/extensions/qt/widgets/qt_base.rb

@@ -21,6 +21,19 @@ module Qt
       return signals[event_name.to_sym] || "#{event_name}()"
     end
     
+    def foreground=(val)
+      palette = self.palette
+      palette.setColor(Qt::Palette.Foreground, Qt::Color.new(val[0], val[1], val[2]))
+      self.palette = palette
+    end
+
+    def background=(val)
+      palette = self.palette
+      palette.setColor(Qt::Palette.Background, Qt::Color.new(val[0], val[1], val[2]))
+      self.palette = palette
+    end
+
+    
   end
 
 end

data/lib/extensions/qt/widgets/qt_calendar_widget.rb

@@ -0,0 +1,21 @@
+
+module Qt
+
+  class CalendarWidget
+
+    def signals
+      base_list = super
+      base_list[:clicked] = "clicked(QDate)"
+      base_list[:activated] = "activated(QDate)"
+      return base_list
+    end
+
+    def selectedDate=(value)
+      if value.kind_of? ::Date
+        super(value)
+      end
+    end
+
+  end
+
+end

data/lib/extensions/qt/widgets/qt_label.rb

@@ -12,6 +12,10 @@ module Qt
       self.pixmap = image
       self.resize(self.pixmap.size)
     end
+
+    def text=(value)
+      super(value) unless value == nil
+    end
     
   end
 

data/lib/extensions/qt/widgets/{qt_widget.rb → qt_layout.rb}

@@ -1,9 +1,9 @@
 
 module Qt
 
-  class Widget
-    include Freightrain::LayoutWidget
-    
+  class VBoxLayout
+   include Freightrain::LayoutWidget
+
     def setup
       @signals ||= {}
       selected_callback   = @signals[:selected]
@@ -19,33 +19,17 @@ module Qt
 
     def elements=(enumerable)
       setup unless @ready
-      delta = enumerable.length - @elements.length
-      @height_factor = self.get_new_item.control.height unless @height_factor
-      height = @elements.length
-      delta.abs.times do
-        if delta > 0
-          item = self.get_new_item
-          item.control.geometry = Qt::Rect.new(
-            0,
-            item.control.height * height,
-            item.control.width,
-            item.control.height
-          )
-          item.control.setParent(self)
-          item.control.show
-          @elements << item
-          height += 1
-        else
-          item = self.children.last
-          item.control.setParent(nil)
-          @elements.delete_if {|element| element.control == item }
-          item.control = nil
-        end
+      @elements.each do |item|
+        self.removeWidget(item.control)
+        item.control.dispose
       end
-      self.setMinimumHeight(@elements.length * @height_factor)
-      self.show
-      @elements.each do |element|
-        element.value = enumerable[@elements.index(element)]
+      @elements.clear
+      enumerable.each do |value|
+        item = self.get_new_item
+        item.value = value
+        self.addWidget(item.control)
+        item.control.show
+        @elements << item
       end
     end
 
@@ -74,12 +58,10 @@ module Qt
     def bind(options)
       if options[:property].to_sym == :elements
         @viewmodel          = (options[:element].to_s + "_element_view_model").to_sym
-        @signals            = options[:signals]
         options[:force]     = true
       end
       super(options)
     end
 
   end
-
-end
+end

data/lib/extensions/wx/dialog_helper.rb

@@ -0,0 +1,11 @@
+
+#TODO: implement
+module Freightrain
+  module Toolkit
+
+    module DialogHelper
+
+    end
+
+  end
+end

data/lib/extensions/wx/interface_builder.rb

@@ -0,0 +1,62 @@
+
+module Freightrain
+  module Toolkit
+
+    class InterfaceBuilder
+
+      attr_reader :toplevel
+      
+      def file_found?(file_name)
+        return get_xrc_files(file_name)
+      end
+      
+      def get_xrc_files(file_name)
+        search_path = File.join(
+          Freightrain.app_path,
+          "views",
+          "**",
+          file_name.to_convention + ".xrc")
+        results = Dir.glob(search_path)
+        return results.first
+      end
+
+      def create_objects_from_file(file_name)
+        builder = Wx::XmlResource.new(get_xrc_files(file_name))
+        toplevel_name = get_toplevel_name(file_name)
+        @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;"
+        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
+      end
+
+      def control
+        return @toplevel
+      end
+
+      private
+      def get_all_objects(parent, objects = [])
+        objects << parent
+        parent.get_children.each do |child|
+          get_all_objects(child, objects)
+        end
+        return objects
+      end
+
+      def get_toplevel_name(file_name)
+        return "my_frame"
+      end
+
+    end
+    
+  end
+end

data/lib/extensions/wx/wx_bootstrapper.rb

@@ -0,0 +1,33 @@
+
+require 'wx'
+
+require File.join(File.dirname(__FILE__), "interface_builder.rb")
+require File.join(File.dirname(__FILE__), "dialog_helper.rb")
+
+module Freightrain
+
+  module Toolkit
+
+    class WxApp < Wx::App
+
+      def initialize(&block)
+        super
+        @startup = block
+      end
+
+      def on_init
+        @startup.call
+      end
+
+    end
+
+    def self.start_main_loop
+      app = WxApp.new do
+        yield
+      end
+      app.main_loop
+    end
+
+  end
+
+end

data/lib/freightrain/binding/binding_host.rb

@@ -19,7 +19,7 @@ module Freightrain
     end
     
     def bindings
-      return widgets.each.map { |widget| widget.bindings }.flatten
+      return widgets.map { |widget| widget.bindings }.flatten
     end
 
     def commit

data/lib/freightrain/views/freight_view.rb

@@ -7,9 +7,6 @@ module Freightrain
     extend SignalHost
     extend ContainerHookable
 
-#    attr_reader :widgets
-
-    #TODO: CRITICAL make it toolkit-agnostic
     def widgets
       return @widgets.select { |widget| widget.kind_of? BindingBase }
     end
@@ -47,7 +44,7 @@ module Freightrain
         load_from_file(self.class.name, @builder)
       end
       hook_to_layout_widgets()
-      load_bindings_from_file(@widgets)      
+      load_bindings_from_file(@widgets)
     end
 
     def hook_to_layout_widgets

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freightrain
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 5
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - Andrea Dallera
@@ -14,37 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 +02:00
+date: 2010-05-27 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,70 +44,74 @@ files:
 - README.rdoc
 - Rakefile
 - bin/ftrain
-- lib/scaffolding/commands/triad.rb
-- lib/scaffolding/commands/app.rb
+- lib/freightrain.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/view_toplevel_glade.ftt
+- lib/scaffolding/templates/view_control_glade.ftt
 - lib/scaffolding/templates/application.ftt
-- lib/freightrain/binding/converters/boolean_converter.rb
+- lib/scaffolding/templates/view_bnd.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/freightrain/binding/converters/integer_converter.rb
-- lib/freightrain/binding/converters/default_converter.rb
+- lib/freightrain/binding/converters/boolean_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/converters/default_converter.rb
+- lib/freightrain/binding/converters/integer_converter.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/binding/binding_loader.rb
+- lib/freightrain/binding/binding_base.rb
+- lib/freightrain/binding/freight_binding.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/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/signals/freight_signal.rb
+- lib/freightrain/elements/layout_widget.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_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/widgets/qt_widget.rb
-- lib/extensions/qt/interface_builder.rb
-- lib/extensions/qt/dialog_helper.rb
-- lib/extensions/qt/qt_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/freightrain/views/freight_view.rb
+- lib/freightrain/views/interface_builder.rb
+- lib/freightrain/views/callback_wrapper.rb
+- lib/freightrain/auto_requirer.rb
 has_rdoc: true
 homepage: http://github.com/bolthar/freightrain
 licenses: []
@@ -134,20 +125,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