visualruby 3.0.12 → 3.0.13

data/lib/treeview/columns/TreeViewColumn.rb

@@ -1,4 +1,4 @@
-module VR 
+module VR::Col 
 
   class TreeViewColumn < Gtk::TreeViewColumn # :nodoc:
   
@@ -11,44 +11,40 @@ module VR
         cols.each_pair do |symb, type|
           r = nil
           a = [model_col, self, @view, symb]
-          if type == Gdk::Pixbuf
-            r = VR::CellRendererPixbuf.new(*a)
-#            ren = Gtk::CellRendererPixbuf.new #(*a)
+          if type == Gdk::Pixbuf # ok to use gtk
+            r = Gtk::CellRendererPixbuf.new #(*a)
             self.pack_start( r, false )
             self.add_attribute( r, :pixbuf,  model_col)
           elsif type == TrueClass
-            r = VR::CellRendererToggle.new(*a)
+            r = VR::Col::Ren::CellRendererToggle.new(*a)
+#            r = Gtk::CellRendererToggle.new()
             self.pack_start( r, false )
             self.add_attribute( r, :active,  model_col)
-          elsif type == VR::SpinCol #or type == Gtk::Adjustment 
-            r = VR::CellRendererSpin.new(*a)
+          elsif type == VR::Col::SpinCol #or type == Gtk::Adjustment 
+            r = VR::Col::Ren::CellRendererSpin.new(*a)
             self.pack_start( r, false )
             self.add_attribute( r, :adjustment,  model_col)
             self.set_cell_data_func(r) do |col, rend, model, iter|
               fmt = "%.#{rend.digits}f"
               rend.text = fmt % iter[rend.model_col].value.to_s     
             end  
-          elsif type == VR::ComboCol 
-            r = VR::CellRendererCombo.new(*a)
+          elsif type == VR::Col::ComboCol 
+            r = VR::Col::Ren::CellRendererCombo.new(*a)
             self.pack_start( r, false )
             self.set_cell_data_func(r) do |col, rend, model, iter|
               iter = model.get_iter(iter.path)
-#puts "VR::ComboCol Renderer: " + ren.class.name + " model_col: " + ren.model_col.to_s
-#puts "VR::ComboCol Iter: " + iter.class.name
-#puts "VR::ComboCol Model: " + model.class.name 
-#puts "VR::ComboCol Cell: " + iter[ren.model_col].class.name 
-#puts "VR::ComboCol iter[ren.model_col]: " + iter[ren.model_col].selected.to_s 
           #    display_val = iter[rend.model_col].selected.to_s 
               display_val = iter[@view.id(sym)].selected.to_s 
 #puts display_val
               rend.text = display_val #= iter[ren.model_col].selected.to_s
             end 
-          elsif type == VR::ProgressCol 
-            r = VR::CellRendererProgress.new(*a)
+          elsif type == VR::Col::ProgressCol 
+#            r = VR::Col::Ren::CellRendererProgress.new(*a)
+            r = Gtk::CellRendererProgress.new()
             self.pack_start( r, false )
             self.add_attribute( r, :value,  model_col)
           elsif type == DateTime 
-            r = VR::CellRendererDate.new(*a)
+            r = VR::Col::Ren::CellRendererDate.new(*a)
             self.pack_start( r, false )
             self.set_cell_data_func(r) do |col, ren, model, iter|
 #iter = model.get_iter(iter.path)
@@ -56,11 +52,11 @@ module VR
             ren.text = iter[ren.model_col].strftime(ren.date_format).to_s
             end
           elsif type == String or type == Float or type == Integer or type == Fixnum  
-            r = VR::CellRendererText.new(*a)
+            r = VR::Col::Ren::CellRendererText.new(*a)
             self.pack_start( r, false )
             self.add_attribute( r, :text,  model_col)
           else #user defined object
-            r = VR::CellRendererObject.new(*a)
+            r = VR::Col::Ren::CellRendererObject.new(*a)
             self.pack_start( r, false )
             self.set_cell_data_func(r) do |col, ren, model, iter|
               ren.render_object(iter)
@@ -68,7 +64,6 @@ module VR
           end
           model_col = model_col + 1
           view.vr_renderer[sym] = r
-          view.vr_column[sym] = self
         end
     end
   

data/src/main/VR_File_Tree.rb

@@ -46,7 +46,7 @@ class VR_File_Tree < VR::FileTreeView
 #      txt = VR_Tools.sudo_command(command)
 #    end
     @main.shell.buffer.text = txt
-  end
+  end
 
   def menuRDoc_clicked
     return unless @main.tabs.try_to_save_all(:ask => false)
