arcadia 0.13.0 → 0.13.1

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

@@ -22,7 +22,7 @@ class SubProcessInspector < ArcadiaExt
     @processs.each{|pr|
       if !pr.nil? 
         message = Arcadia.text("ext.spi.d.exit_query.msg")
-        r=Arcadia.dialog(self,
+        r=Arcadia.hinner_dialog(self,
             'type'=>'yes_no', 
             'level'=>'warning',
             'title'=> Arcadia.text("ext.spi.d.exit_query.title"), 
@@ -59,7 +59,7 @@ class SubProcessWidget < Tk::BWidget::Button
     @event = _event
     b_command = proc{
       message = Arcadia.text('ext.spi.d.kill.msg', [_event.pid, _event.name])
-      r=Arcadia.dialog(self,
+      r=Arcadia.hinner_dialog(self,
           'type'=>'yes_no', 
           'level'=>'warning',
           'title'=> Arcadia.text('ext.spi.d.kill.title'), 

data/ext/ae-term/ae-term.rb

@@ -21,6 +21,7 @@ class Term < ArcadiaExtPlus
         ArcadiaProblemEvent.new(self, "type"=>ArcadiaProblemEvent::DEPENDENCE_MISSING_TYPE,"title"=>Arcadia.text("ext.term.dependences_missing.xdotool.title"), "detail"=>msg).go!
       end
     end
+    @xterm_class_id = nil
   end
   
   def on_build(_event)
@@ -71,7 +72,10 @@ class Term < ArcadiaExtPlus
   end
   
   def xterm_class
-    "xarc#{instance_index}"
+    if @xterm_class_id.nil? 
+      @xterm_class_id = "xta#{Time.new.to_i}#{instance_index}"
+    end
+    @xterm_class_id
   end
   
   def do_run_xterm(_dir='~')
@@ -82,6 +86,7 @@ class Term < ArcadiaExtPlus
     conf("create",'yes')
     conf("dir",_dir)
     id_int = eval(frame.hinner_frame.winfo_id).to_i
+    
     #Arcadia.runtime_error_msg("CREO XTERM #{xterm_class} con id #{id_int}")
     cmd = "cd #{_dir} ; xterm -into #{id_int} -bg '#{conf('color.bg')}' -fg #{conf('color.fg')} -fa '#{conf('font')}' -class #{xterm_class}  +sb  +hold"
     fi_pid=-1
@@ -110,9 +115,13 @@ class Term < ArcadiaExtPlus
   end
   
   def do_xterm_exit
+    @bind_after_run = false
+    frame.hinner_frame.bind_remove("Configure")
+    frame.hinner_frame.bind_remove("Map")
     if main_instance?
       conf("create",'no')
-      hide_frame
+#      hide_frame
+      clean_instance
     else
       clean_instance
     end

data/lib/a-commons.rb

@@ -234,6 +234,10 @@ class ArcadiaExt
   def hide_frame(_n=0)
     Arcadia.layout.unregister_panel(frame(_n), false, true)
   end 
+
+  def destroy_frame(_n=0)
+    Arcadia.layout.unregister_panel(frame(_n), true, true)
+  end 
   
   def conf_array(_name)
 #    res = []
@@ -281,7 +285,7 @@ class ArcadiaExt
   end
 
   def frame_visible?(_n=0)
-    @frames[_n] != nil && @frames[_n].hinner_frame && TkWinfo.mapped?(@frames[_n].hinner_frame)
+    @frames != nil && @frames[_n] != nil && @frames[_n].hinner_frame && TkWinfo.mapped?(@frames[_n].hinner_frame)
   end
 
   def frame(_n=0,create_if_not_exist=true)
@@ -449,13 +453,18 @@ class ArcadiaExtPlus < ArcadiaExt
   end  
 
   def activate(_obj=self, _raise_event=true)
-    return if @@active_instance[self.class] == _obj
-    @@active_instance[self.class] = _obj
-    @@active_instance[self.class].frame.root.shift_on if @@active_instance[self.class].frame != nil
+    return if @@active_instance[_obj.class] == _obj
+    if _obj.frame_visible?
+      @@active_instance[_obj.class] = nil
+    else
+      @@active_instance[_obj.class] = _obj
+    end
+    #@@active_instance[self.class].frame.root.shift_on if @@active_instance[self.class].frame != nil
+    _obj.frame.root.shift_on if _obj.frame_visible?
     instances.each{|i|
-      i.frame.root.shift_off if i != @@active_instance[self.class] && i.frame != nil && i.frame.root != @@active_instance[self.class].frame.root
+      i.frame.root.shift_off if i != _obj  && i.frame != nil && i.frame.root != _obj.frame.root
     }
-    ActivateInstanceEvent.new(Arcadia.instance, 'name'=>self.name).go! if _raise_event
+    ActivateInstanceEvent.new(Arcadia.instance, 'name'=>_obj.name).go! if _raise_event
   end
 
   def activate_main
@@ -525,7 +534,9 @@ class ArcadiaExtPlus < ArcadiaExt
   def on_destroy_instance(_event)
     Arcadia.detach_listener(self)
     @arcadia.unregister(self)
-    @frames.each{|f| f.free }
+#    @frames.each{|f| f.free }
+    @frames.each_index{|i| destroy_frame(i)}
+    @frames.clear
   end
 
 #  def on_before_layout_raising_frame(_event)
@@ -535,14 +546,24 @@ class ArcadiaExtPlus < ArcadiaExt
 #  end
 
   def clean_instance
-    activate_main
-    @@instances[self.class].delete(self) if @@instances[self.class]
-    Arcadia.del_conf_group(Arcadia['conf'],@name)
-    Arcadia.del_conf_group(Arcadia['pers'],@name)
-    #del_from_conf_property("#{main_instance.name}.clones", @name)
-    main_instance.del_from_conf_property("clones", @name)
-    Arcadia.process_event(ClearCacheInstanceEvent.new(Arcadia.instance), [self])
-    Arcadia.process_event(DestroyInstanceEvent.new(Arcadia.instance), [self])
+    if main_instance?
+      @frames.each_index{|i| destroy_frame(i)}
+      @frames.clear
+      instances.each{|i| 
+        if i != self
+          activate(i)
+          break
+        end
+      }
+    else
+      @@instances[self.class].delete(self) if @@instances[self.class]
+      Arcadia.del_conf_group(Arcadia['conf'],@name)
+      Arcadia.del_conf_group(Arcadia['pers'],@name)
+      main_instance.del_from_conf_property("clones", @name)
+      Arcadia.process_event(ClearCacheInstanceEvent.new(Arcadia.instance), [self])
+      Arcadia.process_event(DestroyInstanceEvent.new(Arcadia.instance), [self])
+      activate_main #if main_instance.frame_visible?
+    end
   end
 
   def deduplicate
@@ -1058,8 +1079,8 @@ class Application
     @@instance
   end
 
-  def Application.conf(_property)
-    @@instance['conf'][_property] if @@instance
+  def Application.conf(_property, _value=nil)
+    @@instance.conf(_property, _value) if @@instance
   end
 
   def Application.version
@@ -1070,7 +1091,10 @@ class Application
     @@instance.local_dir if @@instance
   end
 
-  def conf(_property)
+  def conf(_property, _value=nil)
+    if !_value.nil?
+      self['conf'][_property] = _value
+    end
     self['conf'][_property]
   end
 
@@ -1202,7 +1226,13 @@ class Application
   def load_theme(_name=nil)
     _theme_file = "conf/theme-#{_name}.conf" if !_name.nil?
     if _theme_file && File.exist?(_theme_file)
-      self['conf_theme'] = self.properties_file2hash(_theme_file)
+      thash = self.properties_file2hash(_theme_file)
+      if thash.has_key?('parent')
+        load_theme(thash['parent'])
+        self['conf_theme'].update(thash)
+      else
+        self['conf_theme'] = thash
+      end
       self['conf'].update(self['conf_theme'])
       self['conf_without_local'].update(self['conf_theme'])
       _theme_res_file = "#{Dir.pwd}/conf/theme-#{_name}.res.rb"

data/lib/a-contracts.rb

@@ -98,6 +98,11 @@ end
 class LayoutChangedFrameEvent < ArcadiaSysEvent
 end
 
+class LayoutChangedDomainEvent < ArcadiaSysEvent
+  attr_accessor :old_domain
+  attr_accessor :new_domain
+end
+
 #  +---------------------------------------------+
 #         Buffer event
 #  +---------------------------------------------+
@@ -361,12 +366,20 @@ class LowerCaseTextEvent < FocusEvent; end
 # default actions_pattern  = 'OK'
 class DialogEvent < ArcadiaEvent
   TYPE_PATTERNS = ['ok', 'yes_no', 'ok_cancel', 'yes_no_cancel', 'abort_retry_ignore']
+  MSG_MAX_CHARS = 500
   class Result < Result
     attr_accessor :value
   end
   attr_accessor :title, :msg, :type, :level, :exception
 end
 
+class SystemDialogEvent < DialogEvent
+end
+
+class HinnerDialogEvent < DialogEvent
+end
+
+
 #class QuestionDialogEvent < DialogEvent
 #end
 #

data/lib/a-core.rb

@@ -24,7 +24,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.13.0',
+        '0.13.1',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
@@ -561,6 +561,14 @@ class Arcadia < TkApplication
     self.load_local_config(false)
     # local config can contain loading conditions
     self.load_exts_conf
+    if @first_run
+      myloc = nil
+      begin
+        myloc = ENV["LANG"].split('.')[0].sub('_','-') if ENV["LANG"]
+      rescue Exception => e
+      end
+      Arcadia.conf('locale', myloc) if myloc != nil
+    end
     self.load_local_config
     self.load_theme(self['conf']['theme'])
     self.resolve_properties_link(self['conf'],self['conf'])
@@ -1024,7 +1032,12 @@ class Arcadia < TkApplication
 
 
   def Arcadia.dialog(_sender, _args=Hash.new)
-    _event = process_event(DialogEvent.new(_sender, _args))
+    _event = process_event(SystemDialogEvent.new(_sender, _args))
+    return _event.results[0].value if _event
+  end
+
+  def Arcadia.hinner_dialog(_sender, _args=Hash.new)
+    _event = process_event(HinnerDialogEvent.new(_sender, _args))
     return _event.results[0].value if _event
   end
 
@@ -1351,8 +1364,8 @@ class ArcadiaMainToolbar < ArcadiaUserControl
       @item_obj = Tk::BWidget::Button.new(_args['frame'], Arcadia.style('toolbarbutton')){
         image  _image if _image
         command _command if _command
-        width 20
-        height 20
+        width 23
+        height 23
         helptext  _hint if _hint
         text _caption if _caption
       }
@@ -1703,7 +1716,7 @@ class RunnerManager < TkFloatTitledFrame
       'compound'=>:left,
       'relief'=>'flat').pack('fill'=>'x','side' =>'left')
       _close_command = proc{
-        if (Arcadia.dialog(self, 'type'=>'yes_no',
+        if (Arcadia.hinner_dialog(self, 'type'=>'yes_no',
           'msg'=> Arcadia.text("main.d.confirm_delete_runner.msg", [_runner_hash[:name]]),
           'title' => Arcadia.text("main.d.confirm_delete_runner.title"),
           'level' => 'question')=='yes')
@@ -1967,7 +1980,17 @@ class ArcadiaProblemsShower
     @initialized = true
     if @problems.count > 0
       show_problems
-      @ff.show
+      Thread.new do
+        num_sleep = 0
+        while TkWinfo.viewable(Arcadia.layout.root) == false && num_sleep < 20
+          sleep(1)
+          num_sleep += 1
+        end
+        @ff.show
+      end
+#      p TkWinfo.viewable(Arcadia.layout.root)
+#      Tk.after(1000, proc{@ff.show; p TkWinfo.viewable(Arcadia.layout.root)})
+      
     end
   end
 
@@ -2390,38 +2413,59 @@ end
 
 
 class ArcadiaDialogManager
+  DialogParams = Struct.new("DialogParams",
+    :type,
+    :res_array,
+    :level,
+    :msg
+  )
+
   def initialize(_arcadia)
     @arcadia = _arcadia
     Arcadia.attach_listener(self, DialogEvent)
   end
 
-  def on_dialog(_event)
-    type = _event.type
-    if !DialogEvent::TYPE_PATTERNS.include?(_event.type)
-      type = 'ok'
-    end
-    res_array = type.split('_')
-    if _event.level.nil? || _event.level.length == 0
-      icon = 'info'
-    else
-      icon = _event.level
+  def dialog_params(_event, check_type = true)
+    ret = DialogParams.new
+    if _event
+      ret.type = _event.type
+      if check_type && !_event.class::TYPE_PATTERNS.include?(_event.type)
+        ret.type = 'ok'
+      end
+      ret.res_array = ret.type.split('_')
+      if _event.level.nil? || _event.level.length == 0
+        ret.level = 'info'
+      else
+        ret.level = _event.level
+      end
+      if _event.msg && _event.msg.length > _event.class::MSG_MAX_CHARS
+        ret.msg = _event.msg[0.._event.class::MSG_MAX_CHARS]+' ...'
+      else
+        ret.msg = _event.msg
+      end
     end
-    tktype = type.gsub('_','').downcase
+    ret
+  end
 
-    if _event.msg && _event.msg.length > 500
-      msg = _event.msg[0..500]+' ...'
-    else
-      msg = _event.msg
+  def on_dialog(_event)
+    case _event
+      when SystemDialogEvent
+        do_system_dialog(_event)
+      when HinnerDialogEvent
+        do_hinner_dialog(_event)
     end
+  end
 
+  def do_system_dialog(_event)
+    par = dialog_params(_event)
+    tktype = par.type.gsub('_','').downcase
     tkdialog =  Tk::BWidget::MessageDlg.new(
-    'icon' => icon,
-    'bg' => Arcadia.conf('background'),
-    'fg' => Arcadia.conf('foreground'),
-    'type' => tktype,
-    'title' => _event.title,
-    'message' => msg)
-
+      'icon' => par.level,
+      'bg' => Arcadia.conf('background'),
+      'fg' => Arcadia.conf('foreground'),
+      'type' => tktype,
+      'title' => _event.title,
+    'message' => par.msg)
     tkdialog.configure('font'=>'courier 6')
     res = tkdialog.create
     if _event.level == 'error'
@@ -2431,9 +2475,60 @@ class ArcadiaDialogManager
         Arcadia.runtime_error_msg(_event.msg, _event.title)
       end
     end
-    _event.add_result(self, 'value'=>res_array[res.to_i])
+    _event.add_result(self, 'value'=>par.res_array[res.to_i])
   end
 
+  def do_hinner_dialog(_event)
+    par = dialog_params(_event, false)
+    dialog_frame = TkFrame.new(Arcadia.layout.base_frame, Arcadia.style('panel')){
+      #relief 'solid'
+      #borderwidth 3
+      highlightbackground Arcadia.conf('hightlight.link.foreground')
+      #highlightcolor 'red'
+      highlightthickness 1
+    }
+    dialog_frame.pack('side' =>'top','after'=>Arcadia.layout.root, 'anchor'=>'nw','fill'=>'x', 'padx'=>0, 'pady'=>0)
+    max_width = 0
+    par.res_array.each{|v| 
+      l = v.length
+      max_width = l if l > max_width
+    }
+    res = nil
+    par.res_array.reverse_each{|value|
+      Tk::BWidget::Button.new(dialog_frame, Arcadia.style('button')){
+        command proc{res = value}
+        text value.capitalize
+        helptext  value.capitalize
+        width max_width*2
+      }.pack('side' =>'right','padx'=>5, 'pady'=>5)
+    }
+
+    Tk::BWidget::Label.new(dialog_frame,Arcadia.style('label')){
+      text  par.msg
+      helptext _event.msg
+#    }.pack('fill'=>'x','side' =>'left')
+    }.pack('side' =>'right','padx'=>5, 'pady'=>5)
+
+#    Tk::BWidget::Label.new(dialog_frame,Arcadia.style('label')){
+#      compound 'left'
+#      Tk::Anigif.image(self, "#{Dir.pwd}/ext/ae-subprocess-inspector/process.res")
+#    }.pack('side' =>'right','padx'=>10)
+
+    
+    Tk.update
+    dialog_frame.grab("set")
+    begin
+      while res == nil do 
+        Tk.update
+        sleep(0.1) 
+      end
+    ensure
+      dialog_frame.grab("release")
+    end
+    dialog_frame.destroy
+    Tk.update
+    _event.add_result(self, 'value'=>res)
+  end
 
   def on_dialog_old(_event)
     type = _event.type
@@ -2454,6 +2549,7 @@ end
 
 
 class ArcadiaLayout
+
   #  include Observable
   #  ArcadiaPanelInfo = Struct.new( "ArcadiaPanelInfo",
   #    :name,
@@ -2461,18 +2557,25 @@ class ArcadiaLayout
   #    :frame,
   #    :ffw
   #  )
+  attr_reader :base_frame
   HIDDEN_DOMAIN = '-1.-1'
   def initialize(_arcadia, _frame, _autotab=true)
     @arcadia = _arcadia
     @frames = Array.new
     @frames[0] = Array.new
-    @frames[0][0] = _frame
+    @base_frame = _frame
+    @content_frame = TkFrame.new(_frame).pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
+#    @dialog_frame = TkFrame.new(_frame)
+
+    @frames[0][0] = @content_frame
     # @domains = Array.new
     # @domains[0] = Array.new
     # @domains[0][0] = '_domain_root_'
+    
+    
     @panels = Hash.new
     @panels['_domain_root_']= Hash.new
-    @panels['_domain_root_']['root']= _frame
+    @panels['_domain_root_']['root']= @content_frame
     @panels['_domain_root_']['sons'] = Hash.new
     @panels['_domain_root_'][:raised_stack] = []
 
@@ -2484,7 +2587,7 @@ class ArcadiaLayout
     @splitters=Array.new
     @tabbed = Arcadia.conf('layout.tabbed')=='true'
   end
-
+  
   def root
     @panels['_domain_root_']['root']
   end
@@ -2954,7 +3057,6 @@ class ArcadiaLayout
     ret
   end
 
-
   def domains_on_frame(_frame)
     ret_doms = Array.new
     frame_found = false
@@ -2991,7 +3093,6 @@ class ArcadiaLayout
     ret_doms
   end
 
-
   def find_splitted_frame(_start_frame)
     splitted_frame = _start_frame
     while splitted_frame != nil && !splitted_frame.kind_of?(AGTkSplittedFrames)
@@ -3252,6 +3353,8 @@ class ArcadiaLayout
     end
     # refresh -----
     build_invert_menu
+    Tk.update
+    LayoutChangedDomainEvent.new(self, 'old_domain'=>source_domain, 'new_domain'=>_target_domain).go!
   end
 
   #  def change_domain_old(_dom1, _dom2, _name2)
@@ -3722,7 +3825,7 @@ class ArcadiaLayout
       dr,dc=d.split('.')
       if dc.to_i >= _c && dr.to_i == _r
         #shift_domain_column(_r,dc.to_i+1,_dom)
-        p "== #{d} --> #{domain_name(_r,dc.to_i+1)}"
+        #p "== #{d} --> #{domain_name(_r,dc.to_i+1)}"
         _dom[k]= domain_name(_r,dc.to_i+1)
       end
     }
@@ -3733,7 +3836,7 @@ class ArcadiaLayout
       dr,dc=d.split('.')
       if dr.to_i >= _r && dc.to_i == _c
         #shift_domain_row(dr.to_i+1,_c,_dom)
-        p "shift_domain_row == #{d} --> #{domain_name(dr.to_i+1,_c)}"
+        #p "shift_domain_row == #{d} --> #{domain_name(dr.to_i+1,_c)}"
         _dom[k]=domain_name(dr.to_i+1,_c)
       end
     }