[Commit-gnuradio] r11158 - gnuradio/branches/developers/jblum/wxgui/gr-wxgui/src/python

[jblum]

Author: jblum
Date: 2009-05-27 22:56:16 -0600 (Wed, 27 May 2009)
New Revision: 11158

Modified:
   gnuradio/branches/developers/jblum/wxgui/gr-wxgui/src/python/scope_window.py
Log:
Shaved some px off the scope sink control panel.
Abbreviated some drop down choices as to not clip the text.



Modified: 
gnuradio/branches/developers/jblum/wxgui/gr-wxgui/src/python/scope_window.py
===================================================================
--- 
gnuradio/branches/developers/jblum/wxgui/gr-wxgui/src/python/scope_window.py    
    2009-05-28 04:47:26 UTC (rev 11157)
+++ 
gnuradio/branches/developers/jblum/wxgui/gr-wxgui/src/python/scope_window.py    
    2009-05-28 04:56:16 UTC (rev 11158)
@@ -43,12 +43,12 @@
 )
 TRIGGER_MODES = (
        ('Freerun', gr.gr_TRIG_MODE_FREE),
-       ('Automatic', gr.gr_TRIG_MODE_AUTO),
+       ('Auto', gr.gr_TRIG_MODE_AUTO),
        ('Normal', gr.gr_TRIG_MODE_NORM),
 )
 TRIGGER_SLOPES = (
-       ('Positive +', gr.gr_TRIG_SLOPE_POS),
-       ('Negative -', gr.gr_TRIG_SLOPE_NEG),
+       ('Pos +', gr.gr_TRIG_SLOPE_POS),
+       ('Neg -', gr.gr_TRIG_SLOPE_NEG),
 )
 CHANNEL_COLOR_SPECS = (
        (0.3, 0.3, 1.0),
@@ -79,7 +79,7 @@
                Create a new control panel.
                @param parent the wx parent window
                """
-               WIDTH = 100
+               WIDTH = 90
                self.parent = parent
                wx.Panel.__init__(self, parent, style=wx.SUNKEN_BORDER)
                control_box = wx.BoxSizer(wx.VERTICAL)
@@ -165,7 +165,7 @@
                )
                options_notebook = wx.Notebook(self)
                options_notebook_args = list()
-               CHANNELS = [('Channel %d'%(i+1), i) for i in 
range(parent.num_inputs)]
+               CHANNELS = [('Ch %d'%(i+1), i) for i in 
range(parent.num_inputs)]
                ##################################################
                # Channel Menu Boxes
                ##################################################
@@ -232,7 +232,7 @@
                        parent=trigger_menu_panel, sizer=hbox, label='50%',
                        callback=parent.set_auto_trigger_level, 
style=wx.BU_EXACTFIT,
                )
-               hbox.AddSpacer(40)
+               hbox.AddSpacer(WIDTH-60)
                trigger_level_buttons = forms.incr_decr_buttons(
                        parent=trigger_menu_panel, sizer=hbox,
                        on_incr=self._on_incr_trigger_level, 
on_decr=self._on_decr_trigger_level,