arcadia 0.4.0 → 0.5.0

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

@@ -275,12 +275,13 @@ class ValueRap
     'anchor' => 'w',
     #'width'=>15,
     #'font'=> $arcadia['conf']['inspectors.inspector.value.font'],
-    #'relief'=>'groove'
+    'borderwidth'=>'1',
+    'relief'=>'groove'
     }))
     
     TkTextWindow.new(@parent.right_text, 'end', 'window'=> @labelkey)
 
-    #@labelkey.pack('fill'=>'x',:padx=>0, :pady=>0)
+    @labelkey.pack('fill'=>'x',:padx=>0, :pady=>0)
     
     @parent.right_text.insert('end',"\n")
     
@@ -356,15 +357,14 @@ class PropLine
     @propkey = TkLabel.new(@parent.left_text, Arcadia.style('label')){
       text _name
       justify 'right'
-      #font $arcadia['conf']['inspectors.inspector.key.font']
       anchor 'w'
-     # pack('fill'=>'x',:padx=>0, :pady=>0)
+      borderwidth '1'
+      relief 'groove'
     }
     
-    TkTextWindow.new(@parent.left_text, 'end', 
-                 'window'=> @propkey)
+    TkTextWindow.new(@parent.left_text, 'end', 'window'=> @propkey)
+    @propkey.pack('fill'=>'x',:padx=>0, :pady=>0)
     @parent.left_text.insert('end',"\n")
-
     if !defined? _prop['type']
       _prop['type'] = 'StringType'
     end
@@ -544,11 +544,16 @@ class InspectList
   attr_writer :lasthandlervalue, :family
   attr_reader :lasthandlervalue 
   attr_reader :left_text, :right_text
-  def initialize(_family, _host, _left_width = 85)
+  def initialize(_family, _host, _left_width = 85, show_scrollbar=true)
     @lasthandlervalue = 0;
     @family = _family
-    @bar = TkScrollbar.new(_host, Arcadia.style('scrollbar')).pack('side'=>'right', 'fill'=>'y')
+    #@pwind = AGTkVSplittedFrames.new(_host,_left_width)
+    if show_scrollbar
+    #  @pwind.place('width' => -15)
+      @bar = TkScrollbar.new(_host, Arcadia.style('scrollbar')).pack('side'=>'right', 'fill'=>'y')
+    end
     @pwind = AGTkVSplittedFrames.new(_host,_left_width)
+    
     background = _host.cget('background')
     common_properties = {'relief'=>'flat','state'=>'disabled', 'borderwidth'=>0, 'background'=>background}
     @left_text = TkText.new(@pwind.left_frame, common_properties).pack('expand'=>'yes', 'fill'=>'both')
@@ -556,18 +561,19 @@ class InspectList
     
     @left_text.configure('selectbackground'=>@left_text.cget('background'))
 		@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|
