visualruby 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2cdb311afb2deed214fefa6091767d06a343ca5
-  data.tar.gz: e45f90d1443c9a4bede6af75cbb1e99407c761d0
+  metadata.gz: d0443266e80ba38d5d4306551773250b1d022c92
+  data.tar.gz: f42b42ad7a29ca0a5dde7b15d58e2e65d3e2ca83
 SHA512:
-  metadata.gz: fba0cba31aaea263fe759df39f8c75a408eb8807c0c29034a75c99ecc4f1d34a77ffa3c4263f3b798a39edfea75df840ee06fc9cdb55eaeaeb508304ad60ca46
-  data.tar.gz: 6898472355297110de8b9f0b2fee6d94945e50471c0609dc45489dcf84f761146ce1bdb78c3e0269a9654b3b4ee8f03b1b9221d32c88c07b907544aba5560f88
+  metadata.gz: 7c43c8e1f36352949b7f5d6d014b8be08420266d2922a9fabc18700f5b27571a405832192cb6d1ab4aedac3ebc360de66eaa0c17394401344fcb04fc8508723d
+  data.tar.gz: 7274f357de6a1d4b8c606c9218d70fb8354195bb5386e63860a305715c129fec8c00e1ff900f5ae65a7e70f6c5d3d4d894e276ef6ed4f5a9dcfe0187b69ebc65

data/.vr_settings.yaml

@@ -10,14 +10,19 @@ open_files:
 - "/home/eric/vrp/vr3/examples/active_record/active_record.rb"
 - "/home/eric/vrp/vr3/vr.gemspec"
 - "/home/eric/vrp/vr3/bin/main/VR_ENV_GLOBAL.rb"
+- "/home/eric/vrp/vr3/bin/tools/VR_Tools.rb"
+- "/home/eric/vrp/vr3/vrlib/lib/treeview/FileTreeView.rb"
+- "/home/eric/vrp/vr3/bin/main/ProjectTree.rb"
 open_folders:
 - "/home/eric/vrp/vr3"
 - "/home/eric/vrp/vr3/bin"
 - "/home/eric/vrp/vr3/bin/main"
+- "/home/eric/vrp/vr3/bin/tools"
 - "/home/eric/vrp/vr3/vrlib"
 - "/home/eric/vrp/vr3/vrlib/lib"
