visualruby 3.0.2 → 3.0.3

data/vrlib/lib/treeview/ViewCommon.rb

@@ -113,47 +113,47 @@ module VR
 
 attr_accessor :vr_renderer, :vr_column
   
-  	def load_columns(cols) # :nodoc:
-			@vr_renderer = {}
-			@vr_column = {}
-  		model_col = 0
-  		cols.each_pair do | sym, type|
-  			col = VR::TreeViewColumn.new(self, model_col, sym, type)
-  			model_col = model_col + (type.class == Hash ? type.size : 1)
-  			self.append_column(col)
-  		end
-  		turn_on_comboboxes()
-			@column_keys = flatten_hash(cols).keys
-  	end
+    def load_columns(cols) # :nodoc:
+      @vr_renderer = {}
+      @vr_column = {}
+      model_col = 0
+      cols.each_pair do | sym, type|
+        col = VR::TreeViewColumn.new(self, model_col, sym, type)
+        model_col = model_col + (type.class == Hash ? type.size : 1)
+        self.append_column(col)
+      end
+      turn_on_comboboxes()
+      @column_keys = flatten_hash(cols).keys
+    end
   
-   	def method_missing(meth, *args) # :nodoc:
-    	unless m = /^(ren_|col_)(.+)$/.match(meth.to_s)
-				super
-				return
-			end     
-  		if args.first.is_a? Hash
-  			args.first.each_pair { |key, val| method(m[1] + "attr").call(key, m[2] => val) }
-  		else
-  			method(m[1] + "attr").call(m[2] => args.first) 
-  		end
+     def method_missing(meth, *args) # :nodoc:
+      unless m = /^(ren_|col_)(.+)$/.match(meth.to_s)
+        super
+        return
+      end     
+      if args.first.is_a? Hash
+        args.first.each_pair { |key, val| method(m[1] + "attr").call(key, m[2] => val) }
+      else
+        method(m[1] + "attr").call(m[2] => args.first) 
+      end
     end
 
 # Sets properties on renderers (and columns)  See VR::ViewCommon#col_attr for more.
 
-  	def ren_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 renderer(c).respond_to?(key.to_s + "=")  
-   					renderer(c).send(key.to_s + '=', val) 
-  				elsif column(c).respond_to?(key.to_s + "=")
-  					column(c).send(key.to_s + '=', val) 
-  				end 
-  			end
-			end		
-		end	
+    def ren_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 renderer(c).respond_to?(key.to_s + "=")  
+             renderer(c).send(key.to_s + '=', val) 
+          elsif column(c).respond_to?(key.to_s + "=")
+            column(c).send(key.to_s + '=', val) 
+          end 
+        end
+      end    
+    end  
 
 #  Sets properties on many columns at once.  It can be called with many columns and many attributes.
 #  Also, if you don't specify any columns, it will set the properties on all of them.  There are
@@ -176,20 +176,20 @@ attr_accessor :vr_renderer, :vr_column
 #  In the vast majority of cases, VR::ViewCommon#col_attr and VR::ViewCommon#ren_attr are interchangable.
   
 
-  	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
+    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.
@@ -198,54 +198,54 @@ attr_accessor :vr_renderer, :vr_column
 #  selection mode, it will return an array with one row.  These rows are
 #  able to respond to column IDs.  They are the same types of rows as returned by
 #  VR::ViewCommon#vr_row.
-		
-		def selected_rows()
-			rows = []
-			selection.each do |model, path, iter|
-				rows << vr_row(iter) 
-			end
-			rows
-		end  
+    
+    def selected_rows()
+      rows = []
+      selection.each do |model, path, iter|
+        rows << vr_row(iter) 
+      end
+      rows
+    end  
 
-		def delete_selected()
-			refs = []
-			selection.each do  |mod, path, iter|
-				refs << Gtk::TreeRowReference.new(mod, path)
-			end
-			refs.each do |ref|
-				model.remove(model.get_iter(ref.path))
-			end	 
-		end
+    def delete_selected()
+      refs = []
+      selection.each do  |mod, path, iter|
+        refs << Gtk::TreeRowReference.new(mod, path)
+      end
+      refs.each do |ref|
+        model.remove(model.get_iter(ref.path))
+      end   
+    end
   
