ruby_mvc 0.0.1 → 0.0.2

data/lib/ruby_mvc/toolkit/peers/wxruby/form_builder.rb

@@ -0,0 +1,108 @@
+#--
+######################################################################
+#
+# Copyright 2011 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     form_builder.rb
+# Created:  Fri 30 Dec 2011 17:20:42 CET
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+  module Toolkit
+    module WxRuby
+
+      # This module is a helper class used to build the
+      # concrete representations of the FormView controls
+
+      class FormBuilder
+        def self.build(parent, form)
+          builder = self.new
+          builder.build(parent, form)
+          builder
+        end
+
+        def initialize
+          @fields = {}
+          @panel = Wx::BoxSizer.new(Wx::VERTICAL)
+          @sizer = Wx::FlexGridSizer.new(0, 2, 5, 5)
+          @panel.add(@sizer, 0, Wx::ALIGN_CENTER_VERTICAL|Wx::ALL, 5)
+        end
+
+        def widget
+          @panel
+        end
+
+        def build(parent, form)
+          @form = form
+          form.layout do |key, label, val, editor, disabled|
+          puts "key: #{key}; disabled: #{disabled}"
+            case(editor)
+            when :textarea
+              w = build_textfield(parent, label, val, true)
+            else
+              w = build_textfield(parent, label, val)
+            end
+            @fields[key] = w
+            w.disable if disabled
+          end
+        end
+
+        def submit
+          save_form
+        end
+
+      private
+        def save_form
+          vals = {}
+          @fields.each do |k, v|
+            if v && v.is_modified
+              vals[k] = v.get_value
+            end
+          end
+          @form.submit(vals)
+        end
+
+#        def load_form(model)
+#          @fields.keys.each do |k|
+#            @fields[k].set_value(model[k].to_s)
+#          end
+#        end
+
+        def build_textfield(parent, label, val = "", multiline = false)
+          if multiline
+            flags = Wx::TE_MULTILINE
+            size = [ 150, -1 ]
+          else
+            flags = 0
+            size = [ 150, -1 ]
+          end
+          st = Wx::StaticText.new(parent, :label => label)
+          tf = Wx::TextCtrl.new(parent, :value => val.to_s, :size => size, :style => flags)
+          tf.evt_set_focus { |e| tf.set_selection(0, -1) }
+          tf.evt_kill_focus { |e| tf.set_selection(0, 0) }
+#          @sizer.add(st, 0, Wx::ALIGN_LEFT|Wx::ALL, 5)
+#          @sizer.add(tf, 1, Wx::ALIGN_CENTER|Wx::ALL, 5)
+          @sizer.add(st)
+          @sizer.add(tf)
+          tf
+        end
+      end
+    end
+  end
+end

data/lib/ruby_mvc/toolkit/peers/wxruby/frame.rb

@@ -27,6 +27,7 @@ module RubyMVC
   module Toolkit
     module WxRuby
       class Frame < Wx::Frame
+        include Toolkit::SignalHandler
         include Common
         Toolkit::Frame.peer_class = self
 
@@ -34,7 +35,19 @@ module RubyMVC
           opts = {}
           opts[:title] = options[:title]
           opts[:size] = [ options[:width], options[:height] ]
-          super(options[:parent], opts)
+          if parent = options[:parent]
+            parent = parent.peer
+          end
+          super(parent, opts)
+          if icon = options[:icon]
+            self.set_icon WxRuby.load_icon(icon)
+          end
+          @action_index = {}
+
+          evt_close do |e|
+            e.skip
+            signal_emit("window-closed", self)
+          end
         end
 
         # This method is used to add a child to the existing
@@ -42,6 +55,77 @@ module RubyMVC
 
         def add(child, options = {})
           child.peer.reparent(self)
