arcadia 0.12.2 → 0.13.0

data/lib/a-contracts.rb

@@ -115,6 +115,8 @@ class OpenBufferEvent < BufferEvent
 end
 
 class OpenBufferTransientEvent < OpenBufferEvent
+  # @transient is a boolean property setted to true during event elaboration if the file is considered transient  
+  attr_accessor :transient 
 end
 
 class CloseBufferEvent < BufferEvent
@@ -174,12 +176,32 @@ end
 
 class BufferClosedEvent < BufferEvent
 end
+
+#  +---------------------------------------------+
+#         Bookmark event
+#  +---------------------------------------------+
+
+class BookmarkEvent < ArcadiaEvent
+   #range  around row where event has effect 
+   attr_accessor :id, :file, :row, :persistent, :range, :from_row, :to_row , :content
+end
+
+class SetBookmarkEvent < BookmarkEvent
+end
+
+class UnsetBookmarkEvent < BookmarkEvent
+end
+
+class ToggleBookmarkEvent < BookmarkEvent
+end
+
+
 #  +---------------------------------------------+
 #         Debug event
 #  +---------------------------------------------+
 
 class DebugEvent < ArcadiaEvent
-   attr_accessor :id, :file, :row, :active, :persistent 
+   attr_accessor :id, :file, :row, :active, :persistent
 end
 
 class SetBreakpointEvent < DebugEvent

data/lib/a-core.rb

@@ -24,7 +24,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.12.2',
+        '0.13.0',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
@@ -178,10 +178,16 @@ class Arcadia < TkApplication
   end
 
   def register(_ext)
+    if @@instance['exts_map'] == nil
+      @@instance['exts_map'] = Hash.new
+    end
     @exts_i << _ext
+    @@instance['exts_map'][_ext.name]=_ext 
   end
 
   def unregister(_ext)
+    @@instance['exts_map'][_ext.name] = nil
+    @@instance['exts_map'].delete(_ext.name)
     @exts_i.delete(_ext)
   end
 
