visualruby 1.0.19 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7192ef3fc85bc4b795a31210c16af1270a939f5e
-  data.tar.gz: 0f8f7694df78b11a6bb71d38c55e69a50d06a5a5
+  metadata.gz: dfad4ea2ab9c0dc40116d83d3527b2c37eca5707
+  data.tar.gz: 0545e9a2bb43d8f25456f002be2f6de45d4a909d
 SHA512:
-  metadata.gz: f357c4e45a899939125cb4f8cf6e811e9a00535396d3ac06f343d2792cbf9e267d469ce409b12254645cf599baddbaec555a3f751abb38027004ecb5db38f98c
-  data.tar.gz: 4a928510cf42bbd62700de6a1ab040f70394e0a77953059ddb391da196d0834350eded0824a01c377efa06d6f900b3d787a82fae97ebecc1ae0304000bf2fd20
+  metadata.gz: 9d7a3d89a2780640937a303dd9eb51688e5cffa914241a808862fd84c589f7b92713f98927aa3f0963d70a936b435aad41061614372cea9ff159755d9074bd8d
+  data.tar.gz: 87860ddce8263104e234e071876270923cefc297eb8162ceb911f756c4bd44c3e74e492841c0c77aba890bb82ef2de4d2acec013b44b3bf434134d2827e0a873

data/Splash.rb

@@ -0,0 +1,40 @@
+require "gtk3"
+
+def load_everything
+  require "rubygems"
+  require "gtksourceview3"
+  require "yaml" #needed
+  require "net/http" #needed
+  require "net/https" #needed
+  require "find" #needed
+  require "fileutils" #needed
+  require "rubygems/installer"
+  require "rubygems/uninstaller"
+  require "rubygems/package"
+  require "rubygems/specification"
+  require "date"
+  
+  require 'require_all'
+
+  require_rel 'vrlib/lib/'
+  require_rel 'bin/'
+
+  VR_Main.new(ARGV).show_glade()
+
+end
+
+$splash = Gtk::Window.new()
+image = Gtk::Image.new(:file => "img/splash.png")
+$splash.add image
+$splash.decorated = false
+$splash.position = :center_always
+$splash.show_all
+
+
+GLib::Timeout.add(40) {     
+    load_everything 
+}
+
+Gtk.main
+
+

data/bin/editor/VR_Document.rb

@@ -1,6 +1,6 @@
 
-class VR_Document < Gtk::SourceView
-	
+class VR_Document < GtkSource::View
+	
 	include GladeGUI
 	include VR_TextViewCommon
 	
@@ -12,36 +12,36 @@ class VR_Document < Gtk::SourceView
     super()
     @title = title_label #reference to label on tab
     reload_from_disk(full_path_file) 
-    signal_connect("visibility_notify_event") { scroll_to_cursor() }
     hilight_current_line = true
     show_right_margin = true
     right_margin_position = 80
     auto_indent = true
-    lang = Gtk::SourceLanguageManager.new.get_language(get_language(full_path_file))  # 'ruby') if [".rb", "", ".gemspec"].include? File.extname(full_path_file)
+    lang = GtkSource::LanguageManager.new.get_language(get_language(full_path_file))  
     buffer.language = lang
     buffer.highlight_syntax = true
-    #		buffer.highlight_matching_brackets = true
-    wrap_mode = Gtk::TextTag::WRAP_WORD
-    buffer.create_tag("hilight", { "background" => "#FFF0A0" })
-    buffer.create_tag("hilight_red",{ "background" => "#FFC0C0" })
-    buffer.signal_connect("changed") { remove_tag("hilight") }
-    self.show_line_numbers = true 
-    load_glade(__FILE__) #for save dialogs
+    buffer.highlight_matching_brackets = false
+    @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.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
+
+	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()
-    modify_font(Pango::FontDescription.new($VR_ENV_GLOBAL.font_name))
+    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 * 8)  
+    tab_array.set_tab(0, Pango::TAB_LEFT, $VR_ENV_GLOBAL.tab_spaces.to_i * 8)  
     set_tabs(tab_array)
 	end
 
