visualruby 3.0.2 → 3.0.3

data/bin/editor/VR_Tabs.rb

@@ -3,118 +3,118 @@ class VR_Tabs < Gtk::Notebook
 
   attr_reader :docs  
 
-	include VR_TabSearch
+  include VR_TabSearch
 
   def initialize(main)
     super()
     @docs = Array.new
     @main = main
     @pix_close = Gdk::Pixbuf.new(File.dirname(__FILE__) + '/../../img/close.png')
-		@close_filename = File.dirname(__FILE__) + '/../../img/close.png'
-		self.scrollable = true #after super
-		self.expand = true
+    @close_filename = File.dirname(__FILE__) + '/../../img/close.png'
+    self.scrollable = true #after super
+    self.expand = true
   end
 
-	def update_style_all()
-		@docs.each { |doc| doc.update_style() }
-	end
+  def update_style_all()
+    @docs.each { |doc| doc.update_style() }
+  end
 
-	def try_to_save_all(flags)
-		ask = flags[:ask]
-		passed = true 
-		@docs.each do |doc|
-			unless doc.try_to_save(ask)
-				passed = false
-			end
-		end	
-		(n_pages).times { destroy_tab() }	if flags[:close]
-		return passed	
-	end
+  def try_to_save_all(flags)
+    ask = flags[:ask]
+    passed = true 
+    @docs.each do |doc|
+      unless doc.try_to_save(ask)
+        passed = false
+      end
+    end  
+    (n_pages).times { destroy_tab() }  if flags[:close]
+    return passed  
+  end
 
 ##todo update file_tree!
-#	def try_to_save_all(ask = true)
-#		@docs.each do |doc|
-#			return false unless doc.try_to_save(ask)
-#		end
-#	end
+#  def try_to_save_all(ask = true)
+#    @docs.each do |doc|
+#      return false unless doc.try_to_save(ask)
+#    end
+#  end
 #
 ##todo update file_tree!
-#	def try_to_close_all(ask = true)
-#		return false unless try_to_save_all(ask)
-#		(n_pages).times { destroy_tab() }
-#	end
+#  def try_to_close_all(ask = true)
+#    return false unless try_to_save_all(ask)
+#    (n_pages).times { destroy_tab() }
+#  end
 
 
   def switch_to(path)
-		i = @docs.index{ |d| d.full_path_file == path }
-		return false if i.nil?  
+    i = @docs.index{ |d| d.full_path_file == path }
+    return false if i.nil?  
     self.page = i if i != self.page
-		return true
+    return true
   end  
 
-	def set_contents(text)
-		if @docs[self.page].buffer.text == ""
-			@docs[self.page].buffer.text = text
-			@docs[self.page].buffer.modified = false
-		end
-	end
+  def set_contents(text)
+    if @docs[self.page].buffer.text == ""
+      @docs[self.page].buffer.text = text
+      @docs[self.page].buffer.modified = false
+    end
+  end
 
-	def load_tab(full_path_file = Dir.pwd + "/Untitled")
+  def load_tab(full_path_file = Dir.pwd + "/Untitled")
    return if switch_to(full_path_file)
-		box = Gtk::EventBox.new
-		tab = Gtk::Box.new(:horizontal)
-		img = Gtk::Image.new(:pixbuf => @pix_close)
-		box.add(img)
-		title = Gtk::Label.new(File.basename(full_path_file))
-		tab.pack_start(title, :expand=>true, :fill=>true, :padding=>2)
-		tab.pack_start(box)
+    box = Gtk::EventBox.new
+    tab = Gtk::Box.new(:horizontal)
+    img = Gtk::Image.new(:pixbuf => @pix_close)
+    box.add(img)
+    title = Gtk::Label.new(File.basename(full_path_file))
+    tab.pack_start(title, :expand=>true, :fill=>true, :padding=>2)
+    tab.pack_start(box)
     tab.show_all #needed
-		text = VR_Document.new(full_path_file, title, @main)
-		child = Gtk::ScrolledWindow.new
-		child.add(text)
-		box.signal_connect("button_release_event") {remove_id(text.object_id)}
-		#remove blank tab
-		if @docs.size == 1 and @docs[0].buffer.text.strip == "" 
-			@docs[0] = text
-			self.remove_page(0)
-		end
+    text = VR_Document.new(full_path_file, title, @main)
+    child = Gtk::ScrolledWindow.new
+    child.add(text)
+    box.signal_connect("button_release_event") {remove_id(text.object_id)}
+    #remove blank tab
+    if @docs.size == 1 and @docs[0].buffer.text.strip == "" 
+      @docs[0] = text
+      self.remove_page(0)
+    end
     child.show_all #needed
