arcadia 0.13.1 → 1.0.0

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

@@ -13,7 +13,7 @@ class SearchInFiles < ArcadiaExt
   def on_before_search_in_files(_event)
     if _event.what.nil?
       if _event.dir
-        @find.e_dir.text(_event.dir)
+        @find.e_dir.value=_event.dir
       end
       @find.show
     end
@@ -44,42 +44,56 @@ class SearchInFiles < ArcadiaExt
       end
     }
     
-    for method in [:e_what_entry, :e_filter_entry, :e_dir_entry] do
+    #for method in [:e_what_entry, :e_filter_entry, :e_dir_entry] do
+    for method in [:e_what, :e_filter, :e_dir] do
       @find.send(method).bind_append('KeyPress') { |*args| enter_proc.call *args } # ltodo why can't we pass it in like &enter_proc?
     end
     @find.title(title)
   end
   private :create_find
 
-  def update_what_combo(_txt)
-    values = @find.e_what.cget('values')
-    if (values != nil && !values.include?(_txt))
-      @find.e_what.insert('end', _txt)
+  def update_combo(_combobox=nil)
+    return if _combobox.nil?
+    values = _combobox.cget('values')
+    if (values != nil && !values.include?(_combobox.value))
+      values << _combobox.value
+      _combobox.values=values
     end
   end
 
-  def update_filter_combo(_txt)
-    values = @find.e_filter.cget('values')
-    if (values != nil && !values.include?(_txt))
-      @find.e_filter.insert('end', _txt)
-    end
-  end
+#  def update_what_combo(_txt)
+#    values = @find.e_what.cget('values')
+#    if (values != nil && !values.include?(_txt))
+#      values << @find.e_what.value
+#      @find.e_what.values=values
+#      #@find.e_what.insert('end', _txt)
+#    end
+#  end
 
-  def update_dir_combo(_txt)
-    values = @find.e_dir.cget('values')
-    if (values != nil && !values.include?(_txt))
-      @find.e_dir.insert('end', _txt)
-    end
-  end
+#  def update_filter_combo(_txt)
+#    values = @find.e_filter.cget('values')
+#    if (values != nil && !values.include?(_txt))
+#      values << @find.e_filter.value
+#      @find.e_filter.insert('end', _txt)
+#      #@find.e_filter.insert('end', _txt)
+#    end
+#  end
+#
+#  def update_dir_combo(_txt)
+#    values = @find.e_dir.cget('values')
+#    if (values != nil && !values.include?(_txt))
+#      @find.e_dir.insert('end', _txt)
+#    end
+#  end
   
   def update_all_combo
-    update_what_combo(@find.e_what.text)
-    update_filter_combo(@find.e_filter.text)
-    update_dir_combo(@find.e_dir.text)
+    update_combo(@find.e_what)
+    update_combo(@find.e_filter)
+    update_combo(@find.e_dir)
   end
   
   def do_find
-    return if @find.e_what.text.strip.length == 0  || @find.e_filter.text.strip.length == 0  || @find.e_dir.text.strip.length == 0
+    return if @find.e_what.value.strip.length == 0  || @find.e_filter.value.strip.length == 0  || @find.e_dir.value.strip.length == 0
     @find.hide
     if !defined?(@search_output)
       @search_output = SearchOutput.new(self)
@@ -87,17 +101,15 @@ class SearchInFiles < ArcadiaExt
     self.frame.show_anyway
     Thread.new do
       begin    
-        MonitorLastUsedDir.set_last @find.e_dir.text # save it away TODO make it into a message
-        _search_title = Arcadia.text('ext.search_in_files.search_result_title', [@find.e_what.text, @find.e_dir.text, @find.e_filter.text])
-        _filter = @find.e_dir.text+'/**/'+@find.e_filter.text
+        MonitorLastUsedDir.set_last @find.e_dir.value # save it away TODO make it into a message
+        _search_title = Arcadia.text('ext.search_in_files.search_result_title', [@find.e_what.value, @find.e_dir.value, @find.e_filter.value])
+        _filter = @find.e_dir.value+'/**/'+@find.e_filter.value
         _files = Dir[_filter]
         _node = @search_output.new_result(_search_title, _files.length)
         progress_stop=false
