arcadia 0.9.0 → 0.9.1

data/README

@@ -1,8 +1,8 @@
 = Arcadia Ide
-version 0.9.0
+version 0.9.1
 
 by Antonio Galeone
-on Sep 19, 2010
+on Oct 19, 2010
 
 
 == About
@@ -16,16 +16,16 @@ Some of Arcadia ide project features include:
 * Working on any platform where ruby and tcl-tk work.
 * Highly extensibility architecture.
 
-== In this release 0.9.0
+== In this release 0.9.1
     
 [Improvements]
 	commons: 
-	  - a lot of bug-fixing
-	  - new default theme = dark
-	  - auto-hide scrollbar and auto post menu
+	  - bug-fixing
 	new features:
-	  - added process monitor (possibility to kill running sub process)
-	  - added first release of a configurable runners management (possibility to choose runner for current file)
+	  editor 
+	    - added a button for close current tab
+	    - added menu button for quick file selection
+	    - "Edit/Prettify Current" now works
 
 == Dependencies
   - rubygems

data/conf/arcadia.conf

@@ -6,7 +6,7 @@
 
 #:::::::::::::::: layout    ::::::::::::::::::::::<begin>
 layout.splitter.length=5
-layout.exchange_panel_if_no_tabbed=false 
+layout.exchange_panel_if_no_tabbed=false
 arm::layout.splitter.length=10
 #layout.split=1,2
 #layout.split.1=0.0r70% 
@@ -143,6 +143,14 @@ toolbar.=>>>panel
 
 toolbarbutton.=>>>button
 toolbarbutton.relief=flat
+toolbarbutton.borderwidth=0
+
+titletoolbarbutton.=>>>toolbarbutton
+titletoolbarbutton.background=>>>titlelabel.background
+titletoolbarbutton.foreground=>>>titlelabel.foreground
+titletoolbarbutton.activebackground=>>>titlelabel.activebackground
+titletoolbarbutton.activeforeground=>>>titlelabel.activeforeground
+
 
 label.background=>>>background
 label.foreground=>>>foreground

data/conf/arcadia.res.rb

@@ -359,16 +359,32 @@ R0lGODlhCQAJAJEAAImCejYtJE1CN////ywAAAAACQAJAAACF4yPoismAwQY
 LUgIq5pR8+xkk8YoyBkUADs=
 EOS
 
-
-CLOSE_PAGE_GIF=<<EOS
-R0lGODlhYQANAIQaAAAAADU1FTo6Gz8/IEFBI0NDJkhIK0pKLk1NMVRUOYaG
-c4iIdYuLeI2NfY+PfpCQf5mZiZubjK+vo7W1q7e3sMjIwM/PyNTUz9vb193d
-2v///////////////////////yH5BAEAAB8ALAAAAABhAA0AAAXA4CeOZGme
-aKqubKsySCDPdG3feK7v/I0oJksBgnEZj8hkCQMZVEgHiXJKrZ4mhJGjUQJ4
-RQCTNwwel7+k8Zf8CZvb75Fajoaj5yMIQ5S4pOVtXYBsYCtsh4WBKIiMgicZ
-ByJZf5SAiW9qhJZ2d3SanGdrdpyaAnx+m26OioOGqYmVsLCqhZ8ikCIOD113
-eJhxeKuMa3Gbs6HIIxELI1FWz9BIEwMkFgMQFNHa2yQUEU4mDAY95OXm5zoG
-QNzs7SohADs=
+CLOSE_DOCUMENT_GIF=<<EOS
+R0lGODlhEAAQAPcAAPn///v//wc7h/f77fz////48gBEkAo8g/n/0f/98P/+
+8vrHbPbNj/j/0fLTdv//9gJBhgE8igBChAA/ivjOePjOevj/1v3/lP/83gI9
+ef//5fn88fb6mfb6m/f+//3LcvrNcPf///jPd/vId//wy//6//769/753P//
++//69fv9+Pr2kgs/eP/1o//5xfHTe/3/2v/Hd//22/36x//87fbTgf//yP//
+7v/5y//+1ff1xP35yvX5i//SigU+g//rxP/Qfv7owfvQi/r90PX65P/89f//
+4gQ9iv/60Pvxtv/14v/3iwA+lQZAiv784wRCj/n//ff/rQJFjP/KhP/32Pv7
+s/3IePn94v/98fb+6QNBjvn7kPz/v/bTj/fNd/f/+v/2wfDZc/jNfgJCiv/z
+ifnMiPXNhf/JfPjJcfT5///2/wU7gwZCfv7//f/RgwA7gfr//P3JgPb+8/3/
+rQFDjf/2l/vlswVBh//Piv//8v7/9vj//QA+iP//xfnNhP/40QU/kP/xyQY9
+ffn+1frhuf/53v76//3+///33vr///r/+Qk6ff/6yg48iQBHlfrcpv/7vvv+
+//r/8f/6ov/3+v//sPH54QBChwY7ifr0nP331fXPev/wmvPIevXPbvj95/fJ
+cQJGhf/Jb/761PjgsPz5/wY/hv30j/n51/b+//nOgAA+h//Pi/j7qv/8/wA/
+ggBAi/jiuf//5gJEkP/5s/nNhgBAhv/6wP/9+v/00gJBkf//4fzUfP/+y//9
+oPXQdQ02eP383vv8///xkv3+3/r+7/z26ABBgwFBmQc9eww+gwE7hP793/76
+7wVAhv78sf72ofrHdP/Pe/zhtP//3Qw9ivLbqf/Pg/v7sffIdv39///7//v8
+sPj6/wg9f/n13P/7rQJCmQY9j//5/wJAi/v5+vv54v/KfwAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj/AI0R6iEqmpBz
+CBMi/KEklrVAhb4xM0exIsUuQa4hUfHlkBoj5QokaAZgmyREZRjkIkDuSYgs
+CmQNgMNmggkZtcyQKDXmEjAAWIrlgZChCQAqfljpKKKoGrJkhgAIUHYnAI0/
+ql4wQrABBaw1fJzpEnBjwC4cYvBwmWHDkh4psySYCvCJ2igXFayA6VVFkzZv
+gkIdK+EEw5BbFEBga3CCwCtxAuhgOhCASB9IItxA09DGVqNlqXC9cbQoUg5w
+DmpwSwMowipXg1Cl0GKAhZwkXjbNecDEx54dzyoFgxLuSCJaH6b4slCgG7FW
+UVpMgiFs3BUyvEh54nShwzAOS7asG+BRJ9OpMHY8PIoBKpu0OCPOdALyC82C
+aZQCAgA7
 EOS
 
 COPY_GIF=<<EOS
