57 files changed, 37 insertions, 108 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 859b9e9045..e21f6b2d22 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -133,9 +133,7 @@ endif(WIN32)
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(base)
 add_subdirectory(blocks)
-add_subdirectory(freedesktop)
 add_subdirectory(grc_gnuradio)
 add_subdirectory(gui)
 add_subdirectory(python)
diff --git a/grc/cpp/README b/grc/cpp/README
deleted file mode 100644
index 3eccc5dbf7..0000000000
--- a/grc/cpp/README
+++ /dev/null
@@ -1,5 +0,0 @@
-GRC could be used to generate c++ based flowgraphs:
-
-* A few base and gui classes would be overridden.
-* Block info could be extracted from the doxygen xml.
-* New flowgraph templates would be designed.
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index 726784f7cf..a5081dadc2 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@ -27,9 +27,8 @@ pygtk.require('2.0')
 import gtk
 import gobject
 
-from grc.python.base import Constants
-from grc.python.base import ParseXML
-from .. python.Constants import XTERM_EXECUTABLE
+from ..model.base import Constants, ParseXML
+from .. model.Constants import XTERM_EXECUTABLE
 
 from . import Dialogs, Messages, Preferences, Actions
 from .ParserErrorsDialog import ParserErrorsDialog
diff --git a/grc/gui/Block.py b/grc/gui/Block.py
index f961c2281e..aab1cab5a6 100644
--- a/grc/gui/Block.py
+++ b/grc/gui/Block.py
@@ -18,24 +18,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
 import pygtk
-
-import Actions
-import Colors
-import Utils
-from Constants import (
-    BLOCK_LABEL_PADDING, PORT_SPACING, PORT_SEPARATION, LABEL_SEPARATION,
-    PORT_BORDER_SEPARATION, POSSIBLE_ROTATIONS, BLOCK_FONT, PARAM_FONT
-)
-from Constants import BORDER_PROXIMITY_SENSITIVITY
-from Element import Element
-from grc.python.base import odict
-from .. python.Param import num_to_str
-
 pygtk.require('2.0')
 import gtk
 import pango
 
