visualruby 3.2.2 → 3.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 471487097b28ac84f9b91f6cdbded31e11f871b7
-  data.tar.gz: 1b62e86d75a8be09a9b82c75138470b9a5c2865f
+SHA256:
+  metadata.gz: 230602a7de5d52dfbdc0a9929c661491f580fc7e332f70b3d3be8eb287a50f4c
+  data.tar.gz: c32969bb8224e796ae3fa06c32cde03c7f8383f94d20e1ebd583230fccc929b0
 SHA512:
-  metadata.gz: db3f477a72929229e187c0a06565c3bf697a2474705869be6a708a3d42010c95d58c3fc7157630d946b124db750ffa254f0bfd5dae670b37855374862ab2f320
-  data.tar.gz: 4ea888126ac4ba0b4a4c2ae7fd386db675a556e496078be5255719240f6c01bda83a1e467e1ff023d939996471373151be551ba28d452f21b1c1dd54963438b5
+  metadata.gz: 1667ff53b16a5841e0a5b38b2f8b0d0c07c661ac3349118ef269d56797b04e30835ec060aa2178ac27336204e51dd63500388bae92b799c0e8acc6c7e01781c7
+  data.tar.gz: b7364d9342206f361622a30361db33b21873d9e3309e61e8463f85cdfd1b2b09a8fa6dce20a432a1d57a9be7a1cd9e0106764787086052fe8996bd2eecc39d5e

data/.vr_settings.yaml

@@ -14,16 +14,32 @@ open_files:
 - "/home/eric/vrp/vr3/vr"
 - "/home/eric/vrp/vr3/src/main/VR_Main.rb"
 - "/home/eric/vrp/vr3/lib/GladeGUI.rb"
-- "/home/eric/vrp/vr3/lib/vrlib.rb"
+- "/home/eric/vrp/vr3/lib/treeview/FileTreeView.rb"
+- "/home/eric/vrp/vr3/src/editor/VR_Document.rb"
+- "/home/eric/vrp/vr3/lib/SavableClass.rb"
 - "/home/eric/vrp/vr3/lib/ActLikeAHash.rb"
+- "/home/eric/vrp/vr3/src/main/VR_Remote_Gem_Tree.rb"
+- "/home/eric/vrp/vr3/src/main/RubygemsAPI.rb"
+- "/home/eric/vrp/vr3/examples/alert_box/main.rb"
+- "/home/eric/vrp/vr3/examples/active_record/active_record.rb"
+- "/home/eric/vrp/vr3/examples/active_record2/main.rb"
+- "/home/eric/vrp/vr3/lib/vrlib.rb"
+- "/home/eric/vrp/vr3/lib/treeview/TreeView.rb"
+- "/home/eric/vrp/vr3/lib/treeview/IterMethods.rb"
+- "/home/eric/vrp/vr3/lib/treeview/ViewCommon.rb"
+- "/home/eric/vrp/vr3/lib/treeview/columns/TreeViewColumn.rb"
 open_folders:
 - "/home/eric/vrp/vr3"
 - "/home/eric/vrp/vr3/lib"
+- "/home/eric/vrp/vr3/lib/glade"
 - "/home/eric/vrp/vr3/site"
+- "/home/eric/vrp/vr3/skeleton"
+- "/home/eric/vrp/vr3/skeleton/document"
 - "/home/eric/vrp/vr3/src"
+- "/home/eric/vrp/vr3/src/editor"
 - "/home/eric/vrp/vr3/src/main"