@@ -620,6 +636,24 @@ BBIqXAiAIMKFCQFIbHgQIkSKAh9exFjRokKOGj2CnEiSpMOSEw0OCPlRAMeV
 CQPIDMDQYcyZMiPaJIAzJwGQN3Hq7Ojxp8qjAwMCADs=
 EOS
 
+DOCUMENT_COMBO_GIF=<<EOS
+R0lGODlhEAAQAMZcADRUbihZhENYaDpbeTBdhy9fkDRfhzFhkDhghzVlkj1q
+k41+QI1/RY2BR42CTY2CTo2CT42EVI2FVo2GWI2GXo2HX42HYI2JZY2JaI2K
+Z42LbY2Lb42Mb42NdY2Ndo2Od0iZ342Pe42QfY2QgI2Rgkuc4o2ShVCh55en
+soHR9//MV//OWqrX///PXv/PYP/QY//SZv/SaP/Sa//Tbv/UdP/Vc//Wdv/Y
+f//ZgP/ag//cjP/djf/ekP/gmP/hmv/hnP/kpv/lpf/lqP/mqf/nrf/osP/o
+sf/ps//ptP/qt//ru//svf/svv/txP/uw//uxf/vyP/wy//wzP/xz//z1v/0
+2v/13f/24f/35P/45//56//78v//////////////////////////////////
+////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////yH+EUNyZWF0
+ZWQgd2l0aCBHSU1QACH5BAEKAH8ALAAAAAAQABAAAAeegH+Cg4SFhQADCIoG
+AwCGgwopLCwnBY+ECSUgB5eFBAGXAqKjKCijo4ICW1pZV1ZVVFNSUE9MAqla
+JiMhHRoXFBEODEm3fwJaUU1KRUE9Ojc1MMSpWCQiHhsZFRIPDQtFxQJXTkpG
+QD47ODQxLUThVSIfHBgWExAzLytA4VdLR0I/eOSwIcOFCnCprhRZWATJwiFE
+gOxLdariqU6XAgEAOw==
+EOS
+
+
 EXIT_GIF=<<EOS
 R0lGODlhFAAUAOelAOlIDulLE+ldLPGUcvaxmPjKuvvk3OA5BOA6BeE+COhD
 CuBCDeFDD+BHFeBIGOBLHOZSI+hWJOZYLOhcLehjN+6HZfCNa++Pb/GScfjH
@@ -1769,4 +1803,4 @@ owSIBIP2gGyQ5wSUKySY9PgQYgAhRIQM/dkAKEWQMCWKzDgBA8GhQw8FVSDE
 YskZFVJ0uDABwI8gRH0OOShk4kkWG0R2TC7w8BAgRBkAdZGTJYaUJT9GBFhT
 57CdBzOUnEGzpcsRGhoAyOCCGFGZKDlEeNDQYUIFChFGFQR583AQoDZorCAB
 ouMGDyxZ3CAKCAA7
-EOS
+EOS

data/conf/theme-dark.conf

@@ -79,8 +79,9 @@ hightlight.global_variable.foreground=#db66ca
 hightlight.constant.foreground=#bdc175
 hightlight.tag.foreground=#69a8d9
 hightlight.selected.background=#133e5e
-hightlight.sel.background=#160504
+hightlight.sel.background=#660000
 hightlight.sel.foreground=white
+hightlight.sel.borderwidth=0
 hightlight.link.foreground=orange
 #hightlight.sel.foreground=white
 

data/conf/theme-dark.res.rb

@@ -8,13 +8,30 @@
 #EOS
 
 W_MAX_GIF[0..-1]=<<EOS
-R0lGODlhCwAJAIAAAP///////yH5BAEKAAEALAAAAAALAAkAAAITDI4Ylrmw
-4puSwmpovXdryTVKAQA7
+R0lGODlhEAAQAKUlAGYAAJkAAP8TE4JPHP8qKoVSH4hVIotYJY1aJ5BdKpJf
+LJRhLpZjMJhlMv9FRZlmM/9eXv95ec2bOM+fPtGiRdKmTf+UlNWqVdevX9m0
+ady5c/+vr9++ff+zs+HEif+8vOTJlOfPnv/Kyv/Z2f/o6P//////////////
+////////////////////////////////////////////////////////////
+/////////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1Q
+ACH5BAEKAD8ALAAAAAAQABAAAAZiwJ9wSCwahYHA0Rj4bADLYUAUgTigy8DI
+UnUQsMUAqcO1EgRgYpJqBaTD7Gv0N+2+4fb5z+0+Pv5LBgUDQg8hfw0MCwoJ
+CAcGEoQ/hiAeHBoZGBcVFBORhX8PiYuNj4N6RkEAOw==
 EOS
 
 W_NORM_GIF[0..-1]=<<EOS
