arcadia 0.6.0 → 0.7.0

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

@@ -1,5 +1,5 @@
 name=file_history
-frames=0.0
+frames=1.0
 frames.labels=File history
 frames.names=file_history
 active=yes
@@ -7,7 +7,7 @@ require=ext/ae-file-history/ae-file-history
 class=FilesHistrory
 
 file.name=arcadia.history
-length=35
+length=20
 font=courier 11
 font.bold=courier 11 bold
 color.background=#ffffff

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

@@ -30,36 +30,6 @@ class TreeNode
     self.label.strip <=> other.label.strip
   end
 	
-#	def path
-#	  _path = @label
-#	  if @parent != nil
-#	    _path = @parent.path+_path
-#	  end
-#	  return _path
-#	end
-
-	def dir_old(_path)
-	  node = nil
-	  parent = self
-	  sons.each{|_tree|
-	     if _path[0.._tree.label.length-1] == _tree.label 
-				 res = _path[_tree.label.length.._path.length-1]
-				 if ["\\","/"].include?(res[0,1])
-              parent = _tree
-              node= _tree.dir(res)
-				 end
-			 end
-			 break if node != nil
-	  }
-	  if node == nil
-	    node = TreeNode.new(parent,'KDir') do |_node|
-      		_node.label=_path
-      		_node.rif= parent.path+_path
-	    end
-	  end
-	  return node
-	end
-
 	def dir(_path)
 	  node = nil
 	  parent = self
@@ -108,13 +78,10 @@ class FilesHistrory < ArcadiaExt
   def sync_on
     @sync = true
     select_file_without_event(@last_file) if @last_file
-
-    #Arcadia.attach_listener(self, BufferRaisedEvent)
   end
 
   def sync_off
     @sync = false
-    #Arcadia.detach_listener(self, BufferRaisedEvent)
   end
 
   def on_before_build(_event)
@@ -126,11 +93,18 @@ class FilesHistrory < ArcadiaExt
     @cb_sync = TkCheckButton.new(self.frame.hinner_frame, Arcadia.style('checkbox')){
       text  'Sync'
       justify  'left'
-      variable 1
-      #command do_check
-      place('x' => 0,'y' => 0,'height' => 22)
+      indicatoron 0
+      offrelief 'raised'
+      image TkPhotoImage.new('dat' => SYNCICON20_GIF)
+      place('x' => 0,'y' => 0,'height' => 26)
     }
 
+    Tk::BWidget::DynamicHelp::add(@cb_sync, 
+      'text'=>'Link open editors with content in the Navigator')
+
+
+
+
     do_check = proc {
       if @cb_sync.cget('onvalue')==@cb_sync.cget('variable').value.to_i
         sync_on
@@ -162,19 +136,26 @@ class FilesHistrory < ArcadiaExt
         #EditorContract.instance.open_file(self,'file'=>_file)
       end
     }
-#    _background = conf('color.background')
-#    _foreground = conf('color.foreground')
+    
+    do_open_folder = proc{|_node|
+      children = @htree.nodes(_node)
+      if children.length == 1 
+        @htree.open_tree(children[0],false)
+      end
+    }    
+
     @font =  Arcadia.conf('treeitem.font')
     @font_b = "#{Arcadia.conf('treeitem.font')} bold"
 
 	  @htree = Tk::BWidget::Tree.new(self.frame.hinner_frame, Arcadia.style('treepanel')){
       showlines false
       deltay 18
+      opencmd proc{|node| do_open_folder.call(node)} 
       selectcommand proc{ do_select_item.call(self) } 
 #      place('relwidth' => 1,'relheight' => '1', 'x' => '0','y' => '22', 'height' => -22)
     }
     _wrapper = TkScrollWidget.new(@htree)  
-    _wrapper.show(0,22)
+    _wrapper.show(0,26)
     _wrapper.show_v_scroll
     _wrapper.show_h_scroll
 #    _scrollcommand = proc{|*args| @htree.yview(*args)}

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

@@ -97,7 +97,7 @@ class SearchOutput
     @results = {}
     _open_file = proc do |tree, sel|
       n_parent, n = sel.split('@@@')
