arcadia 0.10.0 → 0.11.0

data/lib/a-tkcommons.rb

@@ -93,28 +93,28 @@ end
 
 module TkMovable
   def start_moving(_moving_obj=self, _moved_obj=self)
-    @x0 = 0
-    @y0 = 0
-    @moving_obj = _moving_obj
-    @moved_obj = _moved_obj
-    @moving_obj.bind_append("B1-Motion", proc{|x, y| moving_do_move_obj(x,y)},"%x %y")
-    @moving_obj.bind_append("ButtonPress-1", proc{|e| moving_do_press(e.x, e.y)})
+    @x0_m = 0
+    @y0_m = 0
+    @moving_obj_m = _moving_obj
+    @moved_obj_m = _moved_obj
+    @moving_obj_m.bind_append("B1-Motion", proc{|x, y| moving_do_move_obj(x,y)},"%x %y")
+    @moving_obj_m.bind_append("ButtonPress-1", proc{|e| moving_do_press(e.x, e.y)})
   end
 
   def stop_moving
-    @moving_obj.bind_remove("B1-Motion")
-    @moving_obj.bind_remove("ButtonPress-1")
+    @moving_obj_m.bind_remove("B1-Motion")
+    @moving_obj_m.bind_remove("ButtonPress-1")
   end
 
   def moving_do_press(_x, _y)
-    @x0 = _x
-    @y0 = _y
+    @x0_m = _x
+    @y0_m = _y
   end
 
   def moving_do_move_obj(_x, _y)
-    _x = TkPlace.info(@moved_obj)['x'] + _x - @x0
-    _y = TkPlace.info(@moved_obj)['y'] + _y - @y0
-    @moved_obj.place('x'=>_x, 'y'=>_y)
+    _x = TkPlace.info(@moved_obj_m)['x'] + _x - @x0_m
+    _y = TkPlace.info(@moved_obj_m)['y'] + _y - @y0_m
+    @moved_obj_m.place('x'=>_x, 'y'=>_y)
   end
 
 end
@@ -123,32 +123,32 @@ module TkResizable
   MIN_WIDTH = 50
   MIN_HEIGHT = 50
   def start_resizing(_moving_obj=self, _moved_obj=self)
-    @x0 = 0
-    @y0 = 0
-    @moving_obj = _moving_obj
-    @moved_obj = _moved_obj
-    @moving_obj.bind_append("B1-Motion", proc{|x, y| resizing_do_move_obj(x,y)},"%x %y")
-    @moving_obj.bind_append("ButtonPress-1", proc{|e| resizing_do_press(e.x, e.y)})
+    @x0_r = 0
+    @y0_r = 0
+    @moving_obj_r = _moving_obj
+    @moved_obj_r = _moved_obj
+    @moving_obj_r.bind_append("B1-Motion", proc{|x, y| resizing_do_move_obj(x,y)},"%x %y")
+    @moving_obj_r.bind_append("ButtonPress-1", proc{|e| resizing_do_press(e.x, e.y)})
   end
 
   def stop_resizing
-    @moving_obj.bind_remove("B1-Motion")
-    @moving_obj.bind_remove("ButtonPress-1")
+    @moving_obj_r.bind_remove("B1-Motion")
+    @moving_obj_r.bind_remove("ButtonPress-1")
   end
 
   def resizing_do_press(_x, _y)
-    @x0 = _x
-    @y0 = _y
+    @x0_r = _x
+    @y0_r = _y
   end
 
   def resizing_do_move_obj(_x, _y)
-    _width0 = TkPlace.info(@moved_obj)['width']
-    _height0 = TkPlace.info(@moved_obj)['height']
-    _width = _width0 + _x - @x0
-    _height = _height0 + _y -@y0
+    _width0 = TkPlace.info(@moved_obj_r)['width']
+    _height0 = TkPlace.info(@moved_obj_r)['height']
+    _width = _width0 + _x - @x0_r
+    _height = _height0 + _y -@y0_r
     _width = MIN_WIDTH if _width < MIN_WIDTH
     _height = MIN_HEIGHT if _height < MIN_HEIGHT