-R0lGODlhCwAJAIAAAP///////yH5BAEKAAEALAAAAAALAAkAAAIUjIFpm7oB
-XjwtTlghk2j7r3HNUwAAOw==
+R0lGODlhEAAQAOYAAABHvwBFqABBpgBQvQBLsghk0whewwhUsgpcwwpZvQ5g
+whBo0BNkyABZuwdfww5nzxJz3hFqyRx75BxwzgBpzwpz2hFryheA7RNqwBp1
+0CZ81jCO7ne7/32+/obC/4vE/47H/4/H/5rM/6DP/6DQ/wp11gluywpy0g16
+3RNxyxRyyBZ0zBx70yWD2iuH2z2U5Euq/1Cr/1Cg6WKy/267/2+4/HG7/3O9
+/3m//3m694LC/4PE/4fF/47I/47J/5XL/5nN/5vO/53R/6rX/7Xb/whyzAlx
+yQpyyBaD3Bx+0Cqf/y2f/yiG1yuJ2S6I10Cn/zqU4TuR3Eyg6lyz/3zD/4bI
+/4bJ/4vL/5jP/6rY/w57zheI3xeE2yOi/yaP4iiK2HnG/7bi/////wAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAGIA
+LAAAAAAQABAAAAeHgGKCg4SFhoeIhAcKDASJghNVV1RgGwCIGlYxME9LShKD
+JSiCKzczUxkGDhBdAoJOQ2IqNTY0KYQXCIJJWVFNOzguhQUPgkZYQR06HCaF
+AwuCRzkgHjxMDRSFCYJFMj8fIkBCYS+DEQGDXiMhPT5SLRWDFhiDW0QkUEgn
+hSyEXF9aHgkc+CgQADs=
 EOS
 
 #TREE_NODE_CLASS_GIF[0..-1]=<<EOS

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

@@ -6,19 +6,19 @@ frames.names=editor,editor_outline
 active=yes
 require=ext/ae-editor/ae-editor
 class=AgMultiEditor
-#gems=coderay
-gems=coderay,rdp-rbeautify
-gems.rdp-rbeautify.repository=http://gems.github.com
-gems.rdp-rbeautify.events=PrettifyTextEvent
+gems=coderay
+#gems=coderay,rdp-rbeautify
+#gems.rdp-rbeautify.repository=http://gems.github.com
+#gems.rdp-rbeautify.events=PrettifyTextEvent
 tabs=0.5c left
 # to use tab key set tab-replace-width-space=0
 tab-replace-width-space=2
-
+line-numbers=yes
 #tabs
 #tabs.font=courier 11
 #freebsd::tabs.font=courier 12
 #win::tabs.font={Courier New} 9
-##tabs.side=bottom
+#tabs.side=bottom
 tabs.side=top
 complete-code=yes
 close-last-if-not-modified=yes
@@ -45,7 +45,6 @@ max-file-open=3 #todo
 #hightlight.goto.color.foreground=blue
 #hightlight.goto.color.background=yellow
 #+--------------------------------------------------
-#+--------------------------------------------------
 hightlight.sel.foreground=>>>hightlight.sel.foreground
 hightlight.sel.background=>>>hightlight.sel.background
 hightlight.sel.borderwidth=>>>hightlight.sel.borderwidth
@@ -66,75 +65,20 @@ hightlight.spaces.relief=>>>hightlight.4.relief
 #hightlight.debug.relief=>>>hightlight.16.relief
 
 
-#color.background=#FFFFFF
-#color.foreground=#7F7F7F
-#color.insertbackground=#ff8000
-#hightlight.keyword.foreground=#00007F
-#hightlight.keyword.style=bold
-#hightlight.method_name.foreground=#007F7F
-#hightlight.method_name.style=bold
-#hightlight.class_name.foreground=#0000FF
-#hightlight.class_name.style=bold
-#hightlight.module_name.foreground=#0000FF
-#hightlight.module_name.style=bold
-#hightlight.instance_variable.color.foreground=#7F7F7F
-#hightlight.instance_variable.style=bold
-#hightlight.comment.color.foreground=#007F00
-#hightlight.string.color.foreground=#7F007F
-#hightlight.number.color.foreground=#007F7F
-##hightlight.capitalize.color.foreground=#0000FF
-#hightlight.operator.foreground=#000000
-#hightlight.operator.style=bold
-#hightlight.sel.foreground=black
-#hightlight.sel.background=#68f914
-#hightlight.sel.borderwidth=1
-#hightlight.sel.relief=raised
-#hightlight.debug.foreground=black
-#hightlight.debug.background=#b3c1d9
-#hightlight.debug.borderwidth=2
-#hightlight.debug.relief=groove
-##hightlight.goto.color.foreground=blue
-#hightlight.selected.background=yellow
-#hightlight.tabs.foreground=black
-#hightlight.tabs.background=#b1cfba
-#hightlight.tabs.borderwidth=1
-#hightlight.tabs.relief=raised
-#hightlight.spaces.foreground=black
-#hightlight.spaces.background=#d9f42b
-#hightlight.spaces.borderwidth=1
-#hightlight.spaces.relief=raised
-#+--------------------------------------------------
-
-
-# line number 
-#line_number_panel.color.background=#6e6e6e
-#line_number_panel.color.foreground=white
-
-#line_number_panel.color.background=#e1e1e1
-##line_number_panel.color.background=#FFFFFF
-#line_number_panel.color.foreground=#333333
-#
-#
-# tree explorer 
-#explorer_panel.tree.color.background=#ffffff
-#explorer_panel.tree.color.foreground=white
-##explorer_panel.tabs.side=bottom
 explorer_panel.tabs.side=top
