visualruby 3.0.2 → 3.0.3

data/bin/main/VR_Main.rb

@@ -1,292 +1,294 @@
 class VR_Main 
 
-	include GladeGUI
-
-	attr_accessor :proj_path, :tabs, :shell, :builder, :file_tree	
-	
-  def initialize(argv)
-		@proj_path = argv[0] ? argv[0] : Dir.pwd
-		@proj_path = @proj_path.chomp("/")
-	end
-
-	def before_show
-		# 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["boxTabs"].add(@tabs)
+  include GladeGUI
+
+  attr_accessor :proj_path, :tabs, :shell, :builder, :file_tree  
+  
+  def initialize(argv, splash)
+    @splash = splash
+    @proj_path = argv[0] ? argv[0] : Dir.pwd
+    @proj_path = @proj_path.chomp("/")
+  end
+
+  def before_show
+    # 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["boxTabs"].add(@tabs)
     @tabs.show
 
-		#add shell textview
-		@shell = VR_TextShell.new(@tabs)
-		@builder["scrollShell"].add(@shell)
+    #add shell textview
+    @shell = VR_TextShell.new(@tabs)
+    @builder["scrollShell"].add(@shell)
     @shell.show
 
-		#add local gem tab
-		@gem_tree = VR_Local_Gem_Tree.new(self)
-		@builder['scrolledLocalGems'].add(@gem_tree)
+    #add local gem tab
+    @gem_tree = VR_Local_Gem_Tree.new(self)
+    @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)
+    #add remote gem tab
+    @remote_gem_tree = VR_Remote_Gem_Tree.new(self)
+    @builder["scrolledRemoteGems"].add(@remote_gem_tree)
     @remote_gem_tree.show
-	
+
+    @splash[:window1].destroy 
+    Gtk.main_quit
+  
     unless project_valid?(@proj_path)
-			toolOpenFolder__clicked
-		end
+      toolOpenFolder__clicked
+    end
 
     if project_valid?(@proj_path)
-		  load_project
+      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() # assumes valid_project? is true
-		FileUtils.cd(@proj_path)
-		@builder['window1'].title = "VR: " + File.basename(Dir.pwd)
-		@builder["labelStatus"].label = Dir.pwd
-		@file_tree.root = @proj_path
-		@file_tree.refresh()
-		@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 toolOpenFolder__clicked(*a)
-		save_state
-		return unless @tabs.try_to_save_all(:ask=>true)
-		old_path = @proj_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
-		case @builder['notebookTree'].page
-			when 1 then @gem_tree.refresh() 
-			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) 
-	end
-
-	def menuSettings__activate(*a)
-		$VR_ENV.show_glade(self)
-	end
-
-	def menuGlobalSettings__activate(*a)
-		$VR_ENV_GLOBAL.show_glade(self)
-		@tabs.update_style_all()
-	end
-
-	def menuWWWRubygems__activate(*a)
-		VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} https://rubygems.org/users/new")
-	end
-
-	def menuSaveAll__activate(*a)
-		@tabs.try_to_save_all(:ask=>false) # don't prompt 
-	end
-
-	def menuNew__activate(*a)
+
+  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() # assumes valid_project? is true
+    FileUtils.cd(@proj_path)
+    @builder['window1'].title = "VR: " + File.basename(Dir.pwd)
+    @builder["labelStatus"].label = Dir.pwd
+    @file_tree.root = @proj_path
+    @file_tree.refresh()
+    @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 toolOpenFolder__clicked(*a)
+    save_state
+    return unless @tabs.try_to_save_all(:ask=>true)
+    old_path = @proj_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
+    case @builder['notebookTree'].page
+      when 1 then @gem_tree.refresh() 
+      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) 
+  end
+
+  def menuSettings__activate(*a)
+    $VR_ENV.show_glade(self)
+  end
+
+  def menuGlobalSettings__activate(*a)
+    $VR_ENV_GLOBAL.show_glade(self)
+    @tabs.update_style_all()
+  end
+
+  def menuWWWRubygems__activate(*a)
+    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} https://rubygems.org/users/new")
+  end
+
+  def menuSaveAll__activate(*a)
+    @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(*a)
+    case @builder['notebookTree'].page
+      when 0 then @file_tree.refresh()
+      when 1 then @gem_tree.refresh()
+      when 2 then @remote_gem_tree.refresh()
+    end
+  end
+
+  def toolSave__clicked(*a)  # saves open tab
+    @tabs.docs[@tabs.page].try_to_save(false) # false = don't ask
+  end  
+
+  def menuNewWindow__activate(*a)
+    fn = File.dirname(__FILE__) + "/../../skeleton/document/NewWindow.rb"
     @tabs.load_tab()
