arcadia 0.1.2 → 0.1.2.1

data/base/a-utils.rb

@@ -656,18 +656,27 @@ class Application
       if FileTest.exist?(local_file_config)
         self['conf'].update(self.config_file2hash(local_file_config))
       elsif _create_if_not_exist
-        f = File.new(local_file_config, "w")
-        begin
-          if f
-            p = self['conf']
-            if p
-              p.keys.sort.each{|key|
-                f.syswrite('#'+key+'='+self['conf'][key]+"\n")
-              }
+        if FileTest.writable?(local_dir)
+          f = File.new(local_file_config, "w")
+          begin
+            if f
+              p = self['conf']
+              if p
+                p.keys.sort.each{|key|
+                  f.syswrite('#'+key+'='+self['conf'][key]+"\n")
+                }
+              end
             end
+          ensure
+            f.close unless f.nil?
           end
-        ensure
-          f.close unless f.nil?
+        else
+          msg = "Locad dir "+'"'+local_dir+'"'+" must be writable!"
+          Tk.messageBox('icon' => 'error', 'type' => 'ok',
+            'title' => '(Arcadia)', 
+            'message' => msg)
+            exit
+        
         end
       end
   end
@@ -675,8 +684,16 @@ class Application
   def local_dir
     _local_dir = File.join(ENV["HOME"],'.'+self['applicationParams'].name)  if ENV["HOME"] 
     if _local_dir && !File.exist?(_local_dir)
-      Dir.mkdir(_local_dir)
-      @first_run = true
+      if FileTest.exist?(ENV["HOME"])
+        Dir.mkdir(_local_dir)
+        @first_run = true
+      else
+        msg = "Locad dir "+'"'+ENV["HOME"]+'"'+" must be writable!"
+        Tk.messageBox('icon' => 'error', 'type' => 'ok',
+          'title' => '(Arcadia)', 
+          'message' => msg)
+        exit
+      end
     end
     return _local_dir
   end
