arcadia 0.12.2 → 0.13.0

data/README

@@ -1,24 +1,30 @@
 = Arcadia Ide
-version 0.12.2
+version 0.13.0
 
 by Antonio Galeone
-on Apr 28, 2013
+on Jul 24, 2013
 
 
 == About
 
-Arcadia is a Light Integrated Development Environment (IDE) for Ruby language 
+Arcadia is a light Integrated Development Environment (IDE) for Ruby language 
 written in Ruby using the classic tcl/tk GUI toolkit.
 
 Some of Arcadia ide project features include:
 * Editor with source browsing, syntax highlighting, code completion
 * Working on any platform where ruby and tcl-tk work.
 * Debugging support
-* Highly extensibility architecture.
+* Highly estensibile architecture.
 
 
 == News
 
+[0.13.0]
+    This realease:
+  - improves file-history  introducing bookmarks management
+  - improves layout    
+  - fixes bugs 
+
 [0.12.2]
  - this release adds support to debugger gem and fixes minor bugs
   
@@ -35,27 +41,31 @@ Some of Arcadia ide project features include:
    locale is settable in ~/.arcadia/arcadia.conf overriding default (locale=en-UK)
   ... collaborations in translations are welcome!
  - added possibility to interact with running application typing input in output's console
- - introduced in file-history a new kind of view (list view) activable by  button on toolbar  
+ - introduced in file-history a new kind of view (list view) activable by button on toolbar  
  - bugs fixed and optimizations 
  
 == Dependencies
 
   - rubygems
   - ruby-tk
-  - tcl/tk
+  - tcl/tk (ruby-tk supports fully tcl/tk runtime <= 8.5 )
   - tk-tile (if tcl/tk < 8.5)
-  - ctags
+  - ctags (linux)
   - xterm (linux, optional)
   - xdotool (linux, optional)
   - ack (optional)
   - gem coderay (> 1.0)
-  - gem ruby-debug (debugger on ruby 1.9)
+  - gem debugger (ruby-debug on ruby < 1.9)
   - gem win32-process (only on windows)
   - gem ruby-wmi (only on windows)
   
 == How to install
 * exec on command line "gem install arcadia"
 
+NOTE: on some linux distributions like archlinux the default tcl/tk runtime at this time is on versions >= 8.6
+on the other hand ruby-tk supports fully only versions <= 8.5.x.y so to make arcadia working a choice 
+can be install ActiveTcl 8.5 and use ruby via rvm. 
+
 == How to run
 * exec on command line "arcadia"
 
@@ -63,7 +73,7 @@ Some of Arcadia ide project features include:
 == Short User guide
 Application layout is splitted in vertical and horizontal resizable frames. 
 On vertical and horizontal  splitter appear two button for left or right 
-one shot frame close. 
+one shot frame closing. 
 Every frame has a title, a button to expand or resizing it and a menu-button 
 for dynamic layout functions (like add row, add column, close or for move a frame).
 
@@ -114,33 +124,34 @@ It is a navigational tree:
 - open terminal from selected dir 
 
 ==== File history
-The last used files are organizing in tree so you can reopen them or there  
+The last used files are organizing in tree so you can reopen them or their 
 directory by clicking on the tree node.
 
 ==== Debug
-Require ruby-debug gem.
+Require debugger gem.
 It is created when a debug session init. 
 The debug button are: Step Next, Step Into, Step Over, Resume and quit.
 The debug frame show the local, instance and global variables for each
 step. 
 
+NOTE: at this moment debugger doesn't seem to work with ruby >= 2.0  
+
 ==== Configuration
 Same Arcadia properties are locally configurabled by editing the file arcadia.conf
 under ~/.arcadia  directory. The format of property definition are:
 <OPERATING SYSTEM IDENTIFY::>PROPERTY_NAME=PROPERTY_VALUE
 
 
