visualruby 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f68ce5a6041fcc6a57dfaa680f001f3033768de0
-  data.tar.gz: b86743fb4d3dc7395530d0933d5fe0f77f5bc355
+  metadata.gz: 46496d9e3a786ea8b5f5f1b6a89b813b6cd0d09a
+  data.tar.gz: d8876ec02fb0ed6e7b05f31ed7d0737bb3239e16
 SHA512:
-  metadata.gz: ab61293fcd30e0980b50eae9e4335f1bba5331fee18dd01314f460ae9e813f79c156ade41bf837686a85e3c3dd15c7827d76cffb797aef38ef8bec40b45d1b2e
-  data.tar.gz: 92cadfe248f6d67a3c5bc9eca4b7a06b36a4b7891d1b3c92b9af489bc17ae5d7e5962118d026f83ee56a9d151ce978115c84c8c8b8ae3a37b58d63f732cfa617
+  metadata.gz: 030b6c8b25c1312e5360076d557145e68805a0db37ec2a5f36f046485365decd9f6ab0f3611df3fb0c3e68cb1817812e2b1bd72f2f927219c7e999a4768095b1
+  data.tar.gz: 7963567437104f66bd96f322efcf05d1c3c2047c9cc080c3fd81d51758552a74df5aa687d74726baeea0098278c012665dc07ded4825a6de531d7e9d05b8fa1f

data/.vr_settings.yaml

@@ -1,29 +1,19 @@
 --- !ruby/object:VR_ENV
-width: 1364
-height: 691
-panel_pos: 270
-run_command_line: ruby vr
+width: 1261
+height: 720
+panel_pos: 360
+run_command_line: ruby main.rb
 open_files:
-- "/home/eric/vrp/vr3/vr.gemspec"
-- "/home/eric/vrp/vr3/bin/main/VR_Main.rb"
-- "/home/eric/vrp/vr3/bin/main/VR_Tools.rb"
-- "/home/eric/vrp/vr3/bin/main/VR_ENV.rb"
-- "/home/eric/vrp/vr3/bin/main/OpenProject.rb"
-- "/home/eric/vrp/vr3/bin/main/VR_File_Tree.rb"
-- "/home/eric/vrp/vr3/examples/filetreeview/bin/ProjectTree.rb"
-- "/home/eric/vrp/vr3/examples/listview/bin/SongListViewGUI.rb"
-- "/home/eric/vrp/vr3/vrlib/lib/treeview/columns/CellRendererObject.rb"
 - "/home/eric/vrp/vr3/bin/editor/VR_Document.rb"
+- "/home/eric/vrp/vr3/bin/main/VR_Main.rb"
+- "/home/eric/vrp/vr3/vrlib/lib/treeview/FileTreeView.rb"
+- "/home/eric/vrp/vr3/vr.gemspec"
 open_folders:
 - "/home/eric/vrp/vr3"
 - "/home/eric/vrp/vr3/bin"
 - "/home/eric/vrp/vr3/bin/main"