-current_file: "/home/eric/vrp/vr3/vr"
-current_line: 17
+current_file: "/home/eric/vrp/vr3/src/main/VR_File_Tree.rb"
+current_line: 85
 rdoc_command_line: yardoc lib - site/*.*
 builder: !ruby/object:Gtk::Builder {}
 top_level_window: false

data/examples/all_widgets/bin/AllWidgets.rb

@@ -36,6 +36,7 @@ class AllWidgets
   end
 
   def initialize()  #window1__show(*args)
+p hello
     @window1 = "Showing All Widgets"
     @label1 = "I'm a Label"
     @checkbutton1 = true

data/examples/golf_handicap/.vr_settings.yaml

@@ -10,12 +10,13 @@ open_files:
 - "/home/eric/vrp/vr3/examples/golf_handicap/src/Handicap.rb"
 - "/home/eric/vrp/vr3/examples/golf_handicap/src/Score.rb"
 - "/home/eric/vrp/vr3/examples/golf_handicap/golf_handicap.gemspec"
+- "/home/eric/vrp/vr3/examples/golf_handicap/src/LoadGolfer.rb"
 open_folders:
 - "/home/eric/vrp/vr3/examples/golf_handicap"
 - "/home/eric/vrp/vr3/examples/golf_handicap/src"
 - "/home/eric/vrp/vr3/examples/golf_handicap/src/glade"
 current_file: "/home/eric/vrp/vr3/examples/golf_handicap/golf_handicap.gemspec"
-current_line: 4
+current_line: 3
 rdoc_command_line: rdoc -x README
 builder: !ruby/object:Gtk::Builder {}
 top_level_window: false

data/examples/golf_handicap/src/Handicap.rb

@@ -40,10 +40,6 @@ class Handicap
     end
   end
 
-  def buttonChange__clicked(*a)
-    load_new_golfer
-  end
-
   def buttonAdd__clicked(*a)
     if row = @view.selected_rows.first
       course = row[:course]
@@ -80,6 +76,13 @@ class Handicap
     score_array[0].handicap = count > 0 ? x[0..x.index(".")+1] : "n/a"  if score_array[0]
   end
 
+  def buttonChangeGolfer__clicked(*a)
+    @view = nil  # so it doesn't save contents
+    VR::save_yaml(self)
+    @builder[:window1].destroy
+    load_new_golfer
+  end
+
 
   def window1__delete_event(*)
     @view = nil

data/examples/golf_handicap/src/LoadGolfer.rb

@@ -0,0 +1,27 @@
+def load_new_golfer
+files = []
+names = []
+Dir[File.expand_path('~/visualruby/golf_handicap/**/*.yaml')].each do |file_name|
+  files << file_name
+  names << File.basename(file_name, ".*")
+end
+
+answer = files.empty? ? false : alert("Choose Golfer:", choices: names, button_no: "New Golfer")
+
+if answer.is_a?(String)
+  load_file = files[names.index(answer)]
+elsif answer == false
+  golfer_name = alert("Enter Name of Golfer to Create a new Handicap File:",
+    input_text: "",
+    button_yes: "Add Golfer"
+    )
+  exit! unless golfer_name.is_a?(String) 
+  exit! unless golfer_name.length > 2
+  load_file = golfer_name.downcase.tr("^a-z\s", '').gsub(" ", "_") + ".yaml"
+else
+  exit!
+end
+
+  VR::load_yaml(Handicap, load_file).show_glade
+
+end

data/examples/golf_handicap/src/glade/Handicap.glade

@@ -47,32 +47,6 @@
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkButtonBox" id="buttonbox2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="layout_style">center</property>
-                <child>
-                  <object class="GtkButton" id="buttonChange">
-                    <property name="label" translatable="yes">Change</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">0</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
@@ -106,7 +80,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -139,6 +113,19 @@
             <property name="can_focus">False</property>
             <property name="spacing">5</property>
             <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="buttonChangeGolfer">
+                <property name="label" translatable="yes">Change Golfer</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">0</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkButton" id="buttonAdd">
                 <property name="label" translatable="yes">Add Score</property>

data/examples/simple_ruby_gui/.vr_settings.yaml

@@ -1,7 +1,9 @@
 --- !ruby/object:VR_ENV
-width: 1366
+vr_yaml_file: "/home/eric/vrp/vr3/examples/simple_ruby_gui/.vr_settings.yaml"
+width: 1301
 height: 692
 panel_pos: 490
+notebook_panel_position: 400
 run_command_line: ruby main.rb
 open_files:
 - "/home/eric/vrp/vr3/examples/simple_ruby_gui/bin/DataObjectGUI.rb"
@@ -9,12 +11,9 @@ open_files:
 open_folders:
 - "/home/eric/vrp/vr3/examples/simple_ruby_gui"
 - "/home/eric/vrp/vr3/examples/simple_ruby_gui/bin"
-- "/home/eric/vrp/vr3/examples/simple_ruby_gui/bin/glade"
 current_file: "/home/eric/vrp/vr3/examples/simple_ruby_gui/main.rb"
+current_line: 4
 rdoc_command_line: rdoc -x README
-vr_yaml_file: ".vr_settings.yaml"
-notebook_panel_position: 400
-current_line: 13
-settings_file_version: 1
 builder: !ruby/object:Gtk::Builder {}
+settings_file_version: 1
 filename: ".vr_settings.yaml"

data/examples/simple_ruby_gui/main.rb

@@ -2,11 +2,10 @@
 
 #Updated for Gtk3!
 
-# ignore -- this is for development, same as require 'vrlib'
-require File.exists?("./../../lib/vrlib.rb") ?  "./../../lib/vrlib.rb" : "vrlib"
+require "vrlib"
 
 # from require_all gem:
