arcadia 0.10.0 → 0.11.0

data/lib/a-contracts.rb

@@ -23,20 +23,21 @@ class ArcadiaEvent < Event
 
 end
 
-class QuitEvent < ArcadiaEvent
+class ArcadiaSysEvent < ArcadiaEvent
 end
 
+
 # +------------------------------------------+
 #     Extention Event (raised only by Arcadia)
 #     do not raise! 
 #     Every extensions listen on these events
 # +------------------------------------------+
 
-class BuildEvent < ArcadiaEvent
+class BuildEvent < ArcadiaSysEvent
   attr_accessor :name
 end 
 
-class InitializeEvent < ArcadiaEvent
+class InitializeEvent < ArcadiaSysEvent
 end
 
 
@@ -44,15 +45,28 @@ end
 # before process FinalizeEvent during quiet face.
 # If listener(Extension) set can_exit property to false then 
 # arcadia abort the quiet face. 
-class ExitQueryEvent < ArcadiaEvent
+class ExitQueryEvent < ArcadiaSysEvent
   attr_accessor :can_exit
 end
 
-class FinalizeEvent < ArcadiaEvent
+class QuitEvent < ArcadiaSysEvent
+end
+
+class FinalizeEvent < ArcadiaSysEvent
+end
+
+# used only by ArcadiaExtPlus
+class ClearCacheInstanceEvent < ArcadiaSysEvent
 end
 
+class DestroyInstanceEvent < ArcadiaSysEvent
+end
 
-class NeedRubyGemWizardEvent < ArcadiaEvent
+class ActivateInstanceEvent < ArcadiaSysEvent
+  attr_accessor :name
+end
+
+class NeedRubyGemWizardEvent < ArcadiaSysEvent
   class Result < Result
     attr_accessor :installed
   end
@@ -64,23 +78,24 @@ class NeedRubyGemWizardEvent < ArcadiaEvent
   attr_accessor :gem_events
 end
 
-class ArcadiaProblemEvent < ArcadiaEvent
+class ArcadiaProblemEvent < ArcadiaSysEvent
    DEPENDENCE_MISSING_TYPE = "DEPENDENCE_MISSING_TYPE"
    RUNTIME_ERROR_TYPE = "RUNTIME_ERROR_TYPE"
    attr_accessor :type, :level, :title, :detail
 end
 
+# +------------------------------------------+
 
 # +------------------------------------------+
 #     Generic Layout Event 
 #     
 # +------------------------------------------+
-class LayoutRaisingFrameEvent < ArcadiaEvent
+class LayoutRaisingFrameEvent < ArcadiaSysEvent
   attr_accessor :extension_name
   attr_accessor :frame_name
 end
 
-class LayoutChangedFrameEvent < ArcadiaEvent
+class LayoutChangedFrameEvent < ArcadiaSysEvent
 end
 
 #  +---------------------------------------------+
@@ -321,7 +336,7 @@ class DialogEvent < ArcadiaEvent
   class Result < Result
     attr_accessor :value
   end
-  attr_accessor :title, :msg, :type, :level
+  attr_accessor :title, :msg, :type, :level, :exception
 end
 
 #class QuestionDialogEvent < DialogEvent

data/lib/a-core.rb

@@ -23,7 +23,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.10.0',
+        '0.11.0',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
@@ -43,7 +43,7 @@ class Arcadia < TkApplication
     ArcadiaActionDispatcher.new(self)
     ArcadiaGemsWizard.new(self)
     MonitorLastUsedDir.new
-    FocusEventManager.new
+    @focus_event_manager = FocusEventManager.new
     #self.load_local_config(false)
     ObjectSpace.define_finalizer($arcadia, self.class.method(:finalize).to_proc)
     #_title = "Arcadia Ruby ide :: [Platform = #{RUBY_PLATFORM}] [Ruby version = #{RUBY_VERSION}] [TclTk version = #{tcltk_info.level}]"
