summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-09-30 12:14:23 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-01 11:22:39 -0300
commit10d59e81c9ae5275a92d041e36c61a0628b726f0 (patch)
tree1f6e0f9060658ba9f6706cf0c4967334d6cd7063 /data
parent487993d08cc2e12fdb9c9edcddff5727479e815d (diff)
Implement new UI
Also: - Remove status_panel - Add new icons - Refactor components a bit (mostly divide functionality)
Diffstat (limited to 'data')
-rw-r--r--data/bitmask.pro10
-rw-r--r--data/images/black/32/arrow-down.pngbin0 -> 493 bytes
-rw-r--r--data/images/black/32/arrow-up.pngbin0 -> 468 bytes
-rw-r--r--data/images/black/32/cloud.pngbin0 -> 468 bytes
-rw-r--r--data/images/black/32/contract.pngbin0 -> 417 bytes
-rw-r--r--data/images/black/32/earth-square.pngbin0 -> 1068 bytes
-rw-r--r--data/images/black/32/earth.pngbin0 -> 1145 bytes
-rw-r--r--data/images/black/32/email-square.pngbin0 -> 787 bytes
-rw-r--r--data/images/black/32/email.pngbin0 -> 754 bytes
-rw-r--r--data/images/black/32/expand.pngbin0 -> 451 bytes
-rw-r--r--data/images/black/32/gear.pngbin0 -> 644 bytes
-rw-r--r--data/images/black/32/off.pngbin0 -> 695 bytes
-rw-r--r--data/images/black/32/on.pngbin0 -> 667 bytes
-rw-r--r--data/images/black/32/refresh.pngbin0 -> 624 bytes
-rw-r--r--data/images/black/32/user.pngbin0 -> 534 bytes
-rw-r--r--data/images/black/32/wait.pngbin0 -> 836 bytes
-rw-r--r--data/images/white/32/arrow-down.pngbin0 -> 486 bytes
-rw-r--r--data/images/white/32/arrow-up.pngbin0 -> 463 bytes
-rw-r--r--data/images/white/32/cloud.pngbin0 -> 504 bytes
-rw-r--r--data/images/white/32/contract.pngbin0 -> 417 bytes
-rw-r--r--data/images/white/32/earth-square.pngbin0 -> 1068 bytes
-rw-r--r--data/images/white/32/earth.pngbin0 -> 896 bytes
-rw-r--r--data/images/white/32/email-square.pngbin0 -> 787 bytes
-rw-r--r--data/images/white/32/email.pngbin0 -> 622 bytes
-rw-r--r--data/images/white/32/expand.pngbin0 -> 451 bytes
-rw-r--r--data/images/white/32/gear.pngbin0 -> 656 bytes
-rw-r--r--data/images/white/32/off.pngbin0 -> 703 bytes
-rw-r--r--data/images/white/32/on.pngbin0 -> 677 bytes
-rw-r--r--data/images/white/32/refresh.pngbin0 -> 654 bytes
-rw-r--r--data/images/white/32/user.pngbin0 -> 556 bytes
-rw-r--r--data/images/white/32/wait.pngbin0 -> 855 bytes
-rw-r--r--data/resources/mainwindow.qrc18
32 files changed, 26 insertions, 2 deletions
diff --git a/data/bitmask.pro b/data/bitmask.pro
index e117668b..0f9aaf90 100644
--- a/data/bitmask.pro
+++ b/data/bitmask.pro
@@ -14,10 +14,13 @@ SOURCES += ../src/leap/bitmask/app.py \
../src/leap/bitmask/gui/loggerwindow.py \
../src/leap/bitmask/gui/login.py \
../src/leap/bitmask/gui/mainwindow.py \
- ../src/leap/bitmask/gui/statuspanel.py \
../src/leap/bitmask/gui/twisted_main.py \
../src/leap/bitmask/gui/wizardpage.py \
../src/leap/bitmask/gui/wizard.py \
+ ../src/leap/bitmask/gui/eip_status.py \
+ ../src/leap/bitmask/gui/mail_status.py \
+ ../src/leap/bitmask/gui/eippreferences.py \
+ ../src/leap/bitmask/gui/preferences.py \
../src/leap/bitmask/platform_init/initializers.py \
../src/leap/bitmask/platform_init/locks.py \
../src/leap/bitmask/provider/supportedapis.py \
@@ -45,8 +48,11 @@ SOURCES += ../src/leap/bitmask/app.py \
FORMS += ../src/leap/bitmask/gui/ui/loggerwindow.ui \
../src/leap/bitmask/gui/ui/login.ui \
../src/leap/bitmask/gui/ui/mainwindow.ui \
- ../src/leap/bitmask/gui/ui/statuspanel.ui \
../src/leap/bitmask/gui/ui/wizard.ui \
+ ../src/leap/bitmask/gui/ui/eip_status.ui \
+ ../src/leap/bitmask/gui/ui/mail_status.ui \
+ ../src/leap/bitmask/gui/ui/eippreferences.ui \
+ ../src/leap/bitmask/gui/ui/preferences.ui \
# where to generate ts files -- tx will pick from here
diff --git a/data/images/black/32/arrow-down.png b/data/images/black/32/arrow-down.png
new file mode 100644
index 00000000..328eb08d
--- /dev/null
+++ b/data/images/black/32/arrow-down.png
Binary files differ
diff --git a/data/images/black/32/arrow-up.png b/data/images/black/32/arrow-up.png
new file mode 100644
index 00000000..5eea5108
--- /dev/null
+++ b/data/images/black/32/arrow-up.png
Binary files differ
diff --git a/data/images/black/32/cloud.png b/data/images/black/32/cloud.png
new file mode 100644
index 00000000..10cbd62d
--- /dev/null
+++ b/data/images/black/32/cloud.png
Binary files differ
diff --git a/data/images/black/32/contract.png b/data/images/black/32/contract.png
new file mode 100644
index 00000000..9f0ee605
--- /dev/null
+++ b/data/images/black/32/contract.png
Binary files differ
diff --git a/data/images/black/32/earth-square.png b/data/images/black/32/earth-square.png
new file mode 100644
index 00000000..da7bf2cf
--- /dev/null
+++ b/data/images/black/32/earth-square.png
Binary files differ
diff --git a/data/images/black/32/earth.png b/data/images/black/32/earth.png
new file mode 100644
index 00000000..64919edc
--- /dev/null
+++ b/data/images/black/32/earth.png
Binary files differ
diff --git a/data/images/black/32/email-square.png b/data/images/black/32/email-square.png
new file mode 100644
index 00000000..499d7a8f
--- /dev/null
+++ b/data/images/black/32/email-square.png
Binary files differ
diff --git a/data/images/black/32/email.png b/data/images/black/32/email.png
new file mode 100644
index 00000000..a6f40297
--- /dev/null
+++ b/data/images/black/32/email.png
Binary files differ
diff --git a/data/images/black/32/expand.png b/data/images/black/32/expand.png
new file mode 100644
index 00000000..c581503d
--- /dev/null
+++ b/data/images/black/32/expand.png
Binary files differ
diff --git a/data/images/black/32/gear.png b/data/images/black/32/gear.png
new file mode 100644
index 00000000..93c8742d
--- /dev/null
+++ b/data/images/black/32/gear.png
Binary files differ
diff --git a/data/images/black/32/off.png b/data/images/black/32/off.png
new file mode 100644
index 00000000..6ddde746
--- /dev/null
+++ b/data/images/black/32/off.png
Binary files differ
diff --git a/data/images/black/32/on.png b/data/images/black/32/on.png
new file mode 100644
index 00000000..bbd28bad
--- /dev/null
+++ b/data/images/black/32/on.png
Binary files differ
diff --git a/data/images/black/32/refresh.png b/data/images/black/32/refresh.png
new file mode 100644
index 00000000..ad67f563
--- /dev/null
+++ b/data/images/black/32/refresh.png
Binary files differ
diff --git a/data/images/black/32/user.png b/data/images/black/32/user.png
new file mode 100644
index 00000000..7ea0f43a
--- /dev/null
+++ b/data/images/black/32/user.png
Binary files differ
diff --git a/data/images/black/32/wait.png b/data/images/black/32/wait.png
new file mode 100644
index 00000000..a01ce923
--- /dev/null
+++ b/data/images/black/32/wait.png
Binary files differ
diff --git a/data/images/white/32/arrow-down.png b/data/images/white/32/arrow-down.png
new file mode 100644
index 00000000..02ccc540
--- /dev/null
+++ b/data/images/white/32/arrow-down.png
Binary files differ
diff --git a/data/images/white/32/arrow-up.png b/data/images/white/32/arrow-up.png
new file mode 100644
index 00000000..fbe1f816
--- /dev/null
+++ b/data/images/white/32/arrow-up.png
Binary files differ
diff --git a/data/images/white/32/cloud.png b/data/images/white/32/cloud.png
new file mode 100644
index 00000000..39d589ef
--- /dev/null
+++ b/data/images/white/32/cloud.png
Binary files differ
diff --git a/data/images/white/32/contract.png b/data/images/white/32/contract.png
new file mode 100644
index 00000000..262ff3c0
--- /dev/null
+++ b/data/images/white/32/contract.png
Binary files differ
diff --git a/data/images/white/32/earth-square.png b/data/images/white/32/earth-square.png
new file mode 100644
index 00000000..da7bf2cf
--- /dev/null
+++ b/data/images/white/32/earth-square.png
Binary files differ
diff --git a/data/images/white/32/earth.png b/data/images/white/32/earth.png
new file mode 100644
index 00000000..efca7ccb
--- /dev/null
+++ b/data/images/white/32/earth.png
Binary files differ
diff --git a/data/images/white/32/email-square.png b/data/images/white/32/email-square.png
new file mode 100644
index 00000000..499d7a8f
--- /dev/null
+++ b/data/images/white/32/email-square.png
Binary files differ
diff --git a/data/images/white/32/email.png b/data/images/white/32/email.png
new file mode 100644
index 00000000..abb36035
--- /dev/null
+++ b/data/images/white/32/email.png
Binary files differ
diff --git a/data/images/white/32/expand.png b/data/images/white/32/expand.png
new file mode 100644
index 00000000..0ec28dcc
--- /dev/null
+++ b/data/images/white/32/expand.png
Binary files differ
diff --git a/data/images/white/32/gear.png b/data/images/white/32/gear.png
new file mode 100644
index 00000000..83f8d5ff
--- /dev/null
+++ b/data/images/white/32/gear.png
Binary files differ
diff --git a/data/images/white/32/off.png b/data/images/white/32/off.png
new file mode 100644
index 00000000..22621594
--- /dev/null
+++ b/data/images/white/32/off.png
Binary files differ
diff --git a/data/images/white/32/on.png b/data/images/white/32/on.png
new file mode 100644
index 00000000..8946f763
--- /dev/null
+++ b/data/images/white/32/on.png
Binary files differ
diff --git a/data/images/white/32/refresh.png b/data/images/white/32/refresh.png
new file mode 100644
index 00000000..36a89da9
--- /dev/null
+++ b/data/images/white/32/refresh.png
Binary files differ
diff --git a/data/images/white/32/user.png b/data/images/white/32/user.png
new file mode 100644
index 00000000..ff8edd00
--- /dev/null
+++ b/data/images/white/32/user.png
Binary files differ
diff --git a/data/images/white/32/wait.png b/data/images/white/32/wait.png
new file mode 100644
index 00000000..8562d636
--- /dev/null
+++ b/data/images/white/32/wait.png
Binary files differ
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
index 1e4159b8..0a917d5a 100644
--- a/data/resources/mainwindow.qrc
+++ b/data/resources/mainwindow.qrc
@@ -1,5 +1,23 @@
<RCC>
<qresource prefix="/">
+ <file>../images/white/32/off.png</file>
+ <file>../images/white/32/on.png</file>
+ <file>../images/white/32/wait.png</file>
+ <file>../images/black/32/arrow-down.png</file>
+ <file>../images/black/32/arrow-up.png</file>
+ <file>../images/black/32/cloud.png</file>
+ <file>../images/black/32/contract.png</file>
+ <file>../images/black/32/earth-square.png</file>
+ <file>../images/black/32/earth.png</file>
+ <file>../images/black/32/email-square.png</file>
+ <file>../images/black/32/email.png</file>
+ <file>../images/black/32/expand.png</file>
+ <file>../images/black/32/gear.png</file>
+ <file>../images/black/32/off.png</file>
+ <file>../images/black/32/on.png</file>
+ <file>../images/black/32/refresh.png</file>
+ <file>../images/black/32/user.png</file>
+ <file>../images/black/32/wait.png</file>
<file>../images/mask-launcher.png</file>
<file>../images/mask-icon.png</file>
<file>../images/leap-gray-big.png</file>