diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-08-11 20:08:10 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-08-11 20:08:10 -0300 |
| commit | ad2d4b132805270a13a6c80d6e6f154d687315b3 (patch) | |
| tree | e2fe502e35c7a0a45726972385ee78114e50238f | |
| parent | c52ca1aa1e9637d3e7d18f30b7c476ab1b1fe13a (diff) | |
| parent | 4e3de46b0398f363c65a74197ebd858f6d577b81 (diff) | |
Merge remote-tracking branch 'refs/remotes/elijah/feature/iconcleanup' into develop
131 files changed, 167 insertions, 129 deletions
@@ -22,7 +22,7 @@ PROJFILE = data/bitmask.pro #UI files to compile UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui preferences.ui eip_status.ui mail_status.ui eippreferences.ui advanced_key_management.ui #Qt resource files to compile -RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc icons.qrc eipstatus.qrc +RESOURCES = icons.qrc flags.qrc locale.qrc loggerwindow.qrc #pyuic4 and pyrcc4 binaries PYUIC = pyside-uic diff --git a/data/images/black/22/off.png b/data/images/black/22/off.png Binary files differnew file mode 100644 index 00000000..65afeef2 --- /dev/null +++ b/data/images/black/22/off.png diff --git a/data/images/black/22/on.png b/data/images/black/22/on.png Binary files differnew file mode 100644 index 00000000..229140a3 --- /dev/null +++ b/data/images/black/22/on.png diff --git a/data/images/black/22/question.png b/data/images/black/22/question.png Binary files differnew file mode 100644 index 00000000..bb259fac --- /dev/null +++ b/data/images/black/22/question.png diff --git a/data/images/black/22/wait.png b/data/images/black/22/wait.png Binary files differnew file mode 100644 index 00000000..c267363b --- /dev/null +++ b/data/images/black/22/wait.png diff --git a/data/images/black/24/off.png b/data/images/black/24/off.png Binary files differdeleted file mode 100644 index 72d41d18..00000000 --- a/data/images/black/24/off.png +++ /dev/null diff --git a/data/images/black/24/on.png b/data/images/black/24/on.png Binary files differdeleted file mode 100644 index e75d7d9a..00000000 --- a/data/images/black/24/on.png +++ /dev/null diff --git a/data/images/black/24/question.png b/data/images/black/24/question.png Binary files differdeleted file mode 100644 index efa11b12..00000000 --- a/data/images/black/24/question.png +++ /dev/null diff --git a/data/images/black/24/wait.png b/data/images/black/24/wait.png Binary files differdeleted file mode 100644 index 7eb78f77..00000000 --- a/data/images/black/24/wait.png +++ /dev/null diff --git a/data/images/black/32/cloud.png b/data/images/black/32/cloud.png Binary files differdeleted file mode 100644 index 10cbd62d..00000000 --- a/data/images/black/32/cloud.png +++ /dev/null diff --git a/data/images/black/32/contract.png b/data/images/black/32/contract.png Binary files differdeleted file mode 100644 index 9f0ee605..00000000 --- a/data/images/black/32/contract.png +++ /dev/null diff --git a/data/images/black/32/earth-square.png b/data/images/black/32/earth-square.png Binary files differdeleted file mode 100644 index da7bf2cf..00000000 --- a/data/images/black/32/earth-square.png +++ /dev/null diff --git a/data/images/black/32/email-square.png b/data/images/black/32/email-square.png Binary files differdeleted file mode 100644 index 499d7a8f..00000000 --- a/data/images/black/32/email-square.png +++ /dev/null diff --git a/data/images/black/32/expand.png b/data/images/black/32/expand.png Binary files differdeleted file mode 100644 index c581503d..00000000 --- a/data/images/black/32/expand.png +++ /dev/null diff --git a/data/images/black/32/gear.png b/data/images/black/32/gear.png Binary files differdeleted file mode 100644 index 93c8742d..00000000 --- a/data/images/black/32/gear.png +++ /dev/null diff --git a/data/images/black/32/refresh.png b/data/images/black/32/refresh.png Binary files differdeleted file mode 100644 index ad67f563..00000000 --- a/data/images/black/32/refresh.png +++ /dev/null diff --git a/data/images/conn_connected-light.png b/data/images/conn_connected-light.png Binary files differdeleted file mode 100644 index a0db2a22..00000000 --- a/data/images/conn_connected-light.png +++ /dev/null diff --git a/data/images/conn_connected.png b/data/images/conn_connected.png Binary files differdeleted file mode 100644 index a5d20497..00000000 --- a/data/images/conn_connected.png +++ /dev/null diff --git a/data/images/conn_connecting-light.png b/data/images/conn_connecting-light.png Binary files differdeleted file mode 100644 index 83e3ea75..00000000 --- a/data/images/conn_connecting-light.png +++ /dev/null diff --git a/data/images/conn_connecting.png b/data/images/conn_connecting.png Binary files differdeleted file mode 100644 index 31b6e617..00000000 --- a/data/images/conn_connecting.png +++ /dev/null diff --git a/data/images/conn_error-light.png b/data/images/conn_error-light.png Binary files differdeleted file mode 100644 index 8cee20fe..00000000 --- a/data/images/conn_error-light.png +++ /dev/null diff --git a/data/images/conn_error.png b/data/images/conn_error.png Binary files differdeleted file mode 100644 index 85669af6..00000000 --- a/data/images/conn_error.png +++ /dev/null diff --git a/data/images/countries/ar.png b/data/images/countries/ar.png Binary files differnew file mode 100755 index 00000000..e5ef8f1f --- /dev/null +++ b/data/images/countries/ar.png diff --git a/data/images/countries/at.png b/data/images/countries/at.png Binary files differnew file mode 100755 index 00000000..0f15f34f --- /dev/null +++ b/data/images/countries/at.png diff --git a/data/images/countries/au.png b/data/images/countries/au.png Binary files differnew file mode 100755 index 00000000..a01389a7 --- /dev/null +++ b/data/images/countries/au.png diff --git a/data/images/countries/bd.png b/data/images/countries/bd.png Binary files differnew file mode 100755 index 00000000..076a8bf8 --- /dev/null +++ b/data/images/countries/bd.png diff --git a/data/images/countries/be.png b/data/images/countries/be.png Binary files differnew file mode 100755 index 00000000..d86ebc80 --- /dev/null +++ b/data/images/countries/be.png diff --git a/data/images/countries/br.png b/data/images/countries/br.png Binary files differnew file mode 100755 index 00000000..9b1a5538 --- /dev/null +++ b/data/images/countries/br.png diff --git a/data/images/countries/ca.png b/data/images/countries/ca.png Binary files differnew file mode 100755 index 00000000..1f204193 --- /dev/null +++ b/data/images/countries/ca.png diff --git a/data/images/countries/cat.png b/data/images/countries/cat.png Binary files differnew file mode 100644 index 00000000..5041e308 --- /dev/null +++ b/data/images/countries/cat.png diff --git a/data/images/countries/ch.png b/data/images/countries/ch.png Binary files differnew file mode 100755 index 00000000..242ec01a --- /dev/null +++ b/data/images/countries/ch.png diff --git a/data/images/countries/cl.png b/data/images/countries/cl.png Binary files differnew file mode 100755 index 00000000..29c6d61b --- /dev/null +++ b/data/images/countries/cl.png diff --git a/data/images/countries/cn.png b/data/images/countries/cn.png Binary files differnew file mode 100755 index 00000000..89144146 --- /dev/null +++ b/data/images/countries/cn.png diff --git a/data/images/countries/co.png b/data/images/countries/co.png Binary files differnew file mode 100755 index 00000000..a118ff4a --- /dev/null +++ b/data/images/countries/co.png diff --git a/data/images/countries/cy.png b/data/images/countries/cy.png Binary files differnew file mode 100755 index 00000000..5b1ad6c0 --- /dev/null +++ b/data/images/countries/cy.png diff --git a/data/images/countries/cz.png b/data/images/countries/cz.png Binary files differnew file mode 100755 index 00000000..c8403dd2 --- /dev/null +++ b/data/images/countries/cz.png diff --git a/data/images/countries/de.png b/data/images/countries/de.png Binary files differnew file mode 100755 index 00000000..ac4a9773 --- /dev/null +++ b/data/images/countries/de.png diff --git a/data/images/countries/dk.png b/data/images/countries/dk.png Binary files differnew file mode 100755 index 00000000..e2993d3c --- /dev/null +++ b/data/images/countries/dk.png diff --git a/data/images/countries/ec.png b/data/images/countries/ec.png Binary files differnew file mode 100755 index 00000000..0caa0b1e --- /dev/null +++ b/data/images/countries/ec.png diff --git a/data/images/countries/ee.png b/data/images/countries/ee.png Binary files differnew file mode 100755 index 00000000..0c82efb7 --- /dev/null +++ b/data/images/countries/ee.png diff --git a/data/images/countries/es.png b/data/images/countries/es.png Binary files differnew file mode 100755 index 00000000..c2de2d71 --- /dev/null +++ b/data/images/countries/es.png diff --git a/data/images/countries/fi.png b/data/images/countries/fi.png Binary files differnew file mode 100755 index 00000000..14ec091b --- /dev/null +++ b/data/images/countries/fi.png diff --git a/data/images/countries/fr.png b/data/images/countries/fr.png Binary files differnew file mode 100755 index 00000000..8332c4ec --- /dev/null +++ b/data/images/countries/fr.png diff --git a/data/images/countries/gb.png b/data/images/countries/gb.png Binary files differnew file mode 100644 index 00000000..ff701e19 --- /dev/null +++ b/data/images/countries/gb.png diff --git a/data/images/countries/gr.png b/data/images/countries/gr.png Binary files differnew file mode 100755 index 00000000..8651ade7 --- /dev/null +++ b/data/images/countries/gr.png diff --git a/data/images/countries/hk.png b/data/images/countries/hk.png Binary files differnew file mode 100755 index 00000000..d5c380ca --- /dev/null +++ b/data/images/countries/hk.png diff --git a/data/images/countries/hu.png b/data/images/countries/hu.png Binary files differnew file mode 100755 index 00000000..7baafe44 --- /dev/null +++ b/data/images/countries/hu.png diff --git a/data/images/countries/id.png b/data/images/countries/id.png Binary files differnew file mode 100755 index 00000000..c6bc0faf --- /dev/null +++ b/data/images/countries/id.png diff --git a/data/images/countries/ie.png b/data/images/countries/ie.png Binary files differnew file mode 100755 index 00000000..26baa31e --- /dev/null +++ b/data/images/countries/ie.png diff --git a/data/images/countries/il.png b/data/images/countries/il.png Binary files differnew file mode 100755 index 00000000..2ca772d0 --- /dev/null +++ b/data/images/countries/il.png diff --git a/data/images/countries/in.png b/data/images/countries/in.png Binary files differnew file mode 100755 index 00000000..e4d7e81a --- /dev/null +++ b/data/images/countries/in.png diff --git a/data/images/countries/iq.png b/data/images/countries/iq.png Binary files differnew file mode 100755 index 00000000..878a3514 --- /dev/null +++ b/data/images/countries/iq.png diff --git a/data/images/countries/ir.png b/data/images/countries/ir.png Binary files differnew file mode 100755 index 00000000..c5fd136a --- /dev/null +++ b/data/images/countries/ir.png diff --git a/data/images/countries/is.png b/data/images/countries/is.png Binary files differnew file mode 100755 index 00000000..b8f6d0f0 --- /dev/null +++ b/data/images/countries/is.png diff --git a/data/images/countries/it.png b/data/images/countries/it.png Binary files differnew file mode 100755 index 00000000..89692f74 --- /dev/null +++ b/data/images/countries/it.png diff --git a/data/images/countries/jp.png b/data/images/countries/jp.png Binary files differnew file mode 100755 index 00000000..325fbad3 --- /dev/null +++ b/data/images/countries/jp.png diff --git a/data/images/countries/kh.png b/data/images/countries/kh.png Binary files differnew file mode 100755 index 00000000..30f6bb1b --- /dev/null +++ b/data/images/countries/kh.png diff --git a/data/images/countries/kr.png b/data/images/countries/kr.png Binary files differnew file mode 100755 index 00000000..9c0a78eb --- /dev/null +++ b/data/images/countries/kr.png diff --git a/data/images/countries/lb.png b/data/images/countries/lb.png Binary files differnew file mode 100755 index 00000000..d0d452bf --- /dev/null +++ b/data/images/countries/lb.png diff --git a/data/images/countries/ly.png b/data/images/countries/ly.png Binary files differnew file mode 100755 index 00000000..b163a9f8 --- /dev/null +++ b/data/images/countries/ly.png diff --git a/data/images/countries/mx.png b/data/images/countries/mx.png Binary files differnew file mode 100755 index 00000000..5bc58ab3 --- /dev/null +++ b/data/images/countries/mx.png diff --git a/data/images/countries/my.png b/data/images/countries/my.png Binary files differnew file mode 100755 index 00000000..9034cbab --- /dev/null +++ b/data/images/countries/my.png diff --git a/data/images/countries/ng.png b/data/images/countries/ng.png Binary files differnew file mode 100755 index 00000000..3eea2e02 --- /dev/null +++ b/data/images/countries/ng.png diff --git a/data/images/countries/no.png b/data/images/countries/no.png Binary files differnew file mode 100755 index 00000000..160b6b5b --- /dev/null +++ b/data/images/countries/no.png diff --git a/data/images/countries/nz.png b/data/images/countries/nz.png Binary files differnew file mode 100755 index 00000000..10d6306d --- /dev/null +++ b/data/images/countries/nz.png diff --git a/data/images/countries/pe.png b/data/images/countries/pe.png Binary files differnew file mode 100755 index 00000000..62a04977 --- /dev/null +++ b/data/images/countries/pe.png diff --git a/data/images/countries/pk.png b/data/images/countries/pk.png Binary files differnew file mode 100755 index 00000000..e9df70ca --- /dev/null +++ b/data/images/countries/pk.png diff --git a/data/images/countries/pl.png b/data/images/countries/pl.png Binary files differnew file mode 100755 index 00000000..d413d010 --- /dev/null +++ b/data/images/countries/pl.png diff --git a/data/images/countries/ps.png b/data/images/countries/ps.png Binary files differnew file mode 100755 index 00000000..f5f54776 --- /dev/null +++ b/data/images/countries/ps.png diff --git a/data/images/countries/py.png b/data/images/countries/py.png Binary files differnew file mode 100755 index 00000000..cb8723c0 --- /dev/null +++ b/data/images/countries/py.png diff --git a/data/images/countries/ru.png b/data/images/countries/ru.png Binary files differnew file mode 100755 index 00000000..47da4214 --- /dev/null +++ b/data/images/countries/ru.png diff --git a/data/images/countries/se.png b/data/images/countries/se.png Binary files differnew file mode 100755 index 00000000..1994653d --- /dev/null +++ b/data/images/countries/se.png diff --git a/data/images/countries/sg.png b/data/images/countries/sg.png Binary files differnew file mode 100755 index 00000000..dd34d612 --- /dev/null +++ b/data/images/countries/sg.png diff --git a/data/images/countries/tn.png b/data/images/countries/tn.png Binary files differnew file mode 100755 index 00000000..183cdd3d --- /dev/null +++ b/data/images/countries/tn.png diff --git a/data/images/countries/ua.png b/data/images/countries/ua.png Binary files differnew file mode 100755 index 00000000..09563a21 --- /dev/null +++ b/data/images/countries/ua.png diff --git a/data/images/countries/ve.png b/data/images/countries/ve.png Binary files differnew file mode 100755 index 00000000..00c90f9a --- /dev/null +++ b/data/images/countries/ve.png diff --git a/data/images/countries/vn.png b/data/images/countries/vn.png Binary files differnew file mode 100755 index 00000000..ec7cd48a --- /dev/null +++ b/data/images/countries/vn.png diff --git a/data/images/countries/za.png b/data/images/countries/za.png Binary files differnew file mode 100755 index 00000000..57c58e21 --- /dev/null +++ b/data/images/countries/za.png diff --git a/data/images/favicon.ico b/data/images/favicon.ico Binary files differdeleted file mode 100644 index 7f41dd1d..00000000 --- a/data/images/favicon.ico +++ /dev/null diff --git a/data/images/leap-client.icns b/data/images/leap-client.icns Binary files differdeleted file mode 100644 index d5d52cdc..00000000 --- a/data/images/leap-client.icns +++ /dev/null diff --git a/data/images/leap-client.tiff b/data/images/leap-client.tiff Binary files differdeleted file mode 100644 index 71c95b0d..00000000 --- a/data/images/leap-client.tiff +++ /dev/null diff --git a/data/images/leap-color-big.png b/data/images/leap-color-big.png Binary files differdeleted file mode 100644 index eafacdcd..00000000 --- a/data/images/leap-color-big.png +++ /dev/null diff --git a/data/images/leap-gray-big.png b/data/images/leap-gray-big.png Binary files differdeleted file mode 100644 index 1529a74f..00000000 --- a/data/images/leap-gray-big.png +++ /dev/null diff --git a/data/images/light/16/accept.png b/data/images/light/16/accept.png Binary files differdeleted file mode 100644 index 917a68c4..00000000 --- a/data/images/light/16/accept.png +++ /dev/null diff --git a/data/images/light/16/down-arrow.png b/data/images/light/16/down-arrow.png Binary files differdeleted file mode 100644 index 9beb5de3..00000000 --- a/data/images/light/16/down-arrow.png +++ /dev/null diff --git a/data/images/light/16/error.png b/data/images/light/16/error.png Binary files differdeleted file mode 100644 index edc20985..00000000 --- a/data/images/light/16/error.png +++ /dev/null diff --git a/data/images/light/16/refresh.png b/data/images/light/16/refresh.png Binary files differdeleted file mode 100644 index a948a071..00000000 --- a/data/images/light/16/refresh.png +++ /dev/null diff --git a/data/images/light/16/up-arrow.png b/data/images/light/16/up-arrow.png Binary files differdeleted file mode 100644 index 4e0ec404..00000000 --- a/data/images/light/16/up-arrow.png +++ /dev/null diff --git a/data/images/light/64/network-eip-acquiring.png b/data/images/light/64/network-eip-acquiring.png Binary files differdeleted file mode 100644 index 83e3ea75..00000000 --- a/data/images/light/64/network-eip-acquiring.png +++ /dev/null diff --git a/data/images/light/64/network-eip-down.png b/data/images/light/64/network-eip-down.png Binary files differdeleted file mode 100644 index 85669af6..00000000 --- a/data/images/light/64/network-eip-down.png +++ /dev/null diff --git a/data/images/light/64/network-eip-up.png b/data/images/light/64/network-eip-up.png Binary files differdeleted file mode 100644 index a0db2a22..00000000 --- a/data/images/light/64/network-eip-up.png +++ /dev/null diff --git a/data/images/mail-locked.png b/data/images/mail-locked.png Binary files differdeleted file mode 100644 index 2108ca1c..00000000 --- a/data/images/mail-locked.png +++ /dev/null diff --git a/data/images/mail-unlocked.png b/data/images/mail-unlocked.png Binary files differdeleted file mode 100644 index fc3c11b0..00000000 --- a/data/images/mail-unlocked.png +++ /dev/null diff --git a/data/images/mask-launcher.png b/data/images/mask-launcher.png Binary files differdeleted file mode 100644 index cb27f8d3..00000000 --- a/data/images/mask-launcher.png +++ /dev/null diff --git a/data/images/mask-small.png b/data/images/mask-small.png Binary files differdeleted file mode 100644 index 5f5f1b41..00000000 --- a/data/images/mask-small.png +++ /dev/null diff --git a/data/images/white/22/off.png b/data/images/white/22/off.png Binary files differnew file mode 100644 index 00000000..bd4bb0ee --- /dev/null +++ b/data/images/white/22/off.png diff --git a/data/images/white/22/on.png b/data/images/white/22/on.png Binary files differnew file mode 100644 index 00000000..3a3d5b55 --- /dev/null +++ b/data/images/white/22/on.png diff --git a/data/images/white/22/question.png b/data/images/white/22/question.png Binary files differnew file mode 100644 index 00000000..bd2a6292 --- /dev/null +++ b/data/images/white/22/question.png diff --git a/data/images/white/22/wait.png b/data/images/white/22/wait.png Binary files differnew file mode 100644 index 00000000..e0fb53df --- /dev/null +++ b/data/images/white/22/wait.png diff --git a/data/images/white/24/off.png b/data/images/white/24/off.png Binary files differdeleted file mode 100644 index 5ded2a42..00000000 --- a/data/images/white/24/off.png +++ /dev/null diff --git a/data/images/white/24/on.png b/data/images/white/24/on.png Binary files differdeleted file mode 100644 index 48fbd5f7..00000000 --- a/data/images/white/24/on.png +++ /dev/null diff --git a/data/images/white/24/question.png b/data/images/white/24/question.png Binary files differdeleted file mode 100644 index e2188150..00000000 --- a/data/images/white/24/question.png +++ /dev/null diff --git a/data/images/white/24/wait.png b/data/images/white/24/wait.png Binary files differdeleted file mode 100644 index cbe7d598..00000000 --- a/data/images/white/24/wait.png +++ /dev/null diff --git a/data/images/white/32/arrow-down.png b/data/images/white/32/arrow-down.png Binary files differdeleted file mode 100644 index 02ccc540..00000000 --- a/data/images/white/32/arrow-down.png +++ /dev/null diff --git a/data/images/white/32/arrow-up.png b/data/images/white/32/arrow-up.png Binary files differdeleted file mode 100644 index fbe1f816..00000000 --- a/data/images/white/32/arrow-up.png +++ /dev/null diff --git a/data/images/white/32/cloud.png b/data/images/white/32/cloud.png Binary files differdeleted file mode 100644 index 39d589ef..00000000 --- a/data/images/white/32/cloud.png +++ /dev/null diff --git a/data/images/white/32/contract.png b/data/images/white/32/contract.png Binary files differdeleted file mode 100644 index 262ff3c0..00000000 --- a/data/images/white/32/contract.png +++ /dev/null diff --git a/data/images/white/32/earth-square.png b/data/images/white/32/earth-square.png Binary files differdeleted file mode 100644 index da7bf2cf..00000000 --- a/data/images/white/32/earth-square.png +++ /dev/null diff --git a/data/images/white/32/earth.png b/data/images/white/32/earth.png Binary files differdeleted file mode 100644 index efca7ccb..00000000 --- a/data/images/white/32/earth.png +++ /dev/null diff --git a/data/images/white/32/email-square.png b/data/images/white/32/email-square.png Binary files differdeleted file mode 100644 index 499d7a8f..00000000 --- a/data/images/white/32/email-square.png +++ /dev/null diff --git a/data/images/white/32/email.png b/data/images/white/32/email.png Binary files differdeleted file mode 100644 index abb36035..00000000 --- a/data/images/white/32/email.png +++ /dev/null diff --git a/data/images/white/32/expand.png b/data/images/white/32/expand.png Binary files differdeleted file mode 100644 index 0ec28dcc..00000000 --- a/data/images/white/32/expand.png +++ /dev/null diff --git a/data/images/white/32/gear.png b/data/images/white/32/gear.png Binary files differdeleted file mode 100644 index 83f8d5ff..00000000 --- a/data/images/white/32/gear.png +++ /dev/null diff --git a/data/images/white/32/refresh.png b/data/images/white/32/refresh.png Binary files differdeleted file mode 100644 index 36a89da9..00000000 --- a/data/images/white/32/refresh.png +++ /dev/null diff --git a/data/images/white/32/user.png b/data/images/white/32/user.png Binary files differdeleted file mode 100644 index ff8edd00..00000000 --- a/data/images/white/32/user.png +++ /dev/null diff --git a/data/resources/eipstatus.qrc b/data/resources/eipstatus.qrc deleted file mode 100644 index 5d0f2924..00000000 --- a/data/resources/eipstatus.qrc +++ /dev/null @@ -1,7 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>../images/countries/nl.png</file> - <file>../images/countries/tr.png</file> - <file>../images/countries/us.png</file> - </qresource> -</RCC> diff --git a/data/resources/flags.qrc b/data/resources/flags.qrc new file mode 100644 index 00000000..8bdc9c4c --- /dev/null +++ b/data/resources/flags.qrc @@ -0,0 +1,63 @@ +<RCC> + <qresource prefix="/"> + <file>../images/countries/ar.png</file> + <file>../images/countries/at.png</file> + <file>../images/countries/au.png</file> + <file>../images/countries/bd.png</file> + <file>../images/countries/be.png</file> + <file>../images/countries/br.png</file> + <file>../images/countries/ca.png</file> + <file>../images/countries/cat.png</file> + <file>../images/countries/ch.png</file> + <file>../images/countries/cl.png</file> + <file>../images/countries/cn.png</file> + <file>../images/countries/co.png</file> + <file>../images/countries/cy.png</file> + <file>../images/countries/cz.png</file> + <file>../images/countries/de.png</file> + <file>../images/countries/dk.png</file> + <file>../images/countries/ec.png</file> + <file>../images/countries/ee.png</file> + <file>../images/countries/es.png</file> + <file>../images/countries/fi.png</file> + <file>../images/countries/fr.png</file> + <file>../images/countries/gb.png</file> + <file>../images/countries/gr.png</file> + <file>../images/countries/hk.png</file> + <file>../images/countries/hu.png</file> + <file>../images/countries/id.png</file> + <file>../images/countries/ie.png</file> + <file>../images/countries/il.png</file> + <file>../images/countries/in.png</file> + <file>../images/countries/iq.png</file> + <file>../images/countries/ir.png</file> + <file>../images/countries/is.png</file> + <file>../images/countries/it.png</file> + <file>../images/countries/jp.png</file> + <file>../images/countries/kh.png</file> + <file>../images/countries/kr.png</file> + <file>../images/countries/lb.png</file> + <file>../images/countries/ly.png</file> + <file>../images/countries/mx.png</file> + <file>../images/countries/my.png</file> + <file>../images/countries/ng.png</file> + <file>../images/countries/nl.png</file> + <file>../images/countries/no.png</file> + <file>../images/countries/nz.png</file> + <file>../images/countries/pe.png</file> + <file>../images/countries/pk.png</file> + <file>../images/countries/pl.png</file> + <file>../images/countries/ps.png</file> + <file>../images/countries/py.png</file> + <file>../images/countries/ru.png</file> + <file>../images/countries/se.png</file> + <file>../images/countries/sg.png</file> + <file>../images/countries/tn.png</file> + <file>../images/countries/tr.png</file> + <file>../images/countries/ua.png</file> + <file>../images/countries/us.png</file> + <file>../images/countries/ve.png</file> + <file>../images/countries/vn.png</file> + <file>../images/countries/za.png</file> + </qresource> +</RCC>
\ No newline at end of file diff --git a/data/resources/icons.qrc b/data/resources/icons.qrc index 1cc574e2..7fda6197 100644 --- a/data/resources/icons.qrc +++ b/data/resources/icons.qrc @@ -1,11 +1,38 @@ <RCC> <qresource prefix="/"> - <file>../images/mail-locked.png</file> - <file>../images/mail-unlocked.png</file> - <file>../images/light/16/down-arrow.png</file> - <file>../images/light/16/up-arrow.png</file> - <file>../images/light/64/network-eip-acquiring.png</file> - <file>../images/light/64/network-eip-down.png</file> - <file>../images/light/64/network-eip-up.png</file> + + <!-- used as window icon --> + <file>../images/mask-icon.png</file> + + <!-- round status icons --> + <file>../images/black/off.svg</file> + <file>../images/black/on.svg</file> + <file>../images/black/question.svg</file> + <file>../images/black/wait.svg</file> + <file>../images/black/22/off.png</file> + <file>../images/black/22/on.png</file> + <file>../images/black/22/question.png</file> + <file>../images/black/22/wait.png</file> + + <file>../images/white/off.svg</file> + <file>../images/white/on.svg</file> + <file>../images/white/question.svg</file> + <file>../images/white/wait.svg</file> + <file>../images/white/22/off.png</file> + <file>../images/white/22/on.png</file> + <file>../images/white/22/question.png</file> + <file>../images/white/22/wait.png</file> + + <!-- used by login --> + <file>../images/black/32/user.png</file> + + <!-- used by eip status --> + <file>../images/black/32/earth.png</file> + <file>../images/black/32/arrow-down.png</file> + <file>../images/black/32/arrow-up.png</file> + + <!-- used by email status --> + <file>../images/black/32/email.png</file> + </qresource> </RCC> diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc deleted file mode 100644 index c400bb71..00000000 --- a/data/resources/mainwindow.qrc +++ /dev/null @@ -1,44 +0,0 @@ -<RCC> - <qresource prefix="/"> - <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/off.svg</file> - <file>../images/black/on.svg</file> - <file>../images/black/question.svg</file> - <file>../images/black/wait.svg</file> - <file>../images/black/24/off.png</file> - <file>../images/black/24/on.png</file> - <file>../images/black/24/question.png</file> - <file>../images/black/24/wait.png</file> - - <file>../images/white/off.svg</file> - <file>../images/white/on.svg</file> - <file>../images/white/question.svg</file> - <file>../images/white/wait.svg</file> - <file>../images/white/24/off.png</file> - <file>../images/white/24/on.png</file> - <file>../images/white/24/question.png</file> - <file>../images/white/24/wait.png</file> - - <file>../images/mask-launcher.png</file> - <file>../images/mask-icon.png</file> - <file>../images/leap-gray-big.png</file> - <file>../images/leap-color-big.png</file> - <file>../images/conn_connecting.png</file> - <file>../images/conn_connected.png</file> - <file>../images/conn_error.png</file> - <file>../images/conn_connecting-light.png</file> - <file>../images/conn_connected-light.png</file> - <file>../images/conn_error-light.png</file> - </qresource> -</RCC> diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index 836f984a..1b0e5b92 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -214,15 +214,15 @@ class EIPStatusWidget(QtGui.QWidget): WIN : light icons """ EIP_ICONS = EIP_ICONS_TRAY = ( - ":/images/black/24/wait.png", - ":/images/black/24/on.png", - ":/images/black/24/off.png") + ":/images/black/22/wait.png", + ":/images/black/22/on.png", + ":/images/black/22/off.png") if IS_LINUX: EIP_ICONS_TRAY = ( - ":/images/white/24/wait.png", - ":/images/white/24/on.png", - ":/images/white/24/off.png") + ":/images/white/22/wait.png", + ":/images/white/22/on.png", + ":/images/white/22/off.png") self.CONNECTING_ICON = QtGui.QPixmap(EIP_ICONS[0]) self.CONNECTED_ICON = QtGui.QPixmap(EIP_ICONS[1]) diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py index 831c6788..d523f449 100644 --- a/src/leap/bitmask/gui/mail_status.py +++ b/src/leap/bitmask/gui/mail_status.py @@ -134,15 +134,15 @@ class MailStatusWidget(QtGui.QWidget): WIN : light icons """ EIP_ICONS = EIP_ICONS_TRAY = ( - ":/images/black/24/wait.png", - ":/images/black/24/on.png", - ":/images/black/24/off.png") + ":/images/black/22/wait.png", + ":/images/black/22/on.png", + ":/images/black/22/off.png") if IS_LINUX: EIP_ICONS_TRAY = ( - ":/images/white/24/wait.png", - ":/images/white/24/on.png", - ":/images/white/24/off.png") + ":/images/white/22/wait.png", + ":/images/white/22/on.png", + ":/images/white/22/off.png") self.CONNECTING_ICON = QtGui.QPixmap(EIP_ICONS[0]) self.CONNECTED_ICON = QtGui.QPixmap(EIP_ICONS[1]) diff --git a/src/leap/bitmask/gui/ui/advanced_key_management.ui b/src/leap/bitmask/gui/ui/advanced_key_management.ui index 3b567347..72f70d24 100644 --- a/src/leap/bitmask/gui/ui/advanced_key_management.ui +++ b/src/leap/bitmask/gui/ui/advanced_key_management.ui @@ -14,7 +14,7 @@ <string>Advanced Key Management</string> </property> <property name="windowIcon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset> </property> <layout class="QGridLayout" name="gridLayout_4"> @@ -184,7 +184,7 @@ </layout> </widget> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> </resources> <connections/> </ui> diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui index adbd8964..4aaa682a 100644 --- a/src/leap/bitmask/gui/ui/eip_status.ui +++ b/src/leap/bitmask/gui/ui/eip_status.ui @@ -60,7 +60,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/earth.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/32/earth.png</pixmap> </property> </widget> </item> @@ -103,15 +103,15 @@ <widget class="QLabel" name="lblVPNStatusIcon"> <property name="maximumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="text"> <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/off.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/off.png</pixmap> </property> <property name="scaledContents"> <bool>true</bool> @@ -162,7 +162,7 @@ <string>0.0 KB/s</string> </property> <property name="icon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/black/32/arrow-down.png</normaloff>:/images/black/32/arrow-down.png</iconset> </property> <property name="flat"> @@ -213,7 +213,7 @@ <string>0.0 KB/s</string> </property> <property name="icon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/black/32/arrow-up.png</normaloff>:/images/black/32/arrow-up.png</iconset> </property> <property name="flat"> @@ -265,7 +265,6 @@ </layout> </widget> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> <include location="../../../../../data/resources/icons.qrc"/> </resources> <connections/> diff --git a/src/leap/bitmask/gui/ui/eippreferences.ui b/src/leap/bitmask/gui/ui/eippreferences.ui index a3050683..1a5fcd24 100644 --- a/src/leap/bitmask/gui/ui/eippreferences.ui +++ b/src/leap/bitmask/gui/ui/eippreferences.ui @@ -14,7 +14,7 @@ <string>Encrypted Internet Preferences</string> </property> <property name="windowIcon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset> </property> <layout class="QGridLayout" name="gridLayout_2"> @@ -96,7 +96,7 @@ <tabstop>pbSaveGateway</tabstop> </tabstops> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> </resources> <connections/> </ui> diff --git a/src/leap/bitmask/gui/ui/loggerwindow.ui b/src/leap/bitmask/gui/ui/loggerwindow.ui index b19ed91a..fd8644c9 100644 --- a/src/leap/bitmask/gui/ui/loggerwindow.ui +++ b/src/leap/bitmask/gui/ui/loggerwindow.ui @@ -14,7 +14,7 @@ <string>Logs</string> </property> <property name="windowIcon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset> </property> <layout class="QGridLayout" name="gridLayout"> @@ -180,7 +180,7 @@ </tabstops> <resources> <include location="../../../../../data/resources/loggerwindow.qrc"/> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> </resources> <connections/> </ui> diff --git a/src/leap/bitmask/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui index cd20108e..26decc6d 100644 --- a/src/leap/bitmask/gui/ui/login.ui +++ b/src/leap/bitmask/gui/ui/login.ui @@ -170,7 +170,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/user.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/32/user.png</pixmap> </property> <property name="scaledContents"> <bool>false</bool> @@ -209,7 +209,7 @@ <number>0</number> </property> <property name="rightMargin"> - <number>26</number> + <number>25</number> </property> <property name="bottomMargin"> <number>18</number> @@ -299,7 +299,7 @@ <tabstop>chkRemember</tabstop> </tabstops> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> </resources> <connections/> </ui> diff --git a/src/leap/bitmask/gui/ui/mail_status.ui b/src/leap/bitmask/gui/ui/mail_status.ui index 64b8ba8c..6fd63aec 100644 --- a/src/leap/bitmask/gui/ui/mail_status.ui +++ b/src/leap/bitmask/gui/ui/mail_status.ui @@ -60,7 +60,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/off.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/off.png</pixmap> </property> <property name="scaledContents"> <bool>true</bool> @@ -104,14 +104,14 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/email.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/32/email.png</pixmap> </property> </widget> </item> </layout> </widget> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> </resources> <connections/> </ui> diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index 5bd21484..5dc48f29 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -32,7 +32,7 @@ <string>Bitmask</string> </property> <property name="windowIcon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset> </property> <property name="inputMethodHints"> @@ -399,7 +399,7 @@ </action> </widget> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> <include location="../../../../../data/resources/locale.qrc"/> </resources> <connections/> diff --git a/src/leap/bitmask/gui/ui/preferences.ui b/src/leap/bitmask/gui/ui/preferences.ui index e187c016..cd4d3a77 100644 --- a/src/leap/bitmask/gui/ui/preferences.ui +++ b/src/leap/bitmask/gui/ui/preferences.ui @@ -14,7 +14,7 @@ <string>Preferences</string> </property> <property name="windowIcon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset> </property> <layout class="QGridLayout" name="gridLayout_3"> @@ -174,7 +174,7 @@ </layout> </widget> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> </resources> <connections/> </ui> diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui index 5473310b..0e28ecbf 100644 --- a/src/leap/bitmask/gui/ui/wizard.ui +++ b/src/leap/bitmask/gui/ui/wizard.ui @@ -26,7 +26,7 @@ <string>Bitmask Provider Setup</string> </property> <property name="windowIcon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset> </property> <property name="modal"> @@ -177,14 +177,14 @@ </property> <property name="minimumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="maximumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="scaledContents"> @@ -194,7 +194,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap> </property> </widget> </item> @@ -208,14 +208,14 @@ </property> <property name="minimumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="maximumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="scaledContents"> @@ -225,7 +225,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap> </property> </widget> </item> @@ -239,14 +239,14 @@ </property> <property name="minimumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="maximumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="scaledContents"> @@ -256,7 +256,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap> </property> </widget> </item> @@ -580,14 +580,14 @@ </property> <property name="minimumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="maximumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="scaledContents"> @@ -597,7 +597,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap> </property> </widget> </item> @@ -611,14 +611,14 @@ </property> <property name="minimumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="maximumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="scaledContents"> @@ -628,7 +628,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap> </property> </widget> </item> @@ -663,14 +663,14 @@ </property> <property name="minimumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="maximumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="scaledContents"> @@ -680,7 +680,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap> </property> </widget> </item> @@ -883,7 +883,7 @@ <tabstop>rdoLogin</tabstop> </tabstops> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> <include location="../../../../../data/resources/locale.qrc"/> </resources> <connections> diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py index 175d744c..0223c053 100644 --- a/src/leap/bitmask/gui/wizard.py +++ b/src/leap/bitmask/gui/wizard.py @@ -70,9 +70,9 @@ class Wizard(QtGui.QWizard): self.setPixmap(QtGui.QWizard.LogoPixmap, QtGui.QPixmap(":/images/mask-icon.png")) - self.QUESTION_ICON = QtGui.QPixmap(":/images/black/24/question.png") - self.ERROR_ICON = QtGui.QPixmap(":/images/black/24/off.png") - self.OK_ICON = QtGui.QPixmap(":/images/black/24/on.png") + self.QUESTION_ICON = QtGui.QPixmap(":/images/black/22/question.png") + self.ERROR_ICON = QtGui.QPixmap(":/images/black/22/off.png") + self.OK_ICON = QtGui.QPixmap(":/images/black/22/on.png") self._selected_services = set() self._shown_services = set() |
