visualruby 3.0.11 → 3.0.12

data/{vrlib/lib → lib}/treeview/FileTreeView.rb

@@ -5,21 +5,22 @@ module VR
   
     include GladeGUI
   
+    attr_accessor :root, :glob
 
-
-    # A code block that further eliminates files included in the tree. If this block returns false 
-    # for the entry, it will be excluded.
-    
-    attr_accessor :validation_block, :root, :glob
+    # A Code block that further excludes files and folders included in the tree. If this block returns false 
+    # for the entry, it will be excluded. If it returns true, it will be included...  
+    attr_accessor :validate_block
 
     # 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.  
-    def initialize(root = Dir.pwd, icon_path = nil, glob = "*")
+    # @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)  
+    def initialize(root = Dir.pwd, icon_path = nil, glob = "*", validate_block = nil)
       @root = File.expand_path(root)
-      @glob = glob
+      @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)
       self.headers_visible = false
@@ -31,8 +32,8 @@ module VR
       self.visible = true # necessary!
     end  
 
-    # Refreshes the file tree, optionally with a new root folder, and optionally opening an array of folders.
-    # @param [Hash] flags Optionally pass a root or array of folders to open.
+    # Refresh the file tree, optionally with a new root folder, and optionally opening an array of folders.
+    # @param [Hash] flags You can change the root and/or  open an array of folders.
     # @option flags [String] :root Path to root folder to open
     # @option flags [Array] :open_folders A list of folders to open, possibly from #get_open_folders.
     #    Default: the currently open folders, so the tree doesn't collapse when refreshed. 
@@ -41,22 +42,21 @@ module VR
       open_folders = flags[:open_folders] ? flags[:open_folders] : get_open_folders()
       model.clear
       @root_iter = add_file(@root, nil)
-      open_folders([@root_iter[:path]])
-#      fill_folder(@root_iter)
-#      expand_row(@root_iter.path, false)
+      open_folders([@root_iter[:path]])
       open_folders(open_folders)
     end
 
     # reads a folder from the disk and expands it.
     private def fill_folder(parent_iter)
       model.remove(parent_iter.first_child)   #remove dummy record
-      files = Dir.glob(File.join(parent_iter[id(:path)],@glob))
-      files = files.select &@validation_block if @validation_block
+      files = Dir.glob(File.join(parent_iter[id(:path)], @glob))
+      files = files.select &@validate_block if @validate_block
       files.each do |fn|
          add_file(fn, parent_iter)
       end  
-    end
-  
+    end
+
+    #Ignore this, it is called when a folder is clicked, and expands the folder.
     def self__row_expanded(view, iter, path)
       iter = model.get_iter(path)  #bug fix
       fill_folder(iter) if iter[id(:empty)]
@@ -73,14 +73,17 @@ module VR
       end
     end
 
-    # returns an array of open folders.
+    # returns an array of open folders.  The array of folders can be saved, and then you can
+    # pass the array to #open_folders to restore the state of the file tree.
+    # @return [Array] Returns array of strings with the full expanded paths of the open folders.
     def get_open_folders()
       expanded = []
       map_expanded_rows {|view, path| expanded << model.get_iter(path)[id(:path)] }
       return expanded
     end
 
-    # Opens a list of folders.
+    # Opens a list of folders.  
+    # @param [Array] folder_paths Array of Strings of folder names to expand, possibly from the #get_open_folders method.
     def open_folders(folder_paths)
       model.each do |model, path, iter| 
         if folder_paths.include?(iter[id(:path)])
@@ -89,7 +92,8 @@ module VR
       end
     end  
 
-    # Adds a file to the tree under a given parent iter. 
+    # Adds a file to the tree under a given parent iter. 
+    # @param [String] filename Full path to file to add.
     def add_file(filename, parent = @root_iter)
       my_path = File.dirname(filename)
       model.each do |model, path, iter|
@@ -119,7 +123,8 @@ module VR
       self.level_indentation  = expand ? 0 : 12
     end
   
-    # Returns the full filename with path of the selected file
+    # Returns the full filename with path of the selected file.
+    # @return [String, nil]  Full file path to selected file.
     def get_selected_path() 
       selection.selected ? selection.selected[id(:path)] : nil 
     end