-require_rel 'bin/'
+require_rel 'bin'
 
 
 x = DataObjectGUI.new("Harvey Milktoast", "123 Main, Hemet, CA 90090",

data/lib/ActLikeAHash.rb

@@ -1,12 +1,12 @@
 # @private
-#module ActLikeAHash
-#
+# #module ActLikeAHash
+# #
 #  def [] (key)
 #    instance_variable_get("@" + key.to_s)
 #  end
-#
+# #
 #  def []= (key, val)
 #    instance_variable_put("@" + key_to_s, val)
 #  end
-#
+# #
 #end

data/lib/treeview/IterMethods.rb

@@ -18,7 +18,7 @@ module VR::ViewCommon
   #  
     
       def [](col_id)
-        if col_id.is_a? Fixnum
+        if col_id.is_a? Integer
           super
         else
           get_value(id(col_id))
@@ -26,7 +26,7 @@ module VR::ViewCommon
       end
 
       def []=(col_id,val)
-        if col_id.is_a? Fixnum
+        if col_id.is_a? Integer
           super(col_id, val)
         else
           super(id(col_id), val)
@@ -42,7 +42,7 @@ module VR::ViewCommon
   #  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)
+        return (col_id.is_a? Integer) ? 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

data/lib/treeview/ViewCommon.rb

@@ -334,7 +334,7 @@ attr_accessor :vr_renderer, :column_keys, :vr_cols
 #The VR::ListView class will 
 #automatically assign renderers to each column based on its type:
 #
-#String, Fixnum, Integer, Float => VR::Col::Ren::CellRendererText
+#String, Integer, Float => VR::Col::Ren::CellRendererText
 #TrueClass => VR::Col::Ren::CellRendererToggle
 #GdkPixbuf => VR::Col::Ren::CellRendererPixbuf
 #DateTime => VR::Col::Ren::CellRendererDate
@@ -386,7 +386,7 @@ attr_accessor :vr_renderer, :column_keys, :vr_cols
 #  using VR::ViewCommon#vr_row.
 
     def id(id)
-      return (id.is_a? Fixnum or id.is_a? Integer) ? id : @column_keys.index(id)
+      return (id.is_a? Integer) ? id : @column_keys.index(id)
     end  
 
   end

data/lib/treeview/columns/TreeViewColumn.rb

@@ -51,7 +51,7 @@ module VR::Col
 #puts "DateTime:" + iter[ren.model_col].class.name + ":" + iter[ren.model_col].to_s
             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  
+          elsif type == String or type == Float or type == Integer   
             r = VR::Col::Ren::CellRendererText.new(*a)
             self.pack_start( r, false )
             self.add_attribute( r, :text,  model_col)

data/lib/vrlib.rb

@@ -8,4 +8,5 @@ require "fileutils"
 
 
 require_rel '/'
+require_rel 'treeview'
 

data/skeleton/document/New.glade

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="modal">True</property>
     <child>
       <placeholder/>

data/src/editor/VR_Document.rb

@@ -92,28 +92,28 @@ class VR_Document < GtkSource::View
     apply_tag_to_line(line-1, @hilight, nil)
   end
 
-  def comment()
+
+  def insert_before_selected(text)
     return unless buffer.has_selection?
     s,e = get_selected_lines()
     (s..e).each do |i|
       iter, iter_end = get_line_iters(i)
-      iter_end.offset = iter.offset+1
-      chr = buffer.get_text(iter, iter_end, false)
-      buffer.insert(iter, "#")
-    end  
-  end
-
-  def un_comment()
+      buffer.insert(iter, text)
+    end  
+  end
+
+  def delete_before_selected(text)
     return unless buffer.has_selection?
     s,e = get_selected_lines()
     (s..e).each do |i|
       iter, iter_end = get_line_iters(i)
       next if iter_end.offset <=  iter.offset + 1
-      iter_end.offset = iter.offset+1
+      iter_end.offset = iter.offset + text.size 
       chr = buffer.get_text(iter, iter_end, false)
-      buffer.delete(iter, iter_end) if chr == "#"        
+      buffer.delete(iter, iter_end) if chr == text   
     end  
-  end
+  end
+
 
   def get_selected_lines()
     return unless buffer.has_selection?

data/src/main/VR_File_Tree.rb

@@ -35,14 +35,15 @@ class VR_File_Tree < VR::FileTreeView
   end
 
   def popInstallGem_clicked()
-    file_name = get_selected_path()
-    begin
-      inst = Gem::Installer.new(file_name, :wrappers => true, :ignore_dependencies => true)
-      inst.install().to_s
+    file_name = get_selected_path().to_s
+    begin
       txt = "\nInstalled Gem:  " + file_name
+      package = Gem::Package.new(file_name)
+      inst = Gem::Installer.new(package, wrappers: true, ignore_dependencies: true)
+      inst.install
       txt += "\nNo check was made for dependencies"
     rescue Exception => e
-      txt += "\n" + e.message
+      txt += "\n" + e.message.to_s
     end
     @main.shell.buffer.text = txt
   end
@@ -74,14 +75,15 @@ class VR_File_Tree < VR::FileTreeView
     path = get_selected_path()
     source_code = File.open(path, "r").read
     class_name = VR_Document.get_class_title(source_code).gsub(".rb", "")
-    glade_file = File.dirname(path) + "/glade/" + class_name + ".glade" 
+    glade_file = File.dirname(path) + "/glade/" + class_name + ".glade" 
     if not File.file?(glade_file)
       path = File.dirname(glade_file)
-      FileUtils.makedirs(path) if not File.directory?(path)
-      FileUtils.cp File.expand_path(File.dirname(__FILE__)+"/../../skeleton/document/New.glade"), glade_file
+      FileUtils.makedirs(path) if not File.directory?(path)
+      blank_glade = File.expand_path(File.dirname(__FILE__)+"/../../skeleton/document/New.glade") 
+      FileUtils.cp blank_glade, glade_file
       VR_Tools.popen("#{$VR_ENV_GLOBAL.glade_path} #{glade_file}")
-      sleep(2) #must do it this way because different thread
-      File.delete(glade_file)
+#       sleep(5) #must do it this way because different thread
+#       File.delete(glade_file)
     else
       VR_Tools.popen("#{$VR_ENV_GLOBAL.glade_path} #{glade_file}")
     end

data/src/main/VR_Main.rb

@@ -209,28 +209,20 @@ class VR_Main
     VR_Tools.back_up()
   end
 
-  def toolIndent__clicked(*a)
-    press_key(65289) #tab
+  def toolIndent__clicked(*a)
+    @tabs.docs[@tabs.page].insert_before_selected(" " * $VR_ENV_GLOBAL.tab_spaces.to_i )
   end
 
-  def toolUnIndent__clicked(*a)
-    press_key(65056, :shift_mask) # shift+tab
+  def toolUnIndent__clicked(*a)
+    @tabs.docs[@tabs.page].delete_before_selected(" " * $VR_ENV_GLOBAL.tab_spaces.to_i)
   end
 
-  def press_key(keyval, mask = nil)
-    evt = Gdk::EventKey.new(:key_press)
-    evt.state = mask if mask
-    evt.keyval = keyval
-    @tabs.docs[@tabs.page].signal_emit(:key_press_event,  evt) 
+  def toolComment__clicked(*a)
+    @tabs.docs[@tabs.page].insert_before_selected("# ")
   end
 
-
-  def toolComment__clicked(*a)
-    @tabs.docs[@tabs.page].comment()
-  end
-
-  def toolUnComment__clicked(*a)
-    @tabs.docs[@tabs.page].un_comment()
+  def toolUnComment__clicked(*a)
+    @tabs.docs[@tabs.page].delete_before_selected("# ")
   end
 
   def toolRun__clicked(*a)

data/src/version.rb

@@ -1 +1 @@
-VERSION = "3.2.2"
+VERSION = "3.4.6"

data/vr

@@ -13,12 +13,16 @@ def load_everything
   require "rubygems/specification"
   
   require 'require_all'
+ 
+  require_rel 'lib/'
+  require_rel 'src/' 
+# require File.exists?("./../../lib/vrlib.rb") ?  "./../../lib/vrlib.rb" : "vrlib"
+  
+#  require_rel 'lib/GladeGUI.rb'
+
 
-  require_rel 'lib/GladeGUI.rb'
 
 
-  require_rel 'lib/'
-  require_rel 'src/'
 
   VR_Main.new(ARGV, @splash).show_glade()
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualruby
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.4.6
 platform: ruby
 authors:
 - Eric Cunningham
@@ -9,36 +9,36 @@ autorequire:
 bindir:
 - "."
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: gtksourceview3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - "./examples/filetreeview/main.rb"
 - "./examples/golf_handicap/.vr_settings.yaml"
 - "./examples/golf_handicap/src/Handicap.rb"
+- "./examples/golf_handicap/src/LoadGolfer.rb"
 - "./examples/golf_handicap/src/Score.rb"
 - "./examples/golf_handicap/src/glade/Handicap.glade"
 - "./examples/golf_handicap/src/glade/Score.glade"
@@ -248,7 +249,7 @@ files:
 - "./src/main/glade/VR_Remote_Gem_Tree.glade"
 - "./src/version.rb"
 - "./vr"
-homepage: http://www.visualruby.net/
+homepage: ''
 licenses:
 - MIT
 metadata: {}
@@ -267,8 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: nowarning
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Create IDE designed to make great GUIs with Ruby