[Commit-gnuradio] r8168 - in grc/branches/grc_reloaded/src: grc grc/gui/elements grc_gnuradio/blocks

[jblum]

Author: jblum
Date: 2008-04-09 14:26:56 -0600 (Wed, 09 Apr 2008)
New Revision: 8168

Modified:
   grc/branches/grc_reloaded/src/grc/Preferences.py
   grc/branches/grc_reloaded/src/grc/gui/elements/Block.py
   grc/branches/grc_reloaded/src/grc_gnuradio/blocks/preferences.xml
Log:
hide id pref

Modified: grc/branches/grc_reloaded/src/grc/Preferences.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/Preferences.py    2008-04-09 19:50:10 UTC 
(rev 8167)
+++ grc/branches/grc_reloaded/src/grc/Preferences.py    2008-04-09 20:26:56 UTC 
(rev 8168)
@@ -44,6 +44,7 @@
 window_size_param = block.get_param('window_size')
 files_open_param = block.get_param('files_open')
 show_params_param = block.get_param('show_params')
+show_id_param = block.get_param('show_id')
 
 ##Preferences: title, notes, params
 PREFERENCES = [
@@ -58,10 +59,11 @@
        (
                'Appearance', 
                '''
-Show or hide the reports window at the bottom of the main window. \
-Show or hide the paramater labels in the signal blocks.
+Show or hide the reports window at the bottom of the main window. 
+Show or hide all paramater labels in the signal blocks.
+Show or hide the ID label in the signal blocks.
 ''', 
-               [show_reports_param, show_params_param],
+               [show_reports_param, show_params_param, show_id_param],
        ),
        (
                'Misc', 
@@ -125,3 +127,7 @@
        
 def show_params():
        return show_params_param.get_value() == 'show'
+       
+def show_id():
+       return show_id_param.get_value() == 'show'
+

Modified: grc/branches/grc_reloaded/src/grc/gui/elements/Block.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/elements/Block.py     2008-04-09 
19:50:10 UTC (rev 8167)
+++ grc/branches/grc_reloaded/src/grc/gui/elements/Block.py     2008-04-09 
20:26:56 UTC (rev 8168)
@@ -128,7 +128,9 @@
                #display the params (except for the special params id and 
position)
                from grc import Preferences
                if Preferences.show_params():
-                       for param in filter(lambda p: p.get_key() not in 
('gui_coordinate', 'gui_rotation'), self.get_params()):
+                       hidden_prefs = ['gui_coordinate', 'gui_rotation']
+                       if not Preferences.show_id(): hidden_prefs.append('id')
+                       for param in filter(lambda p: p.get_key() not in 
hidden_prefs, self.get_params()):
                                layout = param.get_layout()
                                layouts.append(layout)
                                w,h = layout.get_pixel_size()

Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/preferences.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/preferences.xml   
2008-04-09 19:50:10 UTC (rev 8167)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/preferences.xml   
2008-04-09 20:26:56 UTC (rev 8168)
@@ -74,24 +74,24 @@
                        <key>hide</key>         
                </option>
        </param>
-       <!-- Misc Prefs -->
+       <!-- Appearance Prefs -->
        <param>
-               <name>Restore Open Files</name>
-               <key>restore_files</key>
-               <value>yes</value>
+               <name>Show Reports Window</name>
+               <key>show_reports</key>
+               <value>show</value>
                <type>enum</type>
                <option>
-                       <name>Yes</name>
-                       <key>yes</key>          
+                       <name>Show</name>
+                       <key>show</key>         
                </option>
                <option>
-                       <name>No</name>
-                       <key>no</key>           
+                       <name>Hide</name>
+                       <key>hide</key>         
                </option>
        </param>
        <param>
-               <name>Show Reports Window</name>
-               <key>show_reports</key>
+               <name>Show Params Labels</name>
+               <key>show_params</key>
                <value>show</value>
                <type>enum</type>
                <option>
@@ -104,8 +104,8 @@
                </option>
        </param>
        <param>
-               <name>Show Params Labels</name>
-               <key>show_params</key>
+               <name>Show ID Label</name>
+               <key>show_id</key>
                <value>show</value>
                <type>enum</type>
                <option>
@@ -117,4 +117,19 @@
                        <key>hide</key>         
                </option>
        </param>
+       <!-- Misc Prefs -->
+       <param>
+               <name>Restore Open Files</name>
+               <key>restore_files</key>
+               <value>yes</value>
+               <type>enum</type>
+               <option>
+                       <name>Yes</name>
+                       <key>yes</key>          
+               </option>
+               <option>
+                       <name>No</name>
+                       <key>no</key>           
+               </option>
+       </param>
 </block>