visualruby 3.0.15 → 3.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3baa011870421fc57b9bbe678959e008841b06ff
-  data.tar.gz: d2b8d5f1b33cc702a107252d47148261e13db5b6
+  metadata.gz: e2434c8926f2476bec1c11354108a4b320cd4583
+  data.tar.gz: 5e1d3930bd198f21c7dd1a306f8b410815c6411d
 SHA512:
-  metadata.gz: 05870a7169f61f20ee82266832d0764c0d17ddf725865ff34b335cfe7f00b516c4c188d25f8adbd484ff46deae7f32214870a80bad107ef89184c999ae4b447d
-  data.tar.gz: fafa3284aee0dc41b01be20926c415a25dbf07065fe7551f00b94c96c9dd8d7b67e74f396824edd0d64afce787ee7f218847f2a76b9ab811202714f7ec7f04e0
+  metadata.gz: a3d2196193f960088d68eddacef6f32dd231e61d5bccd91898bceda3e96699255e656712b4895d442e8cee86eb718e7c207ff8b8d865347472da07cd695c5126
+  data.tar.gz: f6ee408bcdc3e445ae952acdb6568f1870cf679e322c1a71f1f753fe41015e3307ff19a949f79f49e620ed5b409bf28c74df7a91126f8ebd12c1d04610538051

data/.vr_settings.yaml

@@ -1,37 +1,27 @@
 --- !ruby/object:VR_ENV
-vr_yaml_file: ".vr_settings.yaml"
-width: 1308
-height: 761
-panel_pos: 360
-notebook_panel_position: 400
+vr_yaml_file: "/home/eric/vrp/vr3/.vr_settings.yaml"
+width: 1364
+height: 691
+panel_pos: 297
+notebook_panel_position: 458
 run_command_line: ruby vr
 open_files:
+- "/home/eric/vrp/vr3/yard_hack/common.css"
+- "/home/eric/vrp/vr3/src/editor/VR_Tabs.rb"
+- "/home/eric/vrp/vr3/lib/Alert.rb"
+- "/home/eric/vrp/vr3/lib/GladeGUI.rb"
+- "/home/eric/vrp/vr3/src/main/NewProjectGUI.rb"
+- "/home/eric/vrp/vr3/src/main/VR_Main.rb"
 - "/home/eric/vrp/vr3/src/main/VR_File_Tree.rb"
-- "/home/eric/vrp/vr3/src/main/VR_Tools.rb"
-- "/home/eric/vrp/vr3/src/main/OpenProject.rb"
 - "/home/eric/vrp/vr3/vr.gemspec"
-- "/home/eric/vrp/vr3/lib/DragDrop.rb"
-- "/home/eric/vrp/vr3/site/Quick_Start.md"
-- "/home/eric/vrp/vr3/site/ActiveRecord_Totorial.md"
-- "/home/eric/vrp/vr3/site/Child_Windows_Tutorial.rdoc"
-- "/home/eric/vrp/vr3/site/Download.md"
-- "/home/eric/vrp/vr3/site/Generate_RDocs_Tutorial.rdoc"
-- "/home/eric/vrp/vr3/site/Help_Contact_Info.rdoc"
-- "/home/eric/vrp/vr3/site/ListView_Tutorial.rdoc"
-- "/home/eric/vrp/vr3/site/README.md"
-- "/home/eric/vrp/vr3/site/RubyGems_Tutorial.rdoc"
-- "/home/eric/vrp/vr3/site/Screen_Shots.rdoc"
-- "/home/eric/vrp/vr3/site/Signals_Tutorial.rdoc"
 open_folders:
 - "/home/eric/vrp/vr3"
-- "/home/eric/vrp/vr3/lib"
-- "/home/eric/vrp/vr3/lib/oinspect"
-- "/home/eric/vrp/vr3/site"
 - "/home/eric/vrp/vr3/src"
+- "/home/eric/vrp/vr3/src/editor"
 - "/home/eric/vrp/vr3/src/main"