@@ -49,24 +49,24 @@ class VR_Document < Gtk::SourceView
 		@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
+   	buffer.modified = false
 		@modified_time = mod_time()
 	end
-
+
 	def modified_time_matches()	
-		return true if @modified_time == mod_time()	
-		d = @builder["dialogModifiedTime"]
-		@builder["labelModified"].markup = "<big><big><b>WARNING!</b></big></big>\n\nThe 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"
-		resp = d.run
-		d.hide
-    if resp == 2 # Keep Current Version
+		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 resp == 1 # Reload From Disk
+		elsif ans == false # Reload From Disk
 			reload_from_disk()
 		end 
 		return false #abort!
-	end
+	end
+ 
 
 	def try_to_save(ask = true)
 		return false if not modified_time_matches()
@@ -84,7 +84,6 @@ class VR_Document < Gtk::SourceView
 	end
 
   def write_to_disk(fn = @full_path_file)
-#		modify_base(Gtk::STATE_NORMAL, Gdk::Color.parse("#FFFFFF"))
 		@full_path_file = fn
     File.open(fn, "w")  { |f| f.puts(buffer.text) }
     buffer.modified = false
@@ -92,105 +91,113 @@ class VR_Document < Gtk::SourceView
 		@title.label = File.basename(fn)
 		return true	
   end
-
+
 	def save_changes?
-		d = @builder["dialogSave"]
-		@builder["labelSave"].markup = "Save changes to:  <b>#{File.basename(@full_path_file)}</b>?"
-		resp = d.run
-		d.hide
-    if resp == 2 # Save Changes
-			return @title.label == "Untitled" ? save_as() : write_to_disk()
-		elsif resp == 1 # Discard 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
-		else 
-			return false #abort!
 		end
-	end
+		return false #abort!	
+	end
+
+
 
 #todo update file tree, parent window?
   def save_as()  # returns false or complete file name.
-    dialog = Gtk::FileChooserDialog.new("Save File As...",
-                                     @builder['window1'],
-                                     Gtk::FileChooser::ACTION_SAVE,
-                                     nil,
-                                     [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-                                     [Gtk::Stock::SAVE, Gtk::Dialog::RESPONSE_ACCEPT])
-    dialog.current_folder = File.dirname(@full_path_file)
+    dialog = Gtk::FileChooserDialog.new(
+							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 == Gtk::Dialog::RESPONSE_ACCEPT 
+		if resp == :accept
 			write_to_disk(dialog.filename)
-			@main.file_tree.insert(dialog.filename)
+			@main.file_tree.refresh()
 			return true
 		end 
 		return false
-  end
+  end
 
- def jump_to_line(line_num, search_str="")
+ def jump_to_line(line_num, search_str = nil)
+    while (Gtk.events_pending?)
+      Gtk.main_iteration
+    end
 		hilight_line(line_num)
-    iter = buffer.get_iter_at_line(line_num)
-    mark = buffer.create_mark("error", iter, true)
-    scroll_to_mark(mark, 0.0, true, 0.0, 0.5)
-    buffer.place_cursor(iter)	
-		scroll_to_cursor
-		select_text(line_num, search_str)
+    iter = buffer.get_iter_at(:line => line_num - 1)
+    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, "hilight", nil)
+		remove_tag(@hilight)
+		apply_tag_to_line(line-1, @hilight, nil)
 	end
 
-	def indent(spaces)
+	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)
+			iter = buffer.get_iter_at(:line => i)
 			buffer.insert(iter, " " * spaces)
 		end
 	end
 
-	def unindent(spaces)
+	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)
+				t = buffer.get_text(iter, iter_end, false)
 				buffer.delete(iter, iter_end)
 				buffer.insert(iter,t.lstrip)
 			end
 		end
 	end
 
