visualruby 3.0.12 → 3.0.13

data/lib/treeview/FileTreeView.rb

@@ -13,7 +13,7 @@ module VR
 
     # FileTreeView creates a TreeView of files with folders and icons.  
     # Often you should subclass this class for a particular use.
-    # @param [String] Root Root folder of the tree  
+    # @param [String] root Root folder of the tree  
     # @param [String] icon_path Path to a folder where icons are stored.  See VR::IconHash
     # @param [String] glob Glob designating the files to be included.  Google: "ruby glob" for more.
     # @param [Proc] validate_block Block that limits files and folders to include. When block returns true file is includud. (false = excluded)  
@@ -21,11 +21,12 @@ module VR
       @root = File.expand_path(root)
       @glob = glob
       @validate_block = validate_block
-      super(:file => {:pix => Gdk::Pixbuf, :file_name => String}, :empty => TrueClass, :path => String, :modified_date => VR::DateCol, :sort_on => String)
-      col_visible( :path => false, :modified_date => false, :sort_on => false, :empty => false)
+      super(:file => {:pix => Gdk::Pixbuf, :file_name => String}, :empty => TrueClass, 
+            :path => String, :sort_on => String)
+      col_visible( :path => false, :sort_on => false, :empty => false)
       self.headers_visible = false
-      @icons = File.directory?(icon_path) ? VR::IconHash.new(icon_path) : nil
-      parse_signals()
+      @icons = File.directory?(icon_path) ? IconHash.new(icon_path) : nil
+      parse_signals()  #fix this!  Subclasses may call twice!
       model.set_sort_column_id(id(:sort_on), :ascending )
       self.set_enable_search(false)
       refresh
@@ -128,10 +129,26 @@ module VR
     def get_selected_path() 
       selection.selected ? selection.selected[id(:path)] : nil 
     end
+
+    class IconHash < Hash # :nodoc:
+    
+      def initialize(path)
+        Dir.glob(path + "/*.png").each do |f|
+          ext = File.basename(f, ".png")
+          self[ext] = Gdk::Pixbuf.new(f)
+        end
+      end
+    
+      def get_icon(file_name)
+        ext = File.extname(file_name).gsub(".", "")
+        self.has_key?(ext) ? self[ext] : self["unknown"] 
+      end
+    end
+
   
   end  
   
-  
+
   
 
 end

data/lib/treeview/IterMethods.rb

@@ -1,82 +1,82 @@
 
-module VR
+module VR::ViewCommon
 
 #  The IterMethods module extends the GtkTreeIter class so it can work with
 #  visualruby's colum ID symbols as well as Gtk's column numbers. 
 #  
 
-module IterMethods
+  module IterMethods
 
-    attr_accessor :column_keys
-    @column_keys = nil
+      attr_accessor :column_keys
+      @column_keys = nil
 
-#  The [] method returns the value from the specified column in the iter:
-#  
-#   val = iter[:name]
-#  
-#  - col_id -- Either a visualruby column ID symbol, as above, or an integer.
-#  
-  
-    def [](col_id)
-      get_value(id(col_id))
-    end
+  #  The [] method returns the value from the specified column in the iter:
+  #  
+  #   val = iter[:name]
+  #  
+  #  - col_id -- Either a visualruby column ID symbol, as above, or an integer.
+  #  
+    
+      def [](col_id)
+        get_value(id(col_id))
+      end
 
-    def []=(col_id,val)
-      i = id(col_id)
-      set_value(i, val)
-    end
+      def []=(col_id,val)
+        i = id(col_id)
+        set_value(i, val)
+      end
 
-#  The id() method translates visualruby's colum ID symbols into integers that
-#  GtkTreeIter can use:
-#  
-#   iter = model.append
-#   iter[id(:name)] = "Henry"
-#  
-#  Normally, its best to use VR's "rows" instead.  They will already use the column ID symbols.
-#  
-    def id(col_id) # :nodoc:
-      return (col_id.is_a? Fixnum) ? col_id : @column_keys.index(col_id)
-    end
+  #  The id() method translates visualruby's colum ID symbols into integers that
+  #  GtkTreeIter can use:
+  #  
+  #   iter = model.append
+  #   iter[id(:name)] = "Henry"
+  #  
+  #  Normally, its best to use VR's "rows" instead.  They will already use the column ID symbols.
+  #  
+      def id(col_id) # :nodoc:
+        return (col_id.is_a? Fixnum) ? col_id : @column_keys.index(col_id)
+      end
 
