summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-10-25 00:58:04 +0200
committerKali Kaneko <kali@leap.se>2017-11-01 01:39:58 +0100
commit5f9e24bf31f93d0ceff4eba5d0b2969fa8bd7c87 (patch)
treea5c2f8ed01771b388185a768445b03532c1c670a
parentec908bfeec712fc5e65025392c1604f0d95212db (diff)
[feat] add new assets for icons
-rw-r--r--pkg/branding/black/22/off.pngbin0 -> 542 bytes
-rw-r--r--pkg/branding/black/22/on.pngbin0 -> 519 bytes
-rw-r--r--pkg/branding/black/22/question.pngbin0 -> 562 bytes
-rw-r--r--pkg/branding/black/22/wait.pngbin0 -> 596 bytes
-rw-r--r--pkg/branding/icons.qrc8
-rw-r--r--pkg/branding/white/22/off.pngbin0 -> 587 bytes
-rw-r--r--pkg/branding/white/22/on.pngbin0 -> 533 bytes
-rw-r--r--pkg/branding/white/22/question.pngbin0 -> 558 bytes
-rw-r--r--pkg/branding/white/22/wait.pngbin0 -> 588 bytes
-rw-r--r--src/leap/bitmask/gui/app.py1
10 files changed, 8 insertions, 1 deletions
diff --git a/pkg/branding/black/22/off.png b/pkg/branding/black/22/off.png
new file mode 100644
index 0000000..65afeef
--- /dev/null
+++ b/pkg/branding/black/22/off.png
Binary files differ
diff --git a/pkg/branding/black/22/on.png b/pkg/branding/black/22/on.png
new file mode 100644
index 0000000..229140a
--- /dev/null
+++ b/pkg/branding/black/22/on.png
Binary files differ
diff --git a/pkg/branding/black/22/question.png b/pkg/branding/black/22/question.png
new file mode 100644
index 0000000..bb259fa
--- /dev/null
+++ b/pkg/branding/black/22/question.png
Binary files differ
diff --git a/pkg/branding/black/22/wait.png b/pkg/branding/black/22/wait.png
new file mode 100644
index 0000000..c267363
--- /dev/null
+++ b/pkg/branding/black/22/wait.png
Binary files differ
diff --git a/pkg/branding/icons.qrc b/pkg/branding/icons.qrc
index ab994cd..9eb21ba 100644
--- a/pkg/branding/icons.qrc
+++ b/pkg/branding/icons.qrc
@@ -1,5 +1,13 @@
<RCC>
<qresource prefix="/">
<file>mask-icon.png</file>
+ <file>black/22/off.png</file>
+ <file>black/22/on.png</file>
+ <file>black/22/question.png</file>
+ <file>black/22/wait.png</file>
+ <file>white/22/off.png</file>
+ <file>white/22/on.png</file>
+ <file>white/22/question.png</file>
+ <file>white/22/wait.png</file>
</qresource>
</RCC>
diff --git a/pkg/branding/white/22/off.png b/pkg/branding/white/22/off.png
new file mode 100644
index 0000000..bd4bb0e
--- /dev/null
+++ b/pkg/branding/white/22/off.png
Binary files differ
diff --git a/pkg/branding/white/22/on.png b/pkg/branding/white/22/on.png
new file mode 100644
index 0000000..3a3d5b5
--- /dev/null
+++ b/pkg/branding/white/22/on.png
Binary files differ
diff --git a/pkg/branding/white/22/question.png b/pkg/branding/white/22/question.png
new file mode 100644
index 0000000..bd2a629
--- /dev/null
+++ b/pkg/branding/white/22/question.png
Binary files differ
diff --git a/pkg/branding/white/22/wait.png b/pkg/branding/white/22/wait.png
new file mode 100644
index 0000000..e0fb53d
--- /dev/null
+++ b/pkg/branding/white/22/wait.png
Binary files differ
diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py
index 8ec15b2..91e8c87 100644
--- a/src/leap/bitmask/gui/app.py
+++ b/src/leap/bitmask/gui/app.py
@@ -75,7 +75,6 @@ class WithTrayIcon(QDialog):
def createTrayIcon(self):
self.trayIcon = QSystemTrayIcon(self)
- self.trayIcon.setContextMenu(self.trayIconMenu)
class BrowserWindow(QWebView, WithTrayIcon):