[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 42/101: grc: gtk3: update main and checks
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 42/101: grc: gtk3: update main and checks |
Date: |
Thu, 16 Mar 2017 14:58:04 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch python3
in repository gnuradio.
commit 5b9404f8836db0ccfc0d732d93b1b7beeca96ded
Author: Sebastian Koslowski <address@hidden>
Date: Wed Jul 13 17:22:22 2016 +0200
grc: gtk3: update main and checks
---
grc/checks.py | 10 +++++-----
grc/gui/Block.py | 4 +---
grc/gui/BlockTreeWindow.py | 6 +-----
grc/gui/Constants.py | 3 +--
grc/gui/Utils.py | 2 --
grc/main.py | 2 ++
grc/scripts/gnuradio-companion | 11 +++++++----
7 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/grc/checks.py b/grc/checks.py
index 40a0b2b..4b5ce9d 100755
--- a/grc/checks.py
+++ b/grc/checks.py
@@ -36,11 +36,11 @@ Is the library path environment variable set correctly?
def die(error, message):
msg = "{0}\n\n({1})".format(message, error)
try:
- import gtk
- d = gtk.MessageDialog(
- type=gtk.MESSAGE_ERROR,
- buttons=gtk.BUTTONS_CLOSE,
- message_format=msg,
+ from gi.repository import Gtk
+ d = Gtk.MessageDialog(
+ message_type=Gtk.MessageType.ERROR,
+ buttons=Gtk.ButtonsType.CLOSE,
+ text=msg,
)
d.set_title(type(error).__name__)
d.run()
diff --git a/grc/gui/Block.py b/grc/gui/Block.py
index 5efb571..25435e9 100644
--- a/grc/gui/Block.py
+++ b/grc/gui/Block.py
@@ -19,9 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA
from __future__ import absolute_import
import math
-import gi
-gi.require_version('Gtk', '3.0')
-gi.require_version('PangoCairo', '1.0')
+
from gi.repository import Gtk, Pango, PangoCairo
from . import Actions, Colors, Utils, Constants
diff --git a/grc/gui/BlockTreeWindow.py b/grc/gui/BlockTreeWindow.py
index f0f81b3..4e42144 100644
--- a/grc/gui/BlockTreeWindow.py
+++ b/grc/gui/BlockTreeWindow.py
@@ -20,11 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA
from __future__ import absolute_import
import six
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import GObject
+from gi.repository import Gtk, Gdk, GObject
from . import Actions, Utils
from . import Constants
diff --git a/grc/gui/Constants.py b/grc/gui/Constants.py
index 035a7f8..5c55c41 100644
--- a/grc/gui/Constants.py
+++ b/grc/gui/Constants.py
@@ -18,8 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA
"""
from __future__ import absolute_import
-import gi
-gi.require_version('Gtk', '3.0')
+
from gi.repository import Gtk
from ..core.Constants import *
diff --git a/grc/gui/Utils.py b/grc/gui/Utils.py
index e5d4cca..70adede 100644
--- a/grc/gui/Utils.py
+++ b/grc/gui/Utils.py
@@ -19,8 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA
from __future__ import absolute_import
-import gi
-gi.require_version('Gtk', '3.0')
from gi.repository import GLib
from .Constants import POSSIBLE_ROTATIONS, CANVAS_GRID_SIZE
diff --git a/grc/main.py b/grc/main.py
index ff0811e..dc84e16 100755
--- a/grc/main.py
+++ b/grc/main.py
@@ -19,6 +19,8 @@ import argparse
import gi
gi.require_version('Gtk', '3.0')
+gi.require_version('PangoCairo', '1.0')
+
from gi.repository import Gtk
from gnuradio import gr
diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion
index 04a1cb4..6130582 100755
--- a/grc/scripts/gnuradio-companion
+++ b/grc/scripts/gnuradio-companion
@@ -26,13 +26,16 @@ source_tree_subpath = "/grc/scripts"
if not script_path.endswith(source_tree_subpath):
# run the installed version
- from gnuradio.grc.main import main
from gnuradio.grc import checks
+ checks.do_all()
+ from gnuradio.grc.main import main
+ exit(main())
+
else:
print("Running from source tree")
sys.path.insert(1, script_path[:-len(source_tree_subpath)])
- from grc.main import main
from grc import checks
+ checks.do_all()
+ from grc.main import main
+ exit(main())
-checks.do_all()
-exit(main())
- [Commit-gnuradio] [gnuradio] 23/101: grc-refactor: make block.params a dict, (continued)
- [Commit-gnuradio] [gnuradio] 23/101: grc-refactor: make block.params a dict, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 29/101: grc: refactor: block states are no longer hidden params, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 37/101: grc: refactor: fixup selection code and core connection changes, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 22/101: grc-refactor: Block: make more public attribs, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 35/101: grc: gtk3: quick fix for file dialogs, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 41/101: grc: gtk3: fix PythonEditorParam widget, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 02/101: gtk3: add flowgraph draw code and other gtk3 fixes (WIP), git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 21/101: grc-refactor: Block: remove key getters, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 31/101: grc: gtk3: refactor connection draw code, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 14/101: grc-refactor: rewrite tree-api in core, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 42/101: grc: gtk3: update main and checks,
git <=
- [Commit-gnuradio] [gnuradio] 27/101: grc: gtk3: refactor and update draw code WIP, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 33/101: grc: gtk3: update block surface draw code, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 45/101: grc: fix block init, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 38/101: grc: gtk3: update & fix port drawing code, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 32/101: grc: refactor: remote port domain getter, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 16/101: Merge remote-tracking branch 'grcwg/next_grcwg' into gtk3, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 57/101: grc: gtk3: remove left-over gtk2 usage in generator template, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 43/101: grc: refactor: minor clean-up and fixes, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 44/101: grc: gtk3: fix connection arrows, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 56/101: grc: gtk3: fix generating virtual/bypassed connections, git, 2017/03/16