-I have tested arcadia with ruby 1.8.4, 1.8.5, 1.8.6, 1.8.7, 1.9.1, 1.9.2 on 
+I have tested arcadia with ruby 1.8, 1.9, 2.0 on 
 
 * Archlinux
-* Ubuntu
+* Ubuntu/Mint
 * Fedora
 * FreeBsd6.x, FreeBsd7.x, 
 * Vector linux 5.*,
 * Windows 2000/XP/7, 
 * Cygwin (note: same page fault error on dll under cygwin may be solved in this way:
   by ash.exe exec "/bin/rebaseall"). 
-If you will test arcadia on other operating system sends me an e-mail.
 
 ==Developers e general information
 Released on arcadia web site (http://arcadia.rubyforge.org) 

data/conf/LC/en-UK.LANG

@@ -99,6 +99,7 @@ main.ps.runtime_errors=Runtime errors
 ext.editor.menu.view.show_hide_line_number=Show/Hide editor line numbers
 ext.editor.menu.view.show_hide_tabs=Show/Hide editor tabs
 ext.editor.button.link.hint=Link open editors with content in the Navigator
+ext.editor.button.up.hint=View parent
 ext.editor.outline.rebuild_tree=.... rebuild tree
 ext.editor.outline.menu.rebuild=Rebuild
 ext.editor.text_line.menu.title=line $0
@@ -198,6 +199,7 @@ ext.file_history.button.show_as_list.hint=Show as list
 ext.file_history.menu.search_from_here=Search from here
 ext.file_history.menu.find_in_files=Find in files...
 ext.file_history.menu.act_in_files=Act in files...
+ext.file_history.toggle_bookmark=Toggle boomark
 #output
 ext.output.menu.output=Output
 ext.output.menu.save=Save
@@ -230,7 +232,7 @@ ext.ruby_debug.client.e.socket_session.2=Error on socket session : $0:$1
 ext.ruby_debug.client.e.close_session=Error on close session : $0:$1
 ext.ruby_debug.client.e.start_session=Error on start_session : $0:$1 $2
 ext.ruby_debug.client.e.stop_session=Error on stop_session : $0:$1
-ext.ruby_debug.client.e.abort_session=Debugger has finished executing: $0:$1
+ext.ruby_debug.client.e.abort_session=Debugger has finished executing on command $0: $1:$2
 ext.ruby_debug.client.e.raise.on_read.1=Debugged has finished executing
 ext.ruby_debug.client.e.raise.on_read.2=Error: on command '$0' => $1 : $2
 ext.ruby_debug.e.rdebug=Warning: Extension ae-ruby-debug depend upon rdebug command (install it or update system path!)

data/conf/arcadia.conf

@@ -103,6 +103,16 @@ titlemenu.tearoff=0
 titlemenu.borderwidth=1 
 titlemenu.relief=flat
 
+titlebutton.=>>>button
+titlebutton.background=>>>titlelabel.background
+titlebutton.foreground=>>>titlelabel.foreground
+titlebutton.activebackground=>>>titlelabel.activebackground
+titlebutton.activeforeground=>>>titlelabel.activeforeground
+titlebutton.borderwidth=1 
+titlebutton.relief=flat
+titlebutton.direction=above
+titlebutton.font>>>titlelabel.font
+
 
 splitter.background=>>>background
 splitter.highlightbackground=>>>foreground

data/conf/arcadia.res.rb

@@ -272,6 +272,28 @@ R0lGODlhCQAJAPIAAP///8ziw4qyRHelIG2eDWaZAP///wAAACH5BAEAAAYA
 LAAAAAAJAAkAAAMdaCFUJEGNQulYFVRWi3YeIIpUk5XCSUFTdyncEyUAOw==
 EOS
 
+ARROW_UP_GIF=<<EOS
+R0lGODlhEAAQAIQYAAIsYxc7ZSZRhUhumUxvnU9yn1F0ok93pFR3pFZ7qVh7
+qVqEsWePvoKYsXOdzX6p2o+u0Ym15pe225K98aDA5KjK7q7Q97fa////////
+/////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEK
+AB8ALAAAAAAQABAAAAVd4CeOHwCQKAkoypmqyXUl7gsg1jRZSK0alYgwUjH4
+SgXKY8mkFGoAgsRBrVIlhBNgAGF4v2DIwGQSLM7os4A8Ahze8PexRK6bXnib
+vZ4CNP6Af3MAAYWGhYN7bCIhADs=
+EOS
+
+
+STAR_EMPTY_GIF=<<EOS
+R0lGODlhEAAQAKU3AGRkZHt7e3x8fJKSkpWVlZaWlpqampubm5ycnKmpqaqq
+qqurq6ysrK2tra6urrCwsLGxsbKysrOzs7S0tLW1tba2tre3t8TExMXFxcbG
+xsfHx9TU1NXV1djY2NnZ2dvb2+Dg4OHh4eLi4ujo6Ovr6+zs7O3t7e7u7u/v
+7/Hx8fLy8vPz8/T09PX19fb29vf39/j4+Pn5+fr6+vv7+/z8/P39/f7+/v//
+/////////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1Q
+ACH5BAEKAD8ALAAAAAAQABAAAAZpwJ9wSCwaj8ghJJIsajRNoscTFUpGI8nR
+4JhMKh2VqmPxOg7DR4dkWrlerVOpAykmNiuYbBZrcRJHBx4yNTY0HwhIBCB7
+NDQiBUgMKygXGCksDUgYIApCCyEZRwEUA0QDFQJGAEisVUZBADs=
+EOS
+
+
 ADD_GIF=<<EOS
 R0lGODlhEAAQAMQAADRlpH2m14Oq2LbM5n+o14at2ZCz2pK02pS225++4LXM
 5rbN5sDT6JW327TM5bfO5rvR57zR5////wAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -1330,6 +1352,12 @@ JgtCBMCTbQcibiFQVqcLIIc3lmdqqRSscTaQiGQK/Dqf0M1nlDldElrvcjkR
 eqrNtPhBLrRLK8ELJorJ12VRg0TI1EWXcT5/SWRUSwQAOw==
 EOS
 
+BOOKMARK_GIF=<<EOS
+R0lGODlhEAAQAKECADNmAEC/AP///////yH5BAEKAAIALAAAAAAQABAAAAIw
+lB0ZxxwAwWrnMUkNQHPn/WAetXllJpzp+rEq6bKwKTfqa8djvu9XqrCgNJGh
+8VAAADs=
+EOS
+
 FOLDER_GIF=<<EOS
 R0lGODlhEgASAMIGAAAAAISCAISChK2qre/Tpffjtf///////yH+EUNyZWF0
 ZWQgd2l0aCBHSU1QACH5BAEAAAcALAAAAAASABIAAANSeLrcPsPJA42BCstx
@@ -2030,4 +2058,4 @@ EOS
 TREE_VIEW_GIF=<<EOS
 R0lGODlhDgAOAIABAP///////yH5BAEAAAEALAAAAAAOAA4AQAIbjI9poO0P
 gWRxhkkPvlbnt0WI1HyhNn7OCR0FADs=
-EOS
+EOS

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

@@ -45,7 +45,11 @@ class SourceStructure
   attr_reader :root
   
   def initialize
-    @root = SourceTreeNode.new(nil, 'root'){|_node|
+    @root = SourceStructure.root
+  end
+  
+  def SourceStructure.root
+    SourceTreeNode.new(nil, 'root'){|_node|
       _node.rif= 'root'
       _node.label=''
     }
@@ -797,6 +801,31 @@ class AgEditorOutlineToolbar
     }
     @sync = false
     @cb_sync.command(do_check)
+    
+    #----
+    go_to_parent = proc{
+      e = @controller.active_instance.raised
+      if e
+        no = e.outline.last_opened
+        if no
+          e.outline.tree_exp.see(no)
+        else  
+          _selected = e.outline.tree_exp.selected
+          if _selected && e.outline.tree_exp.exist?(_selected)
+            _parent = e.outline.tree_exp.parent(_selected)
+            if _parent && _parent != 'root'
+              e.outline.tree_exp.see(_parent)
+            else
+              e.outline.tree_exp.see(_selected)
+            end
+          end
+        end
+      end
+       
+    }
+    
+    @b_goto_p = @controller.main_instance.frame(1).root.add_button(@controller.main_instance.frame(1).name, Arcadia.text("ext.editor.button.up.hint"), go_to_parent, ARROW_UP_GIF)
+    #----    
   end
 
   def sync_on
@@ -822,6 +851,7 @@ class AgEditorOutline
   attr_reader :last_row
   attr_reader :tree_exp
   attr_reader :ss
+  attr_reader :last_opened
   def initialize(_editor, _frame, _bar, _lang=nil)
     @editor = _editor
     @frame = _frame
@@ -838,7 +868,7 @@ class AgEditorOutline
   end
   
   # I think this is "if synced expand out the outline for the current selection"
-  def shure_select_node(_node)
+  def shure_select_node(_node, _close_if_opened = true)
     return if @selecting_node
     #return if @tree_exp.exist?(_node.rif)
     @selecting_node = true
@@ -856,7 +886,7 @@ class AgEditorOutline
         @last_open_node=parent.rif
         parent = parent.parent
       end
-      @tree_exp.close_tree(to_open) if to_open && !@opened
+      @tree_exp.close_tree(to_open) if _close_if_opened && to_open && !@opened
       @tree_exp.see(_node.rif)
     ensure
       @tree_exp.selectcommand(_proc)
@@ -865,6 +895,15 @@ class AgEditorOutline
     @tree_exp.call_after_next_show_h_scroll(proc{Tk.update;@tree_exp.see(_node.rif)})    
   end
 
+  def shure_select_line(_line, _close_if_opened = true)
+    if @ss && _line
+      node = @ss.node_by_line(@ss.root, _line)
+    else
+      node = SourceStructure.root
+    end
+    shure_select_node(node, _close_if_opened)
+  end
+
   def select_without_event(_line)
     if @ss
       _node=@ss.deep_node_by_line(@ss.root, _line)
@@ -904,11 +943,15 @@ class AgEditorOutline
         @bar.sync = sync_val
       end
     }