-      Arcadia.process_event(OpenBufferEvent.new(self,'file'=>@results[n_parent][n][0], 'row'=>@results[n_parent][n][1]))  if n && @results[n_parent][n]
+      Arcadia.process_event(OpenBufferTransientEvent.new(self,'file'=>@results[n_parent][n][0], 'row'=>@results[n_parent][n][1]))  if n && @results[n_parent][n]
       #EditorContract.instance.open_file(self, 'file'=>@results[n_parent][n][0], 'line'=>@results[n_parent][n][1]) if n && @results[n_parent][n]
     end
 
@@ -170,6 +170,7 @@ class SearchOutput
     Tk.update
     @results[_r_node]={}
     @count = 0
+    @tree.set_focus
     return _r_node
   end
   

data/lib/a-commons.rb

@@ -614,6 +614,10 @@ class Application
   def Application.conf(_property)
 	  @@instance['conf'][_property] if @@instance
   end
+
+  def conf(_property)
+	  self['conf'][_property]
+  end
   
   def sys_info
     "[Platform = #{RUBY_PLATFORM}] [Ruby version = #{RUBY_VERSION}]"

data/lib/a-contracts.rb

@@ -58,6 +58,9 @@ end
 class OpenBufferEvent < BufferEvent
 end
 
+class OpenBufferTransientEvent < OpenBufferEvent
+end
+
 class CloseBufferEvent < BufferEvent
 end
 
@@ -68,6 +71,11 @@ class SaveAsBufferEvent < SaveBufferEvent
   attr_accessor :new_file	
 end
 
+class MoveBufferEvent < BufferEvent
+  attr_accessor :old_file	
+  attr_accessor :new_file	
+end
+
 class GoToLineBufferEvent < BufferEvent
   attr_accessor :line
 end

data/lib/a-core.rb

@@ -23,7 +23,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.6.0',
+        '0.7.0',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
@@ -43,7 +43,9 @@ class Arcadia < TkApplication
       title _title
       withdraw
       protocol( "WM_DELETE_WINDOW", $arcadia['action.on_exit'])
+      iconphoto(TkPhotoImage.new('dat'=>ARCADIA_RING_GIF))
     }
