arcadia 0.1.1 → 0.1.2

data/base/a-libs.rb

@@ -464,9 +464,7 @@ class AG
   end
 
   def select
-    _tobj = InspectorContract::TInspectorObj.new(self)
-    _tobj.wrapper = self
-    InspectorContract.instance.select(_tobj)
+    InspectorContract.instance.select(self, 'wrapper'=>self)
     self
   end
 
@@ -514,7 +512,7 @@ class AG
     if @ag_parent
       return @ag_parent.register(_agobj)
     else
-    		WrapperContract.instance.wrapper_created(WrapperContract::TWrapperObj.new(self,'wrapper'=>_agobj))
+    		WrapperContract.instance.wrapper_created(self,'wrapper'=>_agobj)
 #
 #	    _tobj = InspectorActionContract::TInspectorActionObj.new(self)
 # 		  _tobj.wrapper = _agobj
@@ -590,9 +588,7 @@ class AG
 
 
   def delete
-    _tobj = InspectorContract::TInspectorObj.new(self)
-	  _tobj.wrapper = self
-  		InspectorContract.instance.delete_wrapper(_tobj)
+  		InspectorContract.instance.delete_wrapper(self, 'wrapper'=>self)
   end
 
   def AG.class_wrapped
@@ -833,14 +829,12 @@ class AG
   	 if old_value != _value
     		@props[_family][_name]['set'].call(_value)
     end
-  		WrapperContract.instance.property_updated(
-  				WrapperContract::TWrapperObj.new(self, 
+  		WrapperContract.instance.property_updated(self, 
   					'wrapper'=>self,
   					'property_name'=> _name,
   					'property_family'=>_family,
   					'property_old_value'=>old_value,
-  					'property_new_value'=>_value
-  				)
+  					'property_new_value'=>_value  				
   		)
   end
   

data/base/a-utils.rb

@@ -263,7 +263,7 @@ class AGTkOSplittedFrames < AGTkSplittedFrames
       relief 'flat'
     }
     if perc
-			p_height = TkWinfo.screenheight(self)    
+      p_height = TkWinfo.screenheight(self)    
     		y = (p_height/100*height).to_i
     else
       y = height
@@ -442,20 +442,68 @@ class AGTkOSplittedFrames < AGTkSplittedFrames
 
 end
 
-class TkTitledFrame < TkFrame
+class TkBaseTitledFrame < TkFrame
   attr_reader :frame
   attr_reader :top
 
-  def initialize(parent=nil, title='...', img=nil , keys=nil)
-    super(parent, keys)
-    @state = 'normal'
+  def initialize(parent=nil, *args)
+    super(parent, *args)
     @parent = parent
     @title_height = 18
-   
     @top = TkFrame.new(self){
       background  '#303b50'
+      #foreground  'white'
+      #anchor 'w'
     }.place('x'=>0, 'y'=>0,'height'=>@title_height, 'relwidth'=>1)
+    #.pack('fill'=> 'x','ipady'=> @title_height, 'side'=>'top')
+    
+    
+    @frame = create_frame
+    
+    
     
+    @button_frame=TkFrame.new(@top){
+      #background  '#303b50'
+    }.pack('side'=> 'right','anchor'=> 'w')
+    
+    self.head_buttons
+  end
+
+  def create_frame
+    return TkFrame.new(self).place('x'=>0, 'y'=>@title_height,'height'=>-@title_height,'relheight'=>1, 'relwidth'=>1)
+    #pack('fill'=>'both','expand'=> 1, 'anchor'=>'center')
+    #
+  end
+
+  def add_button(_label,_proc=nil,_image=nil, _side= 'right')
+    TkButton.new(@button_frame){
+      text  _label if _label
+      image  TkPhotoImage.new('dat' => _image) if _image
+      relief 'flat'
+      font 'helvetica 8 bold'
+      #borderwidth 0
+      #background  '#303b50'
+      #background  '#8080ff'
+      pack('side'=> _side,'anchor'=> 'e')
+      bind('1',_proc) if _proc
+    }
+  end
+
+  def head_buttons
+    @bmaxmin = add_button('[ ]',proc{resize}, W_MAX_GIF)
+  end
+
+end
+
+
+
+class TkTitledFrame < TkBaseTitledFrame
+  attr_reader :frame
+  attr_reader :top
+
+  def initialize(parent=nil, title='...', img=nil , keys=nil)
+    super(parent, keys)
+    @state = 'normal'
     @title_label =TkLabel.new(@top){
       text title+' :: '
       anchor  'w'
@@ -474,12 +522,7 @@ class TkTitledFrame < TkFrame
       compound 'left'
       pack('side'=> 'left','anchor'=> 'e')
     }