-    @moved_obj.place('width'=>_width, 'height'=>_height)
+    @moved_obj_r.place('width'=>_width, 'height'=>_height)
   end
 
 end
@@ -262,7 +262,7 @@ class AGTkObjPlace
 end
 
 class TkFrameAdapter < TkFrame
-  include TkMovable
+  #include TkMovable
   attr_reader :frame
   def initialize(scope_parent=nil, args=nil)
     newargs =  Arcadia.style('panel')
@@ -271,22 +271,21 @@ class TkFrameAdapter < TkFrame
     end
     super(scope_parent, newargs)
     @scope_parent = scope_parent
-    @movable = true
-    #ObjectSpace.define_finalizer(self, self.method(:detach_frame).to_proc)
+    #@movable = false
   end
 
-  def add_moved_by(_obj)
-    @movable = true
-    start_moving(_obj, self)
-  end
+#  def add_moved_by(_obj)
+#    @movable = true
+#    start_moving(_obj, self)
+#  end
 
   def detach_frame
     if @frame
-      if @movable
-        @frame.bind_remove("Configure")
-        @frame.bind_remove("Map")
-        @frame.bind_remove("Unmap")
-      end
+#      if @movable
+#        @frame.bind_remove("Configure")
+#        @frame.bind_remove("Map")
+#        @frame.bind_remove("Unmap")
+#      end
       @frame = nil
       self.unmap
     end
@@ -304,11 +303,11 @@ class TkFrameAdapter < TkFrame
     @frame = _frame
     @frame_manager = TkWinfo.manager(@frame)
     refresh
-    if @movable
-      @frame.bind_append("Configure",proc{refresh})
-      @frame.bind_append("Map",proc{refresh})
-      @frame.bind_append("Unmap",proc{unmap  if TkWinfo.mapped?(@frame)})
-    end
+#    if @movable
+#      @frame.bind_append("Configure",proc{refresh})
+#      @frame.bind_append("Map",proc{refresh})
+#      @frame.bind_append("Unmap",proc{unmap  if TkWinfo.mapped?(@frame)})
+#    end
     self
   end
 
@@ -785,6 +784,12 @@ class TkBaseTitledFrame < TkFrame
     }.place('x'=>0, 'y'=>0,'height'=>@title_height, 'relwidth'=>1)
     #.pack('fill'=> 'x','ipady'=> @title_height, 'side'=>'top')
     @frame = create_frame
+
+    @state_frame=TkFrame.new(@top){
+      #background  '#303b50'
+      background  Arcadia.conf('titlelabel.background')
+    }.pack('side'=> 'left','anchor'=> 'e')
+
     @button_frame=TkFrame.new(@top){
       #background  '#303b50'
       background  Arcadia.conf('titlelabel.background')
@@ -794,6 +799,7 @@ class TkBaseTitledFrame < TkFrame
     @menu_buttons = Hash.new
     @panels = Hash.new
     @last_for_frame = Hash.new
+    @last_for_state_frame = Hash.new
     self.head_buttons
   end
 
@@ -834,6 +840,8 @@ class TkBaseTitledFrame < TkFrame
         end
         bind('1',_proc) if _proc
       }
+      Tk::BWidget::DynamicHelp::add(@last_for_frame[_frame], 'text'=>_label) if _label
+      @last_for_frame[_frame]
     rescue RuntimeError => e
       Arcadia.runtime_error(e)
     end
@@ -902,6 +910,31 @@ class TkBaseTitledFrame < TkFrame
   end
   private :__add_sep
 
+  def __add_state_button(_label,_proc=nil,_image=nil, _side= 'left', _frame=nil)
+    return if _frame.nil?
+    begin
+      last = @last_for_state_frame[_frame]
+      @last_for_state_frame[_frame] = TkButton.new(_frame, Arcadia.style('titletoolbarbutton')){
+        text  _label if _label
+        image  Arcadia.image_res(_image) if _image
+        font 'helvetica 8 bold'
+        padx 0
+        pady 0
+        if last
+          pack('side'=> _side,'anchor'=> 'w', 'after'=>last)
+        else
+          pack('side'=> _side,'anchor'=> 'w')
+        end
+        bind('1',_proc) if _proc
+      }
+      Tk::BWidget::DynamicHelp::add(@last_for_state_frame[_frame], 'text'=>_label) if _label
+      @last_for_state_frame[_frame]
+    rescue RuntimeError => e
+      Arcadia.runtime_error(e)
+    end
+  end
+  private :__add_state_button
+
   def menu_button(_name='default')
     @menu_buttons[_name]
   end
