arcadia 0.10.0 → 0.11.0

data/README

@@ -1,27 +1,35 @@
 = Arcadia Ide
-version 0.10.0
+version 0.11.0
 
 by Antonio Galeone
-on Jun 03, 2011
+on Nov 04, 2011
 
 
 == About
 
 Arcadia is a Light Integrated Development Environment (IDE) for Ruby language 
-written in classic Ruby using the classic tcl/tk GUI toolkit.
+written in Ruby using the classic tcl/tk GUI toolkit.
 
 Some of Arcadia ide project features include:
 * Editor with source browsing, syntax highlighting, code completion
-* Debugging support
 * Working on any platform where ruby and tcl-tk work.
+* Debugging support
 * Highly extensibility architecture.
 
-== In this release 0.10.0
+== In this release 0.11.0
     
 [Improvements]
-  - bugs fixed
-  - added initial basic support for other languages (python,java)
-
+  added some new features: 
+  - now you can open more than one instance of "Editor" and "Dir Project"
+    by clicking on button with "plus" icon on the left side of title bar.
+    This can be usefull if you want see 2 buffers at the same time. 
+  - now you can hide the tabs in Editor (for optimizing space) by menu item :
+    "View->Show/Hide Editor Tabs" and recall a buffer by menubutton on right side 
+    of title bar
+  - porting to new version of coderay   
+  
+  A lot of bugs fixed !!!
+  
 == Dependencies
   - rubygems
   - ruby-tk
@@ -29,15 +37,13 @@ Some of Arcadia ide project features include:
   - tk-tile (if tcl/tk < 8.5)
   - ctags
   - ack (optional)
-  - gem coderay
+  - gem coderay (> 1.0)
   - gem ruby-debug (ruby-debug19 on ruby 1.9)
   - gem win32-process (only on windows)
   - gem ruby-wmi (only on windows)
   
 == How to install
-There are two way:
-1. exec as root on command line "gem install arcadia"
-   or as user "sudo gem install arcadia"
+* exec on command line "gem install arcadia"
 
 == How to run
 * exec on command line "arcadia"
@@ -48,7 +54,7 @@ Application layout is splitted in vertical and horizontal resizable frames.
 On vertical and horizontal  splitter appear two button for left or right 
 one shot frame close. 
 Every frame has a title, a button to expand or resizing it and a menu-button 
-for the dynamic layout functions.
+for dynamic layout functions (like add row, add column, close or for move a frame).
 
 ==== Main Toolbar
 The toolbar button are in order:
@@ -63,7 +69,7 @@ The toolbar button are in order:
 - quit (to exit from arcadia)
 
 ==== Editor
-Editor use the notebook metaphor. Same command are on the popup menu 
+Editor can use the notebook metaphor. Same command are on the popup menu 
 that is raised on "Button-3" click event fundamentally for closing the tab 
 under the mouse pointer.
 These are same editor short-cut:

data/conf/arcadia.conf

@@ -79,9 +79,10 @@ scrollbar.elementborderwidth=1
 scrollbar.width=15
 
 titlelabel.background=#303b50
-titlelabel.foreground=#e8e651
+titlelabel.foreground=#cbec21
 titlelabel.activebackground=#6679f1
-titlelabel.activeforeground=#cbec21
+titlelabel.activeforeground=#e8e651
+titlelabel.disabledforeground=#266626662666
 titlelabel.highlightbackground=white
 titlelabel.relief=flat
 titlelabel.borderwidth=0
@@ -284,6 +285,7 @@ hightlight.method.foreground=#007F7F
 hightlight.number.foreground=#007F7F
 hightlight.instance_variable.foreground=#7F7F7F
 hightlight.global_variable.foreground=#db66ca
+hightlight.class_variable.foreground=#db66ca
 hightlight.constant.foreground=#bdc175
 hightlight.tag.foreground=#69a8d9
 hightlight.sel.foreground=black
@@ -293,7 +295,7 @@ hightlight.sel.relief=raised
 #hightlight.selected.foreground=red
 hightlight.selected.background=yellow
 hightlight.link.foreground=red
-
+hightlight.exception.foreground=red
 hightlight.debug.foreground=#d95ed9
 hightlight.debug.background=#b3c1d9
 hightlight.debug.borderwidth=2

data/conf/arcadia.init.rb

@@ -55,3 +55,4 @@ EOL
 exit
 end
 Tk.tk_call "eval","set auto_path [concat $::auto_path tcl]"
+#Tk.tk_call "eval","set tk_strictMotif true"

data/conf/arcadia.res.rb

@@ -1640,6 +1640,22 @@ CBMeFKiwYQCGCSEilLgQgEKKDy1G1FhwYMWKHT9uvKhxYkmRJkk6VLnSZMeX
 AQEAOw==
 EOS
 
+PLUS_EX_GIF=<<EOS
+R0lGODlhEAAQAMZBAABtAABwAAByAAB1AAB4AAB6AAB9AACBAACDAACFAACH
+AACJAACLAACNAACPAACRAACTAJubm56enqKioqOjo3fdRHjeRXvhSMjIyMrK
+yobsU87Ozs/Pz9DQ0NHR0dLS0o3zWtTU1NbW1pH3XtfX19nZ2dzc3N3d3d/f
+3+Dg4OPj4+bm5ufn5+np6erq6uzs7O3t7e7u7vDw8PHx8fLy8vPz8/T09PX1
+9fb29vf39/j4+Pn5+fr6+vv7+/z8/P39/f7+/v//////////////////////
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////yH+EUNyZWF0
+ZWQgd2l0aCBHSU1QACwAAAAAEAAQAAAHtIAZFBKEhYYSERSCPD4/Po+OPz9B
+QT48gz0bHB0eHyEkJSYoKiwuhD6bnSEioSmkLjGEP5yeoCaupTEyp6qsEA8N
+pTAyNLK1oQ4jCy7DNDaynyXADCAIBwbOOLKgJw0jIBoXFgQ2ODqyrQoJBxcF
+AwHmPLInrisuBhUCNfE9p7guL94B4PfjlIoVLV7EmFHjho4dPX4AkYVQIcMb
+OSBKDCJhAo+ECxtmjAiE0gQMEw6p7IghEAA7
+EOS
 
 
 #MINUS_GIF=<<EOS
@@ -1676,6 +1692,17 @@ AAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAOAA4AAAgzAAEIHEiwYICD
 CBMeFKiwYQCGDhNCjLgQAEWEEAsOrFhRI8eLDy2CnEiRZESTDjWqFBgQADs=
 EOS
 
+MINUS_EX_GIF=<<EOS
+R0lGODlhEAAQAKU8AHAxAHUzAHg0AHo1AH02AIE4AIM5AIU6AIc7AIs8AI09
+AJE/AN5VReFYSOxjU/NqWvduXpubm56enqKioqOjo8jIyMrKys7Ozs/Pz9DQ
+0NHR0dLS0tTU1NbW1tfX19nZ2dzc3N3d3d/f3+Dg4OPj4+bm5ufn5+np6erq
+6uzs7O3t7e7u7u/v7/Dw8PHx8fLy8vPz8/T09PX19fb29vf39/j4+Pn5+fr6
++vv7+/z8/P39/f7+/v///////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1Q
+ACwAAAAAEAAQAAAGoUALRUIsGiURivCW0+WeTp2Ox8vdhrgLJqPZcDwfkIhk
+QhFz2y6nEx6RUSuijusFg9zlVeusZt/fKi0vcnVtgIIxcl8fCwoJCQYFBC8x
+M3JgIQoQDw4NDAKVNXJtCAcFAwMBADM1N3IhbiUoKSwuMKw3OGd4s7W3rTg6
+ZyQlJykrtjI1NsE7csXHyTTMOjs8EhM3xsgwMtPNVBMVE0fl2BVBADs=
+EOS
 
 
 FILE_ICON_DEFAULT=DOCUMENT_GIF

data/conf/theme-dark.conf

@@ -70,15 +70,18 @@ progress.relief=groove
 
 hightlight.reserved.foreground=#60f856
 #hightlight.comment.foreground=#21a648
-hightlight.comment.foreground=#000058520000
+#hightlight.comment.foreground=#000058520000
+hightlight.comment.foreground=#009999
 hightlight.string.foreground=#ec6bfc
 hightlight.symbol.foreground=#bdc175
 hightlight.operator.foreground=#d9feff
 hightlight.class.foreground=#f69e2e
-hightlight.method.foreground=#007F7F
+#hightlight.method.foreground=#007F7F
+hightlight.method.foreground=#b332b3330000
 hightlight.number.foreground=#007F7F
 hightlight.instance_variable.foreground=#7F7F7F
 hightlight.global_variable.foreground=#db66ca
+hightlight.class_variable.foreground=#9ae19ae10000
 hightlight.constant.foreground=#bdc175
 hightlight.tag.foreground=#69a8d9
 hightlight.selected.background=#133e5e

data/ext/ae-dir-projects/ae-dir-projects.rb

@@ -21,7 +21,7 @@ class Project
   end
 end
 
