arcadia 0.3.1 → 0.4.0

data/lib/a-commons.rb

@@ -375,7 +375,7 @@ module EventBus #(or SourceEvent)
         if _listener.respond_to?(sub_method_name)
   	         Thread.new{_listener.send(sub_method_name, _event)}
         elsif _listener.respond_to?(method_name)
-             Thread.new{_listener.send(method_name, _event)}
+            Thread.new{_listener.send(method_name, _event)}
         end
       end
     else
@@ -521,14 +521,13 @@ module Configurable
 end
 
 module Persistable
-  def write_persist(_persist_file)
+  def override_persistent(_persist_file, _persistent_hash)
     if FileTest::exist?(_persist_file)
       f = File.new(_persist_file, "w")
       begin
         if f
-          p = self['pers']
-          if p
-            p.each{|key,value|
+          if _persistent_hash
+            _persistent_hash.each{|key,value|
               f.syswrite(key+'='+value+"\n")
             }
           end
@@ -538,6 +537,22 @@ module Persistable
       end
     end
   end
+
+  def append_persistent_property(_persist_file, _persistent_key, _persistent_value)
+    if FileTest::exist?(_persist_file)
+      f = File.new(_persist_file, "w+")
+      begin
+        if f
+          if _persistent_property
+              f.syswrite(_persistent_key+'='+_persistent_value+"\n")
+          end
+        end
+      ensure
+        f.close unless f.nil?
+      end
+    end
+  end
+  
 end
 
 class Application
@@ -570,10 +585,14 @@ class Application
     @@instance
   end
 
-	def Application.conf(_property)
+  def Application.conf(_property)
 	  @@instance['conf'][_property] if @@instance
-	end
-
+  end
+  
+  def sys_info
+    "[Platform = #{RUBY_PLATFORM}] [Ruby version = #{RUBY_VERSION}]"
+  end
+  
   def Application.conf_group(_group)
     @@conf_groups = Hash.new if !defined?(@@conf_groups)
     if @@conf_groups[_group].nil?

data/lib/a-contracts.rb

@@ -90,13 +90,15 @@ end
 #  +---------------------------------------------+
 
 class DebugEvent < ArcadiaEvent
-   attr_accessor :file, :row
+   attr_accessor :file, :row, :active
 end
 
 class SetBreakpointEvent < DebugEvent
+   attr_accessor :active
 end
 
 class UnsetBreakpointEvent < DebugEvent
+   attr_accessor :delete
 end
 
 class EvalExpressionEvent < DebugEvent

data/lib/a-core.rb

@@ -8,27 +8,27 @@ require 'tkextlib/bwidget'
 require "lib/a-tkcommons"
 require "lib/a-contracts"
 require "observer"
-
 class Arcadia < TkApplication
   include Observable
   attr_reader :layout
-  attr_reader :main_menu
   def initialize
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.3.1',
+        '0.4.0',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
     )
     load_config
+    set_sysdefaultproperty
     ArcadiaDialogManager.new(self)
-    ActionDispatcher.new(self)
+    ArcadiaActionDispatcher.new(self)
     #self.load_local_config(false)
     ObjectSpace.define_finalizer($arcadia, self.class.method(:finalize).to_proc)
     publish('action.on_exit', proc{do_exit})