+    
     @on_event = Hash.new
 
     @main_menu_bar = TkMenubar.new(
@@ -69,7 +71,6 @@ class Arcadia < TkApplication
     @splash.set_progress(50) if @splash
     @splash.deiconify if @splash
     Tk.update
-    #sleep(1)
     @splash.next_step('..prepare')  if @splash
     prepare
     @splash.last_step('..load finish')  if @splash
@@ -406,7 +407,7 @@ class Arcadia < TkApplication
 
 
   def do_exit
-    q1 = (Arcadia.dialog(self,
+    q1 = conf('confirm-on-exit')!='yes' || (Arcadia.dialog(self,
                         'type'=>'yes_no',
                         'msg'=>"Do you want exit?",
                         'title' => '(Arcadia) Exit',
@@ -816,6 +817,21 @@ class ArcadiaMainMenu < ArcadiaUserControl
     @menu.add_menu(menu_spec_view)
     @menu.add_menu(menu_spec_tools)
     @menu.add_menu(menu_spec_help)
+  
+    #@menu.bind_append("1", proc{
+#      chs = TkWinfo.children(@menu)
+#      hh = 25
+#      @last_post = nil
+#      chs.each{|ch|
+#        ch.bind_append("Enter", proc{|x,y,rx,ry| 
+#          @last_post.unpost if @last_post
+#          ch.menu.post(x-rx,y-ry+hh)
+#          @last_post=ch.menu}, "%X %Y %x %y")
+#        ch.bind_append("Leave", proc{
+#          @last_post.unpost if @last_post
+#        })
+#      }
+    #})
   end
   
 end
@@ -869,6 +885,14 @@ class ArcadiaAboutSplash < TkToplevel
       justify  'left'
       place('width' => '120','x' => 150,'y' => 65,'height' => 19)
     }
+    @tkLabel21 = TkLabel.new(self){
+      text  'by Antonio Galeone - 2004/2009'
+      background  _bgcolor
+      foreground  '#ffffff'
+      font Arcadia.instance['conf']['splash.credits.font']
+      justify  'left'
+      place('width' => '210','x' => 100,'y' => 95,'height' => 19)
+    }
     @tkLabelStep = TkLabel.new(self){
       text  ''
       background  _bgcolor
@@ -876,20 +900,12 @@ class ArcadiaAboutSplash < TkToplevel
       font Arcadia.instance['conf']['splash.banner.font']
       justify  'left'
       anchor  'w'
-      place('width'=>-5,'relwidth' => 1,'x' => 5,'y' => 175,'height' => 19)
-    }
-    @tkLabel21 = TkLabel.new(self){
-      text  'by Antonio Galeone - 2004/2009'
-      background  _bgcolor
-      foreground  '#ffffff'
-      font Arcadia.instance['conf']['splash.credits.font']
-      justify  'left'
-      place('width' => '210','x' => 100,'y' => 146,'height' => 19)
+      place('width'=>-5,'relwidth' => 1,'x' => 5,'y' => 160,'height' => 19)
     }
     @progress  = TkVariable.new
     reset
     _width = 340
-    _height = 210
+    _height = 200
     #_width = 0;_height = 0
     _x = TkWinfo.screenwidth(self)/2 -  _width / 2
     _y = TkWinfo.screenheight(self)/2 -  _height / 2
@@ -908,11 +924,12 @@ class ArcadiaAboutSplash < TkToplevel
     @max = _max
     Tk::BWidget::ProgressBar.new(self, :width=>150, :height=>10,
     :background=>'black',
-    :foreground=>'yellow',
+    :troughcolor=>'black',
+    :foreground=>'#a11934',
     :variable=>@progress,
     :borderwidth=>0,
     :relief=>'flat',
-    :maximum=>_max).place('width' => '150','x' => 145,'y' => 95,'height' => 15)
+    :maximum=>_max).place('relwidth' => '1','y' => 146,'height' => 2)
   end
 
   def reset
@@ -961,25 +978,36 @@ class ArcadiaDialogManager
     @arcadia = _arcadia
     Arcadia.attach_listener(self, DialogEvent)
   end
+
   def on_dialog(_event)
+    type = _event.type
+    if !DialogEvent::TYPE_PATTERNS.include?(_event.type)
+      type = 'ok'
+    end
+    res_array = type.split('_')
+    icon = _event.level
+    tktype = type.gsub('_','').downcase
+    
+    tkdialog =  Tk::BWidget::MessageDlg.new(
+            'icon' => icon,
+            'bg' => Arcadia.conf('background'),
+            'fg' => Arcadia.conf('foreground'),
+            'type' => tktype,
+            'title' => _event.title, 
+            'message' => _event.msg)
+            
+    tkdialog.configure('font'=>'courier 6')        
+    res = tkdialog.create
+    _event.add_result(self, 'value'=>res_array[res.to_i])
+  end
+
+
+  def on_dialog_old(_event)
     type = _event.type
     if !DialogEvent::TYPE_PATTERNS.include?(_event.type)
       type = 'ok'
     end
     icon = _event.level
-#    case _event
-#      when QuestionDialogEvent
-#        icon = 'question'
-#      when InfoDialogEvent
-#        icon = 'info'
-#      when WarningDialogEvent
-#        icon = 'warning'
-#      when ErrorDialogEvent
-#        icon = 'error'
-#      else
-#        icon = 'info'
-#    end
-     
     tktype = type.gsub('_','').downcase
     
     res =  Tk.messageBox(

data/lib/a-tkcommons.rb

@@ -6,6 +6,46 @@
 require "lib/a-commons"
 require "tk/menu"
 
+class MyBwTree < Tk::BWidget::Tree
+
+  def open?(node)
+    bool(self.itemcget(tagid(node), 'open'))
+  end
+    
+  def areabind(context, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Items, [path, 'bindArea'], 
+                          context, cmd, *args)
+    self
+  end
+
+  def areabind_append(context, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append_for_event_class(Event_for_Items, [path, 'bindArea'], 
+                                 context, cmd, *args)
+    self
+  end
+
+  def areabind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Items, [path, 'bindArea'], *args)
+    self
+  end
+
+  def areabindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Items, [path, 'bindArea'], *args)
+  end
+
+end
+
+
 class TkApplication < Application
   attr_reader :tcltk_info
   def initialize(_application_params)
@@ -275,11 +315,7 @@ class AGTkVSplittedFrames < AGTkSplittedFrames
   attr_reader :left_frame, :right_frame, :splitter_frame
   def initialize(parent=nil, frame=nil, width=10, slen=5, perc=false, keys=nil)
     super(parent, frame, 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'
-    }
+    @left_frame = TkFrame.new(self, Arcadia.style('panel'))
     @frame1 = @left_frame
     if perc
       p_width = TkWinfo.screenwidth(self)
@@ -303,10 +339,7 @@ class AGTkVSplittedFrames < AGTkSplittedFrames
     @left_frame_obj.relwidth = 0
     @left_frame_obj.relheight = 1
 
-    @splitter_frame = TkFrame.new(self, Arcadia.style('splitter')){
-      #relief  'raised'
-      #border 1
-    }
+    @splitter_frame = TkFrame.new(self, Arcadia.style('splitter'))
 
     @splitter_frame.place(
       'relx' => 0,
@@ -321,81 +354,99 @@ class AGTkVSplittedFrames < AGTkSplittedFrames
       "ButtonRelease-1",
       proc{do_resize}
     )
-    _self = self
-    @b_left = TkButton.new(nil, Arcadia.style('button')){
-      image TkPhotoImage.new('dat'=>LEFT_SIDE_GIF)
-    }
-
-    @b_right = TkButton.new(nil, Arcadia.style('button')){
-      image TkPhotoImage.new('dat'=>RIGHT_SIDE_GIF)
-    }
-    @proc_unplace = proc{
-      @b_left.unplace
-      @b_right.unplace
-    }
-    @splitter_frame.bind_append(
-      "B1-Motion",
-      proc{@splitter_frame.raise;@proc_unplace.call}
-    )
-    @@last_b_left = nil
-    @@last_b_right = nil
-    @b_left.bind_append('ButtonPress-1',proc{_self.hide_left;@proc_unplace.call})
-    @b_right.bind_append('ButtonPress-1',proc{_self.hide_right;@proc_unplace.call})
-    @proc_place = proc{|x,y|
-      if !TkWinfo.mapped?(@b_left)
-        _x = TkWinfo.pointerx(self) - 10
-        _y = TkWinfo.pointery(self) - 20
-        if @@last_b_left != nil
-          @@last_b_left.unplace
-          @@last_b_right.unplace
-        end
-        @b_left.place('x'=>_x,'y'=>_y,'border'=>'outside')
-        @b_right.place('x'=>_x,'y'=>_y+25,'border'=>'outside')
-        @b_left.raise
-        @b_right.raise
-        @@last_b_left = @b_left
-        @@last_b_right = @b_right
-        if @thread_unplace
-          @thread_unplace.kill
-        end
-        @thread_unplace= Thread.new {
-          sleep(5)
-          @proc_unplace.call
-          kill
-        }
-      end
-    }
-
-    @splitter_frame.bind_append(
-    'ButtonPress-1',
-    proc{|x,y|
-      @thread_place= Thread.new {
-        @proc_place.call(x,y)
-      }
-    }, "%x %y")
-
+    #-----
+    #-----
+#    _self = self
+#    @b_left = TkButton.new(nil, Arcadia.style('button')){
+#      image TkPhotoImage.new('dat'=>LEFT_SIDE_GIF)
+#    }
+#
+#    @b_right = TkButton.new(nil, Arcadia.style('button')){
+#      image TkPhotoImage.new('dat'=>RIGHT_SIDE_GIF)
+#    }
+#    @proc_unplace = proc{
+#      @b_left.unplace
+#      @b_right.unplace
+#    }
 #    @splitter_frame.bind_append(
-#    "Enter",
-#    proc{
-#      @color_save = @splitter_frame.background
-#      @splitter_frame.background(Arcadia.conf('splitter.highlightbackground'))}
-#      #@splitter_frame.background('#9aa6a7')}
+#      "B1-Motion",
+#      proc{@splitter_frame.raise;@proc_unplace.call}
 #    )
+#    @@last_b_left = nil
+#    @@last_b_right = nil
+#    @b_left.bind_append('ButtonPress-1',proc{_self.hide_left;@proc_unplace.call})
+#    @b_right.bind_append('ButtonPress-1',proc{_self.hide_right;@proc_unplace.call})
+#    @proc_place = proc{|x,y|
+#      if !TkWinfo.mapped?(@b_left)
+#        _x = TkWinfo.pointerx(self) - 10
+#        _y = TkWinfo.pointery(self) - 20
+#        if @@last_b_left != nil
+#          @@last_b_left.unplace
+#          @@last_b_right.unplace
+#        end
+#        @b_left.place('x'=>_x,'y'=>_y,'border'=>'outside')
+#        @b_right.place('x'=>_x,'y'=>_y+25,'border'=>'outside')
+#        @b_left.raise
+#        @b_right.raise
+#        @@last_b_left = @b_left
+#        @@last_b_right = @b_right
+#        if @thread_unplace
+#          @thread_unplace.kill
+#        end
+#        @thread_unplace= Thread.new {
+#          sleep(5)
+#          @proc_unplace.call
+#          kill
+#        }
+#      end
+#    }
+#
 #    @splitter_frame.bind_append(
-#      "Leave",
-#      proc{
-#        @splitter_frame.background(@color_save)
+#    'ButtonPress-1',
+#    proc{|x,y|
+#      @thread_place= Thread.new {
+#        @proc_place.call(x,y)
 #      }
-#    )
+#    }, "%x %y")
+    #-----
+    #-----
+    _xbutton = TkButton.new(@splitter_frame, Arcadia.style('toolbarbutton')){
+      background '#4966d7'
+    }
+    _xbutton.place(
+      'x' => 0,
+      'y' => 0,
+      'relwidth' => 1,
+      'bordermode' => 'outside',
+      'height' => 20
+    )
+    _xbutton.bind_append(
+      "ButtonPress-1",
+      proc{hide_left}
+    )
+    _ybutton = TkButton.new(@splitter_frame, Arcadia.style('toolbarbutton')){
+      background '#118124'
+    }
+    _ybutton.place(
+      'x' => 0,
+      'y' => 21,
+      'bordermode' => 'outside',
+      'height' => 20,
+      'relwidth' => 1
+    )
+    _ybutton.bind_append(
+      "ButtonPress-1",
+      proc{hide_right}
+    )
+    #-----
+    #-----
     @splitter_frame_obj = AGTkObjPlace.new(@splitter_frame, 'x')
     @splitter_frame_obj.width = @slen
     @splitter_frame_obj.height = 0
     @splitter_frame_obj.relwidth = 0
     @splitter_frame_obj.relheight = 1
     x = x + @slen
-    @right_frame = TkFrame.new(self, Arcadia.style('panel')){
-      #relief 'flat'
-    }
+    @right_frame = TkFrame.new(self, Arcadia.style('panel'))
     @frame2 = @right_frame
     @right_frame.place(
       'relwidth' => 1,
@@ -506,15 +557,6 @@ class AGTkOSplittedFrames < AGTkSplittedFrames
   attr_reader :top_frame, :bottom_frame, :splitter_frame
   def initialize(parent=nil, frame=nil, height=10, slen=5, perc=false, keys=nil)
     super(parent, frame, height, slen, keys)
-#    self.place(
-#      'relwidth' => 1,
-#      'relx' => 0,
-#      'x' => 0,
-#      'y' => 0,
-#      'relheight' => 1,
-#      'rely' => 0,
-#      'bordermode' => 'inside'
-#    )
     @top_frame = TkFrame.new(self, Arcadia.style('panel')){
      # relief 'flat'
     }
@@ -584,8 +626,6 @@ class AGTkOSplittedFrames < AGTkSplittedFrames
     @bottom_frame_obj.relheight = 1
     _xbutton = TkButton.new(@splitter_frame, Arcadia.style('toolbarbutton')){
       background '#4966d7'
-      #overrelief  'raised'
-      #relief  'flat'
     }
     _xbutton.place(
       'x' => 0,
@@ -600,8 +640,6 @@ class AGTkOSplittedFrames < AGTkSplittedFrames
     )
     _ybutton = TkButton.new(@splitter_frame, Arcadia.style('toolbarbutton')){
       background '#118124'
-      #overrelief  'raised'
-      #relief  'flat'
     }
     _ybutton.place(
       'x' => 21,
@@ -1172,7 +1210,8 @@ end
 class TclTkInfo
   attr_reader :level
   def initialize
-    @level = TclTkIp.new._eval "info patchlevel"
+    @level = Tk.tk_call( "eval", "info patchlevel")
+    # @level = TclTkIp.new._eval "info patchlevel"
   end
 end