visualruby 1.0.19 → 3.0.2

data/bin/main/glade/VR_Remote_Gem_Tree.glade

@@ -1,75 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="popGem">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="popOpenRubygemsPage">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="tooltip_text" translatable="yes">Open this gem's page on rubygems.org</property>
         <property name="label" translatable="yes">Open rubygems Project Page</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="popOpenRubygemsPage_clicked"/>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="popOpenHomepage">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="tooltip_text" translatable="yes">Open gem's homepage in the default web browser.</property>
         <property name="label" translatable="yes">Open Homepage</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="popOpenHomepage_clicked"/>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="popYank">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="tooltip_text" translatable="yes">Removes the gem from rubygems.org so nobody can download it.</property>
         <property name="label" translatable="yes">Yank Gem From rubygems.org</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="popYank_clicked"/>
       </object>
     </child>
   </object>
   <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
     <property name="window_position">center-on-parent</property>
-    <signal name="destroy" handler="destroy_window"/>
     <child>
-      <object class="GtkHBox" id="hbox1">
+      <object class="GtkBox" id="box2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <child>
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;big&gt;&lt;big&gt;Contacting Rubygems.org...&lt;/big&gt;&lt;/big&gt;
-Please wait while the names of your gems are downloaded.  Yanking old versions of your gems, makes this process faster.</property>
-                <property name="use_markup">True</property>
-                <property name="wrap">True</property>
-              </object>
-              <packing>
-                <property name="padding">15</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkProgressBar" id="progressbar1">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="padding">20</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;big&gt;&lt;big&gt;Contacting Rubygems.org...&lt;/big&gt;&lt;/big&gt;
+Please wait while the names of your gems are downloaded.  Yanking old versions of your gems, makes this process faster.  This is currently not shown!</property>
+            <property name="use_markup">True</property>
+            <property name="wrap">True</property>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="padding">15</property>
             <property name="position">0</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkProgressBar" id="progressbar1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="padding">20</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>

data/bin/tools/VR_Tools.rb

@@ -1,57 +1,32 @@
-module VR_Tools
+module VR_Tools
+
+  def VR_Tools.clear_events
+    while (Gtk.events_pending?)
+      Gtk.main_iteration
+    end
+  end
 
 	def VR_Tools.popen(cmd)
   	begin
 			IO.popen(cmd)
 		rescue
-			VR::Dialog.message_box("The following command couldn't run:\n\n#{cmd}\n\nCheck the path in Tools > Settings")
+			alert("The following command couldn't run:\n\n<b>#{cmd}</b>\n\nCheck the path in Tools > Settings")
 		end
 	end
 
-#	def VR_Tools.sudo_command(command)
-#		@pass ||= ""
-#		if @pass.strip() == ""
-#			@pass = VR::Dialog.input_box("Enter System Password:")
-#		end
-#		result = command + "\n" + `echo #{@pass} | sudo -S #{command}`
-#		@pass = "" if result.include? "incorrect password"
-#		return result 
-#	end
-
-	def VR_Tools.create_desktop_launcher()
-		command = "vr " + Dir.pwd
-		name = File.basename(Dir.pwd) + " Project" 
-		  str = <<END
 
-#!/usr/bin/env xdg-open
-
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Icon[en_US]=gnome-panel-launcher
-Name[en_US]=#{name}
-Exec=#{command}
-Comment[en_US]=Opens a Visual Ruby project
-Name=#{name}
-Comment=Opens a Visual Ruby project
-Icon=gnome-panel-launcher
-
-END
-		return unless File.directory?(ENV["HOME"] + "/Desktop")
-		fn = ENV["HOME"] + "/Desktop/" + name + ".desktop"
-    File.open(fn,"w") { |f| f.puts(str) }
-		File.chmod(0755, fn)
-		VR::Dialog.message_box("Created launcher:\n" + name + "\non your computer's desktop")
-	end
 
   def VR_Tools.back_up()
 		path = File.join(ENV["HOME"], "visualruby_backup", Dir.pwd.gsub(ENV["HOME"], ""))
     t = Time.now
     out_dir = path + "/" + Dir.pwd.split("/").last + " Backup " + t.month().to_s + '-' + t.day().to_s + "-" + t.year().to_s + " at " + t.strftime('%I %M%p')  
     copy_recursively(Dir.pwd, out_dir) 
