[Pkg-privacy-commits] [onionshare] 135/256: Added onionshare logo as settings window icon
Ulrike Uhlig
ulrike at moszumanska.debian.org
Fri May 26 12:53:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
ulrike pushed a commit to branch master
in repository onionshare.
commit a462c567ff54c443c2f4df6f14e2f38f347b21b7
Author: Micah Lee <micah at micahflee.com>
Date: Fri Apr 14 18:37:26 2017 -0700
Added onionshare logo as settings window icon
---
onionshare_gui/__init__.py | 6 +-----
onionshare_gui/settings_dialog.py | 3 ++-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/onionshare_gui/__init__.py b/onionshare_gui/__init__.py
index bc15f8c..074af39 100644
--- a/onionshare_gui/__init__.py
+++ b/onionshare_gui/__init__.py
@@ -69,7 +69,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.app = app
self.setWindowTitle('OnionShare')
- self.setWindowIcon(window_icon)
+ self.setWindowIcon(QtGui.QIcon(helpers.get_resource_path('images/logo.png')))
# the menu bar
self.setMenuBar(Menu(self.qtapp))
@@ -428,10 +428,6 @@ def main():
debug = bool(args.debug)
transparent_torification = bool(args.transparent_torification)
- # create the onionshare icon
- global window_icon
- window_icon = QtGui.QIcon(helpers.get_resource_path('images/logo.png'))
-
# validation
if filenames:
valid = True
diff --git a/onionshare_gui/settings_dialog.py b/onionshare_gui/settings_dialog.py
index 46c0b7e..a40da71 100644
--- a/onionshare_gui/settings_dialog.py
+++ b/onionshare_gui/settings_dialog.py
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
from PyQt5 import QtCore, QtWidgets, QtGui
import sys, platform
-from onionshare import strings
+from onionshare import strings, helpers
from onionshare.settings import Settings
from onionshare.onion import *
@@ -36,6 +36,7 @@ class SettingsDialog(QtWidgets.QDialog):
self.setModal(True)
self.setWindowTitle(strings._('gui_settings_window_title', True))
+ self.setWindowIcon(QtGui.QIcon(helpers.get_resource_path('images/logo.png')))
# Sharing options
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionshare.git
More information about the Pkg-privacy-commits
mailing list