arcadia 0.1.0 → 0.1.1

data/ext/ae-event-log/ae-event-log.rb

@@ -1,3 +1,7 @@
+#
+#   ae-event-log.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
 
 
 class EventLog < ArcadiaExt
@@ -15,30 +19,34 @@ class EventLog < ArcadiaExt
 
   def do_event(_event)
     if _event.context.sender!=self
-      message = ''
-      #message = _event.context.sender.class.to_s+" => "
+      message = event_message(_event)
+      MsgContract.instance.out_simple(self, message,'CH1')  
+    end
+  end
+
+
+	def event_message(_event, _ind="") 
+      message = _ind
       if _event.is_action?
         message = message + 'ACTION::'
       end
-      message = message +_event.signature+" $ "
-      #message = message + 'CONTEXT : '
+      message = message +_event.signature+" :\n"
       if _event.context
-        _event.context.instance_variables.each do |key| 
-          _value = _event.context.send(key.gsub('@',''))
+        _event.context.instance_variables.sort.each do |key| 
+          _obj_value = _event.context.send(key.gsub('@',''))
+          _value = _obj_value
           if _value == nil
             _value = 'nil'
           else !_value.instance_of?(String) 
             _value = _value.to_s
           end
-          message = message + ' -'+key+':'+_value
+          message = message + _ind + "\s"*2 + key+' = '+_value+"\n"
+          if _obj_value != nil && _obj_value.kind_of?(ArcadiaContract::ContractEvent)
+            message = message + event_message(_obj_value, _ind+"\s"*4)
+          end
         end
       end
-      MsgContract.instance.out_simple(self, message,'CH1')  
-#      if @ae_msg_contract
-#        @ae_msg_contract.out_simple(message)  
-#      else
-#        p message
-#      end
-    end
-  end
+      return message
+	end
+
 end

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

@@ -11,7 +11,7 @@ font=courier 9
 font.bold=courier 9 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
+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

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

@@ -1,3 +1,10 @@
+#
+#   ae-file-history.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
+require "base/a-ext"
+
+
 class TreeNode
   attr_reader :sons
   attr_reader :parent
@@ -51,17 +58,24 @@ end
 
 
 class FileH < ArcadiaExt
-  attr_reader :htext
-  #attr_reader :last_add
+  attr_reader :htree
 
 	def before_build
-    #ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
 	end
 
   def build
     @h_stack = Array.new
     do_select_item = proc{|_self|
-      _dir, _file = _self.selection_get[0].split('@@@')
+      if _self.selection_get[0].length >0
+      	_selected = ""
+      	_self.selection_get[0].each{|_block|
+       	 _selected = _selected + _block.to_s + "\s" 
+      	}
+      	_selected = _selected.strip
+      else
+        _selected = _self.selection_get[0]
+      end
+      _dir, _file = _selected.split('@@@')
       if _file
         _file = File.expand_path( _file  , _dir ) 
 	    else
@@ -77,13 +91,12 @@ class FileH < ArcadiaExt
     @font_b = conf('font.bold')
 
 	  @htree = Tk::BWidget::Tree.new(self.frame){
-      background '#FFFFFF'
       relief 'flat'
       showlines false
       deltay 18
       background _background
       crossfill _foreground
-      dragenabled true
+      #dragenabled true
       selectcommand proc{ do_select_item.call(self) } 
       place('relwidth' => 1,'relx' => 0,'x' => '0','y' => '0','relheight' => '1')
     }
@@ -145,8 +158,6 @@ class FileH < ArcadiaExt
       end
     end
 
-
-
     file_dir.keys.sort.each{|_dir|
     				node = root.dir(_dir)
 				file_dir[_dir].each{|file|
@@ -170,7 +181,7 @@ class FileH < ArcadiaExt
           'helptext' => _d,
           'deltax'=>-1,
           'fill' => _foreground,
-          'font'=>$arcadia['conf']['editor.explorer_panel.tree.font'],
+          'font'=>@font,
           'window'=> window('KDir')
         }
       )
@@ -182,7 +193,7 @@ class FileH < ArcadiaExt
           'helptext' => _f,
           'deltax'=>-1,
           'fill' => _foreground,
-          'font'=>@font,
+          'font'=>@font_b,
           'window'=> window('KFile',_f)
         }
       )
