Merged r11309:11357 from grc branch.

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

diff --git a/grc/blocks/variable_slider.xml b/grc/blocks/variable_slider.xml
index 875ae74afca2aff3fc9e977a12cb58db702f0c61..c13d208569f4dc3d50d96314f4298d895b834c24 100644 (file)
--- a/grc/blocks/variable_slider.xml
+++ b/grc/blocks/variable_slider.xml
@@ -10,10 +10,12 @@
        <key>variable_slider</key>
        <import>from gnuradio.wxgui import forms</import>
        <var_make>self.$(id) = $(id) = $value</var_make>
-       <make>_$(id)_sizer = wx.BoxSizer(wx.VERTICAL)
+       <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
+#set $win = '_%s_sizer'%$id
+$win = wx.BoxSizer(wx.VERTICAL)
 self._$(id)_text_box = forms.text_box(
-       parent=self.GetWin(),
-       sizer=_$(id)_sizer,
+       parent=$(parent).GetWin(),
+       sizer=$win,
        value=self.$id,
        callback=self.set_$(id),
        #if $label()
@@ -25,8 +27,8 @@ self._$(id)_text_box = forms.text_box(
        proportion=0,
 )
 self._$(id)_slider = forms.slider(
-       parent=self.GetWin(),
-       sizer=_$(id)_sizer,
+       parent=$(parent).GetWin(),
+       sizer=$win,
        value=self.$id,
        callback=self.set_$(id),
        minimum=$min,
@@ -36,11 +38,10 @@ self._$(id)_slider = forms.slider(
        cast=$(converver.slider_cast),
        proportion=1,
 )
-#set $grid_pos = $grid_pos()
-#if not grid_pos
-self.Add(_$(id)_sizer)
+#if not $grid_pos()
+$(parent).Add($win)
 #else
-self.GridAdd(_$(id)_sizer, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos[3])
+$(parent).GridAdd($win, $(', '.join(map(str, $grid_pos()))))
 #end if</make>
        <callback>self.set_$(id)($value)</callback>
        <callback>self._$(id)_slider.set_value($id)</callback>
@@ -114,6 +115,12 @@ self.GridAdd(_$(id)_sizer, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos[3
                <value></value>
                <type>grid_pos</type>
        </param>
+       <param>
+               <name>Notebook</name>
+               <key>notebook</key>
+               <value></value>
+               <type>notebook</type>
+       </param>
        <check>$min &lt;= $value &lt;= $max</check>
        <check>$min &lt; $max</check>
        <check>0 &lt; $num_steps &lt;= 1000</check>
@@ -125,5 +132,7 @@ The value must be between the minimum and the maximum. \
 The number of steps must be between 0 and 1000.
 
 Use the Grid Position (row, column, row span, column span) to position the graphical element in the window.
+
+Use the Notebook Param (notebook-id, page-index) to place the graphical element inside of a notebook page.
        </doc>
 </block>