-#
-#explorer_panel.tree.font=courier 11
-#freebsd::explorer_panel.tree.font=courier 12
-#win::explorer_panel.tree.font={Courier New} 9
-#explorer_panel.tree.class.color.foreground=#a42019
-#explorer_panel.tree.class.font=times 10 bold
-#win::explorer_panel.tree.class.font=times 10 bold
-#explorer_panel.tree.def.color.foreground=blue
-#explorer_panel.tree.def.font=times 10
-#win::explorer_panel.tree.def.font=times 10
-#explorer_panel.tree.module.color.foreground=#1b691e
-#explorer_panel.tree.module.font=times 8 bold
-#win::explorer_panel.tree.module.font={Courier New} 9 bold
 
 #:::::::::::::::: Editor group    ::::::::::::::::::::::<end>
 popup.bind.shortcut=Button-3
 arm::popup.bind.shortcut=F4
-#keybinding.Control-Shift-KeyPress[Y]=ActionEvent.new(self,'action'=>close_raised)
+#keybinding.Control-Shift-KeyPress[Y]=ActionEvent.new(self,'action'=>close_raised)
+
+# menu items
+user_menu.contexts=View
+user_menu.View.context_path=/
+user_menu.View=line_number
+user_menu.View.line_number.hint=Show/Hide line numbers
+user_menu.View.line_number.caption=Show/Hide line numbers
+user_menu.View.line_number.underline=1
+user_menu.View.line_number.action=ActionEvent.new(self,'action'=>show_hide_current_line_numbers)
+
+#:::::::::::::::::::::::::::::::::::::::::::::::::<end>

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

@@ -10,6 +10,7 @@ require 'tktext'
 require "#{Dir.pwd}/lib/a-tkcommons"
 #require 'lib/a-commons' 
 require "#{Dir.pwd}/lib/a-core"
+require "#{Dir.pwd}/ext/ae-editor/lib/rbeautify"
 
 class TreeNode
   attr_reader :sons
@@ -34,15 +35,99 @@ end
 
 class SourceStructure
   attr_reader :root
+  
+  def initialize
+    @root = TreeNode.new(nil, 'KRoot'){|_node|
+      _node.rif= 'root'
+      _node.label=''
+    }
+  end
+  
+  def node_by_line(_from_node, _line)
+    _found_node = nil
+    _begin = _from_node.rif.to_i
+    _end = _from_node.rif_end.to_i
+    if _line.to_i <= _end && _line.to_i >= _begin
+      _found_node = _from_node
+    else 
+      _sons = _from_node.sons
+      for inode in 0.._sons.length - 1
+        _son = _sons[inode]
+        _found_node = node_by_line(_son, _line)
+        break if _found_node
+      end
+    end
+    return _found_node
+  end
+  
+  def deep_node_by_line(_from_node, _line, _found_node=nil)
+    _begin = _from_node.rif.to_i
+    _end = _from_node.rif_end.to_i
+    if _line.to_i <= _end && _line.to_i >= _begin
+      _found_node = _from_node
+    end
+    _sons = _from_node.sons
+    for inode in 0.._sons.length - 1
+      _son = _sons[inode]
+      _found_node = deep_node_by_line(_son, _line, _found_node)
+    end
+    return _found_node
+  end
+  
+  def class_node_by_line(_line)
+    line_node = node_by_line(@root, _line)
+    class_node = line_node
+    while class_node != nil && class_node.kind != "KClass"
+      class_node = class_node.parent
+    end
+    return class_node
+  end
+  
+end
+
+class CtagsSourceStructure < SourceStructure
+  def initialize(_file)
+    super()
+    @file = _file
+    build_structure
+  end
+
+  def build_structure
+    output = ctags
+    output.each {|line|
+      p line.split("\t")
+    }
+  end
+  
+  def ctags
+    _cmd_ = "|ctags -x -u #{@file}"
+    to_ret = ''
+    open(_cmd_, "r"){|f| 
+      to_ret = f.readlines
+    }
+    to_ret
+  end
+end
+
+
+
+class RubySourceStructure < SourceStructure
   attr_reader :injected_row
+
   def initialize(_source)
+    super()
+    parse_source(_source)
+  end
+
+
+  def parse_source(_source)
     _row = 1
     _liv = 0
     _livs = Array.new
-    @root = TreeNode.new(nil, 'KRoot'){|_node|
-      _node.rif= 'root'
-      _node.label=''
-    }
+#    @root = TreeNode.new(nil, 'KRoot'){|_node|
+#      _node.rif= 'root'
+#      _node.label=''
+#    }
     _livs[_liv]=@root
     _source.each_line{|line|
       line = "\s"+line.split("#")[0]+"\s"
@@ -134,7 +219,8 @@ class SourceStructure
       _row = _row +1
     }
   end
-  
+
+
   def scheletor_from_node(_node, _source='', _injected_source='', _injected_class='')
     _hinner_source = ''
     #_sons = _node.sons.sort
@@ -163,59 +249,17 @@ class SourceStructure
     _source = "#{_source}end\n" if _node.kind == 'KClass' || _node.kind == 'KModule'
     _source
   end