@@ -195,8 +206,7 @@ class FileH < ArcadiaExt
       _foreground = conf('color.foreground')
 
       if _kind == 'KDir'
-        return TkLabel.new(@tree_exp){
-          #image  TkPhotoImage.new('dat' => FOLDER_GIF)
+        return TkLabel.new(self.frame){
           image  TkPhotoImage.new('dat' => BOOK_GIF)
           background(_background)
           foreground(_foreground)
@@ -207,7 +217,7 @@ class FileH < ArcadiaExt
         else
           _image = DOCUMENT_GIF
         end
-        return TkLabel.new(@tree_exp){
+        return TkLabel.new(self.frame){
           image  TkPhotoImage.new('dat' => _image)
           background(_background)
           foreground(_foreground)

data/ext/ae-inspector/ae-inspector.rb

@@ -560,7 +560,7 @@ class InspectList
 		@right_text.configure('selectbackground'=>@right_text.cget('background'))
 #    @left_text = TkText.new(@pwind.left_frame, 'relief'=>'flat').pack('expand'=>'yes', 'fill'=>'both')
 #    @right_text = TkText.new(@pwind.right_frame, 'relief'=>'flat').pack('expand'=>'yes', 'fill'=>'both')
-    @bar.command(proc { |args|
+    @bar.command(proc { |*args|
      @left_text.yview(*args)
      @right_text.yview(*args)
     })
@@ -1199,7 +1199,7 @@ class Obji
 
   def select(me, _activate_me=true)
     return if @active_object == me
-    me.activate if _activate_me
+    me.activate #if _activate_me
     @active_object = me
     @inspect_core.recicle_inspects(me)
     @lb.select(me)
@@ -1322,12 +1322,12 @@ class ObjiController < ArcadiaExt
      		  obji.select(_event.context.wrapper, false)
      		when InspectorContract::DELETE_WRAPPER
    		    obji.delete(_event.context.wrapper)
-#     		when InspectorContract::UPDATE_PROPERTY
-#     		  obji.inspect_core.update_property(_event.context.wrapper, _event.context.property_family, _event.context.property_name, _event.context.property_value)
      		when InspectorContract::DELETE_INSPECTOR  
      		  self.del(obji)
      		when InspectorContract::RAISE_ACTIVE_TOPLEVEL  
      		  self.active.raise_toplevel if active
+     		when InspectorContract::RAISE_LAST_WIDGET  
+     		  self.active.select_last(true) if active
      end
   end
 

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

@@ -9,7 +9,7 @@ MsgContract.channel=CH1
 
 font=courier 7
 font.bold=courier 9 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 
+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 

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

@@ -8,7 +8,7 @@ MsgContract.channel=0
 
 font=courier 7
 font.bold=courier 9 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 
+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 

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

@@ -24,6 +24,7 @@ class OutputView
     
     #@splitted_frame = AGTkVSplittedFrames.new(parent.frame,20)
     @text = TkText.new(parent.frame,
+      'wrap'=>  'none',
       'relief' =>  'sunken',
       'font' => parent.conf('font')
     ){|j|
@@ -43,6 +44,13 @@ class OutputView
        'borderwidth'=>1,
        'relief'=> 'flat'
     )
+    @text.tag_configure('error_msg',
+       'background' => '#f6c9f6',
+       'foreground' => 'red',
+       'borderwidth'=>1,
+       'relief'=> 'flat'
+    )
+
     @text.tag_configure('bord_msg',
        #'foreground' => '#b9b8b9'
        'foreground' => '#7c9b10'
@@ -81,15 +89,23 @@ class Output < ArcadiaExt
 	end
 
 	def do_msg_event(_event)
+	   #p _event.context.text.class
      _txt = "\n+--- "+format_time(_event.time)+" ---+\n"+_event.context.text.strip+"\n"
      _index_begin = @main_frame.text.index('end')
      @main_frame.text.insert(_index_begin,_txt)
      _index_end = @main_frame.text.index('end')
      if _event.context.type == MsgContract::TYPE_DEBUG
      		@main_frame.text.tag_remove('simple_msg',_index_begin, _index_end+ '  lineend')
+     		@main_frame.text.tag_remove('error_msg',_index_begin, _index_end+ '  lineend')
      		@main_frame.text.tag_add('debug_msg',_index_begin, _index_end+ '  lineend')
+     		parse_debug(_index_begin.split('.')[0].to_i) 
+		 elsif _event.context.type == MsgContract::TYPE_ERROR
+     		@main_frame.text.tag_remove('simple_msg',_index_begin, _index_end+ '  lineend')
+     		@main_frame.text.tag_remove('debug_msg',_index_begin, _index_end+ '  lineend')
+     		@main_frame.text.tag_add('error_msg',_index_begin, _index_end+ '  lineend')
      		parse_debug(_index_begin.split('.')[0].to_i) 
 		 else
+     		@main_frame.text.tag_remove('error_msg',_index_begin, _index_end+ '  lineend')
      		@main_frame.text.tag_remove('debug_msg',_index_begin, _index_end+ '  lineend')
      		@main_frame.text.tag_add('simple_msg',_index_begin, _index_end+ '  lineend')
      end

data/ext/ae-palette/ae-palette.rb

@@ -3,7 +3,6 @@
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
 
-#require 'ext/ae-inspector/ae-inspector'
 require 'base/a-libs'
 require 'lib/tk/al-tk'
 require 'tk'
@@ -21,15 +20,11 @@ class Palette < ArcadiaExt
 	end
 
   def build
-    #@ae_inspector_action_contract = @arcadia.retrieve_contract(self, InspectorActionContract)
-    #@main_frame = @arcadia.layout.register_panel('_tokyo_','libman', 'Libman')
     @buttons = Hash.new
     create_palettes
   end
 
   def after_build
-    #p @ae_inspector_talker.info
-    #exit
   end
   
 	def do_inspector_event(_event)
@@ -37,7 +32,6 @@ class Palette < ArcadiaExt
      		when InspectorContract::SELECT_WRAPPER
 				@selected_wrapper=_event.context.wrapper
      end  
-  
   end  
 
   def do_palette_event(_event)
@@ -64,19 +58,12 @@ class Palette < ArcadiaExt
     eval(cod)
   end
 
-#  def eval_file_saved(_filename=nil)
-#    if _filename && (_filename.length > 0)
-#      @arcadia.objects('editor').open_file(_filename)
-#    end
-#  end
-
   def create_palettes
     @cc = WrapperContainer.new(self){
       border 0
       borderwidth 1
     }
     @cc.pack('side' =>'left', 'fill' =>'both', 'anchor'=>'nw', :padx=>2, :pady=>2)
-    #place('x'=>0, 'y'=>0,'relheight'=>1, 'relwidth'=>1)
     @arcadia.libs.list.each{|lib|
       @cc.add_palette(lib)
     }
@@ -112,9 +99,6 @@ class WrapperContainer < TkFrame
     @button_m = Tk::BWidget::Button.new(frame){
       _command = proc{
         require 'tk/clipboard'
-        #objiinfo = _owner.ae_inspector_talker.info
-        #_code = $arcadia['objic'].active.active_object.renderer.class_code.to_s
-        #_code = objiinfo.active_wrapper.renderer.class_code.to_s
         _code = AG.active.renderer.class_code.to_s if AG.active
         TkClipboard::set(_code)
         eval(_code)
@@ -218,9 +202,12 @@ class WrapperContainer < TkFrame
     @classes_panel = @familyts.insert('end',_name,
     'text'=>_name#,
     )
-		
+    
+    _background = @classes_panel.cget('background')
+
 		@tpanel = TkText.new(@classes_panel){
 		  relief 'flat'
+		  background _background
 		}.pack('side' =>'left', 'anchor'=>'nw', :padx=>2, :pady=>2)
 
 

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

@@ -5,7 +5,7 @@ class=Shell
 
 
 #:::::::::::::::: output  ::::::::::::::::::::::<begin>
-ruby=ruby1.8
-i386-freebsd6:ruby=ruby
-i386-mswin32:ruby=ruby
+ruby=ruby
+i386-freebsd6::ruby=ruby
+i386-mswin32::ruby=ruby
 #:::::::::::::::: output  ::::::::::::::::::::::<end>

data/lib/tk/al-tk.rb

@@ -44,6 +44,7 @@ class AGTkObjRect
   def do_enter(x, y)
     @oldcursor = @r.cget('cursor')
     @r.configure('cursor'=> @cursor)
+    
   end
   
   def do_leave
@@ -263,6 +264,7 @@ class AGTkPlaceManager
   end
 
 	def refresh
+	  Tk.update
 	  getx0x3
     activate(false)
 	end
@@ -901,8 +903,8 @@ class AGTk < AG
   attr_writer :x0, :y0, :x3, :y3
 
   def initialize(_ag_parent = nil, _object = nil)
+    #Tk.update if _object != nil && _ag_parent == nil
     super(_ag_parent, _object)
-
     if (defined? @obj)
       if @ag_parent != nil
         ppress = proc{
@@ -931,7 +933,7 @@ class AGTk < AG
   
   def update_property(_sender, _family,_name,_value)
 	  super
-	  if _sender != self && ['x','y','width','height'].include?(_name)
+	  if _sender != self && ['x','y','width','height','text'].include?(_name)
 	    @l_manager.refresh
 	  end
 	
@@ -941,7 +943,7 @@ class AGTk < AG
   def popup_items(_popup_menu)
     _popup_menu.insert('end',
       :command,
-      :label=>@obj.class.to_s,
+      :label=>self.class.class_wrapped.to_s,
       :background => 'white',
       :hidemargin => false
     )
@@ -1051,19 +1053,19 @@ class AGTk < AG
     __FILE__
   end
 
-  def updatep(_family, prop, value, _call_from_inspector=false)
-    if _call_from_inspector && ['place','pack','grid','layout_man'].include?(_family)
-      @l_manager.deactivate
-    end
-    super(_family, prop,value, _call_from_inspector)
-    if _call_from_inspector && _family == 'place'
-      @l_manager.place_manager.initx0x3
-    end
-    if _call_from_inspector && ['place','pack','grid','layout_man'].include?(_family)
-      @l_manager.activate
-    end
-    Tk.update
-  end
+#  def updatep(_family, prop, value, _call_from_inspector=false)
+#    if _call_from_inspector && ['place','pack','grid','layout_man'].include?(_family)
+#      @l_manager.deactivate
+#    end
+#    super(_family, prop,value, _call_from_inspector)
+#    if _call_from_inspector && _family == 'place'
+#      @l_manager.place_manager.initx0x3
+#    end
+#    if _call_from_inspector && ['place','pack','grid','layout_man'].include?(_family)
+#      @l_manager.activate
+#    end
+#    Tk.update
+#  end
 
   def activate
     super
@@ -1189,7 +1191,10 @@ class Revparsel
     if m
       _c,_class_name,_c,_class = m[0].split
       _obj_name = _class_name.sub(/^./) { $&.downcase}
-      cod = _code + "\n@"+ _obj_name + "="+ _class_name+".new\n"
+      cod = _code + "\n@"+ _obj_name + "="+ _class_name+".new('class'=>"+_class+")\n"
+      cod = cod +"Tk.update\n"
+      eval(cod)
+      cod = ''
       cod = cod + '@ag'+ _obj_name + "="+'AG'+ _class+".new(nil,@"+_obj_name+"){\n"
       cod = cod + "|_self|\n"
       cod = cod + "  _self.i_name='"+_obj_name+"' \n"
@@ -2082,9 +2087,11 @@ module TkProperties
 
   def TkProperties.class(_obj)
     {'name'=>'class',
+      'default'=> AG.near_class_wrapped(_obj).to_s,
       'get'=> proc{_obj.cget('class')},
       'set'=> proc{|r| _obj.configure('class'=>r)},
-      'def'=> ""
+      'def'=> "",
+      'kind'=>'on-create'
     }
   end
 
@@ -2443,9 +2450,6 @@ class AGTkBaseContainer < AGTkLayoutManaged
       _tobj = PaletteContract::TPaletteObj.new(self)
       _tobj.parent = self
       PaletteContract.instance.make_selected(_tobj)
-      #Arcadia.instance.retrieve_contract(self, PaletteActionContract).make_selected(PaletteActionContract::TObj.new(self))
-      #$arcadia.objects('palette').give_me_obj(self)
-      #@obj.callback_break
     }
     @obj.bind_append("ButtonRelease-1", p1)
 
@@ -2477,7 +2481,7 @@ class AGTkToplevel < AGTkContainer
   
   def form2code
     tobj = EditorContract::TEditorObj.new(self)
-    tobj.title = @i_name
+    tobj.title = @i_name+'.rb'
     tobj.text = @renderer.class_code.to_s
     EditorContract.instance.open_text(tobj)
     #Arcadia.instance.retrieve_contract(self, EditorActionContract).open_text(tobj)