-  	def turn_on_comboboxes() # :nodoc:
-  		# detect if comboboxes are present:
-  		found = false
-  		self.each_renderer do |r|
-  			if r.is_a? VR::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
-  			end
-    	end		
-  	end
+    def turn_on_comboboxes() # :nodoc:
+      # detect if comboboxes are present:
+      found = false
+      self.each_renderer do |r|
+        if r.is_a? VR::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
+        end
+      end    
+    end
 
-		def flatten_hash(hash) # :nodoc:
-			h = {}
-			hash.each do | k, v |
-				if v.class == Hash
-					v.each_pair { |key, val| h[key] = val }
-				else
-					h[k] = v
-				end
-			end 
- 			return h
-		end
+    def flatten_hash(hash) # :nodoc:
+      h = {}
+      hash.each do | k, v |
+        if v.class == Hash
+          v.each_pair { |key, val| h[key] = val }
+        else
+          h[k] = v
+        end
+      end 
+       return h
+    end
 
 #  Enumerates each row in the model and returns an instance of GtkTreeIter.
 #  However, the iters returned have been converted into a "row" using VR::ViewCommon#vr_row
@@ -254,9 +254,12 @@ attr_accessor :vr_renderer, :vr_column
 #   @view.each_row { |row| puts row[:name] }  # works!
 #
 
-		def each_row
-			self.model.each { |mod, pth, itr| yield vr_row(itr) }
-		end
+    def each_row
+      self.model.each do |mod, pth, itr|
+        iter = model.get_iter(pth) #bug? 
+        yield vr_row(iter) 
+      end
+    end
 
 #  Converts a normal GtkTreeIter to use VR's column IDs.  You can use it like this:
 #  
@@ -264,17 +267,17 @@ attr_accessor :vr_renderer, :vr_column
 #   row[:name] = "Chester"  # works!
 
 
-		def vr_row(iter)
-			unless iter.respond_to?(:id)
-				iter.extend(VR::IterMethods)
-				iter.column_keys = @column_keys
-			end
-			return iter
-		end 
+    def vr_row(iter)
+      unless iter.respond_to?(:id)
+        iter.extend(VR::IterMethods)
+        iter.column_keys = @column_keys
+      end
+      return iter
+    end 
 
-		def get_iter(path)
-			vr_row(model.get_iter(path))
-		end
+    def get_iter(path)
+      vr_row(model.get_iter(path))
+    end
 
 
 #  Returns a VR::TreeViewColumn object for the column.  You can pass this method either
@@ -290,17 +293,17 @@ attr_accessor :vr_renderer, :vr_column
 #  methods instead.  See VR::ViewCommon for more.
 
   
-  	def column(id)
-  		@vr_column[id] 
-  	end
-  	
-  	def each_renderer
-  		self.columns.each do |c| 
-  			c.cells.each do |r| 
-  				yield r 
-  			end
-  		end
-  	end
+    def column(id)
+      @vr_column[id] 
+    end
+    
+    def each_renderer
+      self.columns.each do |c| 
+        c.cells.each do |r| 
+          yield r 
+        end
+      end
+    end
 
 #Returns the renderer for a given column ID.
 #
@@ -334,16 +337,16 @@ attr_accessor :vr_renderer, :vr_column
 #
 #This is perfectly valid even though there are better ways of setting these properties in visualruby.
 
-		def renderer(sym)
-			@vr_renderer[sym]
-		end
+    def renderer(sym)
+      @vr_renderer[sym]
+    end
  
-#  	def renderer(id)
-#  		each_renderer do |r| 
-#  			return r if r.model_col == id(id) 
-#  		end
-#  		return nil
-#  	end
+#    def renderer(id)
+#      each_renderer do |r| 
+#        return r if r.model_col == id(id) 
+#      end
+#      return nil
+#    end
 
 #  Returns the number of the given column ID.  This is very useful when you're
 #  working with Gtk's methods because they require column numbers (not Column IDs)
@@ -362,9 +365,9 @@ attr_accessor :vr_renderer, :vr_column
 #  you also have the option of converting the whole iter to use column IDs (symbols)
 #  using VR::ViewCommon#vr_row.
 