@@ -367,7 +373,7 @@ class Arcadia < TkApplication
   def do_make_clones
     Array.new.concat(@exts_i).each{|ext|
       if ext.kind_of?(ArcadiaExtPlus)
-        a = ext.conf_array("#{ext.name}.clones")
+        a = ext.conf_array("clones")
         a.each{|clone_name|
           ext.clone(clone_name)
         }
@@ -1253,6 +1259,12 @@ class Arcadia < TkApplication
     end
   end
 
+  def Arcadia.extension(_name=nil)
+    if _name && @@instance && @@instance['exts_map']
+      return @@instance['exts_map'][_name]
+    end
+  end
+
   def Arcadia.runtime_error(_e, _title=Arcadia.text("main.e.runtime.title"))
     ArcadiaProblemEvent.new(self, "type"=>ArcadiaProblemEvent::RUNTIME_ERROR_TYPE,"title"=>"#{_title} : [#{_e.class}] #{_e.message} at :", "detail"=>_e.backtrace).go!
   end
@@ -1480,16 +1492,16 @@ class ArcadiaMainMenu < ArcadiaUserControl
     end
   end
 
-  def get_sub_menu(menu_context, folder=nil)
-    if folder
-      s_i = -1
-      i_end = menu_context.index('end')
+  def ArcadiaMainMenu.sub_menu(_menu, _title=nil)
+    s_i = -1
+    if _title
+      i_end = _menu.index('end')
       if i_end
         0.upto(i_end){|j|
-          type = menu_context.menutype(j)
+          type = _menu.menutype(j)
           if type != 'separator'
-            l = menu_context.entrycget(j,'label')
-            if l == folder && type == 'cascade'
+            l = _menu.entrycget(j,'label')
+            if l == _title && type == 'cascade'
               s_i = j
               break
             end
@@ -1497,9 +1509,17 @@ class ArcadiaMainMenu < ArcadiaUserControl
         }
       end
     end
-    if s_i > -1 #&& menu_context.menutype(s_i) == 'cascade'
-      sub = menu_context.entrycget(s_i, 'menu')
+    if s_i > -1
+      sub = _menu.entrycget(s_i, 'menu')
     else
+      sub = nil
+    end
+    sub  
+  end
+
+  def get_sub_menu(menu_context, folder=nil)
+    sub = ArcadiaMainMenu.sub_menu(menu_context, folder)
+    if sub.nil?
       sub = TkMenu.new(
       :parent=>@pop_up,
       :tearoff=>0
@@ -2493,6 +2513,7 @@ class ArcadiaLayout
       p['sons'].each{|k,v|
         if k == _extension
           v.hinner_frame.raise
+          #title_titled_frame(_domain, v.title)
           p['root'].title(v.title)
           p['root'].restore_caption(k)
           p['root'].change_adapters_name(k)
@@ -3108,13 +3129,37 @@ class ArcadiaLayout
     end
 
   end
+  
+#  def title_titled_frame(_domain, _text)
+#    mb = @panels[_domain]['root'].menu_button('ext') if @panels[_domain]
+#    if mb
+#      #mb.configure('text'=>_text)
+#      mb.cget('textvariable').value=_text
+#      p "configuro #{_text}"
+#    end 
+#  end
 
   def build_titled_frame(domain)
     if @panels[domain]
       tframe = TkTitledFrameAdapter.new(@panels[domain]['root']).place('x'=>0, 'y'=>0,'relheight'=>1, 'relwidth'=>1)
-      mb = tframe.add_fixed_menu_button('ext')
+#      mb = tframe.add_fixed_menu_button('ext')
+
+#      mb = tframe.add_fixed_menu_button(
+#        'ext',
+#        nil,
+#        'left',
+#      {'relief'=>:flat, 
+#       'borderwidth'=>1, 
+#       'compound'=> 'left',
+#       'anchor'=>'w',
+#       'activebackground'=>Arcadia.conf('titlelabel.background'),
+#       'foreground' => Arcadia.conf('titlecontext.foreground'),
+#       'textvariable'=> TkVariable.new('')
+#       })
+
       # add commons item
-      menu = mb.cget('menu')
+#      menu = mb.cget('menu')
+      menu = tframe.title_menu
       add_commons_menu_items(domain, menu)
       @panels[domain]['root']= tframe
       #-----------------------------------
@@ -3272,31 +3317,85 @@ class ArcadiaLayout
     exist
   end
   
+  def menu_item_add(_menu, _dom, _ffw, _is_plus=false)
+    if !menu_item_exist?(_menu, _ffw.title)
+      ind = sorted_menu_index(_menu, _ffw.title)
+      if _is_plus
+        if Arcadia.extension(_ffw.name).main_instance? 
+          submenu_title = _ffw.title
+        else
+          submenu_title = Arcadia.extension(_ffw.name).main_instance.frame_title
+        end
+        submenu = nil
+        newlabel = "New ..."
+        if menu_item_exist?(_menu, submenu_title)
+          submenu = ArcadiaMainMenu.sub_menu(_menu, submenu_title)
+        end
+        if submenu.nil?
+          submenu = TkMenu.new(
+            :parent=>_menu,
+            :tearoff=>0,
+            :title => submenu_title
+          )
+          submenu.extend(TkAutoPostMenu)
+          submenu.configure(Arcadia.style('menu'))
+          _menu.insert(ind,
+            :cascade,
+            :image=>Arcadia.image_res(ARROW_LEFT_GIF),
+            :label=>submenu_title,
+            :compound=>'left',
+            :menu=>submenu,
+            :hidemargin => false
+          )
+          submenu.insert('end',:command,
+            :label=>newlabel,
+            :image=>Arcadia.image_res(STAR_EMPTY_GIF),
+            :compound=>'left',
+            :command=>proc{Arcadia.extension(_ffw.name).main_instance.duplicate(nil, _dom)},
+            :hidemargin => true
+          )
+        end
+        submenu.insert(newlabel,:command,
+          :label=>_ffw.title,
+          :image=>Arcadia.image_res(ARROW_LEFT_GIF),
+          :compound=>'left',
+          :command=>proc{change_domain(_dom, _ffw.name)},
+          :hidemargin => true
+        )
+
+      else
+          _menu.insert(ind,:command,
+          :label=>_ffw.title,
+          :image=>Arcadia.image_res(ARROW_LEFT_GIF),
+          :compound=>'left',
+          :command=>proc{change_domain(_dom, _ffw.name)},
+          :hidemargin => true
+        )
+      end
+    end
+  end
 
   def process_frame(_ffw)
     #p "processo frame #{_ffw.title}"
+    #-------
+    is_plus = Arcadia.extension(_ffw.name).kind_of?(ArcadiaExtPlus)
+    #-------
     @panels.keys.each{|dom|
       if  dom != '_domain_root_' && dom != _ffw.domain && @panels[dom] && @panels[dom]['root']
         titledFrame = @panels[dom]['root']
         if titledFrame.instance_of?(TkTitledFrameAdapter)
-          menu = @panels[dom]['root'].menu_button('ext').cget('menu')
-          if !menu_item_exist?(menu, _ffw.title)
-            ind = sorted_menu_index(menu, _ffw.title)
-              menu.insert(ind,:command,
-              :label=>_ffw.title,
-              :image=>Arcadia.image_res(ARROW_LEFT_GIF),
-              :compound=>'left',
-              :command=>proc{change_domain(dom, _ffw.name)},
-              :hidemargin => true
-            )
-          end
+          #menu = @panels[dom]['root'].menu_button('ext').cget('menu')
+          menu = titledFrame.title_menu
+          menu_item_add(menu, dom, _ffw, is_plus)
         end
       end
     }
     if @panels[_ffw.domain]
       titledFrame = @panels[_ffw.domain]['root']
       if titledFrame.instance_of?(TkTitledFrameAdapter)
-        mymenu = titledFrame.menu_button('ext').cget('menu')
+        #titledFrame.menu_button('ext').text("#{_ffw.title}::")
+        #mymenu = titledFrame.menu_button('ext').cget('menu')
+        mymenu = titledFrame.title_menu
         index = mymenu.index('end').to_i
         if @panels.keys.length > 2
           i=index-3
@@ -3318,7 +3417,6 @@ class ArcadiaLayout
             )
           end
         else
-#          if raised_name(_ffw.domain) == _ffw.name
            if !menu_item_exist?(mymenu, clabel)
              mymenu.insert(index,:command,
                :label=> clabel,
@@ -3328,18 +3426,7 @@ class ArcadiaLayout
                :hidemargin => true
              )
            end
-#          else
-            if !menu_item_exist?(mymenu, _ffw.title)
-              ind = sorted_menu_index(mymenu, _ffw.title)
-              mymenu.insert(ind,:command,
-                :label=>_ffw.title,
-                :image=>Arcadia.image_res(ARROW_LEFT_GIF),
-                :compound=>'left',
-                :command=>proc{change_domain(_ffw.domain, _ffw.name)},
-                :hidemargin => true
-              )
-            end
-#          end
+           menu_item_add(mymenu, _ffw.domain, _ffw, is_plus)
         end
       end
     end
@@ -3353,9 +3440,11 @@ class ArcadiaLayout
       if dom != '_domain_root_' && @panels[dom] && @panels[dom]['root']
         titledFrame = @panels[dom]['root']
         if titledFrame.instance_of?(TkTitledFrameAdapter)
-          menu = titledFrame.menu_button('ext').cget('menu')
+          #menu = titledFrame.menu_button('ext').cget('menu')
+          menu = titledFrame.title_menu
           if refresh_commons_items
-            @panels[dom]['root'].menu_button('ext').cget('menu').delete('0','end')
+            #@panels[dom]['root'].menu_button('ext').cget('menu').delete('0','end')
+            @panels[dom]['root'].title_menu.delete('0','end')
             add_commons_menu_items(dom, menu)
           else
             index = menu.index('end').to_i
@@ -3374,7 +3463,8 @@ class ArcadiaLayout
             end
             if i >= 0
               end_index = i.to_s
-              @panels[dom]['root'].menu_button('ext').cget('menu').delete('0',end_index)
+              #@panels[dom]['root'].menu_button('ext').cget('menu').delete('0',end_index)
+              @panels[dom]['root'].title_menu.delete('0',end_index)
             end
           end
           #          index = menu.index('end').to_i
@@ -3404,6 +3494,7 @@ class ArcadiaLayout
       num = pan['sons'].length
       if @headed
         root_frame = pan['root'].frame
+        #title_titled_frame(_domain_name, _title)
         pan['root'].title(_title)
         pan['root'].restore_caption(_name)
         pan['root'].change_adapters_name(_name)
@@ -3439,6 +3530,7 @@ class ArcadiaLayout
             api.name,
             'text'=>api.title,
             'raisecmd'=>proc{
+              #title_titled_frame(_domain_name, api.title)
               pan['root'].title(api.title)
               pan['root'].restore_caption(api.name)
               pan['root'].change_adapters_name(api.name)
@@ -3459,6 +3551,7 @@ class ArcadiaLayout
           _panel = pan['notebook'].insert('end',_name ,
           'text'=>_title,
           'raisecmd'=>proc{
+            #title_titled_frame(_domain_name, _title)
             pan['root'].title(_title)
             pan['root'].restore_caption(_name)
             pan['root'].change_adapters_name(_name)
@@ -3523,6 +3616,7 @@ class ArcadiaLayout
       n = @panels[_domain_name][:raised_stack][-1]
       w = @panels[_domain_name]['sons'][n].hinner_frame
       t = @panels[_domain_name]['sons'][n].title
+      #title_titled_frame(_domain_name, t)
       @panels[_domain_name]['root'].title(t)
       @panels[_domain_name]['root'].restore_caption(n)
       @panels[_domain_name]['root'].shift_on if !@panels[_domain_name]['sons'][n].kind_of?(ArcadiaExtPlus)
@@ -3542,6 +3636,7 @@ class ArcadiaLayout
         end
       end
     elsif @panels[_domain_name]['sons'].length == 0
+      #title_titled_frame(_domain_name, '')
       @panels[_domain_name]['root'].title('')
       @panels[_domain_name]['root'].top_text_clear
     end

data/lib/a-tkcommons.rb

@@ -969,7 +969,8 @@ class TkTitledFrame < TkBaseTitledFrame
     @state = 'normal'
     @title = title
     @img = img
-    @left_label = create_left_label
+#    @left_label = create_left_label
+    @left_label = create_left_title
     @right_label = create_right_label
     @right_labels_text = Hash.new
     @right_labels_image = Hash.new
@@ -979,29 +980,29 @@ class TkTitledFrame < TkBaseTitledFrame
     @apw = Array.new
     @aph = Array.new
     @top.bind_append("Double-Button-1", proc{resize})
-    @left_label.bind_append("Double-Button-1", proc{resize})
+    #@left_label.bind_append("Double-Button-1", proc{resize})
     @right_label.bind_append("Double-Button-1", proc{resize})
   end
 
-  def create_left_label
-    __create_left_label(@top)
-  end
+#  def create_left_label
+#    __create_left_label(@top)
+#  end
 
   def create_right_label
     __create_right_label(@top)
   end
 
-  def __create_left_label(_frame)
-    @title.nil??_text_title ='':_text_title = @title+' :: '
-    _img=@img
-    TkLabel.new(_frame, Arcadia.style('titlelabel')){
-      text _text_title
-      anchor  'w'
-      compound 'left'
-      image  TkAllPhotoImage.new('file' => _img) if _img
-      pack('side'=> 'left','anchor'=> 'e')
-    }
-  end
+#  def __create_left_label(_frame)
+#    @title.nil??_text_title ='':_text_title = @title+' :: '
+#    _img=@img
+#    TkLabel.new(_frame, Arcadia.style('titlelabel')){
+#      text _text_title
+#      anchor  'w'
+#      compound 'left'
+#      image  TkAllPhotoImage.new('file' => _img) if _img
+#      pack('side'=> 'left','anchor'=> 'e')
+#    }
+#  end
 
   def __create_right_label(_frame)
     TkLabel.new(_frame, Arcadia.style('titlelabel')){
@@ -1013,26 +1014,26 @@ class TkTitledFrame < TkBaseTitledFrame
     }
   end
   
-  def shift_on
-    @left_label.foreground(Arcadia.conf('titlelabel.foreground'))
-  end
-  
-  def shift_off
-    @left_label.foreground(Arcadia.conf('titlelabel.disabledforeground'))
-  end
+#  def shift_on
+#    @left_label.foreground(Arcadia.conf('titlelabel.foreground'))
+#  end
+#  
+#  def shift_off
+#    @left_label.foreground(Arcadia.conf('titlelabel.disabledforeground'))
+#  end
   
-  def title(_text=nil)
-    if _text.nil?
-      return @title
-    else
-      @title=_text
-      if _text.strip.length == 0
-        @left_label.text('')
-      else
-        @left_label.text(_text+'::')
-      end
-    end
-  end
+#  def title(_text=nil)
+#    if _text.nil?
+#      return @title
+#    else
+#      @title=_text
+#      if _text.strip.length == 0
+#        @left_label.text('')
+#      else
+#        @left_label.text(_text+'::')
+#      end
+#    end
+#  end
 
   def top_text_clear
     @right_label.configure('text'=>'', 'image'=>nil)
@@ -1158,6 +1159,96 @@ class TkTitledFrame < TkBaseTitledFrame
 end
 
 
+class TkLabelTitledFrame < TkTitledFrame
+
+  def create_left_title
+    @left_label = __create_left_label(@top)
+    @left_label.bind_append("Double-Button-1", proc{resize})
+  end
+
+  def __create_left_label(_frame)
+    @title.nil??_text_title ='':_text_title = @title+' :: '
+    _img=@img
+    TkLabel.new(_frame, Arcadia.style('titlelabel')){
+      text _text_title
+      anchor  'w'
+      compound 'left'
+      image  TkAllPhotoImage.new('file' => _img) if _img
+      pack('side'=> 'left','anchor'=> 'e')
+    }
+  end
+
+  def shift_on
+    @left_label.foreground(Arcadia.conf('titlelabel.foreground'))
+  end
+  
+  def shift_off
+    @left_label.foreground(Arcadia.conf('titlelabel.disabledforeground'))
+  end
+  
+  def title(_text=nil)
+    if _text.nil?
+      return @title
+    else
+      @title=_text
+      if _text.strip.length == 0
+        @left_label.text('')
+      else
+        @left_label.text(_text+'::')
+      end
+    end
+  end
+end
+
+class TkMenuTitledFrame < TkTitledFrame
+  def create_left_title
+    @left_menu_button = __create_left_menu_button(@top)
+    @left_menu_button.bind_append("Double-Button-1", proc{resize})
+  end
+
+  def title_menu
+    @left_menu_button.cget('menu') if @left_menu_button
+  end
+
+  def __create_left_menu_button(_frame)
+    img=@img
+    @left_menu_button = TkMenuButton.new(_frame, Arcadia.style('titlebutton')){|mb|
+      menu TkMenu.new(mb, Arcadia.style('titlemenu'))
+      if img
+        indicatoron false
+        image Arcadia.image_res(img)
+      else
+        indicatoron true
+      end
+      padx 0
+      textvariable TkVariable.new('')
+      pack('side'=> 'left','anchor'=> 'e')
+    }
+
+  end
+
+  def shift_on
+    @left_menu_button.foreground(Arcadia.conf('titlelabel.foreground'))
+  end
+  
+  def shift_off
+    @left_menu_button.foreground(Arcadia.conf('titlelabel.disabledforeground'))
+  end
+  
+  def title(_text=nil)
+    if _text.nil?
+      return @title
+    else
+      @title=_text
+      if _text.strip.length == 0
+        @left_menu_button.textvariable.value=''
+      else
+        @left_menu_button.textvariable.value=_text+'::'
+      end
+    end
+  end
+end
+
 
 #class TkFrameAdapterOld < TkFrame
 #  include TkMovable
@@ -1266,7 +1357,7 @@ end
 #
 #end
 
-class TkTitledFrameAdapter < TkTitledFrame
+class TkTitledFrameAdapter < TkMenuTitledFrame
   attr_reader :transient_frame_adapter
 
   def initialize(parent=nil, title=nil, img=nil , keys=nil)