+    do_open_command = proc{|no|
+      @last_opened = no
+    }
     @tree_exp = BWidgetTreePatched.new(_frame, Arcadia.style('treepanel')){
       showlines false
       deltay 18
       dragenabled true
       selectcommand proc{ _tree_goto.call(self) } 
+      opencmd do_open_command 
       crosscloseimage  Arcadia.image_res(ARROWRIGHT_GIF)      
       crossopenimage  Arcadia.image_res(ARROWDOWN_GIF)
     }
@@ -1056,7 +1099,7 @@ class AgEditor
     @highlighting = false
     @classbrowsing = false
     @codeinsight = false
-    @find = @controller.get_find
+    #@find = @controller.get_find
     @read_only=false
     @loading=false
     @tabs_show = false
@@ -1677,7 +1720,7 @@ class AgEditor
       when 'F5'
         run_buffer
       when 'F3'
-        @find.do_find_next
+        @controller.get_find.do_find_next
       when 'F1'
         line, col = @text.index('insert').split('.')
         _x, _y = xy_insert
@@ -1811,20 +1854,20 @@ class AgEditor
         end
       end
   end
-
+  
   # show the "find in file" dialog
   def find
     _r = @text.tag_ranges('sel')
     if _r.length>0
       _text=@text.get(_r[0][0],_r[0][1])
       if _text.length > 0
