From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Fri, 25 Sep 2009 19:27:29 +0000 (-0700)
Subject: Revert "Merge branch 'grc' of http://gnuradio.org/git/jblum"
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=5d1ce94095bd2120a2fd2df087aae45085f53989;p=debian%2Fgnuradio

Revert "Merge branch 'grc' of http://gnuradio.org/git/jblum"

This reverts commit 06281feea16143ca97a77348f72e1c6dd0616c57.
---

diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml
index 4d0dd289..1798a69f 100644
--- a/grc/blocks/options.xml
+++ b/grc/blocks/options.xml
@@ -77,37 +77,20 @@ else: self.stop(); self.wait()</callback>
 		<type>string</type>
 		<hide>#if $generate_options() == 'hb' then 'none' else 'all'#</hide>
 	</param>
-	<param>
-		<name>Run Options</name>
-		<key>run_options</key>
-		<value>prompt</value>
-		<type>enum</type>
-		<hide>#if $generate_options() == 'no_gui' then 'none' else 'all'#</hide>
-		<option>
-			<name>Run to Completion</name>
-			<key>run</key>
-		</option>
-		<option>
-			<name>Prompt for Exit</name>
-			<key>prompt</key>
-		</option>
-	</param>
 	<param>
 		<name>Run</name>
 		<key>run</key>
 		<value>True</value>
 		<type>bool</type>
-		<hide>
-#if $generate_options() == 'wx_gui'
-	#if $run()
-		part
+		<hide>#if $generate_options() == 'wx_gui'
+	#if str($run) == 'True'
+part#slurp
 	#else
-		none
+none#slurp
 	#end if
 #else
-	all
-#end if
-		</hide>
+all#slurp
+#end if</hide>
 		<option>
 			<name>Autostart</name>
 			<key>True</key>
diff --git a/grc/gui/PropsDialog.py b/grc/gui/PropsDialog.py
index cc84fd08..a7822b22 100644
--- a/grc/gui/PropsDialog.py
+++ b/grc/gui/PropsDialog.py
@@ -93,14 +93,15 @@ class PropsDialog(gtk.Dialog):
 		Ex: Added, removed, type change, hide change...
 		To the props dialog, the hide setting of 'none' and 'part' are identical.
 		Therfore, the props dialog only cares if the hide setting is/not 'all'.
-		Make a hash that uniquely represents the params' state.
+		Make a hash that uniquely represents the params state.
 		@return true if changed
 		"""
 		old_hash = self._hash
-		#create a tuple of things from each param that affects the params box
-		self._hash = hash(tuple([(
-			hash(param), param.get_type(), param.get_hide() == 'all',
-		) for param in self._block.get_params()]))
+		self._hash = 0
+		for param in self._block.get_params():
+			self._hash ^= hash(param)
+			self._hash ^= hash(param.get_type())
+			self._hash ^= hash(param.get_hide() == 'all')
 		return self._hash != old_hash
 
 	def _handle_changed(self, *args):
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index 31d99a61..dce4037d 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -233,14 +233,9 @@ if __name__ == '__main__':
 	#if $generate_options == 'wx_gui'
 	tb.Run($flow_graph.get_option('run'))
 	#elif $generate_options == 'no_gui'
-		#set $run_options = $flow_graph.get_option('run_options')
-		#if $run_options == 'prompt'
 	tb.start()
 	raw_input('Press Enter to quit: ')
 	tb.stop()
-		#elif $run_options == 'run'
-	tb.run()
-		#end if
 	#end if
 #end if