Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / grc / blocks / options.xml

diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml
index 18d6e2f0c99fc0818a5177950cc438672e6f55d0..4d0dd28999f4bfbbc8c6c541cc8b6ffbb695553a 100644 (file)
--- a/grc/blocks/options.xml
+++ b/grc/blocks/options.xml
@@ -9,16 +9,17 @@
 <block>
        <name>Options</name>
        <key>options</key>
-       <import>from gnuradio import gr
-#if $generate_options() == 'wx_gui'
+       <import>from gnuradio import gr</import>
+       <import>from gnuradio.gr import firdes</import>
+       <import>#if $generate_options() == 'wx_gui'
 from grc_gnuradio import wxgui as grc_wxgui
 import wx
 #end if
 #if $generate_options() != 'hb'
 from optparse import OptionParser
 from gnuradio.eng_option import eng_option
-#end if
-</import>
+from gnuradio import eng_notation
+#end if</import>
        <make></make>
        <callback>if $run: self.start()
 else: self.stop(); self.wait()</callback>
@@ -76,20 +77,37 @@ 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 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>