-        @find.e_what.text(_text)
+        @controller.get_find.e_what.text(_text)
       end
     else
     end
-    @find.use(self)
-    @find.e_what.focus
-    @find.show
+    @controller.get_find.use(self)
+    @controller.get_find.e_what.focus
+    @controller.get_find.show
   end
 
   def disactivate_key_binding
@@ -1901,6 +1944,8 @@ class AgEditor
     @text_line_num.tag_configure('normal_case', 'justify'=>'right')
     @text_line_num.tag_configure('bold_case', 'spacing3'=>delta, 'justify'=>'right')
     @text_line_num.tag_configure('breakpoint', 'background'=>'red','foreground'=>'yellow','borderwidth'=>1, 'relief'=>'raised')
+#    @text_line_num.tag_configure('bookmark', 'background'=>'blue','foreground'=>'yellow','borderwidth'=>1, 'relief'=>'raised')
+    @text_line_num.tag_configure('bookmark', 'background'=>'white','foreground'=>'red','borderwidth'=>1, 'relief'=>'raised')
     @text_line_num.tag_configure('current', 
       'background'=>Arcadia.conf("activebackground"),
       'foreground'=>Arcadia.conf("activeforeground"),
@@ -1961,6 +2006,24 @@ class AgEditor
       }
     )
 