-	def comment()
+	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)
+      chr = buffer.get_text(iter, iter_end, false)
       buffer.insert(iter, "#")
 		end	
 	end
 
-	def un_comment()
+	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
-      chr = buffer.get_text(iter, iter_end)
+      chr = buffer.get_text(iter, iter_end, false)
       buffer.delete(iter, iter_end) if chr == "#"  			
 		end	
 	end
 
-	def get_selected_lines()
-		s,e = buffer.selection_bounds
-		return s.line, e.line
+	def get_selected_lines()
+		return unless buffer.has_selection?
+		s,e = buffer.selection_bounds
+		return s.line, e.line 
 	end
 
-	def replace(str)
+	def replace(str)
 		return unless buffer.has_selection?
 		s,e = buffer.selection_bounds
 		buffer.delete(s,e)
@@ -199,7 +206,7 @@ class VR_Document < Gtk::SourceView
 
 	def selected_text()
 		s,e = buffer.selection_bounds
-		buffer.get_text(s, e)
+		buffer.get_text(s, e, false)
 	end
 	
   def empty?()

data/bin/editor/VR_TabSearch.rb

@@ -1,5 +1,5 @@
-
-module VR_TabSearch #grh
+ 
+module VR_TabSearch 
 
 	def find_in_tabs(str)
 		out = "Search Results for:  " + str + "\n"
@@ -13,7 +13,7 @@ module VR_TabSearch #grh
 	end
 
 	def find_in_all(str)
-		out = "Search Res ults for:  " + str + "\n"
+		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) 
@@ -41,10 +41,8 @@ module VR_TabSearch #grh
 
 	def jump_to(line)
 		return if line.nil?	
-	  if not switch_to(line[:path]) #full path file
-			load_tab(line[:path])
-		end 
-    @docs[self.page].jump_to_line(line[:line] - 1, line[:search_str])
+		load_tab(line[:path]) 
+    @docs[self.page].jump_to_line(line[:line], line[:search_str])
   end
 
 end

data/bin/editor/VR_Tabs.rb

@@ -5,35 +5,50 @@ class VR_Tabs < Gtk::Notebook
 
 	include VR_TabSearch
 
-  def initialize(main)
+  def initialize(main)
+    super()
     @docs = Array.new
     @main = main
-    @pix_close = Gdk::Pixbuf.new(File.dirname(__FILE__) + '/../../img/close.png')
-    super()
+    @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
   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
 
-#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
-
-#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
+##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
+#
+##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 switch_to(path)
 		i = @docs.index{ |d| d.full_path_file == path }
-		return false if i.nil? 
-		self.page = i if i != self.page
+		return false if i.nil?  
+    self.page = i if i != self.page
 		return true
   end  
 
@@ -45,16 +60,16 @@ class VR_Tabs < Gtk::Notebook
 	end
 
 	def load_tab(full_path_file = Dir.pwd + "/Untitled")
-    return if switch_to(full_path_file)
-		tab = Gtk::HBox.new
+   return if switch_to(full_path_file)
 		box = Gtk::EventBox.new
-		img = Gtk::Image.new(@pix_close)
+		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, true, true, 2)
-		tab.pack_start(box)
-		tab.show_all
-		text = VR_Document.new(full_path_file, title, @main)
+		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)}
@@ -62,28 +77,34 @@ class VR_Tabs < Gtk::Notebook
 		if @docs.size == 1 and @docs[0].buffer.text.strip == "" 
 			@docs[0] = text
 			self.remove_page(0)
-		end
- 		append_page(child, tab)				
-		@main.builder['window1'].show_all
-		self.page = self.n_pages-1
-		@docs[self.page] = text
+		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 }
-		destroy_tab(i) if @docs[i].try_to_save()
-		 # remove_tab(i) #if not i.nil?
+		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
-
-	def destroy_tab(tab = self.page)
-  	@docs.delete_at(tab)
-  	self.remove_page(tab) 
+
+# this spits out a bunch of warnings on remove_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) 
+    VR_Tools.clear_events  
+  	@docs.delete_at(tab)
   	load_tab() if @docs.empty?
 	end
 