@@ -689,7 +706,7 @@ class Application
         _lines.each{|_line|
           _strip_line = _line.strip
           if (_strip_line.length > 0)&&(_strip_line[0,1]!='#')
-            var_plat = _line.split(':')
+            var_plat = _line.split('::')
             if var_plat.length > 1
               if (RUBY_PLATFORM.include?(var_plat[0]))
               #if (var_plat[0] == RUBY_PLATFORM)

data/conf/arcadia.conf

@@ -84,7 +84,7 @@ toolbar_show=yes
 
 libraries=tk,tkCustom 
 #libraries=tk,tkBWidget,tkCustom,tkArcadia 
-#i386-mswin32::libraries=tk,tkBWidget,tkCustom, tkIWidget
+#win::libraries=tk,tkBWidget,tkCustom, tkIWidget
 # tk library properties
 libraries.tk.name=Tk
 libraries.tk.source=lib/tk/al-tk.rb
@@ -140,51 +140,52 @@ splash.version.font=Courier 10
 splash.credits.font=Courier 10
 splash.banner.font=Courier 8 italic
 
-i386-mswin32::splash.title.font=Ariel 26 bold
-i386-mswin32::splash.subtitle.font=Ariel 8 bold
-i386-mswin32::splash.version.font=Ariel 8
-i386-mswin32::splash.credits.font=Ariel 8
-i386-mswin32::splash.banner.font=Ariel 8 italic
+win::splash.title.font=Ariel 26 bold
+win::splash.subtitle.font=Ariel 8 bold
+win::splash.version.font=Ariel 8
+win::splash.credits.font=Ariel 8
+win::splash.banner.font=Ariel 8 italic
+
 #:::::::::::::::: splash group    ::::::::::::::::::::::<begin>
 
 #:::::::::::::::: main group    ::::::::::::::::::::::<begin>
 main.mainmenu.font=courier 12
-i386-freebsd6::main.mainmenu.font=courier 12
-i386-mswin32::main.mainmenu.font=Ariel 8
+freebsd::main.mainmenu.font=courier 12
+win::main.mainmenu.font=Ariel 8
 main.font=courier 12
 main.font.bold=courier 12 bold
-i386-freebsd6::main.font=courier 12
-i386-freebsd6::main.font=courier 12 bold
-i386-mswin32::main.font=Ariel 8
-i386-mswin32::main.font.bold=Ariel 8 bold
+freebsd::main.font=courier 12
+freebsd::main.font=courier 12 bold
+win::main.font=Ariel 8
+win::main.font.bold=Ariel 8 bold
 main.component.font=times 8
-i386-mswin32::main.component.font=Ariel 8
+win::main.component.font=Ariel 8
 #:::::::::::::::: main group    ::::::::::::::::::::::<end>
 
 #:::::::::::::::: inspector group    ::::::::::::::::::::::<begin>
 inspectors.tabs.font=courier 12
-i386-mswin32::inspectors.tabs.font=Ariel 8
-i386-freebsd6::inspectors.tabs.font=courier 12
+win::inspectors.tabs.font=Ariel 8
+freebsd::inspectors.tabs.font=courier 12
 inspectors.tabs.side=top
 inspectors.inspector.tabs.font=courier 12
-i386-freebsd6::inspectors.inspector.tabs.font=courier 12
-i386-mswin32::inspectors.inspector.tabs.font=Ariel 8
+freebsd::inspectors.inspector.tabs.font=courier 12
+win::inspectors.inspector.tabs.font=Ariel 8
 inspectors.inspector.tabs.side=top
 inspectors.inspector.key.font=courier 12
 inspectors.inspector.value.font=courier 12
-i386-freebsd6::inspectors.inspector.key.font=courier 12
-i386-freebsd6::inspectors.inspector.value.font=courier 12
-i386-mswin32::inspectors.inspector.key.font=Ariel 8
-i386-mswin32::inspectors.inspector.value.font=Ariel 8
+freebsd::inspectors.inspector.key.font=courier 12
+freebsd::inspectors.inspector.value.font=courier 12
+win::inspectors.inspector.key.font=Ariel 8
+win::inspectors.inspector.value.font=Ariel 8
 inspectors.inspector.tree.font=courier 12
-i386-mswin32::inspectors.inspector.tree.font=Ariel 8
+win::inspectors.inspector.tree.font=Ariel 8
 
 inspectors.debug.tabs.font=courier 12
 inspectors.debug.tabs.font.bold=courier 12 bold
-i386-freebsd6::inspectors.debug.tabs.font=courier 12
-i386-freebsd6::inspectors.debug.tabs.font.bold=courier 12 bold
-i386-mswin32::inspectors.debug.tabs.font=courier 8
-i386-mswin32::inspectors.debug.tabs.font.bold=courier 8 bold
+freebsd::inspectors.debug.tabs.font=courier 12
+freebsd::inspectors.debug.tabs.font.bold=courier 12 bold
+win::inspectors.debug.tabs.font=courier 8
+win::inspectors.debug.tabs.font.bold=courier 8 bold
 #:::::::::::::::: inspector group    ::::::::::::::::::::::<end>
 
 
@@ -193,10 +194,10 @@ i386-mswin32::inspectors.debug.tabs.font.bold=courier 8 bold
 all.frame.title.font=courier 12
 all.frame.title.font.bold=courier 12 bold
 all.frame.title.font.italic=courier 12 italic
-i386-freebsd6::all.frame.title.font=courier 12
-i386-freebsd6::all.frame.title.font.bold=courier 12 bold
-i386-freebsd6::all.frame.title.font.italic=courier 12 italic
-i386-mswin32::all.frame.title.font=courier 9
-i386-mswin32::all.frame.title.font.bold=courier 9 bold
-i386-mswin32::all.frame.title.font.italic=courier 9 italic
+freebsd::all.frame.title.font=courier 12
+freebsd::all.frame.title.font.bold=courier 12 bold
+freebsd::all.frame.title.font.italic=courier 12 italic
+win::all.frame.title.font=courier 9
+win::all.frame.title.font.bold=courier 9 bold
+win::all.frame.title.font.italic=courier 9 italic
 #:::::::::::::::: all  ::::::::::::::::::::::<end>

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

@@ -10,7 +10,7 @@ class ArcadiaDebugWrapper
   attr_reader :last_command
 	attr_reader :debugging
   def initialize
-    (RUBY_PLATFORM == 'i386-mswin32')?_cmd="cmd":_cmd='sh'
+    (RUBY_PLATFORM.include?('mswin32'))?_cmd="cmd":_cmd='sh'
     @io = IO.popen(_cmd,'w')
     @last_command = _cmd
     @stop = false

data/ext/ae-doc-code/ae-doc-code.conf

@@ -1,15 +1,15 @@
-name=doc_code
-label=Doc
-frame=1.0
-active=yes
-require=ext/ae-doc-code/ae-doc-code
-class=DocCode
-
-font=courier 12
-font.bold=courier 12 bold
-i386-freebsd6::font=courier 12
-i386-freebsd6::font.bold=courier 12 bold
-i386-mswin32::font={Courier New} 9
-i386-mswin32::font.bold={Courier New} 9 bold 
-color.background=#ffffc1
-color.foreground=#408080
+name=doc_code
+label=Doc
+frame=1.0
+active=yes
+require=ext/ae-doc-code/ae-doc-code
+class=DocCode
+
+font=courier 12
+font.bold=courier 12 bold
+freebsd::font=courier 12
+freebsd::font.bold=courier 12 bold
+win::font={Courier New} 9
+win::font.bold={Courier New} 9 bold 
+color.background=#ffffc1
+color.foreground=#408080

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

@@ -11,17 +11,17 @@ tab-replace-width-space=2
 
 #tabs
 tabs.font=courier 12
-i386-freebsd6::tabs.font=courier 12
-i386-mswin32::tabs.font={Courier New} 9
+freebsd::tabs.font=courier 12
+win::tabs.font={Courier New} 9
 #tabs.side=bottom
 tabs.side=top
 # editor
 font=courier 12
 font.bold=courier 12 bold
-i386-freebsd6::font=courier 12
-i386-freebsd6::font.bold=courier 12 bold
-i386-mswin32::font={Courier New} 9
-i386-mswin32::font.bold={Courier New} 9 bold 
+freebsd::font=courier 12
+freebsd::font.bold=courier 12 bold
+win::font={Courier New} 9
+win::font.bold={Courier New} 9 bold 
 #+--------------------------------------------------
 #color.background=#000040
 #color.foreground=white
@@ -86,16 +86,16 @@ line_number_panel.color.foreground=#333333
 explorer_panel.tree.color.background=#ffffff
 explorer_panel.tree.color.foreground=white
 explorer_panel.tree.font=courier 12
-i386-freebsd6::explorer_panel.tree.font=courier 12
-i386-mswin32::explorer_panel.tree.font={Courier New} 9
+freebsd::explorer_panel.tree.font=courier 12
+win::explorer_panel.tree.font={Courier New} 9
 explorer_panel.tree.class.color.foreground=#a42019
 explorer_panel.tree.class.font=times 10 bold
-i386-mswin32::explorer_panel.tree.class.font=times 10 bold
+win::explorer_panel.tree.class.font=times 10 bold
 explorer_panel.tree.def.color.foreground=blue
 explorer_panel.tree.def.font=times 10
-i386-mswin32::explorer_panel.tree.def.font=times 10
+win::explorer_panel.tree.def.font=times 10
 explorer_panel.tree.module.color.foreground=#1b691e
 explorer_panel.tree.module.font=times 8 bold
-i386-mswin32::explorer_panel.tree.module.font={Courier New} 9 bold
+win::explorer_panel.tree.module.font={Courier New} 9 bold
 
 #:::::::::::::::: Editor group    ::::::::::::::::::::::<end>

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

@@ -370,13 +370,7 @@ class AgEditor
         when 'Right','Left','Down', 'Up'
           # do nil
         else
-          if modified?
-            if !@set_mod
-              set_modify
-            end
-          else
-            reset_modify
-          end
+          check_modify
       end
       case e.keysym
       when 'Return'
@@ -907,12 +901,7 @@ class AgEditor
       end
       _row = _row+1
     }
