arcadia 0.8.0 → 0.8.1

data/README

@@ -1,8 +1,8 @@
 = Arcadia Ruby Ide
-version 0.8.0
+version 0.8.1
 
 by Antonio Galeone
-on Dec 11, 2009
+on Apr 10, 2010
 
 
 == About
@@ -16,23 +16,18 @@ Some of Arcadia ruby ide project features include:
 * Working on any platform where ruby and tcl-tk work.
 * Highly extensibility architecture.
 
-== In this release 0.8.0
-[New extensions]
-  ack in files: 
-     - similar to "search in files" using ack utility
-     
+== In this release 0.8.1
+    
 [Improvements]
 	commons: 
-	  - porting ruby 1.9
 	  - bug-fixing
-	core:
-	  - remenber window size/position, show/hide toolbar preferences and layout from previous run  
+	  - hide splash on gems wizard
+	  - added keybinding configurazion support 
+	  - added new event :  RedoTextEvent, SelectAllTextEvent, InvertSelectionTextEvent, UpperCaseTextEvent, LowerCaseTextEvent
+	    and Edit menu items : 'Redo','Select all','Invert selection','Uppercase', 'Lowercase'
+
 	editor:
-	  - remember the last file your were editing, with editing location, on startup
-	  - added new hightlight engine based on coderay, others kind of file are now supported (erb,rhtml,java)
-	  - added auto completion of current word based on words within the current window 
-	    also; then added escape key short cut.
-	  - added outline syncronization
+	  - added dynamic resizing of line numbers frame 
 
 == Dependencies
   - rubygems

data/conf/arcadia.conf

@@ -27,6 +27,7 @@ layout.split.4=0.0r60%
 #:::::::::::::::: layout    ::::::::::::::::::::::<end>
 confirm-on-exit=no
 #:::::::::::::::::::::::::::::::::::::::::::::::::<begin>
+encoding=utf-8
 font.h1=
 font.h2=
 font.h3=courier 10
@@ -63,6 +64,8 @@ panel.borderwidth=0
 
 scrollbar.background=>>>background
 scrollbar.highlightbackground=>>>background
+scrollbar.activebackground=>>>activebackground
+#scrollbar.troughcolor=red 
 scrollbar.relief=flat
 scrollbar.borderwidth=1
 scrollbar.elementborderwidth=1
@@ -349,6 +352,22 @@ e.user_toolbar.sys.exit.event_class=!QuitEvent
 
 user_toolbar_show=yes
 #:::::::::::::::: toolbar    ::::::::::::::::::::::<end>
+#:::::::::::::::: keybinding    ::::::::::::::::::::::<begin>
+#keybinding.Control-Shift-KeyPress[X]=OpenBufferEvent.new(self,'file'=>Arcadia.open_file_dialog)
+#keybinding.Control-KeyPress[o]=OpenBufferEvent.new(self)
+#keybinding.Control-Shift-KeyPress[Y]=ActionEvent.new(self,'action'=>Arcadia.open_file_dialog)
+keybinding.Control-KeyPress[q]=QuitEvent.new(self)
+
+keybinding.Control-KeyPress[x]=CutTextEvent.new(self)
+keybinding.Control-KeyPress[c]=CopyTextEvent.new(self)
+keybinding.Control-KeyPress[v]=PasteTextEvent.new(self)
+keybinding.Control-KeyPress[z]=UndoTextEvent.new(self)
+keybinding.Control-KeyPress[r]=RedoTextEvent.new(self)
+keybinding.Control-Shift-KeyPress[A]=SelectAllTextEvent.new(self)
+keybinding.Control-Shift-KeyPress[I]=InvertSelectionTextEvent.new(self)
+keybinding.Control-Shift-KeyPress[U]=UpperCaseTextEvent.new(self)
+keybinding.Control-Shift-KeyPress[L]=LowerCaseTextEvent.new(self)
+#:::::::::::::::: keybinding    ::::::::::::::::::::::<end>
 
 #:::::::::::::::: splash group    ::::::::::::::::::::::<begin>
 splash.show=yes

data/ext/ae-dir-projects/ae-dir-projects.rb

@@ -455,6 +455,7 @@ class DirProjects < ArcadiaExt
         end
       }
     )
