r20399 - in /branches/relax_disp: ./ graphics/oxygen_icons/16x16/actions/ graphics/oxygen_icons/22x22/actions/ graphics/oxyg... -- July 18, 2013 - 20:10

Author: bugman
Date: Thu Jul 18 20:10:42 2013
New Revision: 20399

URL: http://svn.gna.org/viewcvs/relax?rev=20399&view=rev
Log:
Merged revisions 20396-20398 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20396 | bugman | 2013-07-18 20:07:24 +0200 (Thu, 18 Jul 2013) | 5 lines
  
  Added some Oxygen icons for a boolean GUI input element.
  
  The media-record-relax-green.png files are the media-record.png files with 
the hue set to 117.
........
  r20397 | bugman | 2013-07-18 20:08:05 +0200 (Thu, 18 Jul 2013) | 5 lines
  
  Created a boolean input element for the auto-analyses of the GUI.
  
  This simply turns on and off.
........
  r20398 | bugman | 2013-07-18 20:10:18 +0200 (Thu, 18 Jul 2013) | 3 lines
  
  Fix for the new boolean GUI auto-analysis element.
........

Added:
    
branches/relax_disp/graphics/oxygen_icons/16x16/actions/media-record-relax-green.png
      - copied unchanged from r20398, 
trunk/graphics/oxygen_icons/16x16/actions/media-record-relax-green.png
    branches/relax_disp/graphics/oxygen_icons/16x16/actions/media-record.png
      - copied unchanged from r20398, 
trunk/graphics/oxygen_icons/16x16/actions/media-record.png
    
branches/relax_disp/graphics/oxygen_icons/22x22/actions/media-record-relax-green.png
      - copied unchanged from r20398, 
trunk/graphics/oxygen_icons/22x22/actions/media-record-relax-green.png
    branches/relax_disp/graphics/oxygen_icons/22x22/actions/media-record.png
      - copied unchanged from r20398, 
trunk/graphics/oxygen_icons/22x22/actions/media-record.png
    
branches/relax_disp/graphics/oxygen_icons/32x32/actions/media-record-relax-green.png
      - copied unchanged from r20398, 
trunk/graphics/oxygen_icons/32x32/actions/media-record-relax-green.png
    branches/relax_disp/graphics/oxygen_icons/32x32/actions/media-record.png
      - copied unchanged from r20398, 
trunk/graphics/oxygen_icons/32x32/actions/media-record.png
    
branches/relax_disp/graphics/oxygen_icons/48x48/actions/media-record-relax-green.png
      - copied unchanged from r20398, 
trunk/graphics/oxygen_icons/48x48/actions/media-record-relax-green.png
    branches/relax_disp/graphics/oxygen_icons/48x48/actions/media-record.png
      - copied unchanged from r20398, 
trunk/graphics/oxygen_icons/48x48/actions/media-record.png
    branches/relax_disp/gui/analyses/elements/bool_element.py
      - copied unchanged from r20398, 
trunk/gui/analyses/elements/bool_element.py
Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/analyses/elements/__init__.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 18 20:10:42 2013
@@ -1,1 +1,1 @@
-/trunk:1-20394
+/trunk:1-20398

Modified: branches/relax_disp/gui/analyses/elements/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/elements/__init__.py?rev=20399&r1=20398&r2=20399&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/elements/__init__.py (original)
+++ branches/relax_disp/gui/analyses/elements/__init__.py Thu Jul 18 20:10:42 
2013
@@ -24,6 +24,7 @@
 
 # The package contents.
 __all__ = [
+    'bool_element',
     'model_list',
     'spin_element',
     'text_element'