arcadia 0.12.2 → 0.13.0

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

@@ -8,4 +8,14 @@ class=FilesHistrory
 
 file.name=arcadia.history
 length=20
-view=tree
+view=tree
+
+bookmarks.range=10
+
+user_toolbar.contexts=bookmarks
+user_toolbar.bookmarks.context_path=file
+user_toolbar.bookmarks=bm
+user_toolbar.bookmarks.bm.name=togglebm
+user_toolbar.bookmarks.bm.hint=!Arcadia.text('ext.file_history.toggle_bookmark')
+user_toolbar.bookmarks.bm.image_data=!BOOKMARK_GIF
+user_toolbar.bookmarks.bm.event_class=!ToggleBookmarkEvent

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

@@ -86,12 +86,16 @@ class FilesHistrory < ArcadiaExt
   end
 
   def on_before_build(_event)
+    @bookmarks =Array.new
     Arcadia.attach_listener(self, BufferRaisedEvent)
+    Arcadia.attach_listener(self, BookmarkEvent)
   end
 
   def on_build(_event)
     @h_stack = Hash.new
     @h_stack_changed = false
+    @bookmarks_frame = TkFrame.new(self.frame.hinner_frame)    
+    @history_frame = TkFrame.new(self.frame.hinner_frame).pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')    
     @panel = self.frame.root.add_panel(self.frame.name, "sync");
     @cb_sync = TkCheckButton.new(@panel, Arcadia.style('checkbox').update('background'=>@panel.background)){
       text  'Sync'
@@ -152,7 +156,7 @@ class FilesHistrory < ArcadiaExt
     @font_b = "#{Arcadia.conf('treeitem.font')} bold"
     @font_italic = "#{Arcadia.conf('treeitem.font')} italic"
     
-	  @htree = BWidgetTreePatched.new(self.frame.hinner_frame, Arcadia.style('treepanel')){
+	  @htree = BWidgetTreePatched.new(@history_frame, Arcadia.style('treepanel')){
       showlines false
       deltay 18
       crosscloseimage  Arcadia.image_res(PLUS_GIF)
@@ -190,7 +194,7 @@ class FilesHistrory < ArcadiaExt
     build_tree
     pop_up_menu_tree
     
-    @hlist = TkText.new(self.frame.hinner_frame, Arcadia.style('text')){|j|
+    @hlist = TkText.new(@history_frame, Arcadia.style('text')){|j|
       wrap 'none'
       font @font_italic
       cursor nil
@@ -206,7 +210,93 @@ class FilesHistrory < ArcadiaExt
 	    @hlist.show
 	  end
 	end
+
+  def on_initialize(_event)
+    load_persistent_bookmarks
+  end  
+
+	
+	def on_bookmark(_event)
+    return if _event.file.nil?
+    case _event
+      when ToggleBookmarkEvent
+        self.frame.show_anyway
+        # set or unset ?
+        to_set = true
+        to_del_detail = nil
+        @bookmarks.each{|detail|
+          if detail[:file] == _event.file && (_event.from_row.to_i >= detail[:from_line].to_i - _event.range) && (_event.to_row.to_i <= detail[:to_line].to_i + _event.range)  
+            to_set = false
+            to_del_detail = detail
+          end
+          break if !to_set 
+        }
+        if to_set
+          SetBookmarkEvent.new(self,
+            'file'=>_event.file, 
+            'from_row'=>_event.from_row, 
+            'to_row'=>_event.to_row,
+            'range'=>_event.range,
+            'persistent'=>_event.persistent,
+            'id'=>_event.id).go!
+        else
+          UnsetBookmarkEvent.new(self,
+            'file'=>_event.file, 
+            'from_row'=>to_del_detail[:from_line], 
+            'to_row'=>to_del_detail[:to_line],
+            'range'=>_event.range,
+            'persistent'=>_event.persistent,
+            'id'=>_event.id).go!
+        end    
+      when SetBookmarkEvent
+        @bookmarks_frame.pack('before'=>@history_frame,'side' =>'top','anchor'=>'nw', 'fill'=>'x', :padx=>0, :pady=>0)     if @bookmarks.empty? 
+        if _event.persistent
+          bookmark = {:file=>_event.file}
+          caption = File.basename(_event.file)
+        else
+          bookmark = {:file=>"__TMP__#{_event.id}"}
+          caption = _event.id
+        end
+        caption = "#{caption} [#{_event.from_row}, #{_event.to_row}]"
+        bookmark[:from_line] = _event.from_row
+        bookmark[:to_line] = _event.to_row
+        bookmark[:persistent] = _event.persistent
+        bookmark[:widget] = Tk::BWidget::Button.new(@bookmarks_frame, Arcadia.style('toolbarbutton')){
+          image Arcadia.image_res(BOOKMARK_GIF)
+          compound 'left'
+          anchor "w"
+          command proc{OpenBufferTransientEvent.new(self,'file'=>_event.file, 'row'=> _event.from_row).go!}
+          #width 20
+          #height 20
+          helptext  _event.content
+          text caption
+        }.pack('side' =>'top','anchor'=>'nw', 'fill'=>'x', :padx=>0, :pady=>0)    
+
+        Tk::BWidget::Button.new(bookmark[:widget], Arcadia.style('toolbarbutton')){
+          image  TkPhotoImage.new('dat' => CLOSE_GIF)
+          command proc{UnsetBookmarkEvent.new(self,
+            'file'=>_event.file, 
+            'from_row'=>_event.from_row,
+            'to_row'=>_event.to_row).go!}
+          #width 20
+          height 16
+        }.pack('side' =>'right','anchor'=>'e', 'fill'=>'y', :padx=>0, :pady=>0)    
+        
+        @bookmarks << bookmark
+      when UnsetBookmarkEvent
+        @bookmarks.delete_if{|b| 
+          if (b[:file]==_event.file && b[:from_line]==_event.from_row)
+            b[:widget].destroy
+            true
+          else
+            false
+          end
+        }
+        @bookmarks_frame.unpack if @bookmarks.empty? 
+	 end
 	
+	end
+  
 	def toggle_list_tree
     Tk::BWidget::DynamicHelp::delete(@btoggle_list_tree)
 	  if @is_tree
@@ -433,6 +523,8 @@ class FilesHistrory < ArcadiaExt
         @hlist.tag_configure(tag_name, 'underline'=>false) 
       }
     )
+    TkTextImage.new(@hlist, 'end', 'image'=> Arcadia.file_icon(_file))
+    @hlist.insert("end", " ")
     @hlist.insert("end", "#{File.basename(_file)}\n", tag_name)
     @hlist.tag_bind(tag_name,"ButtonPress-1", proc{OpenBufferTransientEvent.new(self,'file'=>_file).go!})
   end
@@ -614,6 +706,14 @@ class FilesHistrory < ArcadiaExt
   end
 
   def on_finalize(_event)
+    bookmarks = '';
+    @bookmarks.each{|bm|
+      if bm[:file] != nil && bm[:persistent]
+        bookmarks="#{bookmarks}|" if bookmarks.strip.length > 0
+        bookmarks="#{bookmarks}#{bm[:file]}@@@#{bm[:from_line]}@@@#{bm[:to_line]}"
+      end
+    }
+    Arcadia.persistent('bookmarks', bookmarks)
     if @is_tree
       conf('view','tree') 
     else
@@ -648,6 +748,24 @@ class FilesHistrory < ArcadiaExt
     end
   end
 
+  def load_persistent_bookmarks
+    b = Arcadia.persistent('bookmarks')
+    if b
+      bm_list =b.split("|")
+      bm_list.each do |bm| 
+        file,from_line,to_line = bm.split('@@@')
+        if file && from_line && to_line
+          SetBookmarkEvent.new(self, 
+            'file'=>file, 
+            'from_row'=>from_line.to_i, 
+            'to_row'=>to_line.to_i,
+            'persistent'=>true).go!
+        end
+      end
+    end
+  end
+
+
   def create_history_file(_content=nil)
     dir,fil =File.split(File.expand_path(history_file))
     if !File.exist?(dir)

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

@@ -833,20 +833,19 @@ class RubyDebugServer
             set_alive(false)
             notify(RDS_QUIET)
             Kernel.system('y')
-
             if _debug_event.persistent == false && File.basename(_debug_event.file)[0..1] == '~~'
                File.delete(_debug_event.file) if File.exist?(_debug_event.file)
             end
-
             Kernel.exit!
           else
+            set_alive(false)
+            notify(RDS_QUIET)
             Kernel.exit!
-            Arcadia.console(self, 'msg'=>"#{$?.inspect}", 'level'=>'debug')
+            Arcadia.console(self, 'msg'=>"#{$!.inspect}", 'level'=>'debug')
           end
         end
       end
     rescue Exception => e
-     
       Arcadia.console(self, 'msg'=>Arcadia.text('ext.ruby_debug.server.e.on_start', [e.class, e.message]), 'level'=>'debug')
       #Arcadia.new_debug_msg(self,"Error on start_server : #{e.class}:#{e.message}")    
     end
@@ -1012,6 +1011,7 @@ class RubyDebugClient
         begin
           #sleep(2)
           @session = TCPSocket.new(@server, @port)
+          #@session = IO.popen("|rdebug -c --cport #{@port}",'r+')
           @pend = false
         rescue Errno::ECONNREFUSED,Errno::EBADF => e
           sleep(1)
@@ -1078,6 +1078,7 @@ class RubyDebugClient
       return false if @busy 
       if is_alive?
         @busy = true
+        #p "sending #{_command}"
         @session.puts(_command) if socket_session
       else
         start_session if !@pend
@@ -1087,7 +1088,7 @@ class RubyDebugClient
     rescue Errno::ECONNABORTED,Errno::ECONNRESET, Errno::EPIPE => e
       notify("quit_yes")
       #DebugContract.instance.debug_end(self)
-      Arcadia.console(self, 'msg'=>Arcadia.text('ext.ruby_debug.client.e.abort_session', [e.class, e.inspect]), 'level'=>'debug')
+      Arcadia.console(self, 'msg'=>Arcadia.text('ext.ruby_debug.client.e.abort_session', [_command, e.class, e.inspect]), 'level'=>'debug')
       @session = nil
       @pend = true
       false

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

@@ -54,11 +54,10 @@ end
 class SubProcessWidget < Tk::BWidget::Button
   attr_reader :event
   def initialize(_parent=nil, _event=nil, *args)
-    super(Arcadia['toolbar'].frame, Arcadia.style('button').update("background"=>'black',"activebackground"=>'black', 'relief'=>'groove'))
+    super(Arcadia['toolbar'].frame, Arcadia.style('button').update("compound"=>'left', "background"=>'black',"activebackground"=>'black', 'relief'=>'groove'))
     @parent = _parent
     @event = _event
     b_command = proc{
-      
       message = Arcadia.text('ext.spi.d.kill.msg', [_event.pid, _event.name])
       r=Arcadia.dialog(self,
           'type'=>'yes_no', 
@@ -69,7 +68,12 @@ class SubProcessWidget < Tk::BWidget::Button
         _event.abort_action.call
       end
     }
-    command b_command  
+    command b_command
+    begin
+      text File.basename(_event.name)
+    rescue
+      text _event.name
+    end  
     helptext "#{_event.name} [pid #{_event.pid}]"
     pack('side' =>'left', :padx=>2, :pady=>0)
     Tk::Anigif.image(self, "#{Dir.pwd}/ext/ae-subprocess-inspector/process.res")

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

@@ -130,7 +130,7 @@ class Term < ArcadiaExtPlus
   
   def do_run_external_term(_dir)
     if Arcadia.is_windows?
-      system("cd #{_dir} & start cdm")
+      system("cd #{_dir} & start cmd")
     else
       system("cd #{_dir}; xterm &")
     end

data/lib/a-commons.rb

@@ -215,15 +215,15 @@ class ArcadiaExt
   attr_reader :name
   def initialize(_arcadia, _name=nil)
     @arcadia = _arcadia
-    @arcadia.register(self)
     @name = _name
+    @arcadia.register(self)
     @frames = Array.new
-    @frames_points = conf_array("#{_name}.frames")
-    @frames_labels = conf_array("#{_name}.frames.labels")
-    @frames_names = conf_array("#{_name}.frames.names")
+    @frames_points = conf_array("frames")
+    @frames_labels = conf_array("frames.labels")
+    @frames_names = conf_array("frames.names")
     @float_frames = Array.new
-    @float_geometries = conf_array("#{_name}.float_frames")
-    @float_labels = conf_array("#{_name}.float_labels")
+    @float_geometries = conf_array("float_frames")
+    @float_labels = conf_array("float_labels")
     Arcadia.attach_listener(self, BuildEvent)
     Arcadia.attach_listener(self, InitializeEvent)
     Arcadia.attach_listener(self, ExitQueryEvent)
@@ -236,23 +236,25 @@ class ArcadiaExt
   end 
   
   def conf_array(_name)
-    res = []
-    value = @arcadia['conf'][_name]
-    res.concat(value.split(',')) if value
-    res
+#    res = []
+#    value = @arcadia['conf'][_name]
+#    res.concat(value.split(',')) if value
+#    res
+    Application.conf_array("#{@name}.#{_name}")
   end
 
   def array_conf(_name, _array)
-    value = ''
-    _array.each{|e|
-      if value.length > 0
-        value = "#{value},#{e}"
-      else
-        value = "#{e}"
-      end
-    }
-    @arcadia['conf'][_name]=value
-    value
+#    value = ''
+#    _array.each{|e|
+#      if value.length > 0
+#        value = "#{value},#{e}"
+#      else
+#        value = "#{e}"
+#      end
+#    }
+#    @arcadia['conf'][_name]=value
+#    value
+    Application.array_conf("#{@name}.#{_name}", _array)
   end
 
   def add_to_conf_property(_name, _value)
@@ -269,6 +271,10 @@ class ArcadiaExt
     array_conf(_name,a)
   end
 
+  def frame_title(_n=0)
+    @frames_labels[_n] if @frames[_n] != nil
+  end
+
   def frame_def_visible?(_n=0)
     @arcadia.layout.domains.include?(@frames_points[_n])
     #@frames_points[_n] != '-1.-1'
@@ -398,26 +404,6 @@ class ArcadiaExtPlus < ArcadiaExt
     Arcadia.attach_listener(self, ActivateInstanceEvent)
     super(_arcadia, _name)
     @@active_instance[self.class] = self if @@active_instance[self.class] == nil
-#    if self.frame != nil
-#      self.frame.hinner_frame.bind_append("Enter", proc{activate})
-#      if @@main_instance[self.class] == self
-#        frame.root.add_state_button(
-#        self.name,
-#        'Duplicate',
-#        proc{duplicate},
-#        PLUS_EX_GIF,
-#        'left')
-#        activate(self, false)
-#      else
-#        frame.root.add_state_button(
-#        self.name,
-#        'Destroy',
-#        proc{deduplicate},
-#        MINUS_EX_GIF,
-#        'left')
-#        activate(self, false)
-#      end
-#    end
   end
 
   def frame(_n=0,create_if_not_exist=true)
@@ -426,13 +412,13 @@ class ArcadiaExtPlus < ArcadiaExt
       @frame_initialize = true
       fr.hinner_frame.bind_append("Enter", proc{activate})
       if main_instance?
-        fr.root.add_state_button(
-        self.name,
-        'Duplicate',
-        proc{duplicate},
-        PLUS_EX_GIF,
-        'left')
-        activate(self, false)
+#        fr.root.add_state_button(
+#        self.name,
+#        'Duplicate',
+#        proc{duplicate},
+#        PLUS_EX_GIF,
+#        'left')
+#        activate(self, false)
       else
         fr.root.add_state_button(
         self.name,
@@ -508,17 +494,25 @@ class ArcadiaExtPlus < ArcadiaExt
     exist
   end
   
-  def duplicate(_name=new_name)
+  def duplicate(_name=nil, _dom=nil, _confirm_on_exit=true)
+    _name = new_name if _name.nil?
+    @confirm_on_exit = _confirm_on_exit
     #create conf properties
     Arcadia.conf_group_copy(@@main_instance[self.class].name, _name)
-    instance = clone(_name)
+    if !_dom.nil?
+      doms = Application.conf_array("#{_name}.frames")
+      doms[0] = _dom
+      Application.array_conf("#{_name}.frames", doms)
+    end
+    instance = clone(_name, _dom)
     #initialize
     Arcadia.process_event(InitializeEvent.new(Arcadia.instance), [instance])
-    add_to_conf_property("#{main_instance.name}.clones", _name)
+    #add_to_conf_property("#{main_instance.name}.clones", _name)
+    main_instance.add_to_conf_property("clones", _name)
     instance
   end
   
-  def clone(_name)
+  def clone(_name, _dom=nil)
     #create
     instance = self.class.new(Arcadia.instance, _name)
     #build
@@ -545,21 +539,22 @@ class ArcadiaExtPlus < ArcadiaExt
     @@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)
+    #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])
   end
 
   def deduplicate
-    if (Arcadia.dialog(self, 'type'=>'yes_no',
+    can_exit=true
+    if @confirm_on_exit && (Arcadia.dialog(self, 'type'=>'yes_no',
       'msg'=>Arcadia.text('main.d.confirm_delete_ext_instance.msg', [@name]),
       'title' => Arcadia.text('main.d.confirm_delete_ext_instance.title', [@name]),
       'level' => 'question')=='yes')
       exit_query_event = Arcadia.process_event(ExitQueryEvent.new(self, 'can_exit'=>true))
-      if exit_query_event.can_exit
-        clean_instance
-      end
+      can_exit = exit_query_event.can_exit
     end
+    clean_instance if can_exit
   end
 
 end
@@ -1113,6 +1108,27 @@ class Application
   def Application.del_conf(_k)
     @@instance['conf'].delete(_k)
   end
+  
+  def Application.conf_array(_name)
+    res = []
+    value = @@instance['conf'][_name]
+    res.concat(value.split(',')) if value
+    res
+  end
+
+  def Application.array_conf(_name, _array)
+    value = ''
+    _array.each{|e|
+      if value.length > 0
+        value = "#{value},#{e}"
+      else
+        value = "#{e}"
+      end
+    }
+    @@instance['conf'][_name]=value
+    value
+  end
+  
 
   def prepare
   end