@@ -73,8 +73,6 @@ class Arcadia < TkApplication
     )
     #.place('x'=>0,'y'=>0,'relwidth'=>1,'relheight'=>1)
     
-    
-    
     @mf_root.show_statusbar('status')
     Arcadia.new_statusbar_item("Platform").text=RUBY_PLATFORM
     self['toolbar']= ArcadiaMainToolbar.new(self, @mf_root.add_toolbar)
@@ -177,7 +175,15 @@ class Arcadia < TkApplication
   def register(_ext)
     @exts_i << _ext
   end
+
+  def unregister(_ext)
+    @exts_i.delete(_ext)
+  end
   
+  def last_focused_text_widget
+    @focus_event_manager.last_focus_widget
+  end   
+      
   def show_hide_toolbar
     if @is_toolbar_show
     		@mf_root.show_toolbar(0,false)
@@ -203,12 +209,12 @@ class Arcadia < TkApplication
   def ext_source_must_be_loaded?(_name)
     ret = ext_active?(_name)
     if !ret
-    @exts_dip.each{|key,val|
-      if val == _name
-        ret = ret || ext_active?(key)
-      end
-      break if ret
-    }
+      @exts_dip.each{|key,val|
+        if val == _name
+          ret = ret || ext_active?(key)
+        end
+        break if ret
+      }
     end
     ret
   end
@@ -257,11 +263,11 @@ class Arcadia < TkApplication
   end
 
   def Arcadia.gem_available?(_gem)
-      if Gem.respond_to?(:available?)
-          return Gem.available?(_gem)
-      else
-          return !Gem.source_index.find_name(_gem).empty?
-      end
+    if Gem.respond_to?(:available?)
+      return Gem.available?(_gem)
+    else
+      return !Gem.source_index.find_name(_gem).empty?
+    end
   end
 
   def check_gems_dependences(_ext)
@@ -321,12 +327,18 @@ class Arcadia < TkApplication
     }
     begin
       _build_event = Arcadia.process_event(BuildEvent.new(self))
-    rescue Exception
+    rescue Exception => e
       ret = false
       msg = "During build event processing(#{$!.class.to_s}) : #{$!} at : #{$@.to_s}"
-      ans = Tk.messageBox('icon' => 'error', 'type' => 'abortretryignore',
-      'title' => "(Arcadia) Build face", 'parent' => @root,
-      'message' => msg)
+      ans = Arcadia.dialog(self, 
+            'type'=>'abort_retry_ignore', 
+            'title' => "(Arcadia) During build event processing", 
+            'msg'=>msg,
+            'exception'=>e,
+            'level'=>'error')
+#      ans = Tk.messageBox('icon' => 'error', 'type' => 'abortretryignore',
+#      'title' => "(Arcadia) Build face", 'parent' => @root,
+#      'message' => msg)
       if  ans == 'abort'
         raise
         exit
@@ -342,6 +354,17 @@ class Arcadia < TkApplication
     _build_event = Arcadia.process_event(InitializeEvent.new(self))
   end
   
+  def do_make_clones
+    Array.new.concat(@exts_i).each{|ext|
+      if ext.kind_of?(ArcadiaExtPlus)
+        a = ext.conf_array("#{ext.name}.clones")
+        a.each{|clone_name|
+          ext.clone(clone_name)
+        }
+      end
+    }
+  end
+  
   def load_maximized
     lm = self['conf']['layout.maximized']
     if lm    
@@ -369,12 +392,18 @@ class Arcadia < TkApplication
 	      require "#{Dir.pwd}/#{source}" 
       end
       @exts_loaded << _extension
-    rescue Exception,LoadError
+    rescue Exception,LoadError => e
       ret = false
       msg = "Loading \"#{_extension}\" (#{$!.class.to_s}) : #{$!} at : #{$@.to_s}"