-#  This will load the values of any object into the iter.  It will look at all the
-#  instance variables, methods, and ActiveRecord fields and match them to
-#  columns in a VR::ListView or VR::TreeView.  For example, if your object
-#  has an instance variable, @name, this will fill in a column with the symbol :name.
-#  
-#   class MyClass
-#     @name = "Henry"
-#   end
-#  
-#   @view = VR::ListView.new(:name => String)
-#   my = MyClass.new
-#   row = @view.add_row()
-#   row.load_object(my)  # assigns "Henry" to first cell
-#  
-#  
-#  -obj--any ruby object or object subclassed from ActiveRecord::Base.
-#  
-    def load_object(obj)
-      class_sym = obj.class.name.to_sym
-      self[class_sym] = obj if @column_keys.include?(class_sym)
-      @column_keys.each do |k|
-        begin
-        self[k] = obj.send(k) if obj.respond_to?(k.to_s)
-        rescue
+  #  This will load the values of any object into the iter.  It will look at all the
+  #  instance variables, methods, and ActiveRecord fields and match them to
+  #  columns in a VR::ListView or VR::TreeView.  For example, if your object
+  #  has an instance variable, @name, this will fill in a column with the symbol :name.
+  #  
+  #   class MyClass
+  #     @name = "Henry"
+  #   end
+  #  
+  #   @view = VR::ListView.new(:name => String)
+  #   my = MyClass.new
+  #   row = @view.add_row()
+  #   row.load_object(my)  # assigns "Henry" to first cell
+  #  
+  #  
+  #  -obj--any ruby object or object subclassed from ActiveRecord::Base.
+  #  
+      def load_object(obj)
+        class_sym = obj.class.name.to_sym
+        self[class_sym] = obj if @column_keys.include?(class_sym)
+        @column_keys.each do |k|
+          begin
+          self[k] = obj.send(k) if obj.respond_to?(k.to_s)
+          rescue
+          end
         end
-      end
-      keys = @column_keys.inject([]) { |ar, e| ar << e.to_s }
-      matches = obj.attributes.keys & keys if obj.attributes.is_a? Hash
-      matches.each do |field| 
-        begin
-        self[field.to_sym] = obj.attributes[field] 
-        rescue
+        keys = @column_keys.inject([]) { |ar, e| ar << e.to_s }
+        matches = obj.attributes.keys & keys if obj.attributes.is_a? Hash
+        matches.each do |field| 
+          begin
+          self[field.to_sym] = obj.attributes[field] 
+          rescue
+          end
+        end 
+        obj.instance_variables.each do |name|
+          self[name] = instance_variable_get(name) if @column_keys.include?(name) 
         end
-      end 
-      obj.instance_variables.each do |name|
-        self[name] = instance_variable_get(name) if @column_keys.include?(name) 
       end
-    end
-  
+    
+  end
 
 end
-end

data/lib/treeview/ListView.rb

@@ -22,11 +22,11 @@ module VR
 # * DateTime - Displays in a default date format(editable), edits like a String
 # * TrueClass - Displays as a GtkCheckButton, click checkbox to edit
 # * GdkPixbuf - Just an Image, uneditable
-# * VR::CalendarCol - Displays in a default date format(editable), calendar window to edit.
-# * VR::SpinCol - Displays as a number with default number of digits, edits like a GtkSpinButton
-# * VR::ComboCol - Displays String, edits like a GtkComboBoxEntry
-# * VR::ProgressCol - Displays a GtkProgressBar, uneditable
-# * VR::TextCol - For long strings.  Displays first 20 characters in view, edits with simple text editor.
+# * VR::Col::CalendarCol - Displays in a default date format(editable), calendar window to edit.
+# * VR::Col::SpinCol - Displays as a number with default number of digits, edits like a GtkSpinButton
+# * VR::Col::ComboCol - Displays String, edits like a GtkComboBoxEntry
+# * VR::Col::ProgressCol - Displays a GtkProgressBar, uneditable
+# * VR::Col::BlobCol - For long strings.  Displays first 20 characters in view, edits with simple text editor.
 #
 # You can also add your own user-defined column types.  See: {Adding Your Own Objects to ListView}[link:/site/ListView%20Tutorial.html#objects].
 #