-    @button_frame=TkFrame.new(@top){
-      #background  '#303b50'
-    }.pack('side'=> 'right','anchor'=> 'w')
     
-    self.head_buttons
-    @frame = create_frame
     @ap = Array.new
     @apx = Array.new
     @apy = Array.new
@@ -495,9 +538,6 @@ class TkTitledFrame < TkFrame
     @title_label.text(_text+'::')
   end
 
-  def create_frame
-    return TkFrame.new(self).place('x'=>0, 'y'=>@title_height,'height'=>-@title_height,'relheight'=>1, 'relwidth'=>1)
-  end
 
   def add_sep(_width=0,_background =@top.background)
     TkLabel.new(@top){||
@@ -507,19 +547,6 @@ class TkTitledFrame < TkFrame
     }
   end
 
-  def add_button(_label,_proc=nil,_image=nil, _side= 'right')
-    TkButton.new(@button_frame){
-      text  _label if _label
-      image  TkPhotoImage.new('dat' => _image) if _image
-      relief 'flat'
-      font 'helvetica 8 bold'
-      #borderwidth 0
-      #background  '#303b50'
-      #background  '#8080ff'
-      pack('side'=> _side,'anchor'=> 'e', 'padx'=>0, 'pady'=>0)
-      bind('1',_proc) if _proc
-    }
-  end
 
   def head_buttons
     @bmaxmin = add_button('[ ]',proc{resize}, W_MAX_GIF)
@@ -601,10 +628,10 @@ class Application
     init_config
     yield(self) if block_given?
   end
-	
-	def Application.instance
-	  @@instance
-	end
+  
+  def Application.instance
+    @@instance
+  end
 
   def init_config
     self['applicationParams'].persistent_file = File.join(local_dir, self['applicationParams'].name+'.pers')
@@ -623,13 +650,13 @@ class Application
     @objs[_name] = _obj
   end
 
-	# this method load arcadia.conf from local directory for personalizations
-	def load_local_config(_create_if_not_exist=true)
-	    local_file_config = File.join(local_dir,File.basename(self['applicationParams'].config_file))
-	    if FileTest.exist?(local_file_config)
-	      self['conf'].update(self.config_file2hash(local_file_config))
-	    elsif _create_if_not_exist
-	      f = File.new(local_file_config, "w")
+  # this method load arcadia.conf from local directory for personalizations
+  def load_local_config(_create_if_not_exist=true)
+      local_file_config = File.join(local_dir,File.basename(self['applicationParams'].config_file))
+      if FileTest.exist?(local_file_config)
+        self['conf'].update(self.config_file2hash(local_file_config))
+      elsif _create_if_not_exist
+        f = File.new(local_file_config, "w")
         begin
           if f
             p = self['conf']
@@ -642,8 +669,8 @@ class Application
         ensure
           f.close unless f.nil?
         end
-	    end
-	end
+      end
+  end
   
   def local_dir
     _local_dir = File.join(ENV["HOME"],'.'+self['applicationParams'].name)  if ENV["HOME"] 
@@ -716,10 +743,10 @@ class Application
 
 
   def load_persist(_persist_file)
-		if _persist_file && !FileTest::exist?(_persist_file)
-			Dir.mkdir(File.dirname(_persist_file)) unless File.exists?(File.dirname(_persist_file))
-			File.new(_persist_file, File::CREAT)
-		end
+    if _persist_file && !FileTest::exist?(_persist_file)
+      Dir.mkdir(File.dirname(_persist_file)) unless File.exists?(File.dirname(_persist_file))
+      File.new(_persist_file, File::CREAT)
+    end
   
     if _persist_file && FileTest::exist?(_persist_file)
       f = File::open(_persist_file,'r')
@@ -783,3 +810,167 @@ class TkApplication < Application
     Tk.mainloop
   end
 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)})
