visualruby 1.0.19 → 3.0.2

data/bin/main/VR_Main.rb

@@ -1,108 +1,98 @@
-
 class VR_Main 
 
 	include GladeGUI
 
 	attr_accessor :proj_path, :tabs, :shell, :builder, :file_tree	
 	
-  def initialize(argv)
-		@proj_path = argv[0] == "new" ? new_project(argv[1]) : argv[0]
-		@proj_path = @proj_path == nil ? Dir.pwd : @proj_path.chomp("/")
-		@proj_path = ENV["HOME"] unless File.split(@proj_path).length >= 2 and File.directory?(@proj_path)
-	end
-
+  def initialize(argv)
+		@proj_path = argv[0] ? argv[0] : Dir.pwd
+		@proj_path = @proj_path.chomp("/")
+	end
+
 	def before_show
-#	  splash = Splash.new
-#		splash.show(self)
+		# there must be a visualruby directory:
+		menuInstallExamples__activate if not File.directory?(File.join(ENV["HOME"],"","visualruby", "examples","drag_drop"))
+		# 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)
+		end
+
 		@file_tree = VR_File_Tree.new(self, File.expand_path(File.dirname(__FILE__) + "/../../img"))
 		@builder["scrolledwindowFileTree"].add(@file_tree) 
 
 		#add document notebook		
-    @tabs = VR_Tabs.new(self)  
-    @builder["vboxTabs"].add(@tabs) 
+		@tabs = VR_Tabs.new(self) 
+		@builder["boxTabs"].add(@tabs)
+    @tabs.show
 
 		#add shell textview
 		@shell = VR_TextShell.new(@tabs)
-		@builder["scrollShell"].add(@shell) 
+		@builder["scrollShell"].add(@shell)
+    @shell.show
 
 		#add local gem tab
 		@gem_tree = VR_Local_Gem_Tree.new(self)
-		@builder['scrolledLocalGems'].add(@gem_tree) 
+		@builder['scrolledLocalGems'].add(@gem_tree)
+    @gem_tree.show
+ 
 		#add remote gem tab
 		@remote_gem_tree = VR_Remote_Gem_Tree.new(self)
 		@builder["scrolledRemoteGems"].add(@remote_gem_tree)
-
-		menuInstallExamples__activate if not File.directory?(File.join(ENV["HOME"],"","visualruby", "examples", "drag_drop"))
-
-		if Dir.entries(@proj_path).join == "..." #empty
-			VR_Tools.copy_recursively(File.dirname(__FILE__) + "/../../skeleton/project", @proj_path)
-		end
-
-		if not File.file?(@proj_path + "/" + VR_ENV::SETTINGS_FILE)
-			menuInstallExamples__activate if Dir.glob(ENV["HOME"] + File.join( "", "**", VR_ENV::SETTINGS_FILE)).size == 0
-			toolOpenFolder_clicked
-		else
-			load_project(@proj_path)
+    @remote_gem_tree.show
+	
+    unless project_valid?(@proj_path)
+			toolOpenFolder__clicked
 		end
-#	  splash.destroy_window()cvnc
-#		show_window() if not $VR_ENV.nil?
-  end
 
-	def project_valid?(proj_path)
-		return false if proj_path.nil?
-		if not File.directory?(proj_path.to_s)
-			VR::Dialog.message_box("This folder is invalid:\n\n" + proj_path)
-			return false
-		end
-		if ENV["HOME"] == proj_path
-			return false
-		end
-		if Dir.entries(proj_path).join == "..." #empty
-			VR_Tools.copy_recursively(File.dirname(__FILE__) + "/../../skeleton/project", proj_path)
-			return true
-		elsif not File.file?(proj_path + "/" + VR_ENV::SETTINGS_FILE)
-			return VR::Dialog.ok_box("No Visual Ruby project file was found in this folder:\n " + proj_path +  "    Do you wan to open it anyway?")
-		end #success!
+    if project_valid?(@proj_path)
+		  load_project
+    else
+      exit
+    end
+    $splash.destroy if $splash
+    Gtk.main_quit
+
+	end
+
+	def project_valid?(proj_path)
+		return false if proj_path.nil? or proj_path == ""
+		return false if ENV["HOME"] == proj_path
+		return false unless File.directory?(proj_path)
+		return false unless File.file?(File.join(proj_path, VR_ENV::SETTINGS_FILE))
  		return true
 	end
 