@@ -56,10 +56,9 @@ class VR_File_Tree < VR::FileTreeView
     @main.shell.buffer.text = $VR_ENV.rdoc_command_line + fn + "\n" 
     @main.shell.buffer.text += `#{$VR_ENV.rdoc_command_line} 2>&1`
     VR_Tools.replace_html_in_docs()
-    FileUtils.copy("yard_hack/common.css", "#{fn}/doc/css/common.css") if File.exists?("yard_hack/common.css")
     if File.exists?("yard_hack/index.html.replace")
       FileUtils.copy("yard_hack/index.html.replace", "#{fn}/doc/index.html") 
-      FileUtils.copy("yard_hack/index.html.replace", "#{fn}/doc/frames.html")
+      FileUtils.copy("yard_hack/common.css", "#{fn}/doc/css/common.css")
     end
     FileUtils.cd(old_dir)    
     VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{fn}/doc/index.html")

data/src/main/VR_Main.rb

@@ -144,6 +144,18 @@ class VR_Main
       when 2 then @remote_gem_tree.refresh()
     end
   end
+
+  def toolRDoc__clicked(*a)
+    @shell.buffer.text = $VR_ENV.rdoc_command_line + "\n"
+    clear_events 
+    @shell.buffer.text += `#{$VR_ENV.rdoc_command_line} 2>&1`
+    VR_Tools.replace_html_in_docs()
+    if File.exists?("yard_hack/index.html.replace")
+      FileUtils.copy("yard_hack/index.html.replace", "doc/index.html") 
+      FileUtils.copy("yard_hack/common.css", "doc/css/common.css")
+    end
+#    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{fn}/doc/index.html")
+  end
 
   def toolSave__clicked(*a)  # saves open tab 
     @tabs.docs[@tabs.page].try_to_save(false) # false = don't ask

data/src/main/glade/VR_Main.glade

@@ -328,6 +328,20 @@
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkToolButton" id="toolRDoc">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Create RDocs for this project.</property>
+                    <property name="label" translatable="yes">RDoc</property>
+                    <property name="use_underline">True</property>
+                    <property name="stock_id">gtk-copy</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualruby
 version: !ruby/object:Gem::Version
-  version: 3.0.12
+  version: 3.0.13
 platform: ruby
 authors:
 - Eric Cunningham
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - "."
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -178,9 +178,7 @@ files:
 - "./lib/Alert.rb"
 - "./lib/DragDrop.rb"
 - "./lib/GladeGUI.rb"
-- "./lib/IconHash.rb"
 - "./lib/SavableClass.rb"
-- "./lib/SimpleComboBoxEntry.rb"
 - "./lib/glade/Alert.glade"
 - "./lib/oinspect/MethodsListView.rb"
 - "./lib/oinspect/ObjectInspectorGUI.rb"
@@ -191,23 +189,19 @@ files:
 - "./lib/treeview/ListView.rb"
 - "./lib/treeview/TreeView.rb"
 - "./lib/treeview/ViewCommon.rb"
+- "./lib/treeview/columns/BlobCol.rb"
 - "./lib/treeview/columns/CalendarCol.rb"
 - "./lib/treeview/columns/CellRendererCombo.rb"
-- "./lib/treeview/columns/CellRendererDate.rb"
 - "./lib/treeview/columns/CellRendererObject.rb"
-- "./lib/treeview/columns/CellRendererPhone.rb"
-- "./lib/treeview/columns/CellRendererPixbuf.rb"
 - "./lib/treeview/columns/CellRendererProgress.rb"
 - "./lib/treeview/columns/CellRendererSpin.rb"
 - "./lib/treeview/columns/CellRendererText.rb"
 - "./lib/treeview/columns/CellRendererToggle.rb"
 - "./lib/treeview/columns/ComboCol.rb"
 - "./lib/treeview/columns/CurrencyCol.rb"
-- "./lib/treeview/columns/DateCol.rb"
 - "./lib/treeview/columns/ImageCol.rb"
 - "./lib/treeview/columns/ProgressCol.rb"
 - "./lib/treeview/columns/SpinCol.rb"
-- "./lib/treeview/columns/TextCol.rb"
 - "./lib/treeview/columns/TreeViewColumn.rb"
 - "./lib/treeview/columns/glade/CalendarCol.glade"
 - "./lib/treeview/columns/glade/ImageCol.glade"
@@ -227,7 +221,6 @@ files:
 - "./src/main/GemTree.rb"
 - "./src/main/NewProjectGUI.rb"
 - "./src/main/OpenProject.rb"
-- "./src/main/ProjectChooserView.rb"
 - "./src/main/ProjectTree.rb"
 - "./src/main/RubygemsAPI.rb"
 - "./src/main/VR_ENV.rb"