-current_file: "/home/eric/vrp/vr3/bin/main/VR_ENV_GLOBAL.rb"
-current_line: 82
+- "/home/eric/vrp/vr3/vrlib/lib/treeview"
+current_file: "/home/eric/vrp/vr3/bin/main/ProjectTree.rb"
+current_line: 12
 rdoc_command_line: rdoc -x README -x /*.glade -x /*.yaml -x /*.gemspec -x /*.css
 builder: !ruby/object:Gtk::Builder {}
 top_level_window: false

data/bin/main/ProjectTree.rb

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

data/bin/main/VR_ENV_GLOBAL.rb

@@ -46,22 +46,6 @@ class VR_ENV_GLOBAL
     return true
   end
 
-  def buttonFindGlade__clicked(*a)
-    alert "This will search for <b>glade.exe</b> in your home folder.  It is only useful for MS Windows systems.", :parent => self
-    ar = Dir.glob(File.join(Dir.home, "**", "glade.exe"))
-    if ar.empty? 
-      alert "glade.exe not found", parent: self
-    else
-      str = ""
-      ar.each { |file| str = str + file + "\n" }
-      if alert("Found files:\n\n" + str + "\n\nEither enter full filename or add to your PATH to make it work.", 
-          :parent => self,
-          :button_yes => "Use First")
-        @builder[:glade_path].text = ar[0]
-      end 
-    end
-  end
-
   def buttonCancel__clicked(*args)
     @builder["window1"].destroy
   end    

data/bin/main/glade/VR_ENV_GLOBAL.glade

@@ -98,19 +98,6 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkButton" id="buttonFindGlade">
-                    <property name="label" translatable="yes">Find</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>

data/bin/tools/VR_Tools.rb

@@ -10,7 +10,8 @@ module VR_Tools
     begin
       IO.popen(cmd)
     rescue
-      alert("The following command couldn't run:\n\n<b>#{cmd}</b>\n\nCheck the path in Tools > Settings")
+      alert("The following command couldn't run:\n\n<b>#{cmd}</b>\n\nCheck the path in Tools > Settings." + 
+          "\n\nIn MS Windows you may need to add the 'start' command i.e. <b>'start glade'</b>")
     end
   end
 

data/examples/filetreeview/.vr_settings.yaml

@@ -1,7 +1,9 @@
 --- !ruby/object:VR_ENV
+vr_yaml_file: ".vr_settings.yaml"
 width: 1337
 height: 691
 panel_pos: 490
+notebook_panel_position: 400
 run_command_line: ruby main.rb
 open_files:
 - "/home/eric/vrp/vr3/examples/filetreeview/main.rb"
@@ -10,11 +12,9 @@ open_files:
 open_folders:
 - "/home/eric/vrp/vr3/examples/filetreeview"
 - "/home/eric/vrp/vr3/examples/filetreeview/bin"
-- "/home/eric/vrp/vr3/examples/filetreeview/bin/glade"
+- "/home/eric/vrp/vr3/examples/filetreeview/img"
 current_file: "/home/eric/vrp/vr3/examples/filetreeview/bin/ProjectTree.rb"
+current_line: 12
 rdoc_command_line: rdoc -x README
-vr_yaml_file: ".vr_settings.yaml"
-notebook_panel_position: 400
-current_line: 11
 settings_file_version: 1
 filename: ".vr_settings.yaml"

data/examples/filetreeview/bin/ProjectTree.rb

@@ -1,3 +1,16 @@
+#  This demonstrates the VR::FileTreeView class.  You can configure it using a glob and a
+#  validation block.  It will only include the files and folders designated in the glob 
+#  and that have the vaildation block return true.
+#  
+#  It does this:
+#  
+#  files = Dir.glob(folder_path, glob)
+#  files = files.select &@validation_block
+#  
+#  It takes the root of the file tree as the first argument, and a path to the icon files
+#  to display next to the files and folders.  THe icons are named according to the extension.
+#  For example, 'rb.png' will display next to files with a '.rb' extension.
+
 
 class ProjectTree < VR::FileTreeView  #(change name)
  
@@ -6,8 +19,11 @@ class ProjectTree < VR::FileTreeView  #(change name)
   include GladeGUI
 
   def initialize()
-    path = File.join(ENV["HOME"], "visualruby")
-    super(path,  "/home/eric/vrp/vr3/img")
+    root_path = File.join(ENV["HOME"], "visualruby")
+    icon_path = File.join(File.dirname(__FILE__), "/../img")
+    glob = "*"
+    super(root_path, icon_path, glob)
+    @validation_block = proc { |folder| has_settings_file?(folder) } 
   end
 
   def self__row_activated(_self, path, col)
@@ -19,4 +35,15 @@ class ProjectTree < VR::FileTreeView  #(change name)
       end
   end
 
+
+  def has_settings_file?(path)
+    Find.find(path) do |file|
+      if File.basename(file) == ".vr_settings.yaml"
+        return true
+      end
+    end
+    return false
+  end
+
+
 end

data/examples/filetreeview/bin/glade/ProjectTreeGUI.glade

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.16.1 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window1">
@@ -8,8 +8,8 @@
     <property name="title" translatable="yes">FileTreeView Demo</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
-    <property name="default_width">400</property>
-    <property name="default_height">600</property>
+    <property name="default_width">460</property>
+    <property name="default_height">700</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
@@ -48,7 +48,11 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">This filetreeview shows only the folders that contain the hidden file, .vr_settings.  This is how a visualruby project is identified.</property>
+                    <property name="margin_left">10</property>
+                    <property name="margin_right">10</property>
+                    <property name="margin_top">10</property>
+                    <property name="margin_bottom">10</property>
+                    <property name="label" translatable="yes">This filetreeview shows only the folders that contain the hidden file, .vr_settings.  This is how a visualruby project is identified.  You will only be able to select valid visualruby project folders. </property>
                     <property name="wrap">True</property>
                   </object>
                 </child>

data/vrlib/lib/treeview/FileTreeView.rb

@@ -5,7 +5,7 @@ module VR
   
     include GladeGUI
   
-    attr_accessor :root, :glob, :test_block
+    attr_accessor :root, :glob, :validation_block
   
     def initialize(root = Dir.pwd, icon_path = nil, glob = "*")
       @root = root
@@ -36,7 +36,7 @@ module VR
     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 &@test_block if @test_block
+      files = files.select &@validation_block if @validation_block
       files.each do |fn|
          add_file(fn, parent_iter)
       end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualruby
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Eric Cunningham
@@ -136,6 +136,12 @@ files:
 - "./examples/filetreeview/bin/ProjectTree.rb"
 - "./examples/filetreeview/bin/ProjectTreeGUI.rb"
 - "./examples/filetreeview/bin/glade/ProjectTreeGUI.glade"
+- "./examples/filetreeview/img/folder.png"
+- "./examples/filetreeview/img/glade.png"
+- "./examples/filetreeview/img/gtk-edit.png"
+- "./examples/filetreeview/img/png.png"
+- "./examples/filetreeview/img/rb.png"
+- "./examples/filetreeview/img/unknown.png"
 - "./examples/filetreeview/main.rb"
 - "./examples/listview/.vr_settings.yaml"
 - "./examples/listview/bin/SongListView.rb"