visualruby 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfad4ea2ab9c0dc40116d83d3527b2c37eca5707
-  data.tar.gz: 0545e9a2bb43d8f25456f002be2f6de45d4a909d
+  metadata.gz: 4552b5a897a9e272236e07ca2bdb655aedc647cc
+  data.tar.gz: e7e23dcc3cf9b0f4dcd412b67dbfa2c93c8b9e37
 SHA512:
-  metadata.gz: 9d7a3d89a2780640937a303dd9eb51688e5cffa914241a808862fd84c589f7b92713f98927aa3f0963d70a936b435aad41061614372cea9ff159755d9074bd8d
-  data.tar.gz: 87860ddce8263104e234e071876270923cefc297eb8162ceb911f756c4bd44c3e74e492841c0c77aba890bb82ef2de4d2acec013b44b3bf434134d2827e0a873
+  metadata.gz: c091f19fc83fa88f941fa63ed59fe79577634314ac25960fa1d0896f329e918a64b1652fa04d44e5727c371442b2e92457d53fa5ed70175de3f21880d97d0908
+  data.tar.gz: dc1dd9d38f6fb5a71603e6f8a766c78ebcee43f334e32c4da02adb98dad0555c426ae3f07ffb3d62cac6332b13b268d38d928edcc111214193aa4ca3c83ecb37

data/.vr_settings.yaml