+  end
+
+  def stop_moving
+    @moving_obj.bind_remove("B1-Motion")
+    @moving_obj.bind_remove("ButtonPress-1")
+  end
+  
+  def moving_do_press(_x, _y)
+  		@x0 = _x
+  		@y0 = _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)
+  end
+  
+end
+
+module TkResizabled
+  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)})
+  end
+
+  def stop_resizing
+    @moving_obj.bind_remove("B1-Motion")
+    @moving_obj.bind_remove("ButtonPress-1")
+  end
+  
+  def resizing_do_press(_x, _y)
+  		@x0 = _x
+  		@y0 = _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
+    _width = MIN_WIDTH if _width < MIN_WIDTH
+    _height = MIN_HEIGHT if _height < MIN_HEIGHT
+    @moved_obj.place('width'=>_width, 'height'=>_height)
+  end
+  
+end
+
+
+class TkFloatTitledFrame < TkBaseTitledFrame
+  include TkMovable
+  include TkResizabled
+  def initialize(parent=nil, *args)
+    super(parent)
+    frame.place('height'=>-32)
+    borderwidth  2
+    relief  'groove'
+
+    @top_label = TkLabel.new(@top){
+      background  '#303b50'
+      foreground  'white'
+      anchor 'w'
+    }.pack('fill'=>'x', 'side'=>'top')
+    #.place('x'=>0, 'y'=>0,'relheight'=>1, 'relwidth'=>1 ,'width'=>-20)
+
+    @resizing_label=TkLabel.new(self){
+      #background  '#303b50'
+      text '-'
+      image TkPhotoImage.new('dat'=>EXPAND_LIGHT_GIF)
+    }.pack('side'=> 'right','anchor'=> 's')
+    
+    
+    start_moving(@top_label, self)
+    start_resizing(@resizing_label, self)
+  end
+
+  def title(_text)
+    @top_label.text(_text)
+  end
+
+
+  def on_close=(_proc)
+    add_button('X', _proc, TAB_CLOSE_GIF)
+  end
+  
+  def hide
+    @manager = TkWinfo.manager(self) 
+    if @manager == 'place'
+    		@x_place = TkPlace.info(self)['x']
+    		@y_place = TkPlace.info(self)['y']
+    		@width_place = TkPlace.info(self)['width']
+    		@height_place = TkPlace.info(self)['height']
+    		self.unplace
+    end
+  end
+  
+  def show
+    if @manager == 'place'
+      self.place('x'=>@x_place, 'y'=>@y_place, 'width'=>@width_place, 'height'=>@height_place)
+    end
+  end
+
+  def head_buttons
+  end
+
+end
+
+class TkProgressframe < TkFloatTitledFrame
+  def initialize(parent=nil, _max=100, *args)
+    super(parent)
+    @max = _max
+    @progress = TkVariable.new
+    @progress.value = -1
+    Tk::BWidget::ProgressBar.new(self, :width=>150, :height=>10,
+        :background=>'red',
+        :foreground=>'blue',
+   		   :variable=>@progress,
+     		 :borderwidth=>0,
+      	 :relief=>'flat',
+        :maximum=>_max).place('width' => '150','x' => 25,'y' => 30,'height' => 15)
+     
+    @buttons_frame = TkFrame.new(self).pack('fill'=>'x', 'side'=>'bottom')	
+
+    @b_cancel = TkButton.new(@buttons_frame){|_b_go|
+      default  'disabled'
+      text  'Cancel'
+      overrelief  'raised'
+      justify  'center'
+      pack('side'=>'top','ipadx'=>5, 'padx'=>5)
+    }
+
+    place('x'=>100,'y'=>100,'height'=> 120,'width'=> 200)
+  end
+  
+  def quit
+    #self.destroy
+  end
+  
+  def progress(_incr=1)
+    @progress.numeric += _incr
+  end
+
+  def on_cancel=(_proc)
+    @b_cancel.bind_append('1', _proc)
+  end
+
+  
+end
+

data/conf/arcadia.conf

@@ -73,9 +73,11 @@ toolbar_buttons.run.debugquit.action=debug->debug_quit
 toolbar_buttons.sys=exit
 toolbar_buttons.sys.exit.name=exit
 toolbar_buttons.sys.exit.hint=Exit from Arcadia