data/{vrlib/lib → lib}/treeview/columns/ProgressCol.rb

@@ -1,10 +1,3 @@
-
-#  ==The VR Module hold all the classes of the vrlib gem.  The most useful APIs are:
-#  
-#  ===GladeGUI -- loads glade form 
-#  ===VR::ListView -- makes Gtk::TreeView easy!
-
-
 module VR
 
 #  This class is simply a wrapper for an Integer.  It signals VR::Listview's

data/{vrlib → lib}/vrlib.rb

@@ -3,5 +3,5 @@ require "require_all"
 require "date"
 require "yaml"
 
-require_rel 'lib/'
+require_rel '/'
 

data/skeleton/project/main.rb

@@ -3,7 +3,7 @@
 require "vrlib"
 
 # from require_all gem:
-require_rel 'bin/'
+require_rel 'src/'
 
 
 MyClass.new.show_glade()

data/skeleton/project/src/MyClass.rb

@@ -0,0 +1,15 @@
+
+class MyClass #(change name)
+ 
+  include GladeGUI
+
+  def before_show()
+    @button1 = "Hello World"
+  end  
+
+  def button1__clicked(*args)
+    @builder["button1"].label = "Goodbye World" 
+  end
+
+end
+

data/skeleton/project/src/glade/MyClass.glade

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="window_position">center</property>
+    <child>
+      <object class="GtkButtonBox" id="buttonbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <property name="margin_left">50</property>
+        <property name="margin_right">50</property>
+        <property name="margin_top">50</property>
+        <property name="margin_bottom">50</property>
+        <property name="orientation">vertical</property>
+        <property name="layout_style">start</property>
+        <child>
+          <object class="GtkButton" id="button1">
+            <property name="label" translatable="yes">button</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/{bin → src}/editor/VR_Document.rb

@@ -16,7 +16,8 @@ class VR_Document < GtkSource::View
     show_right_margin = true
     right_margin_position = 80
     auto_indent = true
-    lang = GtkSource::LanguageManager.new.get_language(get_language(full_path_file))  
+#    lang = GtkSource::LanguageManager.new.get_language(get_language(full_path_file))  
+    lang = GtkSource::LanguageManager.new.guess_language(full_path_file) 
     buffer.language = lang
     buffer.highlight_syntax = true
     buffer.highlight_matching_brackets = false
@@ -30,13 +31,13 @@ class VR_Document < GtkSource::View
     update_style()
   end
 
-  def get_language(fn)
-    case File.extname(full_path_file)
-      when ".rb", "", ".gemspec" ; return "ruby"
-      when ".erb", ".html" ; return "html"
-      else ; return ""
-    end
-  end
+#  def get_language(fn)
+#    case File.extname(full_path_file)
+#      when ".rb", "", ".gemspec" ; return "ruby"
+#      when ".erb", ".html" ; return "html"
+#      else ; return ""
+#    end
+#  end
 
   def update_style()
     override_font(Pango::FontDescription.new($VR_ENV_GLOBAL.font_name))

data/{bin → src}/main/ProjectTree.rb

@@ -8,8 +8,7 @@ class ProjectTree < VR::FileTreeView  #(change name)
   def initialize()
     path = $VR_ENV_GLOBAL.projects_home
     icon_path = File.expand_path(File.join(File.path(__FILE__), "..", "..", "..", "img"))
-    super(path, icon_path)
-    @validation_block = proc { |folder| has_settings_file?(folder) } 
+    super(path, icon_path, "*", proc { |folder| has_settings_file?(folder) })
     open_folders($VR_ENV_GLOBAL.projects_home_open_folders) 
   end
 

data/{bin → src}/main/VR_File_Tree.rb

@@ -57,8 +57,10 @@ class VR_File_Tree < VR::FileTreeView
     @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")
-    FileUtils.copy("yard_hack/index.html", "#{fn}/doc/index.html") if File.exists?("yard_hack/index.html")
-    FileUtils.copy("yard_hack/index.html", "#{fn}/doc/frames.html") if File.exists?("yard_hack/index.html")
+    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")
+    end
     FileUtils.cd(old_dir)    
     VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{fn}/doc/index.html")
     @main.file_tree.refresh()