-	end
-
-	def menuSaveAs__activate(*a)
-		@tabs.docs[@tabs.page].save_as()
-	end
-
-	def toolRefresh__clicked(*a)
-		case @builder['notebookTree'].page
-			when 0 then @file_tree.refresh()
-			when 1 then @gem_tree.refresh()
-			when 2 then @remote_gem_tree.refresh()
-		end
-	end
-
-	def toolSave__clicked(*a)  # saves open tab
-		@tabs.docs[@tabs.page].try_to_save(false) # false = don't ask
-	end	
-
-	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(:ask=>true)
-		old_path = @proj_path
-		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(*a)
+    @tabs.set_contents(File.open(fn).read)    
+  end
+
+  def menuNewProject__activate(*a)
+    save_state
+    return unless @tabs.try_to_save_all(:ask=>true)
+    old_path = @proj_path
+    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(*a)
    return unless @tabs.try_to_save_all(:ask=>true)
-		VR_Tools.back_up()
+    VR_Tools.back_up()
   end
 
-	def toolIndent__clicked(*a)
-		@tabs.docs[@tabs.page].indent($VR_ENV_GLOBAL.tab_spaces)
+  def toolIndent__clicked(*a)
+    @tabs.docs[@tabs.page].indent($VR_ENV_GLOBAL.tab_spaces)
   end
 
-	def toolUnIndent__clicked(*a)
-		@tabs.docs[@tabs.page].unindent($VR_ENV_GLOBAL.tab_spaces)
+  def toolUnIndent__clicked(*a)
+    @tabs.docs[@tabs.page].unindent($VR_ENV_GLOBAL.tab_spaces)
   end
 
-	def toolComment__clicked(*a)
-		@tabs.docs[@tabs.page].comment()
+  def toolComment__clicked(*a)
+    @tabs.docs[@tabs.page].comment()
   end
 
-	def toolUnComment__clicked(*a)
-		@tabs.docs[@tabs.page].un_comment()
-	end
+  def toolUnComment__clicked(*a)
+    @tabs.docs[@tabs.page].un_comment()
+  end
 
-	def toolRun__clicked(*a)
-   	run_command($VR_ENV.run_command_line)
-  end 		
+  def toolRun__clicked(*a)
+     run_command($VR_ENV.run_command_line)
+  end     
 
-	def run_command(cmd)
+  def run_command(cmd)
     save_state()
     return unless @tabs.try_to_save_all(:ask => false) # false = don't prompt for changes to files
-		cur_dir = Dir.pwd
+    cur_dir = Dir.pwd
     result = "\n#{cur_dir}$ #{cmd}\n"
     result += `#{cmd} 2>&1`
-		FileUtils.cd(cur_dir)
-		@shell.hilight_links(result, true)
-	end
+    FileUtils.cd(cur_dir)
+    @shell.hilight_links(result, true)
+  end
 
   def save_state
-		return unless $VR_ENV
+    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.current_line = @tabs.docs[@tabs.page].line_at_cursor()
+    $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)
+  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["panelNotebook"].set_position($VR_ENV.notebook_panel_position)
+    @builder["panelNotebook"].set_position($VR_ENV.notebook_panel_position)
     @tabs.open_file_names($VR_ENV.open_files)
     @file_tree.open_folders($VR_ENV.open_folders)
     @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.refresh()
