arcadia 0.1.1 → 0.1.2

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

@@ -5,18 +5,19 @@ active=yes
 require=ext/ae-editor/ae-editor
 class=AgMultiEditor
 
-tab-chars=0.5c
+tabs=0.5c left
+# to use tab key set tab-replace-width-space=0
 tab-replace-width-space=2
-find.frame=0.0
+
 #tabs
-tabs.font=courier 9
+tabs.font=courier 12
 i386-freebsd6::tabs.font=courier 12
 i386-mswin32::tabs.font={Courier New} 9
 #tabs.side=bottom
 tabs.side=top
 # editor
-font=courier 9
-font.bold=courier 9 bold
+font=courier 12
+font.bold=courier 12 bold
 i386-freebsd6::font=courier 12
 i386-freebsd6::font.bold=courier 12 bold
 i386-mswin32::font={Courier New} 9
@@ -56,12 +57,20 @@ hightlight.number.color.foreground=#007F7F
 #hightlight.capitalize.color.foreground=#0000FF
 hightlight.operator.color.foreground=#000000
 hightlight.operator.style=bold
-#hightlight.sel.color.foreground=yellow
-hightlight.sel.color.background=#cccccc
+hightlight.sel.color.foreground=black
+hightlight.sel.color.background=#68f914
 hightlight.sel.borderwidth=1
 hightlight.sel.relief=raised
 #hightlight.goto.color.foreground=blue
 hightlight.selected.color.background=yellow
+hightlight.tabs.color.foreground=black
+hightlight.tabs.color.background=#b1cfba
+hightlight.tabs.borderwidth=1
+hightlight.tabs.relief=raised
+hightlight.spaces.color.foreground=black
+hightlight.spaces.color.background=#d9f42b
+hightlight.spaces.borderwidth=1
+hightlight.spaces.relief=raised
 #+--------------------------------------------------
 
 
@@ -76,7 +85,7 @@ line_number_panel.color.foreground=#333333
 # tree explorer 
 explorer_panel.tree.color.background=#ffffff
 explorer_panel.tree.color.foreground=white
-explorer_panel.tree.font=courier 9
+explorer_panel.tree.font=courier 12
 i386-freebsd6::explorer_panel.tree.font=courier 12
 i386-mswin32::explorer_panel.tree.font={Courier New} 9
 explorer_panel.tree.class.color.foreground=#a42019

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

@@ -37,17 +37,10 @@ class AgEditor
     @controller = _controller
     @page_frame = _page_frame
     @set_mod = false
-#    @fm = AGTkVSplittedFrames.new(@page_frame,150)
-#    @fm1 = AGTkVSplittedFrames.new(@fm.right_frame,60)
     @font = @controller.conf('font')
     @font_bold = @controller.conf('font.bold')
     @font_metrics = TkFont.new(@font).metrics
     @font_metrics_bold = TkFont.new(@font_bold).metrics
-#    initialize_text
-#    initialize_text_binding
-#    initialize_highlight
-#    initialize_line_number
-#    initialize_tree
     @highlighting = false
     @classbrowsing = false
     @find = @controller.get_find
@@ -97,17 +90,38 @@ class AgEditor
       selectcommand proc{ _tree_goto.call(self) } 
       place('relwidth' => 1,'relx' => 0,'x' => '0','y' => '0','relheight' => '1','rely' => 0,'height' => 1,'bordermode' => 'inside','width' => '50')
     }
-    @nodes = Array.new
+    
     _c_explo = proc{|*args| @tree_exp.yview(*args)}
     _s_explo = TkScrollbar.new(@nb_tab_exp){|s|
       width 8
       command _c_explo
     }.pack('side'=>'right', 'fill'=>'y')
     @tree_exp.yscrollcommand proc{|first,last| _s_explo.set first,last}
-  
+    pop_up_menu_tree
   end
 
-	def initialize_text(_frame)
+  def pop_up_menu_tree
+    @pop_up_tree = TkMenu.new(
+      :parent=>@tree_exp,
+      :title => 'Menu tree'
+    )
+    @pop_up_tree.insert('end',
+      :command,
+      :label=>'Rebuild',
+      :hidemargin => false,
+      :command=> proc{build_tree}
+    )
+    @tree_exp.bind_append("Button-3",
+      proc{|x,y|
+        _x = TkWinfo.pointerx(@tree_exp)
+        _y = TkWinfo.pointery(@tree_exp)
+        @pop_up_tree.popup(_x,_y)
+      },
+    "%x %y")
+  end
+
+
+  def initialize_text(_frame)
     @v_scroll = TkScrollbar.new(_frame,
       'orient'=>'vertical',
       'relief'=>'flat'
@@ -125,7 +139,7 @@ class AgEditor
       exportselection true
       autoseparators true
       padx 0
-      tabs $arcadia['conf']['editor.tab-chars']
+      tabs $arcadia['conf']['editor.tabs']
       place(
         'x'=>0,
         'y'=>0,
@@ -142,9 +156,22 @@ class AgEditor
     @text.tag_configure('debug', 'background' =>'#b9c6d9', 'borderwidth'=>1 ,'relief'=>'raise')
     @buffer = text_value
     pop_up_menu
-	end
-	
-	def initialize_text_binding
+  end
+
+  def create_temp_file
+    _file = @file+'~~'
+    f = File.new(@file+'~~', "w")
+    begin
+      if f
+        f.syswrite(text_value)
+      end
+    ensure
+      f.close unless f.nil?
+    end
+    _file
+  end
+  
+  def initialize_text_binding
     @v_scroll.command(proc{|*args|
       @text.yview *args
     })
@@ -163,19 +190,8 @@ class AgEditor
       case e.keysym
       when 'space'
         line, col = @text.index('insert').split('.')
-        _file = @file+'~~'
-        f = File.new(@file+'~~', "w")
-        begin
-          if f
-            f.syswrite(text_value)
-          end
-        ensure
-          f.close unless f.nil?
-        end
-          
-          
-
-        EditorContract.instance.complete_code(EditorContract::TEditorObj.new(self, 'file'=>_file, 'line'=>line.to_s, 'col'=>col.to_s))
+        _file = create_temp_file
+        EditorContract.instance.complete_code(self, 'file'=>_file, 'line'=>line.to_s, 'col'=>col.to_s)
       when 'z'
         _b = @text.index('insert').split('.')[0].to_i
         @text.edit_undo
@@ -217,6 +233,7 @@ class AgEditor
         end
         @find.use(self)
         @find.e_what.focus
+        @find.show
       when 'egrave'
         @text.insert('insert',"{")
       when 'plus'
@@ -230,18 +247,30 @@ class AgEditor
         _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
 
         for _row in _row_begin..._row_end
-          @text.insert(_row.to_s+'.0',"\s\s")
+          @text.insert(_row.to_s+'.0',suf)
         end
       when 'U'
         _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+'.2') == "\s\s"
-            @text.delete(_row.to_s+'.0',_row.to_s+'.2')
+          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'
@@ -260,6 +289,7 @@ class AgEditor
 
       end
     }
