From 10d59e81c9ae5275a92d041e36c61a0628b726f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Mon, 30 Sep 2013 12:14:23 -0300 Subject: Implement new UI Also: - Remove status_panel - Add new icons - Refactor components a bit (mostly divide functionality) --- data/bitmask.pro | 10 ++++++++-- data/images/black/32/arrow-down.png | Bin 0 -> 493 bytes data/images/black/32/arrow-up.png | Bin 0 -> 468 bytes data/images/black/32/cloud.png | Bin 0 -> 468 bytes data/images/black/32/contract.png | Bin 0 -> 417 bytes data/images/black/32/earth-square.png | Bin 0 -> 1068 bytes data/images/black/32/earth.png | Bin 0 -> 1145 bytes data/images/black/32/email-square.png | Bin 0 -> 787 bytes data/images/black/32/email.png | Bin 0 -> 754 bytes data/images/black/32/expand.png | Bin 0 -> 451 bytes data/images/black/32/gear.png | Bin 0 -> 644 bytes data/images/black/32/off.png | Bin 0 -> 695 bytes data/images/black/32/on.png | Bin 0 -> 667 bytes data/images/black/32/refresh.png | Bin 0 -> 624 bytes data/images/black/32/user.png | Bin 0 -> 534 bytes data/images/black/32/wait.png | Bin 0 -> 836 bytes data/images/white/32/arrow-down.png | Bin 0 -> 486 bytes data/images/white/32/arrow-up.png | Bin 0 -> 463 bytes data/images/white/32/cloud.png | Bin 0 -> 504 bytes data/images/white/32/contract.png | Bin 0 -> 417 bytes data/images/white/32/earth-square.png | Bin 0 -> 1068 bytes data/images/white/32/earth.png | Bin 0 -> 896 bytes data/images/white/32/email-square.png | Bin 0 -> 787 bytes data/images/white/32/email.png | Bin 0 -> 622 bytes data/images/white/32/expand.png | Bin 0 -> 451 bytes data/images/white/32/gear.png | Bin 0 -> 656 bytes data/images/white/32/off.png | Bin 0 -> 703 bytes data/images/white/32/on.png | Bin 0 -> 677 bytes data/images/white/32/refresh.png | Bin 0 -> 654 bytes data/images/white/32/user.png | Bin 0 -> 556 bytes data/images/white/32/wait.png | Bin 0 -> 855 bytes data/resources/mainwindow.qrc | 18 ++++++++++++++++++ 32 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 data/images/black/32/arrow-down.png create mode 100644 data/images/black/32/arrow-up.png create mode 100644 data/images/black/32/cloud.png create mode 100644 data/images/black/32/contract.png create mode 100644 data/images/black/32/earth-square.png create mode 100644 data/images/black/32/earth.png create mode 100644 data/images/black/32/email-square.png create mode 100644 data/images/black/32/email.png create mode 100644 data/images/black/32/expand.png create mode 100644 data/images/black/32/gear.png create mode 100644 data/images/black/32/off.png create mode 100644 data/images/black/32/on.png create mode 100644 data/images/black/32/refresh.png create mode 100644 data/images/black/32/user.png create mode 100644 data/images/black/32/wait.png create mode 100644 data/images/white/32/arrow-down.png create mode 100644 data/images/white/32/arrow-up.png create mode 100644 data/images/white/32/cloud.png create mode 100644 data/images/white/32/contract.png create mode 100644 data/images/white/32/earth-square.png create mode 100644 data/images/white/32/earth.png create mode 100644 data/images/white/32/email-square.png create mode 100644 data/images/white/32/email.png create mode 100644 data/images/white/32/expand.png create mode 100644 data/images/white/32/gear.png create mode 100644 data/images/white/32/off.png create mode 100644 data/images/white/32/on.png create mode 100644 data/images/white/32/refresh.png create mode 100644 data/images/white/32/user.png create mode 100644 data/images/white/32/wait.png (limited to 'data') 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 Binary files /dev/null and b/data/images/black/32/arrow-down.png 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 Binary files /dev/null and b/data/images/black/32/arrow-up.png differ diff --git a/data/images/black/32/cloud.png b/data/images/black/32/cloud.png new file mode 100644 index 00000000..10cbd62d Binary files /dev/null and b/data/images/black/32/cloud.png differ diff --git a/data/images/black/32/contract.png b/data/images/black/32/contract.png new file mode 100644 index 00000000..9f0ee605 Binary files /dev/null and b/data/images/black/32/contract.png 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 Binary files /dev/null and b/data/images/black/32/earth-square.png differ diff --git a/data/images/black/32/earth.png b/data/images/black/32/earth.png new file mode 100644 index 00000000..64919edc Binary files /dev/null and b/data/images/black/32/earth.png 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 Binary files /dev/null and b/data/images/black/32/email-square.png differ diff --git a/data/images/black/32/email.png b/data/images/black/32/email.png new file mode 100644 index 00000000..a6f40297 Binary files /dev/null and b/data/images/black/32/email.png differ diff --git a/data/images/black/32/expand.png b/data/images/black/32/expand.png new file mode 100644 index 00000000..c581503d Binary files /dev/null and b/data/images/black/32/expand.png differ diff --git a/data/images/black/32/gear.png b/data/images/black/32/gear.png new file mode 100644 index 00000000..93c8742d Binary files /dev/null and b/data/images/black/32/gear.png differ diff --git a/data/images/black/32/off.png b/data/images/black/32/off.png new file mode 100644 index 00000000..6ddde746 Binary files /dev/null and b/data/images/black/32/off.png differ diff --git a/data/images/black/32/on.png b/data/images/black/32/on.png new file mode 100644 index 00000000..bbd28bad Binary files /dev/null and b/data/images/black/32/on.png differ diff --git a/data/images/black/32/refresh.png b/data/images/black/32/refresh.png new file mode 100644 index 00000000..ad67f563 Binary files /dev/null and b/data/images/black/32/refresh.png differ diff --git a/data/images/black/32/user.png b/data/images/black/32/user.png new file mode 100644 index 00000000..7ea0f43a Binary files /dev/null and b/data/images/black/32/user.png differ diff --git a/data/images/black/32/wait.png b/data/images/black/32/wait.png new file mode 100644 index 00000000..a01ce923 Binary files /dev/null and b/data/images/black/32/wait.png 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 Binary files /dev/null and b/data/images/white/32/arrow-down.png 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 Binary files /dev/null and b/data/images/white/32/arrow-up.png differ diff --git a/data/images/white/32/cloud.png b/data/images/white/32/cloud.png new file mode 100644 index 00000000..39d589ef Binary files /dev/null and b/data/images/white/32/cloud.png differ diff --git a/data/images/white/32/contract.png b/data/images/white/32/contract.png new file mode 100644 index 00000000..262ff3c0 Binary files /dev/null and b/data/images/white/32/contract.png 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 Binary files /dev/null and b/data/images/white/32/earth-square.png differ diff --git a/data/images/white/32/earth.png b/data/images/white/32/earth.png new file mode 100644 index 00000000..efca7ccb Binary files /dev/null and b/data/images/white/32/earth.png 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 Binary files /dev/null and b/data/images/white/32/email-square.png differ diff --git a/data/images/white/32/email.png b/data/images/white/32/email.png new file mode 100644 index 00000000..abb36035 Binary files /dev/null and b/data/images/white/32/email.png differ diff --git a/data/images/white/32/expand.png b/data/images/white/32/expand.png new file mode 100644 index 00000000..0ec28dcc Binary files /dev/null and b/data/images/white/32/expand.png differ diff --git a/data/images/white/32/gear.png b/data/images/white/32/gear.png new file mode 100644 index 00000000..83f8d5ff Binary files /dev/null and b/data/images/white/32/gear.png differ diff --git a/data/images/white/32/off.png b/data/images/white/32/off.png new file mode 100644 index 00000000..22621594 Binary files /dev/null and b/data/images/white/32/off.png differ diff --git a/data/images/white/32/on.png b/data/images/white/32/on.png new file mode 100644 index 00000000..8946f763 Binary files /dev/null and b/data/images/white/32/on.png differ diff --git a/data/images/white/32/refresh.png b/data/images/white/32/refresh.png new file mode 100644 index 00000000..36a89da9 Binary files /dev/null and b/data/images/white/32/refresh.png differ diff --git a/data/images/white/32/user.png b/data/images/white/32/user.png new file mode 100644 index 00000000..ff8edd00 Binary files /dev/null and b/data/images/white/32/user.png differ diff --git a/data/images/white/32/wait.png b/data/images/white/32/wait.png new file mode 100644 index 00000000..8562d636 Binary files /dev/null and b/data/images/white/32/wait.png 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 @@ + ../images/white/32/off.png + ../images/white/32/on.png + ../images/white/32/wait.png + ../images/black/32/arrow-down.png + ../images/black/32/arrow-up.png + ../images/black/32/cloud.png + ../images/black/32/contract.png + ../images/black/32/earth-square.png + ../images/black/32/earth.png + ../images/black/32/email-square.png + ../images/black/32/email.png + ../images/black/32/expand.png + ../images/black/32/gear.png + ../images/black/32/off.png + ../images/black/32/on.png + ../images/black/32/refresh.png + ../images/black/32/user.png + ../images/black/32/wait.png ../images/mask-launcher.png ../images/mask-icon.png ../images/leap-gray-big.png -- cgit v1.2.3