arcadia 0.5.1 → 0.6.0

data/ext/ae-file-history/ae-file-history.conf

@@ -1,6 +1,7 @@
 name=file_history
-labels=File history
 frames=0.0
+frames.labels=File history
+frames.names=file_history
 active=yes
 require=ext/ae-file-history/ae-file-history
 class=FilesHistrory

data/ext/ae-file-history/ae-file-history.rb

@@ -189,6 +189,7 @@ class FilesHistrory < ArcadiaExt
 
 	def on_after_build(_event)
     Arcadia.attach_listener(self, OpenBufferEvent)
+    #Arcadia.attach_listener(self, BufferRaisedEvent)
     self.frame.show
     #Arcadia.attach_listener(self, CloseBufferEvent)
 	end

data/ext/ae-output/ae-output.conf

@@ -1,6 +1,7 @@
 name=output
-labels=Output
 frames=1.1
+frames.labels=Output
+frames.names=output
 active=yes
 require=ext/ae-output/ae-output
 class=Output

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

@@ -449,7 +449,7 @@ class PropLineReadOnly
   def initialize(_bodyprops, _key, _value)
     @bodyprops = _bodyprops
     @key = _key
-    @splitted_frame = AGTkVSplittedFrames.new(@bodyprops.host, 85)
+    @splitted_frame = AGTkVSplittedFrames.new(@bodyprops.host,@bodyprops.host, 85)
     @propkey = TkLabel.new(@splitted_frame.left_frame, Arcadia.style('label')){
       text _key
       justify 'right'
@@ -552,7 +552,7 @@ class InspectList
     #  @pwind.place('width' => -15)
       @bar = TkScrollbar.new(_host, Arcadia.style('scrollbar')).pack('side'=>'right', 'fill'=>'y')
     end
-    @pwind = AGTkVSplittedFrames.new(_host,_left_width)
+    @pwind = AGTkVSplittedFrames.new(_host,_host,_left_width)
     
     background = _host.cget('background')
     common_properties = {'relief'=>'flat','state'=>'disabled', 'borderwidth'=>0, 'background'=>background}
@@ -588,6 +588,7 @@ class InspectList
   end
 
 	def new_right_width
+	  new_width = 0
 		font_size = TkFont.new(@right_text.cget('font')).size
     w=TkPlace.info(@pwind.right_frame)['width']
     dw = TkPlace.info(@pwind.left_frame)['width']
@@ -1126,7 +1127,7 @@ class Obji
     @controller = _controller
     @filename = _filename
     @frame = _frame
-    @pmainwind = AGTkOSplittedFrames.new(@frame,20)
+    @pmainwind = AGTkOSplittedFrames.new(@frame,@frame,20)
     @f_top =  @pmainwind.top_frame
     @f_bottom =  @pmainwind.bottom_frame
     @lb = TkMenuButtonObjBoard.new(@f_top, self)

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

@@ -1,6 +1,7 @@
 name=rad
-labels=Rad,Object Inspector
 frames=0.0
+frames.labels=Rad,Object Inspector
+frames.names=rad,rad_object_inspector
 float_frames=200x220+10+10
 float_labels=Rad
 active=yes

data/ext/ae-rad/lib/tk/al-tkarcadia.rb

@@ -1,25 +1,25 @@
-#
-#   al-tkarcadia.rb - Arcadia Ruby ide
-#   by Antonio Galeone <antonio-galeone@rubyforge.org>
-#
-require 'ext/ae-rad/lib/tk/al-tk'
-require 'lib/a-tkcommons'
-
-class WAGTkVSplittedFrames < AGTkFrame
-  def WAGTkVSplittedFrames.class_wrapped
-    AGTkVSplittedFrames
-  end
-  def new_object
-    @obj = AGTkVSplittedFrames.new(@ag_parent.obj)
-  end
-
-  def properties
-    super()
-  end
-end
-
-class ArcadiaLibArcadiaTk < ArcadiaLib
-  def register_classes
-    self.add_class(WAGTkVSplittedFrames)
-  end
-end
+#
+#   al-tkarcadia.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
+require 'ext/ae-rad/lib/tk/al-tk'
+require 'lib/a-tkcommons'
+
+class WAGTkVSplittedFrames < AGTkFrame
+  def WAGTkVSplittedFrames.class_wrapped
+    AGTkVSplittedFrames
+  end
+  def new_object
+    @obj = AGTkVSplittedFrames.new(@ag_parent.obj, @ag_parent.obj)
+  end
+
+  def properties
+    super()
+  end
+end
+
+class ArcadiaLibArcadiaTk < ArcadiaLib
+  def register_classes
+    self.add_class(WAGTkVSplittedFrames)
+  end
+end

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

@@ -1,8 +1,9 @@
 #========================================
 #========================================
 name=ruby-debug
-labels=Ruby Debug
-frames=0.0
+frames=0.0,1.1
+frames.labels=Debug Inspector,Debug Server
+frames.names=ruby_debug_inspector,ruby_debug_server
 active=yes
 require=ext/ae-ruby-debug/ae-ruby-debug
 class=RubyDebug

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

@@ -9,8 +9,9 @@ class RubyDebugView
   B_STATE_ON = '+'
   B_STATE_OFF = '-'
   B_STATE_FREEZE = '=' 
-  def initialize(_frame, _controller)
-    @frame = _frame
+  def initialize(_controller)
+    @frame = _controller.frame.hinner_frame
+    @frame_server = _controller.frame(1).hinner_frame
     @controller = _controller
     self.build_ui
     @controller.rdc.add_listener(self)
@@ -103,13 +104,14 @@ class RubyDebugView
     
     self.build_buttons_set
     
-    sf = AGTkOSplittedFrames.new(@debug_frame,70)
+#    sf = AGTkOSplittedFrames.new(@debug_frame,@debug_frame,70)
 
     #-------------------------------------------------
-    build_process_panel(sf.top_frame)
+    build_process_panel(@frame_server)
+#    build_process_panel(sf.top_frame)
     #-------------------------------------------------
 
-    @enb = Tk::BWidget::NoteBook.new(sf.bottom_frame, Arcadia.style('tabpanel')){
+    @enb = Tk::BWidget::NoteBook.new(@debug_frame, Arcadia.style('tabpanel')){
       tabbevelsize 0
       internalborderwidth 2
       place('relwidth' => 1,'relheight' => '1')
@@ -1347,6 +1349,7 @@ class RubyDebugClient
   def set_breakpoint(_file, _line)
     #_line = _line + 1
     text = read("break #{_file}:#{_line}")
+    #p text
     breakpoint_no = -1
     #matches = text.match(/Set breakpoint ([0-9]*)?/)
     matches = text.downcase.match(/breakpoint ([0-9]*)?/)
@@ -1531,7 +1534,7 @@ class RubyDebug < ArcadiaExt
         #Arcadia.new_msg(self,@rds.to_s)
         
         @rdc = RubyDebugClient.new(self, conf('server.host'), conf('server.port'), conf('server.timeout')) if @rdc.nil?
-        @rdv = RubyDebugView.new(self.frame.hinner_frame, self) if @rdv.nil?
+        @rdv = RubyDebugView.new(self) if @rdv.nil?
         self.frame.show
         @rdv.start_process(_filename)
         if @rdc.start_session
@@ -1559,6 +1562,7 @@ class RubyDebug < ArcadiaExt
 
   def debug_free
     self.frame.free
+    self.frame(1).free
     @rdc = nil
     @rdv = nil
   end

data/ext/ae-search-in-files/ae-search-in-files.conf

@@ -1,6 +1,7 @@
 name=search_in_files
-labels=Search in files
 frames=1.1
+frames.labels=Search in files
+frames.names=search_in_files
 active=yes
 require=ext/ae-search-in-files/ae-search-in-files
 class=SearchInFilesService

data/lib/a-commons.rb

@@ -64,16 +64,20 @@ end
 
 class FixedFrameWrapper < AbstractFrameWrapper
 #  include AbstractFrameWrapper
-  def initialize(_arcadia, _point, _name, _title='')
-    @arcadia = _arcadia
-    @point =_point
+  attr_accessor :domain
+  attr_reader :name
+  attr_reader :title
+  attr_reader :extension
+  def initialize(_extension, _domain, _name, _title='')
+    @extension = _extension
+    @domain =_domain
     @name = _name
     @title = _title
     fixed_frame_forge
   end
   
   def fixed_frame_forge
-    @fixed_frame = @arcadia.layout.register_panel(@point, @name, @title) if @fixed_frame.nil?
+    @fixed_frame = Arcadia.layout.register_panel(self) if @fixed_frame.nil?
   end
   private :fixed_frame_forge
   
@@ -82,25 +86,26 @@ class FixedFrameWrapper < AbstractFrameWrapper
     @fixed_frame
   end
   
-  def title(_title=nil)
+  def top_text(_top_text=nil)
     fixed_frame_forge
-    @arcadia.layout.domain(@point)['root'].top_text(_title)
+    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
-    @arcadia.layout.raise_panel(@point, @name)
+    Arcadia.layout.raise_panel(@domain, @name)
   end
   
   def hide
   end
   
   def raised?
-    @arcadia.layout.raised?(@point, @name)
+    Arcadia.layout.raised?(@domain, @name)
   end
   
   def free
-    @arcadia.layout.unregister_panel(@point, @name)
+    Arcadia.layout.unregister_panel(self)
     @fixed_frame = nil
   end
 end
@@ -179,7 +184,8 @@ class ArcadiaExt
     @name = _name
     @frames = Array.new
     @frames_points = conf_array("#{_name}.frames")
-    @frames_labels = conf_array("#{_name}.labels")
+    @frames_labels = conf_array("#{_name}.frames.labels")
+    @frames_names = conf_array("#{_name}.frames.names")
     @float_frames = Array.new
     @float_geometries = conf_array("#{_name}.float_frames")
     @float_labels = conf_array("#{_name}.float_labels")
@@ -196,7 +202,8 @@ class ArcadiaExt
   def frame(_n=0)
 	  if @frames[_n] == nil && @frames_points[_n]
 	    (@frames_labels[_n].nil?)? _label = @name : _label = @frames_labels[_n]
-	    @frames[_n] =  FixedFrameWrapper.new(@arcadia, @frames_points[_n], @name, _label)
+	    (@frames_names[_n].nil?)? _name = @name : _name = @frames_names[_n]
+	    @frames[_n] =  FixedFrameWrapper.new(@name, @frames_points[_n], _name, _label)
 	  end
     return @frames[_n]
   end
@@ -483,25 +490,40 @@ module Configurable
   end
   
 
-  def resolve_link(_v, _hash_source, _link_symbol='>>>')
+  def resolve_link(_value, _hash_source, _link_symbol='>>>', _add_symbol='+++')
+      if _value.length > 0 
+        _v, _vadd = _value.split(_add_symbol)
+      else
+        _v = _value
+      end
       if _v.length > 3 && _v[0..2]==_link_symbol
         _v=_hash_source[_v[3..-1]] if _hash_source[_v[3..-1]]
+        _v=_v+_vadd if _vadd
       end
       return _v
   end
   
-  def resolve_properties_link(_hash_target, _hash_source, _link_symbol='>>>')
+  def resolve_properties_link(_hash_target, _hash_source, _link_symbol='>>>', _add_symbol='+++')
     loop_level_max = 10
 #    _hash_adding = Hash.new
     _keys_to_extend = Array.new
-    _hash_target.each{|k,v|
+    _hash_target.each{|k,value|
       loop_level = 0
+      if value.length > 0
+	v, vadd = value.split(_add_symbol)
+      else
+	v= value
+      end
+#      p "value=#{value} class=#{value.class}"
+#      p "v=#{v} class=#{v.class}"
+#      p "vadd=#{vadd}"
       while loop_level < loop_level_max && v.length > 3 && v[0..2]==_link_symbol
         if k[-1..-1]=='.'
           _keys_to_extend << k
           break
         elsif _hash_source[v[3..-1]]
           v=_hash_source[v[3..-1]]
+          v=v+vadd if vadd
         else
           break
         end
@@ -547,7 +569,7 @@ module Persistable
       f = File.new(_persist_file, "w+")
       begin
         if f
-          if _persistent_property
+          if _persistent_key
               f.syswrite(_persistent_key+'='+_persistent_value+"\n")
           end
         end

data/lib/a-contracts.rb

@@ -33,6 +33,16 @@ end
 class FinalizeEvent < ArcadiaEvent
 end
 
+# +------------------------------------------+
+#     Generic Layout Event 
+#     
+# +------------------------------------------+
+class LayoutRaisingFrameEvent < ArcadiaEvent
+  attr_accessor :extension_name
+  attr_accessor :frame_name
+end
+
+
 #  +---------------------------------------------+
 #         Buffer event
 #  +---------------------------------------------+
@@ -95,6 +105,7 @@ end
 
 class SetBreakpointEvent < DebugEvent
    attr_accessor :active
+   attr_accessor :line_code
 end
 
 class UnsetBreakpointEvent < DebugEvent

data/lib/a-core.rb

@@ -23,7 +23,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.5.1',
+        '0.6.0',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
@@ -46,7 +46,9 @@ class Arcadia < TkApplication
     }
     @on_event = Hash.new
 
-    @main_menu_bar = TkMenubar.new('background'=> self['conf']['background']).pack('fill'=>'x')
+    @main_menu_bar = TkMenubar.new(
+      'background'=> self['conf']['background']
+    ).pack('fill'=>'x')
     @mf_root = Tk::BWidget::MainFrame.new(@root,
      'background'=> self['conf']['background']
       ){
@@ -91,6 +93,7 @@ class Arcadia < TkApplication
       }
     end
     Arcadia.attach_listener(self, QuitEvent)
+    Arcadia.persistent("version", self['applicationParams'].version)
   end
   
   def on_quit(_event)
@@ -240,8 +243,8 @@ class Arcadia < TkApplication
           end
           
         rescue Exception
-          msg = "Loading layout"
-          if Arcadia.dialog(self, 'type'=>'ok_cancel', 'title' => '(Arcadia) Layout', 'msg'=>msg)=='cancel'
+          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'
             raise
             exit
           else
@@ -325,6 +328,7 @@ class Arcadia < TkApplication
     }
     load_user_control(@main_menu,"","e")
     load_user_control(@main_toolbar,"","e")
+    #@layout.build_invert_menu
   end
 
   def load_user_control(_user_control, _ext='', _pre='')
@@ -449,6 +453,11 @@ class Arcadia < TkApplication
 	  end
   end
 
+  def Arcadia.layout
+    if @@instance
+        return @@instance.layout
+	  end
+  end
 
 #  def Arcadia.res(_res)
 #    theme = Arcadia.instance['conf']['theme']
@@ -870,12 +879,12 @@ class ArcadiaAboutSplash < TkToplevel
       place('width'=>-5,'relwidth' => 1,'x' => 5,'y' => 175,'height' => 19)
     }
     @tkLabel21 = TkLabel.new(self){
-      text  'by Antonio Galeone - 2008'
+      text  'by Antonio Galeone - 2004/2009'
       background  _bgcolor
       foreground  '#ffffff'
       font Arcadia.instance['conf']['splash.credits.font']
       justify  'left'
-      place('width' => '190','x' => 130,'y' => 146,'height' => 19)
+      place('width' => '210','x' => 100,'y' => 146,'height' => 19)
     }
     @progress  = TkVariable.new
     reset
@@ -984,12 +993,13 @@ end
 
 
 class ArcadiaLayout
-  include Observable
-  ArcadiaPanelInfo = Struct.new( "ArcadiaPanelInfo",
-    :name,
-    :title,
-    :frame
-  )
+#  include Observable
+#  ArcadiaPanelInfo = Struct.new( "ArcadiaPanelInfo",
+#    :name,
+#    :title,
+#    :frame,
+#    :ffw
+#  )
 
   def initialize(_arcadia, _frame, _autotab=true)
     @arcadia = _arcadia
@@ -1005,6 +1015,7 @@ class ArcadiaLayout
     @panels['_domain_root_']['sons'] = 	Hash.new
     @autotab = _autotab
     @headed = false
+    @wrappers=Hash.new
     #ArcadiaContractListener.new(self, MainContract, :do_main_event)
   end
 	
@@ -1024,43 +1035,67 @@ class ArcadiaLayout
 #    @panels[_domain_name]['notebook'].raise(_name) if @panels[_domain_name] && @panels[_domain_name]['notebook']
 #  end
 
-	def raised?(_domain, _extension)
-    ret = false
+	def raised?(_domain, _name)
+    ret = true
     p = @panels[_domain]
     if p && p['notebook'] != nil
-      ret=p['notebook'].raise == _extension
+      ret=p['notebook'].raise == _name
+    end
+    ret
+	end
+	
+	def raised_fixed_frame(_domain)
+	  ret = nil
+	  p = @panels[_domain]
+    if p && p['notebook'] != nil
+      raised_name=p['notebook'].raise
+   	  @panels[_domain]['sons'].each{|k,v|
+   	    if raised_name == k 
+   	      ret = v 
+   	      break
+   	    end
+   	  }
+    elsif @panels[_domain]['sons'].length == 1
+      ret = @panels[_domain]['sons'].values[0]
     end
     ret
 	end
 	
   def _prepare_rows(_row,_col, _height, _perc=false, _top_name=nil, _bottom_name=nil)
     if (@frames[_row][_col] !=  nil)
-      _h = AGTkOSplittedFrames.new(@frames[_row][_col],_height, @arcadia['conf']['layout.splitter.length'].to_i,_perc)
+      #source_domains = all_domains(@frames[_row][_col])
+      #source_domains = others_domains(@frames[_row][_col], false)
+      _h = AGTkOSplittedFrames.new(self.root,@frames[_row][_col],_height, @arcadia['conf']['layout.splitter.length'].to_i,_perc)
       if @frames[_row + 1] == nil
       		@frames[_row + 1] = Array.new
       		@domains[_row + 1] = Array.new
       end
       @frames[_row][_col] = _h.top_frame
-# TODO: bisogna schiftare di uno tutti i frame a partire da _row + 1
-#      if @frames[_row + 1][_col] != nil
-#        if @frames[_row + 2] == nil
-#        		@frames[_row + 2] = Array.new
-#        		@domains[_row + 2] = Array.new
-#        end
-#        @frames[_row + 2][_col]=@frames[_row + 1][_col]
-#      end
-      @frames[_row + 1][_col] = _h.bottom_frame
-
+      
       _top_name = _row.to_s+'.'+_col.to_s if _top_name == nil
       @panels[_top_name] = Hash.new
       @panels[_top_name]['root'] = @frames[_row][_col]
       @panels[_top_name]['sons'] = 	Hash.new
+      if @panels[_top_name]['root_splitted_frames'].nil?
+        @panels[_top_name]['root_splitted_frames'] = _h 
+      end
+      @panels[_top_name]['splitted_frames'] = _h
       @domains[_row][_col] = _top_name
 
       _bottom_name = (_row+1).to_s+'.'+_col.to_s if _bottom_name == nil
+      
+      if !@panels[_bottom_name].nil?
+        shift_bottom(_row+1, _col)
+      end
+      
       @panels[_bottom_name] = Hash.new
+      @frames[_row + 1][_col] = _h.bottom_frame
       @panels[_bottom_name]['root'] = @frames[_row + 1][_col]
       @panels[_bottom_name]['sons'] = Hash.new
+      if @panels[_bottom_name]['root_splitted_frames'].nil?
+        @panels[_bottom_name]['root_splitted_frames'] = _h 
+      end
+      @panels[_bottom_name]['splitted_frames'] = _h
     		@domains[_row + 1][_col] = _bottom_name
     end
   end
@@ -1074,27 +1109,186 @@ class ArcadiaLayout
   		_prepare_rows(_row,_col, _height, true, _top_name, _bottom_name)
   end
 
+#  def others_domains(_frame, _vertical=true)
+#      if _vertical
+#        splitter_adapter_class = AGTkVSplittedFrames
+#      else
+#        splitter_adapter_class = AGTkOSplittedFrames
+#      end
+#      splitted_adapter = find_splitted_frame(_frame)
+#      consider_it = splitted_adapter.instance_of?(splitter_adapter_class) && splitted_adapter.frame1 == _frame
+#      if splitted_adapter && !consider_it && splitted_adapter != _frame
+#         rif_frame = splitted_adapter.frame
+#         ret = others_domains(rif_frame)
+#      elsif splitted_adapter && consider_it
+#        ret = domains_on_frame(splitted_adapter.frame2)
+#      else
+#        ret = Array.new
+#      end
+#      ret    
+#  end
+
+  def all_domains(_frame)
+      splitted_adapter = find_splitted_frame(_frame)
+      consider_it = splitted_adapter.kind_of?(AGTkSplittedFrames)
+      if consider_it
+        ret = domains_on_frame(splitted_adapter.frame2).concat(domains_on_frame(splitted_adapter.frame1))
+      else
+        ret = Array.new
+      end
+      ret    
+  end
+
+  def all_domains_cols(_frame)
+    ret = Array.new
+    all_domains(_frame).each{|d|
+      v = d.split('.')[1]
+      ret << v if !ret.include?(v)
+    }
+    ret
+  end
+
+  def all_domains_rows(_frame)
+    ret = Array.new
+    all_domains(_frame).each{|d|
+      v = d.split('.')[0]
+      ret << v if !ret.include?(v)
+    }
+    ret
+  end
+
+
   def _prepare_cols(_row,_col, _width, _perc=false, _left_name=nil, _right_name=nil)
     if (@frames[_row][_col] !=  nil)
-      _w = AGTkVSplittedFrames.new(@frames[_row][_col],_width,@arcadia['conf']['layout.splitter.length'].to_i,_perc)
+      #source_domains = all_domains(@frames[_row][_col])
+      #source_domains = others_domains(@frames[_row][_col])
+      _w = AGTkVSplittedFrames.new(self.root,@frames[_row][_col],_width,@arcadia['conf']['layout.splitter.length'].to_i,_perc)
       @frames[_row][_col] = _w.left_frame
-      @frames[_row][_col + 1] = _w.right_frame
+      #@frames[_row][_col + 1] = _w.right_frame
 
       _left_name = _row.to_s+'.'+_col.to_s if _left_name == nil
       @panels[_left_name] = Hash.new
       @panels[_left_name]['root'] = @frames[_row][_col]
       @panels[_left_name]['sons'] = Hash.new
+      if @panels[_left_name]['root_splitted_frames'].nil?
+        @panels[_left_name]['root_splitted_frames'] = _w 
+      end
+      @panels[_left_name]['splitted_frames'] = _w
       @domains[_row][_col] = _left_name
-
+        
       _right_name = _row.to_s+'.'+(_col+1).to_s if _right_name == nil
+      if !@panels[_right_name].nil?
+        shift_right(_row, _col+1)
+      end
+
+      @frames[_row][_col + 1] = _w.right_frame
       @panels[_right_name] = Hash.new
       @panels[_right_name]['root'] = @frames[_row][_col + 1]
       @panels[_right_name]['sons'] = Hash.new
+      if @panels[_right_name]['root_splitted_frames'].nil?
+        @panels[_right_name]['root_splitted_frames'] = _w 
+      end
+      @panels[_right_name]['splitted_frames'] = _w
       @domains[_row][_col + 1] = _right_name
     end
   end
  	private :_prepare_cols
   
+  
+  def domain_name(_row,_col)
+    _row.to_s+'.'+_col.to_s
+  end
+  
+  def shift_right(_row,_col)
+    d = domain_name(_row, _col+1)
+    dj = domain_name(_row, _col)
+    if @panels[d] !=nil
+      shift_right(_row,_col+1)
+    end
+    Arcadia.console(self,'msg'=>"shifto a destra #{dj} (su #{d})")
+    @panels[d] = @panels[dj]
+    #-------------------------------
+    #@panels[d]['root'].set_domain(d)
+    #-------------------------------
+    @panels[d]['sons'].each{|name,ffw| ffw.domain=d}
+    @frames[_row][_col+1] = @frames[_row][_col]
+    @domains[_row][_col+1] = @domains[_row][_col]
+    
+    @panels.delete(dj)
+    #@panels[dj] = nil
+    @frames[_row][_col] = nil
+    @domains[_row][_col] = nil
+  end
+
+  def shift_left(_row,_col)
+    d = domain_name(_row, _col)
+    dj = domain_name(_row, _col+1)
+    if @panels[dj] !=nil
+      Arcadia.console(self,'msg'=>"shifto a sinista #{dj} (su #{d})")
+      @panels[d] = @panels[dj]
+      #-------------------------------
+      #@panels[d]['root'].set_domain(d)
+      #-------------------------------
+      @panels[d]['sons'].each{|name,ffw| ffw.domain=d}
+      @frames[_row][_col] = @frames[_row][_col+1]
+      @domains[_row][_col] = @domains[_row][_col+1]
+      
+      @panels.delete(dj) # = nil
+      @frames[_row][_col+1] = nil
+      @domains[_row][_col+1] = nil
+      shift_left(_row,_col+1)
+    end
+  
+  end
+
+  def shift_top(_row,_col)
+    d = domain_name(_row, _col)
+    dj = domain_name(_row+1, _col)
+    if @panels[dj] !=nil
+      Arcadia.console(self,'msg'=>"shifto su #{dj} (su #{d})")
+      @panels[d] = @panels[dj]
+      #-------------------------------
+      #@panels[d]['root'].set_domain(d)
+      #-------------------------------
+      @panels[d]['sons'].each{|name,ffw| ffw.domain=d}
+      @frames[_row][_col] = @frames[_row+1][_col]
+      @domains[_row][_col] = @domains[_row+1][_col]
+      
+      @panels.delete(dj) # = nil
+      @frames[_row+1][_col] = nil
+      @domains[_row+1][_col] = nil
+
+      shift_top(_row+1,_col)
+    end
+  
+  end
+
+
+  def shift_bottom(_row, _col)
+    d = domain_name(_row+1, _col)
+    dj = domain_name(_row, _col)
+    if @panels[d] !=nil
+      shift_bottom(_row+1,_col)
+    end
+    Arcadia.console(self,'msg'=>"shifto giu #{dj} (su #{d})")
+    @panels[d] = @panels[dj]
+    #-------------------------------
+    #@panels[d]['root'].set_domain(d)
+    #-------------------------------
+    @panels[d]['sons'].each{|name,ffw| ffw.domain=d}
+    if @frames[_row + 1] == nil
+    		@frames[_row + 1] = Array.new
+    		@domains[_row + 1] = Array.new
+    end
+    @frames[_row+1][_col] = @frames[_row][_col]
+    @domains[_row+1][_col] = @domains[_row][_col]
+    
+    @panels.delete(dj)
+    #@panels[dj] = nil
+    @frames[_row][_col] = nil
+    @domains[_row][_col] = nil
+  end
+  
   def add_cols(_row,_col, _width, _left_name=nil, _right_name=nil)
     _prepare_cols(_row,_col, _width, false, _left_name, _right_name)
   end
@@ -1103,10 +1297,578 @@ class ArcadiaLayout
     _prepare_cols(_row,_col, _width, true, _left_name, _right_name)
   end
 
+  def add_cols_runtime(_domain)
+    saved_root_splitted_frames = @panels[_domain]['root_splitted_frames']
+    _saved = Hash.new
+    _saved.update(@panels[_domain]['sons'])
+    geometry = TkWinfo.geometry(@panels[_domain]['root'])
+    width = geometry.split('x')[0].to_i/2
+    _saved.each{|name,ffw|
+      unregister_panel(ffw, false, false)
+    }
+    unbuild_titled_frame(_domain)
+    _row,_col = _domain.split('.')
+    add_cols(_row.to_i,_col.to_i, width)
+    build_titled_frame(_domain)
+    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)    
+    }
+    if saved_root_splitted_frames
+      @panels[_domain]['root_splitted_frames']=saved_root_splitted_frames
+    end
+    build_invert_menu(true)
+  end
+
+  def add_rows_runtime(_domain)
+    saved_root_splitted_frames = @panels[_domain]['root_splitted_frames']
+    _saved = Hash.new
+    _saved.update(@panels[_domain]['sons'])
+    geometry = TkWinfo.geometry(@panels[_domain]['root'])
+    height = geometry.split('+')[0].split('x')[1].to_i/2
+    _saved.each{|name,ffw|
+      unregister_panel(ffw, false, false)
+    }
+    unbuild_titled_frame(_domain)
+    _row,_col = _domain.split('.')
+    add_rows(_row.to_i,_col.to_i, height)
+    build_titled_frame(_domain)
+    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)    
+    }
+    if saved_root_splitted_frames
+      @panels[_domain]['root_splitted_frames']=saved_root_splitted_frames
+    end
+
+    build_invert_menu(true)
+  end
+
+  def domains_on_frame_rows(_frame)
+    ret = Array.new
+    domains_on_frame(_frame).each{|d|
+      v = d.split('.')[0]
+      ret << v if !ret.include?(v)
+    }
+    ret
+  end
+  
+  def domains_rows(_domains)
+    ret = Array.new
+    if _domains
+      _domains.each{|d|
+        v = d.split('.')[0]
+        ret << v if !ret.include?(v)
+      }
+    end
+    ret
+  end
+
+  def max_col(_domains, _row)
+    ret = 0
+    if _domains
+      _domains.each{|d|
+        r,c = d.split('.')
+        if r.to_i == _row && c.to_i > ret
+          ret = c.to_i
+        end
+      }
+    end
+    ret
+  end
+
+  def max_row(_domains, _col)
+    ret = 0
+    if _domains
+      _domains.each{|d|
+        r,c = d.split('.')
+        if c.to_i == _col && r.to_i > ret
+          ret = r.to_i
+        end
+      }
+    end
+    ret
+  end
+
+  def domains_cols(_domains)
+    ret = Array.new
+    _domains.each{|d|
+      v = d.split('.')[1]
+      ret << v if !ret.include?(v)
+    }
+    ret
+  end
+
+  
+  def domains_on_frame_cols(_frame)
+    ret = Array.new
+    domains_on_frame(_frame).each{|d|
+      v = d.split('.')[1]
+      ret << v if !ret.include?(v)
+    }
+    ret
+  end
+
+  def domains_on_splitter(_splitter)
+    domains_on_frame(_splitter.frame1).concat(domains_on_frame(_splitter.frame2))  
+  end
+
+  def domains_on_splitter_cols(_splitter)
+    ret = Array.new
+    domains_on_splitter(_splitter).each{|d|
+      v = d.split('.')[1]
+      ret << v if !ret.include?(v)
+    }
+    ret
+  end
+
+  def domains_on_splitter_rows(_splitter)
+    ret = Array.new
+    domains_on_splitter(_splitter).each{|d|
+      v = d.split('.')[0]
+      ret << v if !ret.include?(v)
+    }
+    ret
+  end
+
+
+  def domains_on_frame(_frame)
+    ret_doms = Array.new
+    frame_found = false
+    @panels.keys.each{|dom|
+      if dom != '_domain_root_'
+         if (@panels[dom]['splitted_frames'] != nil && @panels[dom]['splitted_frames'].frame == _frame) || (@panels[dom]['root_splitted_frames'] != nil && @panels[dom]['root_splitted_frames'].frame  == _frame)
+           ret_doms.concat(domains_on_frame(@panels[dom]['splitted_frames'].frame1))
+           ret_doms.concat(domains_on_frame(@panels[dom]['splitted_frames'].frame2))
+           frame_found = true
+           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
+             ret_doms << dom
+             frame_found = true
+           end       
+         elsif @panels[dom]['root'].instance_of?(TkTitledFrame) && @panels[dom]['root'].parent == _frame 
+             ret_doms << dom
+             frame_found = true
+         end
+      end
+    }    
+    
+    if !frame_found
+      cfrs = TkWinfo.children(_frame)
+      if cfrs && cfrs.length == 1 && cfrs[0].instance_of?(TkTitledFrame)
+        @wrappers.each{|name, ffw|
+          if ffw.hinner_frame.frame == cfrs[0].frame
+            ret_doms << ffw.domain 
+          end
+        }
+      end
+    end
+    return 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
+      # verifichiamo se la contro parte è uno splitter_adapter
+      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
+    while splitted_frame != nil && !splitted_frame.kind_of?(AGTkSplittedFrames)
+      splitted_frame = TkWinfo.parent(splitted_frame)
+    end
+    splitted_frame
+  end
+#--
+  def close_runtime(_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
+      other_ds = domains_on_frame(@panels[_domain]['splitted_frames'].frame2)
+    elsif @frames[_row.to_i][_col.to_i] == splitted_adapter.frame2
+      other_ds = domains_on_frame(@panels[_domain]['splitted_frames'].frame1)
+    end
+
+    return if other_ds.nil?    
+
+
+    if other_ds.length == 1
+      other_domain = other_ds[0]
+    elsif other_ds.length > 1
+      max = other_ds.length-1
+      j = 0
+      while j <= max
+        if other_domain.nil?
+          other_domain = other_ds[j]
+        else
+          r,c = other_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
+            other_domain = other_ds[j]
+          end
+        end
+        j = j+1
+      end
+    end
+    _other_row, _other_col = other_domain.split('.')
+    @panels[_domain]['sons'].each{|name,ffw|
+      unregister_panel(ffw, false, false)
+    }
+    unbuild_titled_frame(_domain)
+
+    if @panels[other_domain]['splitted_frames'] != @panels[_domain]['splitted_frames']
+      if @panels[other_domain]['root_splitted_frames'].frame == @panels[_domain]['splitted_frames'].frame1 || @panels[other_domain]['root_splitted_frames'].frame == @panels[_domain]['splitted_frames'].frame2
+        other_root_splitted_adapter = @panels[other_domain]['root_splitted_frames']
+      elsif @panels[other_domain]['splitted_frames']
+        other_root_splitted_adapter = @panels[other_domain]['splitted_frames']
+      end
+    end
+
+    @panels.delete(_domain)
+    @frames[_row.to_i][_col.to_i] = nil
+    @domains[_row.to_i][_col.to_i] = nil
+
+    if other_root_splitted_adapter
+      if other_root_splitted_adapter != @panels[other_domain]['splitted_frames']
+        other_ds.each{|d|
+          if @panels[d]['root_splitted_frames'] == splitted_adapter
+            @panels[d]['root_splitted_frames']=other_root_splitted_adapter
+          end
+        }
+      end
+      other_root_splitted_adapter.detach_frame
+      splitted_adapter.detach_frame
+      splitted_adapter.destroy
+      other_root_splitted_adapter.attach_frame(splitted_adapter_frame)
+    else
+      other_source_save = Hash.new
+      other_source_save.update(@panels[other_domain]['sons']) if @panels[other_domain]
+      other_source_save.each{|name,ffw|
+        unregister_panel(ffw, false, false)
+      }
+      splitted_adapter.detach_frame
+      splitted_adapter.destroy
+      @panels[other_domain]['root']=splitted_adapter_frame
+      @frames[_other_row.to_i][_other_col.to_i] = splitted_adapter_frame
+      build_titled_frame(other_domain)
+      other_source_save.each{|name,ffw|
+        ffw.domain = other_domain
+        register_panel(ffw, ffw.hinner_frame)
+      }
+      parent_splitted_adapter = find_splitted_frame(@panels[other_domain]['root'])
+      if  parent_splitted_adapter
+        @panels[other_domain]['splitted_frames']=parent_splitted_adapter
+      else
+        @panels[other_domain]['splitted_frames']= nil
+      end
+    end
+    build_invert_menu(true)
+  end
+
+#--
+  
+  def unbuild_titled_frame(domain)
+    if @panels[domain]
+      parent = @panels[domain]['root'].parent
+      @panels[domain]['root'].destroy
+      @panels[domain]['root']=parent
+    end
+  end
+  
+  def add_commons_menu_items(_domain, _menu)
+      _menu.insert('end', :separator)
+      _menu.insert('end',:command,
+          :label=>"add column",
+          :image=>TkPhotoImage.new('dat'=>ADD_GIF),
+          :compound=>'left',
+          :command=>proc{add_cols_runtime(_domain)},
+          :hidemargin => true
+      )
+      _menu.insert('end',:command,
+          :label=>"add row",
+          :image=>TkPhotoImage.new('dat'=>ADD_GIF),
+          :compound=>'left',
+          :command=>proc{add_rows_runtime(_domain)},
+          :hidemargin => true
+      )
+      if @panels.keys.length > 2
+        _menu.insert('end',:command,
+            :label=>"close",
+            :image=>TkPhotoImage.new('dat'=>CLOSE_FRAME_GIF),
+            :compound=>'left',
+            :command=>proc{close_runtime(_domain)},
+            :hidemargin => true
+        )
+      end
+  end
+  
+  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')
+      # add commons item
+      menu = mb.cget('menu')
+      add_commons_menu_items(domain, menu)
+      @panels[domain]['root']= tframe
+      #-----------------------------------
+#      class << tframe
+#        def set_domain(_domain)
+#          if @label_domain.nil?
+#            @label_domail = TkLabel.new(self.frame, 'text'=>_domain).pack
+#          else
+#            @label_domain.configure('text'=>_domain)
+#          end
+#        end
+#      end
+#      tframe.set_domain(domain)
+      #-----------------------------------
+    end
+  end
+  
   def add_headers
     @domains.each{|row|
       row.each{|domain|
-        @panels[domain]['root']= TkTitledFrame.new(@panels[domain]['root']).place('x'=>0, 'y'=>0,'relheight'=>1, 'relwidth'=>1)  if @panels[domain]
+        build_titled_frame(domain)
       }
     }
     @headed = true
@@ -1124,89 +1886,323 @@ class ArcadiaLayout
     @panels[_domain_name]['sons'][_name] != nil
   end
 
-  def register_panel(_domain_name, _name, _title)
-    #p "register #{_name} ------ 1"
-    p = @panels[_domain_name]
-    if p!=nil
-      num = p['sons'].length
+  def change_domain(_target_domain, _source_name)
+    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
+    if source_has_domain && @panels[source_domain]['sons'].length ==1 && @panels[_target_domain]['sons'].length > 0
+      # change ------
+      ffw1 = raised_fixed_frame(_target_domain)
+      ffw2 = @panels[source_domain]['sons'].values[0]
+      unregister_panel(ffw1,false,false) if ffw1
+      unregister_panel(ffw2,false,false)
+      ffw1.domain = source_domain if ffw1
+      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)
+    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('')
+    elsif !source_has_domain
+      ffw2 = @wrappers[_source_name]
+      ffw2.domain = _target_domain
+      register_panel(ffw2, ffw2.hinner_frame)
+      @panels[_target_domain]['root'].top_text('')
+    end
+    # refresh -----
+    build_invert_menu
+  end
+
+
+#  def change_domain_old(_dom1, _dom2, _name2)
+#    tt1= @panels[_dom1]['root'].top_text
+#    tt2= @panels[_dom2]['root'].top_text
+#    if  @panels[_dom2]['sons'].length ==1 && @panels[_dom1]['sons'].length > 0
+#      # change ------
+#      ffw1 = raised_fixed_frame(_dom1)
+#      ffw2 = @panels[_dom2]['sons'].values[0]
+#      unregister_panel(ffw1,false,false) if ffw1
+#      unregister_panel(ffw2,false,false)
+#      ffw1.domain = _dom2 if ffw1
+#      ffw2.domain = _dom1
+#      register_panel(ffw1, ffw1.hinner_frame) if ffw1
+#      register_panel(ffw2, ffw2.hinner_frame)
+#      @panels[_dom1]['root'].top_text(tt2)
+#      @panels[_dom2]['root'].top_text(tt1)
+#    elsif @panels[_dom2]['sons'].length > 1
+#      ffw2 = @panels[_dom2]['sons'][_name2]
+#      unregister_panel(ffw2, false, false)
+#      ffw2.domain = _dom1
+#      register_panel(ffw2, ffw2.hinner_frame)
+#      @panels[_dom1]['root'].top_text(tt2)
+#      @panels[_dom2]['root'].top_text('')
+#    end
+#    # refresh -----
+#    build_invert_menu
+#  end
+
+  def process_frame(_ffw)
+  #def process_frame(_domain_name, _frame_name)
+    #domain_root = @panels[_domain_name]['sons'][_frame_name]
+    @panels.keys.each{|dom|
+      if  dom != '_domain_root_' && dom != _ffw.domain && @panels[dom] && @panels[dom]['root']
+        menu = @panels[dom]['root'].menu_button('ext').cget('menu')
+        menu.insert('0',:command,
+              :label=>_ffw.title,
+              :image=>TkPhotoImage.new('dat'=>ARROW_LEFT_GIF),
+              :compound=>'left',
+              :command=>proc{change_domain(dom, _ffw.name)},
+              :hidemargin => true
+        )
+      end
+    }
+  end
+
+  
+  def build_invert_menu(refresh_commons_items=false)
+    @panels.keys.each{|dom|
+      if dom != '_domain_root_' && @panels[dom] && @panels[dom]['root']
+        menu = @panels[dom]['root'].menu_button('ext').cget('menu')
+        if refresh_commons_items
+           @panels[dom]['root'].menu_button('ext').cget('menu').delete('0','end')
+           add_commons_menu_items(dom, menu)
+        else
+          if @panels.keys.length > 2
+            i=menu.index('end').to_i-4
+          else
+            i=menu.index('end').to_i-3
+          end
+          if i >= 0
+            end_index = i.to_s
+            @panels[dom]['root'].menu_button('ext').cget('menu').delete('0',end_index)
+          end
+        end
+      end
+    }
+    
+    @wrappers.each{|name,ffw|
+      process_frame(ffw) #if ffw.domain
+    }
+  end
+  
+#  def register_panel_old(_domain_name, _name, _title)
+#    p = @panels[_domain_name]
+#    if p!=nil
+#      num = p['sons'].length
+#      if @headed
+#        p['root'].title(_title)
+#        if !p['root'].frame.instance_of?(TkFrameAdapter)
+#          wrapper = TkFrameAdapter.new(self.root, Arcadia.style('frame'))
+#          wrapper.attach_frame(p['root'].frame)
+#          p['root'].frame=wrapper
+#        end
+#        root_frame = p['root'].frame
+#        process_register_panel(_domain_name)
+#      else
+#        root_frame = p['root']
+#      end
+#      if (num == 0 && @autotab)
+#        api = ArcadiaPanelInfo.new(_name,_title,nil)
+#        api.frame = TkFrame.new(root_frame, Arcadia.style('panel')).place('x'=>0, 'y'=>0, 'relwidth'=>1, 'relheight'=>1)
+#        p['sons'][_name] = api
+#        return api.frame
+#      else
+#        if num == 1 && @autotab &&  p['notebook'] == nil
+#          p['notebook'] = Tk::BWidget::NoteBook.new(root_frame, Arcadia.style('tabpanel')){
+#            tabbevelsize 0
+#            internalborderwidth 0
+#            pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
+#          }
+#          api = p['sons'].values[0]
+#          api_tab_frame = p['notebook'].insert('end',
+#            api.name,
+#            'text'=>api.title,
+#            'raisecmd'=>proc{
+#  					    p['root'].title(api.title)
+#  					    p['root'].top_text('')            
+#               changed
+#              notify_observers('RAISE', api.name)
+#            }
+#          )
+#          api.frame.place('in'=>api_tab_frame, 'x'=>0, 'y'=>0, 'relwidth'=>1, 'relheight'=>1)
+#          api.frame.raise
+#        elsif (num==0 && !@autotab)
+#          p['notebook'] = Tk::BWidget::NoteBook.new(root_frame){
+#            tabbevelsize 0
+#            internalborderwidth 0
+#            pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
+#          }
+#        end
+#        _panel = p['notebook'].insert('end',_name , 
+#        		'text'=>_title, 
+#          'raisecmd'=>proc{
+#					  p['root'].title(_title)            
+#            changed
+#            notify_observers('RAISE', _name)
+#          }
+#        		)
+#        p['sons'][_name] = ArcadiaPanelInfo.new(_name,_title,_panel)
+#        p['notebook'].raise(_name)
+#        return _panel
+#      end
+#    else
+#      Arcadia.dialog(self, 
+#        'type'=>'ok',
+#        'msg'=>"domain #{_domain_name} do not exist\nfor '#{_title}'!",
+#        'level'=>'warning' 
+#      )
+#      float_frame = new_float_frame
+#      float_frame.title(_title)
+#      return float_frame.frame
+#    end
+#  end
+
+  def register_panel(_ffw, _adapter=nil)
+    _domain_name = _ffw.domain
+    _name = _ffw.name
+    _title = _ffw.title
+    pan = @panels[_domain_name]
+    @wrappers[_name]=_ffw
+    if pan!=nil
+      num = pan['sons'].length
       if @headed