data/lib/treeview/ViewCommon.rb

@@ -111,16 +111,17 @@ module VR
 
   module ViewCommon
 
-attr_accessor :vr_renderer, :vr_column
+attr_accessor :vr_renderer
   
     def load_columns(cols) # :nodoc:
       @vr_renderer = {}
-      @vr_column = {}
+      @vr_cols = {}
       model_col = 0
       cols.each_pair do | sym, type|
-        col = VR::TreeViewColumn.new(self, model_col, sym, type)
+        col = VR::Col::TreeViewColumn.new(self, model_col, sym, type)
         model_col = model_col + (type.class == Hash ? type.size : 1)
         self.append_column(col)
+        @vr_cols[sym] = col
       end
       turn_on_comboboxes()
       @column_keys = flatten_hash(cols).keys
@@ -167,7 +168,7 @@ attr_accessor :vr_renderer, :vr_column
 #  Also, if the column VR::TreeViewColumn object doesn't support the property, it will try to
 #  set the property on the renderer instead.  In the above example, the col_attr() method tries to
 #  set teh "<b>background</b>" property of a VR:TreeViewColumn.  However, that object doesn't
-#  support the "background" property, but the renderer for the column, VR::CellRendererText does.
+#  support the "background" property, but the renderer for the column, VR::Col::Ren::CellRendererText does.
 #  So it sets the renderer's property instead.  So, in this example this line of code would do exactly the same
 #  thing:
 #  
@@ -185,13 +186,29 @@ attr_accessor :vr_renderer, :vr_column
           if column(c).respond_to?(key.to_s + "=")
             column(c).send(key.to_s + '=', val)
           elsif renderer(c).respond_to?(key.to_s + "=")  
-             renderer(c).send(key.to_s + '=', val) 
+            renderer(c).send(key.to_s + '=', val) 
           end 
         end
       end    
     end
 
 
+#    def col_attr(*args)
+#      cols = args.select { |arg| !arg.is_a? Hash }
+#      return unless hash = args.detect { |arg| arg.is_a? Hash }
+#      cols = @column_keys if cols.empty?
+#      cols.each do |c|
+#        hash.each_pair do | key, val |
+#          if column(c).respond_to?(key.to_s + "=")
+#            column(c).send(key.to_s + '=', val)
+#          elsif renderer(c).respond_to?(key.to_s + "=")  
+#             renderer(c).send(key.to_s + '=', val) 
+#          end 
+#        end
+#      end    
+#    end
+#
+
 #  Returns an array of rows that are selected in the VR::TreeView or VR::ListView.
 #  If nothing is selected, it returns an empty array.  If you've configured your
 #  listview to accept multiple selections, it will return all of them.  In single 
@@ -221,17 +238,20 @@ attr_accessor :vr_renderer, :vr_column
       # detect if comboboxes are present:
       found = false
       self.each_renderer do |r|
-        if r.is_a? VR::CellRendererCombo
+        if r.is_a? VR::Col::Ren::CellRendererCombo
           found = true
           break
         end
       end  
       return unless found
       self.signal_connect("cursor_changed") do |view|
-        next unless iter = view.selection.selected 
-        view.each_renderer do |r|
-          r.set_model( iter[r.model_col] ) if r.is_a? VR::CellRendererCombo
+        next unless iter = view.selection.selected
+        @vr_renderer.each do |sym, ren|
+          ren.set_model iter[id(sym)] if ren.is_a? VR::Col::Ren::CellRendererCombo
         end
+#        view.each_renderer do |r|
+#          r.set_model( iter[r.model_col] ) if r.is_a? VR::Col::Ren::CellRendererCombo
+#        end
       end    
     end
 
