projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.3.0' into upstream
[debian/gnuradio]
/
grc
/
gui
/
NotebookPage.py
diff --git
a/grc/gui/NotebookPage.py
b/grc/gui/NotebookPage.py
index cb6b7ed3079d7b1df77d207d20b18ab6eef2cde1..fddfeaf5f1cf7b07d2708d602ea99bb3164ae70b 100644
(file)
--- 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
"""
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 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
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)
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().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
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
@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):
"""
def set_markup(self, markup):
"""