-		def id(id)
-			return (id.is_a? Fixnum or id.is_a? Integer) ? id : @column_keys.index(id)
-		end  
+    def id(id)
+      return (id.is_a? Fixnum or id.is_a? Integer) ? id : @column_keys.index(id)
+    end  
 
   end
 end

data/vrlib/lib/treeview/columns/CalendarCol.rb

@@ -18,72 +18,72 @@ module VR
 #  
 #  See the example project, "listview_objects" for more.
 
-	class CalendarCol 
+  class CalendarCol 
 
-		include GladeGUI
+    include GladeGUI
 
-		attr_accessor :date, :date_format, :show_time, :show_calendar
+    attr_accessor :date, :date_format, :show_time, :show_calendar
 #  
 #  - datetime - Instance of DateTime class that holds the date value.
 #  - date_format - String that holds the Ruby date format. Default: "%d %b %Y   %I:%M%p"
 #  - show_time - true/false If this is false, the time will not appear in the edit window.
 #  - show_calendar - true/false If this is false, Calendar will not appear.  Only time will edit.
 #  
-		def initialize(datetime, flags = {})  #flags = :hide_date => true, hide_time => true, :format => "%d %b %Y   %I:%M%p"
-			@format = flags[:format]
-			@format ||= flags[:hide_date] ? "%I:%M%p" : "%d %b %Y   %I:%M%p"
-			@format ||= flags[:hide_time] ? "%d %b %Y" : @date_format
-			@hide_date = flags[:hide_date]
-			@hide_time = flags[:hide_time]
-			@show_calendar = show_calendar
-			@date = datetime
-			@hour = @date.strftime("%I").to_f
-			@minute = @date.min()
-			@am = (@date.hour < 12)
-			@pm = !@am
-		end
+    def initialize(datetime, flags = {})  #flags = :hide_date => true, hide_time => true, :format => "%d %b %Y   %I:%M%p"
+      @format = flags[:format]
+      @format ||= flags[:hide_date] ? "%I:%M%p" : "%d %b %Y   %I:%M%p"
+      @format ||= flags[:hide_time] ? "%d %b %Y" : @date_format
+      @hide_date = flags[:hide_date]
+      @hide_time = flags[:hide_time]
+      @show_calendar = show_calendar
+      @date = datetime
+      @hour = @date.strftime("%I").to_f
+      @minute = @date.min()
+      @am = (@date.hour < 12)
+      @pm = !@am
+    end
 
-		def show_glade(parent = nil)
-			super			
-			@builder["hboxTime"].hide if @hide_time
-			@builder["date"].hide if @hide_date
-		end
+    def show_glade(parent = nil)
+      super      
+      @builder["hboxTime"].hide if @hide_time
+      @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.
-	
-		def to_s
-			@date.strftime(@format)
-		end
+  
+    def to_s
+      @date.strftime(@format)
+    end
 
-		def am__toggled(*args) # :nodoc:
-			@builder["pm"].active = !@builder["am"].active?
-		end
+    def am__toggled(*args) # :nodoc:
+      @builder["pm"].active = !@builder["am"].active?
+    end
 
-		def pm__toggled(*args) # :nodoc:
-			@builder["am"].active = !@builder["pm"].active? 
-		end
+    def pm__toggled(*args) # :nodoc:
+      @builder["am"].active = !@builder["pm"].active? 
+    end
 
-		def buttonSave__clicked(*args) # :nodoc:
-			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")
-			@date = DateTime.new(@date.year, @date.month, @date.day, t.hour, t.min, 0)
-			@builder["window1"].destroy
-		end
+    def buttonSave__clicked(*args) # :nodoc:
+      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")
+      @date = DateTime.new(@date.year, @date.month, @date.day, t.hour, t.min, 0)
+      @builder["window1"].destroy
+    end
 
-		def buttonCancel__clicked(*args) # :nodoc:
-			@builder["window1"].destroy			
-		end
+    def buttonCancel__clicked(*args) # :nodoc:
+      @builder["window1"].destroy      
+    end
 
-		def <=>(calendar)
-			return @date <=> calendar.date
-		end
+    def <=>(calendar)
+      return @date <=> calendar.date
+    end
 
-		def value
-			@date
-		end
+    def value
+      @date
+    end
 