-  
-  
 
-  def node_by_line(_from_node, _line)
-    _found_node = nil
-    _begin = _from_node.rif.to_i
-    _end = _from_node.rif_end.to_i
-    if _line.to_i <= _end && _line.to_i >= _begin
-      _found_node = _from_node
-    else 
-      _sons = _from_node.sons
-      for inode in 0.._sons.length - 1
-        _son = _sons[inode]
-        _found_node = node_by_line(_son, _line)
-        break if _found_node
-      end
-    end
-    return _found_node
-  end
-  
-  def deep_node_by_line(_from_node, _line, _found_node=nil)
-    _begin = _from_node.rif.to_i
-    _end = _from_node.rif_end.to_i
-    if _line.to_i <= _end && _line.to_i >= _begin
-      _found_node = _from_node
-    end
-    _sons = _from_node.sons
-    for inode in 0.._sons.length - 1
-      _son = _sons[inode]
-      _found_node = deep_node_by_line(_son, _line, _found_node)
-    end
-    return _found_node
-  end
-  
-  def class_node_by_line(_line)
-    line_node = node_by_line(@root, _line)
-    class_node = line_node
-    while class_node != nil && class_node.kind != "KClass"
-      class_node = class_node.parent
-    end
-    return class_node
-  end
-  
+
   def classies
   end
   def modules
   end
   def class_methods(_class)
   end
-  
-
 end
 
+
 class SafeCompleteCode
   attr_reader :modified_row, :modified_col
   attr_reader :filter
@@ -224,7 +268,7 @@ class SafeCompleteCode
     @file = _file
     @row = _row.to_i
     @col = _col.to_i
-    @ss = SourceStructure.new(_source)
+    @ss = RubySourceStructure.new(_source)
     @filter=''
     @words = Array.new
     process_source
@@ -856,7 +900,8 @@ class AgEditorOutline
     #(re)build tree
     _txt = @editor.text.get('1.0','end')
     #@root = build_tree_from_source(_txt)
-    @ss = SourceStructure.new(_txt)
+    #CtagsSourceStructure.new(@editor.file)
+    @ss = RubySourceStructure.new(_txt)
     #@root = @ss.root
     @selected = nil
     build_tree_from_node(@ss.root, _label_sel)
@@ -916,12 +961,37 @@ class AgEditor
     @loading=false
     @tabs_show = false
     @spaces_show = false
+    @line_numbers_visible = @controller.conf('line-numbers') == 'yes'
   end
   
   def modified_from_opening?
     @modified_from_opening
   end
   
+  def show_line_numbers
+    if !@line_numbers_visible
+      #@fm1.hide_right
+      @fm1.show_left
+      @line_numbers_visible = true
+      do_line_update
+    end
+  end
+  
+  def hide_line_numbers
+    if @line_numbers_visible
+      @fm1.hide_left
+      @line_numbers_visible = false
+    end
+  end
+  
+  def show_hide_line_numbers
+    if @line_numbers_visible
+      hide_line_numbers
+    else
+      show_line_numbers
+    end
+  end
+  
   def xy_insert
     _index_now = @text.index('insert')
     _rx, _ry, _width, _heigth = @text.bbox(_index_now);
@@ -946,15 +1016,24 @@ class AgEditor
       padx 0
       tabs $arcadia['conf']['editor.tabs']
     }
-
+    _self_editor = self
     class << @text
+      attr_accessor :editor
       def tag_adds(tag, *args)
         tk_send_without_enc('tag', 'add', _get_eval_enc_str(tag), 
                             *args.flatten)
         self
       end
+      
+      def do_upper_case
+        @editor.do_upper_case if @editor
+      end
+    
+      def do_lower_case
+        @editor.do_lower_case if @editor
+      end
     end
-
+    @text.editor = self
     #do_tag_configure_global('debug')
     @text.tag_configure('eval','foreground' => 'yellow', 'background' =>'red','borderwidth'=>1, 'relief'=>'raised')
     @text.tag_configure('errline','borderwidth'=>1, 'relief'=>'groove')
@@ -1976,7 +2055,6 @@ class AgEditor
       :font => "#{Arcadia.conf('menu.font')} bold",
       :hidemargin => true
     )
-
     
     #Arcadia.instance.main_menu.update_style(@pop_up)
     @pop_up.insert('end',
@@ -2226,32 +2304,14 @@ class AgEditor
       :command,
       :label=>'Selection to uppercase',
       :hidemargin => false,
-      :command=> proc{
-        _r = @text.tag_ranges('sel')
-        if _r.length>0
-          _text=@text.get(_r[0][0],_r[0][1])
-          if _text.length > 0
-            @text.delete(_r[0][0],_r[0][1])
-            @text.insert(_r[0][0],_text.upcase)
-          end
-        end
-      }
+      :command=> proc{do_upper_case}
     )
 
     _sub_code.insert('end',
       :command,
       :label=>'Selection to downcase',
       :hidemargin => false,
-      :command=> proc{
-        _r = @text.tag_ranges('sel')
-        if _r.length>0
-          _text=@text.get(_r[0][0],_r[0][1])
-          if _text.length > 0
-            @text.delete(_r[0][0],_r[0][1])
-            @text.insert(_r[0][0],_text.downcase)
-          end
-        end
-      }
+      :command=> proc{do_lower_case}
     )
 
 