-      ans = Tk.messageBox('icon' => 'error', 'type' => 'abortretryignore',
-      'title' => "(Arcadia) Extensions '#{_extension}'", 'parent' => @root,
-      'message' => msg)
+      ans = Arcadia.dialog(self, 
+            'type'=>'abort_retry_ignore', 
+            'title' => "(Arcadia) Extensions '#{_extension}'", 
+            'msg'=>msg,
+            'exception'=>e,
+            'level'=>'error')
+#      ans = Tk.messageBox('icon' => 'error', 'type' => 'abortretryignore',
+#      'title' => "(Arcadia) Extensions '#{_extension}'", 'parent' => @root,
+#      'message' => msg)
       if  ans == 'abort'
         raise
         exit
@@ -401,12 +430,18 @@ class Arcadia < TkApplication
         end
         publish(_extension, klass.new(self, _extension))
       end
-    rescue Exception,LoadError
+    rescue Exception,LoadError => e
       ret = false
-      msg = "Loading \"#{_extension}\" (#{$!.class.to_s}) : #{$!} at : #{$@.to_s}"
-      ans = Tk.messageBox('icon' => 'error', 'type' => 'abortretryignore',
-      'title' => "(Arcadia) Extensions '#{_extension}'", 'parent' => @root,
-      'message' => msg)
+      msg = "Loading \"#{_extension}\" (#{$!.class.to_s}) : #{$!} at : #{$@.to_s}" 
+      ans = Arcadia.dialog(self, 
+            'type'=>'abort_retry_ignore', 
+            'title' => "(Arcadia) Extensions '#{_extension}'", 
+            'msg'=>msg,
+            'exception'=>e,
+            'level'=>'error')
+#      ans = Tk.messageBox('icon' => 'error', 'type' => 'abortretryignore',
+#      'title' => "(Arcadia) Extensions '#{_extension}'", 'parent' => @root,
+#      'message' => msg)
       if  ans == 'abort'
         raise
         exit
@@ -422,11 +457,17 @@ class Arcadia < TkApplication
   def ext_method(_extension, _method)
     begin
       self[_extension].send(_method)
-    rescue Exception
+    rescue Exception => e
       msg = _method.to_s+' "'+_extension.to_s+'"'+" ("+$!.class.to_s+") "+" : "+$! + "\n at : "+$@.to_s
-      ans = Tk.messageBox('icon' => 'warning', 'type' => 'abortretryignore',
-      'title' => '(Arcadia) Extensions', 'parent' => @root,
-      'message' => msg)
+      ans = Arcadia.dialog(self, 
+            'type'=>'abort_retry_ignore', 
+            'title' => "(Arcadia) Extensions", 
+            'msg'=>msg,
+            'exception'=>e,
+            'level'=>'error')
+#      ans = Tk.messageBox('icon' => 'warning', 'type' => 'abortretryignore',
+#      'title' => '(Arcadia) Extensions', 'parent' => @root,
+#      'message' => msg)
       if ans == 'abort'
         raise
         exit
@@ -487,7 +528,12 @@ class Arcadia < TkApplication
             
           rescue Exception
             msg = "Loading layout: (#{$!.class.to_s} : #{$!.to_s} at : #{$@.to_s})"
-            if Arcadia.dialog(self, 'type'=>'ok_cancel', 'level'=>'error','title' => '(Arcadia) Layout', 'msg'=>msg)=='cancel'
+            if Arcadia.dialog(self, 
+              'type'=>'ok_cancel', 
+              'level'=>'error',
+              'title' => '(Arcadia) Layout',
+              'exception' => $!, 
+              'msg'=>msg)=='cancel'
               raise
               exit
             else
@@ -514,12 +560,12 @@ class Arcadia < TkApplication
   end
 
   def load_sysdefaultproperty  
