[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/11: grc: minor edits. removed extra whit
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 04/11: grc: minor edits. removed extra whitespace |
Date: |
Fri, 13 Jun 2014 22:44:33 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 04de4b8d8cbb38d2b7dd10c30dc8bbd66d9ca370
Author: Sebastian Koslowski <address@hidden>
Date: Fri Jun 13 11:03:43 2014 +0200
grc: minor edits. removed extra whitespace
---
grc/gui/ActionHandler.py | 1 -
grc/gui/Actions.py | 2 +-
grc/gui/Dialogs.py | 23 ++++++++++++-----------
grc/gui/MainWindow.py | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index 70e8064..6ad2d55 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@ -381,7 +381,6 @@ class ActionHandler:
self.main_window.text_display.scroll_to_end()
elif action == Actions.CLEAR_REPORTS:
self.main_window.text_display.clear()
-
elif action == Actions.TOGGLE_HIDE_DISABLED_BLOCKS:
Actions.NOTHING_SELECT()
##################################################
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py
index abd5017..3aa9e61 100644
--- a/grc/gui/Actions.py
+++ b/grc/gui/Actions.py
@@ -282,7 +282,7 @@ TOGGLE_BLOCKS_WINDOW = ToggleAction(
keypresses=(gtk.keysyms.b, gtk.gdk.CONTROL_MASK),
)
TOGGLE_SCROLL_LOCK = ToggleAction(
- label='_Report Scroll Lock',
+ label='_Reports Scroll Lock',
tooltip='Toggle scroll lock for the report window',
)
ABOUT_WINDOW_DISPLAY = Action(
diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py
index 1b7be1a..0ffba8e 100644
--- a/grc/gui/Dialogs.py
+++ b/grc/gui/Dialogs.py
@@ -40,10 +40,10 @@ class TextDisplay(gtk.TextView):
self.set_editable(False)
self.set_cursor_visible(False)
self.set_wrap_mode(gtk.WRAP_WORD_CHAR)
-
+
# Added for scroll locking
self.scroll_lock = True
-
+
# Add a signal for populating the popup menu
self.connect("populate-popup", self.populate_popup)
@@ -71,11 +71,11 @@ class TextDisplay(gtk.TextView):
return line[back_count:]
def scroll_to_end(self):
- if (self.scroll_lock == True):
+ if self.scroll_lock:
buffer = self.get_buffer()
buffer.move_mark(buffer.get_insert(), buffer.get_end_iter())
self.scroll_to_mark(buffer.get_insert(), 0.0)
-
+
def clear(self):
buffer = self.get_buffer()
buffer.delete(buffer.get_start_iter(), buffer.get_end_iter())
@@ -83,19 +83,20 @@ class TextDisplay(gtk.TextView):
# Callback functions to handle the scrolling lock and clear context menus
options
# Action functions are set by the ActionHandler's init function
def clear_cb(self, menu_item, web_view):
- Actions.CLEAR_REPORTS()
+ Actions.CLEAR_REPORTS()
+
def scroll_back_cb(self, menu_item, web_view):
Actions.TOGGLE_SCROLL_LOCK()
-
- # Create a popup menu for the scroll lock and clear functions.
+
def populate_popup(self, view, menu):
+ """Create a popup menu for the scroll lock and clear functions"""
menu.append(gtk.SeparatorMenuItem())
-
+
lock = gtk.CheckMenuItem("Scroll Lock")
menu.append(lock)
- lock.set_active(self.scroll_lock)
- lock.connect('activate', self.scroll_back_cb, view)
-
+ lock.set_active(self.scroll_lock)
+ lock.connect('activate', self.scroll_back_cb, view)
+
clear = gtk.ImageMenuItem(gtk.STOCK_CLEAR)
menu.append(clear)
clear.connect('activate', self.clear_cb, view)
diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py
index e763855..f309d34 100644
--- a/grc/gui/MainWindow.py
+++ b/grc/gui/MainWindow.py
@@ -155,7 +155,7 @@ class MainWindow(gtk.Window):
line: the new text
"""
self.text_display.insert(line)
-
+
############################################################
# Pages: create and close
############################################################
- [Commit-gnuradio] [gnuradio] branch master updated (34ee3b7 -> 80ec147), git, 2014/06/13
- [Commit-gnuradio] [gnuradio] 02/11: grc: Fixed scroll functionality in GRC. Also added clear and scrollback capability for the logging window, git, 2014/06/13
- [Commit-gnuradio] [gnuradio] 01/11: pmt_io: adding string conversion for uniform vectors, git, 2014/06/13
- [Commit-gnuradio] [gnuradio] 09/11: pager: Add sync code for FLEX 3200 bps 2-FSK encoding, git, 2014/06/13
- [Commit-gnuradio] [gnuradio] 10/11: Merge remote-tracking branch 'gnuradio-wg-grc/grc_scroll_fix', git, 2014/06/13
- [Commit-gnuradio] [gnuradio] 05/11: Merge branch 'maint', git, 2014/06/13
- [Commit-gnuradio] [gnuradio] 08/11: blocks: added I/Q swap option to interleaved_short_to_complex, git, 2014/06/13
- [Commit-gnuradio] [gnuradio] 03/11: grc: Changed dialog to directly call the SCROLL_LOCK and CLEAR_REPORTS actions. Moved clear reports under view and grouped all Report menu items together, git, 2014/06/13
- [Commit-gnuradio] [gnuradio] 04/11: grc: minor edits. removed extra whitespace,
git <=
- [Commit-gnuradio] [gnuradio] 11/11: Merge remote-tracking branch 'deuxpi/pager-flex-3200-fsk2', git, 2014/06/13
- [Commit-gnuradio] [gnuradio] 06/11: Merge remote-tracking branch 'mmueller/pmt_io_uniform_vector_to_string', git, 2014/06/13
- [Commit-gnuradio] [gnuradio] 07/11: runtime: accessor for message port map & printing more informative error when a msg port is not found, git, 2014/06/13