-        progress_bar = TkProgressframe.new(self.arcadia.layout.root, _files.length)		  
-        progress_bar.title(Arcadia.text('ext.search_in_files.progress.title'))
-        progress_bar.on_cancel=proc{progress_stop=true}
-        #@progress_bar.on_cancel=proc{cancel}
-        pattern = Regexp.new(@find.e_what.text)
+        hint = "#{Arcadia.text('ext.search_in_files.progress.title')} '#{@find.e_what.value}' into '#{@find.e_dir.value}'"
+        progress_bar = self.frame.root.add_progress(self.frame.name, _files.length, proc{progress_stop=true}, hint)
+        pattern = Regexp.new(@find.e_what.value)
         _files.each do |_filename|
             next if File.ftype(_filename) != 'file'
             begin
@@ -120,41 +132,46 @@ class SearchInFiles < ArcadiaExt
         Arcadia.console(self, 'msg'=>e.message, 'level'=>'error')
         #Arcadia.new_error_msg(self, e.message)
       ensure
-        progress_bar.destroy if progress_bar
+        self.frame.root.destroy_progress(self.frame.name, progress_bar) if progress_bar
+        #progress_bar.destroy if progress_bar
         self.frame.show_anyway
       end
     end
   end
-  
-  
+
 end
 
 class SearchOutput
   def initialize(_ext)
     @sequence = 0
     @ext = _ext
-    left_frame = TkFrame.new(@ext.frame.hinner_frame, Arcadia.style('panel')).place('x' => '0','y' => '0','relheight' => '1','width' => '25')
-    #right_frame = TkFrame.new(@ext.frame.hinner_frame, Arcadia.style('panel')).place('x' => '25','y' => '0','relwidth' => '1', 'relheight' => '1', 'width' => '-25')
+#    left_frame = TkFrame.new(@ext.frame.hinner_frame, Arcadia.style('panel')).place('x' => '0','y' => '0','relheight' => '1','width' => '25')
     @results = {}
     _open_file = proc do |tree, sel|
       n_parent, n = sel.split('@@@')
       Arcadia.process_event(OpenBufferTransientEvent.new(self,'file'=>@results[n_parent][n][0], 'row'=>@results[n_parent][n][1]))  if n && @results[n_parent][n]
     end
     @tree = BWidgetTreePatched.new(@ext.frame.hinner_frame, Arcadia.style('treepanel')){
+    #@tree = BWidgetTreePatched.new(@ext.hinner_dialog, Arcadia.style('treepanel')){
+    #@tree = BWidgetTreePatched.new(@ext.hinner_splitted_dialog, Arcadia.style('treepanel')){
       selectcommand(_open_file)
       deltay 15
     }
-    @tree.extend(TkScrollableWidget).show(25,0)
+#    @tree.extend(TkScrollableWidget).show(25,0)
+    @tree.extend(TkScrollableWidget).show(0,0)
     
-    _proc_clear = proc{clear_tree}
+#    _proc_clear = proc{clear_tree}
+
+    _ext.frame.root.add_button(_ext.name,  Arcadia.text('ext.search_in_files.button.clear.hint'), proc{clear_tree}, CLEAR_GIF) if _ext
+
     
-    @button_u = Tk::BWidget::Button.new(left_frame, Arcadia.style('toolbarbutton')){
-      image  Arcadia.image_res(CLEAR_GIF)
-      helptext 'ext.search_in_files.button.clear.hint'
-      command _proc_clear
-      relief 'groove'
-      pack('side' =>'top', 'anchor'=>'n',:padx=>0, :pady=>0)
-    }
+#    @button_u = Tk::BWidget::Button.new(left_frame, Arcadia.style('toolbarbutton')){
+#      image  Arcadia.image_res(CLEAR_GIF)
+#      helptext 'ext.search_in_files.button.clear.hint'
+#      command _proc_clear
+#      relief 'groove'
+#      pack('side' =>'top', 'anchor'=>'n',:padx=>0, :pady=>0)
+#    }
     
     @found_color=Arcadia.conf('activeforeground')
     @not_found_color= Arcadia.conf('hightlight.comment.foreground')
@@ -225,7 +242,7 @@ end
 
 class FindFrame < TkFloatTitledFrame
   attr_reader :e_what, :e_filter, :e_dir
-  attr_reader :e_what_entry, :e_filter_entry, :e_dir_entry
+#  attr_reader :e_what_entry, :e_filter_entry, :e_dir_entry
   attr_reader :b_go
   def initialize(_parent)
     super(_parent)
