Merge remote branch 'gnuradio/next'

* gnuradio/next: (806 commits)
  gruel: added missing ignores
  gruel: fixed swig interface file to dereference pmt_t.
  qtgui: fix distcheck error
  gruel: fixing structure. Passes make check.
  gruel: SWIGing Gruel into Python to access PMTs.
  gnuradio-examples: add C++ audio examples using new gr-audio
  created gruel/attributes.h to house compiler specific attribute macros
  audio: remove obsoleted individual top-level components
  gr-audio: added README and default config fix
  volk: simplify the get new method for the aligned pool
  grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc
  grc: swap store the subprocess object rather than the pid when executing
  qtgui: removed python directory that was added, never used
  uhd: use %ignore to hide warnings and fix errors
  Added/updated ignore files.
  Fixing gr_filter_design program to import from gnuradio Python package.
  audio: high prio for platform specific audio osx
  audio: added windows and osx audio source files
  audio: added config checks for other audios, added jack and port
  audio: make prefs look like old audio, removed old audio.py
  ...

1 files changed, 25 insertions, 2 deletions

diff --git a/grc/python/Param.py b/grc/python/Param.py
index 6dd008d1d..303ab3ed8 100644
--- a/grc/python/Param.py
+++ b/grc/python/Param.py
@@ -1,5 +1,5 @@
 """
-Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright 2008-2011 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
@@ -99,7 +99,7 @@ class Param(_Param, _GUIParam):
 		'hex', 'string', 'bool',
 		'file_open', 'file_save',
 		'id', 'stream_id',
-		'grid_pos', 'notebook',
+		'grid_pos', 'notebook', 'gui_hint',
 		'import',
 	)
 
@@ -354,6 +354,29 @@ class Param(_Param, _GUIParam):
 				except: raise Exception, 'Stream ID "%s" is not found.'%v
 			return v
 		#########################
+		# GUI Position/Hint
+		#########################
+		elif t == 'gui_hint':
+			if ':' in v: tab, pos = v.split(':')
+			elif '@' in v: tab, pos = v, ''
+			else: tab, pos = '', v
+
+			if '@' in tab: tab, index = tab.split('@')
+			else: index = '?'
+
+			widget_str = ({
+				(True, True): 'self.%(tab)s_grid_layout_%(index)s.addWidget(%(widget)s, %(pos)s)',
+				(True, False): 'self.%(tab)s_layout_%(index)s.addWidget(%(widget)s)',
+				(False, True): 'self.top_grid_layout.addWidget(%(widget)s, %(pos)s)',
+				(False, False): 'self.top_layout.addWidget(%(widget)s)',
+			}[bool(tab), bool(pos)])%{'tab': tab, 'index': index, 'widget': '%s', 'pos': pos}
+
+			def gui_hint(ws, w):
+				if 'layout' in w: ws = ws.replace('addWidget', 'addLayout')
+				return ws%w
+
+			return lambda w: gui_hint(widget_str, w)
+		#########################
 		# Grid Position Type
 		#########################
 		elif t == 'grid_pos':