+
     @htree.areabind_append("Button-3",
       proc{|x,y|
         _x = TkWinfo.pointerx(@htree)
@@ -729,7 +730,8 @@ class DirProjects < ArcadiaExt
   def add_node(_parent, _node, _kind)
     return if @htree.exist?(_node)
     @node_parent[_node] = _parent
-    _name = _node.split(File::SEPARATOR)[-1]
+#    _name = _node.split(File::SEPARATOR)[-1]
+    _name = File.basename(_node)
     _drawcross = 'auto'
     if _kind == "project" || _kind == "directory"
       num = Dir.entries(_node).length-2

data/ext/ae-editor/ae-editor.conf

@@ -135,4 +135,5 @@ explorer_panel.tabs.side=top
 
 #:::::::::::::::: Editor group    ::::::::::::::::::::::<end>
 popup.bind.shortcut=Button-3
-arm::popup.bind.shortcut=F4
+arm::popup.bind.shortcut=F4
+#keybinding.Control-Shift-KeyPress[Y]=ActionEvent.new(self,'action'=>close_raised)

data/ext/ae-editor/ae-editor.rb

@@ -370,6 +370,9 @@ class SafeCompleteCode
       # 1) includiano i require
       elsif line.strip.length>7 && (line.strip[0..7]=="require " || line.strip[0..7]=="require(")
         @modified_source = "#{@modified_source}#{line}\n"
+        if line.strip[8..-1].include?("tk")
+          @modified_source = "#{@modified_source}Tk.root.destroy if Tk && Tk.root\n"
+        end
         #@modified_row = @modified_row+1
         #Arcadia.console(self, 'msg'=>"per require @modified_row=#{@modified_row}")
       # 2) includiano la riga da evaluare con un $SAFE 3
@@ -836,7 +839,7 @@ class AgEditorOutline
     build_tree_from_node(@ss.root, _label_sel)
     if @selected
       @tree_exp.selection_add(@selected.rif)
-      @tree_exp.open_tree(@selected.parent.rif)
+      @tree_exp.open_tree(@selected.parent.rif) if @selected.parent.rif != 'root'
       @tree_exp.see(@selected.rif)
     end
   end
@@ -896,7 +899,7 @@ class AgEditor
   
   def xy_insert
     _index_now = @text.index('insert')
-    _rx, _ry, _widht, _heigth = @text.bbox(_index_now);
+    _rx, _ry, _width, _heigth = @text.bbox(_index_now);
     _x = _rx + TkWinfo.rootx(@text)  
     _y = _ry + TkWinfo.rooty(@text)  + @font_metrics[2][1]
     _xroot = _x - TkWinfo.rootx(Arcadia.instance.layout.root)  
@@ -906,7 +909,7 @@ class AgEditor
   
 
   def initialize_text(_frame)
-    @text = TkScrollText.new(_frame, Arcadia.style('text')){|j|
+    @text = TkArcadiaText.new(_frame, Arcadia.style('text')){|j|
       wrap  'none'
       undo true
 #      insertofftime 200
@@ -1060,7 +1063,7 @@ class AgEditor
         extra_len = 0
       end
       if _candidates.length >= 1 
-          _rx, _ry, _widht, heigth = @text.bbox(_begin_index);
+          _rx, _ry, _width, heigth = @text.bbox(_begin_index);
           _x = _rx + TkWinfo.rootx(@text)  
           _y = _ry + TkWinfo.rooty(@text)  + @font_metrics[2][1]
           _xroot = _x - TkWinfo.rootx(Arcadia.instance.layout.root)  
@@ -1328,26 +1331,35 @@ class AgEditor
   #
   def activate_key_binding
     activate_complete_code_key_binding if @is_ruby
+
     @text.bind_append("Control-KeyPress"){|e|
       case e.keysym
-#      when 'space'
-#        @do_complete = true
-#        complete_code.call
-      when 'z'
-        #_b = @text.index('insert').split('.')[0].to_i
-        begin
-          @text.edit_undo
-        rescue RuntimeError => e
-          throw e unless e.to_s.include? "nothing to undo" # this is ok--we've done undo back to the beginning
-          break
-        end
-        #_e = @text.index('insert').split('.')[0].to_i
-        if @highlighting
-          _b = @text.index('@0,0').split('.')[0].to_i
-          _e = @text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1
-          rehighlightlines(_b,_e)
-        end
-        break
+#      when 'z'
+#        begin
+#          @text.edit_undo
+#        rescue RuntimeError => e
+#          throw e unless e.to_s.include? "nothing to undo" # this is ok--we've done undo back to the beginning
+#          break
+#        end
+#        if @highlighting
+#          _b = @text.index('@0,0').split('.')[0].to_i
+#          _e = @text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1
+#          rehighlightlines(_b,_e)
+#        end
+#        break
+#      when 'r'
+#        begin
+#          @text.edit_redo
+#        rescue RuntimeError => e
+#          throw e unless e.to_s.include? "nothing to redo" # this is ok--we've done redo back to the beginning
+#          break
+#        end
+#        if @highlighting
+#          _b = @text.index('@0,0').split('.')[0].to_i
+#          _e = @text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1
+#          rehighlightlines(_b,_e)
+#        end
+#        break
       when 'o'  
         if @file
           _dir = File.dirname(@file)
@@ -1356,23 +1368,20 @@ class AgEditor
         end
         Arcadia.process_event(OpenBufferEvent.new(self,'file'=>Tk.getOpenFile('initialdir'=>_dir)))
         break
-      when 'c'
-        @text.text_copy
-        break
-      when 'x'
-        @text.text_cut
-        break
-      when 'v'
-        _b = @text.index('insert').split('.')[0].to_i
-        @text.text_paste
-        _e = @text.index('insert').split('.')[0].to_i
-        if @highlighting
-          rehighlightlines(_b,_e)
-#          for j in _b..._e
-#            rehighlightline(j)
-#          end
-        end
-        break
+#      when 'c'
+#        @text.text_copy
+#        break
+#      when 'x'
+#        @text.text_cut
+#        break
+#      when 'v'
+#        _b = @text.index('insert').split('.')[0].to_i
+#        @text.text_paste
+#        _e = @text.index('insert').split('.')[0].to_i
+#        if @highlighting
+#          rehighlightlines(_b,_e)
+#        end
+#        break
       end
       case e.keysym
       when 's'
@@ -1577,7 +1586,6 @@ class AgEditor
     @text.bind_remove('Control-KeyPress')
     @text.bind_remove('Control-Shift-KeyPress')
     @text.bind_remove('Shift-KeyPress')
-
   end
   
   def do_enter
@@ -1886,7 +1894,7 @@ class AgEditor
   def pop_up_menu
     @pop_up = TkMenu.new(
       :parent=>@text,
-      :tearoff=>0,
+      :tearoff=>1,
       :title => 'Menu'
     )
     @pop_up.configure(Arcadia.style('menu'))
@@ -1992,6 +2000,26 @@ class AgEditor
         @text.insert('insert',Tk.chooseColor)
       }
     )
+
+    @pop_up.insert('end',
+      :command,
+      :label=>'View color from data',
+      :hidemargin => false,
+      :command=> proc{
+        _r = @text.tag_ranges('sel')
+        if _r.length>0
+          _data=@text.get(_r[0][0],_r[0][1])
+          if _data.length > 0
+            _b = TkButton.new(@text, 
+              'command'=>proc{_b.destroy},
+              'bg'=>_data,
+              'relief'=>'groove')
+            TkTextWindow.new(@text, _r[0][1], 'window'=> _b)
+          end
+        end
+      }
+    )
+
     @pop_up.insert('end',
       :command,
       :label=>'Font',
@@ -2003,7 +2031,7 @@ class AgEditor
     
     @pop_up.insert('end',
       :command,
-      :label=>'Data image from file',
+      :label=>'Data from file',
       :hidemargin => false,
       :command=>       proc{
         file = Arcadia.open_file_dialog
@@ -2039,6 +2067,7 @@ class AgEditor
       }
     )
 
+
     @pop_up.insert('end',
       :command,
       :label=>'Data image to file',
@@ -2211,7 +2240,8 @@ class AgEditor
       proc{|x,y|
         _x = TkWinfo.pointerx(@text)
         _y = TkWinfo.pointery(@text)
-        @pop_up.entryconfigure(0, 'label'=>File.basename(@file)) if @file
+        @pop_up.entryconfigure(1, 'label'=>File.basename(@file)) if @file
+        #@pop_up.entryconfigure(0, 'label'=>File.basename(@file)) if @file
         @pop_up.popup(_x,_y)
       },
     "%x %y")
@@ -2524,14 +2554,14 @@ class AgEditor
         @text_line_num.delete('1.0','end')
         
 
-        _rx, _ry, _widht, _heigth = @text.bbox(line_begin_index);
+        _rx, _ry, _width, _heigth = @text.bbox(line_begin_index);
         
         if _ry && _ry < 0 
           real_line_end = line_end + 1
         else
           real_line_end = line_end
         end
-
+        #@fm1
         _tags = Array.new
         for j in line_begin...real_line_end
           nline = j.to_s.rjust(line_end.to_s.length+2)
@@ -2542,10 +2572,9 @@ class AgEditor
           else
             _tags << 'normal_case'
           end
-          
           if wrap_on
-            w_rx_b, w_ry_b, w_widht_b, w_heigth_b = @text.bbox("#{(j).to_s}.0");
-            w_rx_e, w_ry_e, w_widht_e, w_heigth_e = @text.bbox("#{(j).to_s}.0 lineend");
+            w_rx_b, w_ry_b, w_width_b, w_heigth_b = @text.bbox("#{(j).to_s}.0");
+            w_rx_e, w_ry_e, w_width_e, w_heigth_e = @text.bbox("#{(j).to_s}.0 lineend");
             if w_ry_e && w_ry_b 
               delta = w_ry_e - w_ry_b
               if delta > 1   
@@ -2555,7 +2584,6 @@ class AgEditor
               end
             end
           end
-
           @text_line_num.insert(_index, "#{nline}\n",_tags)
           if b.include?(j.to_s)
             add_tag_breakpoint(j)
@@ -2566,11 +2594,28 @@ class AgEditor
         end
       end
       refresh_outline if Tk.focus==@text
-#      if TkWinfo.mapped?(@text_line_num)
-#        x,y,w,h = @text.bbox("#{(line_end).to_s}.3");
-#        @fm1.splitter_frame.go(w,0)
-#        @fm1.do_resize
-#      end
+      resize_line_num(line_end)
+  end
+
+  def resize_line_num(_line_end=nil)
+    if TkWinfo.mapped?(@text_line_num)
+      _line_end=@text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1 if _line_end.nil?
+      line_end_chars  = _line_end.to_s.length  
+      if @last_line_end_chars != line_end_chars
+        if @line_num_rx_e.nil?
+          @line_num_rx_e, @line_num_ry_e, @line_num_width_e, @line_num_heigth_e = @text_line_num.bbox("0.1 lineend - 1chars");
+        end
+        if @line_num_rx_e && @line_num_width_e && line_end_chars >0 
+          actual_width = @line_num_rx_e + @line_num_width_e
+          need_width = (line_end_chars+1)*@line_num_width_e
+          delta = actual_width - need_width
+          @fm1.resize_left(need_width)
+          @last_line_end_chars = line_end_chars
+        else
+          @last_line_end_chars = -1
+        end
+      end
+    end
   end
 
   def highlightlines(_row_begin, _row_end, _check_mod = false)
@@ -2733,6 +2778,30 @@ class AgEditor
     end
   end
 
+  def modified_by_others?
+    ret = false 
+    if @file_last_access_time && @file 
+      if File.exist?(@file)
+        ftime = File.mtime(@file)
+        ret = @file_last_access_time != ftime
+      else
+        ret = true
+      end
+    end
+    ret
+  end
+
+  def reset_file_last_access_time
+    if @file
+      if File.exist?(@file)
+        @file_last_access_time = File.mtime(@file)
+      else
+        @file_last_access_time = nil
+        @file = nil
+      end
+    end
+  end
+  
   def check_file_last_access_time
     if @file
       file_exist = File.exist?(@file)
@@ -2740,11 +2809,11 @@ class AgEditor
         ftime = File.mtime(@file)
         if @file_last_access_time != ftime
           msg = 'File "'+@file+'" is changed! Reload?'
-          if Tk.messageBox('icon' => 'error', 'type' => 'yesno',
+          ans = Tk.messageBox('icon' => 'error', 'type' => 'yesno',
             'title' => '(Arcadia) Libs', 'parent' => @text,
-            'message' => msg) == 'yes'
+            'message' => msg)
+          if ans == 'yes'
             reload
-            
           else
             @file_last_access_time = ftime
           end
@@ -3115,7 +3184,7 @@ class AgMultiEditor < ArcadiaExt
 
   def on_after_focus(_event)
     if raised && _event.focus_widget == raised.text
-      if [CutTextEvent, PasteTextEvent].include?(_event.class)
+      if [CutTextEvent, PasteTextEvent, UndoTextEvent, RedoTextEvent].include?(_event.class)
         if raised.highlighting
           line_begin_index = raised.text.index('@0,0')
           line_begin = line_begin_index.split('.')[0].to_i
@@ -3473,11 +3542,6 @@ class AgMultiEditor < ArcadiaExt
   def close_raised
     _e = @tabs_editor[@main_frame.enb.raise]
     close_editor(_e) if _e
-  
-    #_page = @main_frame.enb.raise
-    #_editor = @tabs_editor[_page]
-    #_row = _editor.text_insert_index.split('.')[0].strip.to_i
-    #close_editor(_editor)
   end
 
   def breakpoint_add(_file,_line)
@@ -3867,6 +3931,21 @@ class AgMultiEditor < ArcadiaExt
       elsif r=="cancel"
         ret = false
       end
+    elsif _editor.modified_by_others?
+      filename = page_name(_editor.page_frame)
+      message = @main_frame.enb.itemcget(filename, 'text')+"\n modified by other process. Continue closing?"
+      r=Arcadia.dialog(self,
+          'type'=>'yes_no', 
+          'level'=>'warning',
+          'title'=> 'Continue closing', 
+          'msg'=>message)
+      if r=="yes"
+        _editor.reset_file_last_access_time
+        ret = !_editor.modified_by_others?
+      else
+        ret = false
+        #raise_file(filename) 
+      end
     end
     ret
   end