@@ -269,7 +289,7 @@ attr_accessor :vr_renderer, :vr_column
 
     def vr_row(iter)
       unless iter.respond_to?(:id)
-        iter.extend(VR::IterMethods)
+        iter.extend(IterMethods)
         iter.column_keys = @column_keys
       end
       return iter
@@ -294,7 +314,7 @@ attr_accessor :vr_renderer, :vr_column
 
   
     def column(id)
-      @vr_column[id] 
+      @vr_cols[id]
     end
     
     def each_renderer
@@ -314,22 +334,22 @@ attr_accessor :vr_renderer, :vr_column
 #The VR::ListView class will 
 #automatically assign renderers to each column based on its type:
 #
-#String, Fixnum, Integer, Float => VR::CellRendererText
-#TrueClass => VR::CellRendererToggle
-#GdkPixbuf => VR::CellRendererPixbuf
-#DateTime => VR::CellRendererDate
-#VR::CalendarCol, VR::TextCol => VR::CellRendererObject
-#VR::SpinCol => VR::CellRendererSpin
-#VR::ProgressCol => VR::CellRendererProgress
-#VR::ComboCol => VR::CellRendererCombo
+#String, Fixnum, Integer, Float => VR::Col::Ren::CellRendererText
+#TrueClass => VR::Col::Ren::CellRendererToggle
+#GdkPixbuf => VR::Col::Ren::CellRendererPixbuf
+#DateTime => VR::Col::Ren::CellRendererDate
+#VR::Col::CalendarCol, VR::Col::BlobCol => VR::Col::Ren::CellRendererObject
+#VR::Col::SpinCol => VR::Col::Ren::CellRendererSpin
+#VR::Col::ProgressCol => VR::Col::Ren::CellRendererProgress
+#VR::Col::ComboCol => VR::Col::Ren::CellRendererCombo
 #
 #The renderer() method will return one of these renderers:
 #
 # ren = @view.renderer(:ok)
-# puts ren.class.name  # VR::CellRendererToggle  (:ok column is a TrueClass)
-# puts @view.renderer(:name).class.name # =>  VR::CellRendererText
+# puts ren.class.name  # VR::Col::Ren::CellRendererToggle  (:ok column is a TrueClass)
+# puts @view.renderer(:name).class.name # =>  VR::Col::Ren::CellRendererText
 #
-#All the types of renderers are subclasses of Gtk renderers.  For example,  VR::CellRendererText
+#All the types of renderers are subclasses of Gtk renderers.  For example,  VR::Col::Ren::CellRendererText
 #is a subclass of Gtk::CellRendererText.  So, you can use these objects just as you would use a 
 #normal Gtk renderer:
 # 
@@ -353,7 +373,7 @@ attr_accessor :vr_renderer, :vr_column
 #  This method converts the column ID symbols from the VR::ListView#new constructor
 #  to Integers:
 #  
-#   @view = VR::ListView.new(:name => String, :date => VR::CalendarCol)
+#   @view = VR::ListView.new(:name => String, :date => VR::Col::CalendarCol)
 #   
 #   Later in code...
 #  

data/lib/treeview/columns/{TextCol.rb → BlobCol.rb}

@@ -1,18 +1,18 @@
 
-module VR
+module VR::Col
 
-#  The TextCol class is a simple text editor for editing strings of data:
+#  The BlobCol class is a simple text editor for editing strings of data:
 #  
 #  http://visualruby.net/img/textcol.jpg
 #  
 #  It is a very useful class when you want to display and edit long strings
 #  of data in a VR::ListView.  To create a coulmn of long strings in a VR::ListView,
-#  simply define the column type as VR::TextCol:
+#  simply define the column type as VR::Col::BlobCol:
 #  
-#   @view = VR::ListView.new(:name => String, :quote => VR::TextCol)
+#   @view = VR::ListView.new(:name => String, :quote => VR::Col::BlobCol)
 #   row = @view.add_row
 #   row[:name] = "Eric"
