@@ -31,6 +31,7 @@ require 'rubygems' s.rdoc_options << '--title' << 'Arcadia Documentation' << '--main' << 'README' << '-q' s.extra_rdoc_files = ["README"] # s.add_dependency("ruby-debug", ">= 0.9.3") # TODO +# s.add_dependency("rdp-rbeautify") # prettifier plugin TODO uncomment once published s.add_dependency("rogerdpack-whichr") # s.add_dependency("ruby-wmi") # doesn't build on linux # s.add_dependency("win32-process") # same here arcadia.gemspec @@ -2427,6 +2427,7 @@ class AgEditor end + # modify in this instance means the (...) in the tab header of each file def modified? return !(@buffer === text_value) end @@ -2751,9 +2752,8 @@ class AgEditor if Tk.messageBox('icon' => 'error', 'type' => 'yesno', 'title' => '(Arcadia) Libs', 'parent' => @text, 'message' => msg) == 'yes' - @text.delete('1.0','end') - reset_highlight if @highlighting - load_file(@file) + reload + else @file_last_access_time = ftime end @@ -2761,6 +2761,12 @@ class AgEditor end end + def reload + @text.delete('1.0','end') + reset_highlight if @highlighting + load_file(@file) + end + def languages_hash(_ext=nil) @@langs_hash = Hash.new if !defined?(@@langs_hash) return nil if _ext.nil? @@ -3186,7 +3192,13 @@ class AgMultiEditor < ArcadiaExt @find.show_go_to_line_dialog end when CloseCurrentTabEvent - close_raised + close_raised + when PrettifyTextEvent + require 'rbeautify.rb' # gem + self.raised.save # so we can beautify it kludgely here... + path = raised.file + RBeautify.beautify_file(path) + self.raised.reload when MoveBufferEvent if _event.old_file && _event.new_file && editor_exist?(_event.old_file) #close_file(_event.old_file) ext/ae-editor/ae-editor.rb @@ -101,6 +101,10 @@ class GoToLineBufferEvent < BufferEvent attr_accessor :line end +class PrettifyTextEvent < BufferEvent + +end + class SearchBufferEvent < BufferEvent class Result < Result attr_accessor :row, :col lib/a-contracts.rb @@ -8,8 +8,6 @@ # &require_omissis=tk/label # &require_omissis=tk/toplevel - - require "conf/arcadia.res" require 'tkextlib/bwidget' require "lib/a-tkcommons" @@ -951,7 +949,9 @@ class ArcadiaMainMenu < ArcadiaUserControl menu_spec_edit = [['Edit', 0], ['Cut', $arcadia['main.action.edit_cut'], 2], ['Copy', $arcadia['main.action.edit_copy'], 0], - ['Paste', $arcadia['main.action.edit_paste'], 0]] + ['Paste', $arcadia['main.action.edit_paste'], 0], + ['Prettify Current', proc{Arcadia.process_event(PrettifyTextEvent.new(self))}, 0]] + menu_spec_search = [['Search', 0], ['Find/Replace ...', proc{Arcadia.process_event(SearchBufferEvent.new(self))}, 2], ['Find in files...', proc{Arcadia.process_event(SearchInFilesEvent.new(self))}, 2], lib/a-core.rb 9c32acdb52346fdf1d26f212262dca11d9838e67 rdp rogerpack2005@gmail.com http://github.com/angal/arcadia/commit/24bd68907662c8d505878a4dffd3adb786e7aa06 24bd68907662c8d505878a4dffd3adb786e7aa06 2009-10-07T17:20:06-07:00 2009-10-07T17:20:06-07:00 add prettify option a56de67d468fc893302c65a2105a5350a095403f rdp rogerpack2005@gmail.com