-- "/home/eric/vrp/vr3/vrlib"
-- "/home/eric/vrp/vr3/vrlib/lib"
-current_file: "/home/eric/vrp/vr3/bin/editor/VR_Document.rb"
-rdoc_command_line: rdoc -x README -x /*.glade -x /*.yaml -x /*.gemspec -x /*.css
+current_file: "/home/eric/vrp/vr3/vr.gemspec"
+rdoc_command_line: rdoc -x README
 vr_yaml_file: ".vr_settings.yaml"
-notebook_panel_position: 474
-current_line: 132
-builder: !ruby/object:Gtk::Builder {}
-top_level_window: false
+notebook_panel_position: 400
+current_line: 21

data/bin/editor/VR_Document.rb

@@ -145,29 +145,6 @@ class VR_Document < GtkSource::View
     apply_tag_to_line(line-1, @hilight, nil)
   end
 
-  def indent(spaces)
-    return unless buffer.has_selection?
-    s,e = get_selected_lines()
-    (s..e).each do |i|
-      iter = buffer.get_iter_at(:line => i)
-      buffer.insert(iter, " " * spaces)
-    end
-  end
-
-  def unindent(spaces)
-    return unless buffer.has_selection?
-    s,e = get_selected_lines()
-    (s..e).each do |i|
-      iter, iter_end = get_line_iters(i)
-      if iter_end.offset >= iter.offset + 2
-        iter_end.offset = iter.offset + 2
-        t = buffer.get_text(iter, iter_end, false)
-        buffer.delete(iter, iter_end)
-        buffer.insert(iter,t.lstrip)
-      end
-    end
-  end
-
   def comment()
     return unless buffer.has_selection?
     s,e = get_selected_lines()

data/bin/editor/VR_Tabs.rb

@@ -59,8 +59,9 @@ class VR_Tabs < Gtk::Notebook
     end
   end
 
-  def load_tab(full_path_file = Dir.pwd + "/Untitled")
-   return if switch_to(full_path_file)
+  def load_tab(full_path_file = Dir.pwd + "/Untitled")
+    full_path_file = Dir.pwd + "/Untitled" if full_path_file == ""
+    return if switch_to(full_path_file) 
     box = Gtk::EventBox.new
     tab = Gtk::Box.new(:horizontal)
     img = Gtk::Image.new(:pixbuf => @pix_close)
@@ -79,7 +80,7 @@ class VR_Tabs < Gtk::Notebook
       self.remove_page(0)
     end
     child.show_all #needed
-     append_page(child, tab)  
+    append_page(child, tab)  
     self.page = self.n_pages - 1
     @docs[self.page] = text
   end  
@@ -113,7 +114,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/bin/main/NewProjectGUI.rb

@@ -3,8 +3,6 @@ class NewProjectGUI
 
   include GladeGUI
 
-  attr_accessor :my_var
-
   def initialize(parent)
     @parent = parent
     @projects_home = $VR_ENV_GLOBAL.projects_home + "/"
@@ -13,21 +11,14 @@ class NewProjectGUI
   def buttonCreate__clicked(*args)
     fn = @builder["entryFolderName"].text
     fn = fn.gsub(/[^\w\.\/]/, '_')
-    path = File.join($VR_ENV_GLOBAL.projects_home + "/" + fn)
-    if File.directory?(path)
-      alert "The folder <b>" + path + "</b> is already ok disk.  You can open it using the <b>Open Project</b> button.",
-        :headline=> "Project Already Exists", :parent => self, :width => 500
-    else
+    path = File.join($VR_ENV_GLOBAL.projects_home, fn)
+    return if fn.length < 2 
+    unless File.directory?(path)
       FileUtils.mkpath path
       VR_Tools.copy_skeleton_project(path)
-      @parent.proj_path = path
-      @builder["window1"].destroy
     end
-  end
-
-  def buttonCancel__clicked(*args)
-    @my_var = "Hello"
-#    @builder["window1"].destroy
+    @parent.proj_path = path
+    @builder["window1"].destroy
   end
 
 end

data/bin/main/VR_File_Tree.rb

@@ -114,7 +114,8 @@ class VR_File_Tree < VR::FileTreeView
     end
   end
 
-  def self__key_press_event(view, evt)
+  def self__key_press_event(view, evt)
+alert evt.keyval.to_s
     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?")  

data/bin/main/VR_Main.rb

@@ -11,14 +11,21 @@ class VR_Main
   end
 
   def before_show
-    # there must be a visualruby directory:
-    menuInstallExamples__activate if not File.directory?(File.join(ENV["HOME"],"","visualruby", "examples","alert_box"))
+
+    # 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) 
-      @proj_path = $VR_ENV_GLOBAL.default_project if project_valid?($VR_ENV_GLOBAL.default_project)
+    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
+      @proj_path = $VR_ENV_GLOBAL.default_project       
     end
 
     @file_tree = VR_File_Tree.new(self, File.expand_path(File.dirname(__FILE__) + "/../../img"))
@@ -48,7 +55,7 @@ class VR_Main
     Gtk.main_quit
   
     unless project_valid?(@proj_path)
-      toolOpenFolder__clicked
+      toolOpenFolder__clicked # should never gets here.
     end
 
     if project_valid?(@proj_path)
@@ -100,13 +107,6 @@ class VR_Main
       when 2 then @remote_gem_tree.refresh(false) #false = don't force refresh
     end
   end 
-  
-  def window1_key_press(win, key)
-    case x = key.keyval
-       when 65474 then toolRun__clicked # F5
-#      when 115 then toolSave__clicked # Ctrl-S
-    end
-  end
 
   def menuCloseAll__activate(*a)
     @tabs.try_to_save_all(:close=>true) 
@@ -185,16 +185,20 @@ class VR_Main
   end
 
   def toolIndent__clicked(*a)
-#    @tabs.docs[@tabs.page].indent_selected_lines()
-#    evt = Gdk::EventKey.new(:key_press)
-#    evt.keyval = Gdk::Keyval::GDK_6
-#    evt.put
-    @tabs.docs[@tabs.page].indent($VR_ENV_GLOBAL.tab_spaces)
+    press_key(65289) #tab
   end
 
-  def toolUnIndent__clicked(*a)
-    @tabs.docs[@tabs.page].unindent($VR_ENV_GLOBAL.tab_spaces)
+  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 toolComment__clicked(*a)
     @tabs.docs[@tabs.page].comment()
@@ -265,7 +269,7 @@ class VR_Main
     @tabs.docs[@tabs.page].replace(@builder[:entryReplace].text)
   end
 
-  def entryFind_key_press(me, evt)
+  def entryFind__key_press_event(me, evt)
     return if evt.keyval != 65293 #enter key
     buttonFind_clicked
   end

data/bin/main/glade/NewProjectGUI.glade

@@ -21,6 +21,7 @@
         <property name="margin_top">20</property>
         <property name="margin_bottom">20</property>
         <property name="orientation">vertical</property>
+        <property name="spacing">10</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
@@ -38,7 +39,11 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Enter the name for your new project.  A directory will be created under your /home/visualruby directory with that name.  Use only letters and underscores. 
+            <property name="label" translatable="yes">Enter the path for your new project.  If the directory doesn't exist, it will be created.  
+
+If the directory already exists, it will be opened and marked as a visualruby project so you can open it in the future.
+
+Use only letters and underscores. 
 
 You are free to move the project later.</property>
             <property name="wrap">True</property>
@@ -95,10 +100,11 @@ You are free to move the project later.</property>
             <property name="can_focus">False</property>
             <property name="margin_top">10</property>
             <property name="margin_bottom">10</property>
-            <property name="layout_style">spread</property>
+            <property name="spacing">10</property>
+            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="buttonCreate">
-                <property name="label" translatable="yes">Create Project</property>
+              <object class="GtkButton" id="buttonCancel">
+                <property name="label" translatable="yes">Cancel</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -111,8 +117,8 @@ You are free to move the project later.</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="buttonCancel">
-                <property name="label" translatable="yes">Cancel</property>
+              <object class="GtkButton" id="buttonCreate">
+                <property name="label" translatable="yes">Create Project</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>

data/bin/main/glade/VR_Main.glade

@@ -436,7 +436,6 @@
                             <property name="invisible_char">●</property>
                             <property name="primary_icon_activatable">False</property>
                             <property name="secondary_icon_activatable">False</property>
-                            <signal name="key-press-event" handler="entryFind_key_press" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>

data/vrlib/lib/GladeGUI.rb

@@ -90,7 +90,7 @@
 
 module GladeGUI
 
-  attr_accessor :builder
+  attr_accessor :builder
 
 ##
 #
@@ -126,20 +126,23 @@ end
 #  
 #    widget = @builder["name"]
 #  
-#  Normally, you should give your widgets names of instance variables: i.e. "MyClass.var"
-#  so they can be autoloaded using the set_glade_all() method.
+#  Normally, you should give your widgets names of instance variables: i.e. @email
+#  so they can be autoloaded using the set_glade_all() method.  For example,
+#  the value of the @email vaiable would be loaded into a Gtk:Entry named "email"
+#  in your glade form.  It saves you from having to do this:
+#
+#  @builder[:email] = @email
 #  
 #  You can also pass a reference to a parent class that also includes GladeGUI.
 #  Then the child window will run simultaniously with the parent.
 #  
 
-  def load_glade()
+  def load_glade() 
     caller__FILE__ = my_class_file_path() 
-    file_name = File.split(caller__FILE__)[0] + '/glade/' + class_name(self) + ".glade" 
+    file_name = File.join(File.split(caller__FILE__)[0] , "glade", class_name(self) + ".glade")
     @builder = Gtk::Builder.new
     @builder << file_name
     @builder.connect_signals{ |handle| method(handle) }
-#    parse_signals() should be called after before_show()
   end
 
   def class_name(obj) # :nodoc:
@@ -154,9 +157,9 @@ end
 #  
 #  Remember that it will enforce the naming convention:  gladename__signal.  No arguments.
 
-  def parse_signals() 
+  def parse_signals()
     meths = self.class.instance_methods()
-    meths.each do |meth|
+    meths.each do |meth|
       meth = meth.to_s #bug fix ruby 1.9 gives stmbol
       glade_name, signal_name = *(meth.split("__"))
       next if (signal_name.to_s == "" or glade_name.to_s == "") #covers nil
@@ -169,10 +172,24 @@ end
         end
       end
       obj = glade_name == "self" ? self : self.instance_variable_get("@" + glade_name)
-      obj ||= eval(glade_name) if respond_to?(glade_name) and method(glade_name.to_sym).arity == 0 # no arguments!
-      obj.signal_connect(signal_name) { |*args| method(meth.to_sym).call(*args) } if obj.respond_to?("signal_connect") 
+      obj ||= eval(glade_name) if respond_to?(glade_name) and method(glade_name.to_sym).arity == 0 # no arguments!
+      if obj.respond_to?("signal_connect")
+        obj.signal_connect(signal_name) { |*args| method(meth.to_sym).call(*args) }
+      end
     end
-  end
+  end
+
+# parses instance variables added in before_show
+#  def parse_instance_signals(dig = true)
+#    instance_variables.each do |var|
+#      obj = instance_variable_get(var)
+#      if obj.respond_to?(:load_glade)
+#        obj.load_glade
+#        obj.parse_signals                         # dig one level
+#        obj.parse_instance_signals(false) if dig  # never ending loop if instance vaiables are in 2 objects
+#      end
+#    end
+#  end    
 
 #  This method is the most useful method to populate a glade form.  It will
 #  populate from active_record fields and instance variables.  It will simply 
@@ -404,6 +421,7 @@ end
     end
     return true
   end
+
 
 end
   

data/vrlib/lib/SavableClass.rb

@@ -3,7 +3,7 @@ module VR
   def self.load_yaml(flags)
     me = nil
     if File.file?(flags[:file_name]) 
-       me = YAML.load(File.open(flags[:file_name]).read)
+      me = YAML.load(File.open(flags[:file_name]).read)
     elsif flags[:class]
       me = flags[:class].new()
     end

data/vrlib/lib/treeview/FileTreeView.rb

@@ -65,8 +65,8 @@ module VR
   
     def open_folders(folder_paths)
       model.each do |model, path, iter| 
-        if folder_paths.include?(iter[id(:path)])   
-          expand_row(path, false) 
+        if folder_paths.include?(iter[id(:path)])
+          self__row_expanded(self, iter, path)    
         end
       end
     end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualruby
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Eric Cunningham
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - "."
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3