-from ..python.Block import Block as _Block
+from . import Actions, Colors, Utils
+
+from .Constants import (
+    BLOCK_LABEL_PADDING, PORT_SPACING, PORT_SEPARATION, LABEL_SEPARATION,
+    PORT_BORDER_SEPARATION, POSSIBLE_ROTATIONS, BLOCK_FONT, PARAM_FONT,
+    BORDER_PROXIMITY_SENSITIVITY
+)
+from . Element import Element
+from ..model.base import odict
+from ..model.Param import num_to_str
+
+from ..model.Block import Block as _Block
 
 BLOCK_MARKUP_TMPL="""\
 #set $foreground = $block.is_valid() and 'black' or 'red'
diff --git a/grc/gui/Connection.py b/grc/gui/Connection.py
index 9a7777434d..241ada88af 100644
--- a/grc/gui/Connection.py
+++ b/grc/gui/Connection.py
@@ -24,8 +24,8 @@ import Utils
 from Constants import CONNECTOR_ARROW_BASE, CONNECTOR_ARROW_HEIGHT
 from Element import Element
 
-from ..python.base.Constants import GR_MESSAGE_DOMAIN
-from ..python.Connection import Connection as _Connection
+from ..model.base.Constants import GR_MESSAGE_DOMAIN
+from ..model.Connection import Connection as _Connection
 
 
 class Connection(Element, _Connection):
diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py
index 9cd8067966..e975595c11 100644
--- a/grc/gui/FlowGraph.py
+++ b/grc/gui/FlowGraph.py
@@ -30,7 +30,7 @@ from . Element import Element
 from . Constants import SCROLL_PROXIMITY_SENSITIVITY, SCROLL_DISTANCE
 from . external_editor import ExternalEditor
 
-from ..python.FlowGraph import FlowGraph as _Flowgraph
+from ..model.FlowGraph import FlowGraph as _Flowgraph
 
 
 class FlowGraph(Element, _Flowgraph):
diff --git a/grc/gui/Param.py b/grc/gui/Param.py
index ddfbdcbb1a..fed747b4f3 100644
--- a/grc/gui/Param.py
+++ b/grc/gui/Param.py
@@ -26,7 +26,7 @@ import gtk
 from . import Colors, Utils, Constants, Dialogs
 from .Element import Element
 
-from ..python.Param import Param as _Param
+from ..model.Param import Param as _Param
 
 
 class InputParam(gtk.HBox):
diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py
index fa0bcf65ea..af54e498d3 100644
--- a/grc/gui/Platform.py
+++ b/grc/gui/Platform.py
@@ -22,8 +22,8 @@ import sys
 
 from .Element import Element
 
-from ..python.Platform import Platform as _Platform
-from ..python.Constants import PREFS_FILE, PREFS_FILE_OLD
+from ..model.Platform import Platform as _Platform
+from ..model.Constants import PREFS_FILE, PREFS_FILE_OLD
 
 from .Block import Block as _Block
 from .FlowGraph import FlowGraph as _FlowGraph
diff --git a/grc/gui/Port.py b/grc/gui/Port.py
index 849465fc69..23d41dad18 100644
--- a/grc/gui/Port.py
+++ b/grc/gui/Port.py
@@ -27,9 +27,9 @@ from .Constants import (
     CONNECTOR_EXTENSION_INCREMENT, PORT_LABEL_PADDING, PORT_MIN_WIDTH, PORT_LABEL_HIDDEN_WIDTH, PORT_FONT
 )
 from .Element import Element
-from ..python.base.Constants import DEFAULT_DOMAIN, GR_MESSAGE_DOMAIN
+from ..model.base.Constants import DEFAULT_DOMAIN, GR_MESSAGE_DOMAIN
 
-from ..python.Port import Port as _Port
+from ..model.Port import Port as _Port
 
 PORT_MARKUP_TMPL="""\
 <span foreground="black" font_desc="$font">$encode($port.get_name())</span>"""
diff --git a/grc/python/Block.py b/grc/model/Block.py
index aaf65fbddf..aaf65fbddf 100644
--- a/grc/python/Block.py
+++ b/grc/model/Block.py
diff --git a/grc/python/CMakeLists.txt b/grc/model/CMakeLists.txt
index 3f9e273146..123bad2674 100644
--- a/grc/python/CMakeLists.txt
+++ b/grc/model/CMakeLists.txt
@@ -42,3 +42,5 @@ install(FILES
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/python
     COMPONENT "grc"
 )
+
+add_subdirectory(base)
diff --git a/grc/python/Connection.py b/grc/model/Connection.py
index e5b4c2563b..e5b4c2563b 100644
--- a/grc/python/Connection.py
+++ b/grc/model/Connection.py
diff --git a/grc/python/Constants.py b/grc/model/Constants.py
index b7a370cad7..b7a370cad7 100644
--- a/grc/python/Constants.py
+++ b/grc/model/Constants.py
diff --git a/grc/python/FlowGraph.py b/grc/model/FlowGraph.py
index 002740ac9d..ccd60e117b 100644
--- a/grc/python/FlowGraph.py
+++ b/grc/model/FlowGraph.py
@@ -23,6 +23,7 @@ from operator import methodcaller
 from . import expr_utils
 from .base.FlowGraph import FlowGraph as _FlowGraph
 
+
 _variable_matcher = re.compile('^(variable\w*)$')
 _parameter_matcher = re.compile('^(parameter)$')
 _monitors_searcher = re.compile('(ctrlport_monitor)')
diff --git a/grc/python/Generator.py b/grc/model/Generator.py
index 5d6de35077..2e9553fb64 100644
--- a/grc/python/Generator.py
+++ b/grc/model/Generator.py
@@ -27,13 +27,16 @@ import re  # for shlex_quote
 from distutils.spawn import find_executable
 
 from Cheetah.Template import Template
-from .base import odict
+
+from .base import odict, ParseXML
 from .base.Constants import BLOCK_FLAG_NEED_QT_GUI
 
-from .base import ParseXML
 from . import expr_utils
-from . Constants import TOP_BLOCK_FILE_MODE, FLOW_GRAPH_TEMPLATE, \
+from . Constants import (
+    TOP_BLOCK_FILE_MODE, FLOW_GRAPH_TEMPLATE,
     XTERM_EXECUTABLE, HIER_BLOCK_FILE_MODE, HIER_BLOCKS_LIB_DIR, BLOCK_DTD
+)
+
 from .. gui import Messages
 
 
diff --git a/grc/python/Param.py b/grc/model/Param.py
index b627e5eec8..b627e5eec8 100644
--- a/grc/python/Param.py
+++ b/grc/model/Param.py
diff --git a/grc/python/Platform.py b/grc/model/Platform.py
index e6b17fe3f7..e6b17fe3f7 100644
--- a/grc/python/Platform.py
+++ b/grc/model/Platform.py
diff --git a/grc/python/Port.py b/grc/model/Port.py
index 8466f4f97c..8466f4f97c 100644
--- a/grc/python/Port.py
+++ b/grc/model/Port.py
diff --git a/grc/python/__init__.py b/grc/model/__init__.py
index 8b13789179..8b13789179 100644
--- a/grc/python/__init__.py
+++ b/grc/model/__init__.py
diff --git a/grc/python/base/Block.py b/grc/model/base/Block.py
index 77c3145173..32aac84b83 100644
--- a/grc/python/base/Block.py
+++ b/grc/model/base/Block.py
@@ -33,7 +33,7 @@ class TemplateArg(UserDict):
     A cheetah template argument created from a param.
     The str of this class evaluates to the param's to code method.
     The use of this class as a dictionary (enum only) will reveal the enum opts.
-    The __call__ or () method can return the param evaluated to a raw python data type.
+    The __call__ or () method can return the param evaluated to a raw model data type.
     """
 
     def __init__(self, param):