-		end
-	end
-
-	def buttonNext_clicked
-		@shell.jump_to()
-	end
-
-	def buttonFind_clicked
-		str = @builder["entryFind"].text
-		str = str.length < 2 ? @tabs.docs[@tabs.page].selected_text() : str
-		return if str.length < 2
-		text = (@builder["radioOnDisk"].active?) ? @tabs.find_in_all(str) : @tabs.find_in_tabs(str)		
-		@shell.hilight_links(text, false)
-	end	
-
-	def buttonReplace_clicked
-		@tabs.docs[@tabs.page].replace(@builder[:entryReplace].text)
-	end
-
-	def entryFind_key_press(me, evt)
-		return if evt.keyval != 65293 #enter key
-		buttonFind_clicked
-	end
-
-	def menuTutorials__activate(*a)
-		VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} http://www.visualruby.net")
-  end
-	
-	def menuInstallExamples__activate(*a)
-		path = File.join(ENV["HOME"], "", "visualruby", "examples")
-		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, called before destroy, must return false to close wndow.
+    @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.refresh()
+    end
+  end
+
+  def buttonNext_clicked
+    @shell.jump_to()
+  end
+
+  def buttonFind_clicked
+    str = @builder["entryFind"].text
+    str = str.length < 2 ? @tabs.docs[@tabs.page].selected_text() : str
+    return if str.length < 2
+    text = (@builder["radioOnDisk"].active?) ? @tabs.find_in_all(str) : @tabs.find_in_tabs(str)    
+    @shell.hilight_links(text, false)
+  end  
+
+  def buttonReplace_clicked
+    @tabs.docs[@tabs.page].replace(@builder[:entryReplace].text)
+  end
+
+  def entryFind_key_press(me, evt)
+    return if evt.keyval != 65293 #enter key
+    buttonFind_clicked
+  end
+
+  def menuTutorials__activate(*a)
+    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} http://www.visualruby.net")
+  end
+  
+  def menuInstallExamples__activate(*a)
+    path = File.join(ENV["HOME"], "", "visualruby", "examples")
+    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, called before destroy, must return false to close wndow.
   def window1__delete_event(*args)
-		save_state
+    save_state
     return true unless @tabs.try_to_save_all(:ask=>true)
     return false #ok to close
   end
 
-	def menuQuit__activate(*a)   
-		@builder[:window1].destroy
-	end
+  def menuQuit__activate(*a)   
+    @builder[:window1].destroy
+  end
 
 end

data/bin/main/VR_Remote_Gem_Tree.rb

@@ -1,20 +1,20 @@
 class VR_Remote_Gem_Tree < GemTree
 
-	include GladeGUI
-
-	def initialize(main)
-		super()
-		@main = main
-		@gems = Hash.new
-		load_glade()  #for pop-up menu
-		parse_signals()
-	end
-
-	def refresh(force = true)
-		return if @t
-		return unless force or not self.model.iter_first
-		return unless @api.get_key()
-		@t = Thread.new do 
+  include GladeGUI
+
+  def initialize(main)
+    super()
+    @main = main
+    @gems = Hash.new
+    load_glade()  #for pop-up menu
+    parse_signals()
+  end
+
+  def refresh(force = true)
+    return if @t
+    return unless force or not self.model.iter_first
+    return unless @api.get_key()
+    @t = Thread.new do 
       @main.shell.buffer.text += "\nContacting rubygems.org..." 
       self.model.clear
       return unless @gems = @api.get_obj_url("/api/v1/gems.yaml")
@@ -22,34 +22,34 @@ class VR_Remote_Gem_Tree < GemTree
         gem_info = @api.get_obj_url("/api/v1/versions/#{gem['name']}.yaml")
         gem_info.each do |info|
           self.add_row(:pix => RUBY_ICON, :gem => "#{gem['name']} (#{info['number']})") 
-      	end
+        end
       end
       @t.join
-		end
-		@t = false
-	end
-
-	def selected_gem
-		row = self.selection.selected[1].split(" (")
-		@gems.detect { |gem| gem['name'] == row[0] } #and gem['version'] == ver}
-	end
-
-	def popOpenRubygemsPage__activate(*args) 		
-		gem = selected_gem()
-		VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{gem['project_uri']}")
- 	end
-
-	def popOpenHomepage__activate(*args) 
-		gem = selected_gem()
-		VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{gem['homepage_uri']}")
- 	end
-
-	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
-		self.model.remove(selection.selected) if reply.include? "OK"
-	end
+    end
+    @t = false
+  end
+
+  def selected_gem
+    row = self.selection.selected[1].split(" (")
+    @gems.detect { |gem| gem['name'] == row[0] } #and gem['version'] == ver}
+  end
+
+  def popOpenRubygemsPage__activate(*args)     
+    gem = selected_gem()
+    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{gem['project_uri']}")
+   end
+
+  def popOpenHomepage__activate(*args) 
+    gem = selected_gem()
+    VR_Tools.popen("#{$VR_ENV_GLOBAL.browser} #{gem['homepage_uri']}")
+   end
+
+  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
+    self.model.remove(selection.selected) if reply.include? "OK"
+  end
 
 end
 

data/bin/main/glade/Splash.glade

@@ -0,0 +1,19 @@
+<?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="modal">True</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">splashscreen</property>
+    <property name="decorated">False</property>
+    <child>
+      <object class="GtkImage" id="image1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="stock">gtk-missing-image</property>
+      </object>
+    </child>
+  </object>
+</interface>