-    if modified?
-      set_modify
-    else
-      reset_modify
-    end
-    
+    check_modify    
   end
 
   def indentation_tabs_2_space(_n_space=2)
@@ -931,11 +920,7 @@ class AgEditor
       end
       _row = _row+1
     }
-    if modified?
-      set_modify
-    else
-      reset_modify
-    end
+    check_modify    
   end
 
 
@@ -968,8 +953,8 @@ class AgEditor
   end
 
   def highlightline(_row, _line, _check_mod = false)
-    if _check_mod && modified?
-      set_modify
+    if _check_mod 
+      check_modify
     end
     _txt = _line
     _end = 0
@@ -1143,6 +1128,13 @@ class AgEditor
     end
   end
 
+  def check_modify
+    if modified? && !@set_mod
+      set_modify
+    else
+      reset_modify
+    end
+  end
 
   def check_file_last_access_time
     if @file && @file_last_access_time
@@ -2039,6 +2031,7 @@ class Find < Findview
         if TkDialog2.new('message'=>_message, 'buttons'=>['Yes','No']).show() == 0
           self.editor.text.delete(@idx1,@idx2)
           self.editor.text.insert(@idx1,@e_with.value)
+          self.editor.check_modify
         end
     end
   end
@@ -2050,6 +2043,7 @@ class Find < Findview
         if _rc == 0
           self.editor.text.delete(@idx1,@idx2)
           self.editor.text.insert(@idx1,@e_with.value)