data/lib/IconHash.rb

@@ -1,18 +0,0 @@
-module VR
-
-  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

data/lib/SimpleComboBoxEntry.rb

@@ -1,8 +0,0 @@
-
-#This is for backwards compatibility.  Before, there was an instance of
-#SimpleComboBoxEntry in the VR_ENV_GLOBAL yaml file.  Older projects try to
-#load this instance.
-module VR # :nodoc:
-  class SimpleComboBoxEntry
-  end
-end

data/lib/treeview/columns/CellRendererDate.rb

@@ -1,45 +0,0 @@
-module VR
-
-#  This class is a helper to VR::ListView and VR::TreeView.  When
-#  colums are created, this class is used as the renderer because
-#  it adds functionality to the Gtk Renderer.
-#  
-#  When you call ListView#render(model_col) an instance of this class
-#  will be returned.  It is a subclass of
-#  
-#  {Gtk::CellRendererText}[http://ruby-gnome2.sourceforge.jp/hiki.cgi?Gtk%3A%3ACellRendererText]
-#  
-#  So it has all the functionality of its parent, plus the methods listed here.
-
-  class CellRendererDate < Gtk::CellRendererText
-  
-    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
-      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
-      end
-    end
-  end
-
-end

data/lib/treeview/columns/CellRendererPhone.rb

@@ -1,45 +0,0 @@
-module VR
-
-#  This class is a helper to VR::ListView and VR::TreeView.  When
-#  colums are created, this class is used as the renderer because
-#  it adds functionality to the Gtk Renderer.
-#  
-#  When you call ListView#render(model_col) an instance of this class
-#  will be returned.  It is a subclass of
-#  
-#  {Gtk::CellRendererText}[http://ruby-gnome2.sourceforge.jp/hiki.cgi?Gtk%3A%3ACellRendererText]
-#  
-#  So it has all the functionality of its parent, plus the methods listed here.
-
-  class CellRendererPhone < Gtk::CellRendererText
-  
-    attr_accessor :phone_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] }
-      @phone_format = "%3-%3-%4"
-      @validate_block = Proc.new { |text, model_sym, row, view| 
-        only_numbers = text.gsub(/[^0-9]/, "")
-        if (only_numbers.size == 10)
-          true
-        else
-          alert("Unrecognized phone number:  " + 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
-      end
-    end
-  end
-
-end

data/lib/treeview/columns/CellRendererPixbuf.rb

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

data/lib/treeview/columns/DateCol.rb

@@ -1,20 +0,0 @@
-
-  
-module VR 
-
-class DateCol
-  
-  attr_accessor :date
-
-  def initialize(date, format = "%Y-%m-%d")
-    set_date(date, format)
-  end
-
-  def set_date(date, format = "%Y-%m-%d")
-    @date = date
-#    gsub!(self, @date.strftime(format))
-  end
-
-end
-
-end

data/src/main/ProjectChooserView.rb

@@ -1,40 +0,0 @@
-
-class ProjectChooserView < VR::ListView
-
-  PIX = Gdk::Pixbuf.new(File.dirname(__FILE__) + "/../../img/folder.png")
-
-  def initialize()
-    super(:folder => {:pix => Gdk::Pixbuf, :file_name => String}, :modified => DateTime) 
-    ren_xalign(:modified => 1)
-    col_xalign(:modified => 1)
-    col_sort_column_id(:modified => id(:modified), :pix => id(:file_name))
-  end
-
-  def refresh(show_backup = false)
-    # model.set_sort_column_id(1, :ascending)
-    self.model.clear
-    pattern = ""
-    backup_path = Dir.pwd.gsub(ENV["HOME"], File.join(ENV["HOME"], "visualruby_backup"))
-    backup_ar = File.split(backup_path)
-    backup_ar << ["**", VR_ENV::SETTINGS_FILE]
-    if show_backup
-      pattern = File.join(*backup_ar)
-    else
-      pattern = File.join(ENV["HOME"], "visualruby", "**", VR_ENV::SETTINGS_FILE)
-    end
-    Dir.glob(pattern, File::FNM_DOTMATCH).each do |fn|
-      next if not show_backup and fn =~ / Backup /  
-      next if show_backup and not fn =~ / Backup / 
-      t = File.stat(fn).mtime
-      row = add_row()
-      row[:pix] = PIX
-      row[:file_name] = File.dirname(fn)
-      row[:modified] = DateTime.parse(t.to_s)
-    end  
-
-#    model.set_sort_column_id(id(:modified), :descending)
-  end  
-  
-end
-
-