diff --git a/grc/python/base/CMakeLists.txt b/grc/model/base/CMakeLists.txt
index bdc8a5006f..bdc8a5006f 100644
--- a/grc/python/base/CMakeLists.txt
+++ b/grc/model/base/CMakeLists.txt
diff --git a/grc/python/base/Connection.py b/grc/model/base/Connection.py
index 8df0f5ad53..8df0f5ad53 100644
--- a/grc/python/base/Connection.py
+++ b/grc/model/base/Connection.py
diff --git a/grc/python/base/Constants.py b/grc/model/base/Constants.py
index 1e83de63b5..1e83de63b5 100644
--- a/grc/python/base/Constants.py
+++ b/grc/model/base/Constants.py
diff --git a/grc/python/base/Element.py b/grc/model/base/Element.py
index 3b604a5340..3b604a5340 100644
--- a/grc/python/base/Element.py
+++ b/grc/model/base/Element.py
diff --git a/grc/python/base/FlowGraph.py b/grc/model/base/FlowGraph.py
index 42faab6a16..40b4e37ccf 100644
--- a/grc/python/base/FlowGraph.py
+++ b/grc/model/base/FlowGraph.py
@@ -21,7 +21,7 @@ import time
 from operator import methodcaller
 from itertools import ifilter
 
-from grc.gui import Messages
+# from ..FlowGraph import Messages
 
 from . import odict
 from .Element import Element
@@ -371,7 +371,7 @@ class FlowGraph(Element):
                 block = self.get_new_block('dummy_block')
                 # Ugly ugly ugly
                 _initialize_dummy_block(block, block_n)
-                Messages.send_error_msg_load('Block key "%s" not found' % key)
+                print('Block key "%s" not found' % key)
 
             block.import_data(block_n)
 