-	def load_project(proj_path) #assumes valid_project? is true
-		FileUtils.cd(proj_path)
+
+	def load_project() # assumes valid_project? is true
+		FileUtils.cd(@proj_path)
 		@builder['window1'].title = "VR: " + File.basename(Dir.pwd)
 		@builder["labelStatus"].label = Dir.pwd
-		$VR_ENV = VR_ENV.load_yaml()
-		$VR_ENV_GLOBAL = VR_ENV_GLOBAL.load_yaml()
+		@file_tree.root = @proj_path
 		@file_tree.refresh()
-		load_state()
 		@shell.buffer.text = ""
+		# if default project invalid, set default
+		unless project_valid?($VR_ENV_GLOBAL.default_project)	
+			$VR_ENV_GLOBAL.default_project = @proj_path
+			VR::save_yaml($VR_ENV_GLOBAL) 
+		end 
+		load_state()
 	end
-
-	def new_project(proj_path)
-		return nil unless proj_path
-		path = File.join(Dir.pwd,proj_path)
-		FileUtils.mkdir(path) unless File.directory?(path)
-		return path
-	end
-
-	def toolBack_clicked 
-		@tabs.back()
-	end
-
-	def toolOpenFolder_clicked
+
+	def toolOpenFolder__clicked(*a)
 		save_state
-		return unless @tabs.try_to_save_all()
+		return unless @tabs.try_to_save_all(:ask=>true)
 		old_path = @proj_path
-		ProjectChooserGUI.new(self).show() #modal stops execution here, sets @proj_path
-#		return if @proj_path == old_path  #first time needs to be ok
-		if project_valid?(@proj_path)
- 			@tabs.try_to_close_all()
-			load_project(@proj_path)
-		else
-			@proj_path = old_path
+		OpenProject.new(self).show_glade(self)
+		if old_path != @proj_path
+ 			@tabs.try_to_save_all(:ask => false, :close => true)
+			load_project()
 		end	
 	end
 
-	def notebookTree_changed #file, gem notebook
+	def notebookTree_changed #file, gem notebook
 		case @builder['notebookTree'].page
 			when 1 then @gem_tree.refresh() 
 			when 2 then @remote_gem_tree.refresh(false) #false = don't force refresh
@@ -111,44 +101,41 @@ class VR_Main
 	
 	def window1_key_press(win, key)
 		case x = key.keyval
-		 	when 65474 then toolRun_clicked # F5
-#			when 115 then toolSave_clicked # Ctrl-S
+		 	when 65474 then toolRun__clicked # F5
+#			when 115 then toolSave__clicked # Ctrl-S
 		end
 	end
-
-	def menuCreateLauncher__activate(*a)
-		VR_Tools.create_desktop_launcher
-	end
 
 	def menuCloseAll__activate(*a)
-		@tabs.try_to_close_all() 
+		@tabs.try_to_save_all(:close=>true) 
 	end
 
 	def menuSettings__activate(*a)
-		$VR_ENV.show()
+		$VR_ENV.show_glade(self)
+	end
+
+	def menuGlobalSettings__activate(*a)
+		$VR_ENV_GLOBAL.show_glade(self)
+		@tabs.update_style_all()
 	end
-
-	def menuGlobalSettings__activate(*a)
-		$VR_ENV_GLOBAL.show()
-		@tabs.update_style_all()
-	end
 
 	def menuWWWRubygems__activate(*a)
 		VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} https://rubygems.org/users/new")
-	end
-
+	end
+
 	def menuSaveAll__activate(*a)
-		@tabs.try_to_save_all(false) # don't prompt 
+		@tabs.try_to_save_all(:ask=>false) # don't prompt 
 	end
 
 	def menuNew__activate(*a)
     @tabs.load_tab()
 	end
+
 	def menuSaveAs__activate(*a)
 		@tabs.docs[@tabs.page].save_as()
 	end
 
-	def toolRefresh_clicked
+	def toolRefresh__clicked(*a)
 		case @builder['notebookTree'].page
 			when 0 then @file_tree.refresh()
 			when 1 then @gem_tree.refresh()
@@ -156,77 +143,68 @@ class VR_Main
 		end
 	end
 
-	def toolSave_clicked()  # saves open tab
-		@tabs.docs[@tabs.page].try_to_save(false)
+	def toolSave__clicked(*a)  # saves open tab
+		@tabs.docs[@tabs.page].try_to_save(false) # false = don't ask
 	end	
 