-     @left_text.yview(*args)
-     @right_text.yview(*args)
-    })
-    @left_text.yscrollcommand(proc { |first, last|
-       @bar.set(first, last)
-    })
-    @right_text.yscrollcommand(proc { |first, last|
-       @bar.set(first, last)
-    })
+
+    if show_scrollbar
+      @bar.command(proc { |*args|
+       @left_text.yview(*args)
+       @right_text.yview(*args)
+      })
+      @left_text.yscrollcommand(proc { |first, last|
+         @bar.set(first, last)
+      })
+      @right_text.yscrollcommand(proc { |first, last|
+         @bar.set(first, last)
+      })
+    end
     @right_text.bind("Configure", 
     		proc{
             new_width = new_right_width
@@ -989,12 +995,14 @@ class TkMenuButtonObjBoard < ObjBoard
     :underline=>0,
     :direction=>:flush,
     #:font=>$arcadia['conf']['inspectors.inspector.tree.font'],
-    #:relief=>:groove,
+    :relief=>:groove,
+    :borderwidth=> '1',      
+
     #:background=> :white,
     :justify=> :left})){|mb|
       menu TkMenu.new(Arcadia.style('menu').update({
       :parent=>mb,
-      :tearoff=>1
+      :tearoff=>0
       #:font=>$arcadia['conf']['inspectors.inspector.tree.font'],
       #:background=> :white,:relief=>'flat'
       }))
@@ -1021,7 +1029,7 @@ class TkMenuButtonObjBoard < ObjBoard
       _space = _space + '  ' 
     end
     if _agobj.ag_parent != nil 
-      _result = _space + '�'+_result 
+      _result = _space + '¦'+_result 
     end
     return _result
   end
@@ -1479,11 +1487,11 @@ class AGTkInspector < AGInspector
     @top_panel = TkFrame.new(@ojts_layout, Arcadia.style('panel')){
       place('x'=>0, 'y'=>0, 'relheight'=>1, 'relwidth'=>1)
     }
-    @tabs['LayoutType'] = InspectList.new('layout_man', @top_panel)
+    @tabs['LayoutType'] = InspectList.new('layout_man', @top_panel,85,false)
     @mid_panel = TkFrame.new(@ojts_layout, Arcadia.style('panel')){
       place('x'=>0, 'y'=>20,'relheight'=>1, 'relwidth'=>1)
     }
-    @tabs['Layout'] = InspectList.new('...',@mid_panel)
+    @tabs['Layout'] = InspectList.new('...',@mid_panel, 85)
     
     @ojts_winfo = _host.insert('end','winfo','text'=>'Winfo')
     @tabs['Winfo'] = InspectList.new('winfo', @ojts_winfo)

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

@@ -1176,6 +1176,7 @@ include WrapBind
 class Revparsel
 
   def initialize(_code, _filename=nil)
+    #p "-------- revparsel ------------"
     _code.gsub!('TkScrollbar','QTkScrollbar')
     _code.gsub!('bind(','wbind(')
     if $arcadia.objects('code')
@@ -1185,7 +1186,7 @@ class Revparsel
     end
     @filename = _filename
     _re_string = ''
-    ['TkToplevel','TkRoot','TkToplevelLayer'].each{|top|
+    ['TkToplevel','Tk::Toplevel','TkRoot','TkToplevelLayer'].each{|top|
       if _re_string.length > 0
         _re_string = _re_string+'|'
       end
@@ -1197,13 +1198,16 @@ class Revparsel
       _obj_name = _class_name.sub(/^./) { $&.downcase}
       cod = _code + "\n@"+ _obj_name + "="+ _class_name+".new('class'=>"+_class+")\n"
       cod = cod +"Tk.update\n"
+      #p cod
       eval(cod)
       cod = ''
-      cod = cod + '@ag'+ _obj_name + "="+'AG'+ _class+".new(nil,@"+_obj_name+"){\n"
+      cod = cod + '@ag'+ _obj_name + "="+'AG'+ _class.sub('::','')+".new(nil,@"+_obj_name+"){\n"
       cod = cod + "|_self|\n"
       cod = cod + "  _self.i_name='"+_obj_name+"' \n"
       cod = cod + "  _self.i_ag='"+'ag'+_obj_name+"' \n"
       cod = cod + '}'+"\n"
+      #p "-------------------"
+      #p cod
       eval(cod)
     end
   end

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

@@ -1532,6 +1532,7 @@ class RubyDebug < ArcadiaExt
         
         @rdc = RubyDebugClient.new(self, conf('server.host'), conf('server.port'), conf('server.timeout')) if @rdc.nil?
         @rdv = RubyDebugView.new(self.frame.hinner_frame, self) if @rdv.nil?
+        self.frame.show
         @rdv.start_process(_filename)
         if @rdc.start_session
           @static_breakpoints.each{|_b|

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

@@ -43,7 +43,7 @@ class SearchInFilesListener
         Tk.callback_break
       end
     }
-    
+    @find.title("Search in files")
   end
   private :create_find
   
@@ -251,23 +251,20 @@ class FindFrame < TkFloatTitledFrame
       autocomplete 'true'
       expand 'tab'
       takefocus 'true'
-      #pack('side'=>'left','fill'=>'x')
       pack('fill'=>'x')
+      #pack('fill'=>'x')
       #place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
     @e_dir.text(Dir.pwd)
-    @b_dir = TkButton.new(_h_frame, Arcadia.style('button') ){
+    @b_dir = TkButton.new(@e_dir, Arcadia.style('button') ){
       compound  'none'
       default  'disabled'
       text  '...'
-      #overrelief  'raised'
-      #justify  'center'
-      pack('side'=>'right','ipadx'=>5, 'padx'=>5)
+      pack('side'=>'right')
+      #pack('side'=>'right','ipadx'=>5, 'padx'=>5)
     }.bind('1', proc{
-      _d = Tk.chooseDirectory('initialdir'=>@e_dir.text,'mustexist'=>true)
-      if _d && _d.strip.length > 0
-        @e_dir.text(_d)
-      end
+         change_dir
+         Tk.callback_break
     })
     
     y0 = y0 + d
@@ -284,6 +281,13 @@ class FindFrame < TkFloatTitledFrame
     }
     place('x'=>100,'y'=>100,'height'=> 220,'width'=> 300)
   end
+
+  def change_dir
+    _d = Tk.chooseDirectory('initialdir'=>@e_dir.text,'mustexist'=>true)
+    if _d && _d.strip.length > 0
+      @e_dir.text(_d)
+    end
+  end
   
   def show
     super

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

@@ -49,7 +49,7 @@ class Shell < ArcadiaExt
     _filename = @arcadia['pers']['run.file.last'] if _filename == "*LAST"
     if _filename && File.exists?(_filename)
       begin
-        @arcadia['pers']['run.file.last']=_filename
+        @arcadia['pers']['run.file.last']=_filename if _event.persistent
         _cmd_ = "|"+@arcadia['conf']['shell.ruby']+" "+_filename+" 2>&1"
         open(_cmd_,"r"){|f|
            _readed = f.read

data/lib/a-commons.rb

@@ -95,6 +95,10 @@ class FixedFrameWrapper < AbstractFrameWrapper
   def hide
   end
   
+  def raised?
+    @arcadia.layout.raised?(@point, @name)
+  end
+  
   def free
     @arcadia.layout.unregister_panel(@point, @name)
     @fixed_frame = nil
@@ -522,7 +526,7 @@ end
 
 module Persistable
   def override_persistent(_persist_file, _persistent_hash)
-    if FileTest::exist?(_persist_file)
+    if FileTest::exist?(_persist_file) && File.stat(_persist_file).writable?
       f = File.new(_persist_file, "w")
       begin
         if f

data/lib/a-contracts.rb

@@ -164,6 +164,7 @@ class RunRubyFileEvent < ArcadiaEvent
     attr_accessor :output
   end
   attr_accessor :file
+  attr_accessor :persistent
 end
 
 class InputEvent < ArcadiaEvent

data/lib/a-core.rb

@@ -2,12 +2,20 @@
 #   a-core.rb - Arcadia Ruby ide
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
+#   §require_dir_ref=..
+#   §require_omissis=conf/arcadia.init
+#   §require_omissis=tk
+#   §require_omissis=tk/label
+#   §require_omissis=tk/toplevel
+
+
 
 require "conf/arcadia.res"
 require 'tkextlib/bwidget'
 require "lib/a-tkcommons"
 require "lib/a-contracts"
 require "observer"
+
 class Arcadia < TkApplication
   include Observable
   attr_reader :layout
@@ -15,7 +23,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.4.0',
+        '0.5.0',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
@@ -283,7 +291,12 @@ class Arcadia < TkApplication
     publish('main.action.edit_copy',proc{$arcadia['editor'].raised.text.text_copy()})
     publish('main.action.edit_paste',proc{$arcadia['editor'].raised.text.text_paste()})
     @splash.next_step('... load actions')  if @splash
-    publish('action.test.keys', proc{KetTest.new})
+    #provvisorio 
+    @keytest = KeyTest.new
+    @keytest.on_close=proc{@keytest.hide}
+    @keytest.hide
+    @keytest.title("Keys test")
+    publish('action.test.keys', proc{@keytest.show})
     publish('action.get.font', proc{Tk::BWidget::SelectFont::Dialog.new.create})
     @splash.next_step  if @splash
     publish('action.show_about', proc{ArcadiaAboutSplash.new.deiconify})
@@ -874,6 +887,12 @@ class ArcadiaAboutSplash < TkToplevel
     geometry = _width.to_s+'x'+_height.to_s+'+'+_x.to_s+'+'+_y.to_s
     Tk.tk_call('wm', 'geometry', self, geometry )
     bind("Double-Button-1", proc{self.destroy})
+    info = "Ruby version = #{RUBY_VERSION} - TclTk version = #{Arcadia.instance.tcltk_info.level}"
+    set_sysinfo(info)
+  end
+
+  def set_sysinfo(_info)
+    @tkLabelStep.text(_info)
   end
 
   def set_progress(_max=10)
@@ -967,9 +986,9 @@ end
 class ArcadiaLayout
   include Observable
   ArcadiaPanelInfo = Struct.new( "ArcadiaPanelInfo",
-  :name,
-  :title,
-  :frame
+    :name,
+    :title,
+    :frame
   )
 
   def initialize(_arcadia, _frame, _autotab=true)
@@ -997,7 +1016,21 @@ class ArcadiaLayout
     p = @panels[_domain]
     if p && p['notebook'] != nil
       p['notebook'].raise(_extension)
+      p['notebook'].see(_extension)
+    end
+	end
+
+#  def raise_panel(_domain_name, _name)
+#    @panels[_domain_name]['notebook'].raise(_name) if @panels[_domain_name] && @panels[_domain_name]['notebook']
+#  end
+
+	def raised?(_domain, _extension)
+    ret = false
+    p = @panels[_domain]
+    if p && p['notebook'] != nil
+      ret=p['notebook'].raise == _extension
     end
+    ret
 	end
 	
   def _prepare_rows(_row,_col, _height, _perc=false, _top_name=nil, _bottom_name=nil)
@@ -1176,10 +1209,6 @@ class ArcadiaLayout
     #p "unregister #{_name} ------> 5"
   end
 
-  def raise_panel(_domain_name, _name)
-    @panels[_domain_name]['notebook'].raise(_name) if @panels[_domain_name] && @panels[_domain_name]['notebook']
-  end
-
   def [](_row, _col)
     @frames[_row][_col]
   end
@@ -1206,3 +1235,5 @@ class ArcadiaLayout
     return _frame
   end
 end
+
+

data/lib/a-tkcommons.rb

@@ -226,7 +226,7 @@ class AGTkVSplittedFrames < AGTkSplittedFrames
   attr_reader :left_frame, :right_frame, :splitter_frame
   def initialize(parent=nil, width=10, slen=5, perc=false, keys=nil)
     super(parent, width, slen, keys)
-    
+    #self.place('relheight'=>1, 'relwidth'=>1, 'bordermode'=>'outside' )    
     self.pack(:expand=>true, :fill=>:both)
     @left_frame = TkFrame.new(self, Arcadia.style('panel')){
       #relief 'flat'
@@ -816,6 +816,19 @@ class TkTitledScrollFrame < TkTitledFrame
 
 end
 
+class TkResizingTitledFrame < TkFrame
+  include TkResizable
+  def initialize(parent=nil, *args)
+    super(parent, *args)
+    @resizing_label=TkLabel.new(self, Arcadia.style('label')){
+      text '-'
+      image TkPhotoImage.new('dat'=>EXPAND_LIGHT_GIF)
+    }.pack('side'=> 'right','anchor'=> 's')
+    start_resizing(@resizing_label, self)
+  end
+end
+
+
 class TkFloatTitledFrame < TkBaseTitledFrame
   include TkMovable
   include TkResizable
@@ -965,3 +978,218 @@ class TclTkInfo
     @level = TclTkIp.new._eval "info patchlevel"
   end
 end
+
+
+class TkScrollText < TkText
+  def initialize(parent=nil, keys={})
+    super(parent, keys)
+    @scroll_width = 15
+    @v_scroll_on = false
+    @h_scroll_on = false
+    @v_scroll = TkScrollbar.new(parent,{
+      'orient'=>'vertical'}.update(Arcadia.style('scrollbar'))
+    )
+    @v_scroll.command(proc{|*args|
+      self.yview *args
+    })
+    self.yscrollcommand(proc{|first,last| 
+      self.do_yscrollcommand(first,last)
+    })
+    
+    @h_scroll = TkScrollbar.new(parent,{
+      'orient'=>'horizontal'}.update(Arcadia.style('scrollbar'))
+    )
+    @h_scroll.command(proc{|*args|
+      self.xview *args
+    })
+    self.xscrollcommand(proc{|first,last| 
+      self.do_xscrollcommand(first,last)
+    })
+  end
+  def add_yscrollcommand(cmd=Proc.new)
+    @v_scroll_command = cmd
+  end   
+  def do_yscrollcommand(first,last)
+    #p "do_yscrollcommand first=#{first} last=#{last}"
+    @v_scroll.set(first,last)
+    @v_scroll_command.call(first,last) if !@v_scroll_command.nil?
+  end
+  def add_xscrollcommand(cmd=Proc.new)
+    @h_scroll_command = cmd
+  end   
+  def do_xscrollcommand(first,last)
+    #p "do_xscrollcommand first=#{first} last=#{last}"
+    @h_scroll.set(first,last)
+    @h_scroll_command.call(first,last) if !@h_scroll_command.nil?
+  end
+  
+  def show(_x=0,_y=0,_border_mode='outside')
+    @x=_x
+    @y=_y
+    place(
+      'x'=>@x,
+      'y'=>@y,
+      'width' => -@x,
+      'height' => -@y,
+      'relheight'=>1,
+      'relwidth'=>1,
+      'bordermode'=>_border_mode
+   )
+   if @v_scroll_on
+     show_v_scroll
+   end
+   if @h_scroll_on
+     show_h_scroll
+   end
+  end
+  
+  def show_v_scroll
+    self.place('width' => -@scroll_width-@x)
+    @v_scroll.pack('side' => 'right', 'fill' => 'y')
+    @v_scroll_on = true
+  end
+
+  def show_h_scroll
+    self.place('height' => -@scroll_width-@y)
+    @h_scroll.pack('side' => 'bottom', 'fill' => 'x')
+    @h_scroll_on = true
+  end
+
+  def hide_v_scroll
+    self.place('width' => 0)
+    @v_scroll.unpack
+    @v_scroll_on = false
+  end
+
+  def hide_h_scroll
+    self.place('height' => 0)
+    @h_scroll.unpack
+    @h_scroll_on = false  
+  end
+
+end
+
+class TkScrollWidget
+  def initialize(widget)
+    @widget = widget
+    @parent = TkWinfo.parent(@widget)
+    @scroll_width = 15
+    @v_scroll_on = false
+    @h_scroll_on = false
+    @v_scroll = TkScrollbar.new(@parent,{
+      'orient'=>'vertical'}.update(Arcadia.style('scrollbar'))
+    )
+    @v_scroll.command(proc{|*args|
+      @widget.yview *args
+    })
+    @widget.yscrollcommand(proc{|first,last| 
+      do_yscrollcommand(first,last)
+    })
+    
+    @h_scroll = TkScrollbar.new(@parent,{
+      'orient'=>'horizontal'}.update(Arcadia.style('scrollbar'))
+    )
+    @h_scroll.command(proc{|*args|
+      @widget.xview *args
+    })
+    @widget.xscrollcommand(proc{|first,last| 
+      do_xscrollcommand(first,last)
+    })
+  end
+  
+  def add_yscrollcommand(cmd=Proc.new)
+    @v_scroll_command = cmd
+  end   
+  
+  def do_yscrollcommand(first,last)
+    @v_scroll.set(first,last)
+    @v_scroll_command.call(first,last) if !@v_scroll_command.nil?
+  end
+  
+  def add_xscrollcommand(cmd=Proc.new)
+    @h_scroll_command = cmd
+  end   
+  
+  def do_xscrollcommand(first,last)
+    @h_scroll.set(first,last)
+    @h_scroll_command.call(first,last) if !@h_scroll_command.nil?
+  end
+  
+  def show(_x=0,_y=0,_border_mode='outside')
+    @x=_x
+    @y=_y
+    @widget.place(
+      'x'=>@x,
+      'y'=>@y,
+      'width' => -@x,
+      'height' => -@y,
+      'relheight'=>1,
+      'relwidth'=>1,
+      'bordermode'=>_border_mode
+   )
+   if @v_scroll_on
+     show_v_scroll
+   end
+   if @h_scroll_on
+     show_h_scroll
+   end
+  end
+
+  def hide
+    @widget.unplace
+    @v_scroll.unpack
+    @h_scroll.unpack
+  end
+  
+  def show_v_scroll
+    @widget.place('width' => -@scroll_width-@x)
+    @v_scroll.pack('side' => 'right', 'fill' => 'y')
+    @v_scroll_on = true
+  end
+
+  def show_h_scroll
+    @widget.place('height' => -@scroll_width-@y)
+    @h_scroll.pack('side' => 'bottom', 'fill' => 'x')
+    @h_scroll_on = true
+  end
+
+  def hide_v_scroll
+    @widget.place('width' => 0)
+    @v_scroll.unpack
+    @v_scroll_on = false
+  end
+
+  def hide_h_scroll
+    @widget.place('height' => 0)
+    @h_scroll.unpack
+    @h_scroll_on = false  
+  end
+
+end
+
+class KeyTest < TkFloatTitledFrame
+  attr_reader :ttest
+  def initialize(_parent=nil)
+    _parent = Arcadia.instance.layout.root if _parent.nil?
+    super(_parent)
+
+    #Tk.tk_call('wm', 'title', self, '...hello' )
+    #Tk.tk_call('wm', 'geometry', self, '638x117+200+257' )
+
+    @ttest = TkText.new(self.frame){
+      background  '#FFF454'
+      #place('relwidth' => '1','relx' => 0,'x' => '0','y' => '0','relheight' => '1','rely' => 0,'height' => '0','bordermode' => 'inside','width' => '0')
+    }.bind("KeyPress"){|e|
+      @ttest.insert('end'," "+e.keysym+" ")
+      break
+    }
+    _wrapper = TkScrollWidget.new(@ttest)
+    _wrapper.show
+    _wrapper.show_v_scroll
+    _wrapper.show_h_scroll
+    place('x'=>100,'y'=>100,'height'=> 220,'width'=> 500)
+  end
+end
+
+
+