+    
     @text.bind("KeyPress"){|e|
       case e.keysym
       when 'Return'
@@ -276,12 +306,17 @@ class AgEditor
         $arcadia['shell'].run(@file.to_s)
       when 'F3'
         @find.do_find_next
+      when 'F1'
+        line, col = @text.index('insert').split('.')
+        _file = create_temp_file
+        _x, _y = @controller.xy_insert
+        EditorContract.instance.doc_code(@controller, 'file'=>_file, 'line'=>line.to_s, 'col'=>col.to_s, 'xdoc'=>_x, 'ydoc'=>_y)
       when 'Tab'
+        n_space = $arcadia['conf']['editor.tab-replace-width-space'].to_i
         _r = @text.tag_ranges('sel')
         if _r && _r[0]
           _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
@@ -290,7 +325,10 @@ class AgEditor
           for _row in _row_begin..._row_end
             @text.insert(_row.to_s+'.0', suf)
           end
-        break
+          break
+        elsif n_space > 0
+          @text.insert('insert', "\s"*n_space)
+          break
         end
       end
     }
@@ -364,10 +402,8 @@ class AgEditor
         end
       end
     }
-
-	
-	end
-
+  end
+  
   def initialize_line_number(_frame)
     @text_line_num = TkText.new(_frame){
       wrap  'none'
@@ -426,7 +462,7 @@ class AgEditor
       '__LINE__', 'begin', 'defined?', 'ensure', 'module', 'redo', 'super', 'until',
       'BEGIN', 'break', 'do', 'false', 'next', 'rescue', 'then', 'when',
       'END', 'case', 'else', 'for', 'nil', 'retry', 'true', 'while',
-    'alias', 'class', 'elsif', 'if', 'not', 'return', 'undef', 'yield','require']
+    'alias', 'class', 'elsif', 'if', 'not', 'return', 'undef', 'yield','require','include']
     _re_string = ''
     @keyword.each{|word|
       if _re_string.length > 0
@@ -457,7 +493,8 @@ class AgEditor
     do_tag_configure('sel')
     do_tag_configure('selected')
     do_tag_configure('operator')
-  
+    do_tag_configure('tabs')  
+    do_tag_configure('spaces')  
   end
 
   def do_tag_configure(_name)
@@ -499,26 +536,30 @@ class AgEditor
       :hidemargin => false,
       :command=> proc{save}
     )
-#    @pop_up.insert('end',
-#      :command,
-#      :label=>'New',
-#      :hidemargin => false,
-#      :command=> proc{@controller.open_buffer()}
-#    )
-#    @pop_up.insert('end',
-#      :command,
-#      :label=>'Open',
-#      :hidemargin => false,
-#      :command=> proc{ @controller.open_file(Tk.getOpenFile)}
-#    )
-#    @pop_up.insert('end',
-#      :command,
-#      :label=>'Close',
-#      :hidemargin => false,
-#      :command=> proc{
-#        @controller.close_editor(self)
-#      }
-#    )
+
+    @pop_up.insert('end',
+      :command,
+      :label=>'Close',
+      :hidemargin => false,
+      :command=> proc{@controller.close_editor(self)}
+    )
+
+    @pop_up.insert('end',
+      :command,
+      :label=>'Close others',
+      :hidemargin => false,
+      :command=> proc{@controller.close_others_editor(self)}
+    )
+
+    @pop_up.insert('end',
+      :command,
+      :label=>'Close all',
+      :hidemargin => false,
+      :command=> proc{@controller.close_all_editor(self)}
+    )
+
+
+    @pop_up.insert('end', :separator)
 
     @pop_up.insert('end',
       :command,
@@ -536,31 +577,55 @@ class AgEditor
         @text.insert('insert', $arcadia['action.get.font'].call)
       }
     )