-- "/home/eric/vrp/vr3/src/main/glade"
-current_file: "/home/eric/vrp/vr3/site/Screen_Shots.rdoc"
-current_line: 19
+- "/home/eric/vrp/vr3/yard_hack"
+current_file: "/home/eric/vrp/vr3/vr.gemspec"
+current_line: 21
 rdoc_command_line: yardoc lib - site/*.*
 builder: !ruby/object:Gtk::Builder {}
 top_level_window: false

data/lib/ActLikeAHash.rb

@@ -0,0 +1,12 @@
+# @private
+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/Alert.rb

@@ -34,7 +34,7 @@ module VR
 
       @builder[:button_no].show if @flags[:button_no]
       @builder[:button_cancel].show if @flags[:button_cancel]
-      set_glade_hash(@flags)
+       set_glade_hash(@flags)
     end
 
     def button_yes__clicked(but)
@@ -102,9 +102,11 @@ end
 # There are many examples in the "alert_box" example project. 
 
 def alert(message, options = {})
-  @answer = VR::Alert::DialogAnswer.new()
-  VR::Alert.new(message, @answer, options).show_glade(options[:parent])
-  return @answer.answer 
+  @answer_from_user = VR::Alert::DialogAnswer.new()
+  VR::Alert.new(message, @answer_from_user, options).show_glade(options[:parent])
+  ans = @answer_from_user.answer
+  remove_instance_variable(:@answer_from_user)
+  return ans 
 end
 
 

data/lib/GladeGUI.rb

@@ -84,7 +84,8 @@
 # set_glade_variables() method.)
 module GladeGUI
 
-  # @attribute A Builder object that holds references to everything from the galde form.
+# @!attribute [rw] builder
+#   @return [Gtk::Builder] The builder that holds references to everything in the glade form.
   attr_accessor :builder
 
 ##
@@ -163,7 +164,7 @@ end
       if @builder
         @builder.objects.each do |obj|
           next unless obj.respond_to?(:builder_name)
-          if obj.builder_name == glade_name or obj.builder_name =~ /^(?:#{class_name(self)}\.|)#{glade_name}\[\d+\]$/ #arrays
+          if obj.builder_name == glade_name or obj.builder_name =~ /^(?:#{class_name(self)}\.|)#{glade_name}\[[a-zA-Z\d_-]+\]$/ #arrays
             obj.signal_connect(signal_name) { |*args| method(meth.to_sym).call(*args) } 
           end
         end
@@ -239,46 +240,47 @@ end
     return if not defined? @attributes
     obj.attributes.each_pair { |key, val| fill_control(class_name(obj) + "." + key, val) }
   end
-
+
+# Matches names in glade form to keys in a Hash.  
+# @param [Hash] hash The hash with keys that match the names in the glade form.
   def set_glade_hash(hash)
     return unless hash.is_a?(Hash)
     hash.each { |key,val| fill_control( key.to_s, val.to_s) }
   end
 
-#Populates the glade form from the instance variables of the class.
-#This works for Gtk:Button, Gtk::Entry, Gtk::Label and Gtk::Checkbutton.
-#So instead of having to assign each widget a value:
+# Populates the glade form from the instance variables of the class.
+# So instead of having to assign each widget a value:
 #
-#    @builder["DataObjectGUI.name"].text = @name
-#    @builder["DataObjectGUI.address"].text = @address
-#    @builder["DataObjectGUI.email"].text = @eamil
-#    @builder["DataObjectGUI.phone"].text = @phone
+#    @builder["name"].text = @name
+#    @builder["address"].text = @address
+#    @builder["email"].text = @eamil
+#    @builder["phone"].text = @phone
 #
-#you can write one line of code:
+# you can write one line of code:
 #
 #  set_glade_variables()
 #
-#The optional parameter is seldom used because you usually want the
-#glade form to populate from the calling class.  If you passed another object,
-#the form would populate from it.
+# The optional parameter is seldom used because you usually want the
+# glade form to populate from the calling class.  If you passed another object,
+# the form would populate from it.
 #
-#obj - type Object
+# obj - type Object
 #
-
-
-    
   def set_glade_variables(obj = self)
-#    set_glade_hash(obj) if obj.is_a?(Hash) 
     obj.instance_variables.each do |name|
       name = name.to_s #ruby 1.9 passes symbol!
-      v = obj.instance_variable_get(name)
-      x = v.to_s
-      if v.class == Array 
-        (0..v.size-1).each do |i|
-          fill_control(class_name(obj) + "." + name.gsub("@", "") + "[" + i.to_s + "]", v[i] )
-        end  
+      v = obj.instance_variable_get(name)
+      name = name.gsub('@', '')
+      if v.is_a?(Array) 
+        v.each_index do |i|
+          fill_control("#{name}[#{i.to_s}]", v[i] )
+        end
+      elsif v.is_a?(Hash)
+        v.each_pair do |key, val|
+          fill_control("#{name}[#{key.to_s}]", val)
+        end        
       else
-        fill_control(class_name(obj) + "." + name.gsub("@", ""), v)
+        fill_control(name, v)
       end
     end
   end
@@ -286,13 +288,13 @@ end
 
   def fill_control(glade_name, val) 
     control = @builder[glade_name]
-    control_name = glade_name.split(".")[1]
-    control ||= @builder[control_name] if control_name
-    case control
+    return unless control
+    case control  # order matters-- subclasses?
       when Gtk::Window then control.title = val
       when Gtk::CheckButton then control.active = val
       when Gtk::TextView then control.buffer.text = val.to_s
-      when Gtk::Entry then control.text = val.to_s
+      when Gtk::Entry then control.text = val.to_s
+      when Gtk::ColorButton then control.color = Gdk::Color.parse(val.to_s)
       when Gtk::FontButton then control.font_name = val.to_s
       when Gtk::LinkButton then control.uri = control.label = val.to_s 
       when Gtk::Label, Gtk::Button then control.label = val.to_s
@@ -301,9 +303,22 @@ end
       when Gtk::ProgressBar then control.fraction = val.to_f
       when Gtk::Calendar then control.select_month(val.month, val.year) ; control.select_day(val.day) ; control.mark_day(val.day)
       when Gtk::Adjustment then control.value = val.to_f
-      when Gtk::ScrolledWindow, Gtk::Frame, Gtk::VBox, Gtk::HBox then control.add(val)
+      when Gtk::ScrolledWindow, Gtk::Frame, Gtk::VBox, Gtk::HBox then control.add(val)
+      when Gtk::ComboBoxText then try_to_select_text_in_combobox(control, val.to_s)
     end      
-  end
+  end
+
+  def try_to_select_text_in_combobox(cb, text)
+    i = 0
+    cb.model.each do |model, path, iter|
+      if iter[0] == text
+        cb.active = i
+        return
+      end  
+      i = i + 1
+    end
+  end
+
 
 #
 # Populates your instance variables from the glade form.
@@ -327,25 +342,48 @@ end
 # @param [Object] obj Any object with instance variables with same names as in galde form.
 # @return none 
   def get_glade_variables(obj = self)
-    obj.instance_variables.each do |v|
-      v = v.to_s  #fix for ruby 1.9 giving symbols
-      control = @builder[class_name(obj) + v.gsub("@", ".")]
-      control ||= @builder[v.gsub("@", "")]
-      case control
-        when Gtk::CheckButton then obj.instance_variable_set(v, control.active?)
-        when Gtk::Entry then obj.instance_variable_set(v, control.text)
-        when Gtk::TextView then obj.instance_variable_set(v, control.buffer.text)
-        when Gtk::FontButton then obj.instance_variable_set(v, control.font_name) 
-        when Gtk::Label, Gtk::Button then obj.instance_variable_set(v, control.label)
-        when Gtk::SpinButton then obj.instance_variable_set(v, control.value)
-        when Gtk::Image then obj.instance_variable_set(v, control.file)
-        when Gtk::ProgressBar then obj.instance_variable_set(v, control.fraction)
-        when Gtk::Calendar then obj.instance_variable_set(v, DateTime.new(*control.date))
-        when Gtk::Adjustment then obj.instance_variable_set(v, control.value)
-      end        
+    obj.instance_variables.each do |var_name|
+      var = obj.instance_variable_get(var_name)
+      var_name = var_name.to_s.gsub("@", "")  #fix for ruby 1.9 giving symbols
+      if var.is_a? Hash
+        var.each_pair do |key, val|
+          if glade_value = get_control_value("#{var_name}[#{key.to_s}]")
+            var[key] = glade_value
+          end 
+        end
+        obj.instance_variable_set("@"+ var_name, var)
+      elsif var.is_a? Array
+        var.each_index do |i|
+          if glade_value = get_control_value("#{var_name}[#{i.to_s}]")
+            var[i] = glade_value
+          end
+        end
+        obj.instance_variable_set("@"+ var_name, var)
+      else
+        glade_value = get_control_value(var_name)
+        if glade_value
+          obj.instance_variable_set("@"+ var_name, glade_value)
+        end 
+      end
     end
   end
-
+
+  def get_control_value(glade_name)
+    return unless control = @builder[glade_name]
+    case control
+      when Gtk::CheckButton then control.active?
+      when Gtk::Entry then control.text
+      when Gtk::TextView then control.buffer.text
+      when Gtk::FontButton then control.font_name 
+      when Gtk::ColorButton then control.color.to_s[0..2] + control.color.to_s[5..6] + control.color.to_s[9..10] 
+      when Gtk::Label, Gtk::Button then control.label
+      when Gtk::SpinButton, Gtk::Adjustment then control.value
+      when Gtk::Image then control.file
+      when Gtk::ProgressBar then control.fraction
+      when Gtk::Calendar then DateTime.new(*control.date)
+      when Gtk::ComboBoxText then control.active_text
+    end  
+  end
 
   def get_glade_active_record(obj) 
     return if not defined? @attributes
@@ -367,8 +405,7 @@ end
     end
   end
 
-
-# Ignore, just helps figure out name of class including GladeGUI
+# @private
   def self.included(obj)
     temp = caller[0].split(":") #correct for windows  C:\Users\george etc.
     caller_path_to_class_file, = temp[0].size == 1 ? temp[0] + ":" + temp[1] : temp[0] 
@@ -395,9 +432,8 @@ end
     parse_signals()
     set_glade_all()
     @builder[:window1].show  #show_all can't hide widgets in before_show
- #   @builder[:window1].add_events(Gdk::EventMask.new(:key_press))
     @top_level_window = Gtk.main_level == 0 ? true : false
-    Gtk.main if @top_level_window or @builder[:window1].modal?  #need new Gtk.main for blocking!
+    Gtk.main if @top_level_window or @builder[:window1].modal?  # need new Gtk.main for blocking!
   end
 
 # Called when window is destroyed when you execute: <tt>@builder[:window1].destroy</tt>
@@ -417,6 +453,18 @@ end
     oinspect
   end
 
+  # retrieves the key inside a glade control name.  Useful when handling events where
+  # the control name is returned, and you need to match it to an actual hash.  
+  # @example
+  #   # Widget in glade form has name of "button[5]"
+  #   var = @builder["button[5]"]
+  #   extract_key(var) => "5"
+  # @param [String] widget Name for the widget in the glade form.
+  # @return [String] the key value.
+  def extract_key(widget)
+    widget.builder_name[/\[.+?\]/]
+  end
+
 
 #
 #  private def active_record_valid?(show_errors = true)

data/lib/SavableClass.rb

@@ -7,7 +7,8 @@ module VR
     elsif flags[:class]
       me = flags[:class].new()
     end
-    me.instance_variable_set(:@vr_yaml_file, flags[:file_name])
+    file_name = File.expand_path(flags[:file_name])
+    me.instance_variable_set(:@vr_yaml_file, file_name)
     me.defaults() if me.respond_to?(:defaults)
     VR::save_yaml(me)
     return me
@@ -16,8 +17,9 @@ module VR
   # todo create folders if don't exist
   def self.save_yaml(obj, filename = nil)
     filename ||= obj.instance_variable_get(:@vr_yaml_file) 
-    data = YAML.dump(obj)
-    File.open(filename, "w") {|f| f.puts(data)}
+    dirname = File.dirname(filename)
+    FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+    File.open(filename, "w") {|f| f.puts(obj.to_yaml)}
   end
 
 end

data/lib/oinspect/ObjectInspectorGUI.rb

@@ -30,16 +30,16 @@ module VR::ObjectInspector
 
 end
 
-# @param [Object] obj Any object that you want to display.
-# @return none.
+
 # Displays object on screen and halts the program.  Anywhere in your code you can halt 
 # the execution, and display an object in a window like this:
 #   alert anyobject
 #
 # Also, at any window, if you press the F8 key, the object inspector will run.  Try it.
-
 # http://visualruby.net/img/object_inspector.jpg
 #
+# @param [Object] obj Any object that you want to display.
+# @return none.
 def oinspect(obj=self)
   VR::ObjectInspector::ObjectInspectorGUI.new(obj).show_glade()
 end

data/lib/treeview/IterMethods.rb

@@ -18,12 +18,19 @@ module VR::ViewCommon
   #  
     
       def [](col_id)
-        get_value(id(col_id))
+        if col_id.is_a? Fixnum
+          super
+        else
+          get_value(id(col_id))
+        end
       end
 
       def []=(col_id,val)
-        i = id(col_id)
-        set_value(i, val)
+        if col_id.is_a? Fixnum
+          super(col_id, val)
+        else
+          super(id(col_id), val)
+        end
       end
 
   #  The id() method translates visualruby's colum ID symbols into integers that

data/my_yard.yaml

@@ -0,0 +1,20 @@
+--- !ruby/object:MyYard
+project_root: "/home/eric/vrp/vr3"
+output_dir: doc
+theme: visualruby
+template: default
+files: lib/**/*.rb
+extra_files: site/*.*
+exclude: ''
+include_public: true
+include_private: false
+include_protected: false
+no_private: true
+export_db: true
+title: Visual Ruby
+vr_yaml_file: "/home/eric/vrp/vr3/my_yard.yaml"
+main: index.html
+builder: !ruby/object:Gtk::Builder {}
+top_level_window: true
+answer: !ruby/object:VR::Alert::DialogAnswer
+  answer: true

data/src/editor/VR_Document.rb

@@ -4,21 +4,23 @@ class VR_Document < GtkSource::View
   include GladeGUI
   include VR_TextViewCommon
   
-
-  attr_accessor :full_path_file  
+  attr_accessor :full_path_file, :title  
 
   def initialize(full_path_file, title_label, main)
     @main = main
     super()
-    @title = title_label #reference to label on tab
-    reload_from_disk(full_path_file) 
+    @title = title_label #reference to label on tab
+    @full_path_file = full_path_file
+    reload_from_disk() 
     hilight_current_line = true
     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.guess_language(full_path_file) 
-    buffer.language = lang
+    auto_indent = true
+    if ["", ".gemspec", ".erb"].include?(File.extname(full_path_file)) 
+      buffer.language = GtkSource::LanguageManager.new.get_language("ruby")
+    else  
+      buffer.language = GtkSource::LanguageManager.new.guess_language(full_path_file)
+    end
     buffer.highlight_syntax = true
     buffer.highlight_matching_brackets = false
     @hilight = buffer.create_tag("hilight", { "background" => "#FFF0A0" })
@@ -31,14 +33,6 @@ 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 update_style()
     override_font(Pango::FontDescription.new($VR_ENV_GLOBAL.font_name))
     tab_array = Pango::TabArray.new(1, true)
@@ -46,11 +40,9 @@ class VR_Document < GtkSource::View
     set_tabs(tab_array)
   end
 
-  def reload_from_disk(fn = @full_path_file)
-    @full_path_file = fn
-    @title.label = File.basename(@full_path_file) 
+  def reload_from_disk()
     buffer.text = File.open(@full_path_file, "r").read if File.file?(@full_path_file.to_s) #protect against nil to_s        
-     buffer.modified = false
+    buffer.modified = false
     @modified_time = mod_time()
   end
 
@@ -66,22 +58,6 @@ class VR_Document < GtkSource::View
       reload_from_disk()
     end 
     return false #abort!
-  end
- 
-
-  def try_to_save(ask = true)
-    return false if not modified_time_matches()
-    return true if empty?
-    if (@title.label == "Untitled")
-      return save_changes? 
-    elsif (buffer.modified? and ask)  
-      return save_changes? 
-    elsif buffer.modified?
-      write_to_disk()
-      return true
-    else
-      return true
-    end    
   end
 
   def write_to_disk(fn = @full_path_file)
@@ -93,41 +69,9 @@ class VR_Document < GtkSource::View
     return true  
   end
 
-  def save_changes?
-    answer = alert "Save chages to:  <b> #{File.basename(@full_path_file)}</b> ?",
-              parent: @main, 
-              button_yes: "Save Changes", button_no: "Discard Changes",  
-              headline: "Save Changes?", button_cancel: "Cancel"
-    if answer == true # save
-      return @title.label == "Untitled" ? save_as() : write_to_disk()      
-    elsif answer == false # Discard Changes
-      reload_from_disk()
-      return true #continue without saving
-    end
-    return false #abort!  
-  end
-
-
-
-#todo update file tree, parent window?
-  def save_as()  # returns false or complete file name.
-    dialog = Gtk::FileChooserDialog.new(
-              title: "Save File As...",
-              parent: @main.builder[:window1],
-              action: :save,
-              buttons: [["_Cancel", :cancel], ["_Save", :accept]])
+
 
-     dialog.current_folder = File.dirname(@full_path_file)
-    dialog.current_name = VR_Document.get_class_title(buffer.text) 
-    resp = dialog.run 
-    dialog.hide
-    if resp == :accept
-      write_to_disk(dialog.filename)
-      @main.file_tree.refresh()
-      return true
-    end 
-    return false
-  end
+
 
  def jump_to_line(line_num, search_str = nil)
     while (Gtk.events_pending?)

data/src/editor/VR_Tabs.rb

@@ -5,31 +5,94 @@ class VR_Tabs < Gtk::Notebook
 
   include VR_TabSearch
 
-  def initialize(main)
+  def initialize(main)
     super()
-    @docs = Array.new
+    @docs = []
     @main = main
-    @pix_close = Gdk::Pixbuf.new(File.dirname(__FILE__) + '/../../img/close.png')
-    @close_filename = File.dirname(__FILE__) + '/../../img/close.png'
-    self.scrollable = true #after super
+    @x_img = File.dirname(__FILE__) + '/../../img/close.png'
+    self.scrollable = true #after super
     self.expand = true
   end
 
+#todo update file tree, parent window?
+  def save_as()  # returns false or complete file name.
+    dialog = Gtk::FileChooserDialog.new(
+              title: "Save File As...",
+              parent: @main.builder[:window1],
+              action: :save,
+              buttons: [["_Cancel", :cancel], ["_Save", :accept]])
+    dialog.current_folder = File.dirname(@docs[page].full_path_file)
+    dialog.current_name = VR_Document.get_class_title(@docs[page].buffer.text) 
+    resp = dialog.run 
+    dialog.hide
+    if resp == :accept
+      @docs[page].write_to_disk(dialog.filename)
+      destroy_tab()
+      clear_events
+      load_tab(dialog.filename)
+      clear_events
+      @main.file_tree.refresh()
+      return true
+    end 
+    return false
+  end
+
+  def save_changes?
+    answer = alert "Save chages to:  <b> #{File.basename(@docs[page].full_path_file)}</b> ?",
+              parent: @main, 
+              button_yes: "Save Changes", button_no: "Discard Changes",  
+              headline: "Save Changes?", button_cancel: "Cancel"
+    if answer == true # save
+      if @docs[page].title.label == "Untitled"
+        return save_as() 
+      else
+        return @docs[page].write_to_disk()
+    end      
+    elsif answer == false # Discard Changes
+      @docs[page].reload_from_disk()
+      return true #continue without saving
+    end
+    return false #abort!  
+  end
+
+  def try_to_save(ask = true)
+    return false if not @docs[page].modified_time_matches()
+    return true if @docs[page].empty?
+    if (@docs[page].title.label == "Untitled")
+      return save_changes? 
+    elsif (@docs[page].buffer.modified? and ask)  
+      return save_changes? 
+    elsif @docs[page].buffer.modified?
+      @docs[page].write_to_disk()
+      return true
+    else
+      return true
+    end    
+  end
+
+
   def update_style_all()
     @docs.each { |doc| doc.update_style() }
   end
 
-  def try_to_save_all(flags)
+  # Tries to save and/or close all open documents
+  # @param [Hash] flags Optiions
+  # @option [Boolean] ask Whether or not to ask to save or save without asking.
+  # @option [Boolean] close Close tab when finished
+  # @option [String] folder operate only on folders matching this string.  Default = "/" 
+  def try_to_save_all(flags)
     ask = flags[:ask]
-    passed = true 
-    @docs.each do |doc|
-      unless doc.try_to_save(ask)
-        passed = false
-      end
-    end  
-    (n_pages).times { destroy_tab() }  if flags[:close]
-    return passed  
-  end
+    folder ||= "/"
+    passed = true 
+    (0..n_pages-1).each do |i|
+      page = i
+      unless try_to_save(ask)
+        passed = false
+      end
+    end  
+    (n_pages).times { destroy_tab() }  if flags[:close]
+    return passed  
+  end
 
 ##todo update file_tree!
 #  def try_to_save_all(ask = true)
@@ -46,8 +109,8 @@ class VR_Tabs < Gtk::Notebook
 
 
   def switch_to(path)
-    i = @docs.index{ |d| d.full_path_file == path }
-    return false if i.nil?  
+    i = tab_number(path)
+    return false if i.nil?  
     self.page = i if i != self.page
     return true
   end  
@@ -59,18 +122,18 @@ class VR_Tabs < Gtk::Notebook
     end
   end
 
-  def load_tab(full_path_file = Dir.pwd + "/Untitled")
-    full_path_file = Dir.pwd + "/Untitled" if full_path_file == ""
+  def load_tab(full_path_file = Dir.pwd + "/Untitled")
     return if switch_to(full_path_file) 
+    return unless File.exist?(full_path_file) or full_path_file == Dir.pwd + "/Untitled"
     box = Gtk::EventBox.new
     tab = Gtk::Box.new(:horizontal)
-    img = Gtk::Image.new(:pixbuf => @pix_close)
+    img = Gtk::Image.new(:file => @x_img)
     box.add(img)
     title = Gtk::Label.new(File.basename(full_path_file))
     tab.pack_start(title, :expand=>true, :fill=>true, :padding=>2)
-    tab.pack_start(box)
+    tab.pack_start(box)
     tab.show_all #needed
-    text = VR_Document.new(full_path_file, title, @main)
+    text = VR_Document.new(full_path_file, title, @main)
     child = Gtk::ScrolledWindow.new
     child.add(text)
     box.signal_connect("button_release_event") {remove_id(text.object_id)}
@@ -78,34 +141,41 @@ class VR_Tabs < Gtk::Notebook
     if @docs.size == 1 and @docs[0].buffer.text.strip == "" 
       @docs[0] = text
       self.remove_page(0)
-    end
+    end
     child.show_all #needed
     append_page(child, tab)  
-    self.page = self.n_pages - 1
-    @docs[self.page] = text
+    self.page = self.n_pages - 1
+    @docs[self.page] = text
   end  
   
   #used when little 'x' image is clicked to close.
   def remove_id(object_id)
-    i = @docs.index { |doc| doc.object_id == object_id }
-    if @docs[i].try_to_save(true)
-      destroy_tab(i) 
+    i = @docs.index { |doc| doc.object_id == object_id }
+    page = i
+    clear_events
+    if try_to_save(true)
+      destroy_tab(i) 
     end
   end
   
   #if its there, destroys it
   def destroy_file_tab(file_name)
-    destroy_tab() if switch_to(file_name)
+    destroy_tab tab_number(file_name)
   end
 
-# this spits out a bunch of warnings on remove_page
+  def tab_number(file_name)
+    @docs.index{ |d| d.full_path_file == file_name}    
+  end
+
+# this spits out a bunch of warnings on remove_page.  Changing the page number
+# stops the warnings.
   def destroy_tab(tab = self.page)
-    self.page = self.page - 1 # stops some warnings
-    VR_Tools.clear_events
-#    self.set_tab_label(get_nth_page(tab), nil)
-    self.remove_page(tab) 
-    VR_Tools.clear_events  
-    @docs.delete_at(tab)
+    return unless tab
+    self.page = self.page - 1 # stops some warnings
+    clear_events
+    @docs.delete_at(tab)
+#    self.set_tab_label(get_nth_page(tab), nil)   
+    self.remove_page(tab)  # causes warinings nothing I can do!
     load_tab() if @docs.empty?
   end
 
@@ -114,7 +184,7 @@ class VR_Tabs < Gtk::Notebook
   end
 
   def open_file_names(ar)
-   ar.each { |fn| load_tab(fn) if File.file?(fn) and fn.include? Dir.pwd}
+   ar.each { |fn| load_tab(fn) if File.file?(fn) and fn.include? Dir.pwd}
    load_tab() if @docs.empty?
   end
 

data/src/main/NewProjectGUI.rb

@@ -5,12 +5,11 @@ class NewProjectGUI
 
   def initialize(parent)
     @parent = parent
-    @projects_home = $VR_ENV_GLOBAL.projects_home + "/"
   end
 
   def buttonCreate__clicked(*args)
     fn = @builder["entryFolderName"].text
-    fn = fn.gsub(/[^\w\.\/]/, '_')
+    fn = fn.gsub(/[^\w\.\/\-]/, '_')
     path = File.join($VR_ENV_GLOBAL.projects_home, fn)
     return if fn.length < 2 
     unless File.directory?(path)

data/src/main/OpenProject.rb

@@ -10,9 +10,9 @@ class OpenProject
 
   def before_show
     @ftv = ProjectTree.new()
+    @ftv.show
     @ftv.set_show_expanders(false)
     @builder["view"].add(@ftv)
-    @ftv.visible = true
   end
 
   def ftv__cursor_changed(*a)
@@ -46,14 +46,23 @@ class OpenProject
   end
 
   def buttonOpen__clicked(*a)
+      return unless row = @ftv.selected_rows.first
+      test_file = File.join(row[:path], VR_ENV::SETTINGS_FILE)
+      if File.exists?(test_file) 
+        @parent.proj_path = row[:path]
+        buttonCancel__clicked
+      else
+        @ftv.expand_or_collapse_folder()
+      end
+  end
+
+ def buttonNewWindow__clicked(*a)
       return unless row = @ftv.selected_rows.first
       test_file = File.join(row[:path], VR_ENV::SETTINGS_FILE)
       if File.exists?(test_file) 
         VR_Tools.popen("vr #{row[:path]}")
-#         @parent.proj_path = row[:path]
         buttonCancel__clicked
       else
-#        alert("This is not a visualruby project.  It's a folder that holds visualruby projects.", :parent=>self, :width=>400)
         @ftv.expand_or_collapse_folder()
       end
   end

data/src/main/VR_File_Tree.rb

@@ -7,8 +7,7 @@ class VR_File_Tree < VR::FileTreeView
     super(Dir.pwd,icon_path)
     @main = main
     @api = RubygemsAPI.new
-    load_glade()
-#    set_show_expanders(false)
+    load_glade() # loads menus
   end
 
   def self__row_activated(*args)
@@ -123,14 +122,19 @@ class VR_File_Tree < VR::FileTreeView
   def self__key_press_event(view, evt)
     return unless evt.keyval == 65535 #delete
     return unless file_name = get_selected_path()
-    return unless alert("Delete:   <b>" + File.basename(file_name) + "</b> ?" , :button_yes => "Delete", :button_no=>"Cancel", :parent=>self, :headline => "Delete FIle?")  
-    if File.file?(file_name)
-      @main.tabs.destroy_file_tab(file_name)
-      File.delete(file_name)
-    elsif File.directory?(file_name) and file_name != Dir.pwd #root!
-      FileUtils.remove_dir(file_name, true)
-    end
-    delete_selected()
+    return unless alert("Delete:   <b>" + File.basename(file_name) + "</b> ?" , 
+        :button_yes => "Delete", :button_no=>"Cancel", :parent=>self, :headline => "Delete File?")  
+    if File.exist?(file_name) and file_name != Dir.pwd #root!
+      delete_me =  @main.tabs.docs.select { |d| d.full_path_file.start_with?(file_name) }
+      delete_me.each { |d| @main.tabs.destroy_file_tab(d.full_path_file) }
+      delete_selected()
+#      @main.tabs.destroy_file_tab(file_name)
+      #this is where the nasty error occurs.  If you save_as a file, then delete the old
+      # one, the following line crashes the prgogram.
+#      @main.file_tree.model.clear
+      FileUtils.rm_rf(file_name)
+    end
+
   end
 
 

data/src/main/VR_Main.rb

@@ -11,20 +11,20 @@ class VR_Main
   end
 
   def before_show
-
-    # there must be a visualruby directory:
+
+    # there must be a visualruby directory:
     required_project = File.join(ENV["HOME"],"","visualruby", "examples","alert_box")
     menuInstallExamples__activate if not File.directory?(required_project)
-
+
     # load global settings (requires /home/visuaruby folder exists
     $VR_ENV_GLOBAL = VR::load_yaml(:class => VR_ENV_GLOBAL, :file_name => VR_ENV_GLOBAL::GLOBAL_SETTINGS_FILE)
-
+
     # try to open right project
-    if not project_valid?(@proj_path) 
+    if not project_valid?(@proj_path) 
       if not project_valid?($VR_ENV_GLOBAL.default_project)
-        $VR_ENV_GLOBAL.default_project = required_project
-        VR::save_yaml($VR_ENV_GLOBAL) 
-      end
+        $VR_ENV_GLOBAL.default_project = required_project
+        VR::save_yaml($VR_ENV_GLOBAL) 
+      end
       @proj_path = $VR_ENV_GLOBAL.default_project       
     end
 
@@ -50,9 +50,9 @@ class VR_Main
     @remote_gem_tree = VR_Remote_Gem_Tree.new(self)
     @builder["scrolledRemoteGems"].add(@remote_gem_tree)
     @remote_gem_tree.show
-
-    @splash[:window1].destroy 
-    Gtk.main_quit
+
+    @splash.destroy 
+    Gtk.main_quit
   
     unless project_valid?(@proj_path)
       toolOpenFolder__clicked # should never gets here.
@@ -134,7 +134,7 @@ class VR_Main
   end
 
   def menuSaveAs__activate(*a)
-    @tabs.docs[@tabs.page].save_as()
+    @tabs.save_as()
   end
 
   def toolRefresh__clicked(*a)
@@ -144,27 +144,27 @@ class VR_Main
       when 2 then @remote_gem_tree.refresh()
     end
   end
-
-  def toolRDoc__clicked(*a)
-    return unless @tabs.try_to_save_all(:ask => false)
-    @shell.buffer.text = $VR_ENV.rdoc_command_line + "\n"
+
+  def toolRDoc__clicked(*a)
+    return unless @tabs.try_to_save_all(:ask => false)
+    @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/index.html.replace", "doc/frames.html") 
-      FileUtils.copy("yard_hack/common.css", "doc/css/common.css")
-    end
-
-  end
-
-  def toolViewRDoc__clicked(*a)
-    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{Dir.pwd}/doc/index.html")    
-  end
+    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/index.html.replace", "doc/frames.html") 
+      FileUtils.copy("yard_hack/common.css", "doc/css/common.css")
+    end
+
+  end
+
+  def toolViewRDoc__clicked(*a)
+    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{Dir.pwd}/doc/index.html")    
+  end
 
   def toolSave__clicked(*a)  # saves open tab 
-    @tabs.docs[@tabs.page].try_to_save(false) # false = don't ask
+    @tabs.try_to_save(false) # false = don't ask
   end  
 
   def menuNewWindow__activate(*a)
@@ -202,21 +202,21 @@ class VR_Main
     VR_Tools.back_up()
   end
 
-  def toolIndent__clicked(*a)
+  def toolIndent__clicked(*a)
     press_key(65289) #tab
   end
 
-  def toolUnIndent__clicked(*a)
+  def toolUnIndent__clicked(*a)
     press_key(65056, :shift_mask) # shift+tab
   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) 
-  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) 
+  end
+
 
   def toolComment__clicked(*a)
     @tabs.docs[@tabs.page].comment()
@@ -316,5 +316,10 @@ class VR_Main
   def menuQuit__activate(*a)   
     @builder[:window1].destroy
   end
+
+  def tabs__switch_page(_self, x, page_num)
+    return unless tab = @tabs.docs[page_num] # needed. sometimes nil
+    @builder[:labelStatus].label = "Project:  #{@proj_path}       File:  #{tab.full_path_file}"
+  end
 
 end

data/src/main/VR_Tools.rb

@@ -1,10 +1,4 @@
 module VR_Tools
-
-  def VR_Tools.clear_events
-    while (Gtk.events_pending?)
-      Gtk.main_iteration
-    end
-  end
 
   def VR_Tools.popen(cmd)
     begin
@@ -15,8 +9,6 @@ module VR_Tools
     end
   end
 
-
-
   def VR_Tools.back_up()
     path = File.join(ENV["HOME"], "visualruby_backup", Dir.pwd.gsub(ENV["HOME"], ""))
     t = Time.now
@@ -48,14 +40,13 @@ module VR_Tools
     main_file = $VR_ENV.run_command_line.split(" ")[1]
     main_path = "."
     bindir = "'.'" #( main_path == "bin") ? "'bin'" : "'#{main_path}', 'bin'" 
-    libdir = "'.'" #(main_path == "lib") ? "'lib'" : "'#{main_path}', 'lib'"
+    libdir = "'lib'" #(main_path == "lib") ? "'lib'" : "'#{main_path}', 'lib'"
     str = <<END
 Gem::Specification.new do |s|
   s.name = "#{File.basename(Dir.pwd).downcase}"  # i.e. visualruby.  This name will show up in the gem list.
   s.version = "0.0.1"  # i.e. (major,non-backwards compatable).(backwards compatable).(bugfix)
-  s.add_dependency "vrlib", ">= 0.0.1"
-  s.add_dependency "gtk2", ">= 0.0.1"
-  s.add_dependency "require_all", ">= 0.0.1"
+  s.add_dependency "visualruby", ">= 3.0.15"
+  s.add_dependency "require_all", ">= 1.2.0"
   s.has_rdoc = false
   s.authors = ["Your Name"] 
   s.email = "you@yoursite.com" # optional

data/src/main/glade/OpenProject.glade

@@ -232,6 +232,19 @@
                         <property name="position">3</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkButton" id="buttonNewWindow">
+                        <property name="label" translatable="yes">Open in New Window</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">4</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>

data/src/main/glade/VR_Main.glade

@@ -32,6 +32,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">New Project</property>
+                        <accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -91,6 +92,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Quit</property>
+                        <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                   </object>
@@ -163,6 +165,7 @@
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Visit visualruby.net for complete tutorials on using Visual Ruby</property>
                         <property name="label" translatable="yes">Online Tutorails</property>
+                        <accelerator key="F1" signal="activate"/>
                       </object>
                     </child>
                     <child>

data/vr

@@ -19,19 +19,26 @@ def load_everything
   require_rel 'lib/'
   require_rel 'src/'
 
-  VR_Main.new(ARGV, @bldr).show_glade()
+  VR_Main.new(ARGV, @splash).show_glade()
 
 end
 
 $root = File.dirname(__FILE__)
  
-@bldr = Gtk::Builder.new
-@bldr << File.join($root, "src", "main", "glade", "Splash.glade")
-@bldr[:image1].file = File.join($root, "img", "splash.png")
-@bldr[:window1].show_all
+@splash = Gtk::Window.new()
+@splash.decorated = false
+img = Gtk::Image.new(file: File.join($root, "img", "splash.png"))
+img.visible = true
+@splash.add(img)
+@splash.show_all
+@splash.position = :center_always
 
 
-GLib::Timeout.add(40) {     
+
+GLib::Timeout.add(40) {
+    while (Gtk.events_pending?)
+      Gtk.main_iteration
+    end     
     load_everything 
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualruby
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.17
 platform: ruby
 authors:
 - Eric Cunningham
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - "."
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -83,7 +83,6 @@ files:
 - "./examples/active_record2/bin/glade/Paycheck.glade"
 - "./examples/active_record2/db/development.sqlite3"
 - "./examples/active_record2/main.rb"
-- "./examples/alert_box/.vr_settings.yaml"
 - "./examples/alert_box/bin/AlertBoxDemo.rb"
 - "./examples/alert_box/bin/glade/AlertBoxDemo.glade"
 - "./examples/alert_box/main.rb"
@@ -142,15 +141,12 @@ files:
 - "./examples/listview_objects/bin/glade/DataObject.glade"
 - "./examples/listview_objects/bin/glade/ListViewObjectsGUI.glade"
 - "./examples/listview_objects/main.rb"
-- "./examples/phantom/.vr_settings.yaml"
 - "./examples/phantom/main.rb"
 - "./examples/phantom/src/MyClass.rb"
 - "./examples/phantom/src/glade/MyClass.glade"
-- "./examples/pop_up/.vr_settings.yaml"
 - "./examples/pop_up/main.rb"
 - "./examples/pop_up/src/MyClass.rb"
 - "./examples/pop_up/src/glade/MyClass.glade"
-- "./examples/settings_file/.vr_settings.yaml"
 - "./examples/settings_file/bin/MainApp.rb"
 - "./examples/settings_file/bin/SavableSettings.rb"
 - "./examples/settings_file/bin/glade/MainApp.glade"
@@ -175,6 +171,7 @@ files:
 - "./img/ruby.png"
 - "./img/splash.png"
 - "./img/unknown.png"
+- "./lib/ActLikeAHash.rb"
 - "./lib/Alert.rb"
 - "./lib/DragDrop.rb"
 - "./lib/GladeGUI.rb"
@@ -207,6 +204,7 @@ files:
 - "./lib/treeview/columns/glade/ImageCol.glade"
 - "./lib/treeview/columns/glade/TextCol.glade"
 - "./lib/vrlib.rb"
+- "./my_yard.yaml"
 - "./skeleton/document/New.glade"
 - "./skeleton/document/NewWindow.rb"
 - "./skeleton/project/.vr_settings.yaml"

data/examples/alert_box/.vr_settings.yaml

@@ -1,19 +0,0 @@
---- !ruby/object:VR_ENV
-vr_yaml_file: ".vr_settings.yaml"
-width: 1329
-height: 753
-panel_pos: 513
-notebook_panel_position: 400
-run_command_line: ruby main.rb
-open_files:
-- "/home/eric/vrp/vr3/examples/alert_box/bin/AlertBoxDemo.rb"
-open_folders:
-- "/home/eric/vrp/vr3/examples/alert_box"
-- "/home/eric/vrp/vr3/examples/alert_box/bin"
-- "/home/eric/vrp/vr3/examples/alert_box/bin/glade"
-current_file: "/home/eric/vrp/vr3/examples/alert_box/bin/AlertBoxDemo.rb"
-current_line: 71
-rdoc_command_line: rdoc
-builder: !ruby/object:Gtk::Builder {}
-top_level_window: false
-settings_file_version: 1

data/examples/phantom/.vr_settings.yaml

@@ -1,22 +0,0 @@
---- !ruby/object:VR_ENV
-vr_yaml_file: ".vr_settings.yaml"
-width: 1102
-height: 611
-panel_pos: 360
-notebook_panel_position: 400
-run_command_line: ruby main.rb
-open_files:
-- "/home/eric/vrp/phantom/main.rb"
-- "/home/eric/vrp/phantom/src/MyClass.rb"
-open_folders:
-- "/home/eric/vrp/phantom"
-- "/home/eric/vrp/phantom/src"
-- "/home/eric/vrp/phantom/src/glade"
-current_file: "/home/eric/vrp/phantom/main.rb"
-current_line: 11
-rdoc_command_line: rdoc -x README
-browser: firefox
-backup_path: "/home/eric"
-tab_spaces: 2
-glade_path: glade-3
-font_name: Monospace 10

data/examples/pop_up/.vr_settings.yaml

@@ -1,19 +0,0 @@
---- !ruby/object:VR_ENV
-vr_yaml_file: ".vr_settings.yaml"
-width: 800
-height: 600
-panel_pos: 360
-notebook_panel_position: 400
-run_command_line: ruby main.rb
-open_files:
-- "/home/eric/vrp/vrx/Untitled"
-open_folders:
-- "/home/eric/vrp/examples/pop_up"
-current_file: "/home/eric/vrp/vrx/Untitled"
-current_line: 1
-rdoc_command_line: rdoc -x README
-browser: firefox
-backup_path: "/home/eric"
-tab_spaces: 2
-glade_path: glade-3
-font_name: Monospace 10

data/examples/settings_file/.vr_settings.yaml

@@ -1,22 +0,0 @@
---- !ruby/object:VR_ENV
-vr_yaml_file: ".vr_settings.yaml"
-width: 1264
-height: 727
-panel_pos: 267
-notebook_panel_position: 444
-run_command_line: ruby main.rb
-open_files:
-- "/home/eric/vrp/vr3/examples/settings_file/main.rb"
-- "/home/eric/vrp/vr3/examples/settings_file/bin/SavableSettings.rb"
-- "/home/eric/vrp/vr3/examples/settings_file/bin/MainApp.rb"
-open_folders:
-- "/home/eric/vrp/vr3/examples/settings_file"
-current_file: "/home/eric/vrp/vr3/examples/settings_file/main.rb"
-current_line: 15
-rdoc_command_line: rdoc -x README
-browser: firefox
-backup_path: "/home/eric"
-tab_spaces: 2
-glade_path: glade-3
-font_name: Monospace 10
-filename: ".vr_settings.yaml"