-        p['root'].title(_title)
-        root_frame = p['root'].frame
+        pan['root'].title(_title)
+        if !pan['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.raise
+          #@wrappers[_name]=wrapper
+        end
+        root_frame = pan['root'].frame
       else
-        root_frame = p['root']
+        root_frame = pan['root']
       end
       if (num == 0 && @autotab)
-    #p "register #{_name} ------ 2"
-        api = ArcadiaPanelInfo.new(_name,_title,nil)
-        api.frame = TkFrame.new(root_frame, Arcadia.style('panel')).place('x'=>0, 'y'=>0, 'relwidth'=>1, 'relheight'=>1)
-        p['sons'][_name] = api
-        return api.frame
+        #api = ArcadiaPanelInfo.new(_name,_title,wrapper,_ffw)
+        pan['sons'][_name] = _ffw
+        process_frame(_ffw)
+        return adapter
       else
-        if num == 1 && @autotab &&  p['notebook'] == nil
-    #p "register #{_name} ------ 3"
-          p['notebook'] = Tk::BWidget::NoteBook.new(root_frame, Arcadia.style('tabpanel')){
+        if num == 1 && @autotab &&  pan['notebook'] == nil
+          pan['notebook'] = Tk::BWidget::NoteBook.new(root_frame, Arcadia.style('titletabpanel')){
             tabbevelsize 0
             internalborderwidth 0
             pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
           }
-          api = p['sons'].values[0]
-          api_tab_frame = p['notebook'].insert('end',
-          api.name,
-          'text'=>api.title,
-          'raisecmd'=>proc{
-					  p['root'].title(api.title)
-					  p['root'].top_text('')            
-            changed
-            notify_observers('RAISE', api.name)
-          }
+          api = pan['sons'].values[0]
+          api_tab_frame = pan['notebook'].insert('end',
+            api.name,
+            'text'=>api.title,
+            'raisecmd'=>proc{
+  					    pan['root'].title(api.title)
+  					    pan['root'].top_text('') 
+         	     Arcadia.process_event(LayoutRaisingFrameEvent.new(self,'extension_name'=>_ffw.extension, 'frame_name'=>_ffw.name))
+
+#               changed
+#               notify_observers('RAISE', api.name)
+            }
           )
-          api.frame.place('in'=>api_tab_frame, 'x'=>0, 'y'=>0, 'relwidth'=>1, 'relheight'=>1)
-          api.frame.raise
+          adapter = api.hinner_frame
+          adapter.detach_frame
+          adapter.attach_frame(api_tab_frame)
+          api.hinner_frame.raise
         elsif (num==0 && !@autotab)
-    #p "register #{_name} ------ 4"
-          p['notebook'] = Tk::BWidget::NoteBook.new(root_frame){
+          pan['notebook'] = Tk::BWidget::NoteBook.new(root_frame, Arcadia.style('titletabpanel')){
             tabbevelsize 0
             internalborderwidth 0
             pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
           }
         end
-     #   p "---- insert in notebook #{_name} "
-        _panel = p['notebook'].insert('end',_name , 
+        _panel = pan['notebook'].insert('end',_name , 
         		'text'=>_title, 
-        		#'background'=>_tab_bg,
           'raisecmd'=>proc{
-					  p['root'].title(_title)            
-            changed
-            notify_observers('RAISE', _name)
+					  pan['root'].title(_title)            
+      	     Arcadia.process_event(LayoutRaisingFrameEvent.new(self,'extension_name'=>_ffw.extension, 'frame_name'=>_ffw.name))
+#            changed
+#            notify_observers('RAISE', _name)
           }
         		)
-        p['sons'][_name] = ArcadiaPanelInfo.new(_name,_title,_panel)
-        p['notebook'].raise(_name)
+        if _adapter
+          adapter = _adapter
+        else
+          adapter = TkFrameAdapter.new(self.root, Arcadia.style('frame'))
+        end
+        adapter.attach_frame(_panel)
+        adapter.raise
+        _panel=adapter
+        #@wrappers[_name]=wrapper
+        #p['sons'][_name] = ArcadiaPanelInfo.new(_name,_title,_panel,_ffw)
+        pan['sons'][_name] = _ffw
+        pan['notebook'].raise(_name)
+        process_frame(_ffw)
         return _panel
       end
     else
-      Arcadia.dialog(self, 
-        'type'=>'ok',
-        'msg'=>"domain #{_domain_name} do not exist\nfor '#{_title}'!",
-        'level'=>'warning' 
-      )
-      float_frame = new_float_frame
-      float_frame.title(_title)
-      return float_frame.frame
+      _ffw.domain = nil
+      process_frame(_ffw)
+      return TkFrameAdapter.new(self.root, Arcadia.style('frame'))
+      
+#
+#      Arcadia.dialog(self, 
+#        'type'=>'ok',
+#        'msg'=>"domain #{_domain_name} do not exist\nfor '#{_title}'!",
+#        'level'=>'warning' 
+#      )
+#      float_frame = new_float_frame
+#      float_frame.title(_title)
+#      return float_frame.frame
     end
   end
 
-  def unregister_panel(_domain_name, _name)
+
+  def unregister_panel(_ffw, delete_wrapper=true, refresh_menu=true)
     #p "unregister #{_name} ------> 1"
+    _domain_name = _ffw.domain
+    _name = _ffw.name
+    @panels[_domain_name]['sons'][_name].hinner_frame.detach_frame
+    if delete_wrapper
+      @wrappers.delete(_name).hinner_frame.destroy 
+    else
+      @wrappers[_name].domain=nil
+    end
     @panels[_domain_name]['sons'].delete(_name)
     #p "unregister #{_name} ------> 2"
-    #p @panels[_domain_name]['notebook'].pages
-    @panels[_domain_name]['notebook'].delete(_name) if @panels[_domain_name]['notebook'].index(_name) > 0
-    #p "unregister #{_name} ------> 3"
-    new_raise_key = @panels[_domain_name]['sons'].keys[@panels[_domain_name]['sons'].length-1]
-    #p "unregister #{_name} ------> 4"
-    @panels[_domain_name]['notebook'].raise(new_raise_key)
-    #p "unregister #{_name} ------> 5"
+    if @panels[_domain_name]['sons'].length == 1
+      w = @panels[_domain_name]['sons'].values[0].hinner_frame
+      t = @panels[_domain_name]['sons'].values[0].title
+      w.detach_frame
+      w.attach_frame(@panels[_domain_name]['root'].frame)
+      @panels[_domain_name]['root'].title(t)
+      @panels[_domain_name]['notebook'].destroy
+      @panels[_domain_name]['notebook']=nil
+    elsif @panels[_domain_name]['sons'].length > 1
+      @panels[_domain_name]['notebook'].delete(_name) if @panels[_domain_name]['notebook'].index(_name) > 0
+      #p "unregister #{_name} ------> 3"
+      new_raise_key = @panels[_domain_name]['sons'].keys[@panels[_domain_name]['sons'].length-1]
+      #p "unregister #{_name} ------> 4"
+      @panels[_domain_name]['notebook'].raise(new_raise_key)
+      #p "unregister #{_name} ------> 5"
+    elsif @panels[_domain_name]['sons'].length == 0
+      @panels[_domain_name]['root'].title('')
+    end
+    build_invert_menu if refresh_menu
+  end
+
+  def view_panel
+  end
+
+  def hide_panel
   end
 
   def [](_row, _col)
@@ -1217,6 +2213,10 @@ class ArcadiaLayout
     @panels[_domain_name]['sons'][_name].frame
   end
 
+#  def domain_for_frame(_domain_name, _name)
+#    domain(@panels[_domain_name]['sons'][_name].domain)
+#  end
+
   def domain(_domain_name)
     @panels[_domain_name]
   end