-	end
+  end
 
 end

data/vrlib/lib/treeview/columns/CellRendererCombo.rb

@@ -15,28 +15,28 @@ module VR
 
   class CellRendererCombo < Gtk::CellRendererCombo
   
-  	attr_accessor :edited_callback, :validate_block 
-		attr_reader :model_col, :column, :model_sym
+    attr_accessor :edited_callback, :validate_block 
+    attr_reader :model_col, :column, :model_sym
   
-  	def initialize(model_col, column, view, model_sym) # :nodoc:
-  		super()
-  		@model_col = model_col
-  		@column = column
-  		@view = view
-			@model_sym = model_sym
-			@view.model.set_sort_func(@model_col) { |m,x,y| x[@model_col].selected <=> y[@model_col].selected }
-  		@validate_block = Proc.new { |text, model_sym, row, view | true } 
-			self.editable = true
-			self.has_entry = false
-			@edited_callback = nil
-    	self.signal_connect('edited') do |ren, path, text| # iter for
-    		iter = @view.model.get_iter(path)
-  			if @validate_block.call(text, @model_sym, @view.vr_row(iter), @view)
-  				iter[@model_col].selected = text 
-					@edited_callback.call(@model_sym, @view.vr_row(iter)) if @edited_callback
-  			end	
-    	end
-  	end
+    def initialize(model_col, column, view, model_sym) # :nodoc:
+      super()
+      @model_col = model_col
+      @column = column
+      @view = view
+      @model_sym = model_sym
+      @view.model.set_sort_func(@model_col) { |m,x,y| x[@model_col].selected <=> y[@model_col].selected }
+      @validate_block = Proc.new { |text, model_sym, row, view | true } 
+      self.editable = true
+      self.has_entry = false
+      @edited_callback = nil
+      self.signal_connect('edited') do |ren, path, text| # iter for
+        iter = @view.model.get_iter(path)
+        if @validate_block.call(text, @model_sym, @view.vr_row(iter), @view)
+          iter[@model_col].selected = text 
+          @edited_callback.call(@model_sym, @view.vr_row(iter)) if @edited_callback
+        end  
+      end
+    end
 
 #  This sets the renderer's "editable" property to true, and makes it save
 #  the edited value to the model.  When a user edits a row in the ListView
@@ -55,11 +55,11 @@ module VR
 #  is_editable = boolean
 #  
  
-  	def set_model(vr_combo) # :nodoc:
-  		self.model = Gtk::ListStore.new(String)
-  		vr_combo.selections.each { |s| r = self.model.append ; r[0] = s }
-  		self.text_column = 0
-  	end
+    def set_model(vr_combo) # :nodoc:
+      self.model = Gtk::ListStore.new(String)
+      vr_combo.selections.each { |s| r = self.model.append ; r[0] = s }
+      self.text_column = 0
+    end
   
   end
 

data/vrlib/lib/treeview/columns/CellRendererDate.rb

@@ -13,33 +13,33 @@ module VR
 
   class CellRendererDate < Gtk::CellRendererText
   
-  	attr_accessor :date_format, :edited_callback, :model_col, :column, :model_sym
+    attr_accessor :date_format, :edited_callback, :model_col, :column, :model_sym
 
-  	def initialize(model_col, column, view, model_sym) # :nodoc:
-  		super()
-			@model_col = model_col
-			@column = column
-			@view = view
-			@model_sym = model_sym
-			@view.model.set_sort_func(@model_col) { |m,x,y| x[@model_col] <=> y[@model_col] }
-			@date_format = "%m-%d-%Y"
-  		@validate_block = Proc.new { |text, model_sym, row, view| 
-				begin
-					Date.strptime(text, @date_format)
-					true
-				rescue
-					alert("Unrecognized date format:  " + text)
-					false 
-				end } 
-			@edited_block = nil
+    def initialize(model_col, column, view, model_sym) # :nodoc:
+      super()
+      @model_col = model_col
+      @column = column
+      @view = view
+      @model_sym = model_sym
+      @view.model.set_sort_func(@model_col) { |m,x,y| x[@model_col] <=> y[@model_col] }
+      @date_format = "%m-%d-%Y"
+      @validate_block = Proc.new { |text, model_sym, row, view| 
+        begin
+          Date.strptime(text, @date_format)
+          true
+        rescue
+          alert("Unrecognized date format:  " + text)
+          false 
+        end } 
+      @edited_block = nil
       self.signal_connect('edited') do |ren, path, text|