@@ -0,0 +1,27 @@
+--- !ruby/object:VR_ENV
+width: 1364
+height: 691
+panel_pos: 270
+run_command_line: ruby vr
+open_files:
+- "/home/eric/vrp/vr3/vrlib/lib/treeview/FileTreeView.rb"
+- "/home/eric/vrp/vr3/bin/main/VR_Main.rb"
+- "/home/eric/vrp/vr3/bin/main/OpenProject.rb"
+- "/home/eric/vrp/vr3/bin/main/ProjectTree.rb"
+- "/home/eric/vrp/vr3/bin/main/VR_ENV.rb"
+- "/home/eric/vrp/vr3/vr.gemspec"
+- "/home/eric/vrp/vr3/examples/settings_file/bin/SavableSettings.rb"
+- "/home/eric/vrp/vr3/bin/editor/VR_Tabs.rb"
+- "/home/eric/vrp/vr3/bin/editor/VR_TextShell.rb"
+- "/home/eric/vrp/vr3/bin/main/GemTree.rb"
+- "/home/eric/vrp/vr3/bin/main/VR_File_Tree.rb"
+- "/home/eric/vrp/vr3/bin/editor/VR_Document.rb"
+open_folders:
+- "/home/eric/vrp/vr3"
+current_file: "/home/eric/vrp/vr3/bin/editor/VR_Document.rb"
+rdoc_command_line: rdoc -x README -x /*.glade -x /*.yaml -x /*.gemspec -x /*.css
+vr_yaml_file: ".vr_settings.yaml"
+notebook_panel_position: 474
+current_line: 227
+builder: !ruby/object:Gtk::Builder {}
+top_level_window: false

data/bin/editor/VR_Document.rb

@@ -1,9 +1,9 @@
 
 class VR_Document < GtkSource::View
-	
-	include GladeGUI
-	include VR_TextViewCommon
-	
+  
+  include GladeGUI
+  include VR_TextViewCommon
+  
 
   attr_accessor :full_path_file  
 
@@ -23,204 +23,204 @@ class VR_Document < GtkSource::View
     @hilight = buffer.create_tag("hilight", { "background" => "#FFF0A0" })
     buffer.signal_connect("changed") { remove_tag(@hilight) }
     self.show_line_numbers = true 
-		self.insert_spaces_instead_of_tabs = true
-		self.indent_width = $VR_ENV_GLOBAL.tab_spaces.to_i
+    self.insert_spaces_instead_of_tabs = true
+    self.indent_width = $VR_ENV_GLOBAL.tab_spaces.to_i
     self.highlight_current_line = true
     self.set_cursor_visible(true)
     update_style()
   end
 
-	def get_language(fn)
-		case File.extname(full_path_file)
-			when ".rb", "", ".gemspec" ; return "ruby"
-			when ".erb", ".html" ; return "html"
-			else ; return ""
-		end
-	end
+  def get_language(fn)
+    case File.extname(full_path_file)
+      when ".rb", "", ".gemspec" ; return "ruby"
+      when ".erb", ".html" ; return "html"
+      else ; return ""
+    end
+  end
 
-	def update_style()
+  def update_style()
     override_font(Pango::FontDescription.new($VR_ENV_GLOBAL.font_name))
     tab_array = Pango::TabArray.new(1, true)
     tab_array.set_tab(0, Pango::TAB_LEFT, $VR_ENV_GLOBAL.tab_spaces.to_i * 8)  
     set_tabs(tab_array)
-	end
-
-	def reload_from_disk(fn = @full_path_file)
-		@full_path_file = fn
-		@title.label = File.basename(@full_path_file) 
-  	buffer.text = File.open(@full_path_file, "r").read if File.file?(@full_path_file.to_s) #protect against nil to_s    		
-   	buffer.modified = false
-		@modified_time = mod_time()
-	end
+  end
+
+  def reload_from_disk(fn = @full_path_file)
+    @full_path_file = fn
+    @title.label = File.basename(@full_path_file) 
+    buffer.text = File.open(@full_path_file, "r").read if File.file?(@full_path_file.to_s) #protect against nil to_s        
+     buffer.modified = false
+    @modified_time = mod_time()
+  end
 
-	def modified_time_matches()	
-		return true if @modified_time == mod_time()
-		text = "The file: <b>#{@full_path_file}</b>\n has been modified since you loaded it:\n\nYou loaded: #{@modified_time}\nOn disk: #{mod_time().to_s}\n\nDo you wnat to keep this version?\n"	
-		ans = alert(text, headline: "Warning!", width: 400, button_yes: "Keep Current Version", 
-						button_no: "Reload Disk Version", button_cancel: "Cancel", parent: @main)
-		if ans == true # yes, keep current 
-			write_to_disk()
-			return true
-		elsif ans == false # Reload From Disk
-			reload_from_disk()
-		end 
-		return false #abort!
-	end
+  def modified_time_matches()  
+    return true if @modified_time == mod_time()
+    text = "The file: <b>#{@full_path_file}</b>\n has been modified since you loaded it:\n\nYou loaded: #{@modified_time}\nOn disk: #{mod_time().to_s}\n\nDo you wnat to keep this version?\n"  
+    ans = alert(text, headline: "Warning!", width: 400, button_yes: "Keep Current Version", 
+            button_no: "Reload Disk Version", button_cancel: "Cancel", parent: @main)
+    if ans == true # yes, keep current 
+      write_to_disk()
+      return true
+    elsif ans == false # Reload From Disk
+      reload_from_disk()
+    end 
+    return false #abort!
+  end
  
 
-	def try_to_save(ask = true)
-		return false if not modified_time_matches()
-		return true if empty?
-		if (@title.label == "Untitled")
-			return save_changes? 
-		elsif (buffer.modified? and ask)  
-			return save_changes? 
-		elsif buffer.modified?
-			write_to_disk()
-			return true
-		else
-			return true
-		end		
-	end
+  def try_to_save(ask = true)
+    return false if not modified_time_matches()
+    return true if empty?
+    if (@title.label == "Untitled")
+      return save_changes? 
+    elsif (buffer.modified? and ask)  
+      return save_changes? 
+    elsif buffer.modified?
+      write_to_disk()
+      return true
+    else
+      return true
+    end    
+  end
 
   def write_to_disk(fn = @full_path_file)
-		@full_path_file = fn
+    @full_path_file = fn
     File.open(fn, "w")  { |f| f.puts(buffer.text) }
     buffer.modified = false
-		@modified_time = mod_time()
-		@title.label = File.basename(fn)
-		return true	
+    @modified_time = mod_time()
+    @title.label = File.basename(fn)
+    return true  
   end
 
-	def save_changes?
-		answer = alert "Save chages to:  <b> #{File.basename(@full_path_file)}</b> ?",
-							parent: @main, 
-							button_yes: "Save Changes", button_no: "Discard Changes",  
-							headline: "Save Changes?", button_cancel: "Cancel"
-		if answer == true # save
-			return @title.label == "Untitled" ? save_as() : write_to_disk()			
-		elsif answer == false # Discard Changes
-			reload_from_disk()
-			return true #continue without saving
-		end
-		return false #abort!	
-	end
+  def save_changes?
+    answer = alert "Save chages to:  <b> #{File.basename(@full_path_file)}</b> ?",
+              parent: @main, 
+              button_yes: "Save Changes", button_no: "Discard Changes",  
+              headline: "Save Changes?", button_cancel: "Cancel"
+    if answer == true # save
+      return @title.label == "Untitled" ? save_as() : write_to_disk()      
+    elsif answer == false # Discard Changes
+      reload_from_disk()
+      return true #continue without saving
+    end
+    return false #abort!  
+  end
 
 
 
 #todo update file tree, parent window?
   def save_as()  # returns false or complete file name.
     dialog = Gtk::FileChooserDialog.new(
-							title: "Save File As...",
+              title: "Save File As...",
               parent: @main.builder[:window1],
               action: :save,
               buttons: [["_Cancel", :cancel], ["_Save", :accept]])
 
-   	dialog.current_folder = File.dirname(@full_path_file)
-		dialog.current_name = VR_Document.get_class_title(buffer.text) 
-		resp = dialog.run 
-		dialog.hide
-		if resp == :accept
-			write_to_disk(dialog.filename)
-			@main.file_tree.refresh()
-			return true
-		end 
-		return false
+     dialog.current_folder = File.dirname(@full_path_file)
+    dialog.current_name = VR_Document.get_class_title(buffer.text) 
+    resp = dialog.run 
+    dialog.hide
+    if resp == :accept
+      write_to_disk(dialog.filename)
+      @main.file_tree.refresh()
+      return true
+    end 
+    return false
   end
 
  def jump_to_line(line_num, search_str = nil)
     while (Gtk.events_pending?)
       Gtk.main_iteration
     end
-		hilight_line(line_num)
+    hilight_line(line_num)
     iter = buffer.get_iter_at(:line => line_num - 1)
-    buffer.place_cursor(iter)		
+    buffer.place_cursor(iter)    
     mark = buffer.get_mark("insert")
     scroll_to_mark(mark, 0.1, true, 0.0, 0.5)
-		select_text(line_num - 1, search_str) if search_str
-  end
-	
-	def hilight_line(line)
-		remove_tag(@hilight)
-		apply_tag_to_line(line-1, @hilight, nil)
-	end
-
-	def indent(spaces)
-		return unless buffer.has_selection?
-		s,e = get_selected_lines()
-		(s..e).each do |i|
-			iter = buffer.get_iter_at(:line => i)
-			buffer.insert(iter, " " * spaces)
-		end
-	end
-
-	def unindent(spaces)
-		return unless buffer.has_selection?
-		s,e = get_selected_lines()
-		(s..e).each do |i|
-			iter, iter_end = get_line_iters(i)
-			if iter_end.offset >= iter.offset + 2
-				iter_end.offset = iter.offset + 2
-				t = buffer.get_text(iter, iter_end, false)
-				buffer.delete(iter, iter_end)
-				buffer.insert(iter,t.lstrip)
-			end
-		end
-	end
-
-	def comment()
-		return unless buffer.has_selection?
-		s,e = get_selected_lines()
-		(s..e).each do |i|
-			iter, iter_end = get_line_iters(i)
-			iter_end.offset = iter.offset+1
+    select_text(line_num - 1, search_str) if search_str
+  end
+  
+  def hilight_line(line)
+    remove_tag(@hilight)
+    apply_tag_to_line(line-1, @hilight, nil)
+  end
+
+  def indent(spaces)
+    return unless buffer.has_selection?
+    s,e = get_selected_lines()
+    (s..e).each do |i|
+      iter = buffer.get_iter_at(:line => i)
+      buffer.insert(iter, " " * spaces)
+    end
+  end
+
+  def unindent(spaces)
+    return unless buffer.has_selection?
+    s,e = get_selected_lines()
+    (s..e).each do |i|
+      iter, iter_end = get_line_iters(i)
+      if iter_end.offset >= iter.offset + 2
+        iter_end.offset = iter.offset + 2
+        t = buffer.get_text(iter, iter_end, false)
+        buffer.delete(iter, iter_end)
+        buffer.insert(iter,t.lstrip)
+      end
+    end
+  end
+
+  def comment()
+    return unless buffer.has_selection?
+    s,e = get_selected_lines()
+    (s..e).each do |i|
+      iter, iter_end = get_line_iters(i)
+      iter_end.offset = iter.offset+1
       chr = buffer.get_text(iter, iter_end, false)
       buffer.insert(iter, "#")
-		end	
-	end
-
-	def un_comment()
-		return unless buffer.has_selection?
-		s,e = get_selected_lines()
-		(s..e).each do |i|
-			iter, iter_end = get_line_iters(i)
+    end  
+  end
+
+  def un_comment()
+    return unless buffer.has_selection?
+    s,e = get_selected_lines()
+    (s..e).each do |i|
+      iter, iter_end = get_line_iters(i)
       next if iter_end.offset <=  iter.offset + 1
-			iter_end.offset = iter.offset+1
+      iter_end.offset = iter.offset+1
       chr = buffer.get_text(iter, iter_end, false)
-      buffer.delete(iter, iter_end) if chr == "#"  			
-		end	
-	end
-
-	def get_selected_lines()
-		return unless buffer.has_selection?
-		s,e = buffer.selection_bounds
-		return s.line, e.line 
-	end
-
-	def replace(str)
-		return unless buffer.has_selection?
-		s,e = buffer.selection_bounds
-		buffer.delete(s,e)
-		buffer.insert_at_cursor(str)
-	end
-
-	def selected_text()
-		s,e = buffer.selection_bounds
-		buffer.get_text(s, e, false)
-	end
-	
+      buffer.delete(iter, iter_end) if chr == "#"        
+    end  
+  end
+
+  def get_selected_lines()
+    return unless buffer.has_selection?
+    s,e = buffer.selection_bounds
+    return s.line, e.line 
+  end
+
+  def replace(str)
+    return unless buffer.has_selection?
+    s,e = buffer.selection_bounds
+    buffer.delete(s,e)
+    buffer.insert_at_cursor(str)
+  end
+
+  def selected_text()
+    s,e = buffer.selection_bounds
+    buffer.get_text(s, e, false)
+  end
+  
   def empty?()
     return buffer.text.strip == ''
   end
 
-	def self.get_class_title(source_code)
-		cn = /^\s*class\s+(\b\w+\b)/.match(source_code)
-		cn == nil ? "Untitled" : cn[1] + ".rb" 
-	end
-	
-	def mod_time()
-		return File.file?(@full_path_file) ? File.stat(@full_path_file).mtime : nil
-	end
+  def self.get_class_title(source_code)
+    cn = /^\s*class\s+(\b\w+\b)/.match(source_code)
+    cn == nil ? "Untitled" : cn[1] + ".rb" 
+  end
+  
+  def mod_time()
+    return File.file?(@full_path_file) ? File.stat(@full_path_file).mtime : nil
+  end
 
 end
      

data/bin/editor/VR_TabSearch.rb

@@ -1,47 +1,47 @@
  
 module VR_TabSearch 
 
-	def find_in_tabs(str)
-		out = "Search Results for:  " + str + "\n"
-		out += scan_for_text(str, @docs[self.page].buffer.text, @docs[self.page].full_path_file)
-		(0..self.n_pages-1).each do |i| 
-			if i != self.page
-				out += scan_for_text(str, @docs[i].buffer.text, @docs[i].full_path_file)
-			end
-		end
-		return out
-	end
+  def find_in_tabs(str)
+    out = "Search Results for:  " + str + "\n"
+    out += scan_for_text(str, @docs[self.page].buffer.text, @docs[self.page].full_path_file)
+    (0..self.n_pages-1).each do |i| 
+      if i != self.page
+        out += scan_for_text(str, @docs[i].buffer.text, @docs[i].full_path_file)
+      end
+    end
+    return out
+  end
 
-	def find_in_all(str)
-		out = "Search Results for:  " + str + "\n"
-		Find.find(Dir.pwd) do |path|
-			Find.prune if path =~ /\/glade$/ or path =~ /\/doc$/ #or File.directory?(path)
-			if (File.extname(path) == ".rb" or File.extname(path) == ".erb") and not File.directory?(path) 
-				txt = File.open(path, "r").read
-				out += scan_for_text(str, txt, path)
-			end
-		end
-		return out
-	end
+  def find_in_all(str)
+    out = "Search Results for:  " + str + "\n"
+    Find.find(Dir.pwd) do |path|
+      Find.prune if path =~ /\/glade$/ or path =~ /\/doc$/ #or File.directory?(path)
+      if (File.extname(path) == ".rb" or File.extname(path) == ".erb") and not File.directory?(path) 
+        txt = File.open(path, "r").read
+        out += scan_for_text(str, txt, path)
+      end
+    end
+    return out
+  end
 
-	def replace(str_replacement)
-		@docs[self.page].replace(str_replacement)
-	end
+  def replace(str_replacement)
+    @docs[self.page].replace(str_replacement)
+  end
 
-	def scan_for_text(str, txt, path)
-		i = 1
-		out = ''
-		txt.each_line do |line|
-			match = line.scan(str)
-			out += path + ':' + i.to_s + ": Found: "+ str + "\n" if match.size > 0
-			i += 1
-		end
-		return out
-	end	
+  def scan_for_text(str, txt, path)
+    i = 1
+    out = ''
+    txt.each_line do |line|
+      match = line.scan(str)
+      out += path + ':' + i.to_s + ": Found: "+ str + "\n" if match.size > 0
+      i += 1
+    end
+    return out
+  end  
 
-	def jump_to(line)
-		return if line.nil?	
-		load_tab(line[:path]) 
+  def jump_to(line)
+    return if line.nil?  
+    load_tab(line[:path]) 
     @docs[self.page].jump_to_line(line[:line], line[:search_str])
   end