-    _title = "Arcadia Ruby ide :: [Platform = "+RUBY_PLATFORM+'] [Ruby version = ' + RUBY_VERSION+']'
+    #_title = "Arcadia Ruby ide :: [Platform = #{RUBY_PLATFORM}] [Ruby version = #{RUBY_VERSION}] [TclTk version = #{tcltk_info.level}]"
+    _title = "Arcadia Ruby ide :: #{sys_info}"
     @root = TkRoot.new(
       'background'=> self['conf']['background']
       ){
@@ -55,7 +55,7 @@ class Arcadia < TkApplication
     @is_toolbar_show=self['conf']['user_toolbar_show']=='yes'
     @mf_root.show_toolbar(0,@is_toolbar_show)
     @use_splash = self['conf']['splash.show']=='yes'
-    @splash = ArcadiaAboutSplash.new('... initialize') if @use_splash
+    @splash = ArcadiaAboutSplash.new if @use_splash
     @splash.set_progress(50) if @splash
     @splash.deiconify if @splash
     Tk.update
@@ -154,7 +154,8 @@ class Arcadia < TkApplication
       class_name = self['conf'][_extension+'.class']
       if source.strip.length > 0
         #p source
-        eval('require ' + "'" + source + "'")
+	eval("require '#{source}'") 
+        #eval('require ' + "'" + source + "'")
       end
       if class_name.strip.length > 0
         publish(_extension, eval(class_name).new(self, _extension))
@@ -254,6 +255,14 @@ class Arcadia < TkApplication
     self.resolve_properties_link(self['conf'],self['conf'])
   end
 
+  def set_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']}"
+    Tk.tk_call "eval","option add *activebackground #{self['conf']['activebackground']}"
+    Tk.tk_call "eval","option add *activeforeground #{self['conf']['activeforeground']}"
+  end
+
   def prepare
     super
     @splash.next_step('...initialize')  if @splash
@@ -398,7 +407,7 @@ class Arcadia < TkApplication
 
   def do_finalize
     _event = Arcadia.process_event(FinalizeEvent.new(self))
-    self.write_persist(self['applicationParams'].persistent_file)
+    self.override_persistent(self['applicationParams'].persistent_file, self['pers'])
   end
 
   def Arcadia.console(_sender, _args=Hash.new)
@@ -414,6 +423,18 @@ class Arcadia < TkApplication
     Configurable.properties_group(_class, Arcadia.instance['conf'])
   end
   
+  def Arcadia.persistent(_property, _value=nil, _immediate=false)
+    if @@instance
+      if _value.nil?
+        return @@instance['pers'][_property]
+      else
+	      @@instance['pers'][_property] = _value 
+	    end
+	    if _immediate      
+	      @@instance.append_persistent_property(@@instance['applicationParams'].persistent_file,_property, _value )
+      end
+	  end
+  end
 
 
 #  def Arcadia.res(_res)
@@ -779,7 +800,7 @@ end
 
 class ArcadiaAboutSplash < TkToplevel
   attr :progress
-  def initialize(_txt=nil)
+  def initialize
     #_bgcolor = '#B83333'
     _bgcolor = '#000000'
     super()
@@ -824,10 +845,10 @@ class ArcadiaAboutSplash < TkToplevel
       foreground  '#ffffff'
       font Arcadia.instance['conf']['splash.version.font']
       justify  'left'
-      place('width' => '100','x' => 150,'y' => 65,'height' => 19)
+      place('width' => '120','x' => 150,'y' => 65,'height' => 19)
     }
     @tkLabelStep = TkLabel.new(self){
-      text  _txt
+      text  ''
       background  _bgcolor
       foreground  'yellow'
       font Arcadia.instance['conf']['splash.banner.font']
@@ -887,7 +908,7 @@ class ArcadiaAboutSplash < TkToplevel
   
 end
 
-class ActionDispatcher
+class ArcadiaActionDispatcher
 
   def initialize(_arcadia)
     @arcadia = _arcadia

data/lib/a-tkcommons.rb

@@ -6,6 +6,16 @@
 require "lib/a-commons"
 
 class TkApplication < Application
+  attr_reader :tcltk_info
+  def initialize(_application_params)
+    super(_application_params)
+    @tcltk_info = TclTkInfo.new
+  end
+  
+  def sys_info
+   "#{super} [TclTk version = #{tcltk_info.level}]"
+  end
+  
   def run
     Tk.appname(self['applicationParams'].name)
     Tk.mainloop
@@ -81,7 +91,7 @@ class AGTkObjPlace
 
   def initialize(_obj=nil , _side='both' , _cursor=nil, _bind = true )
     if !_obj
-      break
+      return
     end
     @obj = _obj
     if !_cursor
@@ -949,3 +959,9 @@ class TkBuffersChoise < TkBuffersChoiseView
   
 end
 
+class TclTkInfo
+  attr_reader :level
+  def initialize
+    @level = TclTkIp.new._eval "info patchlevel"
+  end
+end