-#   row[:quote] = VR::TextCol.new("I have come to believe that the whole world is an enigma, a harmless enigma that is made terrible by our own mad attempt to interpret it as though it had an underlying truth.  - Umberto Eco) ")
+#   row[:quote] = VR::Col::BlobCol.new("I have come to believe that the whole world is an enigma, a harmless enigma that is made terrible by our own mad attempt to interpret it as though it had an underlying truth.  - Umberto Eco) ")
 #  
 #  The above listview will only display the first 20 characters of the quote, so
 #  it won't destroy the appearance of the listview.  When a user clicks on the
@@ -20,7 +20,7 @@ module VR
 #  
 #  See the example project, "listview_objects" for more.
 
-  class TextCol 
+  class BlobCol 
 
     include GladeGUI
 

data/lib/treeview/columns/CalendarCol.rb

@@ -1,22 +1,22 @@
 
-module VR
+module VR::Col
 
-#  The CalendarCol class is a simple calendar window where you can edit
-#  the date:
-#  
-#  http://visualruby.net/img/calendar.jpg
-#  
-#  This class is very useful when you want to display and edit dates
-#  in a VR::ListView.  You can define a column with the type VR::CalendarCol
-#  and the column will display as a date, and when the user clicks on the
-#  date, a calendar window will appear so he/she can edit it:
-#  
-#   @view = VR::ListView.new(:name => String, :birthday => VR::CalendarCol)
-#   row = @view.add_row
-#   row[:name] = "Eric"
-#   row[:birthday] = VR::CalendarCol.new(DateTime.new(1966, 7, 14))
-#  
-#  See the example project, "listview_objects" for more.
+# The CalendarCol class is a simple calendar window where you can edit
+# the date:
+#
+# http://visualruby.net/img/calendar.jpg
+#
+# This class is very useful when you want to display and edit dates
+# in a VR::ListView.  You can define a column with the type VR::Col::CalendarCol
+# and the column will display as a date, and when the user clicks on the
+# date, a calendar window will appear so he/she can edit it:
+#
+#  @view = VR::ListView.new(:name => String, :birthday => VR::Col::CalendarCol)
+#  row = @view.add_row
+#  row[:name] = "Eric"
+#  row[:birthday] = VR::Col::CalendarCol.new(DateTime.new(1966, 7, 14))
+#
+# See the example project, "listview_objects" for more.
 
   class CalendarCol 
 
@@ -49,22 +49,21 @@ module VR
       @builder["date"].hide if @hide_date
     end
 
-# displays time according to the @date_format instance variable.  If you want to
-# change the appearance of this object, assign a new vale to @date_format.
-  
+    # Output shown in ListView according to the @date_format instance variable.  If you want to
+    # change the appearance of this object, assign a new vale to @date_format. 
     def to_s
       @date.strftime(@format)
     end
 
-    def am__toggled(*args) # :nodoc:
+    def am__toggled(*args)
       @builder["pm"].active = !@builder["am"].active?
     end
 
-    def pm__toggled(*args) # :nodoc:
+    def pm__toggled(*args)
       @builder["am"].active = !@builder["pm"].active? 
     end
 
-    def buttonSave__clicked(*args) # :nodoc:
+    def buttonSave__clicked(*args) 
       get_glade_variables()
       m = @builder["am"].active? ? "AM" : "PM"
       t = DateTime.strptime("#{@hour.to_i.to_s} #{@minute.to_i.to_s} #{m}", "%I %M %p")
@@ -72,10 +71,7 @@ module VR
       @builder["window1"].destroy
     end
 
-    def buttonCancel__clicked(*args) # :nodoc:
-      @builder["window1"].destroy      
-    end
-
+    # Used for sorting in ListView
     def <=>(calendar)
       return @date <=> calendar.date
     end

data/lib/treeview/columns/CellRendererCombo.rb

@@ -1,4 +1,4 @@
-module VR
+module VR::Col::Ren
 
 #  This class is a helper to VR::ListView and VR::TreeView.  When
 #  colums are created, this class is used as the renderer because

data/lib/treeview/columns/CellRendererObject.rb

@@ -1,4 +1,4 @@
-module VR
+module VR::Col::Ren
 
 #  This class is a helper to VR::ListView and VR::TreeView.  When
 #  colums are created, this class is used as the renderer because

data/lib/treeview/columns/CellRendererProgress.rb

