28 files changed, 79 insertions, 28 deletions
diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt
index 13b41a2e3c..685f5736fb 100644
--- a/gr-blocks/CMakeLists.txt
+++ b/gr-blocks/CMakeLists.txt
@@ -87,6 +87,7 @@ add_subdirectory(lib)
 #endif(ENABLE_TESTING)
 if(ENABLE_PYTHON)
      add_subdirectory(python/blocks)
+     add_subdirectory(python/grc_gnuradio)
      add_subdirectory(swig)
      add_subdirectory(grc)
      add_subdirectory(doc)
diff --git a/grc/blocks/blks2_error_rate.xml b/gr-blocks/grc/blks2_error_rate.xml
index 91a303206d..8be018243f 100644
--- a/grc/blocks/blks2_error_rate.xml
+++ b/gr-blocks/grc/blks2_error_rate.xml
@@ -8,6 +8,7 @@
 <block>
 	<name>Error Rate</name>
 	<key>blks2_error_rate</key>
+	<category>Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.error_rate(
 	type=$type,
diff --git a/grc/blocks/blks2_selector.xml b/gr-blocks/grc/blks2_selector.xml
index 2d89df1860..580fdd9d8c 100644
--- a/grc/blocks/blks2_selector.xml
+++ b/gr-blocks/grc/blks2_selector.xml
@@ -8,6 +8,7 @@
 <block>
 	<name>Selector</name>
 	<key>blks2_selector</key>
+	<category>Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.selector(
 	item_size=$type.size*$vlen,
diff --git a/grc/blocks/blks2_tcp_sink.xml b/gr-blocks/grc/blks2_tcp_sink.xml
index cfe7b42d84..46b10a7790 100644
--- a/grc/blocks/blks2_tcp_sink.xml
+++ b/gr-blocks/grc/blks2_tcp_sink.xml
@@ -7,6 +7,7 @@
 <block>
 	<name>TCP Sink</name>
 	<key>blks2_tcp_sink</key>
+	<category>Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.tcp_sink(
 	itemsize=$type.size*$vlen,
diff --git a/grc/blocks/blks2_tcp_source.xml b/gr-blocks/grc/blks2_tcp_source.xml
index 6bf742aa00..6a59522f3f 100644
--- a/grc/blocks/blks2_tcp_source.xml
+++ b/gr-blocks/grc/blks2_tcp_source.xml
@@ -7,6 +7,7 @@
 <block>
 	<name>TCP Source</name>
 	<key>blks2_tcp_source</key>
+	<category>Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.tcp_source(
 	itemsize=$type.size*$vlen,
diff --git a/grc/blocks/blks2_valve.xml b/gr-blocks/grc/blks2_valve.xml
index 47c553523f..d879ff655f 100644
--- a/grc/blocks/blks2_valve.xml
+++ b/gr-blocks/grc/blks2_valve.xml
@@ -8,6 +8,7 @@
 <block>
 	<name>Valve</name>
 	<key>blks2_valve</key>
+	<category>Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.valve(item_size=$type.size*$vlen, open=bool($open))</make>
 	<callback>set_open(bool($open))</callback>
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml
index f35815b4dd..bfab41aeb6 100644
--- a/gr-blocks/grc/blocks_block_tree.xml
+++ b/gr-blocks/grc/blocks_block_tree.xml
@@ -29,7 +29,7 @@
 <cat>
    <name></name> <!-- Blank for Root Name -->
    <cat>
-           <name>Audio</name>
+      <name>Audio</name>
       <block>blocks_wavfile_source</block>
       <block>blocks_wavfile_sink</block>
    </cat>
@@ -230,4 +230,9 @@
       <name>Variables</name>
       <block>variable_tag_object</block>
    </cat>
+   <cat>
+      <name>Misc</name>
+      <block>xmlrpc_server</block>
+      <block>xmlrpc_client</block>
+   </cat>
 </cat>
diff --git a/grc/blocks/xmlrpc_client.xml b/gr-blocks/grc/xmlrpc_client.xml
index dc4d154d14..dc4d154d14 100644
--- a/grc/blocks/xmlrpc_client.xml
+++ b/gr-blocks/grc/xmlrpc_client.xml
diff --git a/grc/blocks/xmlrpc_server.xml b/gr-blocks/grc/xmlrpc_server.xml
index 602d444161..602d444161 100644
--- a/grc/blocks/xmlrpc_server.xml
+++ b/gr-blocks/grc/xmlrpc_server.xml
diff --git a/grc/grc_gnuradio/CMakeLists.txt b/gr-blocks/python/grc_gnuradio/CMakeLists.txt
index e992a60a39..9ff1240997 100644
--- a/grc/grc_gnuradio/CMakeLists.txt
+++ b/gr-blocks/python/grc_gnuradio/CMakeLists.txt
@@ -18,18 +18,20 @@
 # Boston, MA 02110-1301, USA.
 
 ########################################################################
+
+include(GrPython)
+
 GR_PYTHON_INSTALL(
     FILES __init__.py
     DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio
-    COMPONENT "grc"
+    COMPONENT "blocks_python"
 )
 
 GR_PYTHON_INSTALL(FILES
     blks2/__init__.py
     blks2/error_rate.py
-    blks2/packet.py
     blks2/selector.py
     blks2/tcp.py
     DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/blks2
-    COMPONENT "grc"
+    COMPONENT "blocks_python"
 )
diff --git a/grc/grc_gnuradio/README b/gr-blocks/python/grc_gnuradio/README
index 897eed65ca..897eed65ca 100644
--- a/grc/grc_gnuradio/README
+++ b/gr-blocks/python/grc_gnuradio/README
diff --git a/grc/grc_gnuradio/__init__.py b/gr-blocks/python/grc_gnuradio/__init__.py
index 8b13789179..8b13789179 100644
--- a/grc/grc_gnuradio/__init__.py
+++ b/gr-blocks/python/grc_gnuradio/__init__.py
diff --git a/grc/grc_gnuradio/blks2/__init__.py b/gr-blocks/python/grc_gnuradio/blks2/__init__.py
index e6941ab91b..d3c8210834 100644
--- a/grc/grc_gnuradio/blks2/__init__.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/__init__.py
@@ -19,8 +19,12 @@
 #
 
 from selector import selector, valve
-from packet import options, packet_encoder, packet_decoder, \
-    packet_mod_b, packet_mod_s, packet_mod_i, packet_mod_f, packet_mod_c, \
-    packet_demod_b, packet_demod_s, packet_demod_i, packet_demod_f, packet_demod_c
 from error_rate import error_rate
 from tcp import tcp_source, tcp_sink
+
+try:
+    from packet import options, packet_encoder, packet_decoder, \
+        packet_mod_b, packet_mod_s, packet_mod_i, packet_mod_f, packet_mod_c, \
+        packet_demod_b, packet_demod_s, packet_demod_i, packet_demod_f, packet_demod_c
+except ImportError:
+    pass  # only available if gr-digital is install
diff --git a/grc/grc_gnuradio/blks2/error_rate.py b/gr-blocks/python/grc_gnuradio/blks2/error_rate.py
index 9bf387030a..9bf387030a 100644
--- a/grc/grc_gnuradio/blks2/error_rate.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/error_rate.py
diff --git a/grc/grc_gnuradio/blks2/selector.py b/gr-blocks/python/grc_gnuradio/blks2/selector.py
index 24e3844658..24e3844658 100644
--- a/grc/grc_gnuradio/blks2/selector.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/selector.py
diff --git a/grc/grc_gnuradio/blks2/tcp.py b/gr-blocks/python/grc_gnuradio/blks2/tcp.py
index aee90fad2c..aee90fad2c 100644
--- a/grc/grc_gnuradio/blks2/tcp.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/tcp.py
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
index 7a9f8f6c48..c6fa0798d1 100644
--- a/gr-digital/CMakeLists.txt
+++ b/gr-digital/CMakeLists.txt
@@ -97,6 +97,7 @@ add_subdirectory(doc)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/digital)
+    add_subdirectory(python/grc_gnuradio)
     add_subdirectory(grc)
     add_subdirectory(examples)
 endif(ENABLE_PYTHON)
diff --git a/grc/blocks/blks2_packet_decoder.xml b/gr-digital/grc/blks2_packet_decoder.xml
index 07b0d1f2eb..c3672450ea 100644
--- a/grc/blocks/blks2_packet_decoder.xml
+++ b/gr-digital/grc/blks2_packet_decoder.xml
@@ -7,6 +7,7 @@
 <block>
 	<name>Packet Decoder</name>
 	<key>blks2_packet_decoder</key>
+	<category>Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.packet_demod_$(type.fcn)(grc_blks2.packet_decoder(
 		access_code=$access_code,
diff --git a/grc/blocks/blks2_packet_encoder.xml b/gr-digital/grc/blks2_packet_encoder.xml
index 88e1ba350c..92de9c9570 100644
--- a/grc/blocks/blks2_packet_encoder.xml
+++ b/gr-digital/grc/blks2_packet_encoder.xml
@@ -7,6 +7,7 @@
 <block>
 	<name>Packet Encoder</name>
 	<key>blks2_packet_encoder</key>
+	<category>Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.packet_mod_$(type.fcn)(grc_blks2.packet_encoder(
 		samples_per_symbol=$samples_per_symbol,
diff --git a/gr-digital/python/grc_gnuradio/CMakeLists.txt b/gr-digital/python/grc_gnuradio/CMakeLists.txt
new file mode 100644
index 0000000000..f021299f1a
--- /dev/null
+++ b/gr-digital/python/grc_gnuradio/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+
+include(GrPython)
+
+# __init__ files come from gr-blocks
+
+GR_PYTHON_INSTALL(FILES
+    blks2/packet.py
+    DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/blks2
+    COMPONENT "digital_python"
+)
diff --git a/grc/grc_gnuradio/blks2/packet.py b/gr-digital/python/grc_gnuradio/blks2/packet.py
index ef79afde64..ef79afde64 100644
--- a/grc/grc_gnuradio/blks2/packet.py
+++ b/gr-digital/python/grc_gnuradio/blks2/packet.py
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 859b9e9045..d05ab51203 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -136,7 +136,6 @@ endif(WIN32)
 add_subdirectory(base)
 add_subdirectory(blocks)
 add_subdirectory(freedesktop)
-add_subdirectory(grc_gnuradio)
 add_subdirectory(gui)
 add_subdirectory(python)
 add_subdirectory(scripts)
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index d07c52e9c5..a8775d6872 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -20,23 +20,6 @@
 
       <block>note</block>
       <block>import</block>
-
-      <block>blks2_selector</block>
-      <block>blks2_valve</block>
-      <block>blks2_error_rate</block>
-
-      <block>xmlrpc_server</block>
-      <block>xmlrpc_client</block>
-   </cat>
-   <cat>
-      <name>Networking Tools</name>
-      <block>blks2_tcp_source</block>
-      <block>blks2_tcp_sink</block>
-   </cat>
-   <cat>
-      <name>Packet Operators</name>
-      <block>blks2_packet_decoder</block>
-      <block>blks2_packet_encoder</block>
    </cat>
    <cat>
       <name>Variables</name>
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index 0f227d08f5..8812704b26 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@ -143,6 +143,7 @@ class ActionHandler:
                 Actions.TOGGLE_SHOW_CODE_PREVIEW_TAB,
                 Actions.TOGGLE_SHOW_FLOWGRAPH_COMPLEXITY,
                 Actions.FLOW_GRAPH_OPEN_QSS_THEME,
+                Actions.SELECT_ALL,
             ):
                 action.set_sensitive(True)
                 if hasattr(action, 'load_from_preferences'):
@@ -162,6 +163,8 @@ class ActionHandler:
             pass #do nothing, update routines below
         elif action == Actions.NOTHING_SELECT:
             self.get_flow_graph().unselect()
+        elif action == Actions.SELECT_ALL:
+            self.get_flow_graph().select_all()
         ##################################################
         # Enable/Disable
         ##################################################
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py
index d53375f291..354e536a82 100644
--- a/grc/gui/Actions.py
+++ b/grc/gui/Actions.py
@@ -226,6 +226,12 @@ FLOW_GRAPH_REDO = Action(
     keypresses=(gtk.keysyms.y, gtk.gdk.CONTROL_MASK),
 )
 NOTHING_SELECT = Action()
+SELECT_ALL = Action(
+    label='Select _All',
+    tooltip='Select all blocks and connections in the flow graph',
+    stock_id=gtk.STOCK_SELECT_ALL,
+    keypresses=(gtk.keysyms.a, gtk.gdk.CONTROL_MASK),
+)
 ELEMENT_SELECT = Action()
 ELEMENT_CREATE = Action()
 ELEMENT_DELETE = Action(
diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py
index 19f041f508..259aa6ed8b 100644
--- a/grc/gui/Bars.py
+++ b/grc/gui/Bars.py
@@ -82,6 +82,7 @@ MENU_BAR_LIST = (
         Actions.BLOCK_COPY,
         Actions.BLOCK_PASTE,
         Actions.ELEMENT_DELETE,
+        Actions.SELECT_ALL,
         None,
         Actions.BLOCK_ROTATE_CCW,
         Actions.BLOCK_ROTATE_CW,
diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py
index 63fd841218..e940661a1d 100644
--- a/grc/gui/FlowGraph.py
+++ b/grc/gui/FlowGraph.py
@@ -49,7 +49,7 @@ class FlowGraph(Element):
         #important vars dealing with mouse event tracking
         self.element_moved = False
         self.mouse_pressed = False
-        self.unselect()
+        self._selected_elements = []
         self.press_coor = (0, 0)
         #selected ports
         self._old_selected_port = None
@@ -429,6 +429,10 @@ class FlowGraph(Element):
         """
         self._selected_elements = []
 
+    def select_all(self):
+        """Select all blocks in the flow graph"""
+        self._selected_elements = list(self.get_elements())
+
     def what_is_selected(self, coor, coor_m=None):
         """
         What is selected?
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index bd8025b676..ecdb89390e 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -274,8 +274,8 @@ gr.io_signaturev($(len($io_sigs)), $(len($io_sigs)), [$(', '.join($size_strs))])
         self.settings = Qt.QSettings("GNU Radio", "$class_name")
         self.settings.setValue("geometry", self.saveGeometry())
         event.accept()
-
     #if $flow_graph.get_option('qt_qss_theme')
+
     def setStyleSheetFromFile(self, filename):
         try:
             if not os.path.exists(filename):
@@ -336,7 +336,12 @@ $short_id#slurp
 
 
 def argument_parser():
-    parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
+    #set $desc_args = 'usage="%prog: [options]", option_class=eng_option'
+    #if $flow_graph.get_option('description')
+        #set $desc_args += ', description=description'
+    description = $repr($flow_graph.get_option('description'))
+    #end if
+    parser = OptionParser($desc_args)
     #for $param in $parameters
         #set $type = $param.get_param('type').get_value()
         #if $type