data/{bin → src}/main/VR_Main.rb

@@ -145,8 +145,11 @@ class VR_Main
     end
   end
 
-  def toolSave__clicked(*a)  # saves open tab
-    @tabs.docs[@tabs.page].try_to_save(false) # false = don't ask
+  def toolSave__clicked(*a)  # saves open tab 
+    @tabs.docs[@tabs.page].try_to_save(false) # false = don't ask
+#    command = $VR_ENV.rdoc_command_line.split(" ")[0]
+#    file = @tabs.docs[@tabs.page].full_path_file
+#    run_command("#{command} #{file}")
   end  
 
   def menuNewWindow__activate(*a)
@@ -180,7 +183,7 @@ class VR_Main
   end
 
   def toolBackUp__clicked(*a)
-   return unless @tabs.try_to_save_all(:ask=>true)
+    return unless @tabs.try_to_save_all(:ask=>true)
     VR_Tools.back_up()
   end
 

data/{bin → src}/main/VR_Tools.rb

@@ -84,8 +84,8 @@ END
   #
   #this works on Dir.pwd that's maybe different from project
   def VR_Tools.replace_html_in_docs()
-    return if not File.file? "rdoc_replace.yaml"
-    ar = YAML.load_file "rdoc_replace.yaml"  
+    return if not File.file? "yard_hack/rdoc_replace.yaml"
+    ar = YAML.load_file "yard_hack/rdoc_replace.yaml"  
     Dir.glob("#{Dir.pwd}/doc/**/*.html") do |f|
       str = File.open(f).read
       ar.each do |pair|
@@ -93,8 +93,8 @@ END
       end
       File.open(f, "w") { |file| file.puts(str) }
     end
-    FileUtils.cp "#{Dir.pwd}/rdoc.css", "#{Dir.pwd}/doc/rdoc.css" if File.file?("#{Dir.pwd}/rdoc.css") and File.directory?("#{Dir.pwd}/doc")
-  end
+#    FileUtils.cp "#{Dir.pwd}/rdoc.css", "#{Dir.pwd}/doc/rdoc.css" if File.file?("#{Dir.pwd}/rdoc.css") and File.directory?("#{Dir.pwd}/doc")
+    end
 
 end
 #  def VR_Tools.sudo_command(command)

data/{bin → src}/main/glade/OpenProject.glade

@@ -9,6 +9,7 @@
     <property name="title" translatable="yes">Open Project</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
+    <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <child>
       <object class="GtkBox" id="box1">

data/vr

@@ -16,16 +16,18 @@ def load_everything
   
   require 'require_all'
 
-  require_rel 'vrlib/lib/'
-  require_rel 'bin/'
+  require_rel 'lib/'
+  require_rel 'src/'
 
   VR_Main.new(ARGV, @bldr).show_glade()
 
 end
+
+$root = File.dirname(__FILE__)
  
 @bldr = Gtk::Builder.new
-@bldr << File.join(File.dirname(__FILE__), "bin", "main", "glade", "Splash.glade")
-@bldr[:image1].file = File.join(File.dirname(__FILE__), "img", "splash.png")
+@bldr << File.join($root, "src", "main", "glade", "Splash.glade")
+@bldr[:image1].file = File.join($root, "img", "splash.png")
 @bldr[:window1].show_all
 
 

data/{vrlib → yard_hack}/rdoc_replace.yaml

@@ -49,7 +49,7 @@
   - "<A href=http://ruby-gnome2.sourceforge.jp/hiki.cgi?Gtk%3A%3ASelection>Gtk::Selection</a>"
 - - <li class="r1"><span class="object_link"><a href="index.html" title="README">README</a></a></li>
   - "<!-- README deleted makes problem. -->"
-- - '<div id="search">Search: <input type="text" /></div>'
+- - '<div id="search">Search: <input type="text" /></div>x'
   - "<title>Visual Ruby -- GUI with Ruby and Glade</title>"
 - - video:activerecord.avi
   - <iframe width="640" height="480" src="http://www.youtube.com/embed/uySVKltD7fk"