-#    Tk.tk_call "eval","option add *background #{self['conf']['background']}"
-#    Tk.tk_call "eval","option add *foreground #{self['conf']['foreground']}"
-#    Tk.tk_call "eval","option add *activebackground #{self['conf']['activebackground']}"
-#    Tk.tk_call "eval","option add *activeforeground #{self['conf']['activeforeground']}"
-#    Tk.tk_call "eval","option add *highlightcolor  #{self['conf']['background']}"
-#    Tk.tk_call "eval","option add *relief #{self['conf']['relief']}"
+    Tk.tk_call "eval","option add *background #{self['conf']['background']}"
+    Tk.tk_call "eval","option add *foreground #{self['conf']['foreground']}"
+    Tk.tk_call "eval","option add *activebackground #{self['conf']['activebackground']}"
+    Tk.tk_call "eval","option add *activeforeground #{self['conf']['activeforeground']}"
+    Tk.tk_call "eval","option add *highlightcolor  #{self['conf']['background']}"
+    Tk.tk_call "eval","option add *relief #{self['conf']['relief']}"
 
     if !Arcadia.is_windows? && File.basename(Arcadia.ruby) != 'ruby'
       begin
@@ -579,6 +625,7 @@ class Arcadia < TkApplication
     load_user_control(self['toolbar'],"","e")
     load_user_control(self['menubar'],"","e")
     load_runners
+    do_make_clones
     do_initialize
     #@layout.build_invert_menu
   end
@@ -686,6 +733,21 @@ class Arcadia < TkApplication
 
   end
   
+  def register_key_binding(_self_target, k, v)
+    value = v.strip
+    key_dits = k.split('[')
+    return if k.length == 0
+    key_event=key_dits[0]
+    if key_dits[1]
+      key_sym=key_dits[1][0..-2]
+    end
+    @root.bind_append(key_event){|e|
+      if key_sym == e.keysym
+        Arcadia.process_event(_self_target.instance_eval(value))
+      end
+    }
+  end
+  
   def load_key_binding(_ext='')
     return unless _ext && ext_active?(_ext)
     if _ext.length > 0 
@@ -701,18 +763,7 @@ class Arcadia < TkApplication
     end
     keybs=Arcadia.conf_group(suf)
     keybs.each{|k,v|
-      value = v.strip
-      key_dits = k.split('[')
-      next if k.length == 0
-      key_event=key_dits[0]
-      if key_dits[1]
-        key_sym=key_dits[1][0..-2]
-      end
-      @root.bind_append(key_event){|e|
-        if key_sym == e.keysym
-          Arcadia.process_event(_self_on_eval.instance_eval(value))
-        end
-      }
+      register_key_binding(_self_on_eval, k, v)
     }
   end
   
@@ -767,6 +818,7 @@ class Arcadia < TkApplication
             'type'=>'ok_cancel', 
             'title' => "(Arcadia) #{_user_control.class::SUF}", 
             'msg'=>msg,
+            'exception'=>$!,
             'level'=>'error')=='cancel'
             raise
             exit
@@ -964,7 +1016,26 @@ class Arcadia < TkApplication
   def Arcadia.conf_group(_path, _refresh=false)
     Configurable.properties_group(_path, Arcadia.instance['conf'], 'conf', _refresh)
   end
-  
+
+  def Arcadia.conf_group_copy(_path_source, _path_target, _suff = 'conf')
+    _target = conf_group(_path_source)
+    _postfix = _path_target.sub(_path_source,"")
+    _target.each{|k,v|
+      if ["frames.labels","frames.names","name"].include?(k)
+        v_a = v.split(',')
+        new_val = ''
+        v_a.each{|value|
+          if new_val.length > 0
+            new_val = "#{new_val},"
+          end
+          new_val = "#{new_val}#{value}#{_postfix}"
+        }
+        v = new_val
+      end
+      @@instance['conf']["#{_path_target}.#{k}"]=v
+    }
+  end
+ 
   def Arcadia.persistent(_property, _value=nil, _immediate=false)
     if @@instance
       if _value.nil?
@@ -1157,9 +1228,12 @@ class Arcadia < TkApplication
   end
 
   def Arcadia.runtime_error(_e, _title="Runtime Error")