+          
+          if child.is_a?(RubyMVC::Views::View) && (a = child.actions)
+            child.frame = self
+            merge_actions(a)
+          end
+        end
+
+        def merge_actions(actions)
+#          puts "#merge_actions #{actions.inspect}"
+          tb = toolbar
+          actions.each do |a|
+            i = @action_index.size
+#            puts "Action: #{a.label}"
+            case a[:icon]
+            when :stock_new
+              artid = Wx::ART_NEW
+            when :stock_edit
+              artid = Wx::ART_NORMAL_FILE
+            when :stock_delete
+              artid = Wx::ART_DELETE
+            when :stock_home
+              artid = Wx::ART_GO_HOME
+            when :stock_back
+              artid = Wx::ART_GO_BACK
+            when :stock_forward
+              artid = Wx::ART_GO_FORWARD
+            when :stock_reload
+              artid = Wx::ART_REDO
+            end
+            if artid
+              icon = Wx::ArtProvider.get_bitmap(artid, Wx::ART_TOOLBAR, [ 16, 16 ])
+            else
+              icon = Wx::NULL_BITMAP
+            end
+
+            tb.add_tool(i, a.label, icon)
+            tb.enable_tool(i, a.sensitive)
+            a.signal_connect("property-changed") do |a, key, old, val|
+#              puts "property changed: #{key} => #{val}"
+              tb.enable_tool(i, val)
+            end
+            evt_tool(i) do |event|
+#              puts "Action[#{i}] triggered: #{a.key}"
+              a.call
+            end
+            @action_index[a.key] = i
+          end
+          @toolbar.realize
+
+#          puts "action_index: #{@action_index.inspect}"
+        end
+
+        def unmerge_actions(actions)
+#          puts "unmerge actions: #{actions.inspect}"
+          tb = toolbar
+          actions.each do |a|
+            idx = @action_index.delete(a.key)
+#            puts "unmerge action[#{idx}] => #{a.inspect}"
+            tb.delete_tool(idx) if idx
+          end
+        end
+      
+      protected
+        def toolbar
+          if !@toolbar
+            @toolbar = create_tool_bar(
+                Wx::TB_HORIZONTAL |
+                Wx::TB_FLAT |
+                Wx::TB_TEXT)
+          end
+          @toolbar
         end
       end
     end

data/lib/ruby_mvc/toolkit/peers/wxruby/grid_model.rb

@@ -0,0 +1,79 @@
+#--
+######################################################################
+#
+# Copyright 2011 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     grid_model.rb
+# Created:  Sat 31 Dec 2011 18:29:03 CET
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+  module Toolkit
+    module WxRuby
+
+      # This class provides an adapter between a
+      # RubyMVC::Models::TableModel instance and the
+      # Wx::GridTableBase API so that we can drive Wx::Grid
+      # instances using our model definitions.
+
+      class GridModel < Wx::GridTableBase
+        def initialize(model)
+          super()
+          @model = model
+          @labels = model.labels
+          @cols = {}
+          @labels.each_with_index do |l, i|
+            @cols[i] = l[:key]
+          end
+        end
+
+        def get_number_cols
+          @model.labels.size
+        end
+
+        def get_number_rows
+          @model.size
+        end
+
+        def get_value(row, col)
+          @model.value_for(row, get_key(col)).to_s
+        end
+
+        def is_empty_cell(row, col)
+          get_value(row, col).nil?
+        end
+
+        def get_attr(row, col, kind)
+        end
+
+        def get_row_label_value(row)
+          (row + 1).to_s
+        end
+
+        def get_col_label_value(col)
+          @labels[col][:label]
+        end
+
+        def get_key(col)
+          @cols[col]
+        end
+      end
+    end
+  end
+end

data/lib/ruby_mvc/toolkit/peers/wxruby/grid_view.rb