@@ -2313,8 +2373,8 @@ class AgEditor
       proc{|x,y|
         _x = TkWinfo.pointerx(@text)
         _y = TkWinfo.pointery(@text)
-        @pop_up.entryconfigure(1, 'label'=>File.basename(@file)) if @file
-        #@pop_up.entryconfigure(0, 'label'=>File.basename(@file)) if @file
+        #@pop_up.entryconfigure(1, 'label'=>File.basename(@file)) if @file
+        @pop_up.entryconfigure(0, 'label'=>File.basename(@file)) if @file
         @pop_up.popup(_x,_y)
       },
     "%x %y")
@@ -2342,7 +2402,55 @@ class AgEditor
   def text_value
     return @text.value
   end
+  
+  def text_selected
+    _text = ''
+    _r = @text.tag_ranges('sel')
+    if _r.length>0
+      _text=@text.get(_r[0][0],_r[0][1])
+    end
+    _text
+  end
+  
+  def text_replace_selected_with(_text_for_replace='')
+    _r = @text.tag_ranges('sel')
+    if _r.length>0
+      bl = _r[0][0].split('.')[0].to_i
+      @text.delete(_r[0][0],_r[0][1])
+      @text.insert(_r[0][0],_text_for_replace)
+      el = @text.index('insert').split('.')[0].to_i
+      if highlighting
+        reset_highlight(bl)
+        rehighlightlines(bl,el,true)
+      end
+    end
+  end
+
+  def text_replace_value_with(_text_for_replace='')
+    pos_index = @text.index('insert') 
+    @text.delete('1.0','end')
+    reset_highlight if @highlighting
+    @text.insert('end',_text_for_replace)
+    do_line_update
+    @text.see(pos_index)
+    @text.set_insert(pos_index)
+    check_modify
+  end
+  
+  def do_upper_case
+    _text = text_selected
+    if _text.length > 0
+      text_replace_selected_with(_text.upcase)
+    end
+  end
 
+  def do_lower_case
+    _text = text_selected
+    if _text.length > 0
+      text_replace_selected_with(_text.downcase)
+    end
+  end
+  
   # vertical scrollbar : ON/OFF
   def vscroll(mode)
     st = TkGrid.info(@v_scroll)
@@ -2611,8 +2719,6 @@ class AgEditor
         line_begin = line_begin_index.split('.')[0].to_i
         line_end = @text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1
         wrap_on = @text.cget("wrap") != 'none'
-        # breakpoint
-        b = @controller.breakpoint_lines_on_file(@file)
         if @highlighting
           _zone_begin = ((line_begin) / @highlight_zone_length).to_i + 1
           _zone_end = ((line_end) / @highlight_zone_length).to_i + 1
@@ -2628,52 +2734,55 @@ class AgEditor
           @last_zone_begin = _zone_begin
           @last_zone_end = _zone_end
         end
-        @text_line_num.delete('1.0','end')
-        
-
-        _rx, _ry, _width, _heigth = @text.bbox(line_begin_index);
-        
-        if _ry && _ry < 0 
-          real_line_end = line_end + 1
-        else
-          real_line_end = line_end
-        end
-        #@fm1
-        _tags = Array.new
-        for j in line_begin...real_line_end
-          nline = j.to_s.rjust(line_end.to_s.length+2)
-          _index = @text_line_num.index('end')
-          _tags.clear
-          if @highlighting && @is_line_bold[j]
-            _tags << 'bold_case'
+        if @line_numbers_visible
+          # breakpoint
+          b = @controller.breakpoint_lines_on_file(@file)
+          
+          @text_line_num.delete('1.0','end')
+          _rx, _ry, _width, _heigth = @text.bbox(line_begin_index);
+          
+          if _ry && _ry < 0 
+            real_line_end = line_end + 1
           else
-            _tags << 'normal_case'
+            real_line_end = line_end
           end
-          
-          if wrap_on
-            w_rx_b, w_ry_b, w_width_b, w_heigth_b = @text.bbox("#{(j).to_s}.0");
-            w_rx_e, w_ry_e, w_width_e, w_heigth_e = @text.bbox("#{(j).to_s}.0 lineend");
-            if w_ry_e && w_ry_b 
-              delta = w_ry_e - w_ry_b
-              if delta > 1   
-                _tag = "wrap_case_#{j}"
-                @text_line_num.tag_configure(_tag, 'spacing3'=>delta)  
-                _tags << _tag
+          #@fm1
+          _tags = Array.new
+          for j in line_begin...real_line_end
+            nline = j.to_s.rjust(line_end.to_s.length+2)
+            _index = @text_line_num.index('end')
+            _tags.clear
+            if @highlighting && @is_line_bold[j]
+              _tags << 'bold_case'
+            else
+              _tags << 'normal_case'
+            end
+            
+            if wrap_on
+              w_rx_b, w_ry_b, w_width_b, w_heigth_b = @text.bbox("#{(j).to_s}.0");
+              w_rx_e, w_ry_e, w_width_e, w_heigth_e = @text.bbox("#{(j).to_s}.0 lineend");
+              if w_ry_e && w_ry_b 
+                delta = w_ry_e - w_ry_b
+                if delta > 1   
+                  _tag = "wrap_case_#{j}"
+                  @text_line_num.tag_configure(_tag, 'spacing3'=>delta)  
+                  _tags << _tag
+                end
               end
             end
+  
+            @text_line_num.insert(_index, "#{nline}\n",_tags)
+            if b.include?(j.to_s)
+              add_tag_breakpoint(j)
+            end
           end
-
-          @text_line_num.insert(_index, "#{nline}\n",_tags)
-          if b.include?(j.to_s)
-            add_tag_breakpoint(j)
+          if _ry && _ry < 0 
+            @text_line_num.yview_scroll(_ry.abs+2,"pixels")
           end
