visualruby 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 471487097b28ac84f9b91f6cdbded31e11f871b7
-  data.tar.gz: 1b62e86d75a8be09a9b82c75138470b9a5c2865f
+  metadata.gz: ea28638629e02704ffff8783f60a749017345073
+  data.tar.gz: 4b3d828f553f07c3d39abf83a16222027220856a
 SHA512:
-  metadata.gz: db3f477a72929229e187c0a06565c3bf697a2474705869be6a708a3d42010c95d58c3fc7157630d946b124db750ffa254f0bfd5dae670b37855374862ab2f320
-  data.tar.gz: 4ea888126ac4ba0b4a4c2ae7fd386db675a556e496078be5255719240f6c01bda83a1e467e1ff023d939996471373151be551ba28d452f21b1c1dd54963438b5
+  metadata.gz: afd365c9fbbf5615f28083f63f50e4aac7d9194b5b5205d2665c485b1f2f358d41ef2e97401a125c116cb96663b0c84d405b369d7953250550c3b3bef3728565
+  data.tar.gz: 0c62889a4aa774e79094208fc3c68ef9e4798d91bdda0fb08df4c4e616e0efd02941a3093e2348fc7fe8a0be1f906fe465562365e167f01899ed94393c1a4824

data/.vr_settings.yaml

@@ -15,15 +15,16 @@ open_files:
 - "/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/ActLikeAHash.rb"
+- "/home/eric/vrp/vr3/lib/treeview/FileTreeView.rb"
+- "/home/eric/vrp/vr3/src/editor/VR_Document.rb"
 open_folders:
 - "/home/eric/vrp/vr3"
-- "/home/eric/vrp/vr3/lib"
 - "/home/eric/vrp/vr3/site"
 - "/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_Main.rb"
+current_line: 218
 rdoc_command_line: yardoc lib - site/*.*
 builder: !ruby/object:Gtk::Builder {}
 top_level_window: false

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_file: "/home/eric/vrp/vr3/examples/golf_handicap/src/Score.rb"
+current_line: 38
 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/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_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.2.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualruby
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Eric Cunningham
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - "."
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -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"