-toolbar_buttons.sys.exit.image=EXIT_GIF
+toolbar_buttons.sys.exit.image=EXIT_STORY_GIF
 toolbar_buttons.sys.exit.action=arcadia->do_exit
 
+toolbar_show=yes
+
 #:::::::::::::::: Libraries group ::::::::::::::::::::::<begin>
 
 # this section is for the components pallets of the wrapped class
@@ -146,11 +148,11 @@ i386-mswin32::splash.banner.font=Ariel 8 italic
 #:::::::::::::::: splash group    ::::::::::::::::::::::<begin>
 
 #:::::::::::::::: main group    ::::::::::::::::::::::<begin>
-main.mainmenu.font=courier 9
+main.mainmenu.font=courier 12
 i386-freebsd6::main.mainmenu.font=courier 12
 i386-mswin32::main.mainmenu.font=Ariel 8
-main.font=courier 9
-main.font.bold=courier 9 bold
+main.font=courier 12
+main.font.bold=courier 12 bold
 i386-freebsd6::main.font=courier 12
 i386-freebsd6::main.font=courier 12 bold
 i386-mswin32::main.font=Ariel 8
@@ -160,39 +162,41 @@ i386-mswin32::main.component.font=Ariel 8
 #:::::::::::::::: main group    ::::::::::::::::::::::<end>
 
 #:::::::::::::::: inspector group    ::::::::::::::::::::::<begin>
-inspectors.tabs.font=courier 9
+inspectors.tabs.font=courier 12
 i386-mswin32::inspectors.tabs.font=Ariel 8
 i386-freebsd6::inspectors.tabs.font=courier 12
 inspectors.tabs.side=top
-inspectors.inspector.tabs.font=courier 9
+inspectors.inspector.tabs.font=courier 12
 i386-freebsd6::inspectors.inspector.tabs.font=courier 12
 i386-mswin32::inspectors.inspector.tabs.font=Ariel 8
 inspectors.inspector.tabs.side=top
-inspectors.inspector.key.font=courier 9
-inspectors.inspector.value.font=courier 9
+inspectors.inspector.key.font=courier 12
+inspectors.inspector.value.font=courier 12
 i386-freebsd6::inspectors.inspector.key.font=courier 12
 i386-freebsd6::inspectors.inspector.value.font=courier 12
 i386-mswin32::inspectors.inspector.key.font=Ariel 8
 i386-mswin32::inspectors.inspector.value.font=Ariel 8
-inspectors.inspector.tree.font=courier 9
+inspectors.inspector.tree.font=courier 12
 i386-mswin32::inspectors.inspector.tree.font=Ariel 8
 
-inspectors.debug.tabs.font=courier 9
+inspectors.debug.tabs.font=courier 12
+inspectors.debug.tabs.font.bold=courier 12 bold
 i386-freebsd6::inspectors.debug.tabs.font=courier 12
-i386-mswin32::inspectors.debug.tabs.font=courier 8
-inspectors.debug.tabs.font.bold=courier 9 bold
 i386-freebsd6::inspectors.debug.tabs.font.bold=courier 12 bold
+i386-mswin32::inspectors.debug.tabs.font=courier 8
 i386-mswin32::inspectors.debug.tabs.font.bold=courier 8 bold
 #:::::::::::::::: inspector group    ::::::::::::::::::::::<end>
 
 
 
 #:::::::::::::::: all  ::::::::::::::::::::::<begin>
-all.frame.title.font=courier 9
-all.frame.title.font.bold=courier 9 bold
-all.frame.title.font.italic=courier 9 italic
+all.frame.title.font=courier 12
+all.frame.title.font.bold=courier 12 bold
+all.frame.title.font.italic=courier 12 italic
 i386-freebsd6::all.frame.title.font=courier 12
 i386-freebsd6::all.frame.title.font.bold=courier 12 bold
 i386-freebsd6::all.frame.title.font.italic=courier 12 italic
-i386-mswin32::all.frame.title.font=Ariel 8
+i386-mswin32::all.frame.title.font=courier 9
+i386-mswin32::all.frame.title.font.bold=courier 9 bold
+i386-mswin32::all.frame.title.font.italic=courier 9 italic
 #:::::::::::::::: all  ::::::::::::::::::::::<end>