diff --git a/grc/python/base/Param.py b/grc/model/base/Param.py
index b246d9f759..b246d9f759 100644
--- a/grc/python/base/Param.py
+++ b/grc/model/base/Param.py
diff --git a/grc/python/base/ParseXML.py b/grc/model/base/ParseXML.py
index 2d5fed0862..2d5fed0862 100644
--- a/grc/python/base/ParseXML.py
+++ b/grc/model/base/ParseXML.py
diff --git a/grc/python/base/Platform.py b/grc/model/base/Platform.py
index 367140f8ae..367140f8ae 100644
--- a/grc/python/base/Platform.py
+++ b/grc/model/base/Platform.py
diff --git a/grc/python/base/Port.py b/grc/model/base/Port.py
index 39166d18f7..39166d18f7 100644
--- a/grc/python/base/Port.py
+++ b/grc/model/base/Port.py
diff --git a/grc/python/base/__init__.py b/grc/model/base/__init__.py
index 2682db8125..2682db8125 100644
--- a/grc/python/base/__init__.py
+++ b/grc/model/base/__init__.py
diff --git a/grc/python/base/block_tree.dtd b/grc/model/base/block_tree.dtd
index 9e23576477..9e23576477 100644
--- a/grc/python/base/block_tree.dtd
+++ b/grc/model/base/block_tree.dtd
diff --git a/grc/python/base/domain.dtd b/grc/model/base/domain.dtd
index b5b0b8bf39..b5b0b8bf39 100644
--- a/grc/python/base/domain.dtd
+++ b/grc/model/base/domain.dtd
diff --git a/grc/python/base/flow_graph.dtd b/grc/model/base/flow_graph.dtd
index bdfe1dc059..bdfe1dc059 100644
--- a/grc/python/base/flow_graph.dtd
+++ b/grc/model/base/flow_graph.dtd
diff --git a/grc/python/base/odict.py b/grc/model/base/odict.py
index 70ab67d053..70ab67d053 100644
--- a/grc/python/base/odict.py
+++ b/grc/model/base/odict.py
diff --git a/grc/python/block.dtd b/grc/model/block.dtd
index 145f4d8610..145f4d8610 100644
--- a/grc/python/block.dtd
+++ b/grc/model/block.dtd
diff --git a/grc/python/default_flow_graph.grc b/grc/model/default_flow_graph.grc
index 059509d34b..059509d34b 100644
--- a/grc/python/default_flow_graph.grc
+++ b/grc/model/default_flow_graph.grc
diff --git a/grc/python/epy_block_io.py b/grc/model/epy_block_io.py
index e089908a01..e089908a01 100644
--- a/grc/python/epy_block_io.py
+++ b/grc/model/epy_block_io.py
diff --git a/grc/python/expr_utils.py b/grc/model/expr_utils.py
index 9e0b2a4a0a..9e0b2a4a0a 100644
--- a/grc/python/expr_utils.py
+++ b/grc/model/expr_utils.py
diff --git a/grc/python/extract_docs.py b/grc/model/extract_docs.py
index 7c149ce593..7c149ce593 100644
--- a/grc/python/extract_docs.py
+++ b/grc/model/extract_docs.py
diff --git a/grc/python/flow_graph.tmpl b/grc/model/flow_graph.tmpl
index bd8025b676..bd8025b676 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/model/flow_graph.tmpl
diff --git a/grc/scripts/CMakeLists.txt b/grc/scripts/CMakeLists.txt
index e905892308..6cc78c3cf3 100644
--- a/grc/scripts/CMakeLists.txt
+++ b/grc/scripts/CMakeLists.txt
@@ -23,3 +23,5 @@ GR_PYTHON_INSTALL(
     DESTINATION ${GR_RUNTIME_DIR}
     COMPONENT "grc"
 )
