visualruby 3.6.3 → 3.6.4

data/lib/TestWindow.rb

@@ -0,0 +1,33 @@
+
+
+class TestWindow < VR_GtkWindow
+
+  def change
+    l = @builder["entry1"]
+    l.text = "Chicken"
+  end
+
+  def button1__clicked(*args)
+    test
+    return
+    @model = @builder["tree1"].model
+    oinspect @model
+    row = @model.append 
+    row[0] = 23.5
+    row[1] = 190
+    @builder["tree1"].hide
+    @builder["tree1"].show
+    
+  end
+
+  def test
+    @items_model = Gtk::ListStore.new(Integer, String)
+    iter = @items_model.append
+    iter[0] = 132
+    iter[1] = "Chicken"
+    @builder["tree1"].model = @item_model
+
+  end
+
+
+end

data/lib/VR_GtkWindow.rb

@@ -0,0 +1,7 @@
+
+
+class VR_GtkWindow < Gtk::Window
+
+  include GladeGUI
+
+end

data/lib/glade/TestWindow.glade

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.40.0 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name num1 -->
+      <column type="gfloat"/>
+      <!-- column-name num2 -->
+      <column type="gfloat"/>
+    </columns>
+  </object>
+  <object class="GtkWindow" id="window1">
+    <property name="width-request">100</property>
+    <property name="height-request">400</property>
+    <property name="can-focus">False</property>
+    <property name="modal">True</property>
+    <property name="window-position">center-always</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">100</property>
+        <child>
+          <object class="GtkButton" id="button1">
+            <property name="label" translatable="yes">button</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="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can-focus">False</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">Test</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkTreeView" id="tree1">
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="model">liststore1</property>
+            <property name="enable-grid-lines">both</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection"/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/lib/treeview/TreeView.rb

@@ -30,8 +30,6 @@ module VR
 #
 #  
 
-
-
      def add_row(parent, hash = {})
       row = vr_row(model.append(parent))
       hash.each_pair { |key, val| row[key] = val }

data/lib/vrlib.rb

@@ -7,6 +7,7 @@ require "fileutils"
 
 #tools go first
 require_relative "GladeGUI"
+require_relative "VR_GtkWindow"
 require_relative "Alert"
 require_relative "DragDrop"
 require_relative "SavableClass"

data/skeleton/project/main.rb

@@ -1,10 +1,7 @@
-#!/usr/bin/ruby
 
 require "vrlib"
 
-# from require_all gem:
-require_rel 'src/'
-
+require_relative "src/MyClass"
 
 MyClass.new.show_glade()
 

data/src/editor/VR_Document.rb

@@ -75,10 +75,7 @@ class VR_Document < GtkSource::View
   end
 
   def jump_to_line(line_num, search_str = nil)
-    clear_events
-#    while (Gtk.events_pending?)
-#      Gtk.main_iteration
-#    end
+    clear_events
     hilight_line(line_num)
     iter = buffer.get_iter_at(:line => line_num - 1)
     buffer.place_cursor(iter)    

data/src/editor/VR_TabSearch.rb

@@ -15,7 +15,7 @@ module VR_TabSearch
   def find_in_all(str)
     out = "Search Results for:  " + str + "\n"
     Find.find(Dir.pwd) do |path|
-      Find.prune if path =~ /\/glade$/ or path =~ /\/doc$/ #or File.directory?(path)
+      Find.prune if path =~ /\/glade$/ or path =~ /\/docs$/ #or File.directory?(path)
       if (File.extname(path) == ".rb" or File.extname(path) == ".erb") and not File.directory?(path) 
         txt = File.open(path, "r").read
         out += scan_for_text(str, txt, path)

data/src/main/RubygemsAPI.rb

@@ -29,18 +29,13 @@ def set_up_key()
     @builder["dialog1"].hide
     return unless response_id == 1    
     get_glade_all() #gets @username, @password
-alert(@username + @password)
     begin
       @http.start() do |h|
         req = Net::HTTP::Get.new("/api/v1/api_key.yaml")
-alert("1")
         req.basic_auth @username, @password
-        response = h.request(req)
-alert("2")
-alert(response)
-        obj = YAML.unsecure_load(response.body)
-        key = obj[:rubygems_api_key]
-alert(key)
+        response = h.request(req)
+        obj = YAML.load(response.body)
+        key = obj[:rubygems_api_key]
         if key
           File.open(CREDENTIALS_FILE,"w",0600) { |f| f.write(YAML.dump(obj)) } 
         else

data/src/main/SplashWindow.rb

@@ -0,0 +1,18 @@
+
+class SplashWindow < Gtk::Window
+
+  def initialize()
+    super()
+    self.decorated = false
+    img = Gtk::Image.new(file: File.join($root, "img", "splash.png"))
+    img.visible = true
+    self.set_child(img)
+#    self.set_position(:center)
+    self.position = :center_always
+    self.set_keep_above(true)
+    self.position = :center_always
+# puts File.join("..", "..", "img", "splash.png")
+
+  end
+
+end

data/src/main/VR_Main.rb

@@ -1,11 +1,13 @@
+
+
 class VR_Main 
 
   include GladeGUI
 
   attr_accessor :proj_path, :tabs, :shell, :builder, :file_tree  
   
