summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-09-20 05:00:32 +0900
committerkali <kali@leap.se>2012-09-20 05:00:32 +0900
commit1ab8247ecb8664af5159b7f1e050189f5e637146 (patch)
tree1fac7766356a2a69870fd0e00fd306131bd036a9 /data
parent50396fca082652dd1a1617e0d029c1c726e4c651 (diff)
parent3c7451d62363d0a3326552956db630dda09392fa (diff)
Merge branch 'feature/systray-menu' into develop
Close #536. Cleaning up of the systray menu. Main window starts hidden if not in debug mode. Incidentally, some fixes related to the subprocess invocation and termination, removing many of the annoying hangs during debug.
Diffstat (limited to 'data')
-rw-r--r--data/images/leap-color-small.pngbin0 -> 11909 bytes
-rw-r--r--data/resources/mainwindow.qrc1
2 files changed, 1 insertions, 0 deletions
diff --git a/data/images/leap-color-small.png b/data/images/leap-color-small.png
new file mode 100644
index 00000000..afabe2c9
--- /dev/null
+++ b/data/images/leap-color-small.png
Binary files differ
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
index 9a2531c9..f62c531e 100644
--- a/data/resources/mainwindow.qrc
+++ b/data/resources/mainwindow.qrc
@@ -4,5 +4,6 @@
<file>../images/conn_connecting.png</file>
<file>../images/conn_connected.png</file>
<file>../images/leapfrog.jpg</file>
+ <file>../images/leap-color-small.png</file>
</qresource>
</RCC>