-class DirProjects < ArcadiaExt
+class DirProjects < ArcadiaExtPlus
   attr_reader :htree
 
   def sync_on
@@ -918,6 +918,7 @@ class DirProjects < ArcadiaExt
 	def projects_file
     if !defined?(@arcadia_projects_file)
     		@arcadia_projects_file = @arcadia.local_dir+'/'+conf('file.name')
+    		@arcadia_projects_file = "#{@arcadia_projects_file}#{instance_index}" if instance_index > 0 
     		if !File.exist?(@arcadia_projects_file)
      			dir,fil =File.split(File.expand_path(@arcadia_projects_file))
      			if !File.exist?(dir)
@@ -930,7 +931,6 @@ class DirProjects < ArcadiaExt
           f.close unless f.nil?
         end
       end
-    		
     end
     return @arcadia_projects_file
 	end
@@ -980,6 +980,12 @@ class DirProjects < ArcadiaExt
     end
   end
 
+  def on_clear_cache_instance(_event)
+    if File.exist?(@arcadia_projects_file)
+      File.delete(@arcadia_projects_file)
+    end
+  end
+  
   def image(_kind, _label='.rb')
       if _kind == 'directory'
         return @image_kdir

data/ext/ae-editor/ae-editor.conf

@@ -22,49 +22,8 @@ line-numbers=yes
 tabs.side=top
 complete-code=yes
 close-last-if-not-modified=yes
-max-file-open=3 #todo
-# editor
-#font=courier 11
-#font.bold=courier 11 bold
-#freebsd::font=courier 12
-#freebsd::font.bold=courier 12 bold
-#win::font={Courier New} 9
-#win::font.bold={Courier New} 9 bold 
-#+--------------------------------------------------
-#color.background=#000000
-#color.foreground=white
-#color.insertbackground=#ff8000
-#hightlight.keyword.color.foreground=#800000
-#hightlight.variable.color.foreground=#f9c6f8
-#hightlight.comment.color.foreground=#4aff4a
-#hightlight.string.color.foreground=#8080ff
-#hightlight.number.color.foreground=red
-#hightlight.capitalize.color.foreground=#ffff00
-#hightlight.select.color.foreground=yellow
-#hightlight.select.color.background=blue
-#hightlight.goto.color.foreground=blue
-#hightlight.goto.color.background=yellow
-#+--------------------------------------------------
-hightlight.sel.foreground=>>>hightlight.sel.foreground
-hightlight.sel.background=>>>hightlight.sel.background
-hightlight.sel.borderwidth=>>>hightlight.sel.borderwidth
-hightlight.sel.relief=>>>hightlight.sel.relief
-hightlight.selected.background=>>>hightlight.selected.background
-#hightlight.selected.foreground=>>>hightlight.selected.foreground
-hightlight.tabs.foreground=>>>hightlight.3.foreground
-hightlight.tabs.background=>>>hightlight.3.background
-hightlight.tabs.borderwidth=>>>hightlight.3.borderwidth
-hightlight.tabs.relief=>>>hightlight.3.relief
-hightlight.spaces.foreground=>>>hightlight.4.foreground
-hightlight.spaces.background=>>>hightlight.4.background
-hightlight.spaces.borderwidth=>>>hightlight.4.borderwidth
-hightlight.spaces.relief=>>>hightlight.4.relief
-#hightlight.debug.foreground=>>>hightlight.16.foreground
-#hightlight.debug.background=>>>hightlight.16.background
-#hightlight.debug.borderwidth=>>>hightlight.16.borderwidth
-#hightlight.debug.relief=>>>hightlight.16.relief
-
-
+max-file-open=3 #TODO
+use-tabs=yes
 explorer_panel.tabs.side=top
 
 #:::::::::::::::: Editor group    ::::::::::::::::::::::<end>
@@ -75,10 +34,15 @@ arm::popup.bind.shortcut=F4
 # menu items
 user_menu.contexts=View
 user_menu.View.context_path=/
-user_menu.View=line_number
+user_menu.View=line_number,tabs
 user_menu.View.line_number.hint=Show/Hide line numbers
-user_menu.View.line_number.caption=Show/Hide line numbers
+user_menu.View.line_number.caption=Show/Hide editor line numbers
 user_menu.View.line_number.underline=1
 user_menu.View.line_number.action=ActionEvent.new(self,'action'=>show_hide_current_line_numbers)
 
+user_menu.View.tabs.hint=Show/Hide line numbers
+user_menu.View.tabs.caption=Show/Hide editor tabs
+user_menu.View.tabs.underline=1
+user_menu.View.tabs.action=ActionEvent.new(self,'action'=>show_hide_tabs)
+
 #:::::::::::::::::::::::::::::::::::::::::::::::::<end>

data/ext/ae-editor/ae-editor.rb

@@ -491,6 +491,19 @@ class SafeCompleteCode
     #---------------------------------
     focus_line = source_array[@row-1]
     focus_line = focus_line[0..@col] if focus_line
+    #-----
+#    if ["\s",'(','{','['].include?(focus_line[-1..-1])
+#      p "focus_line[-1..-1] e uguale a #{focus_line[-1..-1]}"
+#      focus_line = ''
+#    else
+#      focus_line_split = focus_line.split
+#      if focus_line_split && focus_line_split.length >0
+#        old_focus_line_length = focus_line.length 
+#        focus_line = focus_line_split[-1]
+#        @col = @col - (old_focus_line_length = focus_line.length)
+#      end
+#    end
+    #---
     focus_line = '' if focus_line.nil?
     focus_world = ''
     if focus_line && focus_line.strip.length > 0
@@ -515,6 +528,7 @@ class SafeCompleteCode
       focus_world= focus_word(focus_segment)
     end
     @class_node = @ss.class_node_by_line(@row)
+    focus_line_to_evaluate = focus_line
     #---------------------------------
     @modified_source = "#{@modified_source}Dir.chdir('#{File.dirname(@editor.file)}')\n" if @editor.file
     @modified_row = @modified_row+1
@@ -546,7 +560,7 @@ class SafeCompleteCode
         #Arcadia.console(self, 'msg'=>"per require @modified_row=#{@modified_row}")
       # 2) includiano la riga da evaluare con un $SAFE 3
       elsif j.to_i == @row-1
-        focus_line = line
+        focus_line_to_evaluate = line
         break
       # 3) eliminiamo la riga
       else
@@ -554,7 +568,7 @@ class SafeCompleteCode
       end
       break if j.to_i >= @row - 1
     }
-    if focus_line
+    if focus_line_to_evaluate
       # ricerchiamo una eventuale dichiarazione
         if focus_world && focus_world.strip.length > 0
           begin
@@ -598,7 +612,7 @@ class SafeCompleteCode
         ss_source = @ss.scheletor_from_node(@ss.root,'',to_iniect, to_iniect_class)
         ss_source_array = ss_source.split("\n")
         ss_len = ss_source_array.length
-        if ss_len>0 && ss_source_array[0].strip != focus_line.strip
+        if ss_len>0 && ss_source_array[0].strip != focus_line_to_evaluate.strip
           @modified_source = "#{@modified_source}#{ss_source}"
           if @class_node
             @modified_source = "#{@modified_source}#{@class_node.label.downcase} = #{@class_node.label}.new\n"
@@ -629,7 +643,6 @@ class SafeCompleteCode
         end
     end
     if @filter.strip.length > 0 && !is_dot?
-#        refresh_words(source_array)
         refresh_words
     end
 
@@ -803,7 +816,7 @@ class AgEditorOutlineToolbar
   attr_accessor :sync
   def initialize(_controller)
     @controller = _controller