-  def initialize(argv, splash)
-    @splash = splash
+  def initialize(argv)
+#    @splash = splash
     @proj_path = argv[0] ? argv[0] : Dir.pwd
     @proj_path = @proj_path.chomp("/")
   end
@@ -17,7 +19,10 @@ class VR_Main
 
     # load global settings (requires /home/visuaruby folder exists
     $VR_ENV_GLOBAL = VR::load_yaml(VR_ENV_GLOBAL, VR_ENV_GLOBAL::GLOBAL_SETTINGS_FILE)
-
+    if !File.exists?($VR_ENV_GLOBAL.default_project) or !File.exists?($VR_ENV_GLOBAL.projects_home) #start over
+      File.delete(VR_ENV_GLOBAL::GLOBAL_SETTINGS_FILE)
+      $VR_ENV_GLOBAL = VR::load_yaml(VR_ENV_GLOBAL, VR_ENV_GLOBAL::GLOBAL_SETTINGS_FILE)
+    end    
 
     # try to open right project
     if not project_valid?(@proj_path) 
@@ -51,11 +56,11 @@ class VR_Main
     @builder["scrolledRemoteGems"].add(@remote_gem_tree)
     @remote_gem_tree.show
 
-    if not @splash.nil? 
-      @splash.destroy
-    end
+#     if not @splash.nil? 
+#       @splash.destroy
+#     end
  
-    Gtk.main_quit #for splash
+#    Gtk.main_quit #for splash
   
     unless project_valid?(@proj_path)
       toolOpenFolder__clicked # should never gets here.
@@ -152,15 +157,16 @@ class VR_Main
 #    @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")
+#      FileUtils.copy("yard_hack/index.html.replace", "docs/index.html") 
+#      FileUtils.copy("yard_hack/index.html.replace", "docs/frames.html") 
+#      FileUtils.copy("yard_hack/common.css", "docs/css/common.css")
 #    end
 #
 #  end
 
   def toolMyYard__clicked(*a)
-    return alert "Not available yet."
+    TestWindow.new.show_glade
+    return # alert "Not available yet."
     begin
       require "my_yard"
     rescue LoadError
@@ -170,7 +176,7 @@ class VR_Main
   end
 
   def toolViewRDoc__clicked(*a)
-    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{Dir.pwd}/doc/index.html")    
+    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{Dir.pwd}/docs/index.html")    
   end
 
   def toolSave__clicked(*a)  # saves open tab 
@@ -194,19 +200,6 @@ class VR_Main
     end  
   end
 
-  def toolHome__clicked(*a)
-    default_project = $VR_ENV_GLOBAL.default_project
-    return if default_project == @proj_path  
-    if not project_valid?(default_project)
-      alert("Your default home project is invalid:\n\n<b>#{default_project}</b>.\n\nGo to: Tools > Global Settings to set it.", 
-           parent: self, headline: "Invalid Home Project")
-      return
-    end 
-    return unless @tabs.try_to_save_all( ask: true, close: true)
-    @proj_path = default_project
-    load_project
-  end
-
   def toolBackUp__clicked(*a)
     return unless @tabs.try_to_save_all(:ask=>true)
     VR_Tools.back_up()
@@ -295,7 +288,7 @@ class VR_Main
   end
 
   def menuTutorials__activate(*a)
-    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} http://www.visualruby.net")
+    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} https://beagle123.github.io/visualruby")
   end
   
   def menuInstallExamples__activate(*a)

data/src/main/VR_Tools.rb

@@ -1,12 +1,14 @@
 module VR_Tools
 
-  def VR_Tools.popen(cmd)
-    begin
-      IO.popen(cmd)
-    rescue
+  def VR_Tools.popen(cmd)
+    begin
+      lines = IO.popen(cmd).readlines
+      lines ||= [""]
+      return lines.join()    
+    rescue
       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
+          "\n\nIn MS Windows you may need to add the 'start' command i.e. <b>'start glade'</b>")
+    end
   end
 
   def VR_Tools.back_up()
@@ -62,14 +64,14 @@ END
   def VR_Tools.replace_html_in_docs()
     return if not File.file? "yard_hack/rdoc_replace.yaml"
     ar = YAML.load_file "yard_hack/rdoc_replace.yaml"  
-    Dir.glob("#{Dir.pwd}/doc/**/*.html") do |f|
+    Dir.glob("#{Dir.pwd}/docs/**/*.html") do |f|
       str = File.open(f).read
       ar.each do |pair|
         str.gsub!(pair[0], pair[1])
       end
       File.open(f, "w") { |file| file.puts(str) }
     end
-#    FileUtils.cp "#{Dir.pwd}/rdoc.css", "#{Dir.pwd}/doc/rdoc.css" if File.file?("#{Dir.pwd}/rdoc.css") and File.directory?("#{Dir.pwd}/doc")
+#    FileUtils.cp "#{Dir.pwd}/rdoc.css", "#{Dir.pwd}/docs/rdoc.css" if File.file?("#{Dir.pwd}/rdoc.css") and File.directory?("#{Dir.pwd}/doc")
     end
 
 end