arcadia 0.8.0 → 0.8.1

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

@@ -9,20 +9,12 @@ re.link=>>>
 re_op.to_line_end=comment
 re_op.only_first=operator
 
-#hightlight.comment.foreground=#007F00
-#hightlight.key.foreground=#9c342c
-#hightlight.key.style=bold
-#hightlight.value.foreground=#69a0b6
-#hightlight.value.style=bold
-#hightlight.operator.foreground=red
-#hightlight.operator.style=bold
-
-re.hightlight.comment.foreground=>>>hightlight.11.foreground
-re.hightlight.key.foreground=>>>hightlight.5.foreground
+re.hightlight.comment.foreground=>>>hightlight.comment.foreground
+re.hightlight.key.foreground=>>>hightlight.symbol.foreground
 re.hightlight.key.style=bold
-re.hightlight.value.foreground=>>>hightlight.6.foreground
+re.hightlight.value.foreground=>>>hightlight.constant.foreground
 re.hightlight.value.style=bold
-re.hightlight.operator.foreground=>>>hightlight.14.foreground
+re.hightlight.operator.foreground=>>>hightlight.operator.foreground
 re.hightlight.operator.style=bold
-re.hightlight.link.foreground=>>>hightlight.12.foreground
+re.hightlight.link.foreground=>>>hightlight.string.foreground
 re.hightlight.link.style=bold

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

@@ -24,7 +24,7 @@ class OutputView
       pack('side' =>'top', 'anchor'=>'n',:padx=>0, :pady=>0)
     }
     