+    _pop_up.insert('end',
+      :command,
+      :label=> Arcadia.text('ext.file_history.toggle_bookmark'),
+      :hidemargin => false,
+      :command=> proc{ 
+        if defined?(@text_line_num_current_index)
+          row = @text_line_num.get(@text_line_num_current_index+' linestart',@text_line_num_current_index+' lineend').strip
+          ToggleBookmarkEvent.new(self,
+            'file'=>@file, 
+            'from_row'=>row, 
+            'to_row'=>row,
+            'persistent'=>File.exists?(@file),
+            'id'=>@id).go!
+        end
+      }
+    )
+
+
     @text_line_num.bind("Button-3",
       proc{|*x|
         _x = TkWinfo.pointerx(@text_line_num)
@@ -2020,6 +2083,24 @@ class AgEditor
     end
   end
 
+  def add_tag_bookmark(_line)
+      rel_line = file_line_to_text_line_num_line(_line)
+      if rel_line
+        i1 = "#{rel_line}.2"
+        i2 = i1+' lineend'
+        @text_line_num.tag_add('bookmark',i1,i2)
+      end
+  end
+
+  def remove_tag_bookmark(_line)
+      rel_line = file_line_to_text_line_num_line(_line)
+      if rel_line
+        i1 = "#{rel_line}.0"
+        i2 = i1+' lineend'
+        @text_line_num.tag_remove('bookmark',i1,i2)
+      end
+  end
+
   def reset_highlight(_from_row=nil)
     if _from_row &&  @highlighting
       invalidated_begin_zone= zone_of_row(_from_row)
@@ -2863,6 +2944,8 @@ class AgEditor
         if @line_numbers_visible
           # breakpoint
           b = @controller.breakpoint_lines_on_file(@file)
+          # bookmark
+          bm = @controller.bookmark_lines_on_file(@file)
           
           @text_line_num.delete('1.0','end')
           _rx, _ry, _width, _heigth = @text.bbox(line_begin_index);
@@ -2901,6 +2984,9 @@ class AgEditor
             if b.include?(j.to_s)
               add_tag_breakpoint(j)
             end
+            if bm.include?(j.to_s)
+              add_tag_bookmark(j)
+            end
           end
           if _ry && _ry < 0 
             @text_line_num.yview_scroll(_ry.abs+2,"pixels")
@@ -3474,6 +3560,7 @@ class AgMultiEditorView
   end
   
   def page_title(_name, _title=nil, _image=nil)
+    return nil if _name.nil? or _name.strip.length == 0
     @pages[_name]['text'] = _title if _title != nil
     @pages[_name]['image'] = _image if _image != nil
     title = _title
@@ -3819,9 +3906,6 @@ class CoderayHighlightScanner < HighlightScanner
         @i = nil
       end 
       tok = @tok
-      
-      #p tok
-      
       if tok[1]==:space && tok[0].include?("\n")
         row+=tok[0].count("\n")
         begin_gap = tok[0].split("\n")[-1]
@@ -3834,6 +3918,7 @@ class CoderayHighlightScanner < HighlightScanner
         toklength = tok[0].length
         t_begin="#{row}.#{col}"
         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]
@@ -3875,6 +3960,7 @@ class AgMultiEditor < ArcadiaExtPlus
       ArcadiaProblemEvent.new(self, "type"=>ArcadiaProblemEvent::DEPENDENCE_MISSING_TYPE,"title"=>Arcadia.text("ext.editor.e.ctags.title"), "detail"=>msg).go!
     end
     @breakpoints =Array.new
+    @bookmarks =Array.new
     @tabs_file =Hash.new
     @tabs_editor =Hash.new
     @raw_buffer_name = Hash.new 
@@ -3888,6 +3974,7 @@ class AgMultiEditor < ArcadiaExtPlus
     Arcadia.attach_listener(self, RunCmdEvent)
   # Arcadia.attach_listener(self, StartDebugEvent)
     Arcadia.attach_listener(self, FocusEvent)
+    Arcadia.attach_listener(self, BookmarkEvent)
   end
   
 #  def on_before_run_ruby_file(_event)
@@ -4056,9 +4143,16 @@ class AgMultiEditor < ArcadiaExtPlus
     end
     @last_active_instance_name = _event.name if _event.name == @name || exist_name?(_event.name)
   end
+  
+  def deduplicate
+    @main_frame.pages.each{|page|
+      main_instance.move_buffer_here(page)
+    }
+    super
+  end
 
-  def duplicate(_name=new_name)
-    instance = super(_name)    
+  def duplicate(_name, _dom)
+    instance = super(_name, _dom, false)    
     i_end = @buffer_menu.index('end')
     if i_end
       0.upto(i_end){|j|
@@ -4497,6 +4591,80 @@ class AgMultiEditor < ArcadiaExtPlus
 #    end
 #  end
 
+  def on_before_bookmark(_event)
+    _filename = _event.file
+    if _filename.nil? || _filename == "*CURR"
+      current_editor = self.raised
+      _event.persistent=true
+      if current_editor
+        if current_editor.file
+          _event.file=current_editor.file
+        else
+          _event.file=current_editor.create_temp_file
+          _event.id=current_editor.id
+          _event.persistent=false
+        end
+      end
+    else
+      current_editor = editor_of(_filename) 
+    end
+
+    if _event.from_row != nil && _event.to_row == nil
+      _event.to_row = _event.from_row 
+    elsif _event.from_row == nil && _event.to_row == nil && _event.row != nil
+      _event.from_row = _event.row
+      _event.to_row = _event.row
+    end
+    
+    if _event.range == nil
+      _event.range=0
+    end
+
+    if _event.from_row == nil && current_editor != nil
+      r_sel = current_editor.text.tag_ranges('sel')
+      if !r_sel.empty?
+        _event.from_row = r_sel[0][0].split('.')[0].to_i
+        _event.to_row = r_sel[r_sel.length - 1][1].split('.')[0].to_i
+      else
+        _event.from_row = current_editor.text.index('insert').split('.')[0].to_i
+        _event.to_row = _event.from_row 
+      end
+    end
+    
+    case _event
+      when SetBookmarkEvent
+        #set
+        if _event.persistent
+          @bookmarks << {:file=>_event.file,:from_line=>_event.from_row, :to_line=>_event.to_row}
+          _e = @tabs_editor[tab_file_name(_event.file)]
+        else
+          @bookmarks << {:file=>"__TMP__#{_event.id}",:from_line=>_event.from_row, :to_line=>_event.to_row}
+          _e = @editors[_event.id]
+        end
+        if _e
+          index_from = "#{_event.from_row}.0"
+          index_to = "#{_event.to_row}.0 lineend"
+          _event.content = _e.text.get(index_from, index_to)
+          _event.from_row.upto(_event.to_row) do |row|
+            _e.add_tag_bookmark(row) 
+          end
+        end
+      when UnsetBookmarkEvent
+        #unset
+        @bookmarks.delete_if{|b| (b[:file]==_event.file && b[:from_line]==_event.from_row)}
+        if _event.file && File.exists?(_event.file) 
+          _e = @tabs_editor[tab_file_name(_event.file)]
+        elsif _event.id
+          _e = @editors[_event.id]
+        end
+        _event.from_row.upto(_event.to_row) do |row|
+          _e.remove_tag_bookmark(row) if _e
+        end
+    end
+  end
+
+
+
   def on_before_step_debug(_event)
     debug_reset
   end
@@ -4597,7 +4765,8 @@ class AgMultiEditor < ArcadiaExtPlus
           elsif !editor_exist?(_event.file) && _event.last_row
             _index = _event.last_row.to_s+'.0' 
           end
-          if _event.kind_of?(OpenBufferTransientEvent) && conf('close-last-if-not-modified')=="yes"
+          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?
@@ -4608,6 +4777,10 @@ class AgMultiEditor < ArcadiaExtPlus
               @last_transient_file = _event.file
             else
               @last_transient_file = nil
+              _event.transient = false
+            end
+            else
+              _event.transient = false
             end
           end
           if _event.select_index.nil? 
@@ -4814,6 +4987,18 @@ class AgMultiEditor < ArcadiaExtPlus
     }
     return result
   end
+
+  def bookmark_lines_on_file(_file)
+    result = Array.new
+    @bookmarks.each{|value|
+      if value[:file]==_file
+        value[:from_line].upto(value[:to_line]) do |i|
+          result << i.to_s
+        end
+      end
+    }
+    return result
+  end
   
   def on_layout_raising_frame(_event)
     if _event.extension_name == "editor" && _event.frame_name=="editor_outline"
@@ -4861,46 +5046,46 @@ class AgMultiEditor < ArcadiaExtPlus
     self
   end
   
-  def bookmark_add(_file, _index)
-    if @bookmarks == nil
-      @bookmarks = Array.new
-      @bookmarks_index = - 1 
+  def chrono_bookmark_add(_file, _index)
+    if @chrono_bookmarks == nil
+      @chrono_bookmarks = Array.new
+      @chrono_bookmarks_index = - 1 
     else
-      _cur_file, _cur_index = @bookmarks[@bookmarks_index]
+      _cur_file, _cur_index = @chrono_bookmarks[@chrono_bookmarks_index]
       if _cur_file == _file && _cur_index == _index
         #@arcadia.outln('uguale ----> '+_file+':'+_index)
         return 
       end
-      @bookmarks = @bookmarks[0..@bookmarks_index]
+      @chrono_bookmarks = @chrono_bookmarks[0..@chrono_bookmarks_index]
     end
-    @bookmarks << [_file, _index]
-    @bookmarks_index = @bookmarks.length - 1
+    @chrono_bookmarks << [_file, _index]
+    @chrono_bookmarks_index = @chrono_bookmarks.length - 1
     #@arcadia.outln('add ----> '+_file+':'+_index)
   end
 
-  def bookmark_clear
-    @bookmarks.clear
-    @bookmarks_index = - 1
+  def chrono_bookmark_clear
+    @chrono_bookmarks.clear
+    @chrono_bookmarks_index = - 1
   end
 
-  def bookmark_next
-    return if @bookmarks == nil || @bookmarks_index >= @bookmarks.length - 1
-    bookmark_move(+1)
+  def chrono_bookmark_next
+    return if @chrono_bookmarks == nil || @chrono_bookmarks_index >= @chrono_bookmarks.length - 1
+    chrono_bookmark_move(+1)
   end
 
-  def bookmark_move(_n=0)
-    @bookmarks_index = @bookmarks_index + _n
+  def chrono_bookmark_move(_n=0)
+    @chrono_bookmarks_index = @chrono_bookmarks_index + _n
     #Tk.messageBox('message'=>@bookmarks_index.to_s)
-    _file, _index = @bookmarks[@bookmarks_index]
+    _file, _index = @chrono_bookmarks[@chrono_bookmarks_index]
     _line, _col = _index.split('.') if _index
     open_file(_file, _index)
     #openfile(@bookmarks[@bookmarks_index])
   end
 
 
-  def bookmark_prev
-    return if @bookmarks == nil || @bookmarks_index <= 0
-    bookmark_move(-1)
+  def chrono_bookmark_prev
+    return if @chrono_bookmarks == nil || @chrono_bookmarks_index <= 0
+    chrono_bookmark_move(-1)
   end
 
 
@@ -4921,7 +5106,7 @@ class AgMultiEditor < ArcadiaExtPlus
   end
 
   def unname_modified(_name)
-    return _name.gsub("(...)",'')
+    return (_name && _name.strip.length > 0) ? _name.gsub("(...)",'') : nil 
   end
   
   
@@ -5005,13 +5190,10 @@ class AgMultiEditor < ArcadiaExtPlus
     if @arcadia.layout.headed?
       if frame.root.title == frame.title || @last_frame_caption != _new_caption
         make_buffer_string(@main_frame.page(_name)['text']) if @main_frame.page(_name)
-        #@buffer_menu_button.configure('image'=>@main_frame.page(_name)['image']) if @main_frame.page(_name)
-#        frame.root.top_text(@main_frame.page(_name)['text'], @main_frame.page(_name)['image']) if @main_frame.page(_name)
         frame.root.top_text(top_text_string, @main_frame.page(_name)['image']) if @main_frame.page(_name)
         frame.root.top_text_hint(_new_caption)
         @last_frame_caption = _new_caption
       end  
-#      frame.root.save_caption(frame.name, @main_frame.page(_name)['text'], @main_frame.page(_name)['image'])
     end
   end
 
@@ -5474,12 +5656,21 @@ class AgMultiEditor < ArcadiaExtPlus
 #    @raw_buffer_name.delete_if {|key, value| value == _name }
     _index = @main_frame.index(_name)
     @main_frame.delete_page(_name, !_moved)
-    if !@main_frame.pages.empty? && is_raised
-      @main_frame.raise(@main_frame.pages[_index-1]) if TkWinfo.mapped?(@main_frame.root_frame)
-    else
-      frame.root.top_text_clear if TkWinfo.mapped?(frame.hinner_frame)
-      make_buffer_string("")
-      reset_status
+    if is_raised
+      if !@main_frame.pages.empty? # && is_raised
+        #@main_frame.raise(@main_frame.pages[_index-1]) if TkWinfo.mapped?(@main_frame.root_frame)
+        len = @main_frame.pages.length
+        if _index < len
+          ind = _index
+        else
+          ind = _index-1
+        end
+        @main_frame.raise(@main_frame.pages[ind]) if TkWinfo.mapped?(@main_frame.root_frame)
+      else
+        frame.root.top_text_clear if TkWinfo.mapped?(frame.hinner_frame)
+        make_buffer_string("")
+        reset_status
+      end
     end
   end
 
@@ -5752,7 +5943,7 @@ class Finder < Findview
       self.editor.text.tag_add('selected',_index,_index+' lineend')
       #self.editor.text.tag_add('sel', _index,_index+' lineend')
       self.editor.text.set_insert(_index)
-      @controller.bookmark_add(self.editor.file, _index)
+      @controller.chrono_bookmark_add(self.editor.file, _index)
     @goto_line_dialog.hide
     end
     #self.hide()
@@ -5823,7 +6014,7 @@ class Finder < Findview
         @idx1 =_index
                 @idx2 =_index_sel_end
         _found = true
-        @controller.bookmark_add(self.editor.file, _index)
+        @controller.chrono_bookmark_add(self.editor.file, _index)
       else
         _message = '"'+@e_what.value+'" not found'
         TkDialog2.new('message'=>_message, 'buttons'=>['Ok']).show()