visualruby 1.0.14 → 1.0.16

data/bin/main/VR_Main.rb

@@ -84,14 +84,9 @@ class VR_Main
 		return path
 	end
 
-
-
 	def toolBack_clicked 
 		@tabs.back()
-	end
-
-
-
+	end
 
 	def toolOpenFolder_clicked
 		save_state
@@ -114,8 +109,7 @@ class VR_Main
 		end
 	end 
 	
-	def window1_key_press(win, key)
-puts key.keyval.to_s
+	def window1_key_press(win, key)
 		case x = key.keyval
 		 	when 65474 then toolRun_clicked # F5
 #			when 115 then toolSave_clicked # Ctrl-S

data/visualruby_examples/calculator/.vr_settings.yaml

@@ -1,21 +1,11 @@
 --- !ruby/object:VR_ENV
-backup_path: /home/eric
-browser: firefox
-current_file: /home/eric/vrp/vrx/visualruby_examples/calculator/main.rb
-font_name: Monospace 10
-glade_path: glade-3
+current_file: /home/eric/vrp/vr2/Untitled
 height: 600
 open_files:
-- /home/eric/vrp/vrx/visualruby_examples/calculator/main.rb
-- /home/eric/vrp/vrx/visualruby_examples/calculator/bin/Calculator.rb
-open_folders:
-- /home/eric/vrp/vrx/visualruby_examples/calculator
-- /home/eric/vrp/vrx/visualruby_examples/calculator/bin
+- /home/eric/vrp/vr2/Untitled
+open_folders: []
 panel_pos: 360
 rdoc_command_line: rdoc -x README
 run_command_line: ruby main.rb
-tab_spaces: 2
 width: 800
-builder: !ruby/object:Gtk::Builder {}
-glade_box: !ruby/object:VR::SimpleComboBoxEntry {}
-browser_box: !ruby/object:VR::SimpleComboBoxEntry {}
+settings_file_version: 1

data/visualruby_examples/calculator/bin/Calculator.rb

@@ -51,11 +51,11 @@ class Calculator
 			when "C" then @builder["display"].text = ""
 			when "=" then
 				begin # this doesn't catch all errors
-				 	@builder["display.text"] = eval(@builder["display"].text).to_s
+				 	@builder["display"].text = eval(@builder["display"].text).to_s
 				rescue
-					@builder["display.text"] = "error"
+					@builder["display"].text = "error"
 				end
-			else @builder["display.text"] = @builder["display"].text + button.label
+			else @builder["display"].text = @builder["display"].text + button.label
 		end	 
 	end	
 

data/visualruby_examples/child_window/.vr_settings.yaml

@@ -1,46 +1,16 @@
 --- !ruby/object:VR_ENV
-backup_path: /home/eric
-browser: firefox
-current_file: /home/eric/vrp/vrx/visualruby_examples/child_window/main.rb
-font_name: Monospace 10
-glade_path: glade-gtk2
-height: 637
+current_file: /home/eric/vrp/vr2/visualruby_examples/child_window/bin/MyChildClass.rb
+height: 780
 open_files:
-- /home/eric/vrp/vrx/visualruby_examples/child_window/bin/ChildWindowDemo.rb
-- /home/eric/vrp/vrx/visualruby_examples/child_window/bin/MyChildClass.rb
-- /home/eric/vrp/vrx/visualruby_examples/child_window/main.rb
+- /home/eric/vrp/vr2/visualruby_examples/child_window/bin/MyChildClass.rb
+- /home/eric/vrp/vr2/visualruby_examples/child_window/bin/ChildWindowDemo.rb
+- /home/eric/vrp/vr2/visualruby_examples/child_window/main.rb
 open_folders:
-- /home/eric/vrp/vrx/visualruby_examples/child_window
-- /home/eric/vrp/vrx/visualruby_examples/child_window/bin
-- /home/eric/vrp/vrx/visualruby_examples/child_window/bin/glade
+- /home/eric/vrp/vr2/visualruby_examples/child_window
+- /home/eric/vrp/vr2/visualruby_examples/child_window/bin
+- /home/eric/vrp/vr2/visualruby_examples/child_window/bin/glade
 panel_pos: 360
 rdoc_command_line: rdoc -x README
 run_command_line: ruby main.rb