data/bin/editor/VR_TextShell.rb

@@ -1,5 +1,5 @@
 
-class VR_TextShell < Gtk::TextView
+class VR_TextShell < GtkSource::View
 
 	include VR_TextViewCommon
 
@@ -9,49 +9,25 @@ class VR_TextShell < Gtk::TextView
 		@current_line = 0
 		@lines = [] #needed
 		self.editable = false
-		buffer.create_tag("blue", { "foreground" => "#0000A0", "underline" => Pango::UNDERLINE_SINGLE  })
-		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  
-#		self.buffer.signal_connect("changed") { buffer__changed() }
+		@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
 
-# @buffer.signal_connect("changed") {
-#      eob_mark = 
-#@output.buffer.create_mark(nil,@output.buffer.start_iter.forward_to_end,false)
-#      @output.scroll_mark_onscreen(eob_mark)
-#    }
-
-	def buffer__move_cursor
-		remove_tag("hilight")
-#		place_cursor_onscreen
-		line = line_at_cursor()
-		apply_tag_to_line(line, "hilight")
-	end
-
-#	def buffer__changed
-#		iter = buffer.end_iter
-#		scroll_to_iter(iter, 0.0, false, 0, 0)
-#		self.queue_draw
-##		self.hide
-#
-##		self.show
-#
-#	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)
+			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
@@ -72,10 +48,12 @@ class VR_TextShell < Gtk::TextView
 	end
 	
 	def jump_to(line_no = @current_line+1)
-		return false if line_no > @lines.size - 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)
+#		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

data/bin/editor/VR_TextViewCommon.rb

@@ -1,34 +1,23 @@
-
-
 module VR_TextViewCommon
 
-	def get_line_text(line)
-		return nil if line > buffer.line_count - 1
-		iter, iter_end = get_line_iters(line)
-		return buffer.get_text(iter, iter_end)
-	end
-
 	def get_line_iters(line, search_str = nil)
-		s = buffer.get_iter_at_line(line)
+		s = buffer.get_iter_at(:line => line)
 		e = get_end_iter(s)
 		if !search_str.nil?
-			s, e = s.forward_search(search_str, Gtk::TextIter::SEARCH_TEXT_ONLY, e)
+		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)
-    	buffer.move_mark("insert",s)
-			buffer.move_mark("selection_bound", e)
+			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
 
 
-#	def get_text_scan_iters(line_num, search_str)
-#		st, en = get_line_iters(line_num)
-#		s, e = st.forward_search(search_str, Gtk::TextIter::SEARCH_TEXT_ONLY, en)
-#	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)	
@@ -40,7 +29,7 @@ module VR_TextViewCommon
     if iter.line == buffer.line_count - 1 # last line
       return buffer.end_iter 
     end
-    return buffer.get_iter_at_line(iter.line+1)
+    return buffer.get_iter_at(:line => iter.line+1)
 	end
 	
 	def remove_tag(tag)
@@ -48,18 +37,10 @@ module VR_TextViewCommon
 		buffer.remove_tag(tag, s, e)	
 	end
 
-
 	def line_at_cursor()
     cursor_pos = buffer.cursor_position
-    iter = buffer.get_iter_at_offset(cursor_pos)
-		return iter.line-1
-	end
-
-	def scroll_to_cursor()
-   	os = buffer.cursor_position
-		return if os > buffer.char_count - 1 or os == 0
-		iter = buffer.get_iter_at_offset(os)
-		scroll_to_iter(iter, 0.0, true, 1.0, 0.5)
+    iter = buffer.get_iter_at(:offset => cursor_pos)  #get_iter_at_offset depricated
+		return iter.line + 1
 	end
 
 end