diff options
| author | Johnathan Corgan | 2009-09-15 08:41:21 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-09-15 08:41:21 -0700 |
| commit | 9d2c4b0625dac26c86974453518aa5b034fc849e (patch) | |
| tree | bfed69062238116588c5160e4a3a98959302f311 /grc/gui/NotebookPage.py | |
| parent | 2f663bacb14822efc95da006da26fa67f63ab315 (diff) | |
| parent | 3fb876217316bb8ac9a59fffc75bb3c523ae1704 (diff) | |
| download | gnuradio-9d2c4b0625dac26c86974453518aa5b034fc849e.tar.gz gnuradio-9d2c4b0625dac26c86974453518aa5b034fc849e.tar.bz2 gnuradio-9d2c4b0625dac26c86974453518aa5b034fc849e.zip | |
Merge branch 'grc' of http://gnuradio.org/git/jblum into master
* 'grc' of http://gnuradio.org/git/jblum:
fixed issue where entry boxes lost focus (mishandling of hide changing)
fixed bool converter in forms to work with non bool options
tweaked key handling callbacks
fix for uniformity convention with gtk signal name strings
Simply Actions module imports, using module prefix.
Reworked actions api and actions objects:
Move key press extraction logic into actions module.
rename variable, use keysyms in props dialog
use the keymap's translate_keyboard_state, use the key value rather than name
ignore irrelevant modifiers and events pending
properties dialog with ok/cancel buttons
Diffstat (limited to 'grc/gui/NotebookPage.py')
| -rw-r--r-- | grc/gui/NotebookPage.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/grc/gui/NotebookPage.py b/grc/gui/NotebookPage.py index cb6b7ed30..fddfeaf5f 100644 --- a/grc/gui/NotebookPage.py +++ b/grc/gui/NotebookPage.py @@ -17,10 +17,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ -from Actions import FLOW_GRAPH_CLOSE import pygtk pygtk.require('2.0') import gtk +import Actions from StateCache import StateCache from Constants import MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT from DrawingArea import DrawingArea @@ -80,9 +80,8 @@ class NotebookPage(gtk.HBox): self.drawing_area = DrawingArea(self.get_flow_graph()) self.scrolled_window.add_with_viewport(self.get_drawing_area()) self.pack_start(self.scrolled_window) - #inject drawing area and handle states into flow graph + #inject drawing area into flow graph self.get_flow_graph().drawing_area = self.get_drawing_area() - self.get_flow_graph().handle_states = main_window.handle_states self.show_all() def get_drawing_area(self): return self.drawing_area @@ -104,7 +103,7 @@ class NotebookPage(gtk.HBox): @param the button """ self.main_window.page_to_be_closed = self - self.main_window.handle_states(FLOW_GRAPH_CLOSE) + Actions.FLOW_GRAPH_CLOSE() def set_markup(self, markup): """ |