@@ -0,0 +1,117 @@
+#--
+######################################################################
+#
+# Copyright 2011 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     dialog.rb
+# Created:  Sun 11 Dec 2011 14:37:40 CST
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+  module Toolkit
+    module WxRuby
+      class GridView < Wx::Grid
+        include SignalHandler
+        include Common
+        Toolkit::GridView.peer_class = self
+
+        def initialize(options = {})
+          puts "options: #{options.inspect}"
+          super(WxRuby.parent(options), options[:id] || -1)
+          if false == options[:show_row_labels]
+            set_row_label_size(0)
+          end
+          @selected_rows = []
+
+          evt_grid_cmd_cell_left_dclick(self.get_id()) do |e|
+            if @gm
+              col = @gm.get_key(e.get_col)
+            else
+              col = e.get_col
+            end
+            signal_emit("row-activated", self, @model, e.get_row, col)
+          end
+
+          evt_grid_range_select do |e|
+            puts "Event alt: #{e.alt_down}; ctrl: #{e.control_down}; brc: #{e.get_bottom_right_coords}; bottom: #{e.get_bottom_row}; left: #{e.get_left_col}; right: #{e.get_right_col}; tlc: #{e.get_top_left_coords}; top: #{e.get_top_row}; meta: #{e.meta_down}; selecting: #{e.selecting}; shift: #{e.shift_down}" if !e.selecting
+            next if !e.selecting
+
+            # FIXME: this should be a bit more clever in the
+            # future, but right now, we're only dealing with
+            # row selection
+#            puts "Event alt: #{e.alt_down}; ctrl: #{e.control_down}; brc: #{e.get_bottom_right_coords}; bottom: #{e.get_bottom_row}; left: #{e.get_left_col}; right: #{e.get_right_col}; tlc: #{e.get_top_left_coords}; top: #{e.get_top_row}; meta: #{e.meta_down}; selecting: #{e.selecting}; shift: #{e.shift_down}"
+            top = e.get_top_row
+            bottom = e.get_bottom_row
+            sel = []
+            top.upto(bottom) do |i|
+              sel << i
+            end
+            @selected_rows = sel
+            signal_emit("row-selection-changed", self, @model, sel)
+          end
+        end
+
+        def model=(model)
+          @model = model
+          @gm = GridModel.new(model)
+          set_table(@gm, Wx::Grid::GridSelectRows)
+
+          # FIXME: this is a bit cheezy and there should be a
+          # better way to communicate between the grid table
+          # and the view than this...  Apparently, the wxRuby
+          # implementation doesn't expose the message
+          # dispatching required between GridTableBase and the
+          # Grid displaying it.  Kinda defeats the point...
+
+          @model.signal_connect("rows-inserted") do |s, i, r|
+            puts "refresh rows-inserted"
+            @gm = GridModel.new(model)
+            set_table(@gm, Wx::Grid::GridSelectRows, false)
+          end
+          @model.signal_connect("rows-removed") do |s, i, r|
+            puts "refresh rows-removed"
+            @gm = GridModel.new(model)
+            set_table(@gm, Wx::Grid::GridSelectRows, false)
+          end
+          @model.signal_connect("row-changed") do |s, i, r|
+            puts "refresh row-changed"
+            @gm = GridModel.new(model)
+            set_table(@gm, Wx::Grid::GridSelectRows, false)
+          end
+        end
+
+        def set_table(table, flags, clear_selection = true)
+          super(table, flags)
+          @selected_rows.clear if clear_selection
+          auto_size_columns(false)
+          signal_emit("row-selection-changed", self, @model, @selected_rows)
+        end
+
+        def editable=(val)
+          enable_editing(val)
+        end
+
+        def selected_rows
+          # FIXME: I shouldn't have to maintain this list...
+          @selected_rows
+        end
+      end
+    end
+  end
+end

data/lib/ruby_mvc/toolkit/peers/wxruby/messagebox.rb

@@ -0,0 +1,58 @@
+#--
+######################################################################
+#
+# Copyright 2011-2012 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     messagebox.rb
+# Created:  Mon  9 Jan 2012 11:34:52 GMT
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+  module Toolkit
+    module WxRuby
+      class MessageBox < Wx::MessageDialog
+        include Common
+        Toolkit::MessageBox.peer_class = self
+
+        def initialize(message, options)
+          opts = {}
+          title = options[:title] || "Message"
+          if parent = options[:parent]
+            parent = parent.peer
+          end
+          case(options[:class])
+          when :error
+            flags = Wx::OK | Wx::ICON_ERROR
+          when :info
+            flags = Wx::OK | Wx::ICON_INFORMATION
+          when :question
+            flags = Wx::YES_NO | Wx::ICON_QUESTION
+          else
+            flags = Wx::OK | Wx::CANCEL
+          end
+          super(parent, message.to_s, title, flags)
+        end
+
+        def show
+          show_modal
+        end
+      end
+    end
+  end
+end