+          self.editor.check_modify
         elsif _rc == 2
           break
         end

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

@@ -11,7 +11,7 @@ font=courier 12
 font.bold=courier 12 bold
 color.background=#ffffff
 color.foreground=#000000
-i386-freebsd6::font=courier 12 italic
-i386-freebsd6::font.bold=courier 12 bold
-i386-mswin32::font={Courier New} 9
-i386-mswin32::font.bold={Courier New} 9 bold
+freebsd::font=courier 12 italic
+freebsd::font.bold=courier 12 bold
+win::font={Courier New} 9
+win::font.bold={Courier New} 9 bold

data/ext/ae-output-event/ae-output-event.conf

@@ -9,7 +9,7 @@ MsgContract.channel=CH1
 
 font=courier 10
 font.bold=courier 10 bold
-i386-freebsd6::font=courier 10
-i386-freebsd6::font.bold=courier 12 bold
-i386-mswin32::font={Courier New} 9
-i386-mswin32::font.bold={Courier New} 9 bold 
+freebsd::font=courier 10
+freebsd::font.bold=courier 12 bold
+win::font={Courier New} 9
+win::font.bold={Courier New} 9 bold

data/ext/ae-output/ae-output.conf

@@ -8,7 +8,7 @@ MsgContract.channel=0
 
 font=courier 10
 font.bold=courier 10 bold
-i386-freebsd6::font=courier 12
-i386-freebsd6::font.bold=courier 12 bold
-i386-mswin32::font={Courier New} 9
-i386-mswin32::font.bold={Courier New} 9 bold 
+freebsd::font=courier 12
+freebsd::font.bold=courier 12 bold
+win::font={Courier New} 9
+win::font.bold={Courier New} 9 bold 

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

@@ -6,6 +6,6 @@ class=Shell
 
 #:::::::::::::::: output  ::::::::::::::::::::::<begin>
 ruby=ruby
-i386-freebsd6::ruby=ruby
-i386-mswin32::ruby=ruby
+freebsd::ruby=ruby
+win::ruby=ruby
 #:::::::::::::::: output  ::::::::::::::::::::::<end>

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

@@ -9,7 +9,6 @@ require "base/a-utils"
 class Shell < ArcadiaExt
 
   def build
-    #@ae_msg_contract = @arcadia.retrieve_contract(self, MsgContract)
     @run_threads = Array.new
   end
 
@@ -31,23 +30,21 @@ class Shell < ArcadiaExt
     debug_quit if @adw
   end
 
-	
   def run(_filename=nil)
     if _filename
       begin
         $arcadia['pers']['run.file.last']=_filename
         @run_threads << Thread.new{
-          @cmd = open("|"+$arcadia['conf']['shell.ruby']+" "+_filename+" 2>&1","r"){
+          _cmd_ = "|"+$arcadia['conf']['shell.ruby']+" "+_filename+" 2>&1"
+          #MsgContract.instance.out_debug(self, _cmd_)
+          @cmd = open(_cmd_,"r"){
             |f|
             MsgContract.instance.out_debug(self, f.read)
-            #@ae_msg_contract.out_debug(f.read)
-          }
+        }
       }
-  		rescue Exception => e
-  			 MsgContract.instance.out_debug(self, e)
-       #@ae_msg_contract.out_debug(e)
-        #@main_frame.text.insert('end', "---> "+e )
-  	  end
+      rescue Exception => e
+        MsgContract.instance.out_debug(self, e)
+      end
     end
   end
 

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

@@ -0,0 +1,49 @@
+#
+#   ae-shell.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
+
+require "tk"
+require "base/a-utils"
+
+class Shell < ArcadiaExt
+
+  def build
+    @run_threads = Array.new
+  end
+
+  def run_last
+    run($arcadia['pers']['run.file.last'])
+  end
+  
+  def run_current
+    current_editor = $arcadia['editor'].raised
+    run(current_editor.file) if current_editor
+  end
+
+  def stop
+    @run_threads.each{|t|
+      if t.alive?
+        t.kill
+      end
+    }
+    debug_quit if @adw
+  end
+
+  def run(_filename=nil)
+    if _filename
+      begin
+        $arcadia['pers']['run.file.last']=_filename
+        @run_threads << Thread.new{
+          @cmd = open("|"+$arcadia['conf']['shell.ruby']+" "+_filename+" 2>&1","r"){
+            |f|
+            MsgContract.instance.out_debug(self, f.read)
+        }
+      }
+      rescue Exception => e
+        MsgContract.instance.out_debug(self, e)
+      end
+    end
+  end
+
+end