summaryrefslogtreecommitdiff
path: root/grc/blocks
diff options
context:
space:
mode:
authorJohnathan Corgan2009-10-04 08:22:22 -0700
committerJohnathan Corgan2009-10-04 08:22:22 -0700
commitc6b4290d73069e4e4f0f71b04a65b9670318e86d (patch)
tree51f452f053692bac4d49fe9be9c9c553f958b95b /grc/blocks
parent56496536e1e2b8f73079bd3dedc4e74b27fcad80 (diff)
parent02a14678e889b09d41eaf903962733c47791c9cb (diff)
downloadgnuradio-c6b4290d73069e4e4f0f71b04a65b9670318e86d.tar.gz
gnuradio-c6b4290d73069e4e4f0f71b04a65b9670318e86d.tar.bz2
gnuradio-c6b4290d73069e4e4f0f71b04a65b9670318e86d.zip
Merge branch 'grc' of http://gnuradio.org/git/jblum into master
This restores functionality reverted in fd37328c * 'grc' of http://gnuradio.org/git/jblum: Added a run options to the "no gui" generate options.
Diffstat (limited to 'grc/blocks')
-rw-r--r--grc/blocks/options.xml29
1 files changed, 23 insertions, 6 deletions
diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml
index 1798a69f8..4d0dd2899 100644
--- a/grc/blocks/options.xml
+++ b/grc/blocks/options.xml
@@ -78,19 +78,36 @@ else: self.stop(); self.wait()</callback>
<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 str($run) == 'True'
-part#slurp
+ <hide>
+#if $generate_options() == 'wx_gui'
+ #if $run()
+ part
#else
-none#slurp
+ none
#end if
#else
-all#slurp
-#end if</hide>
+ all
+#end if
+ </hide>
<option>
<name>Autostart</name>
<key>True</key>