-
-	#returns false to abort!
-
-	
 	def menuNewWindow__activate(*a)
 		fn = File.dirname(__FILE__) + "/../../skeleton/document/NewWindow.rb"
 		@tabs.load_tab()
 		@tabs.set_contents(File.open(fn).read)		
 	end
-
+
 	def menuNewProject__activate(*a)
 		save_state
-		return unless @tabs.try_to_save_all()
+		return unless @tabs.try_to_save_all(:ask=>true)
 		old_path = @proj_path
-		NewProjectGUI.new(self).show
-		if project_valid?(@proj_path)
- 			@tabs.try_to_close_all()
-			load_project(@proj_path)
-		else
-			@proj_path = old_path
-		end	
+		NewProjectGUI.new(self).show_glade(self)
+		if old_path != @proj_path
+ 			@tabs.try_to_save_all(:ask=>false, :close=>true)
+			load_project
+		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
-    return unless @tabs.try_to_save_all()
-#		path = File.join(ENV["HOME"], "visualruby_backup", Dir.pwd.gsub(ENV["HOME"], ""))
+
+	def toolBackUp__clicked(*a)
+   return unless @tabs.try_to_save_all(:ask=>true)
 		VR_Tools.back_up()
-#		VR::Dialog.message_box("Files backed up to:  \n\n" + path) 
-  end
-
-#	def toolBackUp_clicked
-#    return unless @tabs.try_to_save_all()
-#		path = $VR_ENV.backup_path
-#		return if path.nil?
-#    if File.directory?(path) and path.gsub('\\', '/').include?(ENV["HOME"])
-#			VR_Tools.back_up(Dir.pwd, path)
-#			VR::Dialog.message_box("Files backed up to:  \n\n" + path)
-#		else    
-#  		VR::Dialog.message_box("Backup path must be subdirecory of #{ENV['HOME']}:\n\n InValid: " +  path)
-#			menuSettings__activate
-#    end  
-#  end
-
-
-	def toolIndent_clicked
+  end
+
+	def toolIndent__clicked(*a)
 		@tabs.docs[@tabs.page].indent($VR_ENV_GLOBAL.tab_spaces)
   end
 
-	def toolUnIndent_clicked
+	def toolUnIndent__clicked(*a)
 		@tabs.docs[@tabs.page].unindent($VR_ENV_GLOBAL.tab_spaces)
   end
 
-	def toolComment_clicked
+	def toolComment__clicked(*a)
 		@tabs.docs[@tabs.page].comment()
   end
 
-	def toolUnComment_clicked
+	def toolUnComment__clicked(*a)
 		@tabs.docs[@tabs.page].un_comment()
 	end
 
-	def toolRun_clicked
+	def toolRun__clicked(*a)
    	run_command($VR_ENV.run_command_line)
   end 		
 
 	def run_command(cmd)
     save_state()
-    return unless @tabs.try_to_save_all(false) # false = don't prompt for changes to files
+    return unless @tabs.try_to_save_all(:ask => false) # false = don't prompt for changes to files
 		cur_dir = Dir.pwd
     result = "\n#{cur_dir}$ #{cmd}\n"
     result += `#{cmd} 2>&1`
@@ -235,30 +213,33 @@ class VR_Main
 	end
 
   def save_state
-    return if $VR_ENV == nil
+		return unless $VR_ENV
     $VR_ENV.width, $VR_ENV.height = @builder["window1"].size()
     $VR_ENV.panel_pos = @builder["panelMain"].position
+    $VR_ENV.notebook_panel_position = @builder["panelNotebook"].position
     $VR_ENV.open_folders = @file_tree.get_open_folders()
     $VR_ENV.open_files = @tabs.get_open_fn()
     $VR_ENV.current_file = @tabs.docs[@tabs.page].full_path_file
-    $VR_ENV.save_yaml()
+		$VR_ENV.current_line = @tabs.docs[@tabs.page].line_at_cursor()
+    VR::save_yaml($VR_ENV)
   end
 
 	def load_state
+		$VR_ENV = VR::load_yaml(:class => VR_ENV, :file_name => VR_ENV::SETTINGS_FILE)
     @builder["window1"].resize($VR_ENV.width, $VR_ENV.height)
     @builder['panelMain'].set_position($VR_ENV.panel_pos)
-    @builder["window1"].visible = true
+		@builder["panelNotebook"].set_position($VR_ENV.notebook_panel_position)
     @tabs.open_file_names($VR_ENV.open_files)
-    @tabs.switch_to($VR_ENV.current_file)
     @file_tree.open_folders($VR_ENV.open_folders)