-        end
-        if _ry && _ry < 0 
-          @text_line_num.yview_scroll(_ry.abs+2,"pixels")
+          resize_line_num
         end
       end
       refresh_outline if Tk.focus==@text
-      resize_line_num
   end
 
   def resize_line_num
@@ -2924,7 +3033,7 @@ class AgEditor
     @text.set_insert(pos_index)
   end
 
-  def init_editing(_ext='rb', _w1=150, _w2=60)
+  def init_editing(_ext='rb')
     @is_ruby = _ext=='rb'|| _ext=='rbw'
     @classbrowsing = @is_ruby
     @lang_hash = @controller.languages_hash(_ext)
@@ -2937,7 +3046,7 @@ class AgEditor
 #    else
 #      @fm1 = AGTkVSplittedFrames.new(@page_frame,_w2)
 #    end
-    @fm1 = AGTkVSplittedFrames.new(@page_frame,@page_frame,_w2)
+    @fm1 = AGTkVSplittedFrames.new(@page_frame,@page_frame,0,5,false,false)
     @fm1.splitter_frame.configure('relief'=>'flat')
     initialize_text(@fm1.right_frame)
     initialize_highlight(_ext)
@@ -2950,7 +3059,7 @@ class AgEditor
       @outline.show
     else
       @outline=AgEditorOutline.new(self,@controller.frame(1).hinner_frame,@controller.outline_bar)
-      @outline.build_tree
+      refresh
     end
   end
 
@@ -3325,8 +3434,60 @@ class AgMultiEditor < ArcadiaExt
     @outline_bar = AgEditorOutlineToolbar.new(self.frame(1).hinner_frame, self)
     create_find # this is the "find within current file" one
     pop_up_menu
-    
-    #self.open_last_files
+    @buffer_menu = frame.root.add_menu_button(self.name, 'files', DOCUMENT_COMBO_GIF, 'right', {'relief'=>:raised, 'borderwidth'=>1}).cget('menu')
+    frame.root.add_sep(self.name, 1)
+    frame.root.add_button(
+      self.name,
+      'close current',
+      proc{Arcadia.process_event(CloseCurrentTabEvent.new(self))}, 
+      CLOSE_DOCUMENT_GIF)
+  end
+
+  def add_buffer_menu_item(_filename, is_file=true)
+    index = 'end'
+    i_end = @buffer_menu.index('end')
+    if i_end
+      0.upto(i_end){|j|
+        type = @buffer_menu.menutype(j)
+        if type != 'separator'
+          label = @buffer_menu.entrycget(j,'label')
+          if label > _filename
+            index=j
+            break
+          end
+        end
+      }
+    end
+
+    @buffer_menu.insert(index,:command,
+          :label=>_filename,
+          :image=> Arcadia.file_icon(_filename),
+          :compound=>'left',
+          :command=>proc{
+            if is_file
+              open_file(_filename)
+            else
+              open_buffer(tab_name(_filename))             
+            end
+          },
+          :hidemargin => true
+    )
+  end
+
+  def del_buffer_menu_item(_file)
+    to_del = -1
+    i_end = @buffer_menu.index('end')
+    0.upto(i_end){|j|
+      type = @buffer_menu.menutype(j)
+      if type != 'separator'
+        label = @buffer_menu.entrycget(j,'label')
+        if label == _file
+          to_del=j
+          break
+        end
+      end
+    }
+    @buffer_menu.delete(to_del) if to_del != -1
   end
 
   def on_after_build(_event)
@@ -3643,11 +3804,24 @@ class AgMultiEditor < ArcadiaExt
       when CloseCurrentTabEvent
          close_raised
       when PrettifyTextEvent
-        require 'rbeautify.rb' # gem
-        self.raised.save # so we can beautify it kludgely here...
-        path = raised.file
-        RBeautify.beautify_file(path)
-        self.raised.reload
+#        require 'rbeautify.rb' # gem
+#        self.raised.save # so we can beautify it kludgely here...
+#        path = raised.file
+#        RBeautify.beautify_file(path)
+#        self.raised.reload
+
+        rbea = RBeautify.beautify_string(raised.text_value_lines)
+        if rbea && rbea.length >1 && !rbea[1]
+          raised.text_replace_value_with(rbea[0])
+        else
+          msg = "Problems in prettify #{raised.tab_title}"
+          Arcadia.dialog(self, 
+            'type'=>'ok', 
+            'title' => "(Arcadia) code prettify", 
+            'msg'=>msg,
+            'level'=>'error')
+        end
+        
       when MoveBufferEvent
         if _event.old_file && _event.new_file && editor_exist?(_event.old_file)
           #close_file(_event.old_file)
@@ -3671,6 +3845,11 @@ class AgMultiEditor < ArcadiaExt
     _e.find if _e
   end
 
+  def show_hide_current_line_numbers
+    _e = raised
+    _e.show_hide_line_numbers if _e
+  end
+
   def on_finalize(_event)
     @batch_files = true
     _files =''
@@ -3856,6 +4035,10 @@ class AgMultiEditor < ArcadiaExt
     @main_frame.enb.itemcget(page_name(_tab), 'text')
   end
 
+  def tab_title_by_tab_name(_tab_name)
+    @main_frame.enb.itemcget(_tab_name, 'text')
+  end
+
   def page_name(_page_frame)
     TkWinfo.appname(_page_frame).sub('f','')
   end
@@ -3961,7 +4144,10 @@ class AgMultiEditor < ArcadiaExt
       end
     end
     if @arcadia.layout.headed?