-#    @pop_up.insert('end',
-#      :command,
-#      :label=>'Eval Toplevel',
-#      :hidemargin => false,
-#      :command=> proc{
-#        _r = @text.tag_ranges('sel')
-#        _ibegin = _r[_r.length - 1][0]
-#        _iend = _r[_r.length - 1][1]
-#        _cod = @text.get(_ibegin, _iend)
-#        Revparsel.new(_cod, @file)
-#        @text.tag_add('eval',_ibegin, _iend)
-#        _reset = proc{
-#          _message = 'Replace code with new '+$arcadia['objic'].active.agobj_start.i_name+'?'
-#          _r = TkDialog2.new('message'=>_message, 'buttons'=>['Yes','No','Cancel']).show()
-#          if _r == '0'
-#            @text.tag_remove('eval',_ibegin, _iend)
-#            @text.delete(_ibegin, _iend)
-#            text_insert(_ibegin,$arcadia['objic'].active.objects2code.to_s){_edit_reset=false}
-#            @text.tag_remove('sel','1.0', 'end')
-#            $arcadia['objic'].del($arcadia['objic'].active)
-#          end
-#        }
-#        @text.tag_bind('eval',"Double-ButtonPress-1",_reset)
-#      }
-#    )
+
+    @pop_up.insert('end', :separator)
+
+    @pop_up.insert('end',
+      :command,
+      :label=>'Show tabs',
+      :hidemargin => false,
+      :command=> proc{show_tabs}
+    )
+
+
+    @pop_up.insert('end',
+      :command,
+      :label=>'Hide tabs',
+      :hidemargin => false,
+      :command=> proc{hide_tabs}
+    )
+
+    @pop_up.insert('end',
+      :command,
+      :label=>'Show spaces',
+      :hidemargin => false,
+      :command=> proc{show_spaces}
+    )
+
+
+    @pop_up.insert('end',
+      :command,
+      :label=>'Hide spaces',
+      :hidemargin => false,
+      :command=> proc{hide_spaces}
+    )
+
+
+    @pop_up.insert('end',
+      :command,
+      :label=>'Space to tabs indentation',
+      :hidemargin => false,
+      :command=> proc{indentation_space_2_tabs}
+    )
+
+    @pop_up.insert('end',
+      :command,
+      :label=>'Tabs to space indentation',
+      :hidemargin => false,
+      :command=> proc{indentation_tabs_2_space}
+    )
+
+
     @text.bind("Button-3",
       proc{|x,y|
         _x = TkWinfo.pointerx(@text)
@@ -646,7 +711,6 @@ class AgEditor
 #            _row = _row +1
           end
 
-          @nodes << _row.to_s
           TreeNode.new(_parent, _kind){|_node|
             _node.label = _label
             _node.helptext = _helptext
@@ -669,38 +733,31 @@ class AgEditor
   end
 
   def build_tree_from_node(_node, _label_match=nil)
+    
+    @image_kclass = TkPhotoImage.new('dat' => TREE_NODE_CLASS_GIF)
+    @image_kmodule =  TkPhotoImage.new('dat' => TREE_NODE_MODULE_GIF)
+    @image_kdef =  TkPhotoImage.new('dat' => TREE_NODE_DEF_GIF)
+    @image_kdefclass =  TkPhotoImage.new('dat' => TREE_NODE_DEFCLASS_GIF)
+    
     _sorted_sons = _node.sons.sort
     for inode in 0.._sorted_sons.length - 1
       _son = _sorted_sons[inode]
       if _son.kind == 'KClass'
-        _window = TkLabel.new(@fm.left_frame){
-          image  TkPhotoImage.new('dat' => TREE_NODE_CLASS_GIF)
-          background($arcadia['conf']['editor.explorer_panel.tree.color.background'])
-        }
+          _image = @image_kclass
       elsif _son.kind == 'KModule'
-        _window = TkLabel.new(@fm.left_frame){
-          image  TkPhotoImage.new('dat' => TREE_NODE_MODULE_GIF)
-          background($arcadia['conf']['editor.explorer_panel.tree.color.background'])
-        }
+          _image = @image_kmodule
       elsif _son.kind == 'KDef'
-        _window = TkLabel.new(@fm.left_frame){
-          image  TkPhotoImage.new('dat' => TREE_NODE_DEF_GIF)
-          background($arcadia['conf']['editor.explorer_panel.tree.color.background'])
-        }
+          _image = @image_kdef
       elsif _son.kind == 'KDefClass'
-        _window = TkLabel.new(@fm.left_frame){
-          image  TkPhotoImage.new('dat' => TREE_NODE_DEFCLASS_GIF)
-          background($arcadia['conf']['editor.explorer_panel.tree.color.background'])
-        }
+          _image = @image_kdefclass
       end
       @tree_exp.insert('end', _son.parent.rif ,_son.rif, {
         'text' =>  _son.label ,
         'helptext' => _son.helptext,
         'font'=>$arcadia['conf']['editor.explorer_panel.tree.font'],
-        'window'=> _window
+        'image'=> _image
       }
       )
-      @nodes << _son.rif
       if (_label_match) && (_label_match.strip == _son.label.strip)
         @selected = _son
       end
@@ -712,9 +769,16 @@ class AgEditor
     if _sel
       _label_sel = @tree_exp.itemcget(_sel,'text')
     end
+    
     #clear tree
-    @tree_exp.delete(@nodes)
-    @nodes.clear
+    begin
+      @tree_exp.delete(@tree_exp.nodes('root'))
+    rescue Exception
+      # workaround on windows
+      @tree_exp.delete(@tree_exp.nodes('root'))
+    end
+    
+    
     #(re)build tree
     _txt = @text.get('1.0','end')
     @root = build_tree_from_source(_txt)
@@ -722,6 +786,8 @@ class AgEditor
     build_tree_from_node(@root, _label_sel)
     if @selected
       @tree_exp.selection_add(@selected.rif)
+      @tree_exp.open_tree(@selected.parent.rif)
+      @tree_exp.see(@selected.rif)
     end
   end
 
@@ -791,16 +857,98 @@ class AgEditor
     end
   end
 
-#  def find_next_and_set_tag(_re, _row, _col, _txt, _tag)
-#    m = _re.match(_txt)
-#    if m
-#      _txt = m.post_match
-#      _ibegin = _row.to_s+'.'+(m.begin(0)+_end).to_s
-#      _col = m.end(0)+ _col
-#      _iend = _row.to_s+'.'+(_col.to_s)
-#      @text.tag_add(_tag,_ibegin, _iend)
-#    end
-#  end
+  def show_spaces
+    @spaces_show = true
+    _row = 1
+    @text.value.each{|_line|
+      show_chars_line(_row, _line, /[ ^\t]\s*/, 'spaces')
+      _row = _row+1
+    }
+  end
+
+
+  def show_tabs
+    @tabs_show = true
+    _row = 1
+    @text.value.each{|_line|
+      show_chars_line(_row, _line, /\t/, 'tabs')
+      _row = _row+1
+    }
+  end
+
+
+  def show_chars_line(_row, _line, _re, _tag)
+    m = _re.match(_line)
+    _end = 0
+    while m
+      _txt = m.post_match
+      _ibegin = _row.to_s+'.'+(m.begin(0)+_end).to_s
+      _end = m.end(0) + _end
+      _iend = _row.to_s+'.'+(_end.to_s)
+      @text.tag_add(_tag,_ibegin, _iend)
+      m = _re.match(_txt)
+    end
+  end 
+
+  def indentation_space_2_tabs(_n_space=2)
+    _row = 1
+    @text.value.each{|_line|
+      m = /\s*/.match(_line)
+      _end = 0
+      if m && m.begin(0)==0
+        _s = m[0]
+        if !_s.include?("\n") && !_s.include?("\t")
+          _ibegin = _row.to_s+'.0'
+          _iend = _row.to_s+'.'+m.end(0).to_s
+          _n_tab = (_s.length / _n_space).round
+          @text.delete(_ibegin, _iend)
+          @text.insert(_ibegin,"\t"*_n_tab )
+        end
+      end
+      _row = _row+1
+    }
+    if modified?
+      set_modify
+    else
+      reset_modify
+    end
+    
+  end
+
+  def indentation_tabs_2_space(_n_space=2)
+    _row = 1
+    @text.value.each{|_line|
+      m = /\t*/.match(_line)
+      _end = 0
+      if m && m.begin(0)==0
+        _s = m[0]
+        if !_s.include?("\n")
+          _ibegin = _row.to_s+'.0'
+          _iend = _row.to_s+'.'+m.end(0).to_s
+          @text.delete(_ibegin, _iend)
+          @text.insert(_ibegin,"\s"*_s.length*_n_space )
+        end
+      end
+      _row = _row+1
+    }
+    if modified?
+      set_modify
+    else
+      reset_modify
+    end
+  end
+
+
+  def hide_tabs
+    @text.tag_remove('tabs','1.0', 'end')
+    @tabs_show = false
+  end
+
+  def hide_spaces
+    @text.tag_remove('spaces','1.0', 'end')
+    @spaces_show = false
+  end
+
 
   def modified?
     return !(@buffer === text_value)
@@ -852,6 +1000,8 @@ class AgEditor
       arem << 'operator'
       find_and_set_tag(@re_string, _row, _txt, 'string', arem)
     end
+    find_and_set_tag(/\t/, _row, _txt, 'tabs', arem) if @tabs_show 
+    find_and_set_tag(/[ ^\t]\s*/, _row, _txt, 'spaces', arem) if @spaces_show 
   end
 
   def rehighlightline(_row)
@@ -979,60 +1129,69 @@ class AgEditor
       ensure
         f.close unless f.nil?
       end
+      EditorContract.instance.file_saved(self,'file' =>@file)
     end
   end
 
   def save_as
-    @file = Tk.getSaveFile
+    @file = Tk.getSaveFile("filetypes"=>[["Ruby Files", [".rb", ".rbw"]]])
+    @file = nil if @file == ""  # cancelled
     if @file
       save
       @controller.change_file_name(@page_frame, @file)
+      EditorContract.instance.file_created(self, 'file'=>@file)
     end
   end
 
 
-	def check_file_last_access_time
-	  if @file && @file_last_access_time
-	  
-	    ftime = File.mtime(@file)
-	    if @file_last_access_time != ftime
-	      msg = 'File "'+@file+'" is changed! Reload?'
+  def check_file_last_access_time
+    if @file && @file_last_access_time
+   
+    ftime = File.mtime(@file)
+      if @file_last_access_time != ftime
+        msg = 'File "'+@file+'" is changed! Reload?'
           if Tk.messageBox('icon' => 'error', 'type' => 'yesno',
             'title' => '(Arcadia) Libs', 'parent' => @text,
             'message' => msg) == 'yes'
-             @text.delete('1.0','end')
-						load_file(@file)
-				  else
-				    @file_last_access_time = ftime
+            @text.delete('1.0','end')
+            load_file(@file)
+          else
+            @file_last_access_time = ftime
           end
-	    end
-	  end
-	end
-
-	def init_editing(_ext='rb')
-	  case _ext
-	    when 'rb'
-	      @fm = AGTkVSplittedFrames.new(@page_frame,150)
-    			 @fm1 = AGTkVSplittedFrames.new(@fm.right_frame,60)
+      end
+    end
+  end
+
+  def init_editing(_ext='rb')
+    case _ext
+      when 'rb'
+        @fm = AGTkVSplittedFrames.new(@page_frame,150)
+        @fm1 = AGTkVSplittedFrames.new(@fm.right_frame,60)
         initialize_text(@fm1.right_frame)
-	    		initialize_text_binding
-		    initialize_highlight
-		    initialize_line_number(@fm1.left_frame)
-		    initialize_tree(@fm.left_frame)
-	    else
-    			 @fm1 = AGTkVSplittedFrames.new(@page_frame,60)
+        initialize_text_binding
+        initialize_highlight
+        initialize_line_number(@fm1.left_frame)
+        initialize_tree(@fm.left_frame)
+      when nil
+        @fm1 = AGTkVSplittedFrames.new(@page_frame,60)
         initialize_text(@fm1.right_frame)
-	    		initialize_text_binding
-		    initialize_line_number(@fm1.left_frame)
-	  end
-	end
-
-	def file_extension(_filename=nil)
-	  if _filename
-	  		_m = /(.*\.)(.*$)/.match(File.basename(_filename))
-	  		return _m[2] if _m && _m.length > 1
-	  end
-	end
+        initialize_text_binding
+        initialize_highlight
+        initialize_line_number(@fm1.left_frame)
+      else
+        @fm1 = AGTkVSplittedFrames.new(@page_frame,60)
+        initialize_text(@fm1.right_frame)
+        initialize_text_binding
+        initialize_line_number(@fm1.left_frame)
+    end
+  end
+
+  def file_extension(_filename=nil)
+    if _filename
+      _m = /(.*\.)(.*$)/.match(File.basename(_filename))
+    end
+    _ret = (_m && _m.length > 1)?_m[2]: nil
+  end
 
   def load_file(_filename = nil)
     #if filename is nil then open a new tab
@@ -1078,21 +1237,22 @@ end
 
 class AgMultiEditor < ArcadiaExt
   attr_reader :breakpoints
-	attr_reader :splitted_frame
-	def before_build
+  attr_reader :splitted_frame
+  def before_build
     ArcadiaContractListener.new(self, DebugContract, :do_debug_event)
     ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
     ArcadiaContractListener.new(self, MainContract, :do_main_event)
-	end
+  end
 
   def build
     if @arcadia.layout.headed?
-    		title_frame = @arcadia.layout.domain(conf('frame'))['root']
+      title_frame = @arcadia.layout.domain(conf('frame'))['root']
       #@close_button =	title_frame.add_button(nil,nil,TAB_CLOSE_GIF,'left')
     end
 
-    @splitted_frame = AGTkOSplittedFrames.new(self.frame,20)
-    @main_frame = AgMultiEditorView.new(@splitted_frame.bottom_frame)
+    #@splitted_frame = AGTkOSplittedFrames.new(self.frame,20)
+    #@main_frame = AgMultiEditorView.new(@splitted_frame.bottom_frame)
+    @main_frame = AgMultiEditorView.new(self.frame)
     #@close_button.bind('1',proc{close_raised})
     @tabs_file =Hash.new
     @tabs_editor =Hash.new
@@ -1101,9 +1261,9 @@ class AgMultiEditor < ArcadiaExt
     pop_up_menu
   end
 
-	def after_build
-	  self.open_last_files
-	end
+  def after_build
+    self.open_last_files
+  end
 
   def pop_up_menu
     @pop_up = TkMenu.new(
@@ -1115,33 +1275,47 @@ class AgMultiEditor < ArcadiaExt
       :command,
       :label=>'...',
       :state=>'disabled',
-      :background=>'yellow',
-      :activebackground=>'yellow',
+      :background=>'blue',
+      :font => conf('font.bold'),
       :hidemargin => true
     )
     @c = @pop_up.insert('end',
       :command,
       :label=>'Close',
+      :font => conf('font'),
       :hidemargin => false,
       :command=> proc{
         if @selected_tab_name_from_popup != nil
-        		_e = @tabs_editor[@selected_tab_name_from_popup]
-        		self.close_editor(_e)
+          _e = @tabs_editor[@selected_tab_name_from_popup]
+          self.close_editor(_e)
         end
       }
     )
     @c = @pop_up.insert('end',
       :command,
       :label=>'Close others',
+      :font => conf('font'),
       :hidemargin => false,
       :command=> proc{
         if @selected_tab_name_from_popup != nil
-        		_e = @tabs_editor[@selected_tab_name_from_popup]
-        		self.close_others_editor(_e)
+          _e = @tabs_editor[@selected_tab_name_from_popup]
+          self.close_others_editor(_e)
         end
       }
     )
-		
+    @c = @pop_up.insert('end',
+      :command,
+      :label=>'Close all',
+      :font => conf('font'),
+      :hidemargin => false,
+      :command=> proc{
+        if @selected_tab_name_from_popup != nil
+          _e = @tabs_editor[@selected_tab_name_from_popup]
+          self.close_all_editor(_e)
+        end
+      }
+    )
+    
     @main_frame.enb.tabbind("Button-3",
       proc{|*x|
         _x = TkWinfo.pointerx(@main_frame.enb)
@@ -1153,39 +1327,60 @@ class AgMultiEditor < ArcadiaExt
           _index = @main_frame.enb.index(@selected_tab_name_from_popup)
         end
         if _index != -1 
-        		_file =  @main_frame.enb.itemcget(@selected_tab_name_from_popup, 'text')
-        		@pop_up.entryconfigure(0, 'label'=>_file)
-        		@pop_up.popup(_x,_y)
+          _file =  @main_frame.enb.itemcget(@selected_tab_name_from_popup, 'text')
+          @pop_up.entryconfigure(0, 'label'=>_file)
+          @pop_up.popup(_x,_y)
         end
       })
   end
 
 
-	def do_debug_event(_event)
-     #@arcadia.outln('_sender ----> '+_sender.to_s)	  
-     #@arcadia.outln('_event.signature ----> '+_event.signature)
-     case _event.signature 
-     		when DebugContract::DEBUG_BEGIN
-     				self.debug_begin
-     		when DebugContract::DEBUG_END
-     				self.debug_end
-     		when DebugContract::DEBUG_STEP
-     		  if _event.context.file
-     		  		self.open_file_in_debug(_event.context.file, _event.context.line)
-     				end
-     end
-	end
-
-	def do_editor_event(_event)
-     case _event.signature 
-     		when EditorContract::OPEN_FILE
-     		  if _event.context.file 
-     				  if _event.context.line
-     				    _index = _event.context.line.to_s+'.0' 
-     				  end
-     				  self.open_file(_event.context.file, _index)
-     				  _event.handled(self)
-     				end
+  def do_debug_event(_event)
+    #@arcadia.outln('_sender ----> '+_sender.to_s)	  
+    #@arcadia.outln('_event.signature ----> '+_event.signature)
+    case _event.signature 
+      when DebugContract::DEBUG_BEGIN
+        self.debug_begin
+      when DebugContract::DEBUG_END
+        self.debug_end
+      when DebugContract::DEBUG_STEP
+        if _event.context.file
+          self.open_file_in_debug(_event.context.file, _event.context.line)
+        end
+    end
+  end
+
+  def do_editor_event(_event)
+    case _event.signature 
+       when EditorContract::OPEN_FILE
+         if _event.context.file 
+           if _event.context.line
+             _index = _event.context.line.to_s+'.0' 
+           end
+           self.open_file(_event.context.file, _index)
+           _event.handled(self)
+         end
+       when EditorContract::CLOSE_FILE
+         if _event.context.file 
+           self.close_file(_event.context.file)
+           _event.handled(self)
+         end
+       when EditorContract::SAVE_FILE_RAISED
+         self.raised.save
+         _event.handled(self)
+       when EditorContract::SAVE_FILE
+         if _event.context.file 
+         self.save_file(_event.context.file)
+         _event.handled(self)
+      end
+        when EditorContract::SAVE_AS_FILE_RAISED
+          self.raised.save_as
+          _event.handled(self)
+        when EditorContract::SAVE_AS_FILE
+          if _event.context.file 
+          self.save_as_file(_event.context.file)
+          _event.handled(self)
+      end
      		when EditorContract::OPEN_TEXT
      		  if _event.context.title 
      				  _tab_name = self.tab_name(_event.context.title)
@@ -1197,126 +1392,129 @@ class AgMultiEditor < ArcadiaExt
      				  add_reverse_item(_e)
      				  _event.handled(self)
      				end
-     		when EditorContract::CLOSE_FILE
-     		  if _event.context.file 
-     				  self.close_file(_event.context.file)
-     				  _event.handled(self)
-     				end
-     end
-	end
-	
-	def do_main_event(_event)
-     case _event.signature 
+     		when EditorContract::SHOW_SEARCH_DIALOG
+        @find.show
+     		when EditorContract::SHOW_GOTO_LINE_DIALOG
+        @find.show_go_to_line_dialog
+    end
+  end
+
+  def xy_insert
+    _text = self.raised.text
+    _index_now = _text.index('insert')
+    _rx, _ry, _widht, _heigth = _text.bbox(_index_now);
+    _x = _rx + TkWinfo.rootx(_text)  
+    _y = _ry + TkWinfo.rooty(_text)  + TkFont.new(conf('font')).metrics[2][1]
+    _xroot = _x - TkWinfo.rootx(@arcadia.layout.root)  
+    _yroot = _y - TkWinfo.rooty(@arcadia.layout.root)  
+    return _xroot, _yroot
+  end
+
+
+
+  def raise_complete_code(_context)
+    # delete the file used for completion 
+ 		if File.exist?(_context.file) && _context.file.include?('~~')
+      File.delete(_context.file)
+    end
+    @raised_listbox.destroy if @raised_listbox != nil
+    
+    _text = self.raised.text
+    _index_call = _context.line+'.'+_context.col
+    _index_now = _text.index('insert')
+    if _index_call == _index_now 
+      _target = _text.get('insert - 1 chars wordstart','insert')
+        if _target.length > 0 && _target != '.'
+          extra_len = _target.length.+@
+          _begin_index = _index_now<<' - '<<extra_len.to_s<<' chars'
+          _text.tag_add('sel', _begin_index, _index_now)
+        else
+          _begin_index = _index_now
+          extra_len = 0
+        end
+        if _context.candidates.length > 1 
+            _rx, _ry, _widht, heigth = _text.bbox(_begin_index);
+            _x = _rx + TkWinfo.rootx(_text)  
+            _y = _ry + TkWinfo.rooty(_text)  + TkFont.new(conf('font')).metrics[2][1]
+
+            _xroot = _x - TkWinfo.rootx(@arcadia.layout.root)  
+            _yroot = _y - TkWinfo.rooty(@arcadia.layout.root)  
+            
+        					_max_height = TkWinfo.screenheight(@arcadia.layout.root) - _y - 5
+            
+            @raised_listbox = TkListbox.new(@arcadia.layout.root, 
+   					  		'takefocus'=>true, 
+              :background=>conf('color.background'),
+              :foreground=>conf('color.foreground'),
+              :selectbackground=>'yellow',
+              :selectforeground=>'red',
+              :activestyle=>'none',
+              :font => conf('font'),
+              :borderwidth=>1
+   					 	)
+  						_font = TkFont.new(conf('font'))
+  						_char_height = _font.metrics[2][1]
+  						_width = 0
+  						_docs_entries = Hash.new
+  						_context.candidates.each{|value|
+        				   			_key, _doc = value.split
+        				   			_docs_entries[_key]= _doc
+        				   			@raised_listbox.insert('end', _key)
+        				   			_temp_width = _font.measure(_key) + _font.measure('X')
+        				   			_width = _temp_width if _temp_width > _width 
+      						}
+      						_height = (_context.candidates.length+1)*_char_height
+      						_height = _max_height if _height > _max_height
+            @raised_listbox.place('x'=>_xroot,'y'=>_yroot, 'width'=>_width, 'height'=>_height)
+            
+          			@raised_listbox.focus
+  						@raised_listbox.bind_append('KeyPress'){|e|
+        			   			case e.keysym
+ 	         						when 'Escape'
+  	        						  @raised_listbox.destroy
+   	       						  #_menu.destroy
+    	      						  Tk.callback_break
+    			           when 'Return'
+      									_value = @raised_listbox.get('active')
+      									_text.delete(_begin_index,'insert')
+      									_text.insert('insert',_value)
+      									@raised_listbox.destroy
+      									#_menu.destroy
+      									Tk.callback_break
+      								 when 'F1'
+      								 	_key = @raised_listbox.get('active')
+                  _x, _y = xy_insert
+           	       EditorContract.instance.doc_code(self, 'doc_entry'=>_docs_entries[_key], 'xdoc'=>_x, 'ydoc'=>_y)
+      								end
+  					   }
+       			 elsif _context.candidates.length == 1 && _context.candidates[0].length>0
+       					   _text.delete(_begin_index,'insert');
+     					   _text.insert('insert',_context.candidates[0].split[0])
+         end
+      end
+  end
+  
+  def do_main_event(_event)
+    case _event.signature 
      		when MainContract::EVENT_HANDLED
      				_cause = _event.context.caused_by
      				if _cause.signature == EditorContract::COMPLETE_CODE &&
      					 _cause.context.sender == self.raised
-     					 # delete the file used for completion 
-			     if File.exist?(_cause.context.file) && _cause.context.file.include?('~~')
-				      File.delete(_cause.context.file)
-    					 end
-
-     					 _text = self.raised.text
-     					 _index_call = _cause.context.line+'.'+_cause.context.col
-     					 _index_now = _text.index('insert')
-     					 if _index_call == _index_now 
- 	            _target = _text.get('insert - 1 chars wordstart','insert')
-						 if _target.length > 0 && _target != '.'
-						 		extra_len = _target.length.+@
-						 		_begin_index = _index_now<<' - '<<extra_len.to_s<<' chars'
-						 		_text.tag_add('sel', _begin_index, _index_now)
-						 else
-						    _begin_index = _index_now
-						    extra_len = 0
-						 end
-     					 	 if _cause.context.candidates.length > 1 
-		     					 _rx, _ry, _widht, heigth = _text.bbox(_begin_index);
-					     _menu = TkMenu.new(
-				      		 :parent=>_text,
-				      		 :tearoff=>0,
-				      		 :relief=>'solid',
-				      		 :borderwidth=>1,
-				      		 :background=>conf('color.background'),
-				      		 :foreground=>conf('color.foreground'),
-				      		 :font => conf('font')
-   	 						 )
-	   	 					 _cause.context.candidates.each{|item|
-	   	 					 _value, _hint = item.split
-    							 if _hint
-    							 _menu.insert('end',
-    							 		:command,
-    							 		:accelerator=>_hint.split('#')[0],
-      									:command=> proc{_text.delete(_begin_index,'insert'); _text.insert('insert',_value)},
-      									:label=>_value,
-      									:activebackground=>'yellow',
-      									:hidemargin => true
-    								)
-    								else
-        							 _menu.insert('end',
-        							 		:command,
-          									:command=> proc{_text.delete(_begin_index,'insert'); _text.insert('insert',_value)},
-          									:label=>_value,
-          									:activebackground=>'yellow',
-          									:hidemargin => true
-        								)
-    								end
-            	  }
-            	  
-             	 _x = _rx + TkWinfo.rootx(_text)  
-              	_y = _ry + TkWinfo.rooty(_text)  + TkFont.new(conf('font')).metrics[2][1]
-    						 	_menu.popup(_x,_y)
-
-              _old_g = TkWinfo.geometry(_menu)
-              _w,_h = _old_g.split('+')[0].split('x')
-              _yy = TkWinfo.screenheight(_menu) - _y - 5
- 	             if _h.to_i > _yy
-                _h = _yy.to_s
-	              _w = (_w.to_i+5).to_s
-	              _new_g =  _w+'x'+_h+'+'+_x.to_s+'+'+_y.to_s
- 		            Tk.tk_call('wm', 'geometry', _menu, _new_g )
- 		            _listbox = TkListbox.new(_menu, 
-           					  		'takefocus'=>true, 
-      			      		 		:background=>conf('color.background'),
-      				     	 		 :foreground=>conf('color.foreground'),
-								 	 :selectbackground=>'yellow',
-								 	 :activestyle=>'none',
-      				        	 :font => conf('font'),
-      			        		 :borderwidth=>1
-           					 ).place('x'=>0,'y'=>0, 'relwidth'=>1, 'relheight'=>1)
-		      						_listbox.focus
-          						 _listbox.bind_append('KeyPress'){|e|
-           							 case e.keysym
-            								when 'Escape'
-            									 _listbox.destroy
-            									 _menu.destroy
-            									 Tk.callback_break
-      		             when 'Return'
-        			             _value = _listbox.get('active')
-           				          _text.delete(_begin_index,'insert')
-               				      _text.insert('insert',_value)
-            											 _listbox.destroy
-            									    _menu.destroy
-            									    Tk.callback_break
-            							end
-          						  }
-          						  _cause.context.candidates.each{|value|
-                     _listbox.insert('end', value)
-                  }
-	              end
-	     					 elsif _cause.context.candidates.length == 1 && _cause.context.candidates[0].length>0
-	     					   _text.delete(_begin_index,'insert');
-  	   					   _text.insert('insert',_cause.context.candidates[0].split[0])
- 	    					 end
-     					 end
-     				end
-		 end		  
-	end
+     					 raise_complete_code(_cause.context)
+    				elsif _cause.signature == EditorContract::DOC_CODE && _cause.context.file != nil
+          # delete the file used for completion 
+ 					if File.exist?(_cause.context.file) && _cause.context.file.include?('~~')
+            File.delete(_cause.context.file)
+          end
+    				end
+    end		  
+  end
 
   def add_reverse_item(_editor)
     code2form = proc{
       Revparsel.new(_editor.text_value)
       self.close_editor(_editor, false)
-      InspectorContract.instance.raise_last_widget(InspectorContract::TInspectorObj.new(self))
+      InspectorContract.instance.raise_last_widget(self)
     }
     _editor.insert_popup_menu_item('end',
       :command,
@@ -1326,7 +1524,7 @@ class AgMultiEditor < ArcadiaExt
     )
   
   end
-	
+  
 #	def editor_state
 #	  r = EditorContract::SObj.new
 #	  r.raised_file = self.raised.file
@@ -1340,7 +1538,10 @@ class AgMultiEditor < ArcadiaExt
 
   def create_find
     #find_frame = @arcadia.layout.register_panel(conf('find.frame'),'Find', 'Find')
-    @find = Find.new(@splitted_frame.top_frame, self)
+#    @find = Find.new(@splitted_frame.top_frame, self)
+    @find = Find.new(@arcadia.layout.root, self)
+    @find.on_close=proc{@find.hide}
+    @find.hide
   end
 
   def finalize
@@ -1367,18 +1568,12 @@ class AgMultiEditor < ArcadiaExt
   end
   
   def breakpoint_add(_file,_line)
-    _tobj =  EditorContract::TEditorObj.new(self) 
-    _tobj.file = _file
-    _tobj.line = _line
-    EditorContract.instance.breakpoint_created(_tobj)
+    EditorContract.instance.breakpoint_created(self, 'file'=>_file, 'line'=>_line)
     @breakpoints << {:file=>_file,:line=>_line}
   end
 
   def breakpoint_del(_file,_line)
-    _tobj =  EditorContract::TEditorObj.new(self) 
-    _tobj.file = _file
-    _tobj.line = _line
-    EditorContract.instance.breakpoint_deleted(_tobj)
+    EditorContract.instance.breakpoint_deleted(self, 'file'=>_file, 'line'=>_line)
     @breakpoints.delete_if{|b| (b[:file]==_file && b[:line]==_line)}
   end
 
@@ -1534,8 +1729,8 @@ class AgMultiEditor < ArcadiaExt
       _e = @tabs_editor[_name]
       if _e && _e.file != nil
         _new_caption = _e.file
-	      @find.use(_e)
-	      _e.check_file_last_access_time
+        @find.use(_e)
+        _e.check_file_last_access_time
       else
         _new_caption = _title
       end
@@ -1544,7 +1739,7 @@ class AgMultiEditor < ArcadiaExt
       @arcadia.layout.domain(@arcadia['conf'][@name+'.frame'])['root'].top_text(_new_caption)
     end
     _title = @tabs_file[_name] != nil ? File.basename(@tabs_file[_name]) :_name
-    EditorContract.instance.buffer_raised(EditorContract::TEditorObj.new(self, 'title'=>_title, 'file'=>@tabs_file[_name]))
+    EditorContract.instance.buffer_raised(self, 'title'=>_title, 'file'=>@tabs_file[_name])
   end
   
   def editor_exist?(_filename)
@@ -1584,9 +1779,7 @@ class AgMultiEditor < ArcadiaExt
       @tabs_file[_tab_name]= _filename
       @tabs_editor[_tab_name].load_file(_filename)
       #do_buffer_raise(_tab_name)
-      _tobj =EditorContract::TEditorObj.new(self)
-      _tobj.file= _filename
-      EditorContract.instance.file_opened(_tobj)
+      EditorContract.instance.file_opened(self, 'file'=>_filename)
     end
     
     if _text_index != nil && _text_index != '1.0'
@@ -1639,6 +1832,11 @@ class AgMultiEditor < ArcadiaExt
   		end
   end
 
+  def close_all_editor(_editor, _mod=true)
+  		@tabs_editor.values.each do |_e|
+  		    close_editor(_e)
+  		end
+  end
 
   def close_editor(_editor, _mod=true)
     if ((_mod)&&(_editor.modified?))
@@ -1654,9 +1852,7 @@ class AgMultiEditor < ArcadiaExt
     else
       close_tab(_editor.page_frame)
     end
-    _tobj = EditorContract::TEditorObj.new(self)
-    _tobj.file = _editor.file
-    EditorContract.instance.file_closed(_tobj)
+    EditorContract.instance.file_closed(self, 'file'=>_editor.file)
   end
 
   def close_tab(_page_frame)
@@ -1672,78 +1868,120 @@ class AgMultiEditor < ArcadiaExt
   def close_file(_filename)
     close_editor(@tabs_editor[tab_name(_filename)])
   end
+
+  def save_file(_filename)
+    @tabs_editor[tab_name(_filename)].save
+  end
+
+  def save_as_file(_filename)
+    @tabs_editor[tab_name(_filename)].save_as
+  end
+
 end
 
-class Findview < TkFrame
+class Findview < TkFloatTitledFrame
   def initialize(_parent)
     super(_parent)
-    @cb_reg = TkCheckButton.new(self){|_cb_reg|
-      text  'regexp'
+    #stop_resizing
+ 	  y0 = 10
+    d = 23    
+   TkLabel.new(self.frame){
+   	text 'Find what:'
+   	place('x' => 8,'y' => y0,'height' => 19)
+   }
+   y0 = y0 + d
+  @e_what = Tk::BWidget::ComboBox.new(self.frame){
+      editable true
+      justify  'left'
+      relief  'ridge'
+      autocomplete 'true'
+      #insertbackground '#FFFFFF'
+      entrybg '#FFFFFF'
+      expand 'tab'
+      takefocus 'true'
+      #pack('padx'=>10, 'fill'=>'x')
+      place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
+  }
+   y0 = y0 + d
+   TkLabel.new(self.frame){
+   	text 'Replace with:'
+   	place('x' => 8,'y' => y0,'height' => 19)
+   }
+   y0 = y0 + d
+   
+  @e_with = Tk::BWidget::ComboBox.new(self.frame){
+      editable true
+      justify  'left'
+      relief  'ridge'
+      autocomplete 'true'
+      #insertbackground '#FFFFFF'
+      entrybg '#FFFFFF'
+      expand 'tab'
+      takefocus 'true'
+      #pack('padx'=>10, 'fill'=>'x')
+      place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
+    }
+    
+    y0 = y0 + d
+    @cb_reg = TkCheckButton.new(self.frame){|_cb_reg|
+      text  'Use Regular Expression'
       justify  'left'
       relief  'flat'
-      pack('side'=>'left', 'anchor'=>'e')
-      #place('relwidth' => 0,'x' => 8,'y' => 14,'relheight' => 0,'rely' => 0,'height' => 22,'bordermode' => 'inside','width' => 62)
+      #pack('side'=>'left', 'anchor'=>'e')
+      place('x' => 8,'y' => y0,'height' => 22)
     }
-#    @e_kind = Tk::BWidget::ComboBox.new(self){
-#      editable true
-#      justify  'left'
-#      relief  'groove'
-#      autocomplete 'true'
-#      insertbackground '#FFFFFF'
-#      expand 'tab'
-#      values 'forwards backwards page'
-#      takefocus 'true'
-#      pack('side'=>'left', 'anchor'=>'e')
-#    }
-    @rb = TkRadioButton.new(self){
-      value 'forwards'
-      text 'forwards'
-      select
-      pack('side'=>'left', 'anchor'=>'e')
-      #place('relx' => 0,'x' => 8,'y' => 64,'relheight' => 0,'rely' => 0,'height' => 23,'bordermode' => 'inside')
+    y0 = y0 + d
+    @cb_back = TkCheckButton.new(self.frame){|_cb_reg|
+      text  'Search backwards'
+      justify  'left'
+      relief  'flat'
+      #pack('side'=>'left', 'anchor'=>'e')
+      place('x' => 8,'y' => y0,'height' => 22)
     }
-    TkRadioButton.new(self){
-      value 'backwards'
-      text 'backwards'
-      pack('side'=>'left', 'anchor'=>'e')
-      #place('relx' => 0,'x' => 8,'y' => 84,'relheight' => 0,'rely' => 0,'height' => 23,'bordermode' => 'inside')
+    
+  y0 = y0 + d
+  y0 = y0 + d
+   @buttons_frame = TkFrame.new(self.frame).pack('fill'=>'x', 'side'=>'bottom')	
+
+    @b_replace_all = TkButton.new(@buttons_frame){|_b_go|
+    		state 'disabled'
+      default  'disabled'
+      text  'Replace All'
+      overrelief  'raised'
+      justify  'center'
+      #width 15
+      pack('side'=>'right','ipadx'=>5, 'padx'=>5)
+      #place('width' => 50,'x' => 0,'y' => y0,'height' => 23,'bordermode' => 'inside')
     }
-    TkRadioButton.new(self){
-      value 'line'
-      text 'line'
-      pack('side'=>'left', 'anchor'=>'e')
-      #place('relx' => 0,'x' => 8,'y' => 104,'relheight' => 0,'rely' => 0,'height' => 23,'bordermode' => 'inside')
+
+
+    @b_replace = TkButton.new(@buttons_frame){|_b_go|
+    		state 'disabled'
+      default  'disabled'
+      text  'Replace'
+      overrelief  'raised'
+      justify  'center'
+      #width 15
+      pack('side'=>'right','ipadx'=>5, 'padx'=>5)
+      #place('width' => 50,'x' => 0,'y' => y0,'height' => 23,'bordermode' => 'inside')
     }
-#    TkLabel.new(self){
-#      text 'what'
-#      pack('side'=>'left', 'anchor'=>'e')
-#    }
-    @b_go = TkButton.new(self){|_b_go|
+
+    
+    @b_go = TkButton.new(@buttons_frame){|_b_go|
       compound  'none'
       default  'disabled'
-      text  'Find'
+      text  'Find Next'
       #background  '#ffffff'
-      image TkPhotoImage.new('dat' => FIND_GIF)
+      #image TkPhotoImage.new('dat' => FIND_GIF)
       overrelief  'raised'
       justify  'center'
-      relief  'ridge'
-      width 20
-      pack('side'=>'right','ipadx'=>20)
-      #place('width' => 50,'x' => 0,'y' => 130,'height' => 23,'bordermode' => 'inside')
-    }
-    @e_what = Tk::BWidget::ComboBox.new(self){
-      editable true
-      justify  'left'
-      relief  'ridge'
-      autocomplete 'true'
-      #insertbackground '#FFFFFF'
-      entrybg '#FFFFFF'
-      expand 'tab'
-      takefocus 'true'
-      pack('padx'=>10, 'fill'=>'x')
-      #place('relwidth' => 1, 'x' => 0,'y' => 41,'height' => 19)
+      #relief  'ridge'
+      #width 15
+      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'=>0,'y'=>0,'relheight'=> 1,'relwidth'=> 1)
+    place('x'=>100,'y'=>100,'height'=> 220,'width'=> 300)
     
   end
 end
@@ -1757,42 +1995,98 @@ class Find < Findview
     @controller = _controller
     @forwards = true
     @find_action = proc{
-      _radio = @rb.get_value
-      if _radio == 'line'
-        go_line
-      else
-        @forwards =  _radio == 'forwards'
+      #_radio = @rb.get_value
+      
+      #if _radio == 'line'
+      #  go_line
+      #else
         do_find_next
-      end
+      #end
     }
     @b_go.bind('1', @find_action)
+    
+  		@b_replace.bind('1', proc{do_replace})  
+    
+  		@b_replace_all.bind('1', proc{do_replace_all})  
+
     e =  TkWinfo.children(@e_what)[0]
     e.bind_append('KeyPress'){|e|
       case e.keysym
       when 'Return'
         @find_action.call
+        hide
+        @editor_caller.text.focus
         Tk.callback_break
+      else
+        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
+    @goto_line_dialog.on_close=proc{@goto_line_dialog.hide}
+
+    @goto_line_dialog.b_go.bind('1',proc{go_line})
+  end
+
+  def do_replace
+    if do_find_next
+        _message = 'Replace "'+@e_what.value+'" with "'+@e_with.value+'" ?'
+        if TkDialog2.new('message'=>_message, 'buttons'=>['Yes','No']).show() == 0
+          self.editor.text.delete(@idx1,@idx2)
+          self.editor.text.insert(@idx1,@e_with.value)
+        end
+    end
   end
 
-	def editor
+  def do_replace_all
+    while do_find_next
+        _message = 'Replace "'+@e_what.value+'" with "'+@e_with.value+'" ?'
+        _rc = TkDialog2.new('message'=>_message, 'buttons'=>['Yes','No','Annulla']).show()
+        if _rc == 0
+          self.editor.text.delete(@idx1,@idx2)
+          self.editor.text.insert(@idx1,@e_with.value)
+        elsif _rc == 2
+          break
+        end
+    end
+  end
+  
+  def widget_state
+   		if (@e_what.value.length > 0) && (@e_with.value.length > 0)
+   			@b_replace.configure('state'=>'active')
+   			@b_replace_all.configure('state'=>'active')
+   		else
+   			@b_replace.configure('state'=>'disabled')
+   			@b_replace_all.configure('state'=>'disabled')
+   		end
+  end
+
+
+  def editor
     if @editor_caller == nil
       @editor_caller = @controller.raised
     end
     return @editor_caller
-	end
+  end
 
+  def show_go_to_line_dialog
+    @goto_line_dialog.show
+  end
 
   def go_line
-    if @e_what.value.length > 0
-      _row = @e_what.value
+    if @goto_line_dialog.e_line.value.length > 0
+      _row = @goto_line_dialog.e_line.value
       _index = _row+'.1'
       self.editor.text.see(_index)
       self.editor.text.tag_add('sel', _index,_index+' lineend')
       self.editor.text.set_insert(_index)
       @controller.bookmark_add(self.editor.file, _index)
+    @goto_line_dialog.hide
     end
     #self.hide()
   end
@@ -1801,6 +2095,7 @@ class Find < Findview
     if (_editor != @editor_caller)
       @last_index='insert'
       @editor_caller = _editor
+      title(_editor.file)
     end
   end
 
@@ -1812,6 +2107,10 @@ class Find < Findview
   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 !_istart && self.editor.text.index('insert')!=nil
@@ -1822,15 +2121,15 @@ class Find < Findview
         _istart = '1.0'
       end
       if @forwards
-        if @cb_reg.cget('onvalue')=='1'
-          _index = self.editor.text.rsearch(@e_what.text,_istart)
+        if @cb_reg.cget('onvalue')==@cb_reg.cget('variable').value.to_i
+          _index = self.editor.text.tksearch(['regexp'],@e_what.text,_istart)
         else
           _index = self.editor.text.search(@e_what.text,_istart)
         end
       else
 
-        if @cb_reg.cget('onvalue')=='1'
-          _index = self.editor.text.tkrsearch(['backwards'],@e_what.text,_istart)
+        if @cb_reg.cget('onvalue')==@cb_reg.cget('variable').value.to_i
+          _index = self.editor.text.tksearch(['regexp','backwards'],@e_what.text,_istart)
         else
           _index = self.editor.text.tksearch(['backwards'],@e_what.text,_istart)
         end
@@ -1846,6 +2145,9 @@ class Find < Findview
         end
         self.editor.text.tag_add('sel', _index,_index_sel_end)
         self.editor.text.set_insert(_index)
+        @idx1 =_index
+        @idx2 =_index_sel_end
+        _found = true
         @controller.bookmark_add(self.editor.file, _index)
       else
         _message = '"'+@e_what.value+'" not found'
@@ -1855,9 +2157,13 @@ class Find < Findview
     else
       self.show()
     end
+    return _found
   end
 
   def do_find_next
+    if @idx1 != nil
+    		self.editor.text.tag_remove('sel',@idx1,@idx2)
+    end
     do_find(@last_index)
   end
 end
@@ -1891,3 +2197,39 @@ end
 
 class CodeInsight
 end
+
+class GoToLine < TkFloatTitledFrame
+  attr_reader :e_line
+  attr_reader :b_go 
+  def initialize(_parent)
+    super(_parent)
+    #stop_resizing
+ 	  y0 = 10
+    d = 23    
+   TkLabel.new(self.frame){
+   	text 'Go to line:'
+   	place('x' => 8,'y' => y0,'height' => 19)
+   }
+   y0 = y0 + d
+   	@e_line = TkEntry.new(self.frame){
+      justify  'left'
+      relief  'ridge'
+      place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
+   	}
+    
+   	y0 = y0 + d
+   	y0 = y0 + d
+   @buttons_frame = TkFrame.new(self.frame).pack('fill'=>'x', 'side'=>'bottom')	
+    
+    @b_go = TkButton.new(@buttons_frame){|_b_go|
+      compound  'none'
+      default  'disabled'
+      text  'Go'
+      overrelief  'raised'
+      justify  'center'
+      pack('side'=>'right','ipadx'=>5, 'padx'=>5)
+    }
+    place('x'=>150,'y'=>150,'height'=> 120,'width'=> 100)
+    
+  end
+end