-    ArcadiaProblemEvent.new(self, "type"=>ArcadiaProblemEvent::RUNTIME_ERROR_TYPE,"title"=>"#{_title}:#{_e.message}", "detail"=>_e.backtrace).go!
+    ArcadiaProblemEvent.new(self, "type"=>ArcadiaProblemEvent::RUNTIME_ERROR_TYPE,"title"=>"#{_title} : [#{_e.class}] #{_e.message} at :", "detail"=>_e.backtrace).go!
   end 
 
+  def Arcadia.runtime_error_msg(_msg, _title="Runtime Error")
+    ArcadiaProblemEvent.new(self, "type"=>ArcadiaProblemEvent::RUNTIME_ERROR_TYPE,"title"=>"#{_title} at :", "detail"=>_msg).go!
+  end 
 end
 
 class ArcadiaUserControl
@@ -1841,6 +1915,7 @@ class ArcadiaProblemsShower
     @initialized = true
     if @problems.count > 0   
       show_problems
+      @ff.show
     end
   end
   
@@ -1871,7 +1946,7 @@ class ArcadiaProblemsShower
   def initialize_gui
     # float_frame
     args = {'width'=>600, 'height'=>300, 'x'=>400, 'y'=>100}
-    @ff = @arcadia.layout.new_float_frame(args).hide
+    @ff = @arcadia.layout.add_float_frame(args).hide
     @ff.title("Arcadia problems")
 
     #tree
@@ -2249,16 +2324,29 @@ class ArcadiaDialogManager
     end
     tktype = type.gsub('_','').downcase
     
+    if _event.msg && _event.msg.length > 500
+      msg = _event.msg[0..500]+' ...'
+    else
+      msg = _event.msg
+    end
+    
     tkdialog =  Tk::BWidget::MessageDlg.new(
             'icon' => icon,
             'bg' => Arcadia.conf('background'),
             'fg' => Arcadia.conf('foreground'),
             'type' => tktype,
             'title' => _event.title, 
-            'message' => _event.msg)
+            'message' => msg)
             
     tkdialog.configure('font'=>'courier 6')        
     res = tkdialog.create
+    if _event.level == 'error'
+      if _event.exception != nil
+        Arcadia.runtime_error(_event.exception, _event.title)
+      else
+        Arcadia.runtime_error_msg(_event.msg, _event.title)
+      end
+    end
     _event.add_result(self, 'value'=>res_array[res.to_i])
   end
 
@@ -2301,7 +2389,11 @@ class ArcadiaLayout
     @panels = Hash.new
     @panels['_domain_root_']= Hash.new
     @panels['_domain_root_']['root']= _frame
-    @panels['_domain_root_']['sons'] = 	Hash.new
+    @panels['_domain_root_']['sons'] = Hash.new
+    
+    @panels['nil'] = Hash.new
+    @panels['nil']['root'] = TkTitledFrameAdapter.new(self.root)
+    
     @autotab = _autotab
     @headed = false
     @wrappers=Hash.new
@@ -2597,6 +2689,9 @@ class ArcadiaLayout
     saved_root_splitted_frames = @panels[_domain]['root_splitted_frames']
     _saved = Hash.new
     _saved.update(@panels[_domain]['sons'])