-    @panel = @controller.frame(1).root.add_panel(@controller.frame(1).name, "sync");
+    @panel = @controller.main_instance.frame(1).root.add_panel(@controller.main_instance.frame(1).name, "sync");
     @cb_sync = TkCheckButton.new(@panel, Arcadia.style('checkbox').update('background'=>@panel.background)){
       text  'Sync'
       justify  'left'
@@ -828,7 +841,7 @@ class AgEditorOutlineToolbar
 
   def sync_on
     @sync = true
-    e = @controller.raised
+    e = @controller.active_instance.raised
     if e
       e.outline.select_without_event(e.outline.last_row) if e.outline.last_row
     end
@@ -949,7 +962,9 @@ class AgEditorOutline
 
   def destroy
     #@tree_scroll_wrapper.destroy
+    @tree_exp.hide
     @tree_exp.destroy
+    Tk.update
   end
   
   def show
@@ -1067,11 +1082,11 @@ class AgEditor
   attr_reader :read_only 
   attr_reader :page_frame
   attr_reader :text, :root
-  attr_reader :outline
   attr_reader :highlighting
   attr_reader :last_tmp_file
   attr_reader :lang
   attr_reader :file_info  
+  attr_reader :outline  
   def initialize(_controller, _page_frame)
     @controller = _controller
     @page_frame = _page_frame
@@ -1093,7 +1108,7 @@ class AgEditor
     @id = -1
     @file_info = Hash.new
   end
-  
+
   def modified_from_opening?
     @modified_from_opening
   end
@@ -1308,7 +1323,7 @@ class AgEditor
   end
 
 
-  def raise_complete_code(_candidates, _row, _col, _filter='')
+  def raise_complete_code(_candidates, _row, _col, _filter='')    
     @raised_listbox_frame.destroy if @raised_listbox_frame != nil
     _index_call = _row+'.'+_col
     _index_now = @text.index('insert')
@@ -1322,13 +1337,14 @@ class AgEditor
         if !ei.nil?
           j=1
           pre_target = ''
-          while ei-j>=0 && _line[ei-j..ei-j]!="\s"
+          while ei-j>=0 && !["\s",'(','[','{'].include?(_line[ei-j..ei-j])
             pre_target = _line[ei-j..ei-j] + pre_target
             j+=1
           end
           _target= pre_target + _target
         end       
       end
+      
       if _target.strip.length > 0 && _target != '.'
         extra_len = _target.length.+@
         _begin_index = _index_now<<' - '<<extra_len.to_s<<' chars'
@@ -1337,6 +1353,19 @@ class AgEditor
         _begin_index = _index_now
         extra_len = 0
       end
+      if _filter.length > 0 
+        begin_index_for_delete = "insert - #{_filter.length}chars"
+      else
+        for_delete = @text.get(_begin_index,"insert")
+        if for_delete && ['.','(','[','{','=','<','!','>'].include?(for_delete.strip[-1..-1])
+          begin_index_for_delete = "insert"
+        elsif for_delete && for_delete.include?('.')
+          begin_index_for_delete = "insert - #{for_delete.split('.')[-1].length}chars"
+        else
+          begin_index_for_delete = _begin_index
+        end 
+      end
+
       if _candidates.length >= 1 
           _rx, _ry, _width, heigth = @text.bbox(_begin_index);
           _x = _rx + TkWinfo.rootx(@text)  
@@ -1399,6 +1428,7 @@ class AgEditor
 
               Tk.event_generate(@raised_listbox, "1") if TkWinfo.mapped?(@raised_listbox)
           }
+          
 
           _insert_selected_value = proc{
             #_value = @raised_listbox.get('active').split('-')[0].strip
@@ -1408,7 +1438,7 @@ class AgEditor
               @raised_listbox_frame.destroy
               #_menu.destroy
               @text.focus
-              @text.delete(_begin_index,'insert')
+              @text.delete(begin_index_for_delete,'insert')
 
               # workaround for @ char
               _value = _value.strip
@@ -1547,7 +1577,7 @@ class AgEditor
             end
           }
         elsif _candidates.length == 1 && _candidates[0].length>0
-          @text.delete(_begin_index,'insert');
+          @text.delete(begin_index_for_delete,'insert');
           @text.insert('insert',_candidates[0].split[0])
           complete_code_end
         end