+
+add_subdirectory(freedesktop)
diff --git a/grc/freedesktop/CMakeLists.txt b/grc/scripts/freedesktop/CMakeLists.txt
index 47e836f697..47e836f697 100644
--- a/grc/freedesktop/CMakeLists.txt
+++ b/grc/scripts/freedesktop/CMakeLists.txt
diff --git a/grc/freedesktop/README b/grc/scripts/freedesktop/README
index 0857ecc224..0857ecc224 100644
--- a/grc/freedesktop/README
+++ b/grc/scripts/freedesktop/README
diff --git a/grc/freedesktop/convert.sh b/grc/scripts/freedesktop/convert.sh
index e2cba264a6..e2cba264a6 100755
--- a/grc/freedesktop/convert.sh
+++ b/grc/scripts/freedesktop/convert.sh
diff --git a/grc/freedesktop/gnuradio-grc.desktop b/grc/scripts/freedesktop/gnuradio-grc.desktop
index 39beeca1b8..39beeca1b8 100644
--- a/grc/freedesktop/gnuradio-grc.desktop
+++ b/grc/scripts/freedesktop/gnuradio-grc.desktop
diff --git a/grc/freedesktop/gnuradio-grc.xml b/grc/scripts/freedesktop/gnuradio-grc.xml
index a5cb95d9fd..a5cb95d9fd 100644
--- a/grc/freedesktop/gnuradio-grc.xml
+++ b/grc/scripts/freedesktop/gnuradio-grc.xml
diff --git a/grc/freedesktop/gnuradio_logo_icon-square.svg b/grc/scripts/freedesktop/gnuradio_logo_icon-square.svg
index 3b54bf4001..3b54bf4001 100644
--- a/grc/freedesktop/gnuradio_logo_icon-square.svg
+++ b/grc/scripts/freedesktop/gnuradio_logo_icon-square.svg
diff --git a/grc/freedesktop/grc-icon-128.png b/grc/scripts/freedesktop/grc-icon-128.png
index 13efe806ba..13efe806ba 100644
--- a/grc/freedesktop/grc-icon-128.png
+++ b/grc/scripts/freedesktop/grc-icon-128.png
diff --git a/grc/freedesktop/grc-icon-16.png b/grc/scripts/freedesktop/grc-icon-16.png
index bdd1823b3d..bdd1823b3d 100644
--- a/grc/freedesktop/grc-icon-16.png
+++ b/grc/scripts/freedesktop/grc-icon-16.png
diff --git a/grc/freedesktop/grc-icon-24.png b/grc/scripts/freedesktop/grc-icon-24.png
index a124768125..a124768125 100644
--- a/grc/freedesktop/grc-icon-24.png
+++ b/grc/scripts/freedesktop/grc-icon-24.png
diff --git a/grc/freedesktop/grc-icon-256.png b/grc/scripts/freedesktop/grc-icon-256.png
index 077688eac5..077688eac5 100644
--- a/grc/freedesktop/grc-icon-256.png
+++ b/grc/scripts/freedesktop/grc-icon-256.png
diff --git a/grc/freedesktop/grc-icon-32.png b/grc/scripts/freedesktop/grc-icon-32.png
index a345aace3c..a345aace3c 100644
--- a/grc/freedesktop/grc-icon-32.png
+++ b/grc/scripts/freedesktop/grc-icon-32.png
diff --git a/grc/freedesktop/grc-icon-48.png b/grc/scripts/freedesktop/grc-icon-48.png
index c522a5d0ec..c522a5d0ec 100644
--- a/grc/freedesktop/grc-icon-48.png
+++ b/grc/scripts/freedesktop/grc-icon-48.png
diff --git a/grc/freedesktop/grc-icon-64.png b/grc/scripts/freedesktop/grc-icon-64.png
index df4f6dc07b..df4f6dc07b 100644
--- a/grc/freedesktop/grc-icon-64.png
+++ b/grc/scripts/freedesktop/grc-icon-64.png
diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/scripts/freedesktop/grc_setup_freedesktop.in
index 87a388e2ec..87a388e2ec 100644
--- a/grc/freedesktop/grc_setup_freedesktop.in
+++ b/grc/scripts/freedesktop/grc_setup_freedesktop.in
diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion
index 9eee8df7dd..3a3bf503c2 100755
--- a/grc/scripts/gnuradio-companion
+++ b/grc/scripts/gnuradio-companion
@@ -27,7 +27,7 @@ import warnings
 GR_IMPORT_ERROR_MESSAGE = """\
 Cannot import gnuradio.
 
-Is the python path environment variable set correctly?
+Is the model path environment variable set correctly?
     All OS: PYTHONPATH
 
 Is the library path environment variable set correctly?
diff --git a/grc/todo.txt b/grc/todo.txt
deleted file mode 100644
index cedea72aa3..0000000000
--- a/grc/todo.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-##################################################
-# Examples
-##################################################
-* Push-to-Talk example
-* Start/Stop the flow graph
-
-##################################################
-# Blocks
-##################################################
-* probe: also non-float outputs
-* log slider gui control
-* packet mod: whitening offset
-* wx min window size in options block
-* gr_adaptive_fir_ccf
-* size params for the graphical sinks
-* callbacks for set average on fft, waterfall, number sinks
-* add units to params: Sps, Hz, dB...
-* add bool type to command line option store_true or store_false
-* messages for packet blocks and probe blocks
-
-##################################################
-# Features
-##################################################
-* extract category from doxygen
-  * fix up block tree to mirror current doxygen group
-  * remove blocks in block tree covered by doxygen
-* param editor, expand entry boxes in focus
-* change param dialog to panel within main window
-* gui grid editor for configuring grid params/placing wxgui plots and controls
-* drag from one port to another to connect
-* per parameter docs
-  * extract individual param docs from doxygen
-  * doc tag in param for handwritten notes
-* separate generated code into top block and gui class
-  * use gui.py in gr-wxgui and remove custom top_block_gui
-* configuration option for adding block paths
-* orientations for ports (top, right, bottom, left)
-  * source defaults to right, sink defaults to left
-* separation of variables and gui controls
-* speedup w/ background layer and animation layer
-* multiple doxygen directories (doc_dir becomes doc_path)
-* use pango markup in tooltips for params
-* use get_var_make to determine if it is a variable, not regexp
-* concept of a project, or project flow graph
-  * collection of blocks, hier and top
-  * system-wide, default/work, and user created
-* use templates/macros to generate the repetative stuff in the xml
-
-##################################################
-# Problems
-##################################################
-* msg ports dont work with virtual connections
-  * dont fix this until pmts are used?
-* hier block generation
-  * auto generate hier library on changes
-  * auto clean hier library when block removed
-  * add hier blocks to tree without restart
-* dont generate py files in saved flowgraph dir
-* save/restore cwd
-* threads dont die on exit in probe and variable sink
-* align param titles in properties dialog
-* weird grid params misbehaving
-* gr hier blocks have more diverse IO capabilities than we allow for
-
-##################################################
-# Future
-##################################################
-* require pygtk 2.12 for treeview tooltips
-  * remove try/except in BlockTreeWindow.py