@@ -1,17 +1,17 @@
-module VR
-
-  class CellRendererProgress < Gtk::CellRendererProgress # :nodoc:
-  
-    attr_reader :model_col, :column, :model_sym
-  
-    def initialize(model_col, column, view, model_sym)
-      super()
-      @model_col = model_col
-      @model_sym = model_sym
-      @column = column
-      @view = view  
-    end
-  
-  end
-
-end
+#module VR
+#
+#  class CellRendererProgress < Gtk::CellRendererProgress # :nodoc:
+#  
+#    attr_reader :model_col, :column, :model_sym
+#  
+#    def initialize(model_col, column, view, model_sym)
+#      super()
+#      @model_col = model_col
+#      @model_sym = model_sym
+#      @column = column
+#      @view = view  
+#    end
+#  
+#  end
+#
+#end

data/lib/treeview/columns/CellRendererSpin.rb

@@ -1,4 +1,4 @@
-module VR
+module VR::Col::Ren
 
 #  This class is a helper to VR::ListView and VR::TreeView.  When
 #  colums are created, this class is used as the renderer because

data/lib/treeview/columns/CellRendererText.rb

@@ -1,4 +1,4 @@
-module VR
+module VR::Col::Ren
 
 #  This class is a helper to VR::ListView and VR::TreeView.  When
 #  colums are created, this class is used as the renderer because

data/lib/treeview/columns/CellRendererToggle.rb

@@ -1,4 +1,4 @@
-module VR
+module VR::Col::Ren
 
 #
 #  This renderer has a slightly different validate_block than the others.  Its validate_block will be called with three
@@ -8,7 +8,7 @@ module VR
 #     (row[:name].length < 3)
 #   }
 #  
-#  Also, you can use the VR::CellRendererToggle#edited= method to allow editing.
+#  Also, you can use the VR::Col::Ren::CellRendererToggle#edited= method to allow editing.
 #
 
   class CellRendererToggle < Gtk::CellRendererToggle
@@ -29,7 +29,7 @@ module VR
         next unless iter = @view.model.get_iter(path)
         if @validate_block.call(@model_sym, @view.vr_row(iter), @view)
           iter[model_col] = !iter[model_col]
-           @edited_callback.call(@model_col, iter) if @edited_callback
+          @edited_callback.call(@model_col, iter) if @edited_callback
          end
       end
     end

data/lib/treeview/columns/ComboCol.rb

@@ -1,6 +1,6 @@
 
   
-module VR 
+module VR::Col
 
 #  The Combo class is for use with VR::ListView and VR::TreeView.  It
 #  simply holds the values for a combobox to be displayed in the view.

data/lib/treeview/columns/CurrencyCol.rb

@@ -1,5 +1,5 @@
   
-module VR 
+module VR::Col 
 
   class CurrencyCol
     

data/lib/treeview/columns/ImageCol.rb

@@ -1,5 +1,5 @@
 
-module VR
+module VR::Col
 
   class ImageCol #< Gdk::Pixbuf
 

data/lib/treeview/columns/ProgressCol.rb

@@ -1,16 +1,16 @@
-module VR
+module VR::Col
 
 #  This class is simply a wrapper for an Integer.  It signals VR::Listview's
 #  and VR::Treeviews constructor to make this column a progressbar using
-#  VR::CellRendererProgress.  For example, whwn you create a VR::ListView,
+#  VR::Col::Ren::CellRendererProgress.  For example, whwn you create a VR::ListView,
 #  you can pass VR::Progress as a column type:
 #  
-#   @view = VR::ListView.new(String, VR::Progress, Gdk::Pixbif)
+#   @view = VR::ListView.new(name: String, prog: VR::Col::ProgressCol, pix: Gdk::Pixbif)
 #  
 #  This makes model_col #1 a progress bar.  When you set the value of the column,
 #  provide an integer value from 0 to 100:
 #  
-#  @view.add_row("Hello World", 65, @pixbuf)
+#  @view.add_row("Jerry", 65, @pixbuf)
 #  
 #  
 

data/lib/treeview/columns/SpinCol.rb

@@ -1,4 +1,4 @@
-module VR
+module VR::Col
 
   class SpinCol < Gtk::Adjustment