@@ -1605,32 +1635,6 @@ class AgEditor
 
     @text.bind_append("Control-KeyPress"){|e|
       case e.keysym
-#      when 'z'
-#        begin
-#          @text.edit_undo
-#        rescue RuntimeError => e
-#          throw e unless e.to_s.include? "nothing to undo" # this is ok--we've done undo back to the beginning
-#          break
-#        end
-#        if @highlighting
-#          _b = @text.index('@0,0').split('.')[0].to_i
-#          _e = @text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1
-#          rehighlightlines(_b,_e)
-#        end
-#        break
-#      when 'r'
-#        begin
-#          @text.edit_redo
-#        rescue RuntimeError => e
-#          throw e unless e.to_s.include? "nothing to redo" # this is ok--we've done redo back to the beginning
-#          break
-#        end
-#        if @highlighting
-#          _b = @text.index('@0,0').split('.')[0].to_i
-#          _e = @text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1
-#          rehighlightlines(_b,_e)
-#        end
-#        break
       when 'o'  
         if @file
           _dir = File.dirname(@file)
@@ -1639,24 +1643,9 @@ class AgEditor
         end
         Arcadia.process_event(OpenBufferEvent.new(self,'file'=>Tk.getOpenFile('initialdir'=>_dir)))
         break
-#      when 'c'
-#        @text.text_copy
-#        break
-#      when 'x'
-#        @text.text_cut
-#        break
-#      when 'v'
-#        _b = @text.index('insert').split('.')[0].to_i
-#        @text.text_paste
-#        _e = @text.index('insert').split('.')[0].to_i
-#        if @highlighting
-#          rehighlightlines(_b,_e)
-#        end
-#        break
-      end
-      case e.keysym
       when 's'
         save
+        #Tk.callback_break
       when 'f'
         find
       when 'egrave'
@@ -1690,21 +1679,6 @@ class AgEditor
         end
       when 'U'
         decrease_indent
-#        _r = @text.tag_ranges('sel')
-#        _row_begin = _r[0][0].split('.')[0].to_i
-#        _row_end = _r[_r.length - 1][1].split('.')[0].to_i
-#        n_space = $arcadia['conf']['editor.tab-replace-width-space'].to_i
-#        if n_space > 0
-#          suf = "\s"*n_space
-#        else
-#          suf = "\t"
-#        end
-#        _l_suf = 	suf.length.to_s
-#        for _row in _row_begin..._row_end
-#          if @text.get(_row.to_s+'.0',_row.to_s+'.'+_l_suf) == suf
-#            @text.delete(_row.to_s+'.0',_row.to_s+'.'+_l_suf)
-#          end
-#        end
       when 'C'
         _r = @text.tag_ranges('sel')
         _row_begin = _r[0][0].split('.')[0].to_i
@@ -1725,19 +1699,16 @@ class AgEditor
     }
     
     @text.bind_append("KeyPress"){|e|
-      #@do_complete = false
+      @last_keypress = e.keysym
       case e.keysym
-      #when 'Return'
-      when 'BackSpace'
-        _index = @text.index('insert')
-        _row, _col = _index.split('.')
-        rehighlightlines(_row.to_i,_row.to_i) if @highlighting
-  #      rehighlightline(_row.to_i) if @highlighting
-      when 'Delete'
-        _index = @text.index('insert')
-        _row, _col = _index.split('.')
-        rehighlightlines(_row.to_i, _row.to_i) if @highlighting
-  #      rehighlightline(_row.to_i) if @highlighting
+#      when 'BackSpace'
+#        _index = @text.index('insert')
+#        _row, _col = _index.split('.')
+#        rehighlightlines(_row.to_i,_row.to_i) if @highlighting
+#      when 'Delete'
+#        _index = @text.index('insert')
+#        _row, _col = _index.split('.')
+#        rehighlightlines(_row.to_i, _row.to_i) if @highlighting
       when 'F5'
         run_buffer
       when 'F3'
@@ -1775,11 +1746,15 @@ class AgEditor
     }
 
     @text.bind_append("KeyRelease"){|e|
+      @last_keyrelease = e.keysym
+      #return if @last_keypress != e.keysym
       case e.keysym
-      when 'Up','Down'
-          refresh_outline
+#      when 'Up','Down'
+#          refresh_outline
       when 'Left', 'Right'
-      
+        if Arcadia.instance.last_focused_text_widget != @text
+          @text.select_throw
+        end
       when 'Return' #,'Control_L', 'Control_V', 'BackSpace', 'Delete'
         _index = @text.index('insert')
         _row, _col = _index.split('.')
@@ -1797,20 +1772,26 @@ class AgEditor
         if _row.to_i + 1  ==  @text.index('end').split('.')[0].to_i
           do_line_update
         end
-      else 
-        if ['Control_L', 'Control_V', 'BackSpace', 'Delete'].include?(e.keysym)
-          do_line_update
+        if @highlighting
+          rehighlightlines(_row.to_i, _row.to_i)
         end
+      when 'Shift_L','Shift_R','Control_L','Control_R' ,'Prior', 'Next', 'Up','Down'
+        # do nothing because od do_line_update
+      else 
+#        if ['BackSpace', 'Delete'].include?(e.keysym)
+#          do_line_update
+#        end
         if @highlighting
           row = @text.index('insert').split('.')[0].to_i
           rehighlightlines(row, row)
         end
       end
-      check_modify
+      check_modify if !['Shift_L','Shift_R','Control_L','Control_R','Up','Down','Left', 'Right', 'Prior', 'Next'].include?(e.keysym)      
     }
 
 
     @text.bind_append("Shift-KeyPress"){|e|
+      @last_keypress = e.keysym
       case e.keysym
       when 'Tab','ISO_Left_Tab'
         _r = @text.tag_ranges('sel')
@@ -1899,8 +1880,8 @@ class AgEditor
   end
 
   def refresh_outline
-    if @outline
-      Tk.after(1,proc{ @outline.update_row(self.row)})
+    if defined?(@outline)
+      Tk.after(1,proc{@outline.update_row(self.row)})
     end
   end
 
@@ -2081,9 +2062,11 @@ class AgEditor
     if _from_row &&  @highlighting
       invalidated_begin_zone= zone_of_row(_from_row)
       @is_line_bold.delete_if {|key, value| key >= invalidated_begin_zone }
+      @is_line_comment.delete_if {|key, value| key >= invalidated_begin_zone }
       @highlight_zone.delete_if {|key, value| key >= invalidated_begin_zone }
     elsif @highlighting
       @is_line_bold.clear
+      @is_line_comment.clear
       @highlight_zone.clear 
     end
     @last_line_begin=0
@@ -2116,6 +2099,7 @@ class AgEditor
   def initialize_highlight(_ext)
     @highlight_scanner = @controller.highlight_scanner(_ext)
     @is_line_bold = Hash.new
+    @is_line_comment = Hash.new
     @is_tag_bold = Hash.new
     do_tag_configure_global('debug')
     if @lang_hash.nil? || @highlight_scanner.nil?
@@ -2998,10 +2982,39 @@ class AgEditor
     end
   end
 
+  def refresh_visible_highlighting
+    line_begin_index = @text.index('@0,0')
+    line_begin = line_begin_index.split('.')[0].to_i
+    line_begin = @comment_line_begin if !@comment_line_begin.nil? && @comment_line_begin < line_begin
+    line_end = @text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1
+    reset_highlight(line_begin)
+    zone_begin = zone_of_row(line_begin)
+    zone_end = zone_of_row(line_end)
+    zone_begin.upto(zone_end){|z| highlight_zone(z)}
+    highlight_zone(zone_of_row(line_end+1)) if @is_line_comment[line_end]
+    
+    #rehighlightlines(line_begin,line_end,true)
+    if @is_line_comment[line_end]
+      line_end.downto(line_begin){|l|
+        @comment_line_begin = l if @is_line_comment[l]
+      }
+    else
+      @comment_line_begin = nil
+    end
+  end
+
+
   def highlightlines(_row_begin, _row_end, _check_mod = false)
     if _check_mod 
       check_modify
     end
+    is_comment = _row_begin == _row_end
+    if _row_begin == _row_end && (@is_line_comment[_row_end-1] || @is_line_comment[_row_end+1])
+      if  !['apostrophe','quotedbl'].include?(@last_keypress)
+        refresh_visible_highlighting
+        return  
+      end
+    end
     #_row_begin = _row_begin+1
     _ibegin = _row_begin.to_s+'.0'
     _iend = (_row_end+1).to_s+'.0'
@@ -3009,28 +3022,39 @@ class AgEditor
     _lines = @text.get(_ibegin, _iend)
     tags_map = @highlight_scanner.highlight_tags(_row_begin,_lines)
     tags_map.each do |key,value|      
+      is_comment = is_comment && key == :comment
+      break if is_comment
       to_tag = Array.new
       value.each{|ite|
         to_tag.concat(ite)
-        if @is_tag_bold[key.to_s]
-          if ite.length==2
-            row_begin = ite[0].split('.')[0].to_i
-            row_end = ite[1].split('.')[0].to_i
-            for row in row_begin..row_end 
-              @is_line_bold[row]=true
-            end
+        if ite.length==2
+          row_begin = ite[0].split('.')[0].to_i
+          row_end = ite[1].split('.')[0].to_i
+          for row in row_begin..row_end 
+            @is_line_bold[row] = @is_tag_bold[key.to_s]
+            @is_line_comment[row] = key == :comment
           end
-#          ite.each{|p|
-#            row_begin = p[0].split('.')[0].to_i
-#            row_end = p[1].split('.')[0].to_i
-#            for row in row_begin...row_end 
-#              @is_line_bold[row]=true
-#            end
-#          }
         end
       }
+#      to_tag.each{|p|
+#        if @i.nil?
+#          @one = p
+#          @i = 1
+#          next
+#        else
+#          @two = p
+#          @i = nil
+#        end
+#        row_begin = @one.split('.')[0].to_i
+#        row_end = @two.split('.')[0].to_i
+#        for row in row_begin...row_end 
+#          @is_line_comment[row] = key == :comment
+#        end
+#      }
       @text.tag_adds(key.to_s,to_tag)
     end
+    refresh_visible_highlighting if is_comment
+
     if @tabs_show || @spaces_show
       if !defined?(@rescanner)
         if @lang_hash['scanner']!='re'
@@ -3047,7 +3071,8 @@ class AgEditor
   def highlight_zone(_zone, _force_highlight=false)
     if !@highlight_zone[_zone] || _force_highlight
       _b = @highlight_zone_length*(_zone - 1) +1
-      _e = @highlight_zone_length*(_zone) #+ 1
+      _e = @highlight_zone_length*(_zone) #+ 1      
+      _b -=1 while @is_line_comment[_b-1]      
       rehighlightlines(_b,_e)
       @highlight_zone[_zone] = true
     end
@@ -3193,6 +3218,7 @@ class AgEditor
   end
   
   def check_file_last_access_time
+    #@controller.activate
     if @file
       file_exist = File.exist?(@file)
       if @file_info['mtime'] && file_exist
@@ -3276,15 +3302,16 @@ class AgEditor
   end
   
   def show_outline
-    if @outline
+    if defined?(@outline)
       @outline.show
     else
-      @outline=AgEditorOutline.new(self, @controller.frame(1).hinner_frame, @controller.outline_bar, @lang)
+      @outline=AgEditorOutline.new(self, @controller.main_instance.frame(1).hinner_frame, @controller.outline_bar, @lang)
       refresh
     end
   end
 
   def hide_outline
+    #@outline.hide if defined?(@outline)
     @outline.hide if @outline
   end
 
@@ -3336,20 +3363,27 @@ class AgEditor
   end
   
   def refresh
-    @outline.build_tree if @outline && @classbrowsing #&& !is_exp_hide?
+    @outline.build_tree if defined?(@outline) && @classbrowsing #&& !is_exp_hide?
   end
 end
 
 class AgMultiEditorView
-  attr_reader :enb
-  def initialize(parent=nil)
-    @enb = Tk::BWidget::NoteBook.new(parent,Arcadia.style('tabpanel')){
+  #attr_reader :enb
+  def initialize(parent=nil, _usetabs=true)
+    @parent = parent
+    @usetabs = _usetabs
+    if @usetabs
+      initialize_tabs
+    end
+    @pages = {}
+    @page_binds = {}
+    @raised_page=nil
+  end
+  
+  def initialize_tabs
+    @enb = Tk::BWidget::NoteBook.new(@parent.hinner_frame, Arcadia.style('tabpanel')){
       tabbevelsize 0
       internalborderwidth 2
-#      arcradius 4
-#      activeforeground 'red'
-#      activebackground 'yellow'
-      #borderwidth 1
       side Arcadia.conf('editor.tabs.side')
       font Arcadia.conf('editor.tabs.font')
       pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
@@ -3358,13 +3392,204 @@ class AgMultiEditorView
       if !@enb.pages.empty?
         if @enb.raise.nil? || @enb.raise.strip.length == 0
           @enb.raise(@enb.pages[0]) 
-          @enb.see(@enb.pages[0])
+           @enb.see(@enb.pages[0])
         end
       end
     }
     @enb.bind_append("Map",refresh_after_map)
   end
   
+  def switch_2_tabs
+    raised = raise
+    @usetabs = true
+    initialize_tabs
+    @pages.each{|name, value|
+      oldframe = value['frame'].frame
+      value['frame'].detach_frame
+      oldframe.destroy
+      add_page(name, value['file'], value['text'], value['image'], value['raisecmd'], value['frame'])
+    }
+    raise(raised)
+    @page_binds.each{|event, proc| page_bind(event, proc)}    
+  end
+
+  def switch_2_notabs
+    raised = raise
+    @usetabs = false
+    @pages.each{|name, value|
+      value['frame'].detach_frame
+      add_page(name, value['file'], value['text'], value['image'], value['raisecmd'], value['frame'])
+    }
+    @enb.destroy
+    raise(raised)
+    @page_binds.each{|event, proc| 
+      page_bind(event, proc)
+    }    
+  end
+  
+  def root_frame
+    if @usetabs
+      @enb
+    else
+      @parent.hinner_frame
+    end
+  end
+  
+  def exist_buffer?(_name)
+    if @usetabs
+      @enb.index(_name) != -1
+    else
+      @pages.include?(_name)
+    end
+  end  
+  
+  def index(_name)
+    if @usetabs
+      @enb.index(_name)
+    else
+      _index = @pages.values.index(@pages[_name])
+      _index = -1 if _index.nil?
+      _index
+    end
+  end
+  
+  def pages
+    if @usetabs
+      @enb.pages
+    else
+      @pages.keys
+    end
+  end
+  
+  def page_title(_name, _title=nil, _image=nil)
+    @pages[_name]['text'] = _title if _title != nil
+    @pages[_name]['image'] = _image if _image != nil
+    title = _title
+    if @usetabs
+      if _title.nil? && _image.nil?
+        title = @enb.itemcget(_name, 'text')
+      else
+        args = {}
+        if _title != nil
+          args['text']=_title
+        end 
+        if _image != nil
+          args['image']=_image
+        end
+        @enb.itemconfigure(_name, args)      
+      end
+    else
+      if _title.nil? && _image.nil?
+        title = @pages[_name]['text'] if @pages[_name]
+      end
+    end
+    @parent.root.top_text(page(_name)['text'], page(_name)['image']) if page(_name) && raised?(_name)
+    title
+  end
+  
+  def add_page(_name, _file, _title, _image, _raise_proc, _adapter=nil)
+    if @usetabs
+      frame = @enb.insert('end', _name ,
+        'text'=> _title,
+        'image'=> _image,
+        'background'=> Arcadia.style("tabpanel")["background"],
+        'foreground'=> Arcadia.style("tabpanel")["foreground"],
+        'raisecmd'=>_raise_proc
+      )
+    else
+      frame = TkFrame.new(@parent.hinner_frame) #.pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
+    end
+    if _adapter.nil?
+      adapted_frame = TkFrameAdapter.new(@parent.hinner_frame)
+    else
+      adapted_frame = _adapter
+    end
+    adapted_frame.attach_frame(frame)
+    adapted_frame.raise
+    @pages[_name]={'frame'=>adapted_frame, 'file'=>_file, 'text'=>_title, 'image' => _image, 'raisecmd'=>_raise_proc}
+    adapted_frame
+  end
+
+  def delete_page(_name)
+    if @usetabs
+      @enb.delete(_name)
+    end
+    adapter_frame = @pages.delete(_name)['frame']
+    adapter_frame.frame.destroy if adapter_frame.frame
+    adapter_frame.destroy 
+  end
+
+  def page_bind(_event, _proc)
+    @page_binds[_event] = _proc
+    if @usetabs
+      @enb.tabbind_append("Button-3",_proc)
+      @parent.root.top_text_bind_remove("Button-3")   
+    else
+      @parent.root.top_text_bind_append("Button-3", _proc)   
+    end    
+  end
+
+  def page(_name)
+    @pages[_name]
+  end
+  
+  def page_frame(_name)
+    if @usetabs
+      @enb.get_frame(_name)
+    else
+      @pages[_name]['frame'] if @pages[_name]
+    end    
+  end
+  
+  def page_name(_frame)
+    res = nil
+    @pages.each{|k,v|
+      res = k if v['frame'] == _frame
+      break if !res.nil?
+    }
+    res
+  end
+  
+  def raise(_page=nil)
+    if @usetabs
+      if _page.nil?
+        @raised_page = @enb.raise
+      else  
+        @enb.raise(_page)
+      end
+    else
+      if _page.nil?
+        @raised_page
+      else
+        if @raised_page
+          @pages[@raised_page]['frame'].unpack if @pages[@raised_page]
+        end
+        @raised_page = _page
+        @pages[_page]['frame'].pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
+        @pages[_page]['raisecmd'].call
+      end
+    end
+    @raised_page
+  end
+  
+  def raised?(_name)
+    @raised_page==_name
+  end
+  
+  def see(_page)
+    if @usetabs
+      @enb.see(_page) 
+    else
+    end
+  end
+  
+  def move(_name, _pos)
+    if @usetabs
+      @enb.move(_name,_pos) if _pos
+    else
+    end
+  end
+  
 end
 
 class HighlightScanner
@@ -3487,7 +3712,7 @@ class ReHighlightScanner < HighlightScanner
   end
 end
   
-class CoderayHighlightScanner < HighlightScanner
+class CoderayHighlightScannerOld < HighlightScanner
   def initialize(_langs_conf)
     super(_langs_conf)
     require 'coderay'
@@ -3544,12 +3769,76 @@ class CoderayHighlightScanner < HighlightScanner
   end
 end
 
+class CoderayHighlightScanner < HighlightScanner
+
+  def initialize(_langs_conf)
+    super(_langs_conf)
+    require 'coderay'
+  end
+
+  def highlight_tags(_row_begin,_code)
+    super(_row_begin,_code)
+    c_scanner = CodeRay::Scanners[@lang].new _code
+    row=_row_begin
+    col=0
+    tags_map = Hash.new 
+    c_scanner.tokens.each{|t|
+      #p tok
+      if @i.nil?
+        @tok = []
+        @tok << t
+        @i = 1
+        next
+      else
+        @tok << t
+        @i = nil
+      end 
+      tok = @tok
+      
+      #p tok
+      
+      if tok[1]==:space && tok[0].include?("\n")
+        row+=tok[0].count("\n")
+        begin_gap = tok[0].split("\n")[-1]
+        if begin_gap && tok[0][-1..-1]!="\n"
+          col = begin_gap.length
+        else
+          col = 0
+        end
+      elsif !([:open, :close, :begin_group,:end_group].include?(tok[0])&& tok[1].class==Symbol)
+        toklength = tok[0].length
+        t_begin="#{row}.#{col}"
+        if tok[0].include?("\n")
+          ar = tok[0].split("\n")
+          row+=tok[0].count("\n")
+          begin_gap = ar[-1]
+          if begin_gap && tok[0][-1..-1]!="\n"
+            col = begin_gap.length
+          else
+            col = 0
+          end
+        else
+          col+=toklength
+        end
+        t_end="#{row}.#{col}"
+        if tok[1]!=:space
+          tags_map[tok[1]] = [] if tags_map[tok[1]].nil?
+          tags_map[tok[1]] << [t_begin,t_end]
+          #Arcadia.console(self, 'msg'=>"#{tok[1]}=#{[t_begin,t_end]}", 'level'=>'error')          
+          #p [t_begin,t_end]
+        end
+      end  
+    }
+    tags_map
+  end
+end
+
 
-class AgMultiEditor < ArcadiaExt
+class AgMultiEditor < ArcadiaExtPlus
   include Configurable
 #  attr_reader :breakpoints
   attr_reader :splitted_frame
-  attr_reader :outline_bar
+#  attr_reader :outline_bar
   attr_reader :has_ctags, :ctags_string
   def on_before_build(_event)
     Arcadia.is_windows? ? @ctags_string="lib/ctags.exe" : @ctags_string='ctags'
@@ -3689,21 +3978,44 @@ class AgMultiEditor < ArcadiaExt
 #  end
 
   def on_build(_event)
-    @main_frame = AgMultiEditorView.new(self.frame.hinner_frame)
-    @outline_bar = AgEditorOutlineToolbar.new(self)
+#    self.frame.hinner_frame.bind_append("Enter", proc{activate})
+    @usetabs = conf('use-tabs')=='yes'
+    @main_frame = AgMultiEditorView.new(self.frame, @usetabs)
+    @@outline_bar = AgEditorOutlineToolbar.new(self) if !defined?(@@outline_bar)
     create_find # this is the "find within current file" one
-    pop_up_menu
+    begin
+      pop_up_menu
+    rescue RuntimeError => e
+      Arcadia.runtime_error(e)
+    end
     frame.root.add_button(
       self.name,
-      'close current',
-      proc{Arcadia.process_event(CloseCurrentTabEvent.new(self))}, 
+      'Close current',
+      proc{self.activate;Arcadia.process_event(CloseCurrentTabEvent.new(self))}, 
       CLOSE_DOCUMENT_GIF)
     frame.root.add_sep(self.name, 1)
-    @buffer_menu = frame.root.add_menu_button(self.name, 'files', DOCUMENT_COMBO_GIF, 'right', {'relief'=>:raised, 'borderwidth'=>1}).cget('menu')
+    @buffer_number = TkVariable.new
+    @buffer_number.value = 0
+    @buffer_menu = frame.root.add_menu_button(
+      self.name, 'files', DOCUMENT_COMBO_GIF, 'right', 
+      {'relief'=>:raised, 'borderwidth'=>1, 'compound'=> 'left','anchor'=>'w', 'textvariable'=> @buffer_number, 'width'=>40}).cget('menu')
     load_languages_hash
   end
 
+  def on_activate_instance(_event)
+    if _event.name == @name
+      refresh_status
+      _e = raised
+      change_outline(_e, true) if  _e      
+    end
+  end
+
+  def outline_bar
+    @@outline_bar
+  end
+
   def add_buffer_menu_item(_filename, is_file=true)
+    @buffer_number.numeric += 1
     index = 'end'
     i_end = @buffer_menu.index('end')
     if i_end
@@ -3723,7 +4035,6 @@ class AgMultiEditor < ArcadiaExt
     
     @buffer_menu.insert(index,:radio,
       :label=>File.basename(_filename),
-     # :variable=>TkVariable.new(_filename),
       :value=>_filename,
       :image=> Arcadia.file_icon(_filename),
       :compound=>'left',
@@ -3739,6 +4050,7 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def del_buffer_menu_item(_file)
+    @buffer_number.numeric -= 1
     to_del = -1
     i_end = @buffer_menu.index('end')
     0.upto(i_end){|j|
@@ -3756,9 +4068,60 @@ class AgMultiEditor < ArcadiaExt
     @buffer_menu.delete(to_del) if to_del != -1
   end
 
+  def mod_buffer_menu_item(_file, _newtext, _newvalue = nil)
+    to_mod = -1
+    i_end = @buffer_menu.index('end')
+    0.upto(i_end){|j|
+      type = @buffer_menu.menutype(j)
+      if type != 'separator'
+        value = @buffer_menu.entrycget(j,'value')
+        if value == _file
+          to_mod=j
+          break
+        end
+      end
+    }
+    @buffer_menu.entryconfigure(to_mod, 'label'=>_newtext) if to_mod != -1
+    if to_mod != -1 && _newvalue != nil
+      is_file = File.exists?(_newvalue)
+      @buffer_menu.entryconfigure(to_mod, 
+        :value => _newvalue,
+        :image=> Arcadia.file_icon(_newvalue),
+        :command=>proc{
+          if is_file
+            open_file(_newvalue)
+          else
+            open_buffer(tab_name(_newvalue))             
+          end
+        }
+      )
+    end
+  end
+
+  def refresh_selected_buffer_menu_item
+    i_end = @buffer_menu.index('end')
+    p_name =  @main_frame.raise
+    if @tabs_editor[p_name] && @tabs_editor[p_name].file
+      to_select = @tabs_editor[p_name].file
+    else
+      to_select = unname_modified(tab_title_by_tab_name(p_name))
+    end
+    0.upto(i_end){|j|
+      type = @buffer_menu.menutype(j)
+      if type != 'separator'
+        value = @buffer_menu.entrycget(j,'value')
+        if value == to_select
+          @buffer_menu.entryconfigure(j, 'state'=>'disabled')
+        else
+          @buffer_menu.entryconfigure(j, 'state'=>'normal')
+        end
+      end
+    }
+  end
+
   def on_initialize(_event)
     self.open_last_files
-    reset_status if @main_frame.enb.pages.empty?
+    reset_status if @main_frame.pages.empty?
   end
 
   def on_exit_query(_event)
@@ -3776,18 +4139,14 @@ class AgMultiEditor < ArcadiaExt
     if raised && _event.focus_widget == raised.text
       if [CutTextEvent, PasteTextEvent, UndoTextEvent, RedoTextEvent].include?(_event.class)
         if raised.highlighting
-          line_begin_index = raised.text.index('@0,0')
-          line_begin = line_begin_index.split('.')[0].to_i
-          line_end = raised.text.index('@0,'+TkWinfo.height(raised.text).to_s).split('.')[0].to_i + 1
-          raised.reset_highlight(line_begin)
-          raised.rehighlightlines(line_begin,line_end,true)
+          raised.refresh_visible_highlighting
         else
           raised.check_modify
         end      
       end
     end
   end
-
+  
   def highlight_scanner(_ext=nil)
     return nil if _ext.nil?
     scanner = nil
@@ -3882,7 +4241,7 @@ class AgMultiEditor < ArcadiaExt
 
   def pop_up_menu
     @pop_up = TkMenu.new(
-      :parent=>@main_frame.enb,
+      :parent=> self.frame.hinner_frame,
       :tearoff=>0,
       :title => 'Menu'
     )
@@ -3937,15 +4296,19 @@ class AgMultiEditor < ArcadiaExt
       :hidemargin => false
     )
 
-    @main_frame.enb.tabbind("Button-3",
+    @main_frame.page_bind("Button-3",
       proc{|*x|
-        _x = TkWinfo.pointerx(@main_frame.enb)
-        _y = TkWinfo.pointery(@main_frame.enb)
-        @selected_tab_name_from_popup = x[0].split(':')[0]
-        _index = @main_frame.enb.index(@selected_tab_name_from_popup)
+        _x = TkWinfo.pointerx(@main_frame.root_frame)
+        _y = TkWinfo.pointery(@main_frame.root_frame)
+        if @usetabs
+          @selected_tab_name_from_popup = x[0].split(':')[0]
+        else
+          @selected_tab_name_from_popup = @main_frame.raise
+        end
+        _index = @main_frame.index(@selected_tab_name_from_popup)
         if _index == -1 
           @selected_tab_name_from_popup = 'ff'+@selected_tab_name_from_popup
-          _index = @main_frame.enb.index(@selected_tab_name_from_popup)
+          _index = @main_frame.index(@selected_tab_name_from_popup)
         end
 
         if _index != -1 
@@ -4183,15 +4546,31 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def show_hide_current_line_numbers
-    _e = raised
+    _e = active_instance.raised
     _e.show_hide_line_numbers if _e
   end
 
+  def show_hide_tabs
+    if active? 
+      if @usetabs
+        @main_frame.switch_2_notabs
+        @usetabs = false
+        Arcadia['conf']["#{@name}.use-tabs"]='no'
+      else
+        @main_frame.switch_2_tabs
+        @usetabs = true
+        Arcadia['conf']["#{@name}.use-tabs"]='yes'
+      end
+    else
+      active_instance.show_hide_tabs
+    end
+  end
+
   def on_finalize(_event)
     @batch_files = true
     _files =''
     _raised = self.raised
-    Arcadia.persistent('editor.files.last', _raised.file) if _raised
+    Arcadia.persistent("#{@name}.files.last", _raised.file) if _raised
     @tabs_editor.each_value{|editor|
       if editor.file != nil
         #_insert_index = editor.text.index('insert')
@@ -4202,7 +4581,7 @@ class AgMultiEditor < ArcadiaExt
       #p editor.text.dump_tag('0.1',editor.text.index('end'))
       close_editor(editor,true)
     }
-    Arcadia.persistent('editor.files.open', _files)
+    Arcadia.persistent("#{@name}.files.open", _files)
     clear_temp_files
 #    _breakpoints = '';
 #    @breakpoints.each{|point|
@@ -4231,12 +4610,16 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def raised
-    _page = @main_frame.enb.raise
-    return @tabs_editor[resolve_tab_name(_page)]
+    if @main_frame
+      _page = @main_frame.raise
+      return @tabs_editor[resolve_tab_name(_page)]
+    else
+      nil
+    end
   end
 
   def close_raised
-    _e = @tabs_editor[resolve_tab_name(@main_frame.enb.raise)]
+    _e = @tabs_editor[resolve_tab_name(@main_frame.raise)]
     close_editor(_e) if _e
   end
 
@@ -4274,8 +4657,8 @@ class AgMultiEditor < ArcadiaExt
 
   def open_last_files
     @batch_files = true
-    if Arcadia.persistent('editor.files.open')
-      _files_index =Arcadia.persistent('editor.files.open').split("|")
+    if Arcadia.persistent("#{@name}.files.open")
+      _files_index =Arcadia.persistent("#{@name}.files.open").split("|")
       _files_index.each do |value| 
         _file,_index,_line_numbers_visible_as_string = value.split(';')
         if _file && _index
@@ -4289,18 +4672,17 @@ class AgMultiEditor < ArcadiaExt
       end
     end
     @batch_files = false
-    to_raise_file = Arcadia.persistent('editor.files.last')
+    to_raise_file = Arcadia.persistent("#{@name}.files.last")
     if to_raise_file
       raise_file(to_raise_file,0)
     else
-      _first_page = @main_frame.enb.pages(0) if @main_frame.enb.pages.length > 0
+      _first_page = @main_frame.pages[0] if @main_frame.pages.length > 0
       if _first_page
-        @main_frame.enb.raise(_first_page) if frame_def_visible?
-        @main_frame.enb.see(_first_page)
+        @main_frame.raise(_first_page) if frame_def_visible?
+        @main_frame.see(_first_page)
       end
     end
-    frame(1)
-    #@arcadia.layout.add_observer(self)
+    main_instance.frame(1)
     Arcadia.attach_listener(self, LayoutRaisingFrameEvent)
     self
   end
@@ -4348,18 +4730,9 @@ class AgMultiEditor < ArcadiaExt
   end
 
 
-  def get_tab_from_name(_name=nil)
-    return @main_frame.enb.get_frame(_name)
-#    if _name
-#      @tabs_name.each{
-#        |key,value|
-#        if value.to_s==_name.to_s
-#          return key
-#        end
-#      }
-#      return nil
-#    end
-  end
+#  def get_tab_from_name(_name=nil)
+#    return @main_frame.enb.get_frame(_name)
+#  end
   
   def name_read_only(_name)
     '[READ-ONLY] '+_name
@@ -4368,14 +4741,23 @@ class AgMultiEditor < ArcadiaExt
   def unname_read_only(_name)
     return _name.gsub("[READ-ONLY] ",'')
   end
+
+  def name_modified(_name)
+    '(...)'+_name
+  end
+
+  def unname_modified(_name)
+    return _name.gsub("(...)",'')
+  end
+  
   
   def change_tab_set_read_only(_tab)
-    _new_name = name_read_only(@main_frame.enb.itemcget(page_name(_tab), 'text'))
+    _new_name = name_read_only(@main_frame.page_title(page_name(_tab)))
     change_tab_title(_tab, _new_name)
   end
 
   def change_tab_reset_read_only(_tab)
-    _new_name = unname_read_only(@main_frame.enb.itemcget(page_name(_tab), 'text'))
+    _new_name = unname_read_only(@main_frame.page_title(page_name(_tab)))
     if _new_name
       change_tab_title(_tab, _new_name)
     end
@@ -4383,16 +4765,15 @@ class AgMultiEditor < ArcadiaExt
 
 
   def change_tab_set_modify(_tab)
-    _new_name = '(...)'+@main_frame.enb.itemcget(page_name(_tab), 'text')
-    change_tab_title(_tab, _new_name)
+    change_tab_title(_tab, name_modified(@main_frame.page_title(page_name(_tab))))
   end
 
   def tab_title(_tab)
-    @main_frame.enb.itemcget(page_name(_tab), 'text')
+    @main_frame.page_title(page_name(_tab))
   end
 
   def tab_title_by_tab_name(_tab_name)
-    @main_frame.enb.itemcget(resolve_tab_name(_tab_name), 'text')
+    @main_frame.page_title(resolve_tab_name(_tab_name))
   end
 
   def tab_name(_str="")
@@ -4407,8 +4788,9 @@ class AgMultiEditor < ArcadiaExt
   end
   
   def page_name(_page_frame)
-    pn = TkWinfo.appname(_page_frame).sub('f','')
-    resolve_tab_name(pn)
+    @main_frame.page_name(_page_frame)
+#    pn = TkWinfo.appname(_page_frame).sub('f','')
+#    resolve_tab_name(pn)
   end
   
   def resolve_tab_name(_tab_name)
@@ -4421,44 +4803,64 @@ class AgMultiEditor < ArcadiaExt
   
   def change_tab_reset_modify(_tab)
     #_new_name = @main_frame.enb.itemcget(@tabs_name[_tab], 'text').gsub!("(...)",'')
-    if @main_frame.enb.index(page_name(_tab))
-	    _new_name = @main_frame.enb.itemcget(page_name(_tab), 'text').gsub!("(...)",'')
+    if @main_frame.index(@main_frame.page_name(_tab))
+	    _new_name = unname_modified(@main_frame.page_title(page_name(_tab)))
      	if _new_name
         change_tab_title(_tab, _new_name)
      	end
     end
   end
-  
-  def change_frame_caption(_new_caption)
+
+  def change_frame_caption(_name, _new_caption)
     if @arcadia.layout.headed?
       if frame.root.title == frame.title
-        frame.root.top_text(_new_caption)
+        frame.root.top_text(@main_frame.page(_name)['text'], @main_frame.page(_name)['image']) if @main_frame.page(_name)
+        frame.root.top_text_hint(_new_caption)
+      end  
+      frame.root.save_caption(frame.name, @main_frame.page(_name)['text'], @main_frame.page(_name)['image'])
+    end
+  end
+
+  
+  def change_outline_frame_caption(_new_caption)
+    if @arcadia.layout.headed?
+      if main_instance.frame(1).root.title == main_instance.frame(1).title
+        main_instance.frame(1).root.top_text(_new_caption)
       end  
-      frame.root.save_caption(frame.name, _new_caption)
+      main_instance.frame(1).root.save_caption(frame.name, _new_caption)
     end
   end
 
-  def change_tab_title(_tab, _new_text)
-    @main_frame.enb.itemconfigure(page_name(_tab), 'text'=> _new_text)
+  def change_tab_title(_tab, _new_text, _new_file=nil)
+    p_name = page_name(_tab)
+    old_text = @main_frame.page_title(p_name)
+
+    if @tabs_editor[p_name] && @tabs_editor[p_name].file
+      mod_buffer_menu_item(@tabs_editor[p_name].file, _new_text, _new_file)
+    else
+      mod_buffer_menu_item(unname_modified(tab_title_by_tab_name(p_name)), _new_text)
+    end
+#    mod_buffer_menu_item(@main_frame.page(p_name)['file'], _new_text)
+    @main_frame.page_title(p_name, _new_text)
   end
 
   def change_tab_icon(_tab, _new_text)
-    @main_frame.enb.itemconfigure(page_name(_tab), 'image'=> Arcadia.file_icon(_new_text))
+    @main_frame.page_title(page_name(_tab), nil, Arcadia.file_icon(_new_text))
   end
 
   def change_file(_old_file, _new_file)
     _tab_name=tab_file_name(_old_file)
-    _tab = @main_frame.enb.get_frame(_tab_name)
+    _tab = @main_frame.page_frame(_tab_name)
     e =  @tabs_editor[_tab_name]
-    e.new_file_name(_new_file) if e
     change_file_name(_tab, _new_file)
+    e.new_file_name(_new_file) if e
   end
 
   def change_file_name(_tab, _new_file)
     @tabs_file[page_name(_tab)] = _new_file
     @raw_buffer_name[tab_file_name(_new_file)]=page_name(_tab)
     _new_label = File.basename(_new_file)
-    change_tab_title(_tab, _new_label)
+    change_tab_title(_tab, _new_label, _new_file)
     change_tab_icon(_tab, _new_label)
     #change_frame_caption(_new_file)
     #@tabs_editor[tab_file_name(_new_file)]=@tabs_editor[page_name(_tab)]
@@ -4515,21 +4917,22 @@ class AgMultiEditor < ArcadiaExt
   end
   
   def change_outline(_e, _raised=false)
-    _raised = _raised || frame(1).raised?
+    return if defined?(@@last_outline_e) && @@last_outline_e == _e
+    _raised = _raised || main_instance.frame(1).raised?
     if !@batch_files && _raised
-      @last_outline_e.hide_outline if @last_outline_e
+      @@last_outline_e.hide_outline if defined?(@@last_outline_e)
+      if _e && _e.file
+        change_outline_frame_caption(File.basename(_e.file))
+      end
       _e.show_outline
-      @last_outline_e = _e
+      @@last_outline_e = _e
     end
   end
   
   def do_buffer_raise(_name, _title='...')
-    _index = @main_frame.enb.index(resolve_tab_name(_name))
+    _index = @main_frame.index(resolve_tab_name(_name))
     _new_caption = '...'
     if _index != -1
-      #_name = @main_frame.enb.pages(_index)
-      #_tab = get_tab_from_name(_name)
-      #@main_frame.enb.raise(_name)
       _e = @tabs_editor[resolve_tab_name(_name)]
       change_outline(_e) if _e
       if _e && _e.file != nil
@@ -4542,28 +4945,28 @@ class AgMultiEditor < ArcadiaExt
       _lang = _e.lang
       _e.update_toolbar
     end
-    change_frame_caption(_new_caption)
+    change_frame_caption(_name, _new_caption)
     refresh_status
     _title = @tabs_file[_name] != nil ? File.basename(@tabs_file[_name]) :_name
     Arcadia.broadcast_event(BufferRaisedEvent.new(self, 'title'=>_title, 'file'=>@tabs_file[_name], 'lang'=>_lang ))
     Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>_e.text)) if _e
-
+    refresh_selected_buffer_menu_item
     #EditorContract.instance.buffer_raised(self, 'title'=>_title, 'file'=>@tabs_file[_name])
   end
   
   def initialize_status
-    @statusbar_items = Hash.new
-    @statusbar_items['file_size'] = Arcadia.new_statusbar_item("File size")
-    @statusbar_items['file_mtime'] = Arcadia.new_statusbar_item("File modification time")
-    @statusbar_items['file_name'] = Arcadia.new_statusbar_item("File name")
-#    @statusbar_item = Arcadia.new_statusbar_item
-#    @statusbar_item.relief('flat')
+    if !defined?(@@statusbar_items)
+      @@statusbar_items = Hash.new
+      @@statusbar_items['file_size'] = Arcadia.new_statusbar_item("File size")
+      @@statusbar_items['file_mtime'] = Arcadia.new_statusbar_item("File modification time")
+      @@statusbar_items['file_name'] = Arcadia.new_statusbar_item("File name")
+    end
   end
 
   def reset_status
-    @statusbar_items['file_name'].text = '?'
-    @statusbar_items['file_mtime'].text =  '?'
-    @statusbar_items['file_size'].text = '?' 
+    @@statusbar_items['file_name'].text = '?'
+    @@statusbar_items['file_mtime'].text =  '?'
+    @@statusbar_items['file_size'].text = '?' 
   end
   
   def refresh_status
@@ -4575,10 +4978,12 @@ class AgMultiEditor < ArcadiaExt
       else
         size_str = "#{size} b"      
       end
-      @statusbar_items['file_name'].text(File.basename(raised.file))
-      @statusbar_items['file_mtime'].text =  raised.file_info['mtime'].localtime
-      @statusbar_items['file_size'].text = size_str 
+      @@statusbar_items['file_name'].text(File.basename(raised.file))
+      @@statusbar_items['file_mtime'].text =  raised.file_info['mtime'].localtime
+      @@statusbar_items['file_size'].text = size_str 
       #@statusbar_item.text("#{File.basename(raised.file)} | #{raised.file_info['mtime'].localtime} | #{size_str}")
+    else
+      reset_status
     end
   end
   
@@ -4593,10 +4998,10 @@ class AgMultiEditor < ArcadiaExt
     if _ret.nil?
       _basefilename = File.basename(_filename)
       _name = self.tab_file_name(_filename)
-      _index = @main_frame.enb.index(resolve_tab_name(_name))
+      _index = @main_frame.index(resolve_tab_name(_name))
       if _index == -1
         _name = name_read_only(_name)
-        _index = @main_frame.enb.index(resolve_tab_name(_name))
+        _index = @main_frame.index(resolve_tab_name(_name))
       end
       if _index != -1
         _ret = @tabs_editor[resolve_tab_name(_name)]
@@ -4610,9 +5015,9 @@ class AgMultiEditor < ArcadiaExt
     #_basename = _basefilename.split('.')[0]+'_'+_basefilename.split('.')[1]
     
     _name = self.tab_file_name(_filename)
-    _index = @main_frame.enb.index(resolve_tab_name(_name))
+    _index = @main_frame.index(resolve_tab_name(_name))
     if _index == -1
-      _index = @main_frame.enb.index(resolve_tab_name(name_read_only(_name)))
+      _index = @main_frame.index(resolve_tab_name(name_read_only(_name)))
     end
     if _index == -1
       @editors.each{|e|
@@ -4628,10 +5033,10 @@ class AgMultiEditor < ArcadiaExt
   def raise_file(_filename=nil, _pos=nil)
     if _filename && frame_def_visible?
       tab_name=self.tab_file_name(_filename)
-      if  @main_frame.enb.index(tab_name) != -1
-          @main_frame.enb.move(tab_name,_pos) if _pos
-          @main_frame.enb.raise(tab_name)
-          @main_frame.enb.see(tab_name)
+      if  @main_frame.index(tab_name) != -1
+          @main_frame.move(tab_name,_pos) if _pos
+          @main_frame.raise(tab_name)
+          @main_frame.see(tab_name)
       end
     end    
   end
@@ -4657,6 +5062,7 @@ class AgMultiEditor < ArcadiaExt
         close_editor(@tabs_editor[_tab_name], true)
         Arcadia.runtime_error(e)
       end
+      change_outline_frame_caption(File.basename(_filename)) if _filename    
     end
     editor = @tabs_editor[_tab_name]
     if _text_index != nil && _text_index != '1.0' && editor
@@ -4669,7 +5075,7 @@ class AgMultiEditor < ArcadiaExt
 
 
   def open_buffer(_buffer_name = nil, _title = nil, _filename=nil, _lang=nil)
-    _index = @main_frame.enb.index(resolve_tab_name(_buffer_name))
+    _index = @main_frame.index(resolve_tab_name(_buffer_name))
     if _buffer_name == nil
     		_title_new = '*new'
     		tmp_buffer_num = 0
@@ -4678,11 +5084,11 @@ class AgMultiEditor < ArcadiaExt
     end
     
     if _index != -1
-      _tab = @main_frame.enb.get_frame(resolve_tab_name(_buffer_name))
-      @main_frame.enb.raise(resolve_tab_name(_buffer_name)) if frame_visible?
+      _tab = @main_frame.page_frame(resolve_tab_name(_buffer_name))
+      @main_frame.raise(resolve_tab_name(_buffer_name)) if frame_visible?
     else
       _n = 1
-      while @main_frame.enb.index(_buffer_name) != -1
+      while @main_frame.index(_buffer_name) != -1
         _title_new = '*new'+_n.to_s
         tmp_buffer_num = _n
         _buffer_name = tab_name(_title_new)
@@ -4700,14 +5106,15 @@ class AgMultiEditor < ArcadiaExt
       else
         _image = Arcadia.file_icon(_title)
       end
-      _tab = @main_frame.enb.insert('end', _buffer_name ,
-        'text'=> _title,
-        'image'=> _image,
- #       'image'=> Arcadia.file_icon(lang_sign),
-        'background'=> Arcadia.style("tabpanel")["background"],
-        'foreground'=> Arcadia.style("tabpanel")["foreground"],
-        'raisecmd'=>proc{do_buffer_raise(_buffer_name, _title)}
-      )
+      _tab = @main_frame.add_page(_buffer_name, _filename, _title, _image, proc{do_buffer_raise(_buffer_name, _title)})
+#      _tab = @main_frame.enb.insert('end', _buffer_name ,
+#        'text'=> _title,
+#        'image'=> _image,
+# #       'image'=> Arcadia.file_icon(lang_sign),
+#        'background'=> Arcadia.style("tabpanel")["background"],
+#        'foreground'=> Arcadia.style("tabpanel")["foreground"],
+#        'raisecmd'=>proc{do_buffer_raise(_buffer_name, _title)}
+#      )
       @raw_buffer_name[_buffer_name]=_buffer_name
       if _filename
         add_buffer_menu_item(_filename)
@@ -4727,11 +5134,11 @@ class AgMultiEditor < ArcadiaExt
     end
     begin
       if raised != @tabs_editor[resolve_tab_name(_buffer_name)]
-        @main_frame.enb.move(resolve_tab_name(_buffer_name), 0)
-        @main_frame.enb.raise(resolve_tab_name(_buffer_name)) if frame_visible?
-        @main_frame.enb.see(resolve_tab_name(_buffer_name))
+        @main_frame.move(resolve_tab_name(_buffer_name), 0)
+        @main_frame.raise(resolve_tab_name(_buffer_name)) if frame_visible?
+        @main_frame.see(resolve_tab_name(_buffer_name))
       else
-        @main_frame.enb.move(resolve_tab_name(_buffer_name), 0)
+        @main_frame.move(resolve_tab_name(_buffer_name), 0)
       end
     rescue Exception => e
       Arcadia.runtime_error(e)
@@ -4748,7 +5155,7 @@ class AgMultiEditor < ArcadiaExt
       end
     }
     if _tab_name
-      _index = @main_frame.enb.index(resolve_tab_name(_tab_name))
+      _index = @main_frame.index(resolve_tab_name(_tab_name))
       _exist_buffer = _index != -1
       if _exist_buffer
         open_buffer(_tab_name)
@@ -4781,7 +5188,7 @@ class AgMultiEditor < ArcadiaExt
     ret = true
     if _editor.modified?
       filename = page_name(_editor.page_frame)
-      message = @main_frame.enb.itemcget(filename, 'text')+"\n modified. Save?"
+      message = @main_frame.page_title(filename)+"\n modified. Save?"
       r=Arcadia.dialog(self,
           'type'=>'yes_no_cancel', 
           'level'=>'warning',
@@ -4795,7 +5202,7 @@ class AgMultiEditor < ArcadiaExt
       end
     elsif _editor.modified_by_others?
       filename = page_name(_editor.page_frame)
-      message = @main_frame.enb.itemcget(filename, 'text')+"\n modified by other process. Continue closing?"
+      message = @main_frame.page_title(filename)+"\n modified by other process. Continue closing?"
       r=Arcadia.dialog(self,
           'type'=>'yes_no', 
           'level'=>'warning',
@@ -4819,6 +5226,7 @@ class AgMultiEditor < ArcadiaExt
       index = _editor.text.index("@0,0")
       r,c = index.split('.')
       _editor.destroy_outline
+      change_outline_frame_caption('') if raised==_editor      
       close_buffer(_editor.page_frame)
       BufferClosedEvent.new(self,'file'=>file,'row'=>r.to_i, 'col'=>c.to_i).shot!
     else
@@ -4831,18 +5239,18 @@ class AgMultiEditor < ArcadiaExt
     if @tabs_editor[_name] && @tabs_editor[_name].file
       del_buffer_menu_item(@tabs_editor[_name].file)
     else
-      del_buffer_menu_item(tab_title_by_tab_name(_name))
+      del_buffer_menu_item(unname_modified(tab_title_by_tab_name(_name)))
     end
     @tabs_editor.delete(_name)
     @tabs_file.delete(_name)
     @raw_buffer_name.delete_if {|key, value| value == _name }  
    
-    _index = @main_frame.enb.index(_name)
-    @main_frame.enb.delete(_name)
-    if !@main_frame.enb.pages.empty?
-      @main_frame.enb.raise(@main_frame.enb.pages[_index-1]) if TkWinfo.mapped?(@main_frame.enb)
+    _index = @main_frame.index(_name)
+    @main_frame.delete_page(_name)
+    if !@main_frame.pages.empty?
+      @main_frame.raise(@main_frame.pages[_index-1]) if TkWinfo.mapped?(@main_frame.root_frame)
     else
-      frame.root.top_text('') if TkWinfo.mapped?(frame.hinner_frame)
+      frame.root.top_text_clear if TkWinfo.mapped?(frame.hinner_frame)
       reset_status
     end
   end
@@ -5005,6 +5413,7 @@ class Findview < TkFloatTitledFrame
     super
     self.focus
     @e_what.focus
+    @e_what_entry.select_throw
     @e_what_entry.selection_range(0,'end')
   end
 
@@ -5253,6 +5662,7 @@ class GoToLine < TkFloatTitledFrame
     super
     self.focus
     @e_line.focus
+    @e_line.select_throw
     @e_line.selection_range(0,'end')
   end
 end