@@ -927,6 +960,7 @@ class TkTitledFrame < TkBaseTitledFrame
     @left_label = create_left_label
     @right_label = create_right_label
     @right_labels_text = Hash.new
+    @right_labels_image = Hash.new
     @ap = Array.new
     @apx = Array.new
     @apy = Array.new
@@ -966,7 +1000,15 @@ class TkTitledFrame < TkBaseTitledFrame
       pack('side'=> 'left','anchor'=> 'e')
     }
   end
-
+  
+  def shift_on
+    @left_label.foreground(Arcadia.conf('titlelabel.foreground'))
+  end
+  
+  def shift_off
+    @left_label.foreground(Arcadia.conf('titlelabel.disabledforeground'))
+  end
+  
   def title(_text=nil)
     if _text.nil?
       return @title
@@ -980,27 +1022,60 @@ class TkTitledFrame < TkBaseTitledFrame
     end
   end
 
-  def top_text(_text=nil)
-    if _text.nil?
+  def top_text_clear
+    @right_label.configure('text'=>'', 'image'=>nil)
+  end
+
+  def top_text(_text=nil, _image=nil)
+    if _text.nil? && _image.nil?
       return @right_label.text
-    else
+    elsif !_text.nil? && _image.nil?
       @right_label.text(_text)
+    else
+      @right_label.configure('text'=>_text, 'image'=>_image)
     end
   end
 
-  def save_caption(_name, _caption)
+  def top_text_bind_append(_tkevent, _proc=nil)
+    @right_label.bind_append(_tkevent, _proc)
+  end
+
+  def top_text_bind_remove(_tkevent)
+    @right_label.bind_remove(_tkevent)
+  end
+
+  def top_text_hint(_text=nil)
+    if _text.nil?
+      res = ''
+      res = @right_label_hint_variable.value if defined?(@right_label_hint_variable)
+      res
+    else
+      if !defined?(@right_label_hint_variable)
+        @right_label_hint_variable = TkVariable.new
+        Tk::BWidget::DynamicHelp::add(@right_label, 'variable'=>@right_label_hint_variable)
+      end      
+      @right_label_hint_variable.value=_text
+    end
+  end
+
+  def save_caption(_name, _caption, _image=nil)
     @right_labels_text[_name] = _caption
+    @right_labels_image[_name] = _image
   end
 
   def last_caption(_name)
     @right_labels_text[_name]
   end
 
+  def last_caption_image(_name)
+    @right_labels_image[_name]
+  end
+
   def restore_caption(_name)
     if @right_labels_text[_name]
-      top_text(@right_labels_text[_name])
+      top_text(@right_labels_text[_name], @right_labels_image[_name])
     else
-      top_text('')
+      top_text_clear
     end
   end
 
@@ -1039,7 +1114,8 @@ class TkTitledFrame < TkBaseTitledFrame
     if @state == 'normal'
       p = TkWinfo.parent(self)
       while (p != nil) && (TkWinfo.manager(p)=='place')
-        Tk.messageBox('message'=>p.to_s)
+        Arcadia.dialog(self, 'msg'=>p.to_s)
+        #Tk.messageBox('message'=>p.to_s)
         @ap << p
         @apx << TkPlace.info(p)['x']
         @apy << TkPlace.info(p)['y']
@@ -1179,60 +1255,122 @@ class TkTitledFrameAdapter < TkTitledFrame
 
   def initialize(parent=nil, title=nil, img=nil , keys=nil)
     super(parent, title, img, keys)