-		VR::Dialog.message_box("Files backed up to:  \n\n" + path) 
+		alert "Files backed up to:  \n\n" + path 
   end
+
+	def VR_Tools.copy_skeleton_project(path)
+			VR_Tools.copy_recursively(File.dirname(__FILE__) + "/../../skeleton/project", path)
+	end
 
 	def VR_Tools.copy_recursively(from, out_dir)
     Find.find(from) do |path|
@@ -67,7 +42,7 @@ END
       end
     end
 	end
-
+ 
 	def self.create_gemspec()
 		main_file = $VR_ENV.run_command_line.split(" ")[1]
 		main_path = "."
@@ -87,21 +62,25 @@ Gem::Specification.new do |s|
   s.homepage = "http://www.yoursite.org/"  # optional
   s.description = "Full description here" # optional
 	s.executables = ['#{main_file}']  # i.e. 'vr' (optional, blank if library project)
-	s.default_executable = ['#{main_file}']  # i.e. 'vr' (optional, blank if library project)
+	s.default_executable = '#{main_file}'  # i.e. 'vr' (optional, blank if library project)
 	s.bindir = [#{bindir}]    # optional, default = bin
 	s.require_paths = [#{libdir}]  # optional, default = lib 
 	s.files = Dir.glob(File.join("**", "*.{rb,glade}"))
 	s.rubyforge_project = "nowarning" # supress warning message 
 end
 END
-		name =  Dir.pwd + "/" + File.basename(Dir.pwd).downcase + ".gemspec"
+		name =  File.basename(Dir.pwd).downcase + ".gemspec"
 		if File.file?(name)
-			return false if not VR::Dialog.ok_box("Do you want to overwrite existing #{name}?")
-		end
-		File.open(name, "w") { |f| f.puts(str) }
-		return name
+			unless alert("Do you want to overwrite existing file?:\n<b>#{name}</b>?", 
+						:headline => "File Already Exists", :button_yes => "Overwrite", :button_no => "Cancel", :width => 400)
+				return false
+			end
+		end
+		file_name = File.join(Dir.pwd,name)
+		File.open(file_name, "w") { |f| f.puts(str) }
+		return file_name
   end
-
+	#
 	#this works on Dir.pwd that's maybe different from project
 	def VR_Tools.replace_html_in_docs()
 		return if not File.file? "rdoc_replace.yaml"
@@ -117,5 +96,40 @@ END
 	end
 
 end
+#	def VR_Tools.sudo_command(command)
+#		@pass ||= ""
+#		if @pass.strip() == ""
+#			@pass = VR::Dialog.input_box("Enter System Password:")
+#		end
+#		result = command + "\n" + `echo #{@pass} | sudo -S #{command}`
+#		@pass = "" if result.include? "incorrect password"
+#		return result 
+#	end
 
+#	def VR_Tools.create_desktop_launcher()
+#		command = "vr " + Dir.pwd
+#		name = File.basename(Dir.pwd) + " Project" 
+#		  str = <<END
+#
+##!/usr/bin/env xdg-open
+#
+#[Desktop Entry]
+#Version=1.0
+#Type=Application
+#Terminal=false
+#Icon[en_US]=gnome-panel-launcher
+#Name[en_US]=#{name}
+#Exec=#{command}
+#Comment[en_US]=Opens a Visual Ruby project
+#Name=#{name}
+#Comment=Opens a Visual Ruby project
+#Icon=gnome-panel-launcher
+#
+#END
+#		return unless File.directory?(ENV["HOME"] + "/Desktop")
+#		fn = ENV["HOME"] + "/Desktop/" + name + ".desktop"
+#    File.open(fn,"w") { |f| f.puts(str) }
+#		File.chmod(0755, fn)
+#		alert("Created launcher:\n" + name + "\non your computer's desktop")
+#	end
 

data/{visualruby_examples → examples}/active_record/active_record.rb

@@ -1,21 +1,27 @@
-require 'vrlib.rb'
-require 'active_record'
 
-#make program output in real time so errors visible in VR.
-STDOUT.sync = true
-STDERR.sync = true
 
-#everything in these directories will be included
-my_path = File.expand_path(File.dirname(__FILE__))
-require_all Dir.glob(my_path + "/lib/**/*.rb") 
-require_all Dir.glob(my_path + "/bin/**/*.rb") 
+# ignore -- this is for development, same as require 'vrlib'
+require File.exists?("./../../vrlib/vrlib.rb") ?  "./../../vrlib/vrlib.rb" : "vrlib"
+
+begin
+  require 'active_record'
+  require 'sqlite3'
+rescue LoadError
+  alert "You must install activerecord gem to use this example.  " +
+      "Just enter at command prompt:\n\n<b>gem install activerecord\ngem install sqlite3</b>"
+  exit
+end
+
+# from require_all gem:
+require_rel 'bin/'
+
 
 ActiveRecord::Base.establish_connection(  
 :adapter => "sqlite3",    
 :database => "db/development.sqlite3",
 )
 
-ChoosePerson.new.show
+ChoosePerson.new.show_glade()
 
 
 #ActiveRecord::Schema.define do

data/{visualruby_examples → examples}/active_record/bin/ChoosePerson.rb

@@ -12,6 +12,13 @@ class ChoosePerson < VR::ListView
 		Person.all.each do |p|
 			row = add_row(:person => p)
 		end
+    self.show
 	end
 
+  def buttonShow__clicked(*a)
+    return unless row = selected_rows.first
+    row[:person].show_glade()
+  end
+
+
 end

data/examples/active_record/bin/Person.rb

@@ -0,0 +1,21 @@
+class Person < ActiveRecord::Base
+
+		include GladeGUI
+
+		def before_show
+      @builder[:labelName].label = "<big>#{name}</big>" 
+			set_glade_all() # updates entry boxes
+		end
+    
+    # this is what shows in the listview
+		def to_s 
+			"#{self.name}  (#{self.email})  #{self.phone}" 
+    end
+
+    def buttonSave__clicked(*a)
+      get_glade_all #sets name, address, phone etc. from glade
+      save!
+      @builder[:window1].destroy
+    end
+
+end

data/examples/active_record/bin/glade/ChoosePerson.glade

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Active Record Demo</property>
+    <property name="window_position">center</property>
+    <property name="default_width">450</property>
+    <property name="default_height">300</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">20</property>
+        <property name="margin_right">20</property>
+        <property name="margin_top">20</property>
+        <property name="margin_bottom">20</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;big&gt;&lt;big&gt;Choose Person:&lt;/big&gt;&lt;/big&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox" id="buttonbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">10</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="buttonCancel">
+                <property name="label" translatable="yes">Cancel</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="buttonShow">
+                <property name="label" translatable="yes">Show</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">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/examples/active_record/bin/glade/Person.glade

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkWindow" id="window1">
+    <property name="width_request">460</property>
+    <property name="can_focus">False</property>
+    <property name="window_position">center</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">20</property>
+        <property name="margin_right">20</property>
+        <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="labelName">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="yalign">0.4699999988079071</property>
+            <property name="label" translatable="yes">Person</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="padding">10</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="grid1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="row_spacing">8</property>
+            <property name="column_spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Name:</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Address:</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Phone Number:</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Email:</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="name">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="address">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="phone">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="email">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox" id="buttonbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">10</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="buttonCancel">
+                <property name="label" translatable="yes">Cancel</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="buttonSave">
+                <property name="label" translatable="yes">Save</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">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>