-    @text = TkScrollText.new(right_frame,
+    @text = TkArcadiaText.new(right_frame,
       {'wrap'=>  'none'}.update(Arcadia.style('edit'))
     )
     @text.show

data/ext/ae-rad/lib/tk/al-tk.rb

@@ -2427,7 +2427,7 @@ class AGTkToplevel < AGTkContainer
     if ans =='yes'
       form2code
     elsif ans =='no'
-        keep_me
+      keep_me
     end
   end
   

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

@@ -42,14 +42,16 @@ class SearchInFilesListener
     enter_proc = proc {|e|
       case e.keysym
       when 'Return'
-        update_all_combo    
-        do_find
+        if @find.visible?
+          update_all_combo    
+          do_find
+        end
         Tk.callback_break
       end
     }
     
     for method in [:e_what_entry, :e_filter_entry, :e_dir_entry] do
-      @find.send(method).bind_append('KeyRelease') { |*args| enter_proc.call *args } # ltodo why can't we pass it in like &enter_proc?
+      @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
@@ -177,8 +179,8 @@ class SearchOutput
 #    @found_color='#3f941b'
 #    @not_found_color= 'red'
 #    @item_color='#6fc875'
-    @found_color=Arcadia.conf('hightlight.5.foreground')
-    @not_found_color= Arcadia.conf('hightlight.6.foreground')
+    @found_color=Arcadia.conf('activeforeground')
+    @not_found_color= Arcadia.conf('hightlight.comment.foreground')
     @item_color=Arcadia.conf('treeitem.fill')
   end  
   

data/lib/a-commons.rb

@@ -541,7 +541,6 @@ module Configurable
     end
     Hash.new.update(@@conf_groups[_group])
   end
-  
 
   def resolve_link(_value, _hash_source, _link_symbol='>>>', _add_symbol='+++')
       if _value.length > 0 
@@ -563,9 +562,9 @@ module Configurable
     _hash_target.each{|k,value|
       loop_level = 0
       if value.length > 0
-	v, vadd = value.split(_add_symbol)
+        v, vadd = value.split(_add_symbol)
       else
-	v= value
+        v= value
       end
 #      p "value=#{value} class=#{value.class}"
 #      p "v=#{v} class=#{v.class}"
@@ -597,6 +596,14 @@ module Configurable
     end
   end
   
+  def make_value(_self_context=self, _value='')
+    value = _value.strip
+    if value[0..0]=='!'
+      value=_self_context.instance_eval(value[1..-1])  
+    end
+    value
+  end
+  
 end
 
 module Persistable
@@ -658,6 +665,8 @@ class Application
     # read in the settings'
     publish('conf', properties_file2hash(self['applicationParams'].config_file)) if self['applicationParams'].config_file
     publish('origin_conf', Hash.new.update(self['conf'])) if self['conf']
+    publish('local_conf', Hash.new)
+    publish('conf_without_local', Hash.new.update(self['conf'])) if self['conf']
     publish('pers', properties_file2hash(self['applicationParams'].persistent_file)) if self['applicationParams'].persistent_file
     yield(self) if block_given?
   end
@@ -694,11 +703,11 @@ class Application
     @@conf_groups[_group]
   end
 
-  def Application.del_conf_group(_group)
+  def Application.del_conf_group(_conf_hash, _group)
       glen=_group.length
-      @@instance['conf'].keys.sort.each{|k|
+      _conf_hash.keys.sort.each{|k|
         if k[0..glen] == "#{_group}."
-          @@instance['conf'].delete(k)
+          _conf_hash.delete(k)
         end
       }
   end
@@ -730,13 +739,13 @@ class Application
           f = File.new(local_file_config, "w")
           begin
             if f
-              p = self['conf']
-              if p
-                p.keys.sort.each{|key|
-                  if self['origin_conf'][key] == self['conf'][key]
-                    f.syswrite('#'+key+'='+self['conf'][key]+"\n") # write it as a comment since it isn't a real change
-                  else
-                    f.syswrite(key+'='+self['conf'][key]+"\n")
+              properties = self['conf']
+              if properties
+                properties.keys.sort.each{|key|
+                  if self['conf_without_local'][key] == self['conf'][key] || (self['origin_conf'][key] && self['origin_conf'][key].include?('>>>')) # || self['local_conf'][key].nil?
+                    f.syswrite("# #{key}=#{self['origin_conf'][key]}\n") # write it as a comment since it isn't a real change
+                  elsif self['conf'][key]
+                    f.syswrite("#{key}=#{self['conf'][key]}\n")
                   end
                 }
               end
@@ -751,7 +760,8 @@ class Application
   # this method load config file from local directory for personalizations
   def load_local_config(_create_if_not_exist=true)
       if FileTest.exist?(local_file_config)
-        self['conf'].update(self.properties_file2hash(local_file_config))
+        self['local_conf']= self.properties_file2hash(local_file_config)
+        self['conf'].update(self['local_conf'])
       elsif _create_if_not_exist
         if FileTest.writable?(local_dir)
           f = File.new(local_file_config, "w")
@@ -778,7 +788,9 @@ 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'].update(self.properties_file2hash(_theme_file))
+      self['conf_theme'] = self.properties_file2hash(_theme_file)
+      self['conf'].update(self['conf_theme'])
+      self['conf_without_local'].update(self['conf_theme'])
       _theme_res_file = "conf/theme-#{_name}.res.rb"
       if _theme_res_file && File.exist?(_theme_res_file)
         begin

data/lib/a-contracts.rb

@@ -242,6 +242,12 @@ end
 class CutTextEvent < FocusEvent; end
 class CopyTextEvent < FocusEvent; end
 class PasteTextEvent < FocusEvent; end
+class UndoTextEvent < FocusEvent; end
+class RedoTextEvent < FocusEvent; end
+class SelectAllTextEvent < FocusEvent; end
+class InvertSelectionTextEvent < FocusEvent; end
+class UpperCaseTextEvent < FocusEvent; end
+class LowerCaseTextEvent < FocusEvent; end
 
 #class VirtualKeyboardEvent  < ArcadiaEvent
 #end

data/lib/a-core.rb

@@ -21,13 +21,15 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.8.0',
+        '0.8.1',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
     )
     load_config
-    set_sysdefaultproperty
+    if self['conf']['encoding']
+      Tk.encoding=self['conf']['encoding']
+    end
     ArcadiaDialogManager.new(self)
     ArcadiaActionDispatcher.new(self)
     ArcadiaGemsWizard.new(self)
@@ -47,6 +49,7 @@ class Arcadia < TkApplication
       iconphoto(TkPhotoImage.new('dat'=>ARCADIA_RING_GIF))
     }
     
+    
     @on_event = Hash.new
 
     @main_menu_bar = TkMenubar.new(
@@ -189,6 +192,7 @@ class Arcadia < TkApplication
        end	 	
     		 self['conf'].update(conf_hash2)	
     		 self['origin_conf'].update(conf_hash2)	
+    		 self['conf_without_local'].update(conf_hash2)	
     		 load_exts_conf_from("#{ext_dir}/ext",name)
   		}
   end
@@ -224,11 +228,13 @@ class Arcadia < TkApplication
                 EventWatcherForGem.new(eval(event_str),args)
               }
             else
+              @splash.withdraw  if @splash
               _event = Arcadia.process_event(NeedRubyGemWizardEvent.new(self, args))
               ret = ret &&  Arcadia.gem_available?(gem)
 #              if _event && _event.results
 #                ret = ret && _event.results[0].installed
 #              end
+              @splash.deiconify  if @splash
             end
             break if !ret
           end
@@ -381,6 +387,7 @@ class Arcadia < TkApplication
           suf1 = suf+'.'+group
           begin
             property = self['conf'][suf1]
+            #next if property.nil?
             c = property.split('c')
             if c && c.length == 2
               pt = c[0].split('.')
@@ -428,11 +435,12 @@ class Arcadia < TkApplication
     self.load_exts_conf
     self.load_local_config
     self.load_theme(self['conf']['theme'])
+    self.load_sysdefaultproperty
     self.resolve_properties_link(self['conf'],self['conf'])
-    self.resolve_properties_link(self['origin_conf'],self['origin_conf'])
+    self.resolve_properties_link(self['conf_without_local'],self['conf_without_local'])
   end
 
-  def set_sysdefaultproperty
+  def load_sysdefaultproperty
     Tk.tk_call "eval","option add *background #{self['conf']['background']}"
     Tk.tk_call "eval","option add *foreground #{self['conf']['foreground']}"
     #Tk.tk_call "eval","option add *font #{self['conf']['font']}"
@@ -484,16 +492,48 @@ class Arcadia < TkApplication
     load_user_control(@main_menu)
     load_user_control(@main_toolbar)
     #Extension control
+    load_key_binding
     @exts.each{|ext|
       @splash.next_step("... load #{ext} user controls ")  if @splash
       load_user_control(@main_menu, ext)
       load_user_control(@main_toolbar, ext)
+      load_key_binding(ext)
     }
     load_user_control(@main_menu,"","e")
     load_user_control(@main_toolbar,"","e")
     #@layout.build_invert_menu
   end
 
+  def load_key_binding(_ext='')
+    return unless _ext && ext_active?(_ext)
+    if _ext.length > 0 
+      if self[_ext]
+        _self_on_eval = self[_ext]
+      else
+        _self_on_eval = self
+      end
+      suf = "#{_ext}.keybinding"
+    else
+      _self_on_eval = self
+      suf = "keybinding"
+    end
+    keybs=Arcadia.conf_group(suf)
+    keybs.each{|k,v|
+      value = v.strip
+      key_dits = k.split('[')
+      next if k.length == 0
+      key_event=key_dits[0]
+      if key_dits[1]
+        key_sym=key_dits[1][0..-2]
+      end
+      @root.bind_append(key_event){|e|
+        if key_sym == e.keysym
+          Arcadia.process_event(_self_on_eval.instance_eval(value))
+        end
+      }
+    }
+  end
+  
   def load_user_control(_user_control, _ext='', _pre='')
     return unless _ext && ext_active?(_ext)
     
@@ -518,26 +558,25 @@ class Arcadia < TkApplication
         begin
           context_path = self['conf']["#{suf1}.context_path"]
           context_underline = self['conf']["#{suf1}.context_underline"]
-#          property = proc{|_str, _suf| self['conf']["#{_suf}.#{_str}"]} 
-#          property_to_eval = proc{|_str, _suf| 
-#            p = self['conf']["#{_suf}.#{_str}"]
-#            _self_on_eval.instance_eval(p) if p 
-#          } 
           items = self['conf'][suf1].split(',')
           items.each{|item|
             suf2 = suf1+'.'+item
             disabled = !self['conf']["#{suf2}.disabled"].nil?
             iprops=Arcadia.conf_group(suf2)
             item_args = Hash.new
+            
             iprops.each{|k,v|
-              value = v.strip
-              if value[0..0]=='!'
-                item_args[k]=_self_on_eval.instance_eval(value[1..-1])  
-              else
-                item_args[k]=value
-              end
+              item_args[k]= make_value(_self_on_eval, v)
             }
-          #  item_args['caption'] = item if item_args['caption'].nil?
+
+#            iprops.each{|k,v|
+#              value = v.strip
+#              if value[0..0]=='!'
+#                item_args[k]=_self_on_eval.instance_eval(value[1..-1])  
+#              else
+#                item_args[k]=value
+#              end
+#            }
             item_args['name'] = item if item_args['name'].nil?
             item_args['context'] = group
             item_args['context_path'] = context_path
@@ -550,7 +589,7 @@ class Arcadia < TkApplication
           msg = "Loading #{groups} ->#{items} (#{$!.class.to_s} : #{$!.to_s} at : #{$@.to_s})"
           if Arcadia.dialog(self, 
             'type'=>'ok_cancel', 
-            'title' => '(Arcadia) Toolbar', 
+            'title' => "(Arcadia) #{_user_control.class::SUF}", 
             'msg'=>msg,
             'level'=>'error')=='cancel'
             raise
@@ -584,7 +623,7 @@ class Arcadia < TkApplication
 
   def save_layout
     self['conf']['geometry']= TkWinfo.geometry(@root)
-    Arcadia.del_conf_group('layout')
+    Arcadia.del_conf_group(self['conf'],'layout')
     # resizing
     @exts_i.each{|e|
       found = false
@@ -655,7 +694,6 @@ class Arcadia < TkApplication
     else
       self['conf']['user_toolbar_show']='no'
     end
-    
   end
   
   def do_finalize
@@ -1089,6 +1127,12 @@ class ArcadiaMainMenu < ArcadiaUserControl
       ['Cut', proc{Arcadia.process_event(CutTextEvent.new(self))}, 2],
       ['Copy', proc{Arcadia.process_event(CopyTextEvent.new(self))}, 0],
       ['Paste', proc{Arcadia.process_event(PasteTextEvent.new(self))}, 0],
+      ['Undo', proc{Arcadia.process_event(UndoTextEvent.new(self))}, 0],
+      ['Redo', proc{Arcadia.process_event(RedoTextEvent.new(self))}, 0],
+      ['Select all', proc{Arcadia.process_event(SelectAllTextEvent.new(self))}, 0],
+      ['Invert selection', proc{Arcadia.process_event(InvertSelectionTextEvent.new(self))}, 0],
+      ['Uppercase', proc{Arcadia.process_event(UpperCaseTextEvent.new(self))}, 0],
+      ['Lowercase', proc{Arcadia.process_event(LowerCaseTextEvent.new(self))}, 0],
       ['Prettify Current', proc{Arcadia.process_event(PrettifyTextEvent.new(self))}, 0]]
       
       menu_spec_search = [['Search', 0],
@@ -1183,7 +1227,7 @@ class ArcadiaAboutSplash < TkToplevel
       place('width' => '120','x' => 150,'y' => 65,'height' => 19)
     }
     @tkLabel21 = TkLabel.new(self){
-      text  'by Antonio Galeone - 2004/2009'
+      text  'by Antonio Galeone - 2004/2010'
       background  _bgcolor
       foreground  '#ffffff'
       font Arcadia.instance['conf']['splash.credits.font']
@@ -2935,6 +2979,18 @@ class FocusEventManager
         do_copy(_event.focus_widget)
       when PasteTextEvent
         do_paste(_event.focus_widget)
+      when UndoTextEvent
+        do_undo(_event.focus_widget)
+      when RedoTextEvent
+        do_redo(_event.focus_widget)
+      when SelectAllTextEvent
+        do_select_all(_event.focus_widget)
+      when InvertSelectionTextEvent
+        do_invert_selection(_event.focus_widget)
+      when UpperCaseTextEvent
+        do_upper_case(_event.focus_widget)
+      when LowerCaseTextEvent
+        do_lower_case(_event.focus_widget)
     end
   end
   
@@ -2949,5 +3005,53 @@ class FocusEventManager
   def do_paste(_focused_widget)
     _focused_widget.text_paste if _focused_widget.respond_to?(:text_paste)
   end
+
+  def do_undo(_focused_widget)
+    begin
+      _focused_widget.edit_undo if _focused_widget.respond_to?(: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
+    end
+  end
+
+  def do_redo(_focused_widget)
+    begin
+      _focused_widget.edit_redo if _focused_widget.respond_to?(: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
+    end
+  end
+
+  def do_select_all(_focused_widget)
+    _focused_widget.tag_add('sel','1.0','end') if _focused_widget.respond_to?(:tag_add)
+  end
+
+  def do_invert_selection(_focused_widget)
+    if _focused_widget.respond_to?(:tag_ranges)
+      r = _focused_widget.tag_ranges('sel')
+      _focused_widget.tag_add('sel','1.0','end') if _focused_widget.respond_to?(:tag_add)
+      _focused_widget.tag_remove('sel',r[0][0],r[0][1]) if _focused_widget.respond_to?(:tag_remove) && r && r[0]
+    end
+  end
+
+  def do_upper_case(_focused_widget)
+    _replace_sel(_focused_widget, :upcase)
+  end
+
+  def do_lower_case(_focused_widget)
+    _replace_sel(_focused_widget, :downcase)
+  end
   
+  def _replace_sel(_focused_widget, _method)
+    if _focused_widget.respond_to?(:tag_ranges)
+      r = _focused_widget.tag_ranges('sel')
+      if _focused_widget.respond_to?(:get) && r && r[0]
+        target_text = _focused_widget.get(r[0][0],r[0][1])
+        if target_text
+          _focused_widget.delete(r[0][0],r[0][1])
+          _focused_widget.insert(r[0][0],target_text.send(_method))
+        end
+      end
+    end
+  end
 end