-tab_spaces: 2
-width: 1031
-builder: !ruby/object:Gtk::Builder {}
-glade_box: !ruby/object:VR::SimpleComboBoxEntry {}
-browser_box: !ruby/object:VR::SimpleComboBoxEntry {}
-buttonChooseFolder: ! '...'
-vbox1: !ruby/object:Gtk::VBox {}
-label7: ! 'Editor Font:'
-label3: ! 'Back-up Path:'
-window1: !ruby/object:Gtk::Window {}
-hbuttonbox1: !ruby/object:Gtk::HButtonBox {}
-buttonCancel: Cancel
-label8: ! 'RDoc Command Line: '
-table1: !ruby/object:Gtk::Table {}
-buttonTryBrowser: Try
-buttonSave: Save
-hboxBrowser: !ruby/object:Gtk::HBox {}
-hboxGlade: !ruby/object:Gtk::HBox {}
-label1: <big><big><b>Visual Ruby Settings</b></big></big>
-label2: ! 'Browser Command Line:'
-label4: ! 'Spaces for Each Tab in Editor:'
-label5: ! 'Glade Command Line:'
-label6: ! 'Command Line when "Run" is pressed:'
-hbox1: !ruby/object:Gtk::HBox {}
-hbox2: !ruby/object:Gtk::HBox {}
-hbox3: !ruby/object:Gtk::HBox {}
-hbox4: !ruby/object:Gtk::HBox {}
-buttonTryGlade: Try
+width: 1239
+settings_file_version: 1

data/visualruby_examples/child_window/bin/ChildWindowDemo.rb

@@ -22,9 +22,7 @@ class ChildWindowDemo #(change name)
 	include GladeGUI
 
 	def buttonOpenChild__clicked(*argv)
-		win = MyChildClass.new
-		win.set_parent(self)
-		win.show #self = parent
+		MyChildClass.new.show(self) #self = parent
 	end
 
 	def modalButton__clicked(*argv)

data/visualruby_examples/child_window/bin/MyChildClass.rb

@@ -21,18 +21,16 @@ class MyChildClass
 
 	include GladeGUI
 
-	def initialize(parent = nil)
-		super()
-		set_parent(parent) if parent
-		if parent.nil?
-			@hello.label = "MODAL WINDOW\nThis window freezes the parent program until it is closed.\nTherefore you can't open any more windows, or close the\n parent window until you close this window."
-			@window1.title = "Modal Window"
+	def before_show()	
+		if get_parent()
+			@builder["label1"].label = "NON-MODAL WINDOW\n This window doesn't interfere with the operation of the rest of the program.\nTherefore you can open more of these windows if you like.\nIf you close the parent, I will close too."
+			@builder["window1"].title = "Non-Modal Window"
 		else
-			@hello.label = "NON-MODAL WINDOW\n This window doesn't interfere with the operation of the rest of the program.\nTherefore you can open more of these windows if you like.\nIf you close the parent, I will close too."
-			@window1.title = "Non-Modal Window"
+			@builder["label1"].label = "MODAL WINDOW\nThis window freezes the parent program until it is closed.\nTherefore you can't open any more windows, or close the\n parent window until you close this window."
+			@builder["window1"].title = "Modal Window"
 		end
 	end
-	
+
 	# When cancel clicked in MyChildClass.glade
 	def buttonCancel__clicked(*argv)  
 		destroy_window() 

data/visualruby_examples/child_window/bin/glade/MyChildClass.glade

@@ -13,7 +13,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkLabel" id="MyChildClass.hello">
+          <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xpad">80</property>

data/vr

@@ -1,10 +1,7 @@
 #!/usr/bin/env ruby 
 #
 
-require "rubygems"
-require "gtk2"
 require "gtksourceview2"
-require "require_all"
 require "yaml" #needed
 require "net/http" #needed
 require "net/https" #needed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualruby
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ autorequire:
 bindir:
 - .
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2014-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.13
+        version: 1.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.13
+        version: 1.0.16
 - !ruby/object:Gem::Dependency
   name: gtksourceview2
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
 description: ! "Visualruby is a complete IDE for making graphical user interfaces
   with ruby.  It utilizes glade interface designer to create windows, and uses a library
   of GUI helpers to make coding GTK+ programs easy.  The IDE really helps you organize