arcadia 0.13.1 → 1.0.0

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

@@ -75,7 +75,6 @@ end
 
 class FilesHistrory < ArcadiaExt
   attr_reader :htree
-
   def sync_on
     @sync = true
     select_file_without_event(@last_file) if @last_file
@@ -97,17 +96,27 @@ class FilesHistrory < ArcadiaExt
     @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'
-      justify  'left'
-      indicatoron 0
-      offrelief 'flat'
+    
+#    @cb_sync = TkCheckButton.new(@panel, Arcadia.style('checkbox').update('background'=>@panel.background)){
+#      text  'Sync'
+#      justify  'left'
+#      indicatoron 0
+#      offrelief 'flat'
+#      image Arcadia.image_res(SYNC_GIF)
+#      pack
+#    }
+#
+#    Tk::BWidget::DynamicHelp::add(@cb_sync, 
+#      'text'=>Arcadia.text('ext.file_history.button.link.hint'))
+
+    @cb_sync = Arcadia.wf.titlecontextcheckbutton(@panel){
+      variable TkVariable.new
       image Arcadia.image_res(SYNC_GIF)
       pack
     }
+    
+    @cb_sync.hint=Arcadia.text('ext.file_history.button.link.hint')
 
-    Tk::BWidget::DynamicHelp::add(@cb_sync, 
-      'text'=>Arcadia.text('ext.file_history.button.link.hint'))
 
     do_check = proc {
       if @cb_sync.cget('onvalue')==@cb_sync.cget('variable').value.to_i
@@ -172,7 +181,8 @@ class FilesHistrory < ArcadiaExt
         _selected = @htree.selected
         _dir, _file = _selected.sub("%%%",":").split('@@@')
         if _dir && _file.nil? && File.ftype(node2file(_dir)) == 'directory'
-	        _file = Tk.getOpenFile('initialdir'=>node2file(_dir))
+	        _file = Arcadia.open_file_dialog(node2file(_dir))
+	        #Tk.getOpenFile('initialdir'=>node2file(_dir))
       	    if _file && _file.strip.length > 0 
       	       Arcadia.process_event(OpenBufferTransientEvent.new(self,'file'=>_file))
            end
@@ -257,20 +267,23 @@ class FilesHistrory < ArcadiaExt
           bookmark = {:file=>"__TMP__#{_event.id}"}
           caption = _event.id
         end
-        caption = "#{caption} [#{_event.from_row}, #{_event.to_row}]"
+        caption = (_event.from_row == _event.to_row) ? "#{caption} [#{_event.from_row}] #{_event.content.strip if _event.content}":"#{caption} [#{_event.from_row}, #{_event.to_row}] #{str=_event.content.split("\n")[0] if _event.content;str.strip if str}"
         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')){
+        #bookmark[:widget] = Tk::BWidget::Button.new(@bookmarks_frame, Arcadia.style('toolbarbutton')){
+        bookmark[:widget] = Arcadia.wf.toolbutton(@bookmarks_frame){
           image Arcadia.image_res(BOOKMARK_GIF)
           compound 'left'
-          anchor "w"
+          #anchor "w"
           command proc{OpenBufferTransientEvent.new(self,'file'=>_event.file, 'row'=> _event.from_row).go!}
           #width 20
           #height 20
-          helptext  _event.content
+          #helptext  _event.content
           text caption
-        }.pack('side' =>'top','anchor'=>'nw', 'fill'=>'x', :padx=>0, :pady=>0)    
+          pack('side' =>'top','anchor'=>'nw', 'fill'=>'x', :padx=>0, :pady=>0)    
+        }
+        bookmark[:widget].hint=_event.content
 
         Tk::BWidget::Button.new(bookmark[:widget], Arcadia.style('toolbarbutton')){
           image  TkPhotoImage.new('dat' => CLOSE_GIF)
@@ -560,21 +573,23 @@ class FilesHistrory < ArcadiaExt
   end
 
   def pop_up_menu_tree
-    @pop_up_tree = TkMenu.new(
+    #@pop_up_tree = TkMenu.new(
+    @pop_up_tree = Arcadia.wf.menu(
       :parent=>@htree,
       :tearoff=>0,
       :title => 'Menu tree'
     )
-    @pop_up_tree.extend(TkAutoPostMenu)
-    @pop_up_tree.configure(Arcadia.style('menu'))
+    #@pop_up_tree.extend(TkAutoPostMenu)
+    #@pop_up_tree.configure(Arcadia.style('menu'))
     #----- search submenu
-    sub_ref_search = TkMenu.new(
+    #sub_ref_search = TkMenu.new(
+    sub_ref_search = Arcadia.wf.menu(
       :parent=>@pop_up_tree,
       :tearoff=>0,
       :title => 'Ref'
     )
-    sub_ref_search.extend(TkAutoPostMenu)
-    sub_ref_search.configure(Arcadia.style('menu'))
+    #sub_ref_search.extend(TkAutoPostMenu)
+    #sub_ref_search.configure(Arcadia.style('menu'))
     sub_ref_search.insert('end',
       :command,
       :label=>Arcadia.text('ext.file_history.menu.find_in_files'),
@@ -720,6 +735,7 @@ class FilesHistrory < ArcadiaExt
       conf('view','list') 
     end
     return if !@h_stack_changed 
+    
     if File.exist?(history_file)
       f = File::open(history_file,'r')
       begin
@@ -729,16 +745,17 @@ class FilesHistrory < ArcadiaExt
       end
       f = File.new(history_file, "w")
       begin
-        if f
-          _lines[0..-1].each{|_line|
+        if f && _lines
+          _lines.each{|_line|
             _lfile = _line.split(';')
-            if _lfile
+            if _lfile && File.exists?(_lfile[0])
+              rif = nil
               if @h_stack[_lfile[0]]
                 rif = "#{_lfile[0]};#{@h_stack[_lfile[0]]}"
               else
                 rif = _line
               end
-              f.syswrite(rif+"\n")
+              f.syswrite(rif+"\n") if !rif.nil?
             end
           }
         end
@@ -786,26 +803,30 @@ class FilesHistrory < ArcadiaExt
       _filename = File.expand_path(_filename)
       _filename_index = _filename+";"+_text_index
       if File.exist?(history_file)
+        to_add = []
+        max= conf('length').to_i
+        i = 1
+        to_add << _filename_index
+        @history_lines.each{|_line|
+          _lfile = _line.split(';')
+          if _lfile
+            if (_lfile[0] != _filename) && (_line.length > 0) && File.exists?(_lfile[0])
+              to_add << _line
+              i+=1 
+            end
+          end
+          break if i >= max
+        }
+        
         f = File.new(history_file, "w")
         begin
-          if f
-            max= conf('length').to_i
-            i = 1
-            f.syswrite(_filename_index+"\n")
-            @history_lines.each{|_line|
-              _lfile = _line.split(';')
-              if _lfile
-                if (_lfile[0] != _filename) && (_line.length > 0) 
-                  f.syswrite(_line+"\n")
-                  i+=1 
-                end
-              end
-              break if i >= max
-            }
-          end
+          to_add.each{|x|
+            f.syswrite(x+"\n")
+          }
         ensure
           f.close unless f.nil?
         end
+          
       else
         create_history_file(_filename+"\n")
       end

data/ext/ae-output/ae-output.rb

@@ -15,21 +15,21 @@ class OutputView
   def initialize(parent=nil)
     #left_frame = TkFrame.new(parent.frame.hinner_frame, Arcadia.style('panel')).place('x' => '0','y' => '0','relheight' => '1','width' => '25')
     #right_frame = TkFrame.new(parent.frame.hinner_frame, Arcadia.style('panel')).place('x' => '25','y' => '0','relheight' => '1','relwidth' => '1','width' => '-25')
+    @auto_open_file = false
+    @parent = parent
     parent.frame.root.add_button(
       parent.name,
       Arcadia.text('ext.output.button.clear.hint'),
       proc{parent.main_frame.text.delete('1.0','end')}, 
       CLEAR_GIF)
 
-#    @button_u = Tk::BWidget::Button.new(left_frame, Arcadia.style('toolbarbutton')){
-#      image  TkPhotoImage.new('dat' => CLEAR_GIF)
-#      helptext 'Clear'
-#      #foreground 'blue'
-#      command proc{parent.main_frame.text.delete('1.0','end')}
-#      #relief 'groove'
-#      pack('side' =>'top', 'anchor'=>'n',:padx=>0, :pady=>0)
-#    }
-
+#----
+    @ck = parent.frame.root.add_check_button(
+      parent.name,
+      Arcadia.text('ext.output.checkbutton.auto_open_file.hint'),
+      proc{ @auto_open_file = @ck.cget('onvalue')==@ck.cget('variable').value.to_i},
+      GO_UP_GIF)
+#---
     @text = TkArcadiaText.new(parent.frame.hinner_frame,
     {'wrap'=>  'none'}.update(Arcadia.style('edit'))
     )
@@ -52,9 +52,17 @@ class OutputView
     'borderwidth'=>1,
     'relief'=> 'flat'
     )
-    @text.tag_configure('bord_msg',
-    #'foreground' => '#b9b8b9'
-    'foreground' => Arcadia.conf('hightlight.comment.foreground')
+    @text.tag_configure('system_error_msg',
+    'background' => Arcadia.conf('hightlight.system_error.background'),
+    'foreground' => Arcadia.conf('hightlight.system_error.foreground'),
+    'borderwidth'=>1,
+    'relief'=> 'groove'
+    )
+    @text.tag_configure('info_msg',
+    'foreground' => Arcadia.conf('hightlight.edge.foreground')
+    )
+    @text.tag_configure('prompt',
+      'foreground' => Arcadia.conf('hightlight.prompt.foreground')
     )
     @text.tag_configure('sel',
     'background'=>Arcadia.conf('hightlight.sel.background'),
@@ -64,23 +72,28 @@ class OutputView
     @input_buffer = nil
     pop_up_menu        
   end
+  
+  def auto_open_file?
+    @auto_open_file
+  end
 
   def input(_char)
     case _char
       when 'Return'
-        @input_buffer = @text.get("insert linestart","insert").sub(Output::PROMPT,'').strip
+        @input_buffer = @text.get("insert linestart","insert").sub(@parent.prompt,'').strip
     end
   end
 
 
   def pop_up_menu
-    @pop_up = TkMenu.new(
+    #@pop_up = TkMenu.new(
+    @pop_up = Arcadia.wf.menu(
     :parent=>@text,
     :tearoff=>0,
     :title => 'Menu'
     )
-    @pop_up.extend(TkAutoPostMenu)
-    @pop_up.configure(Arcadia.style('menu'))
+    #@pop_up.extend(TkAutoPostMenu)
+    #@pop_up.configure(Arcadia.style('menu'))
 
     @pop_up.insert('end',
     :command,
@@ -144,7 +157,8 @@ class OutputView
   end
 
   def save_as
-    @file = Tk.getSaveFile("filetypes"=>[["Ruby Files", [".rb", ".rbw"]],["All Files", [".*"]]])
+    @file = Arcadia.save_file_dialog
+    #Tk.getSaveFile("filetypes"=>[["Ruby Files", [".rb", ".rbw"]],["All Files", [".*"]]])
     @file = nil if @file == ""  # cancelled
     if @file
       save
@@ -156,13 +170,15 @@ end
 
 class Output < ArcadiaExt
   attr_reader :main_frame
+  attr_reader :prompt
   MARKSUF='mark-'
-  PROMPT='>>>'
+  PROMPT_SIMBOL='$'
   def on_before_build(_event)
     #ArcadiaContractListener.new(self, MsgContract, :do_msg_event)
     @tag_seq = 0
     @writing=false
     @prompt_active = false
+    @prompt = PROMPT_SIMBOL 
     Arcadia.attach_listener(self, MsgEvent)
     Arcadia.attach_listener(self, InputKeyboardQueryEvent)
     #_frame = @arcadia.layout.register_panel('_rome_',@name, 'Output')
@@ -196,9 +212,9 @@ class Output < ArcadiaExt
     else
       @main_frame.text.insert("end","\n")
       _index_begin = @main_frame.text.index('end')
-      TkTextImage.new(@main_frame.text, _index_begin, 'padx'=>0, 'pady'=>0, 'image'=> Arcadia.image_res(ITEM_START_LOG_GIF))
-      #@main_frame.text.insert("end"," +--- #{format_time(_event.time)} ---+\n", 'bord_msg')
-      sync_insert("end"," +--- #{format_time(_event.time)} ---+\n", 'bord_msg')
+#      TkTextImage.new(@main_frame.text, _index_begin, 'padx'=>0, 'pady'=>0, 'image'=> Arcadia.image_res(ITEM_START_LOG_GIF))
+#      sync_insert("end"," +--- #{format_time(_event.time)} ---+\n", 'info_msg')
+      sync_insert("end","===== #{format_time(_event.time)} ======\n", 'info_msg')
     end
     if _event.append
       _index_begin = "#{@main_frame.text.index(_index_begin)} - 2 lines lineend"
@@ -231,7 +247,6 @@ class Output < ArcadiaExt
     #       TkTextWindow.new(@main_frame.text, 'end', 'window'=> _b)
     #     end
 
-      
   end
 
   def sync_insert(_index, _txt, _tag=nil)
@@ -242,7 +257,7 @@ class Output < ArcadiaExt
       @writing = true
       if @prompt_active
         start =  @main_frame.text.get("#{_index} -1 lines linestart", _index).strip
-        if start == PROMPT
+        if start == @prompt.strip
           _index = "#{_index} -1 lines linestart"
         end
       end
@@ -257,19 +272,23 @@ class Output < ArcadiaExt
   end
 
   def on_input_keyboard_query(_event)
+    if _event.pid
+      @prompt = "~#{_event.pid} #{PROMPT_SIMBOL} "
+    end
     @prompt_active = true
-    sync_insert("end","#{PROMPT}",'bord_msg')
+    sync_insert("end", @prompt, 'prompt')
     @main_frame.text.focus
     @main_frame.text.see("end")
-
+    prompt_index = @main_frame.text.index("insert")
     @main_frame.input_buffer = nil
     while @main_frame.input_buffer.nil? && !_event.is_breaked?
       sleep(0.1)
     end
     if !_event.is_breaked?
       _event.add_result(self, 'input'=>@main_frame.input_buffer)
+      @main_frame.text.tag_add("prompt","#{prompt_index} linestart","#{prompt_index} lineend")
     else
-      if @main_frame.text.get("end -1 lines linestart", "end -1 lines lineend").strip == PROMPT
+      if @main_frame.text.get("end -1 lines linestart", "end -1 lines lineend").strip == @prompt.strip
         @main_frame.text.delete("end -1 lines linestart", "end -1 lines lineend")
       end
     end
@@ -295,7 +314,7 @@ class Output < ArcadiaExt
         #if _row >= _from_row
         _end = 0
         #m = /([\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*\.rb):(\d*)/.match(l)
-        re = Regexp.new('([\w\:]*[\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*[(<<current buffer>>)]*):(\d*)')
+        re = Regexp.new('([\w\:]*[\.\/]*[\/A-Za-z0-9_\-\.]*[\.\/\w\d]*[(<<current buffer>>)]*):(\d*)')
         m = re.match(l)
         #m = /([\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*):(\d*)/.match(l)
         while m
@@ -349,6 +368,12 @@ class Output < ArcadiaExt
     proc{@main_frame.text.configure('cursor'=> @cursor)}
     )
 
+    if @main_frame.auto_open_file?
+      Arcadia.process_event(OpenBufferTransientEvent.new(self,'file'=>_file, 'row'=>_line))
+      self.frame.show
+      @main_frame.text.set_focus
+      @main_frame.text.see("end")
+    end
   end
 
   def out(_txt=nil, _tag=nil)

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

@@ -45,4 +45,6 @@ user_toolbar.debug.debuglast.event_args=!{'file'=>"*LAST"}
 user_toolbar.debug.debugquit.name=debugquit
 user_toolbar.debug.debugquit.hint=Quit debug
 user_toolbar.debug.debugquit.image_data=!DEBUG_QUIT_GIF
-user_toolbar.debug.debugquit.event_class=!StopDebugEvent
+user_toolbar.debug.debugquit.event_class=!StopDebugEvent
+
+runners.ruby.debug.curr.console = {:cmd=>"rdebug <<FILE>>",:file=>"*CURR",:title=>Arcadia.text('main.runner.rdebug_selected.title',['ruby']),:file_exts=>".rb,.rbw",:image=>DEBUG_CURRENT_GIF}

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

@@ -137,7 +137,7 @@ class RubyDebugView
       if @tree_process.parent(_selected)=='client'
         _text = @tree_process.itemcget(_selected, 'text')
         pos = match_position_from_stack(_text)
-        if pos && pos.length >0 
+        if pos && pos.length >0 && File.exists?(pos[0])
     	     Arcadia.process_event(OpenBufferEvent.new(self,'file'=>pos[0], 'row'=>pos[1]))
           #EditorContract.instance.open_file(self, 'file'=>pos[0], 'line'=>pos[1])
         end
@@ -522,13 +522,17 @@ class RubyDebugView
     #matchline = _line.match(/#*([0-9]*)[\s\w\W]*\s([\w\:]*[\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*):(\d*)/)
     matchline = _line.match(/#*([0-9]*)[\s\w\W]*line\s(.*):([0-9]*)(.*)/)
     if !matchline.nil? && matchline.length==5
-      #Arcadia.new_error_msg(self, "matchline[2]=#{matchline[2]}")
-      #Arcadia.new_error_msg(self, "matchline[3]=#{matchline[3]}")
       filename = matchline[2].to_s.strip
       line_no = matchline[3].to_i 
-      if filename && line_no
-        ret << filename << line_no
+    else
+      matchline = _line.match(/[lL]ine\s(.*)[:]*([0-9]*)\sof\s\"(.*)\"/)
+      if !matchline.nil? && matchline.length==4
+        filename = matchline[3].to_s.strip
+        line_no = matchline[1].to_i 
       end
+    end  
+    if filename && line_no
+      ret << filename << line_no
     end
     ret
   end
@@ -1141,7 +1145,8 @@ class RubyDebugClient
   end
 
   def where
-    notify("where", read("where"))
+#    notify("where", read("where"))
+    notify("where", read("info line"))
   end
 
   def quit
@@ -1392,10 +1397,12 @@ class RubyDebug < ArcadiaExt
         #p "on_debug --> @rdc.is_alive?=#{@rdc.is_alive?}"
         #p "on_debug --> @rds.is_alive?=#{@rds.is_alive?}"
       when SetBreakpointEvent
-        if _event.file
-          self.breakpoint_add(File.expand_path(_event.file), _event.row)
-        elsif _event.id
-          self.breakpoint_add(_event.id, _event.row)
+        if _event.active > 0
+          if _event.file
+            self.breakpoint_add(File.expand_path(_event.file), _event.row)
+          elsif _event.id
+            self.breakpoint_add(_event.id, _event.row)
+          end
         end
       when UnsetBreakpointEvent
         return if _event.file.nil?
@@ -1548,7 +1555,7 @@ class RubyDebug < ArcadiaExt
           end
         end
       rescue Exception => e
-        Arcadia.console(self, Arcadia.text('ext.ruby_debug.e.do_debug', [e.to_s, e.backtrace[0]]), 'level'=>'debug')
+        Arcadia.console(self, 'msg'=> Arcadia.text('ext.ruby_debug.e.do_debug', [e.to_s, e.backtrace[0]]), 'level'=>'debug')
       end
     end
   end

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

@@ -10,5 +10,5 @@ font=courier 10
 font.bold=courier 10 bold
 freebsd::font=courier 12 italic
 freebsd::font.bold=courier 12 bold
-win|mingw::font={Courier New} 9
-win|mingw::font.bold={Courier New} 9 bold
+WINDOWS::font={Courier New} 9
+WINDOWS::font.bold={Courier New} 9 bold