-    		next unless iter = @view.model.get_iter(path)
-    		if @validate_block.call(text, @model_sym, @view.vr_row(iter), @view)
-    			iter[@model_col] = DateTime.strptime(text, @date_format)
-  				@edited_callback.call(@model_sym, @view.vr_row(iter)) if @edited_callback
-    		end
+        next unless iter = @view.model.get_iter(path)
+        if @validate_block.call(text, @model_sym, @view.vr_row(iter), @view)
+          iter[@model_col] = DateTime.strptime(text, @date_format)
+          @edited_callback.call(@model_sym, @view.vr_row(iter)) if @edited_callback
+        end
       end
-		end
-	end
+    end
+  end
 
 end

data/vrlib/lib/treeview/columns/CellRendererObject.rb

@@ -13,45 +13,45 @@ module VR
 
   class CellRendererObject < Gtk::CellRendererText
   
-  	attr_accessor :model_col, :column, :edited_callback, :visual_attributes_method, :model_sym
+    attr_accessor :model_col, :column, :edited_callback, :visual_attributes_method, :model_sym
 
-  	def initialize(model_col, column, view, model_sym) # :nodoc:
-			super()
-  		@model_col = model_col
-			@model_sym = model_sym
-			@view = view
-			@column = column
-			@edit = true
-			@edited_callback = nil
-			@visual_attributes_method = "visual_attributes"
-			@view.model.set_sort_func(@model_col) { |m,x,y| x[@model_col] <=> y[@model_col] } 
-			@show_block = Proc.new { |obj| obj.show_glade() if obj.respond_to? "show_glade" }
-			@view.signal_connect("row_activated") do | view, path, col |
-				next if !@edit or !col.eql? @column
-				iter = @view.model.get_iter(path)
-				obj = iter[@model_col]
-				@show_block.call(obj)
-				block = @edited_callback ? @edited_callback.call(@model_sym, @view.vr_row(iter)) : true 
-				@view.signal_emit_stop("row_activated") if block	
-			end
-  	end
+    def initialize(model_col, column, view, model_sym) # :nodoc:
+      super()
+      @model_col = model_col
+      @model_sym = model_sym
+      @view = view
+      @column = column
+      @edit = true
+      @edited_callback = nil
+      @visual_attributes_method = "visual_attributes"
+      @view.model.set_sort_func(@model_col) { |m,x,y| x[@model_col] <=> y[@model_col] } 
+      @show_block = Proc.new { |obj| obj.show_glade() if obj.respond_to? "show_glade" }
+      @view.signal_connect("row_activated") do | view, path, col |
+        next if !@edit or !col.eql? @column
+        iter = @view.model.get_iter(path)
+        obj = iter[@model_col]
+        @show_block.call(obj)
+        block = @edited_callback ? @edited_callback.call(@model_sym, @view.vr_row(iter)) : true 
+        @view.signal_emit_stop("row_activated") if block  
+      end
+    end
   
-		alias :set_editable :editable=  
-  	def editable=(e)
-			@edit = e
-  	end
-	
-		def render_object(iter)
-			obj = iter[@view.id(@model_col)]
-			self.text = obj.respond_to?(:to_s) ?  obj.to_s : "Define to_s!"
-			if obj.respond_to? @visual_attributes_method
-				return unless attrib = obj.send(@visual_attributes_method)
-				attrib.each_pair do | key, val |
-					self.send( key.to_s + "=", val)
-				end
-			end
-		end
+    alias :set_editable :editable=  
+    def editable=(e)
+      @edit = e
+    end
+  
+    def render_object(iter)
+      obj = iter[@view.id(@model_col)]
+      self.text = obj.respond_to?(:to_s) ?  obj.to_s : "Define to_s!"
+      if obj.respond_to? @visual_attributes_method
+        return unless attrib = obj.send(@visual_attributes_method)
+        attrib.each_pair do | key, val |
+          self.send( key.to_s + "=", val)
+        end
+      end
+    end
  
-	end
+  end
 
 end