-      frame.top_text(_new_caption)
+      if frame.root.title == frame.title
+        frame.root.top_text(_new_caption)
+      end  
+      frame.root.save_caption(frame.name, _new_caption)
       #@arcadia.layout.domain(@arcadia['conf'][@name+'.frame'])['root'].top_text(_new_caption)
     end
     _title = @tabs_file[_name] != nil ? File.basename(@tabs_file[_name]) :_name
@@ -3983,7 +4169,7 @@ class AgMultiEditor < ArcadiaExt
   
   def tab_name(_str="")
     #_str = _str.downcase if is_windows?
-    'ff'+_str.downcase.gsub("/","_").gsub(".","_").gsub(":","_").gsub("\\","_")
+    'ff'+_str.downcase.gsub("/","_").gsub(".","__").gsub(":","___").gsub("\\","____").gsub("*","_____")
   end
   
   def tab_file_name(_filename="")
@@ -4014,21 +4200,17 @@ class AgMultiEditor < ArcadiaExt
       open_buffer(_tab_name)
     else
       @tabs_file[_tab_name]= _filename
-      if _exp
-        open_buffer(_tab_name, _basefilename)
-      else
-        open_buffer(_tab_name, _basefilename,0)
-      end
+      open_buffer(_tab_name, _basefilename, _filename)
       @tabs_editor[_tab_name].reset_highlight
       begin
         @tabs_editor[_tab_name].load_file(_filename)
       rescue RuntimeError => e
         p "RuntimeError : #{e.message}"
-        close_editor(@tabs_editor[_tab_name])
+        close_editor(@tabs_editor[_tab_name], true)
       end
     end
     
-    if _text_index != nil && _text_index != '1.0'
+    if _text_index != nil && _text_index != '1.0' && @tabs_editor[_tab_name]
       @tabs_editor[_tab_name].text_see(_text_index)
       @tabs_editor[_tab_name].mark_selected(_text_index) if _mark_selected 
     end
@@ -4037,11 +4219,12 @@ class AgMultiEditor < ArcadiaExt
   end
 
 
-  def open_buffer(_buffer_name = nil, _title = nil, w1=150)
+  def open_buffer(_buffer_name = nil, _title = nil, _filename=nil)
     _index = @main_frame.enb.index(_buffer_name)
     if _buffer_name == nil
-    		_buffer_name = tab_name('new')
     		_title_new = '*new'
+    		_buffer_name = tab_name(_title_new)
+    		#_buffer_name = tab_name('new')
     end
     
     if _index != -1
@@ -4051,7 +4234,8 @@ class AgMultiEditor < ArcadiaExt
       _n = 1
       while @main_frame.enb.index(_buffer_name) != -1
         _title_new = '*new'+_n.to_s
-        _buffer_name = tab_name('new')+_n.to_s
+        _buffer_name = tab_name(_title_new)
+        #_buffer_name = tab_name('new')+_n.to_s
         _n =_n+1
       end
       if _title == nil
@@ -4064,10 +4248,15 @@ class AgMultiEditor < ArcadiaExt
         'foreground'=> Arcadia.style("tabpanel.foreground"),
         'raisecmd'=>proc{do_buffer_raise(_buffer_name, _title)}
       )
+      if _filename
+        add_buffer_menu_item(_filename)
+      else
+        add_buffer_menu_item(_title, false)
+      end
       _e = AgEditor.new(self, _tab)
       ext = Arcadia.file_extension(_title)
       ext='rb' if ext.nil?
-      _e.init_editing(ext, w1)
+      _e.init_editing(ext)
       _e.text.set_focus
       #@tabs_file[_buffer_name]= nil
       @tabs_editor[_buffer_name]=_e
@@ -4132,39 +4321,26 @@ class AgMultiEditor < ArcadiaExt
   def close_editor(_editor, _force=false)
     if _force || can_close_editor?(_editor)
       _editor.destroy_outline
-      close_tab(_editor.page_frame)
+      close_buffer(_editor.page_frame)
     else
       return
     end
   end
 
-
-#  def close_editor(_editor, _mod=true)
-#    if ((_mod)&&(_editor.modified?))
-#      _message = @main_frame.enb.itemcget(page_name(_editor.page_frame), 'text')+"\n modified. Save?"
-#      _r = TkDialog2.new('message'=>_message, 'buttons'=>['Ok','No','Cancel']).show()
-#      if _r == 0
-#        _editor.save
-#      elsif _r == 1
-#        close_tab(_editor.page_frame)
-#      elsif _r == 2
-#        return
-#      end
-#    else
-#      close_tab(_editor.page_frame)
-#    end
-#    #EditorContract.instance.file_closed(self, 'file'=>_editor.file)
-#  end
-
-  def close_tab(_page_frame)
+  def close_buffer(_page_frame)
     _name = page_name(_page_frame)
+    if @tabs_editor[_name] && @tabs_editor[_name].file
+      del_buffer_menu_item(@tabs_editor[_name].file)
+    else
+      del_buffer_menu_item(tab_title_by_tab_name(_name))
+    end
     @tabs_editor.delete(_name)
     _index = @main_frame.enb.index(_name)
     @main_frame.enb.delete(_name)
     if !@main_frame.enb.pages.empty?
       @main_frame.enb.raise(@main_frame.enb.pages[_index-1]) if TkWinfo.mapped?(@main_frame.enb)
     else
-      frame.top_text('') if TkWinfo.mapped?(frame.hinner_frame)
+      frame.root.top_text('') if TkWinfo.mapped?(frame.hinner_frame)
     end
   end