- 		append_page(child, tab)	
-		self.page = self.n_pages - 1
-		@docs[self.page] = text
-	end	
-	
-	#used when little 'x' image is clicked to close.
-	def remove_id(object_id)
-		i = @docs.index { |doc| doc.object_id == object_id }
-		if @docs[i].try_to_save(true)
-			destroy_tab(i) 
-		end
-	end
-	
-	#if its there, destroys it
-	def destroy_file_tab(file_name)
-		destroy_tab() if switch_to(file_name)
-	end
+     append_page(child, tab)  
+    self.page = self.n_pages - 1
+    @docs[self.page] = text
+  end  
+  
+  #used when little 'x' image is clicked to close.
+  def remove_id(object_id)
+    i = @docs.index { |doc| doc.object_id == object_id }
+    if @docs[i].try_to_save(true)
+      destroy_tab(i) 
+    end
+  end
+  
+  #if its there, destroys it
+  def destroy_file_tab(file_name)
+    destroy_tab() if switch_to(file_name)
+  end
 
 # this spits out a bunch of warnings on remove_page
-	def destroy_tab(tab = self.page)
+  def destroy_tab(tab = self.page)
     self.page = self.page - 1 # stops some warnings
     VR_Tools.clear_events
-#		self.set_tab_label(get_nth_page(tab), nil)
-  	self.remove_page(tab) 
+#    self.set_tab_label(get_nth_page(tab), nil)
+    self.remove_page(tab) 
     VR_Tools.clear_events  
-  	@docs.delete_at(tab)
-  	load_tab() if @docs.empty?
-	end
+    @docs.delete_at(tab)
+    load_tab() if @docs.empty?
+  end
 
-	def get_open_fn()
-		@docs.inject([]) { |ar, doc| ar << doc.full_path_file }
-	end
+  def get_open_fn()
+    @docs.inject([]) { |ar, doc| ar << doc.full_path_file }
+  end
 
-	def open_file_names(ar)
-		ar.each { |fn| load_tab(fn) if File.file?(fn) and fn.include? Dir.pwd}
+  def open_file_names(ar)
+    ar.each { |fn| load_tab(fn) if File.file?(fn) and fn.include? Dir.pwd}
    load_tab() if @docs.empty?
-	end
+  end
 
 end

data/bin/editor/VR_TextShell.rb

@@ -1,61 +1,58 @@
 
 class VR_TextShell < GtkSource::View
 
-	include VR_TextViewCommon
+  include VR_TextViewCommon
 
-	def initialize(tabs)
-		super()
-		@tabs = tabs
-		@current_line = 0
-		@lines = [] #needed
-		self.editable = false
-		@blue = buffer.create_tag("blue", { "foreground" => "#0000A0", "underline" => Pango::UNDERLINE_SINGLE  })
+  def initialize(tabs)
+    super()
+    @tabs = tabs
+    @current_line = 0
+    @lines = [] #needed
+    self.editable = false
+    @blue = buffer.create_tag("blue", { "foreground" => "#0000A0", "underline" => Pango::UNDERLINE_SINGLE  })
     self.highlight_current_line = true
-#		@hilight = buffer.create_tag("hilight", { "background" => "#FFF0A0" } )
-		signal_connect("button_release_event") { puts "release" ; jump_to(line_at_cursor() - 1) }  #buffer's lines start at 1  
-		signal_connect("key_release_event") { jump_to(line_at_cursor() - 1) }  #buffer's lines start at 1  
-	end
+    @hilight = buffer.create_tag("hilight", { "background" => "#FFF0A0" } )
+    signal_connect("button_release_event") { jump_to(line_at_cursor() - 1) }  #buffer's lines start at 1  
+    signal_connect("key_release_event") { jump_to(line_at_cursor() - 1) }  #buffer's lines start at 1  
+  end
 
+  def hilight_links(text, jump_to_first)
+    self.buffer.text = text
+    first_valid_line = load_lines()
+    (0..@lines.size - 1).each do |i|
+      next if @lines[i].nil?
+      apply_tag_to_line(i, @blue, @lines[i][:file_name] + ":" + @lines[i][:line].to_s)
+    end
+    @current_line = 0
+    @tabs.jump_to(first_valid_line) if jump_to_first and first_valid_line
+  end
 