-    @builder["window1"].show_all
+    @tabs.load_tab($VR_ENV.current_file)
+		@tabs.docs[@tabs.page].jump_to_line($VR_ENV.current_line)
 	end
 
 	def menuCreateGemspec__activate(*a)
 		if file_name = VR_Tools.create_gemspec()
 			@tabs.destroy_file_tab(file_name)
   		@tabs.load_tab(file_name)
-  		@file_tree.insert(file_name)
+  		@file_tree.refresh()
 		end
 	end
 
@@ -275,7 +256,7 @@ class VR_Main
 	end	
 
 	def buttonReplace_clicked
-		@tabs.docs[@tabs.page].replace(@builder["entryReplace"].text)
+		@tabs.docs[@tabs.page].replace(@builder[:entryReplace].text)
 	end
 
 	def entryFind_key_press(me, evt)
@@ -289,20 +270,23 @@ class VR_Main
 	
 	def menuInstallExamples__activate(*a)
 		path = File.join(ENV["HOME"], "", "visualruby", "examples")
-		VR_Tools.copy_recursively(File.expand_path(File.join(File.dirname(__FILE__),"","..","..","visualruby_examples")), path) 
-		VR::Dialog.message_box("The example projects are installed in:\n#{path}\nIf you want to uninstall them, just delete the folder.\n\nUse the /home/visualruby folder for all your visualruby projects.")			
+		VR_Tools.copy_recursively(File.expand_path(File.join(File.dirname(__FILE__),"","..","..","examples")), path) 
+		alert("The example projects are installed in this folder:\n\n<b>#{path}</b>\n\n "+
+			"Use your <b>/home/visualruby</b> folder for all your visualruby projects.", 
+			:parent => self,	
+			:headline => "Installing Example Projects...",
+			:width => 500) 	
 	end
 
-	#needed so tabs can be saved
-  def on_window1_delete_event
+	# needed so tabs can be saved, called before destroy, must return false to close wndow.
+  def window1__delete_event(*args)
 		save_state
-    return true unless @tabs.try_to_save_all()
+    return true unless @tabs.try_to_save_all(:ask=>true)
     return false #ok to close
   end
 
-	def destroy_window()    
-		super		    
-#		exit!  # note exit makes it not spit out buffer
+	def menuQuit__activate(*a)   
+		@builder[:window1].destroy
 	end
 
 end

data/bin/main/VR_Remote_Gem_Tree.rb

@@ -1,18 +1,14 @@
-
 class VR_Remote_Gem_Tree < GemTree
 
-#	PIX = Gdk::Pixbuf.new(File.dirname(__FILE__) + '/../../img/rb.png')
-
 	include GladeGUI
 
 	def initialize(main)
 		super()
 		@main = main
-#		set_title(PIX => "Gems on rubygems.org")
 		@gems = Hash.new
-		load_glade(__FILE__, main)
+		load_glade()  #for pop-up menu
+		parse_signals()
 	end
-
 
 	def refresh(force = true)
 		return if @t
@@ -35,29 +31,20 @@ class VR_Remote_Gem_Tree < GemTree
 
 	def selected_gem
 		row = self.selection.selected[1].split(" (")
-#		ver = row[1].gsub(")","") 
 		@gems.detect { |gem| gem['name'] == row[0] } #and gem['version'] == ver}
 	end
 
-	def popOpenRubygemsPage_clicked 		
+	def popOpenRubygemsPage__activate(*args) 		
 		gem = selected_gem()
 		VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{gem['project_uri']}")
  	end
 
-	def popOpenHomepage_clicked 
+	def popOpenHomepage__activate(*args) 
 		gem = selected_gem()
 		VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{gem['homepage_uri']}")
  	end
 
-#  def remoteGemTree_rclicked(w, event)
-#    if event.event_type == Gdk::Event::BUTTON_RELEASE
-#      if event.button == 3   # right mouse button
-# 				@builder['popGemRemote'].popup(nil, nil, event.button, event.time)
-#      end
-#    end
-#  end
-
-	def popYank_clicked
+	def popYank__activate(*args)
 		name, ver = get_name_ver(selection.selected[1])
 		reply = @api.yank_gem(name, ver)
 		@main.shell.buffer.text = "Yanking gem: #{name} #{ver}\n" + reply
@@ -67,4 +54,4 @@ class VR_Remote_Gem_Tree < GemTree
 end
 
 
-    #
+