-    @transient_frame = TkFrame.new(@button_frame){
+    @transient_action_frame = TkFrame.new(@button_frame){
       background  Arcadia.conf('titlelabel.background')
       padx 0
       pady 0
       pack('side'=> "right",'anchor'=> 'e','fill'=>'both', 'expand'=>true)
     }
+    @transient_state_frame = TkFrame.new(@state_frame){
+      background  Arcadia.conf('titlelabel.background')
+      padx 0
+      pady 0
+      pack('side'=> "left",'anchor'=> 'w','fill'=>'both', 'expand'=>true)
+    }
     @transient_frame_adapter = Hash.new
+    @@instances = [] if !defined?(@@instances)
+    @@instances << self 
   end
 
   def forge_transient_adapter(_name)
     if @transient_frame_adapter[_name].nil?
-      @transient_frame_adapter[_name] = TkFrameAdapter.new(Arcadia.layout.root, {'background'=>  Arcadia.conf('titlelabel.background')})
-      __attach_adapter(@transient_frame_adapter[_name])
-      @transient_frame_adapter[_name].raise
+      @transient_frame_adapter[_name] = Hash.new
+      @transient_frame_adapter[_name][:action] = TkFrameAdapter.new(Arcadia.layout.root, {'background'=>  Arcadia.conf('titlelabel.background')})
+      @transient_frame_adapter[_name][:state] = TkFrameAdapter.new(Arcadia.layout.root, {'background'=>  Arcadia.conf('titlelabel.background')})
+      __attach_action_adapter(@transient_frame_adapter[_name][:action])
+      __attach_action_adapter(@transient_frame_adapter[_name][:state])
+      @transient_frame_adapter[_name][:action].raise
+      @transient_frame_adapter[_name][:state].raise
     end
     @transient_frame_adapter[_name]
   end
 
-  def __attach_adapter(_adapter)
-    @last_attached_adapter.detach_frame if @last_attached_adapter
-    _adapter.attach_frame(@transient_frame)
-    @last_attached_adapter = _adapter
+#  def __attach_adapter(_adapter)
+#    @last_attached_adapter.detach_frame if @last_attached_adapter
+#    _adapter.attach_frame(@transient_action_frame)
+#    @last_attached_adapter = _adapter
+#  end
+
+  def __attach_action_adapter(_adapter)
+    @last_attached_action_adapter.detach_frame if @last_attached_action_adapter
+    _adapter.attach_frame(@transient_action_frame)
+    @last_attached_action_adapter = _adapter
   end
 
-  def change_adapter(_name, _adapter)
-    @transient_frame_adapter[_name] = _adapter
-    @transient_frame_adapter[_name].detach_frame
-    __attach_adapter(@transient_frame_adapter[_name])
-    @transient_frame_adapter[_name].raise
+  def __attach_state_adapter(_adapter)
+    @last_attached_state_adapter.detach_frame if @last_attached_state_adapter
+    _adapter.attach_frame(@transient_state_frame)
+    @last_attached_state_adapter = _adapter
   end
 
-  def change_adapter_name(_name)
-    __attach_adapter(forge_transient_adapter(_name))
-    @transient_frame_adapter[_name].raise
+#  def change_adapter(_name, _adapter)
+#    @transient_frame_adapter[_name] = _adapter
+#    @transient_frame_adapter[_name].detach_frame
+#    __attach_adapter(@transient_frame_adapter[_name])
+#    @transient_frame_adapter[_name].raise
+#  end
+#
+#  def change_adapter_name(_name)
+#    __attach_adapter(forge_transient_adapter(_name))
+#    @transient_frame_adapter[_name].raise
+#  end
+
+  def change_adapters(_name, _adapters)
+    forge_transient_adapter(_name)
+    @transient_frame_adapter[_name][:action] = _adapters[:action]
+    @transient_frame_adapter[_name][:state] = _adapters[:state]
+    @transient_frame_adapter[_name][:action].detach_frame
+    @transient_frame_adapter[_name][:state].detach_frame
+    __attach_action_adapter(@transient_frame_adapter[_name][:action])
+    __attach_state_adapter(@transient_frame_adapter[_name][:state])
+    @transient_frame_adapter[_name][:action].raise
+    @transient_frame_adapter[_name][:state].raise
+  end
+
+  def change_adapters_name(_name)
+    __attach_action_adapter(forge_transient_adapter(_name)[:action])
+    __attach_state_adapter(forge_transient_adapter(_name)[:state])
+    @transient_frame_adapter[_name][:action].raise
+    @transient_frame_adapter[_name][:state].raise
+  end
+
+  def clear_transient_adapters(_name)
+    @@instances.each{|i| 
+      if i.transient_frame_adapter[_name] 
+        if i.transient_frame_adapter[_name][:action]
+          i.transient_frame_adapter[_name][:action].detach_frame
+        end
+        if i.transient_frame_adapter[_name][:state]
+          i.transient_frame_adapter[_name][:state].detach_frame
+        end
+        i.transient_frame_adapter.delete(_name).clear
+      end 
+    }
   end
 
   def add_button(_sender_name, _label,_proc=nil,_image=nil, _side= 'right')
     forge_transient_adapter(_sender_name)
-    __add_button(_label,_proc,_image, _side, @transient_frame_adapter[_sender_name])
+    __add_button(_label,_proc,_image, _side, @transient_frame_adapter[_sender_name][:action])
   end
 
   def add_menu_button(_sender_name, _name='default',_image=nil, _side= 'right', _args=nil)
     forge_transient_adapter(_sender_name)
-    __add_menu_button(_name, _image, _side, _args, @transient_frame_adapter[_sender_name])
+    __add_menu_button(_name, _image, _side, _args, @transient_frame_adapter[_sender_name][:action])
   end
 
   def add_panel(_sender_name, _name='default',_side= 'right', _args=nil)
     forge_transient_adapter(_sender_name)
-    __add_panel(_name, _side, _args, @transient_frame_adapter[_sender_name])
+    __add_panel(_name, _side, _args, @transient_frame_adapter[_sender_name][:action])
   end
 
   def add_sep(_sender_name, _width=0)
     forge_transient_adapter(_sender_name)
-    __add_sep(_width, @transient_frame_adapter[_sender_name])
+    __add_sep(_width, @transient_frame_adapter[_sender_name][:action])
+  end
+
+  def add_state_button(_sender_name, _label,_proc=nil,_image=nil, _side= 'left')
+    forge_transient_adapter(_sender_name)
+    __add_state_button(_label,_proc,_image, _side, @transient_frame_adapter[_sender_name][:state])
   end
 
 end
@@ -1291,8 +1429,9 @@ class TkFloatTitledFrame < TkBaseTitledFrame
     #          hide
     #      end
     #    }
+    Arcadia.instance.register_key_binding(self,"KeyPress[Escape]","ActionEvent.new(self, 'action'=>hide_if_visible)")
   end
-
+  
   def title(_text)
     @right_label.text(_text)
   end
@@ -1301,6 +1440,10 @@ class TkFloatTitledFrame < TkBaseTitledFrame
     add_fixed_button('X', _proc, TAB_CLOSE_GIF)
   end
 
+  def hide_if_visible
+    hide if visible?
+  end
+
   def hide
     @manager = TkWinfo.manager(self)
     if @manager == 'place'
@@ -1534,6 +1677,10 @@ module TkInputThrow
     _widget.bind_append("<Redo>"){Arcadia.process_event(RedoTextEvent.new(_widget));break}
     _widget.bind_append("1", proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>_widget))})
   end
+  
+  def select_throw
+    InputEnterEvent.new(self,'receiver'=>self).go!
+  end
 end
 
 module TkAutoPostMenu
@@ -1725,8 +1872,7 @@ module TkScrollableWidget
       end
       @v_scroll_command.call(first,last) if !@v_scroll_command.nil?
       @last_y_last = last if last.to_f < 1
-    end
-    
+    end    
   end
 
   def add_xscrollcommand(cmd=Proc.new)
@@ -1896,7 +2042,8 @@ class KeyTest < TkFloatTitledFrame
     super(_parent)
 
     @ttest = TkText.new(self.frame){
-      background  '#FFF454'
+      background  Arcadia.conf("background")
+      foreground  Arcadia.conf("foreground")
       #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+" ")