arcadia 0.9.0 → 0.9.1

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

@@ -0,0 +1,222 @@
+#!/usr/bin/ruby -w
+
+
+=begin
+/***************************************************************************
+ *   Copyright (C) 2008, Paul Lutus                                        *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+=end
+
+PVERSION = "Version 2.9, 10/24/2008"
+
+module RBeautify
+
+   # user-customizable values
+
+   RBeautify::TabStr = " "
+   RBeautify::TabSize = 2
+
+   # indent regexp tests
+
+   IndentExp = [
+      /^module\b/,
+      /^class\b/,
+      /^if\b/,
+      /(=\s*|^)until\b/,
+      /(=\s*|^)for\b/,
+      /^unless\b/,
+      /(=\s*|^)while\b/,
+      /(=\s*|^)begin\b/,
+      /(^| )case\b/,
+      /\bthen\b/,
+      /^rescue\b/,
+      /^def\b/,
+      /\bdo\b/,
+      /^else\b/,
+      /^elsif\b/,
+      /^ensure\b/,
+      /\bwhen\b/,
+      /\{[^\}]*$/,
+      /\[[^\]]*$/
+   ]
+
+   # outdent regexp tests
+
+   OutdentExp = [
+      /^rescue\b/,
+      /^ensure\b/,
+      /^elsif\b/,
+      /^end\b/,
+      /^else\b/,
+      /\bwhen\b/,
+      /^[^\{]*\}/,
+      /^[^\[]*\]/
+   ]
+
+   def RBeautify.rb_make_tab(tab)
+      return (tab < 0)?"":TabStr * TabSize * tab
+   end
+
+   def RBeautify.rb_add_line(line,tab)
+      line.strip!
+      line = rb_make_tab(tab) + line if line.length > 0
+      return line
+   end
+
+   def RBeautify.beautify_string(source, path = "")
+      comment_block = false
+      in_here_doc = false
+      here_doc_term = ""
+      program_end = false
+      multiLine_array = []
+      multiLine_str = ""
+      tab = 0
+      output = []
+      source.each do |line|
+         line.chomp!
+         if(!program_end)
+            # detect program end mark
+            if(line =~ /^__END__$/)
+               program_end = true
+            else
+               # combine continuing lines
+               if(!(line =~ /^\s*#/) && line =~ /[^\\]\\\s*$/)
+                  multiLine_array.push line
+                  multiLine_str += line.sub(/^(.*)\\\s*$/,"\\1")
+                  next
+               end
+
+               # add final line
+               if(multiLine_str.length > 0)
+                  multiLine_array.push line
+                  multiLine_str += line.sub(/^(.*)\\\s*$/,"\\1")
+               end
+
+               tline = ((multiLine_str.length > 0)?multiLine_str:line).strip
+               if(tline =~ /^=begin/)
+                  comment_block = true
+               end
+               if(in_here_doc)
+                  in_here_doc = false if tline =~ %r{\s*#{here_doc_term}\s*}
+               else # not in here_doc
+                  if tline =~ %r{=\s*<<}
+                     here_doc_term = tline.sub(%r{.*=\s*<<-?\s*([_|\w]+).*},"\\1")
+                     in_here_doc = here_doc_term.size > 0
+                  end
+               end
+            end
+         end
+         if(comment_block || program_end || in_here_doc)
+            # add the line unchanged
+            output << line
+         else
+            comment_line = (tline =~ /^#/)
+            if(!comment_line)
+               # throw out sequences that will
+               # only sow confusion
+               while tline.gsub!(/\{[^\{]*?\}/,"")
+               end
+               while tline.gsub!(/\[[^\[]*?\]/,"")
+               end
+               while tline.gsub!(/'.*?'/,"")
+               end
+               while tline.gsub!(/".*?"/,"")
+               end
+               while tline.gsub!(/\`.*?\`/,"")
+               end
+               while tline.gsub!(/\([^\(]*?\)/,"")
+               end
+               while tline.gsub!(/\/.*?\//,"")
+               end
+               while tline.gsub!(/%r(.).*?\1/,"")
+               end
+               # delete end-of-line comments
+               tline.sub!(/#[^\"]+$/,"")
+               # convert quotes
+               tline.gsub!(/\\\"/,"'")
+               OutdentExp.each do |re|
+                  if(tline =~ re)
+                     tab -= 1
+                     break
+                  end
+               end
+            end
+            if (multiLine_array.length > 0)
+               multiLine_array.each do |ml|
+                  output << rb_add_line(ml,tab)
+               end
+               multiLine_array.clear
+               multiLine_str = ""
+            else
+               output << rb_add_line(line,tab)
+            end
+            if(!comment_line)
+               IndentExp.each do |re|
+                  if(tline =~ re && !(tline =~ /\s+end\s*$/))
+                     tab += 1
+                     break
+                  end
+               end
+            end
+         end
+         if(tline =~ /^=end/)
+            comment_block = false
+         end
+      end
+      error = (tab != 0)
+      STDERR.puts "Error: indent/outdent mismatch: #{tab}." if error
+      return output.join("\n") + "\n",error
+   end # beautify_string
+
+   def RBeautify.beautify_file(path)
+      error = false
+      if(path == '-') # stdin source
+         source = STDIN.read
+         dest,error = beautify_string(source,"stdin")
+         print dest
+      else # named file source
+         source = File.read(path)
+         dest,error = beautify_string(source,path)
+         if(source != dest)
+            # make a backup copy
+            File.open(path + "~","w") { |f| f.write(source) }
+            # overwrite the original
+            File.open(path,"w") { |f| f.write(dest) }
+         end
+      end
+      return error
+   end # beautify_file
+
+   def RBeautify.main
+      error = false
+      if(!ARGV[0])
+         STDERR.puts "usage: Ruby filenames or \"-\" for stdin."
+         exit 0
+      end
+      ARGV.each do |path|
+         error = (beautify_file(path))?true:error
+      end
+      error = (error)?1:0
+      exit error
+   end # main
+end # module RBeautify
+
+# if launched as a standalone program, not loaded as a module
+if __FILE__ == $0
+   RBeautify.main
+end

data/ext/ae-rad/ae-rad-palette.rb

@@ -270,4 +270,4 @@ class WrapperContainer < TkFrame
     end
     return (_found)?_data:A_WIDGET_GIF
   end
-end
+end

data/ext/ae-rad/ae-rad.conf

@@ -4,7 +4,7 @@ frames.labels=Rad,Object Inspector
 frames.names=rad,rad_object_inspector
 float_frames=200x220+10+10
 float_labels=Rad
-active=yes
+active=no
 require=ext/ae-rad/ae-rad
 class=Rad
 

data/ext/ae-ruby-debug/ae-ruby-debug.rb

@@ -232,8 +232,11 @@ class RubyDebugView
         @b_local_onoff.image(_i_on)
         command_enabled(false)
         Thread.new{
-          update_variables('local_var', @controller.rdc.variables('local_variables')) #if @tree_var.open?('local_var')
-          command_enabled(true)
+          begin
+            update_variables('local_var', @controller.rdc.variables('local_variables')) #if @tree_var.open?('local_var')
+          ensure
+            command_enabled(true)
+          end
         }
       elsif @local_state == B_STATE_FREEZE
         @b_local_onoff.image(_i_freeze)
@@ -276,8 +279,11 @@ class RubyDebugView
         @b_instance_onoff.image(_i_on)
         command_enabled(false)
         Thread.new{
-          update_variables('instance_var', @controller.rdc.variables('instance_variables')) #if @tree_var.open?('local_var')
-          command_enabled(true)
+          begin
+            update_variables('instance_var', @controller.rdc.variables('instance_variables')) #if @tree_var.open?('local_var')
+          ensure
+            command_enabled(true)
+          end
         }
       elsif @instance_state == B_STATE_FREEZE
         @b_instance_onoff.image(_i_freeze)
@@ -319,8 +325,11 @@ class RubyDebugView
         @b_class_onoff.image(_i_on)
         command_enabled(false)
         Thread.new{
-          update_variables('class_var', @controller.rdc.variables('self.class.class_variables')) #if @tree_var.open?('local_var')
-          command_enabled(true)
+          begin
+            update_variables('class_var', @controller.rdc.variables('self.class.class_variables')) #if @tree_var.open?('local_var')
+          ensure
+            command_enabled(true)
+          end
         }
       elsif @class_state == B_STATE_FREEZE
         @b_class_onoff.image(_i_freeze)
@@ -363,8 +372,11 @@ class RubyDebugView
         @b_global_onoff.image(_i_on)
         command_enabled(false)
         Thread.new{
-          update_variables('global_var', @controller.rdc.variables('global_variables')) #if @tree_var.open?('local_var')
-          command_enabled(true)
+          begin
+            update_variables('global_var', @controller.rdc.variables('global_variables')) #if @tree_var.open?('local_var')
+          ensure
+            command_enabled(true)
+          end
         }
       elsif @global_state == B_STATE_FREEZE
         @b_global_onoff.image(_i_freeze)
@@ -768,7 +780,7 @@ class RubyDebugServer
       else
         rdebug_cmd = "rdebug"
       end
-       commandLine = "#{rdebug_cmd} --host #{_host} --port #{_remote_port} -sw #{_filename}"
+      commandLine = "#{rdebug_cmd} --host #{_host} --port #{_remote_port} -sw #{_filename}"
     else
        commandLine = "rdebug --host #{_host} --port #{_remote_port} -sw #{_filename}"
     end

data/lib/a-commons.rb

@@ -88,11 +88,16 @@ class FixedFrameWrapper < AbstractFrameWrapper
     @fixed_frame
   end
   
-  def top_text(_top_text=nil)
+  def root
     fixed_frame_forge
-    Arcadia.layout.domain(@domain)['root'].top_text(_top_text)
-    #@arcadia.layout.domain_for_frame(@domain, @name)['root'].top_text(_title)
+    Arcadia.layout.domain(@domain)['root']
   end
+  
+#  def top_text(_top_text=nil)
+#    fixed_frame_forge
+#    Arcadia.layout.domain(@domain)['root'].top_text(_top_text)
+#    #@arcadia.layout.domain_for_frame(@domain, @name)['root'].top_text(_title)
+#  end
 
   def show
     fixed_frame_forge

data/lib/a-contracts.rb

@@ -61,6 +61,8 @@ class LayoutRaisingFrameEvent < ArcadiaEvent
   attr_accessor :frame_name
 end
 
+class LayoutChangedFrameEvent < ArcadiaEvent
+end
 
 #  +---------------------------------------------+
 #         Buffer event

data/lib/a-core.rb

@@ -22,7 +22,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.9.0',
+        '0.9.1',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
@@ -98,9 +98,9 @@ class Arcadia < TkApplication
       geometry = start_width.to_s+'x'+start_height.to_s+'+0+0'
     end
     @root.deiconify
-    @root.raise
     @root.focus(true)
     @root.geometry(geometry)
+    @root.raise
     Tk.update_idletasks
     #sleep(1)
     @splash.destroy  if @splash
@@ -682,7 +682,7 @@ class Arcadia < TkApplication
             item_args['context_path'] = context_path
             item_args['context_caption'] = groups_caption[gi] if groups_caption
             item_args['context_underline'] = context_underline.strip.to_i if context_underline
-            i = _user_control.new_item(self, item_args)
+            i = _user_control.new_item(_self_on_eval, item_args)
             i.enable=false if disabled
           }
         rescue Exception
@@ -712,6 +712,8 @@ class Arcadia < TkApplication
     if q1 && can_exit?
       do_finalize
       @root.destroy
+#      Tk.mainloop_exist?
+#      Tk.destroy
       Tk.exit
     end
   end
@@ -1022,7 +1024,6 @@ class ArcadiaMainToolbar < ArcadiaUserControl
         height 20
         helptext  _hint if _hint
         text _caption if _caption
-        
       }
       if _args['context_path'] && _args['last_item_for_context']
         @item_obj.pack('after'=>_args['last_item_for_context'].item_obj, 'side' =>'left', :padx=>2, :pady=>0)
@@ -1198,11 +1199,6 @@ class ArcadiaMainMenu < ArcadiaUserControl
     @menu = menu
     build
     @menu.configure(Arcadia.style('menu'))
-#    menu.foreground('black')
-#    menu.activeforeground('#6679f1')
-#    menu.relief('flat')
-#    menu.borderwidth(0)
-#    menu.font(Arcadia.conf('main.mainmenu.font'))
   end
 
   def get_menu_context(_menubar, _context, _underline=nil)
@@ -2347,11 +2343,11 @@ class ArcadiaLayout
            break
          elsif @panels[dom]['notebook'] != nil 
            cfrs = TkWinfo.children(_frame)
-           if cfrs && cfrs.length == 1 && cfrs[0].instance_of?(TkTitledFrame) && TkWinfo.parent(@panels[dom]['notebook'])== cfrs[0].frame
+           if cfrs && cfrs.length == 1 && cfrs[0].instance_of?(TkTitledFrameAdapter) && TkWinfo.parent(@panels[dom]['notebook'])== cfrs[0].frame
              ret_doms << dom
              frame_found = true
            end       
-         elsif @panels[dom]['root'].instance_of?(TkTitledFrame) && @panels[dom]['root'].parent == _frame 
+         elsif @panels[dom]['root'].instance_of?(TkTitledFrameAdapter) && @panels[dom]['root'].parent == _frame 
              ret_doms << dom
              frame_found = true
          end
@@ -2360,7 +2356,7 @@ class ArcadiaLayout
     
     if !frame_found
       cfrs = TkWinfo.children(_frame)
-      if cfrs && cfrs.length == 1 && cfrs[0].instance_of?(TkTitledFrame)
+      if cfrs && cfrs.length == 1 && cfrs[0].instance_of?(TkTitledFrameAdapter)
         @wrappers.each{|name, ffw|
           if ffw.hinner_frame.frame == cfrs[0].frame
             ret_doms << ffw.domain 
@@ -2371,244 +2367,6 @@ class ArcadiaLayout
     ret_doms
   end
 
-  def close_runtime_old(_domain)
-    splitted_adapter = find_splitted_frame(@panels[_domain]['root'])
-    splitted_adapter_frame = splitted_adapter.frame
-    vertical = splitted_adapter.instance_of?(AGTkVSplittedFrames)
-    
-    _row, _col = _domain.split('.')
-    
-    if @frames[_row.to_i][_col.to_i] == splitted_adapter.frame1
-      close_first = true
-    elsif @frames[_row.to_i][_col.to_i] == splitted_adapter.frame2
-      close_first = false
-    end
-    
-    return if close_first.nil?    
-    
-    #source_domains = domains_on_frame(splitted_adapter.frame1).concat(domains_on_frame(splitted_adapter.frame2))
-    #Arcadia.console(self,'msg'=>"domini coinvolti = #{source_domains.to_s}")
-    
-    @panels[_domain]['sons'].each{|name,ffw|
-      unregister_panel(ffw, false, false)
-    }
-    unbuild_titled_frame(_domain)
-    if close_first
-      #left_frame
-      other_ds = domains_on_frame(@panels[_domain]['splitted_frames'].frame2)
-      if other_ds.length == 1
-        source_domain = other_ds[0]
-      elsif other_ds.length > 1
-        max = other_ds.length-1
-        j = 0
-        while j <= max
-          if source_domain.nil?
-            source_domain = other_ds[j]
-          else
-            r,c = source_domain.split('.')
-            new_r,new_c = other_ds[j].split('.')
-            if new_r.to_i < r.to_i || new_r.to_i == r.to_i && new_c.to_i < c.to_i
-              source_domain = other_ds[j]
-            end
-          end
-          j = j+1
-        end
-      else
-        if vertical
-          source_domain = domain_name(_row.to_i, _col.to_i+1)
-        else
-          source_domain = domain_name(_row.to_i+1, _col.to_i)
-        end
-      end
-      if vertical
-        ref_source_domain = domain_name(_row.to_i, _col.to_i+1)
-      else
-        ref_source_domain = domain_name(_row.to_i+1, _col.to_i)
-      end
-
-      destination_domain = _domain
-            
-      if @panels[source_domain]['splitted_frames'] != @panels[destination_domain]['splitted_frames']
-        if @panels[source_domain]['root_splitted_frames'] && @panels[source_domain]['root_splitted_frames'] != @panels[destination_domain]['splitted_frames']
-          other_root_splitted_adapter = @panels[source_domain]['root_splitted_frames']
-        elsif @panels[source_domain]['splitted_frames']
-          other_root_splitted_adapter = @panels[source_domain]['splitted_frames']
-        end
-      end
-
-      if other_root_splitted_adapter
-        p "primo quadrante"
-        other_root_splitted_adapter.detach_frame
-        splitted_adapter.detach_frame
-        splitted_adapter.destroy
-        other_root_splitted_adapter.attach_frame(splitted_adapter_frame)
-        if source_domain == ref_source_domain
-          if vertical
-            rows = domains_on_splitter_rows(other_root_splitted_adapter)
-            rows.each{|r|
-              shift_left(r.to_i,_col.to_i)
-            }
-          else
-            cols = domains_on_splitter_cols(other_root_splitted_adapter)
-            cols.each{|c|
-              shift_top(_row.to_i,c.to_i)
-            }
-          end
-        else
-          @panels.delete(_domain)
-          @frames[_row.to_i][_col.to_i] = nil
-         # @domains[_row.to_i][_col.to_i] = nil
-#          ref_r,ref_c = ref_source_domain.split('.')
-#          real_r,real_c=source_domain.split('.')
-#          gap_r = ref_r.to_i - real_r.to_i
-#          gap_c = ref_c.to_i - real_c.to_i
-#          if gap_r != 0 && gap_c == 0 # vertical
-#            doms = domains_on_splitter(other_root_splitted_adapter)
-#            doms.each{|d|
-#              r,c=d.split('.')
-#              cur_r = r.to_i+gap_r
-#              cur_domain = "#{cur_r}.#{_col}"
-#              if @panels[cur_domain] != nil
-#                shift_bottom(cur_r,_col.to_i)
-#              end
-#              @panels[cur_domain] = @panels[d]
-#              @panels[cur_domain]['root'].set_domain(cur_domain)
-#              @panels[cur_domain]['sons'].each{|name,ffw| ffw.domain=cur_domain}
-#              @frames[cur_r.to_i][_col.to_i] = @frames[r.to_i][c.to_i]
-#              @domains[cur_r.to_i][_col.to_i] = @domains[r.to_i][c.to_i]
-#              
-#              @panels.delete(d)
-#              @frames[r.to_i][c.to_i] = nil
-#              @domains[r.to_i][c.to_i] = nil
-#            }
-#          elsif gap_c != 0
-#          end
-        end
-        @panels.delete(source_domain)
-        if vertical
-          @frames[_row.to_i][_col.to_i+1] = nil
-         # @domains[_row.to_i][_col.to_i+1] = nil
-        else
-          @frames[_row.to_i+1][_col.to_i] = nil
-         # @domains[_row.to_i+1][_col.to_i] = nil
-        end
-      else
-        p "secondo quadrante"
-        source_save = Hash.new
-        source_save.update(@panels[source_domain]['sons']) if @panels[source_domain]
-        source_save.each{|name,ffw|
-          unregister_panel(ffw, false, false)
-        }
-        splitted_adapter.detach_frame
-        splitted_adapter.destroy
-        @panels[destination_domain]['root']=splitted_adapter_frame
-        @frames[_row.to_i][_col.to_i] = splitted_adapter_frame
-       # @domains[_row.to_i][_col.to_i] = destination_domain
-        build_titled_frame(destination_domain)
-        @panels.delete(source_domain)
-        if vertical
-          @frames[_row.to_i][_col.to_i+1] = nil
-         # @domains[_row.to_i][_col.to_i+1] = nil
-        else
-          @frames[_row.to_i+1][_col.to_i] = nil
-         # @domains[_row.to_i+1][_col.to_i] = nil
-        end
-        source_save.each{|name,ffw|
-          ffw.domain = destination_domain
-          register_panel(ffw, ffw.hinner_frame)
-        }
-        #-----
-        parent_splitted_adapter = find_splitted_frame(@panels[destination_domain]['root'])
-        if  parent_splitted_adapter
-          @panels[destination_domain]['splitted_frames']=parent_splitted_adapter
-        else
-          @panels[destination_domain]['splitted_frames']= nil
-        end
-        #-----
-        source_row,source_col = source_domain.split('.')
-#        shift_left(source_row.to_i,source_col.to_i)
-        if vertical
-          shift_left(source_row.to_i,source_col.to_i-1)
-        else
-          shift_top(source_row.to_i-1,source_col.to_i)
-        end
-      end
-    else  # CLOSE OTHER
-      other_ds = domains_on_frame(@panels[_domain]['splitted_frames'].frame1)
-      if other_ds.length == 1
-        other_dom = other_ds[0]
-      else
-        if vertical
-          other_dom = domain_name(_row.to_i, _col.to_i-1)
-        else
-          other_dom = domain_name(_row.to_i-1, _col.to_i)
-        end
-      end
-      if @panels[_domain]['splitted_frames'] != @panels[other_dom]['splitted_frames']
-        if @panels[other_dom]['root_splitted_frames'] && @panels[other_dom]['root_splitted_frames'] != @panels[_domain]['splitted_frames']
-          other_root_splitted_adapter = @panels[other_dom]['root_splitted_frames']
-        elsif @panels[other_dom]['splitted_frames']
-          other_root_splitted_adapter = @panels[other_dom]['splitted_frames']
-        end
-      end
-
-      if other_root_splitted_adapter
-        p "terzo quadrante"
-        other_root_splitted_adapter.detach_frame
-        splitted_adapter.detach_frame
-        splitted_adapter.destroy
-        other_root_splitted_adapter.attach_frame(splitted_adapter_frame)
-
-        @frames[_row.to_i][_col.to_i] = nil
-       # @domains[_row.to_i][_col.to_i] = nil
-        @panels.delete(_domain)
-      else
-        p "quarto quadrante"
-        source_save = Hash.new
-        source_save.update(@panels[other_dom]['sons'])
-        source_save.each{|name,ffw|
-          unregister_panel(ffw, false, false)
-        }
-        splitted_adapter.detach_frame
-        splitted_adapter.destroy
-        @panels[other_dom]['root']=splitted_adapter_frame 
-
-        @frames[_row.to_i][_col.to_i] = nil
-       # @domains[_row.to_i][_col.to_i] = nil
-        build_titled_frame(other_dom)
-        @panels.delete(_domain)
-  
-        source_save.each{|name,ffw|
-          ffw.domain = other_dom
-          register_panel(ffw, ffw.hinner_frame)
-        }
-        #-----
-        parent_splitted_adapter = find_splitted_frame(@panels[other_dom]['root'])
-        if  parent_splitted_adapter
-          @panels[other_dom]['splitted_frames']=parent_splitted_adapter
-        else
-          @panels[other_dom]['splitted_frames']= nil
-        end
-        other_row,other_col = other_dom.split('.')
-        @frames[other_row.to_i][other_col.to_i] = splitted_adapter_frame
-       # @domains[other_row.to_i][other_col.to_i] = other_dom
-#        if vertical
-#          @frames[_row.to_i][_col.to_i-1] = splitted_adapter_frame
-#         # @domains[_row.to_i][_col.to_i-1] = other_dom
-#        else
-#          @frames[_row.to_i-1][_col.to_i] = splitted_adapter_frame
-#         # @domains[_row.to_i-1][_col.to_i] = other_dom
-#        end
-      end
-
-      if vertical
-        shift_left(_row.to_i,_col.to_i)
-      else
-        shift_top(_row.to_i,_col.to_i)
-      end
-    end 
-    build_invert_menu(true)
-  end
 
   def find_splitted_frame(_start_frame)
     splitted_frame = _start_frame
@@ -2746,8 +2504,8 @@ class ArcadiaLayout
   
   def build_titled_frame(domain)
     if @panels[domain]
-      tframe = TkTitledFrame.new(@panels[domain]['root']).place('x'=>0, 'y'=>0,'relheight'=>1, 'relwidth'=>1)
-      mb = tframe.add_menu_button('ext')
+      tframe = TkTitledFrameAdapter.new(@panels[domain]['root']).place('x'=>0, 'y'=>0,'relheight'=>1, 'relwidth'=>1)
+      mb = tframe.add_fixed_menu_button('ext')
       # add commons item
       menu = mb.cget('menu')
       add_commons_menu_items(domain, menu)
@@ -2805,10 +2563,10 @@ class ArcadiaLayout
   end
 
   def change_domain(_target_domain, _source_name)
-    tt1= @panels[_target_domain]['root'].top_text
+    #tt1= @panels[_target_domain]['root'].top_text
     source_domain = @wrappers[_source_name].domain
     source_has_domain = !source_domain.nil?
-    tt2= @panels[source_domain]['root'].top_text if source_has_domain
+    #tt2= @panels[source_domain]['root'].top_text if source_has_domain
     if @arcadia.conf('layout.exchange_panel_if_no_tabbed')=='true' && source_has_domain && @panels[source_domain]['sons'].length ==1 && @panels[_target_domain]['sons'].length > 0
       # change ------
       ffw1 = raised_fixed_frame(_target_domain)
@@ -2819,20 +2577,29 @@ class ArcadiaLayout
       ffw2.domain = _target_domain
       register_panel(ffw1, ffw1.hinner_frame) if ffw1
       register_panel(ffw2, ffw2.hinner_frame)
-      @panels[_target_domain]['root'].top_text(tt2)
-      @panels[source_domain]['root'].top_text(tt1)
+      #@panels[_target_domain]['root'].top_text(tt2)
+      #@panels[source_domain]['root'].top_text(tt1)
+      @panels[_target_domain]['root'].save_caption(ffw2.name, @panels[source_domain]['root'].last_caption(ffw2.name))
+      @panels[source_domain]['root'].save_caption(ffw1.name, @panels[_target_domain]['root'].last_caption(ffw1.name))
+      @panels[_target_domain]['root'].restore_caption(ffw2.name)
+      @panels[source_domain]['root'].restore_caption(ffw1.name)
+      @panels[_target_domain]['root'].change_adapter(ffw2.name, @panels[source_domain]['root'].forge_transient_adapter(ffw2.name))
+      @panels[source_domain]['root'].change_adapter(ffw1.name, @panels[_target_domain]['root'].forge_transient_adapter(ffw1.name))
     elsif source_has_domain && @panels[source_domain]['sons'].length >= 1
       ffw2 = @panels[source_domain]['sons'][_source_name]
       unregister_panel(ffw2, false, false)
       ffw2.domain = _target_domain
       register_panel(ffw2, ffw2.hinner_frame)
-      @panels[_target_domain]['root'].top_text(tt2)
-      @panels[source_domain]['root'].top_text('')
+      #@panels[_target_domain]['root'].top_text(tt2)
+      #@panels[source_domain]['root'].top_text('')
+      @panels[_target_domain]['root'].save_caption(ffw2.name, @panels[source_domain]['root'].last_caption(ffw2.name))
+      @panels[_target_domain]['root'].restore_caption(ffw2.name)
+      @panels[_target_domain]['root'].change_adapter(ffw2.name, @panels[source_domain]['root'].forge_transient_adapter(ffw2.name))
     elsif !source_has_domain
       ffw2 = @wrappers[_source_name]
       ffw2.domain = _target_domain
       register_panel(ffw2, ffw2.hinner_frame)
-      @panels[_target_domain]['root'].top_text('')
+      #@panels[_target_domain]['root'].top_text('')
     end
     # refresh -----
     build_invert_menu
@@ -2872,7 +2639,7 @@ class ArcadiaLayout
     @panels.keys.each{|dom|
       if  dom != '_domain_root_' && dom != _ffw.domain && @panels[dom] && @panels[dom]['root']
         titledFrame = @panels[dom]['root']
-        if titledFrame.instance_of?(TkTitledFrame)
+        if titledFrame.instance_of?(TkTitledFrameAdapter)
           menu = @panels[dom]['root'].menu_button('ext').cget('menu')
           menu.insert('0',:command,
                 :label=>_ffw.title,
@@ -2886,7 +2653,7 @@ class ArcadiaLayout
     }
     if @panels[_ffw.domain]
       titledFrame = @panels[_ffw.domain]['root']
-      if titledFrame.instance_of?(TkTitledFrame)
+      if titledFrame.instance_of?(TkTitledFrameAdapter)
         mymenu = titledFrame.menu_button('ext').cget('menu')
         index = mymenu.index('end').to_i
         if @panels.keys.length > 2
@@ -2914,7 +2681,7 @@ class ArcadiaLayout
     @panels.keys.each{|dom|
       if dom != '_domain_root_' && @panels[dom] && @panels[dom]['root']
         titledFrame = @panels[dom]['root']
-        if titledFrame.instance_of?(TkTitledFrame)
+        if titledFrame.instance_of?(TkTitledFrameAdapter)
           menu = titledFrame.menu_button('ext').cget('menu')
           if refresh_commons_items
             @panels[dom]['root'].menu_button('ext').cget('menu').delete('0','end')
@@ -2956,23 +2723,23 @@ class ArcadiaLayout
     if pan!=nil
       num = pan['sons'].length
       if @headed
+        root_frame = pan['root'].frame
         pan['root'].title(_title)
-        if !pan['root'].frame.instance_of?(TkFrameAdapter) && num==0
+        pan['root'].restore_caption(_name)
+   	    pan['root'].change_adapter_name(_name)
+        if !root_frame.instance_of?(TkFrameAdapter) && num==0
           if _adapter
             adapter = _adapter
           else
             adapter = TkFrameAdapter.new(self.root, Arcadia.style('frame'))
           end
-          adapter.attach_frame(pan['root'].frame)
+          adapter.attach_frame(root_frame)
           adapter.raise
-          #@wrappers[_name]=wrapper
         end
-        root_frame = pan['root'].frame
       else
         root_frame = pan['root']
       end
       if (num == 0 && @autotab)
-        #api = ArcadiaPanelInfo.new(_name,_title,wrapper,_ffw)
         pan['sons'][_name] = _ffw
         process_frame(_ffw)
         return adapter
@@ -2989,7 +2756,8 @@ class ArcadiaLayout
             'text'=>api.title,
             'raisecmd'=>proc{
   					    pan['root'].title(api.title)
-  					    pan['root'].top_text('') 
+  					    pan['root'].restore_caption(api.name) 
+  					    pan['root'].change_adapter_name(api.name)
          	         Arcadia.process_event(LayoutRaisingFrameEvent.new(self,'extension_name'=>pan['sons'][api.name].extension_name, 'frame_name'=>pan['sons'][api.name].name))
 #               changed
 #               notify_observers('RAISE', api.name)
@@ -3009,7 +2777,9 @@ class ArcadiaLayout
         _panel = pan['notebook'].insert('end',_name , 
         		'text'=>_title, 
           'raisecmd'=>proc{
-					  pan['root'].title(_title)            
+            pan['root'].title(_title)            
+            pan['root'].restore_caption(_name) 
+            pan['root'].change_adapter_name(_name)
       	     Arcadia.process_event(LayoutRaisingFrameEvent.new(self,'extension_name'=>_ffw.extension_name, 'frame_name'=>_ffw.name))
 #            changed
 #            notify_observers('RAISE', _name)
@@ -3062,9 +2832,13 @@ class ArcadiaLayout
     if @panels[_domain_name]['sons'].length == 1
       w = @panels[_domain_name]['sons'].values[0].hinner_frame
       t = @panels[_domain_name]['sons'].values[0].title
+      n = @panels[_domain_name]['sons'].values[0].name
       w.detach_frame
       w.attach_frame(@panels[_domain_name]['root'].frame)
       @panels[_domain_name]['root'].title(t)
+      @panels[_domain_name]['root'].restore_caption(n)
+      @panels[_domain_name]['root'].change_adapter_name(n)
+
       @panels[_domain_name]['notebook'].destroy
       @panels[_domain_name]['notebook']=nil
     elsif @panels[_domain_name]['sons'].length > 1
@@ -3076,6 +2850,7 @@ class ArcadiaLayout
       #p "unregister #{_name} ------> 5"
     elsif @panels[_domain_name]['sons'].length == 0
       @panels[_domain_name]['root'].title('')
+      @panels[_domain_name]['root'].top_text('')
     end
     build_invert_menu if refresh_menu
   end
@@ -3143,7 +2918,7 @@ class ArcadiaLayout
     ret = _frame
 #    child = TkWinfo.children(_frame)[0]
     TkWinfo.children(_frame).each{|child|
-      if child.instance_of?(TkTitledFrame)
+      if child.instance_of?(TkTitledFrameAdapter)
         ret = child.frame
         break
       end
@@ -3350,11 +3125,19 @@ class FocusEventManager
   end
 
   def do_upper_case(_focused_widget)
-    _replace_sel(_focused_widget, :upcase)
+    if _focused_widget.respond_to?(:do_upper_case)
+      _focused_widget.do_upper_case
+    else
+      _replace_sel(_focused_widget, :upcase)
+    end
   end
 
   def do_lower_case(_focused_widget)
-    _replace_sel(_focused_widget, :downcase)
+    if _focused_widget.respond_to?(:do_lower_case)
+      _focused_widget.do_lower_case
+    else
+      _replace_sel(_focused_widget, :downcase)
+    end
   end
   
   def _replace_sel(_focused_widget, _method)