-	def hilight_links(text, jump_to_first)
-		self.buffer.text = text
-		first_valid_line = load_lines()
-		(0..@lines.size - 1).each do |i|
-			next if @lines[i].nil?
-			apply_tag_to_line(i, @blue, @lines[i][:file_name] + ":" + @lines[i][:line].to_s)
-		end
-		@current_line = 0
-		@tabs.jump_to(first_valid_line) if jump_to_first and first_valid_line
-	end
-
-	def load_lines()
-		@lines = []
-		first = nil
-		reg = /^.*(#{Dir.pwd}[\w+|\/]*)\/([\w|\.]+):(\d+):/ 
-		reg_str =  /Found:\s(.+)$/
-		self.buffer.text. each_line do |l|
-			m = reg.match(l)
-			if m.nil?
-				@lines << nil
-			else 
-				m2 = reg_str.match(l)
-				search_str = (m2.nil?) ? "" : m2[1]   
-				@lines << { :path => m[1] + "/" + m[2], :file_name =>  m[2], :line =>  m[3].to_i, :search_str => search_str }
-				first ||= @lines.last 
-			end				
-		end
-		return first
-	end
-	
-	def jump_to(line_no = @current_line+1)
-puts "fed: " + line_no.to_s
-		return false if line_no > @lines.size 
-		@current_line = line_no
-#		remove_tag(@hilight)
-#		apply_tag_to_line(@current_line, @hilight, nil)
-puts "jumping to " + line_no.to_s + " = " + @lines[line_no].to_s
-		@tabs.jump_to(@lines[@current_line])
-		return false #must return false for button_up event
-	end
+  def load_lines()
+    @lines = []
+    first = nil
+    reg = /^.*(#{Dir.pwd}[\w+|\/]*)\/([\w|\.]+):(\d+):/ 
+    reg_str =  /Found:\s(.+)$/
+    self.buffer.text. each_line do |l|
+      m = reg.match(l)
+      if m.nil?
+        @lines << nil
+      else 
+        m2 = reg_str.match(l)
+        search_str = (m2.nil?) ? "" : m2[1]   
+        @lines << { :path => m[1] + "/" + m[2], :file_name =>  m[2], :line =>  m[3].to_i, :search_str => search_str }
+        first ||= @lines.last 
+      end        
+    end
+    return first
+  end
+  
+  def jump_to(line_no = @current_line+1)
+    return false if line_no > @lines.size 
+    @current_line = line_no
+    remove_tag(@hilight)
+    apply_tag_to_line(@current_line, @hilight, nil)
+    @tabs.jump_to(@lines[@current_line])
+    return false #must return false for button_up event
+  end
 
 end

data/bin/editor/VR_TextViewCommon.rb

@@ -1,46 +1,46 @@
 module VR_TextViewCommon
 
-	def get_line_iters(line, search_str = nil)
-		s = buffer.get_iter_at(:line => line)
-		e = get_end_iter(s)
-		if !search_str.nil?
-		s, e = s.forward_search(search_str, :text_only, e)
-		end
-		return s, e
-	end
-
-	def select_text(line, search_str = nil)
-			s, e = get_line_iters(line, search_str)
-			return if s.nil? or e.nil?
+  def get_line_iters(line, search_str = nil)
+    s = buffer.get_iter_at(:line => line)
+    e = get_end_iter(s)
+    if !search_str.nil?
+    s, e = s.forward_search(search_str, :text_only, e)
+    end
+    return s, e
+  end
+
+  def select_text(line, search_str = nil)
+      s, e = get_line_iters(line, search_str)
+      return if s.nil? or e.nil?
       buffer.place_cursor(s)
-#    	buffer.move_mark(buffer.get_mark("insert"),s)
-			buffer.move_mark(buffer.get_mark("selection_bound"), e)
-	end
+#      buffer.move_mark(buffer.get_mark("insert"),s)
+      buffer.move_mark(buffer.get_mark("selection_bound"), e)
+  end
 
 
-	def apply_tag_to_line(line, tag, search_str = nil)
-			s, e = get_line_iters(line, search_str)
-			buffer.apply_tag(tag, s, e)	
-	end
+  def apply_tag_to_line(line, tag, search_str = nil)
+      s, e = get_line_iters(line, search_str)
+      buffer.apply_tag(tag, s, e)  
+  end
 
-	
+  
 
-	def get_end_iter(iter)
+  def get_end_iter(iter)
     if iter.line == buffer.line_count - 1 # last line
       return buffer.end_iter 
     end
     return buffer.get_iter_at(:line => iter.line+1)
-	end
-	
-	def remove_tag(tag)
-		s, e = buffer.bounds
-		buffer.remove_tag(tag, s, e)	
-	end
-
-	def line_at_cursor()
+  end
+  
+  def remove_tag(tag)
+    s, e = buffer.bounds
+    buffer.remove_tag(tag, s, e)  
+  end
+
+  def line_at_cursor()
     cursor_pos = buffer.cursor_position
     iter = buffer.get_iter_at(:offset => cursor_pos)  #get_iter_at_offset depricated
-		return iter.line + 1
-	end
+    return iter.line + 1
+  end
 
 end

data/bin/main/GemTree.rb

@@ -1,23 +1,23 @@
 
 class GemTree < VR::ListView
 
-	RUBY_ICON = Gdk::Pixbuf.new(File.dirname(__FILE__) + '/../../img/rb.png')
+  RUBY_ICON = Gdk::Pixbuf.new(File.dirname(__FILE__) + '/../../img/rb.png')
 
-	def initialize()
-		hash = {:gems => {:pix => Gdk::Pixbuf, :gem => String}}
-		super(hash)
-		self.headers_visible = false
-		@api = RubygemsAPI.new
-	end
+  def initialize()
+    hash = {:gems => {:pix => Gdk::Pixbuf, :gem => String}}
+    super(hash)
+    self.headers_visible = false
+    @api = RubygemsAPI.new
+  end
 
-	def self__button_release_event(w, event)
-		return unless selection.selected and event.button == 3 #right mouse
-		@builder['popGem'].popup(nil, nil, event.button, event.time)
+  def self__button_release_event(w, event)
+    return unless selection.selected and event.button == 3 #right mouse
+    @builder['popGem'].popup(nil, nil, event.button, event.time)
   end
 
-	def get_name_ver(line)
-		match = /^(.*)\s+\((.*)\)/.match(line)
-		return match[1], match[2]
-	end
+  def get_name_ver(line)
+    match = /^(.*)\s+\((.*)\)/.match(line)
+    return match[1], match[2]
+  end
 
 end

data/bin/main/NewProjectGUI.rb

@@ -1,33 +1,33 @@
 
 class NewProjectGUI
 
-	include GladeGUI
+  include GladeGUI
 
-	attr_accessor :my_var
+  attr_accessor :my_var
 
-	def initialize(parent)
-		@parent = parent
-		@projects_home = $VR_ENV_GLOBAL.projects_home + "/"
-	end
+  def initialize(parent)
+    @parent = parent
+    @projects_home = $VR_ENV_GLOBAL.projects_home + "/"
+  end
 
-	def buttonCreate__clicked(*args)
-		fn = @builder["entryFolderName"].text
-		fn = fn.gsub(/[^\w\.\/]/, '_')
-		path = File.join($VR_ENV_GLOBAL.projects_home + "/" + fn)
-		if File.directory?(path)
-			alert "The folder <b>" + path + "</b> is already ok disk.  You can open it using the <b>Open Project</b> button.",
-				:headline=> "Project Already Exists", :parent => self, :width => 500
-		else
-			FileUtils.mkpath path
-			VR_Tools.copy_skeleton_project(path)
-			@parent.proj_path = path
-			@builder["window1"].destroy
-		end
-	end
+  def buttonCreate__clicked(*args)
+    fn = @builder["entryFolderName"].text
+    fn = fn.gsub(/[^\w\.\/]/, '_')
+    path = File.join($VR_ENV_GLOBAL.projects_home + "/" + fn)
+    if File.directory?(path)
+      alert "The folder <b>" + path + "</b> is already ok disk.  You can open it using the <b>Open Project</b> button.",
+        :headline=> "Project Already Exists", :parent => self, :width => 500
+    else
+      FileUtils.mkpath path
+      VR_Tools.copy_skeleton_project(path)
+      @parent.proj_path = path
+      @builder["window1"].destroy
+    end
+  end
 
-	def buttonCancel__clicked(*args)
-		@my_var = "Hello"
-#		@builder["window1"].destroy
-	end
+  def buttonCancel__clicked(*args)
+    @my_var = "Hello"
+#    @builder["window1"].destroy
+  end
 
 end

data/bin/main/OpenProject.rb

@@ -1,69 +1,69 @@
 
 class OpenProject
 
-	include GladeGUI
+  include GladeGUI
 
-	def initialize(parent)
-		@parent = parent
-		@projects_home = $VR_ENV_GLOBAL.projects_home
-	end
+  def initialize(parent)
+    @parent = parent
+    @projects_home = $VR_ENV_GLOBAL.projects_home
+  end
 
-	def before_show
-		@ftv = ProjectTree.new()
-		@ftv.set_show_expanders(false)
-		@builder["view"].add(@ftv)
-		@ftv.visible = true
-	end
+  def before_show
+    @ftv = ProjectTree.new()
+    @ftv.set_show_expanders(false)
+    @builder["view"].add(@ftv)
+    @ftv.visible = true
+  end
 
-	def ftv__cursor_changed(*a)
-		return unless row = @ftv.selected_rows.first
-		@ftv.expand_or_collapse_folder() 
-	end
+  def ftv__cursor_changed(*a)
+#    return unless row = @ftv.selected_rows.first
+    @ftv.expand_or_collapse_folder() 
+  end
 
   def ftv__row_activated(_self, path, col)
-		buttonOpen__clicked 
-	end
+    buttonOpen__clicked 
+  end
 
-	def buttonChange__clicked(*a)
-		$VR_ENV_GLOBAL.show_glade(self)
-		@projects_home = $VR_ENV_GLOBAL.projects_home
-		@ftv.refresh(:root => @projects_home)
-		@builder[:projects_home].label = @projects_home
-	end
+  def buttonChange__clicked(*a)
+    $VR_ENV_GLOBAL.show_glade(self)
+    @projects_home = $VR_ENV_GLOBAL.projects_home
+    @ftv.refresh(:root => @projects_home)
+    @builder[:projects_home].label = @projects_home
+  end
 
-	def buttonDelete__clicked(*a)
-  	return unless row = @ftv.selected_rows.first
-		return if row[:path] == Dir.pwd  #can't delete current project
-		if alert("Do you really want to delete  \n<b>" + row[:path] + " </b>?", 
-				parent: self, headline: "Warning!", button_yes: "Delete", button_no: "Cancel", width: 400)
-  		FileUtils.remove_dir(row[:path], true)
-			@ftv.refresh()
-  	end
-	end
+  def buttonDelete__clicked(*a)
+    return unless row = @ftv.selected_rows.first
+    return if row[:path] == Dir.pwd  #can't delete current project
+    if alert("Do you really want to delete  \n<b>" + row[:path] + " </b>?", 
+        parent: self, headline: "Warning!", button_yes: "Delete", button_no: "Cancel", width: 400)
+      FileUtils.remove_dir(row[:path], true)
+      @ftv.refresh()
+    end
+  end
 
-	def buttonOpen__clicked(*a)
-  		return unless row = @ftv.selected_rows.first
-			test_file = File.join(row[:path], VR_ENV::SETTINGS_FILE)
-			if File.exists?(test_file) 
- 				@parent.proj_path = row[:path]
-				buttonCancel__clicked
-			else
-#				alert("This is not a visualruby project.  It's a folder that holds visualruby projects.", :parent=>self, :width=>400)
-				@ftv.expand_or_collapse_folder()
-			end
-	end
+  def buttonOpen__clicked(*a)
+      return unless row = @ftv.selected_rows.first
+      test_file = File.join(row[:path], VR_ENV::SETTINGS_FILE)
+      if File.exists?(test_file) 
+         @parent.proj_path = row[:path]
+        buttonCancel__clicked
+      else
+#        alert("This is not a visualruby project.  It's a folder that holds visualruby projects.", :parent=>self, :width=>400)
+        @ftv.expand_or_collapse_folder()
+      end
+  end
 
-	def buttonNew__clicked(*a)
-		old_proj_path = @parent.proj_path
-		NewProjectGUI.new(@parent).show_glade(self)
-		@builder[:window1].destroy if @parent.proj_path != old_proj_path  #new path created!
-	end
+  def buttonNew__clicked(*a)
+    old_proj_path = @parent.proj_path
+    NewProjectGUI.new(@parent).show_glade(self)
+    @builder[:window1].destroy if @parent.proj_path != old_proj_path  #new path created!
+  end
 
 
-	def buttonCancel__clicked(*a) #save state
-		$VR_ENV_GLOBAL.projects_home_open_folders = @ftv.get_open_folders()
-		VR::save_yaml($VR_ENV_GLOBAL)
-		@builder["window1"].destroy		
-	end
+  def buttonCancel__clicked(*a) #save state
+    $VR_ENV_GLOBAL.projects_home_open_folders = @ftv.get_open_folders()
+    VR::save_yaml($VR_ENV_GLOBAL)
+    @builder["window1"].destroy    
+  end
 
 end