+    _saved.each_key{|name|
+      @panels['nil']['root'].change_adapters(name, @panels[_domain]['root'].transient_frame_adapter[name])
+    }     
     geometry = TkWinfo.geometry(@panels[_domain]['root'])
     width = geometry.split('x')[0].to_i/2
     _saved.each{|name,ffw|
@@ -2609,7 +2704,8 @@ class ArcadiaLayout
     build_titled_frame(domain_name(_row.to_i,_col.to_i+1))
     _saved.each{|name,ffw|
       ffw.domain = _domain
-      register_panel(ffw, ffw.hinner_frame)    
+      register_panel(ffw, ffw.hinner_frame)
+  	   @panels[_domain]['root'].change_adapters(name, @panels['nil']['root'].transient_frame_adapter[name])    
     }
     if saved_root_splitted_frames
       @panels[_domain]['root_splitted_frames']=saved_root_splitted_frames
@@ -2621,6 +2717,9 @@ class ArcadiaLayout
     saved_root_splitted_frames = @panels[_domain]['root_splitted_frames']
     _saved = Hash.new
     _saved.update(@panels[_domain]['sons'])
+    _saved.each_key{|name|
+      @panels['nil']['root'].change_adapters(name, @panels[_domain]['root'].transient_frame_adapter[name])
+    }    
     geometry = TkWinfo.geometry(@panels[_domain]['root'])
     height = geometry.split('+')[0].split('x')[1].to_i/2
     _saved.each{|name,ffw|
@@ -2633,7 +2732,8 @@ class ArcadiaLayout
     build_titled_frame(domain_name(_row.to_i+1,_col.to_i))
     _saved.each{|name,ffw|
       ffw.domain = _domain
-      register_panel(ffw, ffw.hinner_frame)    
+      register_panel(ffw, ffw.hinner_frame)
+  	   @panels[_domain]['root'].change_adapters(name, @panels['nil']['root'].transient_frame_adapter[name])
     }
     if saved_root_splitted_frames
       @panels[_domain]['root_splitted_frames']=saved_root_splitted_frames
@@ -2840,6 +2940,9 @@ class ArcadiaLayout
     else
       other_source_save = Hash.new
       other_source_save.update(@panels[other_domain]['sons']) if @panels[other_domain]
+      other_source_save.each_key{|name|
+        @panels['nil']['root'].change_adapters(name, @panels[other_domain]['root'].transient_frame_adapter[name])
+      }     
       other_source_save.each{|name,ffw|
         unregister_panel(ffw, false, false)
       }
@@ -2851,6 +2954,7 @@ class ArcadiaLayout
       other_source_save.each{|name,ffw|
         ffw.domain = other_domain
         register_panel(ffw, ffw.hinner_frame)
+    	   @panels[other_domain]['root'].change_adapters(name, @panels['nil']['root'].transient_frame_adapter[name])
       }
       parent_splitted_adapter = find_splitted_frame(@panels[other_domain]['root'])
       if  parent_splitted_adapter
@@ -2874,14 +2978,14 @@ class ArcadiaLayout
   
   def add_commons_menu_items(_domain, _menu)
       _menu.insert('end', :separator)
-      _menu.insert('end',:command,
+      _menu.insert('end', :command,
           :label=>"add column",
           :image=>Arcadia.image_res(ADD_GIF),
           :compound=>'left',
           :command=>proc{add_cols_runtime(_domain)},
           :hidemargin => true
       )
-      _menu.insert('end',:command,
+      _menu.insert('end', :command,
           :label=>"add row",
           :image=>Arcadia.image_res(ADD_GIF),
           :compound=>'left',
@@ -2889,7 +2993,7 @@ class ArcadiaLayout
           :hidemargin => true
       )
       if @panels.keys.length > 2
-        _menu.insert('end',:command,
+        _menu.insert('end', :command,
             :label=>"close",
             :image=>Arcadia.image_res(CLOSE_FRAME_GIF),
             :compound=>'left',
@@ -2977,12 +3081,12 @@ class ArcadiaLayout
       register_panel(ffw2, ffw2.hinner_frame)
       #@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'].save_caption(ffw2.name, @panels[source_domain]['root'].last_caption(ffw2.name), @panels[source_domain]['root'].last_caption_image(ffw2.name))
+      @panels[source_domain]['root'].save_caption(ffw1.name, @panels[_target_domain]['root'].last_caption(ffw1.name), @panels[_target_domain]['root'].last_caption_image(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))
+      @panels[_target_domain]['root'].change_adapters(ffw2.name, @panels[source_domain]['root'].forge_transient_adapter(ffw2.name))
+      @panels[source_domain]['root'].change_adapters(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)
@@ -2990,13 +3094,16 @@ class ArcadiaLayout
       register_panel(ffw2, ffw2.hinner_frame)
       #@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'].save_caption(ffw2.name, @panels[source_domain]['root'].last_caption(ffw2.name), @panels[source_domain]['root'].last_caption_image(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))
+      @panels[_target_domain]['root'].change_adapters(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)
+      if @panels['nil']['root'].transient_frame_adapter[ffw2.name]
+    	   @panels[ffw2.domain]['root'].change_adapters(ffw2.name, @panels['nil']['root'].transient_frame_adapter[ffw2.name])
+      end
       #@panels[_target_domain]['root'].top_text('')
     end
     # refresh -----
@@ -3074,7 +3181,6 @@ class ArcadiaLayout
     
   end
 
-  
   def build_invert_menu(refresh_commons_items=false)
     @panels.keys.each{|dom|
       if dom != '_domain_root_' && @panels[dom] && @panels[dom]['root']
@@ -3124,7 +3230,7 @@ class ArcadiaLayout
         root_frame = pan['root'].frame
         pan['root'].title(_title)
         pan['root'].restore_caption(_name)
-   	    pan['root'].change_adapter_name(_name)
+   	    pan['root'].change_adapters_name(_name)
         if !root_frame.instance_of?(TkFrameAdapter) && num==0
           if _adapter
             adapter = _adapter
@@ -3155,8 +3261,8 @@ class ArcadiaLayout
             'raisecmd'=>proc{
   					    pan['root'].title(api.title)
   					    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))
+  					    pan['root'].change_adapters_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)
             }
@@ -3177,12 +3283,12 @@ class ArcadiaLayout
           'raisecmd'=>proc{
             pan['root'].title(_title)            
             pan['root'].restore_caption(_name) 
-            pan['root'].change_adapter_name(_name)
+            pan['root'].change_adapters_name(_name)
       	     Arcadia.process_event(LayoutRaisingFrameEvent.new(self,'extension_name'=>_ffw.extension_name, 'frame_name'=>_ffw.name))
 #            changed
 #            notify_observers('RAISE', _name)
           }
-        		)
+        )
         if _adapter
           adapter = _adapter
         else
@@ -3201,7 +3307,7 @@ class ArcadiaLayout
     else
       _ffw.domain = nil
       process_frame(_ffw)
-      return TkFrameAdapter.new(self.root)
+       return TkFrameAdapter.new(self.root)
 #
 #      Arcadia.dialog(self, 
 #        'type'=>'ok',
@@ -3221,6 +3327,7 @@ class ArcadiaLayout
     _name = _ffw.name
     @panels[_domain_name]['sons'][_name].hinner_frame.detach_frame
     if delete_wrapper
+      @wrappers[_name].root.clear_transient_adapters(_name)
       @wrappers.delete(_name).hinner_frame.destroy 
     else
       @wrappers[_name].domain=nil
@@ -3235,7 +3342,7 @@ class ArcadiaLayout
       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]['root'].change_adapters_name(n)
 
       @panels[_domain_name]['notebook'].destroy
       @panels[_domain_name]['notebook']=nil
@@ -3248,7 +3355,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('')
+      @panels[_domain_name]['root'].top_text_clear
     end
     build_invert_menu if refresh_menu
   end
@@ -3279,7 +3386,7 @@ class ArcadiaLayout
     @panels[_domain_name]['root'].frame
   end
   
-  def new_float_frame(_args=nil)
+  def add_float_frame(_args=nil)
     if _args.nil?
      _args = {'x'=>10, 'y'=>10, 'width'=>100, 'height'=>100}
     end
@@ -3456,6 +3563,7 @@ end
 require 'tk/clipboard'
 
 class FocusEventManager
+  attr_reader :last_focus_widget
   def initialize
     Arcadia.attach_listener(self, FocusEvent)
     Arcadia.attach_listener(self, InputEvent)