arcadia 0.13.1 → 1.0.0

data/ext/ae-breakpoints/ae-breakpoints.rb

@@ -107,13 +107,14 @@ class Breakpoints < ArcadiaExt
   end
   
   def build_popup
-    _pop_up = TkMenu.new(
+    #_pop_up = TkMenu.new(
+    _pop_up = Arcadia.wf.menu(
       :parent=>@tree_break,
       :tearoff=>0,
       :title => 'Menu'
     )
-    _pop_up.extend(TkAutoPostMenu)
-    _pop_up.configure(Arcadia.style('menu'))
+    #_pop_up.extend(TkAutoPostMenu)
+    #_pop_up.configure(Arcadia.style('menu'))
     _title_item = _pop_up.insert('end',
       :command,
       :label=>'...',

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

@@ -6,4 +6,30 @@ active=yes
 require=ext/ae-dir-projects/ae-dir-projects
 class=DirProjects
 
-file.name=arcadia.projects
+file.name=arcadia.projects
+
+
+user_toolbar.contexts=dir_project
+user_toolbar.dir_project.context_path=file
+user_toolbar.dir_project=newp,openp,search,xterm
+#,openp,search,xterm
+
+user_toolbar.dir_project.newp.name=newp
+user_toolbar.dir_project.newp.hint=!Arcadia.text('ext.dir_projects.button.new.hint')
+user_toolbar.dir_project.newp.image_data=!NEW_GIF
+user_toolbar.dir_project.newp.action=ActionEvent.new(self,'action'=>do_new_project)
+
+user_toolbar.dir_project.openp.name=openp
+user_toolbar.dir_project.openp.hint=!Arcadia.text('ext.dir_projects.button.open.hint')
+user_toolbar.dir_project.openp.image_data=!OPEN_PROJECT_GIF
+user_toolbar.dir_project.openp.action=ActionEvent.new(self,'action'=>do_open_project)
+
+user_toolbar.dir_project.search.name=search
+user_toolbar.dir_project.search.hint=!Arcadia.text('ext.dir_projects.button.search.hint')
+user_toolbar.dir_project.search.image_data=!SEARCH_FILES_GIF
+user_toolbar.dir_project.search.action=ActionEvent.new(self,'action'=>do_search_files)
+
+user_toolbar.dir_project.xterm.name=xterm
+user_toolbar.dir_project.xterm.hint=!Arcadia.text('ext.dir_projects.button.term.hint')
+user_toolbar.dir_project.xterm.image_data=!TERMINAL_GIF
+user_toolbar.dir_project.xterm.action=ActionEvent.new(self,'action'=>do_open_term)

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

@@ -45,68 +45,81 @@ class DirProjects < ArcadiaExtPlus
     @h_stack = Array.new
     @opened_folder = Array.new
     #--- button_box 
-    @button_box = Tk::BWidget::ButtonBox.new(self.frame.hinner_frame){
-      homogeneous true
-      spacing 0
-      padx 0
-      pady 0
-      background Arcadia.conf('panel.background')
-    }.place('x'=>0)
-    TkWinfo.parent(@button_box).configure(:background => Arcadia.conf('panel.background'))
+#    @button_box = Tk::BWidget::ButtonBox.new(self.frame.hinner_frame){
+#      homogeneous true
+#      spacing 0
+#      padx 0
+#      pady 0
+#      background Arcadia.conf('panel.background')
+#    }.place('x'=>0)
+#    TkWinfo.parent(@button_box).configure(:background => Arcadia.conf('panel.background'))
     
-    @button_box.add(Arcadia.style('toolbarbutton').update({
-      'name'=>'new_proj',
-      'anchor' => 'center',
-      'command'=>proc{self.do_new_project},
-      'helptext'=>Arcadia.text('ext.dir_projects.button.new.hint'),
-      'image'=> Arcadia.image_res(NEW_GIF)})
-    )
+#    @button_box.add(Arcadia.style('toolbarbutton').update({
+#      'name'=>'new_proj',
+#      'anchor' => 'center',
+#      'command'=>proc{self.do_new_project},
+#      'helptext'=>Arcadia.text('ext.dir_projects.button.new.hint'),
+#      'image'=> Arcadia.image_res(NEW_GIF)})
+#    )
+
+
+
+#    @button_box.add(Arcadia.style('toolbarbutton').update({
+#      'name'=>'open_proj',
+#      'anchor' => 'center',
+#      'command'=>proc{self.do_open_project},
+#      'helptext'=>Arcadia.text('ext.dir_projects.button.open.hint'),
+#      'image'=> Arcadia.image_res(OPEN_PROJECT_GIF)})
+#    )
+
+
+
+#    @button_box.add(Arcadia.style('toolbarbutton').update({
+#      'name'=>'parent_folder',
+#      'anchor' => 'center',
+#      'command'=>proc{self.do_goto_parent_folder},
+#      'helptext'=>Arcadia.text('ext.dir_projects.button.up.hint'),
+#      'image'=> Arcadia.image_res(PARENTFOLDER_GIF)})
+#    )
 
-    @button_box.add(Arcadia.style('toolbarbutton').update({
-      'name'=>'open_proj',
-      'anchor' => 'center',
-      'command'=>proc{self.do_open_project},
-      'helptext'=>Arcadia.text('ext.dir_projects.button.open.hint'),
-      'image'=> Arcadia.image_res(OPEN_PROJECT_GIF)})
-    )
 
-    @button_box.add(Arcadia.style('toolbarbutton').update({
-      'name'=>'parent_folder',
-      'anchor' => 'center',
-      'command'=>proc{self.do_goto_parent_folder},
-      'helptext'=>Arcadia.text('ext.dir_projects.button.up.hint'),
-      'image'=> Arcadia.image_res(PARENTFOLDER_GIF)})
-    )
     
-    @button_box.add(Arcadia.style('toolbarbutton').update({
-      'name'=>'search_in_files',
-      'anchor' => 'center',
-      'command'=>proc{self.do_search_files},
-      'helptext'=>Arcadia.text('ext.dir_projects.button.search.hint'),
-      'image'=> Arcadia.image_res(SEARCH_FILES_GIF)})
-    )
+#    @button_box.add(Arcadia.style('toolbarbutton').update({
+#      'name'=>'search_in_files',
+#      'anchor' => 'center',
+#      'command'=>proc{self.do_search_files},
+#      'helptext'=>Arcadia.text('ext.dir_projects.button.search.hint'),
+#      'image'=> Arcadia.image_res(SEARCH_FILES_GIF)})
+#    )
 
-    @button_box.add(Arcadia.style('toolbarbutton').update({
-      'name'=>'terminal',
-      'anchor' => 'center',
-      'command'=>proc{self.do_open_term},
-      'helptext'=>Arcadia.text('ext.dir_projects.button.term.hint'),
-      'image'=> Arcadia.image_res(TERMINAL_GIF)})
-    )
 
+
+#    @button_box.add(Arcadia.style('toolbarbutton').update({
+#      'name'=>'terminal',
+#      'anchor' => 'center',
+#      'command'=>proc{self.do_open_term},
+#      'helptext'=>Arcadia.text('ext.dir_projects.button.term.hint'),
+#      'image'=> Arcadia.image_res(TERMINAL_GIF)})
+#    )
+
+    
+    
     #--- button_box
+    
+    
     @panel = self.frame.root.add_panel(self.frame.name, "sync");
-    @cb_sync = TkCheckButton.new(@panel, Arcadia.style('checkbox').update('background'=>@panel.background)){
-      text  'Sync'
-      justify  'left'
-      indicatoron 0
-      offrelief 'flat'
+#    @cb_sync = TkCheckButton.new(@panel, Arcadia.style('checkbox').update('background'=>@panel.background)){
+    
+    @cb_sync = Arcadia.wf.titlecontextcheckbutton(@panel){
+      variable TkVariable.new
       image Arcadia.image_res(SYNC_GIF)
       pack
     }
+    
+    @cb_sync.hint=Arcadia.text('ext.dir_projects.button.link.hint')
 
-    Tk::BWidget::DynamicHelp::add(@cb_sync, 
-      'text'=>Arcadia.text('ext.dir_projects.button.link.hint'))
+#    Tk::BWidget::DynamicHelp::add(@cb_sync, 
+#      'text'=>Arcadia.text('ext.dir_projects.button.link.hint'))
 
     do_check = proc {
       if @cb_sync.cget('onvalue')==@cb_sync.cget('variable').value.to_i
@@ -139,6 +152,16 @@ class DirProjects < ArcadiaExtPlus
         shure_delete_node(_selected)
       end
     }
+
+    self.frame.root.add_button(self.frame.name, Arcadia.text('ext.dir_projects.button.up.hint'), proc{self.do_goto_parent_folder}, ARROW_UP_GIF)
+#    self.frame.root.add_sep(self.frame.name,1)
+#    self.frame.root.add_button(self.frame.name, Arcadia.text('ext.dir_projects.button.term.hint'), proc{self.do_open_term}, TERMINAL_GIF)
+#    self.frame.root.add_sep(self.frame.name,1)
+#    self.frame.root.add_button(self.frame.name, Arcadia.text('ext.dir_projects.button.search.hint'), proc{self.do_search_files}, SEARCH_FILES_GIF)
+#    self.frame.root.add_sep(self.frame.name,1)
+#    self.frame.root.add_button(self.frame.name, Arcadia.text('ext.dir_projects.button.open.hint'), proc{Tk.callback_break;self.do_open_project}, OPEN_PROJECT_GIF)
+#    self.frame.root.add_sep(self.frame.name,1)
+#    self.frame.root.add_button(self.frame.name, Arcadia.text('ext.dir_projects.button.new.hint'), proc{self.do_new_project}, NEW_GIF)
     
     
     do_open_folder_cmd = proc{|_node| do_open_folder(_node)}
@@ -152,7 +175,8 @@ class DirProjects < ArcadiaExtPlus
       crosscloseimage  Arcadia.image_res(PLUS_GIF)
       crossopenimage  Arcadia.image_res(MINUS_GIF)
     }
-    @htree.extend(TkScrollableWidget).show(0,24)
+#    @htree.extend(TkScrollableWidget).show(0,24)
+    @htree.extend(TkScrollableWidget).show(0,0)
     self.pop_up_menu_tree
     @image_kdir = Arcadia.image_res(ICON_FOLDER_OPEN_GIF)
     @image_kdir_closed = Arcadia.image_res(FOLDER_GIF)
@@ -289,21 +313,23 @@ class DirProjects < ArcadiaExtPlus
   end
 
   def pop_up_menu_tree
-    @pop_up_tree = TkMenu.new(
+    #@pop_up_tree = TkMenu.new(
+    @pop_up_tree = Arcadia.wf.menu(
       :parent=>@htree,
       :tearoff=>0,
       :title => Arcadia.text('ext.dir_projects.menu.title')
     )
-    @pop_up_tree.extend(TkAutoPostMenu)
-    @pop_up_tree.configure(Arcadia.style('menu'))
+    #@pop_up_tree.extend(TkAutoPostMenu)
+    #@pop_up_tree.configure(Arcadia.style('menu'))
     #----- new submenu
-    sub_new = TkMenu.new(
+    #sub_new = TkMenu.new(
+    sub_new = Arcadia.wf.menu(
       :parent=>@pop_up_tree,
       :tearoff=>0,
       :title => Arcadia.text('ext.dir_projects.menu.new')
     )
-    sub_new.extend(TkAutoPostMenu)
-    sub_new.configure(Arcadia.style('menu'))
+    #sub_new.extend(TkAutoPostMenu)
+    #sub_new.configure(Arcadia.style('menu'))
     sub_new.insert('end',
       :command,
       :label=>Arcadia.text('ext.dir_projects.menu.new_dir_proj'),
@@ -343,13 +369,14 @@ class DirProjects < ArcadiaExtPlus
     )
     #-----------------
     #----- refactor submenu
-    sub_ref = TkMenu.new(
+    #sub_ref = TkMenu.new(
+    sub_ref = Arcadia.wf.menu(
       :parent=>@pop_up_tree,
       :tearoff=>0,
       :title => Arcadia.text('ext.dir_projects.menu.refactor')
     )
-    sub_ref.extend(TkAutoPostMenu)
-    sub_ref.configure(Arcadia.style('menu'))
+    #sub_ref.extend(TkAutoPostMenu)
+    #sub_ref.configure(Arcadia.style('menu'))
     sub_ref.insert('end',
       :command,
       :label=>Arcadia.text('ext.dir_projects.menu.refactor.rename'),
@@ -369,7 +396,8 @@ class DirProjects < ArcadiaExtPlus
         _selected = @htree.selected
         if _selected
           _idir = File.split(_selected)[0]
-          _dir=Tk.chooseDirectory('initialdir'=>_idir,'mustexist'=>true) 
+          #_dir=Tk.chooseDirectory('initialdir'=>_idir,'mustexist'=>true) 
+          _dir=Arcadia.select_dir_dialog(_idir, true)
           do_move(_selected, _dir) if _dir && File.exists?(_dir)
         end
       }
@@ -383,13 +411,14 @@ class DirProjects < ArcadiaExtPlus
     
     #-----------------
     #----- search submenu
-    sub_ref_search = TkMenu.new(
+    #sub_ref_search = TkMenu.new(
+    sub_ref_search = Arcadia.wf.menu(
       :parent=>@pop_up_tree,
       :tearoff=>0,
       :title => Arcadia.text('ext.dir_projects.menu.search')
     )
-    sub_ref_search.extend(TkAutoPostMenu)
-    sub_ref_search.configure(Arcadia.style('menu'))
+    #sub_ref_search.extend(TkAutoPostMenu)
+    #sub_ref_search.configure(Arcadia.style('menu'))
     sub_ref_search.insert('end',
       :command,
       :label=>Arcadia.text('ext.dir_projects.menu.search.find'),
@@ -498,7 +527,8 @@ class DirProjects < ArcadiaExtPlus
   end
 
   def do_search_files
-    _target = @htree.selected
+    active_instance.do_search_files if active_instance != self
+    _target = @htree.selected || MonitorLastUsedDir.get_last_dir
     if _target
       _target = File.dirname(_target) if File.ftype(_target) == 'file'
       Arcadia.process_event(SearchInFilesEvent.new(self,'dir'=>_target))
@@ -506,7 +536,8 @@ class DirProjects < ArcadiaExtPlus
   end
 
   def do_open_term
-    _target = @htree.selected
+    active_instance.do_open_term if active_instance != self
+    _target = @htree.selected || MonitorLastUsedDir.get_last_dir
     if _target
       _target = File.dirname(_target) if File.ftype(_target) == 'file'
       TermEvent.new(self,'dir'=>_target, 'title'=>_target).go!
@@ -557,8 +588,10 @@ class DirProjects < ArcadiaExtPlus
 #  end
 
   def do_new_project(_parent_folder_node=nil)
+    active_instance.do_new_project if active_instance != self
     if _parent_folder_node.nil?
-      _parent_folder_node=Tk.chooseDirectory 'initialdir' =>  MonitorLastUsedDir.get_last_dir
+      #_parent_folder_node=Tk.chooseDirectory 'initialdir' =>  MonitorLastUsedDir.get_last_dir
+      _parent_folder_node=Arcadia.select_dir_dialog(MonitorLastUsedDir.get_last_dir)
     end
     if _parent_folder_node && File.exists?(node2file(_parent_folder_node)) && File.ftype(node2file(_parent_folder_node)) == 'directory'
       tmp_node_name = "#{node2file(_parent_folder_node)}#{File::SEPARATOR}_new_project_"
@@ -584,8 +617,11 @@ class DirProjects < ArcadiaExtPlus
   end
   
   def do_open_project(_proj_name=nil)
+    active_instance.do_open_project if active_instance != self
+
     if _proj_name.nil?
-      _proj_name=Tk.chooseDirectory 'initialdir' =>  MonitorLastUsedDir.get_last_dir
+      #_proj_name=Tk.chooseDirectory 'initialdir' =>  MonitorLastUsedDir.get_last_dir
+      _proj_name=Arcadia.select_dir_dialog(MonitorLastUsedDir.get_last_dir)
       add_project(_proj_name) if _proj_name && File.exists?(_proj_name)
     end
   end
@@ -935,11 +971,26 @@ class DirProjects < ArcadiaExtPlus
       del_project_from_file(_dir) 
   end
 
-
+  def sort_files_name(_files=nil)
+    return if _files.nil?
+    sorted = []
+    names = []
+    files_hash = {}
+    _files.each{|file|
+      name = File.split(file)[1]
+      names << name
+      files_hash[name]=file
+    }
+    names.sort!
+    names.each{|n| sorted << files_hash[n]}
+    sorted
+  end
+    
   def load_projects
     f = File::open(projects_file,'r')
     begin
       _lines = f.readlines.collect!{| line | line.chomp}
+      _lines = sort_files_name(_lines)
     ensure
       f.close unless f.nil?
     end
@@ -983,7 +1034,6 @@ class DirProjects < ArcadiaExtPlus
     begin
       _lines.each{|_line|
         if _line != _project
-        p _line
           f.syswrite(_line+"\n")
         end
       }

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

@@ -23,12 +23,12 @@ tabs.side=top
 complete-code=yes
 close-last-if-not-modified=yes
 max-file-open=3 #TODO
-use-tabs=yes
+use-tabs=no
 explorer_panel.tabs.side=top
 
 #:::::::::::::::: Editor group    ::::::::::::::::::::::<end>
 popup.bind.shortcut=Button-3
-arm::popup.bind.shortcut=F4
+ARM::popup.bind.shortcut=F4
 #keybinding.Control-Shift-KeyPress[Y]=ActionEvent.new(self,'action'=>close_raised)
 
 # menu items

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

@@ -96,20 +96,12 @@ class SourceStructure
   
 end
 
-class CtagsSourceStructure < SourceStructure
-  SUPPORTED_LANG = ['Ant','Asm','Asp','Awk','Basic','BETA','C','C++','C#','Cobol','DosBatch','Eiffel','Erlang','Flex','Fortran','HTML','Java','JavaScript','Lisp','Lua','Make','MatLab','OCaml','Pascal','Perl','PHP','Python','REXX','Ruby','Scheme','Sh','SLang','SML','SQL','Tcl','Tex','Vera','Verilog','VHDL','Vim','YACC']
-  def initialize(_file, _ctags_string='ctags', _row_rif = nil, _language=nil)
+class FileSourceStructure < SourceStructure
+  def initialize(_file, _row_rif = nil)
     super()
     @file = _file
-    @ctags_string = _ctags_string
-    @language = (_language.nil?)?nil:_language.capitalize
-    @classes = Hash.new
-    @last_root = @root
-    @last_class_node = @root
-    @last_node = @root
-    @blank_rows = []    
+    @blank_rows = []
     initialize_blank_rows(_row_rif) if !_row_rif.nil?
-    build_structure
   end
   
   def initialize_blank_rows(_row = nil)
@@ -120,6 +112,163 @@ class CtagsSourceStructure < SourceStructure
     }
     @blank_rows << _row if _row 
   end
+  
+end
+
+module RubySourceStructureUtils
+  attr_reader :injected_row
+  def scheletor_from_node(_node, _source='', _injected_source='', _injected_class='')
+    _hinner_source = ''
+    #_sons = _node.sons.sort
+    _sons = _node.sons
+    for inode in 0.._sons.length - 1
+      _son = _sons[inode]
+      if _son.kind == 'class'
+         _hinner_source = "#{_hinner_source}#{_son.helptext}\n"
+      elsif _son.kind == 'module'
+         _hinner_source = "#{_hinner_source}#{_son.helptext}\n"
+      elsif _son.kind == 'method' && ((_son.label != 'initialize') || (_son.label == 'initialize') && _son.args)         
+         _hinner_source = "#{_hinner_source}  def #{_son.label}#{_son.args}\n"
+         _hinner_source = "#{_hinner_source}  end\n"
+      elsif _son.kind == 'singleton method'
+         _hinner_source = "#{_hinner_source}  def #{_son.label}\n"
+         _hinner_source = "#{_hinner_source}  end\n"
+      end
+      _hinner_source= scheletor_from_node(_son, _hinner_source, _injected_source, _injected_class)
+    end
+    _source = "#{_source}#{_hinner_source}" if _hinner_source.strip.length>0
+    if _node.kind == 'class' && _node.label == _injected_class
+      _source = "#{_source}  def initialize\n  #{_injected_source}  end\n"
+      @injected_row = _source.split("\n").length-2
+    elsif _node.kind == 'class'
+      _source = "#{_source}  def initialize\n  end\n"
+    end
+    _source = "#{_source}end\n" if _node.kind == 'class' || _node.kind == 'module'
+    _source
+  end
+end
+
+class RubyGrepFileSourceStructure < FileSourceStructure
+  include RubySourceStructureUtils
+  def initialize(_file, _row_rif = nil)
+    super(_file, _row_rif)
+    @last_class_node = @root
+    @last_node = @root
+    @last_end_node_row = 0
+    @last_class_node_row = 0
+    @last_end_indentation = 0
+    @last_class_indentation = 0
+    build_structure
+  end
+  
+  def build_structure
+    output = grep
+    output.each {|line|
+      row, other = line.split(':')
+      
+      indent = 0
+      l0 = other.length
+      if l0 > 0
+        indent = l0 - other.lstrip.length
+      end
+      
+      other.strip! if other
+      key_word, other = other.split
+      other.strip! if other
+      next if !['class','module','def','end'].include?(key_word)
+      if key_word == 'end'
+        @last_end_node_row = row
+        @last_end_indentation = indent
+        next
+      end
+      # hinner class
+      if ['class','module','def'].include?(key_word) && @last_class_node != @root && @last_class_node.parent != @root  && ((@last_class_indentation.to_i - @last_end_indentation.to_i).abs <= 1)
+        @last_class_node = @last_class_node.parent
+        @last_class_node_row = row
+      end
+      # kind
+      if ['class','module'].include?(key_word)
+        kind = key_word
+        if @last_end_node_row.to_i > @last_class_node_row.to_i || @last_class_node == @root
+          parent = @root
+        else
+          parent = @last_class_node
+          @last_class_indentation = indent
+        end
+      elsif ['def'].include?(key_word)
+        kind = 'method'
+        parent = @last_class_node
+      end
+      #name
+      name = other.split('(')[0].strip
+      next if name == '<<' && kind == 'class'
+      #helptext
+      helptext = line.strip
+      #singleton
+      if kind == 'method' && name.split('.')[0] == parent.label
+        kind = 'singleton method'
+        name = name.sub("#{parent.label}.",'')
+      end
+      # create node
+      node = SourceTreeNode.new(parent, kind)
+      node.label = name
+      node.helptext = helptext
+      node.args = ''
+      node.rif = row
+      ln_rif = node.rif.to_i - 1 
+      while @blank_rows.include?(ln_rif) && ln_rif > 0
+        ln_rif = ln_rif - 1
+      end
+      @last_node.rif_end = ln_rif.to_s
+
+      if ['class','module'].include?(key_word)
+        @last_class_node = node
+        @last_class_node_row = row
+      end
+      node.sortable = true
+      @last_node = node
+    }
+  end
+  
+  def grep
+    _cmd_ = "|grep -nE '^class\s|\sclass\s|^module\s|\smodule\s|^def\s|\sdef\s|^end\s|\send\s|^end$|\send$' #{@file}"
+    to_ret = ''
+    begin
+      open(_cmd_, "r"){|f| 
+        to_ret = f.readlines
+      }
+    rescue RuntimeError => e
+      Arcadia.runtime_error(e)
+    end
+    to_ret
+  end
+end
+
+
+class CtagsFileSourceStructure < FileSourceStructure
+  SUPPORTED_LANG = ['Ant','Asm','Asp','Awk','Basic','BETA','C','C++','C#','Cobol','DosBatch','Eiffel','Erlang','Flex','Fortran','HTML','Java','JavaScript','Lisp','Lua','Make','MatLab','OCaml','Pascal','Perl','PHP','Python','REXX','Ruby','Scheme','Sh','SLang','SML','SQL','Tcl','Tex','Vera','Verilog','VHDL','Vim','YACC']
+  def initialize(_file, _ctags_string='ctags', _row_rif = nil, _language=nil)
+    super(_file, _row_rif)
+    #@file = _file
+    @ctags_string = _ctags_string
+    @language = (_language.nil?)?nil:_language.capitalize
+    @classes = Hash.new
+    @last_root = @root
+    @last_class_node = @root
+    @last_node = @root
+    #@blank_rows = []    
+    #initialize_blank_rows(_row_rif) if !_row_rif.nil?
+    build_structure
+  end
+  
+#  def initialize_blank_rows(_row = nil)
+#    File::open(@file,'rb'){ |file|
+#      file.readlines.each_with_index{| line, i | 
+#        @blank_rows << i+1 if line.strip == ''
+#      }
+#    }
+#    @blank_rows << _row if _row 
+#  end
 
   def build_structure
     output = ctags
@@ -187,47 +336,17 @@ class CtagsSourceStructure < SourceStructure
   end
 end
 
+class RubyCtagsFileSourceStructure < CtagsFileSourceStructure
+  include RubySourceStructureUtils
 
-class RubyCtagsSourceStructure < CtagsSourceStructure
-  attr_reader :injected_row
-  
   def initialize(_file, _ctags_string='ctags', _row_rif = nil)
     super(_file, _ctags_string, _row_rif, 'Ruby')
   end
-  
-  def scheletor_from_node(_node, _source='', _injected_source='', _injected_class='')
-    _hinner_source = ''
-    #_sons = _node.sons.sort
-    _sons = _node.sons
-    for inode in 0.._sons.length - 1
-      _son = _sons[inode]
-      if _son.kind == 'class'
-         _hinner_source = "#{_hinner_source}#{_son.helptext}\n"
-      elsif _son.kind == 'module'
-         _hinner_source = "#{_hinner_source}#{_son.helptext}\n"
-      elsif _son.kind == 'method' && ((_son.label != 'initialize') || (_son.label == 'initialize') && _son.args)         
-         _hinner_source = "#{_hinner_source}  def #{_son.label}#{_son.args}\n"
-         _hinner_source = "#{_hinner_source}  end\n"
-      elsif _son.kind == 'singleton method'
-         _hinner_source = "#{_hinner_source}  def #{_son.label}\n"
-         _hinner_source = "#{_hinner_source}  end\n"
-      end
-      _hinner_source= scheletor_from_node(_son, _hinner_source, _injected_source, _injected_class)
-    end
-    _source = "#{_source}#{_hinner_source}" if _hinner_source.strip.length>0
-    if _node.kind == 'class' && _node.label == _injected_class
-      _source = "#{_source}  def initialize\n  #{_injected_source}  end\n"
-      @injected_row = _source.split("\n").length-2
-    elsif _node.kind == 'class'
-      _source = "#{_source}  def initialize\n  end\n"
-    end
-    _source = "#{_source}end\n" if _node.kind == 'class' || _node.kind == 'module'
-    _source
-  end
 end
 
-class RubySourceStructure < SourceStructure
-  attr_reader :injected_row
+class RubySourceStructureParser < SourceStructure
+  include RubySourceStructureUtils
+#  attr_reader :injected_row
 
   def initialize(_source)
     super()
@@ -331,45 +450,46 @@ class RubySourceStructure < SourceStructure
   end
 
 
-  def scheletor_from_node(_node, _source='', _injected_source='', _injected_class='')
-    _hinner_source = ''
-    #_sons = _node.sons.sort
-    _sons = _node.sons
-    for inode in 0.._sons.length - 1
-      _son = _sons[inode]
-      if _son.kind == 'class'
-         _hinner_source = "#{_hinner_source}class #{_son.helptext}\n"
-      elsif _son.kind == 'module'
-         _hinner_source = "#{_hinner_source}module #{_son.helptext}\n"
-      elsif _son.kind == 'method' && _son.helptext != 'initialize'
-         
-         _hinner_source = "#{_hinner_source}  def #{_son.helptext}\n"
-         _hinner_source = "#{_hinner_source}  end\n"
-      elsif _son.kind == 'singleton method'
-         _hinner_source = "#{_hinner_source}  def #{_son.helptext}\n"
-         _hinner_source = "#{_hinner_source}  end\n"
-      end
-      _hinner_source= scheletor_from_node(_son, _hinner_source, _injected_source, _injected_class)
-    end
-    _source = "#{_source}#{_hinner_source}" if _hinner_source.strip.length>0
-    if _node.kind == 'class' && _node.label == _injected_class
-      _source = "#{_source}  def initialize\n  #{_injected_source}  end\n"
-      @injected_row = _source.split("\n").length-2
-    end
-    _source = "#{_source}end\n" if _node.kind == 'class' || _node.kind == 'module'
-    _source
-  end
-
-
-  def classies
-  end
-  def modules
-  end
-  def class_methods(_class)
-  end
+#  def scheletor_from_node(_node, _source='', _injected_source='', _injected_class='')
+#    _hinner_source = ''
+#    #_sons = _node.sons.sort
+#    _sons = _node.sons
+#    for inode in 0.._sons.length - 1
+#      _son = _sons[inode]
+#      if _son.kind == 'class'
+#         _hinner_source = "#{_hinner_source}class #{_son.helptext}\n"
+#      elsif _son.kind == 'module'
+#         _hinner_source = "#{_hinner_source}module #{_son.helptext}\n"
+#      elsif _son.kind == 'method' && _son.helptext != 'initialize'
+#         
+#         _hinner_source = "#{_hinner_source}  def #{_son.helptext}\n"
+#         _hinner_source = "#{_hinner_source}  end\n"
+#      elsif _son.kind == 'singleton method'
+#         _hinner_source = "#{_hinner_source}  def #{_son.helptext}\n"
+#         _hinner_source = "#{_hinner_source}  end\n"
+#      end
+#      _hinner_source= scheletor_from_node(_son, _hinner_source, _injected_source, _injected_class)
+#    end
+#    _source = "#{_source}#{_hinner_source}" if _hinner_source.strip.length>0
+#    if _node.kind == 'class' && _node.label == _injected_class
+#      _source = "#{_source}  def initialize\n  #{_injected_source}  end\n"
+#      @injected_row = _source.split("\n").length-2
+#    end
+#    _source = "#{_source}end\n" if _node.kind == 'class' || _node.kind == 'module'
+#    _source
+#  end
+#
+#
+#  def classies
+#  end
+#  def modules
+#  end
+#  def class_methods(_class)
+#  end
 end
 
 class CompleteCode
+  LEFT_CHARS=['"','(','[','{',"'",'=','>','<',"\\","/",":","+","-"]
   attr_reader :filter
   def initialize(_editor, _row, _col)
     @editor = _editor
@@ -382,6 +502,8 @@ class CompleteCode
   end
   
   def focus_word(focus_segment)
+    focus_segment_parts = focus_segment.split
+    focus_segment = focus_segment_parts[-1] if focus_segment_parts && focus_segment_parts.length > 1  
     focus_world = ''
     char = focus_segment[-1..-1]
     while [")","]","}"].include?(char) 
@@ -389,7 +511,8 @@ class CompleteCode
       focus_segment = focus_segment[0..-2]
     end
     j = focus_segment.length - 1
-    while !["\s","\t",";",",","(","[","{",">"].include?(char) && j >= 0
+    
+    while !LEFT_CHARS.include?(char) && j >= 0
       focus_world = "#{char}#{focus_world}"
       j=j-1
       char = focus_segment[j..j]
@@ -433,14 +556,14 @@ class CompleteCode
 
   def refresh_words
     @words.clear
-    _re = /[\s\t\n"'(\[\{=><]#{@filter}[a-zA-Z0-9\-_]*/
+    _re = /[\s\t\n"'(\[\{=><\\\/\:\+\-]#{@filter}[a-zA-Z0-9\-_]*/
     m = _re.match(@source)
     while m && (_txt=m.post_match)
       can = m[0].strip
       if can.include?(' ')
         can = can.split[1].strip
       end
-      if  ['"','(','[','{',"'",'=','>','<'].include?(can[0..0])
+      if  LEFT_CHARS.include?(can[0..0])
         can = can[1..-1].strip
       end
       @words << can if can != @filter && !@words.include?(can)
@@ -474,15 +597,19 @@ class RubyCompleteCode < CompleteCode
 #    @row = _row.to_i
 #    @col = _col.to_i
     super
-    if _editor && _editor.has_ctags?
+    if _editor && (_editor.has_ctags? || OS.unix?)
       tmp_file = _editor.create_temp_file
       begin
-        @ss = RubyCtagsSourceStructure.new(tmp_file, _editor.ctags_string, _row.to_i)
+        if _editor.has_ctags?
+          @ss = RubyCtagsFileSourceStructure.new(tmp_file, _editor.ctags_string, _row.to_i)
+        elsif OS.unix?
+          @ss = RubyGrepFileSourceStructure.new(tmp_file, _row.to_i)
+        end
       ensure
         File.delete(tmp_file)
       end
     else
-      @ss = RubySourceStructure.new(@source)
+      @ss = RubySourceStructureParser.new(@source)
     end
 #    @filter=''
 #    @words = Array.new
@@ -781,11 +908,12 @@ end
 
 
 class TkTextListBox < TkText
+  SEP = '@@@'
   def initialize(parent=nil, keys={})
     super(parent, keys)
     wrap  'none'
     tag_configure('selected','background' =>Arcadia.conf('hightlight.sel.background'),'borderwidth'=>1, 'relief'=>'raised')
-    tag_configure('class', 'foreground' => Arcadia.conf('hightlight.sel.foreground'))
+    tag_configure('class', 'foreground' => Arcadia.conf('hightlight.class_variable.foreground'))
     @count = 0
     @selected = -1
     self.bind_append('KeyPress'){|e| key_press(e)}
@@ -793,20 +921,23 @@ class TkTextListBox < TkText
     self.bind_append("ButtonPress-1", proc{|x,y| button_press(x,y)}, "%x %y")
   end  
   
+  def length
+    @count
+  end
 
   def insert(index, chars, *tags)
     super(index, chars, *tags)
   end  
   
-  def add(chars)
-    meth_str, class_str = chars.split('-')
+  def add(chars, *tags)
+    meth_str, class_str = chars.split(TkTextListBox::SEP)
     if meth_str && meth_str.strip.length>0 && class_str
       insert('end', "#{meth_str}")
       insert('end', "-#{class_str}\n", 'class')
     elsif meth_str && meth_str.strip.length==0 && class_str
       insert('end', "-#{class_str}\n")
     else
-      insert('end', "#{chars}\n")
+      insert('end', "#{chars}\n", *tags)
     end
     @count = @count+1
   end  
@@ -867,16 +998,25 @@ class AgEditorOutlineToolbar
   def initialize(_controller)
     @controller = _controller
     @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'
-      indicatoron 0
-      offrelief 'flat'
+#    @cb_sync = TkCheckButton.new(@panel, Arcadia.style('checkbox').update('background'=>@panel.background)){
+#      text  'Sync'
+#      justify  'left'
+#      indicatoron 0
+#      offrelief 'flat'
+#      image Arcadia.image_res(SYNC_GIF)
+#      pack
+#    }        
+#    Tk::BWidget::DynamicHelp::add(@cb_sync, 
+#      'text'=> Arcadia.text('ext.editor.button.link.hint'))
+
+    @cb_sync = Arcadia.wf.titlecontextcheckbutton(@panel){
+      variable TkVariable.new
       image Arcadia.image_res(SYNC_GIF)
       pack
-    }        
-    Tk::BWidget::DynamicHelp::add(@cb_sync, 
-      'text'=> Arcadia.text('ext.editor.button.link.hint'))
+    }
+    
+    @cb_sync.hint=Arcadia.text('ext.editor.button.link.hint')
+
 
     do_check = proc {
       if @cb_sync.cget('onvalue')==@cb_sync.cget('variable').value.to_i
@@ -976,6 +1116,8 @@ class AgEditorOutline
       end
       @tree_exp.close_tree(to_open) if _close_if_opened && to_open && !@opened
       @tree_exp.see(_node.rif)
+    rescue RuntimeError => e
+      Arcadia.runtime_error(e)
     ensure
       @tree_exp.selectcommand(_proc)
       @selecting_node = false
@@ -1044,6 +1186,8 @@ class AgEditorOutline
       crossopenimage  Arcadia.image_res(ARROWDOWN_GIF)
     }
     @tree_exp.extend(TkScrollableWidget)
+    @tree_exp.bind_append("Enter", proc{@tree_exp.focus})
+
     self.show
     pop_up_menu_tree
   end
@@ -1084,13 +1228,15 @@ class AgEditorOutline
       elsif _son.kind == 'singleton method'
           _image = @image_singleton_method
       end
-      @tree_exp.insert('end', _son.parent.rif ,_son.rif, {
-        'text' =>  _son.label ,
-        'helptext' => _son.helptext,
-        #'font'=>$arcadia['conf']['editor.explorer_panel.tree.font'],
-        'image'=> _image
-      }.update(Arcadia.style('treeitem'))
+      if !@tree_exp.exist?(_son.rif)
+        @tree_exp.insert('end', _son.parent.rif ,_son.rif, {
+          'text' =>  _son.label ,
+          'helptext' => _son.helptext,
+          #'font'=>$arcadia['conf']['editor.explorer_panel.tree.font'],
+          'image'=> _image
+        }.update(Arcadia.style('treeitem'))
       )
+      end
       if (_label_match) && (_label_match.strip == _son.label.strip)
         @selected = _son
       end
@@ -1112,19 +1258,27 @@ class AgEditorOutline
       @tree_exp.delete(@tree_exp.nodes('root'))
     end
     _txt = @editor.text.get('1.0','end')
-    if @editor.has_ctags?
+    if @editor.has_ctags? || (OS.unix? && @lang == 'ruby')
       if @editor.file && !@editor.modified?
-        @ss = CtagsSourceStructure.new(@editor.file, @editor.ctags_string)
+        if @editor.has_ctags?
+          @ss = CtagsFileSourceStructure.new(@editor.file, @editor.ctags_string)
+        elsif OS.unix?
+          @ss = RubyGrepFileSourceStructure.new(@editor.file)
+        end
       else
         tmp_file = @editor.create_temp_file
         begin
-          @ss = CtagsSourceStructure.new(tmp_file, @editor.ctags_string, @lang)
+          if @editor.has_ctags?
+            @ss = CtagsFileSourceStructure.new(tmp_file, @editor.ctags_string, @lang)
+          elsif OS.unix?
+            @ss = RubyGrepFileSourceStructure.new(tmp_file)
+          end
         ensure 
           File.delete(tmp_file)
         end
       end
     else
-      @ss = RubySourceStructure.new(_txt)
+      @ss = RubySourceStructureParser.new(_txt)
     end
     @selected = nil
     build_tree_from_node(@ss.root, _label_sel)
@@ -1136,14 +1290,15 @@ class AgEditorOutline
   end
   
   def pop_up_menu_tree
-    @pop_up_tree = TkMenu.new(
+    #@pop_up_tree = TkMenu.new(
+    @pop_up_tree = Arcadia.wf.menu(
       :parent=>@tree_exp,
       :tearoff=>0,
       :title => 'Menu tree'
     )
-    @pop_up_tree.extend(TkAutoPostMenu)
-    @pop_up_tree.configure(Arcadia.style('menu'))
-    #Arcadia.instance.main_menu.update_style(@pop_up_tree)
+#    @pop_up_tree.extend(TkAutoPostMenu)
+#    @pop_up_tree.configure(Arcadia.style('menu'))
+
     @pop_up_tree.insert('end',
       :command,
       :label=> Arcadia.text('ext.editor.outline.menu.rebuild'),
@@ -1163,6 +1318,7 @@ end
 
 class AgEditor
   attr_accessor :file
+  attr_accessor :start_index
   attr_accessor :line_numbers_visible
   attr_accessor :id
   attr_reader :read_only 
@@ -1172,7 +1328,9 @@ class AgEditor
   attr_reader :last_tmp_file
   attr_reader :lang
   attr_reader :file_info  
-  attr_reader :outline  
+  attr_reader :outline
+  attr_reader :file_loaded  
+  attr_reader :edit_initialized  
   def initialize(_controller, _page_frame)
     @controller = _controller
     @page_frame = _page_frame
@@ -1193,6 +1351,9 @@ class AgEditor
     @line_numbers_visible = @controller.conf('line-numbers') == 'yes'
     @id = -1
     @file_info = Hash.new
+    @file_loaded = false
+    @edit_initialized = false
+    @start_index='1.0'
   end
 
   def set_controller(_controller)
@@ -1207,14 +1368,14 @@ class AgEditor
     !@highlighting || (@last_line_end && @last_line_end > 0)
   end
   
-
-  
   def show_line_numbers
     if !@line_numbers_visible
       #@fm1.hide_right
       @fm1.show_left
       @line_numbers_visible = true
       do_line_update
+      @need_recalc=true
+      resize_line_num
     end
   end
   
@@ -1290,6 +1451,7 @@ class AgEditor
       Arcadia.runtime_error(e)
       #p "RuntimeError : #{e.message}"
     end
+    @edit_initialized = true
   end
 
   def create_temp_file
@@ -1506,7 +1668,7 @@ class AgEditor
                 end
                 
                 if _key && _class && _key.strip.length > 0 && _class.strip.length > 0 
-                  _item = "#{_key.strip} - #{_class.strip}"
+                  _item = "#{_key.strip} #{TkTextListBox::SEP} #{_class.strip}"
                 elsif _key && _key.strip.length > 0
                   _item = "#{_key.strip}"
                 else
@@ -1538,7 +1700,12 @@ class AgEditor
               @raised_listbox_frame.destroy
               #_menu.destroy
               @text.focus
-              @text.delete("#{begin_index_for_complete} wordstart",'insert')
+              if @text.get("#{begin_index_for_complete} linestart", "#{begin_index_for_complete} wordstart").strip == "" ||
+                 @text.get("#{begin_index_for_complete} wordstart", "#{begin_index_for_complete} wordstart + 1 chars") != " "
+                @text.delete("#{begin_index_for_complete} wordstart",'insert')
+              else 
+                @text.delete("#{begin_index_for_complete} wordstart + 1 chars",'insert')
+              end
               # workaround for @ char
               _value = _value.strip
               if _value[0..0] !=_target[0..0] && _value[1..1] == _target[0..0]
@@ -1746,7 +1913,9 @@ class AgEditor
         else
           _dir = MonitorLastUsedDir.get_last_dir
         end
-        Arcadia.process_event(OpenBufferEvent.new(self,'file'=>Tk.getOpenFile('initialdir'=>_dir)))
+        _file = Arcadia.open_file_dialog(_dir)
+        Arcadia.process_event(OpenBufferEvent.new(self,'file'=>_file)) if _file
+        Tk.callback_break
         break
       when 's'
         save
@@ -1958,7 +2127,7 @@ class AgEditor
     if _r.length>0
       _text=@text.get(_r[0][0],_r[0][1])
       if _text.length > 0
-        @controller.get_find.e_what.text(_text)
+        @controller.get_find.e_what.value=_text
       end
     else
     end
@@ -1977,6 +2146,8 @@ class AgEditor
   
   def do_enter
     check_file_last_access_time
+    find = @controller.get_find
+    find.use(self) if find
   end
   
   def initialize_text_binding
@@ -2067,6 +2238,10 @@ class AgEditor
       },
     "%x %y")
     
+    @text_line_num_resized = false
+    @text_line_num.bind("Map", proc{resize_line_num if !@text_line_num_resized })
+    
+    
     #@text_line_num.configure('font', @font);
     @text_line_num.tag_configure('line_num',
       'foreground' => '#FFFFFF',
@@ -2076,13 +2251,14 @@ class AgEditor
     )
     
     #--- menu
-    _pop_up = TkMenu.new(
+#    _pop_up = TkMenu.new(
+    _pop_up = Arcadia.wf.menu(
       :parent=>@text_line_num,
       :tearoff=>0,
       :title => 'Menu'
     )
-    _pop_up.extend(TkAutoPostMenu)
-    _pop_up.configure(Arcadia.style('menu'))
+    #_pop_up.extend(TkAutoPostMenu)
+    #_pop_up.configure(Arcadia.style('menu'))
     #Arcadia.instance.main_menu.update_style(@pop_up)
     _title_item = _pop_up.insert('end',
       :command,
@@ -2129,7 +2305,7 @@ class AgEditor
 
         _pop_up.popup(_x,_y)
       })
-    
+
   end
 
   def file_line_to_text_line_num_line(_line)
@@ -2341,13 +2517,14 @@ class AgEditor
   end
 
   def pop_up_menu
-    @pop_up = TkMenu.new(
+    #@pop_up = TkMenu.new(
+    @pop_up = Arcadia.wf.menu(
       :parent=>@text,
       :tearoff=>0,
       :title => 'Menu'
     )
-    @pop_up.extend(TkAutoPostMenu)
-    @pop_up.configure(Arcadia.style('menu'))
+    #@pop_up.extend(TkAutoPostMenu)
+    #@pop_up.configure(Arcadia.style('menu'))
     
     @pop_up.insert('end',
       :command,
@@ -2527,7 +2704,8 @@ class AgEditor
         if _r.length>0
           _data=@text.get(_r[0][0],_r[0][1])
           if _data.length > 0
-            file = Tk.getSaveFile("filetypes"=>[["Image", [".gif"]],["All Files", [".*"]]])
+            file = Arcadia.save_file_dialog
+            #Tk.getSaveFile("filetypes"=>[["Image", [".gif"]],["All Files", [".*"]]])
             if file
               require 'base64'
               decoded = Base64.decode64(_data)
@@ -2548,13 +2726,14 @@ class AgEditor
     @pop_up.insert('end', :separator)
 
     #---- debug menu
-    _sub_debug = TkMenu.new(
+    #_sub_debug = TkMenu.new(
+    _sub_debug = Arcadia.wf.menu(
       :parent=>@pop_up,
       :tearoff=>0,
       :title => 'Debug'
     )
-    _sub_debug.extend(TkAutoPostMenu)
-    _sub_debug.configure(Arcadia.style('menu'))
+    #_sub_debug.extend(TkAutoPostMenu)
+    #_sub_debug.configure(Arcadia.style('menu'))
     _sub_debug.insert('end',
       :command,
       :label=>Arcadia.text('ext.editor.text.menu.eval_selected'),
@@ -2580,13 +2759,14 @@ class AgEditor
 
 
     #---- code menu
-    _sub_code = TkMenu.new(
+    #_sub_code = TkMenu.new(
+    _sub_code = Arcadia.wf.menu(
       :parent=>@pop_up,
       :tearoff=>0,
       :title => 'Code'
     )
-    _sub_code.extend(TkAutoPostMenu)
-    _sub_code.configure(Arcadia.style('menu'))
+    #_sub_code.extend(TkAutoPostMenu)
+    #_sub_code.configure(Arcadia.style('menu'))
     _sub_code.insert('end',
       :command,
       :label=>Arcadia.text('ext.editor.text.menu.set_wrap'),
@@ -2959,7 +3139,7 @@ class AgEditor
 
   # modify in this instance means the (...) in the tab header of each file
   def modified?
-    return !(@buffer === text_value)
+    return @text != nil && !(@buffer === text_value)
   end
 
   def set_modify
@@ -3014,6 +3194,21 @@ class AgEditor
   def zone_of_row(_row)
     ((_row) / @highlight_zone_length).to_i + 1
   end
+
+  def visible_line_begin
+    line_begin_index = @text.index('@0,0')
+    line_begin = line_begin_index.split('.')[0].to_i
+    line_begin
+  end
+
+  def visible_line_end
+    line_end = @text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1
+    line_end
+  end
+
+  def visible_lines
+    visible_line_end - visible_line_begin
+  end
   
   def do_line_update
     #re num in @text_line_num the portion of visibled screen  of @text
@@ -3106,7 +3301,7 @@ class AgEditor
           @line_num_rx_e, @line_num_ry_e, @line_num_width_e, @line_num_heigth_e = @text_line_num.bbox("0.1 lineend - 1 chars");
           if @line_num_width_e.nil?
             @line_num_width_e = @font.split()[-1].strip.to_i
-            @need_recalc = true            
+            @need_recalc = true    
 #            linfo_x, linfo_y, linfo_w, linfo_h, linfo_b  = @text_line_num.dlineinfo('0.1')            
 #            if linfo_w
 #              @line_num_width_e = linfo_w.to_f/(line_end_chars+1.5)
@@ -3125,6 +3320,7 @@ class AgEditor
           @last_line_end_chars = -1
         end
       end
+      @text_line_num_resized = true
     end
   end
 
@@ -3281,6 +3477,7 @@ class AgEditor
         save true
       end
     else
+      mkdir_recursive(File.dirname(@file)) if !File.exists?(File.dirname(@file))
       f = File.new(@file, "wb")
       begin
         if f
@@ -3301,8 +3498,27 @@ class AgEditor
     end
   end
 
+  def mkdir_recursive(_dir)
+    dir_seg = _dir.split(File::SEPARATOR)
+    incr_dir = ""
+    res = ""
+    0.upto(dir_seg.length-1){|j|
+      if res == File::SEPARATOR
+        res=res+dir_seg[j]
+      elsif res.length == 0 && dir_seg[j].length == 0
+        res=File::SEPARATOR+dir_seg[j]
+      elsif res.length == 0 && dir_seg[j].length > 0
+        res=dir_seg[j]
+      else
+        res=res+File::SEPARATOR+dir_seg[j]
+      end
+      Dir.mkdir(res) if !File.exists?(res)
+    }
+  end
+
   def save_as
-    file = Tk.getSaveFile("filetypes"=>[["Ruby Files", [".rb", ".rbw"]],["All Files", [".*"]]])
+    file = Arcadia.save_file_dialog
+    #Tk.getSaveFile("filetypes"=>[["Ruby Files", [".rb", ".rbw"]],["All Files", [".*"]]])
     file = nil if file == ""  # cancelled
     if file
       new_file_name(file)
@@ -3370,9 +3586,8 @@ class AgEditor
         ftime = File.mtime(@file)
         if @file_info['mtime'] != ftime
           msg = Arcadia.text('ext.editor.text.d.file_changed.msg', [@file])
-          ans = Tk.messageBox('icon' => 'error', 'type' => 'yesno',
-            'title' => Arcadia.text('ext.editor.text.d.file_changed.title'), 'parent' => @text,
-            'message' => msg)
+          title = Arcadia.text('ext.editor.text.d.file_changed.title')
+          ans = Arcadia.hinner_dialog(self, 'type'=>'yes_no', 'msg'=> msg, 'title' => title, 'level' => 'error')
           if ans == 'yes'
             reload
           else
@@ -3381,9 +3596,8 @@ class AgEditor
         end
       elsif !file_exist
         msg = Arcadia.text('ext.editor.text.d.file_deleted.msg', [@file])
-        if Tk.messageBox('icon' => 'error', 'type' => 'yesno',
-          'title' => Arcadia.text('ext.editor.text.d.file_deleted.title'), 'parent' => @text,
-          'message' => msg) == 'yes'
+        title = Arcadia.text('ext.editor.text.d.file_deleted.title')
+        if Arcadia.hinner_dialog(self, 'type'=>'yes_no', 'msg'=> msg, 'title' => title, 'level' => 'error')  == 'yes'
           save
         else
           @file = nil
@@ -3438,7 +3652,7 @@ class AgEditor
 #    else
 #      @fm1 = AGTkVSplittedFrames.new(@page_frame,_w2)
 #    end
-    @fm1 = AGTkVSplittedFrames.new(@page_frame, @page_frame,0,5,false,false)
+    @fm1 = AGTkVSplittedFrames.new(@page_frame, @page_frame,0,0,false,false)
     @fm1.splitter_frame.configure('relief'=>'flat')
     @fm1.bind_append("Enter", proc{@controller.activate})    
     initialize_text(@fm1.right_frame)
@@ -3469,6 +3683,7 @@ class AgEditor
   def load_file(_filename = nil)
     #if filename is nil then open a new tab
     @loading=true
+    initialize_editing(Arcadia.file_extension(_filename) || 'rb') if !@edit_initialized
     @dos_line_endings=false
     begin
       @file = _filename
@@ -3485,6 +3700,7 @@ class AgEditor
 	        @dos_line_endings=true if file.read.include?("\r\n") # pesky windows line endings
 	      }
       end
+      @file_loaded = true
       set_read_only(!File.stat(_filename).writable?)
       reset(false)
       refresh
@@ -3493,6 +3709,23 @@ class AgEditor
     end
   end
   
+  def load_file_if_not_loaded
+    if @file && !@file_loaded
+      load_file(@file)
+      if @start_index
+        vl = visible_lines
+        if vl && vl > 0
+          text_see("#{@start_index} + #{vl/2 -1} lines")
+        else
+          text_see(@start_index) 
+        end
+      end
+      do_line_update
+      @need_recalc=true
+      resize_line_num
+    end
+  end
+  
   def set_read_only(_value)
     if @read_only != _value
       @read_only = _value
@@ -3519,6 +3752,7 @@ end
 
 class AgMultiEditorView
   #attr_reader :enb
+  attr_reader :usetabs
   def initialize(_parent=nil, _frame=nil, _usetabs=true)
     @parent = _parent
     @frame = _frame
@@ -3552,6 +3786,12 @@ class AgMultiEditorView
     @enb.bind_append("Map",refresh_after_map)
   end
 
+#  def initialize_notabs
+#    @frame_notabs = TkFrame.new(@frame.hinner_frame, Arcadia.style('panel')){
+#      pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
+#    }
+#  end
+
   def switch_2_tabs
     raised = raise
     @usetabs = true
@@ -3706,7 +3946,7 @@ class AgMultiEditorView
     else
       adapted_frame = _adapter
     end
-    adapted_frame.attach_frame(frame)
+    adapted_frame.attach_frame(frame, @parent)
     adapted_frame.raise
     @pages[_name]={'frame'=>adapted_frame, 'file'=>_file, 'text'=>_title, 'image' => _image, 'raisecmd'=>_raise_proc}
     adapted_frame
@@ -3726,13 +3966,14 @@ class AgMultiEditorView
   def add_menu_button(_name, _buffer_string)
     @buffer_menu_button = @frame.root.add_menu_button(
       _name, 'files', nil, 'right', 
-      {'relief'=>:flat, 
-       'borderwidth'=>1, 
+      {
+      #'relief'=>:flat, 
+      # 'borderwidth'=>1, 
        'compound'=> 'left',
-       'anchor'=>'w',
-       'font'=> "#{Arcadia.conf('titlelabel.font')} italic",
-       'activebackground'=>Arcadia.conf('titlelabel.background'),
-       'foreground' => Arcadia.conf('titlecontext.foreground'),
+  #     'anchor'=>'w',
+  #     'font'=> "#{Arcadia.conf('titlelabel.font')} italic",
+  #     'activebackground'=>Arcadia.conf('titlelabel.background'),
+  #     'foreground' => Arcadia.conf('titlecontext.foreground'),
        'textvariable'=> _buffer_string
       }
     )
@@ -4032,8 +4273,8 @@ class CoderayHighlightScanner < HighlightScanner
       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")
-        #if tok[0].to_s.include?("\n")
+        #if tok[0].include?("\n")
+        if tok[0].to_s.include?("\n")
           ar = tok[0].split("\n")
           row+=tok[0].count("\n")
           begin_gap = ar[-1]
@@ -4067,9 +4308,22 @@ class AgMultiEditor < ArcadiaExtPlus
   attr_reader :has_ctags, :ctags_string
   attr_reader :main_frame
   
-  def on_before_build(_event)
+  
+  def has_ctags_exuberant?
+    ret = false
     Arcadia.is_windows? ? @ctags_string="lib/ctags.exe" : @ctags_string='ctags'
-    @has_ctags = !Arcadia.which(@ctags_string).nil?
+    ctags_file = Arcadia.which(@ctags_string)
+    if !ctags_file.nil?
+      output = ArcadiaUtils.exec("#{ctags_file} --version")  
+      ret = output && output.include?('Exuberant Ctags')
+    end
+    ret
+  end
+  
+  def on_before_build(_event)
+    #Arcadia.is_windows? ? @ctags_string="lib/ctags.exe" : @ctags_string='ctags'
+    #@has_ctags = !Arcadia.which(@ctags_string).nil?
+    @has_ctags = has_ctags_exuberant?
     if !@has_ctags
       msg = Arcadia.text("ext.editor.e.ctags.msg")
       ArcadiaProblemEvent.new(self, "type"=>ArcadiaProblemEvent::DEPENDENCE_MISSING_TYPE,"title"=>Arcadia.text("ext.editor.e.ctags.title"), "detail"=>msg).go!
@@ -4090,23 +4344,41 @@ class AgMultiEditor < ArcadiaExtPlus
   # Arcadia.attach_listener(self, StartDebugEvent)
     Arcadia.attach_listener(self, FocusEvent)
     Arcadia.attach_listener(self, BookmarkEvent)
+    Arcadia.attach_listener(self, LayoutChangedDomainEvent)
   end
   
-#  def on_before_run_ruby_file(_event)
-#    _filename = _event.file
-#    if _filename.nil?
-#      current_editor = self.raised
-#       if current_editor
-#         if current_editor.file
-#           _event.file = current_editor.file
-#           _event.persistent = true
-#         else
-#           _event.file = current_editor.create_temp_file
-#         end
-#       end
-#    end
-#  end
+  def unmap_last_frame
+    @last_fa = @main_frame.page_frame(@main_frame.raise)        
+    if @last_fa
+      @last_fa.refresh_layout_manager
+      @last_fa_layout_manager = @last_fa.layout_manager
+      @last_fa.unmap(@last_fa_layout_manager)
+    end
+  end
   
+  def on_layout_changed_domain(_event)
+    # workaround for a problem in stack rendering with usetabs == false 
+    if @main_frame && !@main_frame.usetabs && self.frame_domain(0) == _event.old_domain 
+       if  _event.old_domain == _event.new_domain 
+         if self.frame_raised?(0)
+           if !@last_fa.nil?
+             @last_fa.refresh_layout_manager
+             @last_fa.map(@last_fa_layout_manager)
+             @last_fa = nil
+           end
+         else
+           unmap_last_frame
+         end
+       else
+         if !@last_fa.nil?
+           @last_fa.refresh_layout_manager
+           @last_fa.map(@last_fa_layout_manager)
+           @last_fa = nil
+         end
+       end
+    end
+  end
+
   def on_before_run_cmd(_event)
     _filename = _event.file
     _event.persistent = true
@@ -4216,7 +4488,9 @@ class AgMultiEditor < ArcadiaExtPlus
       self.name,
       'Close current',
       proc{self.activate;Arcadia.process_event(CloseCurrentTabEvent.new(self))}, 
-      CLOSE_DOCUMENT_GIF)
+      #CLOSE_DOCUMENT_GIF
+      CLOSE_FRAME_GIF
+    )
     frame.root.add_sep(self.name, 1)
     @buffer_number = TkVariable.new
     @buffer_string = TkVariable.new
@@ -4281,7 +4555,7 @@ class AgMultiEditor < ArcadiaExtPlus
         end
       }
     end
-    instance.move_buffer_here(raised_name)
+    #instance.move_buffer_here(raised_name)
     instance
   end
 
@@ -4406,8 +4680,8 @@ class AgMultiEditor < ArcadiaExtPlus
     make_buffer_string("") if @buffer_menu.index('end').nil?
     if _sender == self
       instances.each{|i|
-        if i != self
-          i.del_buffer_menu_item(_file, self)
+        if i != self || instances.count == 1
+          i.del_buffer_menu_item(_file, self) if instances.count > 1
           i.refresh_buffer_string
         end
       }
@@ -4494,6 +4768,10 @@ class AgMultiEditor < ArcadiaExtPlus
     reset_status if @main_frame.pages.empty?
   end
 
+#  def on_after_initialize(_event)
+#    @editors.each{|e| e.resize_line_num} 
+#  end
+
   def on_exit_query(_event)    
     _event.can_exit=true
     return if _event.sender.instance_of?(AgMultiEditor) && _event.sender != self 
@@ -4511,9 +4789,8 @@ class AgMultiEditor < ArcadiaExtPlus
       if [CutTextEvent, PasteTextEvent, UndoTextEvent, RedoTextEvent].include?(_event.class)
         if raised.highlighting
           raised.refresh_visible_highlighting
-        else
-          raised.check_modify
         end      
+        raised.check_modify
       end
     end
   end
@@ -4560,9 +4837,6 @@ class AgMultiEditor < ArcadiaExtPlus
         lang_exts.each{|ext|
           @langs_hash_by_ext[ext] = lang_props
         } if lang_exts
-      
-      
-      
       end
     }
   end
@@ -4611,13 +4885,14 @@ class AgMultiEditor < ArcadiaExtPlus
 
 
   def pop_up_menu
-    @pop_up = TkMenu.new(
+    #@pop_up = TkMenu.new(
+    @pop_up = Arcadia.wf.menu(
       :parent=> self.frame.hinner_frame,
       :tearoff=>0,
       :title => 'Menu'
     )
-    @pop_up.extend(TkAutoPostMenu)
-    @pop_up.configure(Arcadia.style('menu'))
+    #@pop_up.extend(TkAutoPostMenu)
+    #@pop_up.configure(Arcadia.style('menu'))
     #Arcadia.instance.main_menu.update_style(@pop_up)
 
 
@@ -4756,7 +5031,7 @@ class AgMultiEditor < ArcadiaExtPlus
           @bookmarks << {:file=>"__TMP__#{_event.id}",:from_line=>_event.from_row, :to_line=>_event.to_row}
           _e = @editors[_event.id]
         end
-        if _e
+        if _e && _e.text
           index_from = "#{_event.from_row}.0"
           index_to = "#{_event.to_row}.0 lineend"
           _event.content = _e.text.get(index_from, index_to)
@@ -4882,18 +5157,18 @@ class AgMultiEditor < ArcadiaExtPlus
           end
           if _event.kind_of?(OpenBufferTransientEvent) 
             if conf('close-last-if-not-modified')=="yes"
-            if defined?(@last_transient_file) && !@last_transient_file.nil? && @last_transient_file != _event.file
-              _e = @tabs_editor[tab_name(@last_transient_file)]
-              if _e && !_e.modified_from_opening?
-                close_editor(_e)
+              if defined?(@last_transient_file) && !@last_transient_file.nil? && @last_transient_file != _event.file
+                _e = @tabs_editor[tab_name(@last_transient_file)]
+                if _e && !_e.modified_from_opening?
+                  close_editor(_e)
+                end
+              end
+              if !editor_exist?(_event.file)
+                @last_transient_file = _event.file
+              else
+                @last_transient_file = nil
+                _event.transient = false
               end
-            end
-            if !editor_exist?(_event.file)
-              @last_transient_file = _event.file
-            else
-              @last_transient_file = nil
-              _event.transient = false
-            end
             else
               _event.transient = false
             end
@@ -4999,11 +5274,13 @@ class AgMultiEditor < ArcadiaExtPlus
   end
 
   def show_hide_current_line_numbers
+    return if !self.frame_raised?(0)
     _e = active_instance.raised
     _e.show_hide_line_numbers if _e
   end
 
   def show_hide_tabs
+    return if !self.frame_raised?(0)
     if active? 
       if @usetabs
         @main_frame.switch_2_notabs
@@ -5027,7 +5304,7 @@ class AgMultiEditor < ArcadiaExtPlus
     @tabs_editor.each_value{|editor|
       if editor.file != nil
         #_insert_index = editor.text.index('insert')
-        _insert_index = editor.text.index('@0,0')
+        _insert_index = editor.text.nil?? editor.start_index : editor.text.index('@0,0')
         _files=_files+'|' if _files.strip.length > 0
         _files=_files + "#{editor.file};#{_insert_index};#{editor.line_numbers_visible.to_s}"
       end
@@ -5116,10 +5393,15 @@ class AgMultiEditor < ArcadiaExtPlus
   end
   
   def on_layout_raising_frame(_event)
-    if _event.extension_name == "editor" && _event.frame_name=="editor_outline"
+    if _event.extension_name && _event.extension_name == "editor" && _event.frame_name=="editor_outline"
       _e = raised
       change_outline(_e, true) if  _e
     end
+    if Arcadia.extension(_event.extension_name) && frame_domain == Arcadia.extension(_event.extension_name).frame_domain
+      if  @main_frame && !@main_frame.usetabs
+        unmap_last_frame
+      end
+    end
   end
 
 #  def update(_kind,_name)
@@ -5131,27 +5413,34 @@ class AgMultiEditor < ArcadiaExtPlus
 
   def open_last_files
     @batch_files = true
+    last_ed = nil
     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
-          ed = open_file(_file,_index,false)
+          ed = open_file(_file,_index,false, false)
         else
-          ed = open_file(_file)
+          ed = open_file(_file,'1.0', false, false)
         end
         if ed && _line_numbers_visible_as_string && ed.line_numbers_visible
           ed.line_numbers_visible = _line_numbers_visible_as_string == 'true'
         end
+        last_ed = ed
       end
     end
     @batch_files = false
+    change_outline(last_ed) if last_ed
     to_raise_file = Arcadia.persistent("#{@name}.files.last")
     if to_raise_file
+      ed_to_raise = @tabs_editor[self.tab_file_name(to_raise_file)]
+      ed_to_raise.load_file_if_not_loaded if ed_to_raise
       raise_file(to_raise_file,0)
     else
       _first_page = @main_frame.pages[0] if @main_frame.pages.length > 0
       if _first_page
+        ed_to_raise = @tabs_editor[_first_page]
+        ed_to_raise.load_file_if_not_loaded if ed_to_raise
         @main_frame.raise(_first_page) if frame_def_visible?
         @main_frame.see(_first_page)
       end
@@ -5291,7 +5580,6 @@ class AgMultiEditor < ArcadiaExtPlus
 
   def make_buffer_string(_str=nil)
     value = "[#{@buffer_number.value}] #{_str}"
-    #@buffer_menu_button.configure(:text => )
     @last_buffer_str = _str
     @buffer_string.value = value
   end
@@ -5330,6 +5618,7 @@ class AgMultiEditor < ArcadiaExtPlus
       mod_buffer_menu_item(@tabs_editor[p_name].file, _new_text, _new_file, self)
     else
       mod_buffer_menu_item(unname_modified(tab_title_by_tab_name(p_name)), _new_text, nil, self)
+      @last_fa.refresh_layout_manager if @last_fa
     end
 #    mod_buffer_menu_item(@main_frame.page(p_name)['file'], _new_text)
     @main_frame.page_title(p_name, _new_text)
@@ -5390,7 +5679,7 @@ class AgMultiEditor < ArcadiaExtPlus
       if _editor
         @last_e = raise_editor(_editor, @last_index, false, false)
       else
-        @last_e = open_file(_filename, @last_index, false, false)
+        @last_e = open_file(_filename, @last_index, false)
       end
       #@last_e.hide_exp
       @last_e.mark_debug(@last_index) if @last_e
@@ -5407,7 +5696,7 @@ class AgMultiEditor < ArcadiaExtPlus
   end
   
   def change_outline(_e, _raised=false)
-    return if defined?(@@last_outline_e) && @@last_outline_e == _e
+    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 defined?(@@last_outline_e)
@@ -5424,6 +5713,7 @@ class AgMultiEditor < ArcadiaExtPlus
     _new_caption = '...'
     if _index != -1
       _e = @tabs_editor[resolve_tab_name(_name)]
+      _e.load_file_if_not_loaded if _e
       change_outline(_e) if _e
       if _e && _e.file != nil
         _new_caption = _e.file
@@ -5469,7 +5759,7 @@ class AgMultiEditor < ArcadiaExtPlus
         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_mtime'].text =  raised.file_info['mtime'].localtime if raised.file_info['mtime']
       @@statusbar_items['file_size'].text = size_str 
       #@statusbar_item.text("#{File.basename(raised.file)} | #{raised.file_info['mtime'].localtime} | #{size_str}")
     else
@@ -5544,7 +5834,7 @@ class AgMultiEditor < ArcadiaExtPlus
     end    
   end
   
-  def open_file(_filename = nil, _text_index='1.0', _mark_selected=true, _exp=true)
+  def open_file(_filename = nil, _text_index='1.0', _mark_selected=true, _load_file=true)
     return if _filename == nil || !File.exist?(_filename) || File.ftype(_filename) != 'file'
     _basefilename = File.basename(_filename)
     _tab_name = self.tab_file_name(_filename)
@@ -5554,12 +5844,26 @@ class AgMultiEditor < ArcadiaExtPlus
     if _exist_buffer
       open_buffer(_tab_name)
       # ??? _text_index = nil 
+      if !@tabs_editor[_tab_name].file_loaded 
+        @tabs_editor[_tab_name].reset_highlight
+        begin
+          @tabs_editor[_tab_name].load_file_if_not_loaded
+        rescue RuntimeError => e
+          close_editor(@tabs_editor[_tab_name], true)
+          Arcadia.runtime_error(e)
+        end
+      end
     else
 #      @tabs_file[_tab_name]= _filename
-      open_buffer(_tab_name, _basefilename, _filename)
+      open_buffer(_tab_name, _basefilename, _filename, nil, false)
       @tabs_editor[_tab_name].reset_highlight
       begin
-        @tabs_editor[_tab_name].load_file(_filename)
+        if _load_file
+          @tabs_editor[_tab_name].load_file(_filename)
+        else
+          @tabs_editor[_tab_name].file = _filename
+          @tabs_editor[_tab_name].start_index = _text_index
+        end
       rescue RuntimeError => e
         #Arcadia.dialog(self,'type'=>'ok', 'level'=>'error','title' => 'RuntimeError', 'msg'=>"RuntimeError : #{e.message}")
         #p "RuntimeError : #{e.message}"
@@ -5569,11 +5873,13 @@ class AgMultiEditor < ArcadiaExtPlus
       change_outline_frame_caption(File.basename(_filename)) if _filename    
     end
     editor = @tabs_editor[_tab_name]
-    if _text_index != nil && _text_index != '1.0' && editor
-      editor.text_see(_text_index)
-      editor.mark_selected(_text_index) if _mark_selected 
+    if editor && _load_file
+      if _text_index != nil && _text_index != '1.0' && editor
+        editor.text_see(_text_index)
+        editor.mark_selected(_text_index) if _mark_selected 
+      end
+      editor.do_line_update if editor && !editor.highlighted?
     end
-    editor.do_line_update if editor && !editor.highlighted?
     return editor
   end
 
@@ -5582,8 +5888,11 @@ class AgMultiEditor < ArcadiaExtPlus
     #@raw_buffer_name[_name]=_name
   end
 
-  def open_buffer(_buffer_name = nil, _title = nil, _filename=nil, _lang=nil)
+  def open_buffer(_buffer_name = nil, _title = nil, _filename=nil, _lang=nil, _initialize_editing=true)
     #_index = @main_frame.index(resolve_tab_name(_buffer_name))
+    if frame_visible? && !frame_raised?
+      @arcadia.layout.change_domain(frame_domain, @name)
+    end
     if @main_frame.exist_buffer?(resolve_tab_name(_buffer_name))
       _tab = @main_frame.page_frame(resolve_tab_name(_buffer_name))
       #@main_frame.raise(resolve_tab_name(_buffer_name)) if frame_visible?
@@ -5614,7 +5923,6 @@ class AgMultiEditor < ArcadiaExtPlus
         _image = Arcadia.file_icon(_title)
       end
       _tab = @main_frame.add_page(_buffer_name, _filename, _title, _image, proc{do_buffer_raise(_buffer_name, _title)})
-#      @raw_buffer_name[_buffer_name]=_buffer_name
       if _filename
         add_buffer_menu_item(_filename)
       else
@@ -5622,27 +5930,17 @@ class AgMultiEditor < ArcadiaExtPlus
       end
       _e = AgEditor.new(self, _tab)
       register_editor(_e, _buffer_name, _filename)
-#      @editor_seq=@editor_seq+1
-#      _e.id=@editor_seq
-#      @editors[@editor_seq]=_e
-#      @tabs_editor[_buffer_name]=_e
-      ext = Arcadia.file_extension(_title)
-      ext='rb' if ext.nil?
-      _e.initialize_editing(ext, _lang)
-      _e.text.set_focus
+      if _initialize_editing
+        ext= Arcadia.file_extension(_title) || 'rb'
+        _e.initialize_editing(ext, _lang)
+        _e.text.set_focus
+      end
     end
     begin
       if raised != @tabs_editor[resolve_tab_name(_buffer_name)]
-        @main_frame.raise(resolve_tab_name(_buffer_name)) if frame_visible?
+        @main_frame.raise(resolve_tab_name(_buffer_name)) #if frame_visible?
         @main_frame.see(resolve_tab_name(_buffer_name))
       end
-#      if raised != @tabs_editor[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.move(resolve_tab_name(_buffer_name), 0)
-#      end
     rescue Exception => e
       Arcadia.runtime_error(e)
     end
@@ -5667,6 +5965,7 @@ class AgMultiEditor < ArcadiaExtPlus
   
   def raise_editor(_editor = nil, _text_index='0.0', _mark_selected=true, _exp=true)
     return if _editor == nil
+    #_editor.load_file_if_not_loaded
     _tab_name = nil
     @tabs_editor.each{|tn,e|
       if e == _editor
@@ -5742,7 +6041,7 @@ class AgMultiEditor < ArcadiaExtPlus
   def close_editor(_editor, _force=false)
     if _force || can_close_editor?(_editor)
       file = _editor.file
-      index = _editor.text.index("@0,0")
+      index = _editor.text.nil?? _editor.start_index : _editor.text.index("@0,0")
       r,c = index.split('.')
       _editor.destroy_outline
       change_outline_frame_caption('') if raised==_editor      
@@ -5780,7 +6079,11 @@ class AgMultiEditor < ArcadiaExtPlus
         else
           ind = _index-1
         end
-        @main_frame.raise(@main_frame.pages[ind]) if TkWinfo.mapped?(@main_frame.root_frame)
+        if TkWinfo.mapped?(@main_frame.root_frame)
+          @main_frame.raise(@main_frame.pages[ind]) 
+          editor = @tabs_editor[@main_frame.pages[ind]]
+          #editor.load_file_if_not_loaded if editor
+        end
       else
         frame.root.top_text_clear if TkWinfo.mapped?(frame.hinner_frame)
         make_buffer_string("")
@@ -5836,20 +6139,22 @@ class Findview < TkFloatTitledFrame
    	  place('x' => 8,'y' => y0,'height' => 19)
     }
     y0 = y0 + d
-    @e_what = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
-      editable true
+#    @e_what = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
+    @e_what = Arcadia.wf.combobox(self.frame){
+ #     editable true
       justify  'left'
-      #relief  'ridge'
-      autocomplete 'true'
-      expand 'tab'
-      takefocus 'true'
-      #pack('padx'=>10, 'fill'=>'x')
+ #     autocomplete 'true'
+ #     expand 'tab'
+      exportselection true
+      width 100
+      takefocus true
       place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
-    @e_what_entry = TkWinfo.children(@e_what)[0]
-
-    #@e_what_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_what_entry))})
-    @e_what_entry.extend(TkInputThrow)
+  
+    @e_what.extend(TkInputThrow)
+    
+#    @e_what_entry = TkWinfo.children(@e_what)[0]
+#    @e_what_entry.extend(TkInputThrow)
 
 
     y0 = y0 + d
@@ -5859,40 +6164,45 @@ class Findview < TkFloatTitledFrame
     }
     y0 = y0 + d
    
-    @e_with = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
-      editable true
+#    @e_with = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
+    @e_with = Arcadia.wf.combobox(self.frame){
+   #   editable true
       justify  'left'
-      autocomplete 'true'
-      expand 'tab'
-      takefocus 'true'
-      #pack('padx'=>10, 'fill'=>'x')
+   #   autocomplete 'true'
+   #   expand 'tab'
+      exportselection true
+      width 100
+      takefocus true
       place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
-    @e_with_entry = TkWinfo.children(@e_with)[0]
-    #@e_with_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_with_entry))})
-    @e_with_entry.extend(TkInputThrow)
+
+    @e_with.extend(TkInputThrow)
+
+#    @e_with_entry = TkWinfo.children(@e_with)[0]
+#    @e_with_entry.extend(TkInputThrow)
+
     y0 = y0 + d
-    @cb_reg = TkCheckButton.new(self.frame, Arcadia.style('checkbox')){|_cb_reg|
+#    @cb_reg = TkCheckButton.new(self.frame, Arcadia.style('checkbox')){|_cb_reg|
+    @cb_reg = Arcadia.wf.checkbutton(self.frame){|_cb_reg|
       text  Arcadia.text('ext.editor.search.label.use_regexp')
-      justify  'left'
-      #relief  'flat'
-      #pack('side'=>'left', 'anchor'=>'e')
+   #   justify  'left'
+      variable TkVariable.new
       place('x' => 8,'y' => y0,'height' => 22)
     }
     y0 = y0 + d
-    @cb_back = TkCheckButton.new(self.frame, Arcadia.style('checkbox')){|_cb_reg|
+    #@cb_back = TkCheckButton.new(self.frame, Arcadia.style('checkbox')){|_cb_reg|
+    @cb_back = Arcadia.wf.checkbutton(self.frame){|_cb_reg|
       text  Arcadia.text('ext.editor.search.label.search_back')
-      justify  'left'
-      #relief  'flat'
-      #pack('side'=>'left', 'anchor'=>'e')
+      variable TkVariable.new
+    #  justify  'left'
       place('x' => 8,'y' => y0,'height' => 22)
     }
     y0 = y0 + d
-    @cb_ignore_case = TkCheckButton.new(self.frame, Arcadia.style('checkbox')){|_cb_reg|
+    #@cb_ignore_case = TkCheckButton.new(self.frame, Arcadia.style('checkbox')){|_cb_reg|
+    @cb_ignore_case = Arcadia.wf.checkbutton(self.frame){|_cb_reg|
       text  Arcadia.text('ext.editor.search.label.ignore_case')
-      justify  'left'
-      #relief  'flat'
-      #pack('side'=>'left', 'anchor'=>'e')
+    #  justify  'left'
+      variable TkVariable.new
       place('x' => 8,'y' => y0,'height' => 22)
     }
     
@@ -5901,45 +6211,39 @@ class Findview < TkFloatTitledFrame
     y0 = y0 + d
     @buttons_frame = TkFrame.new(self.frame, Arcadia.style('panel')).pack('fill'=>'x', 'side'=>'bottom')	
 
-    @b_replace_all = TkButton.new(@buttons_frame, Arcadia.style('button')){|_b_go|
+    #@b_replace_all = TkButton.new(@buttons_frame, Arcadia.style('button')){|_b_go|
+    @b_replace_all = Arcadia.wf.button(@buttons_frame){|_b_go|
     		state 'disabled'
-      default  'disabled'
+#      default  'disabled'
       text  Arcadia.text('ext.editor.search.label.replace_all')
-      #overrelief  'raised'
-      justify  'center'
-      #width 15
+#      justify  'center'
+      width 10
       pack('side'=>'right','ipadx'=>5, 'padx'=>5)
-      #place('width' => 50,'x' => 0,'y' => y0,'height' => 23,'bordermode' => 'inside')
     }
 
 
-    @b_replace = TkButton.new(@buttons_frame, Arcadia.style('button')){|_b_go|
+#    @b_replace = TkButton.new(@buttons_frame, Arcadia.style('button')){|_b_go|
+    @b_replace = Arcadia.wf.button(@buttons_frame){|_b_go|
     		state 'disabled'
-      default  'disabled'
+ #     default  'disabled'
       text  Arcadia.text('ext.editor.search.label.replace')
-      #overrelief  'raised'
-      justify  'center'
-      #width 15
+#      justify  'center'
+      width 10
       pack('side'=>'right','ipadx'=>5, 'padx'=>5)
-      #place('width' => 50,'x' => 0,'y' => y0,'height' => 23,'bordermode' => 'inside')
     }
 
     
-    @b_go = TkButton.new(@buttons_frame, Arcadia.style('button')){|_b_go|
+#    @b_go = TkButton.new(@buttons_frame, Arcadia.style('button')){|_b_go|
+    @b_go = Arcadia.wf.button(@buttons_frame){|_b_go|
       compound  'none'
-      default  'disabled'
+#      default  'disabled'
       text  Arcadia.text('ext.editor.search.label.find_next')
-      #background  '#ffffff'
-      #image TkPhotoImage.new('dat' => FIND_GIF)
-      #overrelief  'raised'
-      justify  'center'
-      #relief  'ridge'
-      #width 15
+#      justify  'center'
+      width 10
       pack('side'=>'right','ipadx'=>5, 'padx'=>5)
-      #place('width' => 50,'x' => 0,'y' => y0,'height' => 23,'bordermode' => 'inside')
     }
     #place('x'=>0,'y'=>0,'relheight'=> 1,'relwidth'=> 1)
-    place('x'=>100,'y'=>100,'height'=> 240,'width'=> 300)
+    place('x'=>100,'y'=>100,'height'=> 240,'width'=> 310)
     
   end
 
@@ -5947,8 +6251,10 @@ class Findview < TkFloatTitledFrame
     super
     self.focus
     @e_what.focus
-    @e_what_entry.select_throw
-    @e_what_entry.selection_range(0,'end')
+    @e_what.select_throw
+    @e_what.selection_range(0,'end')
+#    @e_what_entry.select_throw
+#    @e_what_entry.selection_range(0,'end')
   end
 
   
@@ -5972,7 +6278,8 @@ class Finder < Findview
     
   	 @b_replace_all.bind('1', proc{hide; do_replace_all})  
 
-    @e_what_entry.bind_append('KeyRelease'){|e|
+#    @e_what_entry.bind_append('KeyRelease'){|e|
+    @e_what.bind_append('KeyRelease'){|e|
       case e.keysym
       when 'Return'
         @find_action.call
@@ -5981,10 +6288,7 @@ class Finder < Findview
         widget_state
       end
     }
-    e2 =  TkWinfo.children(@e_with)[0]
-    e2.bind_append('KeyPress'){|e|
-        widget_state
-    }
+
     @last_index='insert'
     
     @goto_line_dialog = GoToLine.new(_frame).hide
@@ -6010,6 +6314,7 @@ class Finder < Findview
           self.editor.check_modify
         end
     end
+    update_combo(@e_with) if @e_with.value.length > 0
   end
 
   def do_replace_all
@@ -6031,6 +6336,7 @@ class Finder < Findview
           break
         end
     end
+    update_combo(@e_with) if @e_with.value.length > 0
   end
   
   def widget_state
@@ -6087,20 +6393,24 @@ class Finder < Findview
     use(@controller.raised)
   end
 
-  def update_combo(_txt)
-    values = @e_what.cget('values')
-    if (values != nil && !values.include?(_txt))
-      @e_what.insert('end', @e_what.value)
+  def update_combo(_combobox=nil)
+    return if _combobox.nil?
+    values = _combobox.cget('values')
+    if (values != nil && !values.include?(_combobox.value))
+      values << _combobox.value
+      _combobox.values=values
+  #    @e_what.insert('end', @e_what.value)
     end
   end
 
   def do_find(_istart=nil)
+   
     @forwards =  @cb_back.cget('onvalue') != @cb_back.cget('variable').value.to_i
     _found = false
     @idx1 = nil
     @idx2 = nil
-    if @e_what.text.length > 0
-      update_combo(@e_what.text)
+    if @e_what.value.length > 0
+      update_combo(@e_what)
       if !_istart && self.editor.text.index('insert')!=nil
         _istart ='insert'
       elsif defined?(@last_index)
@@ -6120,12 +6430,12 @@ class Finder < Findview
       if @cb_ignore_case.cget('onvalue')==@cb_ignore_case.cget('variable').value.to_i
         options << 'nocase'
       end
-      _index = self.editor.text.tksearch(options,@e_what.text,_istart)
+      _index = self.editor.text.tksearch(options,@e_what.value,_istart)
       
       if _index && _index.length>0
         self.editor.text.see(_index)
         _row, _col = _index.split('.')
-        _index_sel_end = _row.to_i.to_s+'.'+(_col.to_i+@e_what.text.length).to_i.to_s
+        _index_sel_end = _row.to_i.to_s+'.'+(_col.to_i+@e_what.value.length).to_i.to_s
         if @forwards
           @last_index= _index_sel_end
         else
@@ -6134,14 +6444,11 @@ class Finder < Findview
         self.editor.text.tag_add('sel', _index,_index_sel_end)
         self.editor.text.set_insert(_index)
         @idx1 =_index
-                @idx2 =_index_sel_end
+        @idx2 =_index_sel_end
         _found = true
         @controller.chrono_bookmark_add(self.editor.file, _index)
       else
-        _message = '"'+@e_what.value+'" not found'
-        Arcadia.hinner_dialog(self, 'type'=>'ok', 'msg'=> _message)
-        
-#        TkDialog2.new('message'=>_message, 'buttons'=>['Ok']).show()
+        Arcadia.hinner_dialog(self, 'type'=>'ok', 'msg'=> Arcadia.text('ext.editor.search.notfound',[@e_what.value, self.editor.tab_title]))
       end
 
     else