@@ -236,18 +253,24 @@ class FindFrame < TkFloatTitledFrame
    	  place('x' => 8,'y' => y0,'height' => 19)
     }
     y0 = y0 + d
-    @e_what = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
-      editable true
+    #@e_what = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
+    @e_what = Arcadia.wf.combobox(self.frame){
+      #editable true
       justify  'left'
-      autocomplete 'true'
-      expand 'tab'
+      #autocomplete 'true'
+      #expand 'tab'
+      exportselection true
+      width 100
       takefocus 'true'
       place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
-    @e_what_entry = TkWinfo.children(@e_what)[0]
-    # this means "after each key press 
-    #@e_what_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_what_entry))})
-    @e_what_entry.extend(TkInputThrow)
+    
+    @e_what.extend(TkInputThrow)
+
+
+#    @e_what_entry = TkWinfo.children(@e_what)[0]
+#    # this means "after each key press 
+#    @e_what_entry.extend(TkInputThrow)
     
     y0 = y0 + d
     TkLabel.new(self.frame, Arcadia.style('label')){
@@ -256,21 +279,28 @@ class FindFrame < TkFloatTitledFrame
     }
     y0 = y0 + d
    
-    @e_filter = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
-      editable true
+    #@e_filter = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
+    @e_filter = Arcadia.wf.combobox(self.frame){
+      #editable true
       justify  'left'
-      autocomplete 'true'
-      expand 'tab'
+      #autocomplete 'true'
+      #expand 'tab'
+      exportselection true
+      width 100
       takefocus 'true'
       place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
-    @e_filter_entry = TkWinfo.children(@e_filter)[0]
-    #@e_filter_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_filter_entry))})
-    @e_filter_entry.extend(TkInputThrow)
+    @e_filter.extend(TkInputThrow)
+
+#    @e_filter_entry = TkWinfo.children(@e_filter)[0]
+#    @e_filter_entry.extend(TkInputThrow)
+
+    @e_filter.values = ['*.rb', '*.*']
+    @e_filter.value = @e_filter.values[0]
+#    @e_filter.insert('end', '*.*')
+#    @e_filter.insert('end', '*.rb')
+#    @e_filter.text('*.rb')
 
-    @e_filter.insert('end', '*.*')
-    @e_filter.insert('end', '*.rb')
-    @e_filter.text('*.rb')
     y0 = y0 + d
 
     TkLabel.new(self.frame, Arcadia.style('label')){
@@ -280,24 +310,32 @@ class FindFrame < TkFloatTitledFrame
     y0 = y0 + d
 
     _h_frame = TkFrame.new(self.frame, Arcadia.style('panel')).place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
-    @e_dir = Tk::BWidget::ComboBox.new(_h_frame, Arcadia.style('combobox')){
-      editable true
+
+    #@e_dir = Tk::BWidget::ComboBox.new(_h_frame, Arcadia.style('combobox')){
+    @e_dir = Arcadia.wf.combobox(_h_frame){
+      #editable true
       justify  'left'
-      autocomplete 'true'
-      expand 'tab'
+      #autocomplete 'true'
+      #expand 'tab'
+      exportselection true
+      width 100
       takefocus 'true'
       pack('fill'=>'x')
       #pack('fill'=>'x')
       #place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
-    @e_dir.text(MonitorLastUsedDir.get_last_dir)
-    @e_dir_entry = TkWinfo.children(@e_dir)[0]
+    @e_dir.value = MonitorLastUsedDir.get_last_dir
+
+#    @e_dir.text(MonitorLastUsedDir.get_last_dir)
+#    @e_dir_entry = TkWinfo.children(@e_dir)[0]
 
-    @b_dir = TkButton.new(@e_dir, Arcadia.style('button') ){
+    #@b_dir = TkButton.new(@e_dir, Arcadia.style('button') ){
+    @b_dir = Arcadia.wf.button(@e_dir){
       compound  'none'
       default  'disabled'
       text  '...'
-      pack('side'=>'right')
+      width 3
+      pack('side'=>'right', 'padx'=>18)
       #pack('side'=>'right','ipadx'=>5, 'padx'=>5)
     }.bind('1', proc{
          change_dir
@@ -308,7 +346,8 @@ class FindFrame < TkFloatTitledFrame
     y0 = y0 + d
     @buttons_frame = TkFrame.new(self.frame, Arcadia.style('panel')).pack('fill'=>'x', 'side'=>'bottom')	
 
-    @b_go = TkButton.new(@buttons_frame, Arcadia.style('button')){|_b_go|
+    #@b_go = TkButton.new(@buttons_frame, Arcadia.style('button')){|_b_go|
+    @b_go = Arcadia.wf.button(@buttons_frame){|_b_go|
       compound  'none'
       default  'disabled'
       text  Arcadia.text('ext.search_in_files.search.button.find')
@@ -316,13 +355,19 @@ class FindFrame < TkFloatTitledFrame
       #justify  'center'
       pack('side'=>'right','ipadx'=>5, 'padx'=>5)
     }
-    place('x'=>100,'y'=>100,'height'=> 220,'width'=> 300)
+    place('x'=>100,'y'=>100,'height'=> 220,'width'=> 350)
   end
 
   def change_dir
-    _d = Tk.chooseDirectory('initialdir'=>@e_dir.text,'mustexist'=>true)
+    #_d = Tk.chooseDirectory('initialdir'=>@e_dir.text,'mustexist'=>true)
+    _d = Arcadia.select_dir_dialog(@e_dir.value, true)
     if _d && _d.strip.length > 0
-      @e_dir.text(_d)
+      @e_dir.value = _d
+      values = @e_dir.values
+      if (values != nil && !values.include?(_d))
+         values << _d
+         @e_dir.values=values
+      end      
     end
   end
   
@@ -330,7 +375,9 @@ class FindFrame < TkFloatTitledFrame
     super
     self.focus
     @e_what.focus
-    @e_what_entry.select_throw
-    @e_what_entry.selection_range(0,'end')
+    @e_what.select_throw
+    @e_what.selection_range(0,'end')
+#    @e_what_entry.select_throw
+#    @e_what_entry.selection_range(0,'end')
   end
 end

data/ext/ae-shell/ae-shell.conf

@@ -4,7 +4,7 @@ require=ext/ae-shell/ae-shell
 class=Shell
 stdout_blocking=no
 stderr_blocking=yes
-win|mingw::1.8:@:gems=win32-process,ruby-wmi
+WINDOWS::1.8:@:gems=win32-process,ruby-wmi
 
 #:::::::::::::::: output  ::::::::::::::::::::::<begin>
 #ruby=ruby

data/ext/ae-shell/ae-shell.rb

@@ -136,7 +136,7 @@ class Shell < ArcadiaExt
     if _event.cmd
       #p "_event.cmd = #{_event.cmd}"
       begin
-        output_mark = Arcadia.console(self,'msg'=>"Running #{_event.title} as #{_event.lang}...", 'level'=>'debug') # info?
+        output_mark = Arcadia.console(self,'msg'=>"Running #{_event.title} as #{_event.lang}...", 'level'=>'info') # info?
         start_time = Time.now
         @arcadia['pers']['run.file.last']=_event.file if _event.persistent
         @arcadia['pers']['run.cmd.last']=_event.cmd if _event.persistent
@@ -183,57 +183,17 @@ class Shell < ArcadiaExt
           Thread.new {
             Thread.current.abort_on_exception = true
             begin
-#              th = Thread.current
               fi = nil
               fi_pid = nil
-#              abort_action = proc{
-#                ArcadiaUtils.unix_child_pids(fi_pid).each {|pid|
-#                  Process.kill(9,pid.to_i)
-#                }
-#                Process.kill(9,fi_pid.to_i)
-#              }
-                
-#              alive_check = proc{
-#                num = `ps -p #{fi_pid}|wc -l` if fi_pid
-#                num.to_i > 1 && fi_pid
-#              }
-              
-
-              #Arcadia.console(self,'msg'=>"#{th}", 'level'=>'debug', 'abort_action'=>abort_action)
 
               Open3.popen3(_cmd_){|stdin, stdout, stderr, th|
                 fi_pid = th.pid if th
-                output_mark = Arcadia.console(self,'msg'=>" [pid #{fi_pid}]", 'level'=>'debug', 'mark'=>output_mark, 'append'=>true)
+                output_mark = Arcadia.console(self,'msg'=>" [pid #{fi_pid}]", 'level'=>'info', 'mark'=>output_mark, 'append'=>true)
                 alive_check = proc{th.status != false}
                 abort_action = proc{Process.kill(9,fi_pid.to_i)}
 
     	           Arcadia.process_event(SubProcessEvent.new(self, 'pid'=>fi_pid, 'name'=>_event.file,'abort_action'=>abort_action, 'alive_check'=>alive_check))
 
-#                if stdout
-#                  if @stdout_blocking
-#                    output_dump = stdout.read
-#                    if output_dump && output_dump.length > 0 
-#                      output_mark = Arcadia.console(self,'msg'=>output_dump, 'level'=>'error', 'mark'=>output_mark)
-#                      _event.add_result(self, 'output'=>output_dump)
-#                    end
-#                  else
-#                    stdout.each do |output_dump|
-#                      p "th.status = #{th.status}"
-#                      output_mark = Arcadia.console(self,'msg'=>output_dump, 'level'=>'debug', 'mark'=>output_mark)
-#                      _event.add_result(self, 'output'=>output_dump)
-#                      if stdin && !stdin.closed? && th.status != false
-#                          begin
-#                            stdin.puts(Arcadia.console_input(self))
-#                          rescue Exception => e
-#                            output_mark = Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug', 'mark'=>output_mark)
-#                          end
-#                      end
-#                    end
-#                  end
-#                end
-
- 
-
                 to = Thread.new(stdout) do |tout|
                   begin
                     while (line = tout.gets)
@@ -251,7 +211,7 @@ class Shell < ArcadiaExt
                     while (tin && !tin.closed? && !input_break)
                       if th.status != false && to.status == 'sleep'
                         begin
-                          input = Arcadia.console_input(self)
+                          input = Arcadia.console_input(self, fi_pid)
                           tin.puts(input) if input != nil
                           sleep(0.1)
                         rescue Exception => e
@@ -264,9 +224,9 @@ class Shell < ArcadiaExt
                   rescue Exception => e
                     output_mark = Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug', 'mark'=>output_mark)
                   end
-               end
+                end
 
-               te = Thread.new(stderr) do |terr|
+                te = Thread.new(stderr) do |terr|
                   begin
                     while (line = terr.gets)
                       output_mark = Arcadia.console(self,'msg'=>line, 'level'=>'error', 'mark'=>output_mark)
@@ -278,43 +238,20 @@ class Shell < ArcadiaExt
                   rescue Exception => e
                     output_mark = Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug', 'mark'=>output_mark)
                   end
-               end
-
-               to.join
-               te.join
-               input_event = Arcadia.console_input_event
-               if input_event != nil
-                 input_event.break
-                 input_break = true
-                 ti.join
-               else
-                 ti.exit
-               end
-               te.exit
-                
-#                if stderr
-#                  if @stderr_blocking
-#                    current_buffer = '<<current buffer>>'
-#                    output_dump = stderr.read
-#                    if output_dump && output_dump.length > 0 
-#                      if !_event.persistent
-#                        output_dump.gsub!(_event.file, current_buffer)
-#                      end
-#                      output_mark = Arcadia.console(self,'msg'=>output_dump, 'level'=>'error', 'mark'=>output_mark)
-#                      _event.add_result(self, 'output'=>output_dump)
-#                    end
-#                  else
-#                    stderr.each do |output_dump|
-#                      if !_event.persistent
-#                        output_dump.gsub!(_event.file, current_buffer)
-#                      end
-#                      output_mark = Arcadia.console(self,'msg'=>output_dump, 'level'=>'error', 'mark'=>output_mark)
-#                      _event.add_result(self, 'output'=>output_dump)
-#                    end
-#                  end
-#                end
+                end
+                to.join
+                te.join
+                input_event = Arcadia.console_input_event
+                if input_event != nil
+                  input_event.break
+                  input_break = true
+                  ti.join
+                else
+                  ti.exit
+                end
+                te.exit
               }
-              output_mark = Arcadia.console(self,'msg'=>"\n"+Arcadia.text('ext.shell.done.1', [_event.title]), 'level'=>'debug', 'mark'=>output_mark)
+              output_mark = Arcadia.console(self,'msg'=>"\n"+Arcadia.text('ext.shell.done.1', [_event.title]), 'level'=>'info', 'mark'=>output_mark)
 
 
 #              open(_cmd_, "r"){|f|