From 37e762d2413609f3e59f3fc3a002cf8cf558b716 Mon Sep 17 00:00:00 2001 From: miruka Date: Wed, 28 Aug 2019 16:30:48 -0400 Subject: [PATCH] Remove hard-coded colors and cleanup SVG icons Also remove old filled icons pack, and rename the "light-thin" pack to just "thin". --- src/icons/dark-filled/add-account.svg | 1 - src/icons/dark-filled/apply.svg | 51 ------------ src/icons/dark-filled/cancel.svg | 51 ------------ src/icons/dark-filled/email.svg | 1 - src/icons/dark-filled/expand.svg | 52 ------------ src/icons/dark-filled/export-keys.svg | 1 - src/icons/dark-filled/forget-room.svg | 51 ------------ src/icons/dark-filled/hourglass.svg | 7 -- src/icons/dark-filled/import-keys.svg | 1 - src/icons/dark-filled/invite-accept.svg | 51 ------------ src/icons/dark-filled/invite-decline.svg | 51 ------------ src/icons/dark-filled/invite-received.svg | 32 -------- src/icons/dark-filled/join.svg | 1 - src/icons/dark-filled/phone.svg | 1 - src/icons/dark-filled/placeholder.svg | 1 - src/icons/dark-filled/reduced-menu.svg | 1 - .../dark-filled/reduced-room-buttons.svg | 1 - src/icons/dark-filled/room-view-files.svg | 1 - src/icons/dark-filled/room-view-history.svg | 1 - src/icons/dark-filled/room-view-members.svg | 1 - .../dark-filled/room-view-notifications.svg | 1 - src/icons/dark-filled/room-view-settings.svg | 1 - src/icons/dark-filled/search.svg | 1 - src/icons/dark-filled/set-status.svg | 1 - src/icons/dark-filled/settings.svg | 1 - src/icons/dark-filled/status.svg | 1 - src/icons/dark-filled/typing.svg | 1 - .../dark-filled/unknown-devices-inspect.svg | 51 ------------ .../dark-filled/unknown-devices-warning.svg | 1 - src/icons/dark-filled/upload-avatar.svg | 1 - src/icons/dark-filled/username.svg | 1 - src/icons/light-thin/add-account.svg | 54 ------------- src/icons/light-thin/apply.svg | 51 ------------ src/icons/light-thin/cancel.svg | 51 ------------ src/icons/light-thin/check-mark.svg | 52 ------------ src/icons/light-thin/email.svg | 31 ------- src/icons/light-thin/expand.svg | 54 ------------- src/icons/light-thin/export-keys.svg | 32 -------- src/icons/light-thin/hourglass.svg | 32 -------- src/icons/light-thin/import-keys.svg | 32 -------- src/icons/light-thin/invite-accept.svg | 51 ------------ src/icons/light-thin/invite-decline.svg | 51 ------------ src/icons/light-thin/invite-received.svg | 32 -------- src/icons/light-thin/join.svg | 13 --- src/icons/light-thin/loader.svg | 80 ------------------- src/icons/light-thin/logout.svg | 1 - src/icons/light-thin/ok.svg | 51 ------------ src/icons/light-thin/phone.svg | 31 ------- src/icons/light-thin/placeholder.svg | 13 --- src/icons/light-thin/reduced-menu.svg | 13 --- src/icons/light-thin/reduced-room-buttons.svg | 13 --- src/icons/light-thin/retry.svg | 1 - src/icons/light-thin/room-forget.svg | 51 ------------ src/icons/light-thin/room-leave.svg | 66 --------------- src/icons/light-thin/room-send-invite.svg | 1 - src/icons/light-thin/room-view-files.svg | 31 ------- src/icons/light-thin/room-view-history.svg | 13 --- src/icons/light-thin/room-view-members.svg | 31 ------- .../light-thin/room-view-notifications.svg | 31 ------- src/icons/light-thin/room-view-settings.svg | 13 --- src/icons/light-thin/search.svg | 13 --- src/icons/light-thin/set-status.svg | 13 --- src/icons/light-thin/settings.svg | 13 --- src/icons/light-thin/status.svg | 13 --- src/icons/light-thin/typing.svg | 13 --- .../light-thin/unknown-devices-inspect.svg | 51 ------------ .../light-thin/unknown-devices-warning.svg | 31 ------- src/icons/light-thin/upload-avatar.svg | 1 - src/icons/light-thin/username.svg | 31 ------- src/icons/thin/add-account.svg | 3 + src/icons/thin/apply.svg | 3 + src/icons/thin/cancel.svg | 3 + src/icons/thin/check-mark.svg | 3 + src/icons/thin/email.svg | 3 + src/icons/thin/expand.svg | 3 + src/icons/thin/export-keys.svg | 3 + src/icons/thin/hourglass.svg | 5 ++ src/icons/thin/import-keys.svg | 3 + src/icons/thin/invite-accept.svg | 3 + src/icons/thin/invite-decline.svg | 3 + src/icons/thin/invite-received.svg | 3 + src/icons/thin/join.svg | 3 + src/icons/thin/loader.svg | 6 ++ src/icons/thin/logout.svg | 3 + src/icons/thin/ok.svg | 3 + src/icons/thin/phone.svg | 3 + src/icons/thin/reduced-menu.svg | 3 + src/icons/thin/reduced-room-buttons.svg | 3 + src/icons/thin/retry.svg | 3 + src/icons/thin/room-forget.svg | 3 + src/icons/thin/room-leave.svg | 3 + src/icons/thin/room-send-invite.svg | 3 + src/icons/thin/room-view-files.svg | 3 + src/icons/thin/room-view-history.svg | 3 + src/icons/thin/room-view-members.svg | 3 + src/icons/thin/room-view-notifications.svg | 3 + src/icons/thin/room-view-settings.svg | 3 + src/icons/thin/search.svg | 3 + src/icons/thin/set-status.svg | 3 + src/icons/thin/settings.svg | 3 + src/icons/thin/status.svg | 3 + src/icons/thin/typing.svg | 3 + src/icons/thin/unknown-devices-inspect.svg | 3 + src/icons/thin/unknown-devices-warning.svg | 3 + src/icons/thin/upload-avatar.svg | 3 + src/icons/thin/username.svg | 3 + src/qml/Base/HButton.qml | 1 + src/qml/Base/HCheckBox.qml | 2 +- src/qml/Base/HIcon.qml | 9 ++- src/themes/Default.qpl | 8 +- 110 files changed, 128 insertions(+), 1582 deletions(-) delete mode 100644 src/icons/dark-filled/add-account.svg delete mode 100644 src/icons/dark-filled/apply.svg delete mode 100644 src/icons/dark-filled/cancel.svg delete mode 100644 src/icons/dark-filled/email.svg delete mode 100644 src/icons/dark-filled/expand.svg delete mode 100644 src/icons/dark-filled/export-keys.svg delete mode 100644 src/icons/dark-filled/forget-room.svg delete mode 100644 src/icons/dark-filled/hourglass.svg delete mode 100644 src/icons/dark-filled/import-keys.svg delete mode 100644 src/icons/dark-filled/invite-accept.svg delete mode 100644 src/icons/dark-filled/invite-decline.svg delete mode 100644 src/icons/dark-filled/invite-received.svg delete mode 100644 src/icons/dark-filled/join.svg delete mode 100644 src/icons/dark-filled/phone.svg delete mode 100644 src/icons/dark-filled/placeholder.svg delete mode 100644 src/icons/dark-filled/reduced-menu.svg delete mode 100644 src/icons/dark-filled/reduced-room-buttons.svg delete mode 100644 src/icons/dark-filled/room-view-files.svg delete mode 100644 src/icons/dark-filled/room-view-history.svg delete mode 100644 src/icons/dark-filled/room-view-members.svg delete mode 100644 src/icons/dark-filled/room-view-notifications.svg delete mode 100644 src/icons/dark-filled/room-view-settings.svg delete mode 100644 src/icons/dark-filled/search.svg delete mode 100644 src/icons/dark-filled/set-status.svg delete mode 100644 src/icons/dark-filled/settings.svg delete mode 100644 src/icons/dark-filled/status.svg delete mode 100644 src/icons/dark-filled/typing.svg delete mode 100644 src/icons/dark-filled/unknown-devices-inspect.svg delete mode 100644 src/icons/dark-filled/unknown-devices-warning.svg delete mode 100644 src/icons/dark-filled/upload-avatar.svg delete mode 100644 src/icons/dark-filled/username.svg delete mode 100644 src/icons/light-thin/add-account.svg delete mode 100644 src/icons/light-thin/apply.svg delete mode 100644 src/icons/light-thin/cancel.svg delete mode 100644 src/icons/light-thin/check-mark.svg delete mode 100644 src/icons/light-thin/email.svg delete mode 100644 src/icons/light-thin/expand.svg delete mode 100644 src/icons/light-thin/export-keys.svg delete mode 100644 src/icons/light-thin/hourglass.svg delete mode 100644 src/icons/light-thin/import-keys.svg delete mode 100644 src/icons/light-thin/invite-accept.svg delete mode 100644 src/icons/light-thin/invite-decline.svg delete mode 100644 src/icons/light-thin/invite-received.svg delete mode 100644 src/icons/light-thin/join.svg delete mode 100644 src/icons/light-thin/loader.svg delete mode 100644 src/icons/light-thin/logout.svg delete mode 100644 src/icons/light-thin/ok.svg delete mode 100644 src/icons/light-thin/phone.svg delete mode 100644 src/icons/light-thin/placeholder.svg delete mode 100644 src/icons/light-thin/reduced-menu.svg delete mode 100644 src/icons/light-thin/reduced-room-buttons.svg delete mode 100644 src/icons/light-thin/retry.svg delete mode 100644 src/icons/light-thin/room-forget.svg delete mode 100644 src/icons/light-thin/room-leave.svg delete mode 100644 src/icons/light-thin/room-send-invite.svg delete mode 100644 src/icons/light-thin/room-view-files.svg delete mode 100644 src/icons/light-thin/room-view-history.svg delete mode 100644 src/icons/light-thin/room-view-members.svg delete mode 100644 src/icons/light-thin/room-view-notifications.svg delete mode 100644 src/icons/light-thin/room-view-settings.svg delete mode 100644 src/icons/light-thin/search.svg delete mode 100644 src/icons/light-thin/set-status.svg delete mode 100644 src/icons/light-thin/settings.svg delete mode 100644 src/icons/light-thin/status.svg delete mode 100644 src/icons/light-thin/typing.svg delete mode 100644 src/icons/light-thin/unknown-devices-inspect.svg delete mode 100644 src/icons/light-thin/unknown-devices-warning.svg delete mode 100644 src/icons/light-thin/upload-avatar.svg delete mode 100644 src/icons/light-thin/username.svg create mode 100644 src/icons/thin/add-account.svg create mode 100644 src/icons/thin/apply.svg create mode 100644 src/icons/thin/cancel.svg create mode 100644 src/icons/thin/check-mark.svg create mode 100644 src/icons/thin/email.svg create mode 100644 src/icons/thin/expand.svg create mode 100644 src/icons/thin/export-keys.svg create mode 100644 src/icons/thin/hourglass.svg create mode 100644 src/icons/thin/import-keys.svg create mode 100644 src/icons/thin/invite-accept.svg create mode 100644 src/icons/thin/invite-decline.svg create mode 100644 src/icons/thin/invite-received.svg create mode 100644 src/icons/thin/join.svg create mode 100644 src/icons/thin/loader.svg create mode 100644 src/icons/thin/logout.svg create mode 100644 src/icons/thin/ok.svg create mode 100644 src/icons/thin/phone.svg create mode 100644 src/icons/thin/reduced-menu.svg create mode 100644 src/icons/thin/reduced-room-buttons.svg create mode 100644 src/icons/thin/retry.svg create mode 100644 src/icons/thin/room-forget.svg create mode 100644 src/icons/thin/room-leave.svg create mode 100644 src/icons/thin/room-send-invite.svg create mode 100644 src/icons/thin/room-view-files.svg create mode 100644 src/icons/thin/room-view-history.svg create mode 100644 src/icons/thin/room-view-members.svg create mode 100644 src/icons/thin/room-view-notifications.svg create mode 100644 src/icons/thin/room-view-settings.svg create mode 100644 src/icons/thin/search.svg create mode 100644 src/icons/thin/set-status.svg create mode 100644 src/icons/thin/settings.svg create mode 100644 src/icons/thin/status.svg create mode 100644 src/icons/thin/typing.svg create mode 100644 src/icons/thin/unknown-devices-inspect.svg create mode 100644 src/icons/thin/unknown-devices-warning.svg create mode 100644 src/icons/thin/upload-avatar.svg create mode 100644 src/icons/thin/username.svg diff --git a/src/icons/dark-filled/add-account.svg b/src/icons/dark-filled/add-account.svg deleted file mode 100644 index 26d5c2ca..00000000 --- a/src/icons/dark-filled/add-account.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/apply.svg b/src/icons/dark-filled/apply.svg deleted file mode 100644 index c2bef64e..00000000 --- a/src/icons/dark-filled/apply.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/dark-filled/cancel.svg b/src/icons/dark-filled/cancel.svg deleted file mode 100644 index 584a4121..00000000 --- a/src/icons/dark-filled/cancel.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/dark-filled/email.svg b/src/icons/dark-filled/email.svg deleted file mode 100644 index 7459cb08..00000000 --- a/src/icons/dark-filled/email.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/expand.svg b/src/icons/dark-filled/expand.svg deleted file mode 100644 index ee95e724..00000000 --- a/src/icons/dark-filled/expand.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/dark-filled/export-keys.svg b/src/icons/dark-filled/export-keys.svg deleted file mode 100644 index 9b9b732c..00000000 --- a/src/icons/dark-filled/export-keys.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/forget-room.svg b/src/icons/dark-filled/forget-room.svg deleted file mode 100644 index 0a837a00..00000000 --- a/src/icons/dark-filled/forget-room.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/dark-filled/hourglass.svg b/src/icons/dark-filled/hourglass.svg deleted file mode 100644 index e3bb8bb9..00000000 --- a/src/icons/dark-filled/hourglass.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - Svg Vector Icons : http://www.onlinewebfonts.com/icon - - \ No newline at end of file diff --git a/src/icons/dark-filled/import-keys.svg b/src/icons/dark-filled/import-keys.svg deleted file mode 100644 index 51e5123b..00000000 --- a/src/icons/dark-filled/import-keys.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/invite-accept.svg b/src/icons/dark-filled/invite-accept.svg deleted file mode 100644 index c2bef64e..00000000 --- a/src/icons/dark-filled/invite-accept.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/dark-filled/invite-decline.svg b/src/icons/dark-filled/invite-decline.svg deleted file mode 100644 index 584a4121..00000000 --- a/src/icons/dark-filled/invite-decline.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/dark-filled/invite-received.svg b/src/icons/dark-filled/invite-received.svg deleted file mode 100644 index f61967ce..00000000 --- a/src/icons/dark-filled/invite-received.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/dark-filled/join.svg b/src/icons/dark-filled/join.svg deleted file mode 100644 index c1224e13..00000000 --- a/src/icons/dark-filled/join.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/phone.svg b/src/icons/dark-filled/phone.svg deleted file mode 100644 index a7b9b3f7..00000000 --- a/src/icons/dark-filled/phone.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/placeholder.svg b/src/icons/dark-filled/placeholder.svg deleted file mode 100644 index 8868ede9..00000000 --- a/src/icons/dark-filled/placeholder.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/reduced-menu.svg b/src/icons/dark-filled/reduced-menu.svg deleted file mode 100644 index 545f9e26..00000000 --- a/src/icons/dark-filled/reduced-menu.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/reduced-room-buttons.svg b/src/icons/dark-filled/reduced-room-buttons.svg deleted file mode 100644 index 7e65a83c..00000000 --- a/src/icons/dark-filled/reduced-room-buttons.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/room-view-files.svg b/src/icons/dark-filled/room-view-files.svg deleted file mode 100644 index 6168b479..00000000 --- a/src/icons/dark-filled/room-view-files.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/room-view-history.svg b/src/icons/dark-filled/room-view-history.svg deleted file mode 100644 index 04061e3e..00000000 --- a/src/icons/dark-filled/room-view-history.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/room-view-members.svg b/src/icons/dark-filled/room-view-members.svg deleted file mode 100644 index cf3671aa..00000000 --- a/src/icons/dark-filled/room-view-members.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/room-view-notifications.svg b/src/icons/dark-filled/room-view-notifications.svg deleted file mode 100644 index cc51fa8b..00000000 --- a/src/icons/dark-filled/room-view-notifications.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/room-view-settings.svg b/src/icons/dark-filled/room-view-settings.svg deleted file mode 100644 index 0bf18afc..00000000 --- a/src/icons/dark-filled/room-view-settings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/search.svg b/src/icons/dark-filled/search.svg deleted file mode 100644 index 2c90350f..00000000 --- a/src/icons/dark-filled/search.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/set-status.svg b/src/icons/dark-filled/set-status.svg deleted file mode 100644 index a3977ab5..00000000 --- a/src/icons/dark-filled/set-status.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/settings.svg b/src/icons/dark-filled/settings.svg deleted file mode 100644 index 9a64fbdf..00000000 --- a/src/icons/dark-filled/settings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/status.svg b/src/icons/dark-filled/status.svg deleted file mode 100644 index e856a109..00000000 --- a/src/icons/dark-filled/status.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/typing.svg b/src/icons/dark-filled/typing.svg deleted file mode 100644 index a3977ab5..00000000 --- a/src/icons/dark-filled/typing.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/unknown-devices-inspect.svg b/src/icons/dark-filled/unknown-devices-inspect.svg deleted file mode 100644 index 4d104b7a..00000000 --- a/src/icons/dark-filled/unknown-devices-inspect.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/dark-filled/unknown-devices-warning.svg b/src/icons/dark-filled/unknown-devices-warning.svg deleted file mode 100644 index ae43d92a..00000000 --- a/src/icons/dark-filled/unknown-devices-warning.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark-filled/upload-avatar.svg b/src/icons/dark-filled/upload-avatar.svg deleted file mode 100644 index d270d3f6..00000000 --- a/src/icons/dark-filled/upload-avatar.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/icons/dark-filled/username.svg b/src/icons/dark-filled/username.svg deleted file mode 100644 index cf3671aa..00000000 --- a/src/icons/dark-filled/username.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light-thin/add-account.svg b/src/icons/light-thin/add-account.svg deleted file mode 100644 index bcea32ec..00000000 --- a/src/icons/light-thin/add-account.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/icons/light-thin/apply.svg b/src/icons/light-thin/apply.svg deleted file mode 100644 index c2bef64e..00000000 --- a/src/icons/light-thin/apply.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/cancel.svg b/src/icons/light-thin/cancel.svg deleted file mode 100644 index 584a4121..00000000 --- a/src/icons/light-thin/cancel.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/check-mark.svg b/src/icons/light-thin/check-mark.svg deleted file mode 100644 index 246dd199..00000000 --- a/src/icons/light-thin/check-mark.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/email.svg b/src/icons/light-thin/email.svg deleted file mode 100644 index 82dffd2f..00000000 --- a/src/icons/light-thin/email.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/expand.svg b/src/icons/light-thin/expand.svg deleted file mode 100644 index d3aec10a..00000000 --- a/src/icons/light-thin/expand.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/export-keys.svg b/src/icons/light-thin/export-keys.svg deleted file mode 100644 index 55b716a5..00000000 --- a/src/icons/light-thin/export-keys.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/hourglass.svg b/src/icons/light-thin/hourglass.svg deleted file mode 100644 index ec6e3ed0..00000000 --- a/src/icons/light-thin/hourglass.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - Svg Vector Icons : http://www.onlinewebfonts.com/icon image/svg+xml - - \ No newline at end of file diff --git a/src/icons/light-thin/import-keys.svg b/src/icons/light-thin/import-keys.svg deleted file mode 100644 index b33a28ef..00000000 --- a/src/icons/light-thin/import-keys.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/invite-accept.svg b/src/icons/light-thin/invite-accept.svg deleted file mode 100644 index c2bef64e..00000000 --- a/src/icons/light-thin/invite-accept.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/invite-decline.svg b/src/icons/light-thin/invite-decline.svg deleted file mode 100644 index 584a4121..00000000 --- a/src/icons/light-thin/invite-decline.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/invite-received.svg b/src/icons/light-thin/invite-received.svg deleted file mode 100644 index 57217223..00000000 --- a/src/icons/light-thin/invite-received.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/join.svg b/src/icons/light-thin/join.svg deleted file mode 100644 index 64c46025..00000000 --- a/src/icons/light-thin/join.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/loader.svg b/src/icons/light-thin/loader.svg deleted file mode 100644 index 008e0a28..00000000 --- a/src/icons/light-thin/loader.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/src/icons/light-thin/logout.svg b/src/icons/light-thin/logout.svg deleted file mode 100644 index 1ce1078c..00000000 --- a/src/icons/light-thin/logout.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light-thin/ok.svg b/src/icons/light-thin/ok.svg deleted file mode 100644 index c2bef64e..00000000 --- a/src/icons/light-thin/ok.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/phone.svg b/src/icons/light-thin/phone.svg deleted file mode 100644 index 9dca262f..00000000 --- a/src/icons/light-thin/phone.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/placeholder.svg b/src/icons/light-thin/placeholder.svg deleted file mode 100644 index c83ab1d4..00000000 --- a/src/icons/light-thin/placeholder.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/reduced-menu.svg b/src/icons/light-thin/reduced-menu.svg deleted file mode 100644 index ab64a32b..00000000 --- a/src/icons/light-thin/reduced-menu.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/reduced-room-buttons.svg b/src/icons/light-thin/reduced-room-buttons.svg deleted file mode 100644 index fe89d2df..00000000 --- a/src/icons/light-thin/reduced-room-buttons.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/retry.svg b/src/icons/light-thin/retry.svg deleted file mode 100644 index 55c7ccc1..00000000 --- a/src/icons/light-thin/retry.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light-thin/room-forget.svg b/src/icons/light-thin/room-forget.svg deleted file mode 100644 index 0a837a00..00000000 --- a/src/icons/light-thin/room-forget.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/room-leave.svg b/src/icons/light-thin/room-leave.svg deleted file mode 100644 index 56e6478d..00000000 --- a/src/icons/light-thin/room-leave.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/src/icons/light-thin/room-send-invite.svg b/src/icons/light-thin/room-send-invite.svg deleted file mode 100644 index bd5fb4d1..00000000 --- a/src/icons/light-thin/room-send-invite.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light-thin/room-view-files.svg b/src/icons/light-thin/room-view-files.svg deleted file mode 100644 index 943a10a5..00000000 --- a/src/icons/light-thin/room-view-files.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/room-view-history.svg b/src/icons/light-thin/room-view-history.svg deleted file mode 100644 index bc1b5411..00000000 --- a/src/icons/light-thin/room-view-history.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/room-view-members.svg b/src/icons/light-thin/room-view-members.svg deleted file mode 100644 index 7899ceac..00000000 --- a/src/icons/light-thin/room-view-members.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/room-view-notifications.svg b/src/icons/light-thin/room-view-notifications.svg deleted file mode 100644 index b7259d74..00000000 --- a/src/icons/light-thin/room-view-notifications.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/room-view-settings.svg b/src/icons/light-thin/room-view-settings.svg deleted file mode 100644 index c5b744f1..00000000 --- a/src/icons/light-thin/room-view-settings.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/search.svg b/src/icons/light-thin/search.svg deleted file mode 100644 index 9a0c00a8..00000000 --- a/src/icons/light-thin/search.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/set-status.svg b/src/icons/light-thin/set-status.svg deleted file mode 100644 index 99a9fc53..00000000 --- a/src/icons/light-thin/set-status.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/settings.svg b/src/icons/light-thin/settings.svg deleted file mode 100644 index b6b6910d..00000000 --- a/src/icons/light-thin/settings.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/status.svg b/src/icons/light-thin/status.svg deleted file mode 100644 index 595c8530..00000000 --- a/src/icons/light-thin/status.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/typing.svg b/src/icons/light-thin/typing.svg deleted file mode 100644 index 99a9fc53..00000000 --- a/src/icons/light-thin/typing.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/light-thin/unknown-devices-inspect.svg b/src/icons/light-thin/unknown-devices-inspect.svg deleted file mode 100644 index 4d104b7a..00000000 --- a/src/icons/light-thin/unknown-devices-inspect.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/unknown-devices-warning.svg b/src/icons/light-thin/unknown-devices-warning.svg deleted file mode 100644 index 5082dcc1..00000000 --- a/src/icons/light-thin/unknown-devices-warning.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/light-thin/upload-avatar.svg b/src/icons/light-thin/upload-avatar.svg deleted file mode 100644 index d270d3f6..00000000 --- a/src/icons/light-thin/upload-avatar.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/icons/light-thin/username.svg b/src/icons/light-thin/username.svg deleted file mode 100644 index 7899ceac..00000000 --- a/src/icons/light-thin/username.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/thin/add-account.svg b/src/icons/thin/add-account.svg new file mode 100644 index 00000000..b0ca843e --- /dev/null +++ b/src/icons/thin/add-account.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/apply.svg b/src/icons/thin/apply.svg new file mode 100644 index 00000000..22fcc2ce --- /dev/null +++ b/src/icons/thin/apply.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/cancel.svg b/src/icons/thin/cancel.svg new file mode 100644 index 00000000..e4728028 --- /dev/null +++ b/src/icons/thin/cancel.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/check-mark.svg b/src/icons/thin/check-mark.svg new file mode 100644 index 00000000..8fda6c85 --- /dev/null +++ b/src/icons/thin/check-mark.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/email.svg b/src/icons/thin/email.svg new file mode 100644 index 00000000..95ba5081 --- /dev/null +++ b/src/icons/thin/email.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/expand.svg b/src/icons/thin/expand.svg new file mode 100644 index 00000000..6db6651e --- /dev/null +++ b/src/icons/thin/expand.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/export-keys.svg b/src/icons/thin/export-keys.svg new file mode 100644 index 00000000..d0e5278c --- /dev/null +++ b/src/icons/thin/export-keys.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/hourglass.svg b/src/icons/thin/hourglass.svg new file mode 100644 index 00000000..0e28395a --- /dev/null +++ b/src/icons/thin/hourglass.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/icons/thin/import-keys.svg b/src/icons/thin/import-keys.svg new file mode 100644 index 00000000..c9222995 --- /dev/null +++ b/src/icons/thin/import-keys.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/invite-accept.svg b/src/icons/thin/invite-accept.svg new file mode 100644 index 00000000..22fcc2ce --- /dev/null +++ b/src/icons/thin/invite-accept.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/invite-decline.svg b/src/icons/thin/invite-decline.svg new file mode 100644 index 00000000..e4728028 --- /dev/null +++ b/src/icons/thin/invite-decline.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/invite-received.svg b/src/icons/thin/invite-received.svg new file mode 100644 index 00000000..67c5f186 --- /dev/null +++ b/src/icons/thin/invite-received.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/join.svg b/src/icons/thin/join.svg new file mode 100644 index 00000000..7a93b424 --- /dev/null +++ b/src/icons/thin/join.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/loader.svg b/src/icons/thin/loader.svg new file mode 100644 index 00000000..5365beab --- /dev/null +++ b/src/icons/thin/loader.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/icons/thin/logout.svg b/src/icons/thin/logout.svg new file mode 100644 index 00000000..ccfa9672 --- /dev/null +++ b/src/icons/thin/logout.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/ok.svg b/src/icons/thin/ok.svg new file mode 100644 index 00000000..22fcc2ce --- /dev/null +++ b/src/icons/thin/ok.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/phone.svg b/src/icons/thin/phone.svg new file mode 100644 index 00000000..bd0ab6a8 --- /dev/null +++ b/src/icons/thin/phone.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/reduced-menu.svg b/src/icons/thin/reduced-menu.svg new file mode 100644 index 00000000..ffe7f08f --- /dev/null +++ b/src/icons/thin/reduced-menu.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/reduced-room-buttons.svg b/src/icons/thin/reduced-room-buttons.svg new file mode 100644 index 00000000..b4041d51 --- /dev/null +++ b/src/icons/thin/reduced-room-buttons.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/retry.svg b/src/icons/thin/retry.svg new file mode 100644 index 00000000..f6671ec8 --- /dev/null +++ b/src/icons/thin/retry.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/room-forget.svg b/src/icons/thin/room-forget.svg new file mode 100644 index 00000000..c6c25edf --- /dev/null +++ b/src/icons/thin/room-forget.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/room-leave.svg b/src/icons/thin/room-leave.svg new file mode 100644 index 00000000..045b0542 --- /dev/null +++ b/src/icons/thin/room-leave.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/room-send-invite.svg b/src/icons/thin/room-send-invite.svg new file mode 100644 index 00000000..334c7a8f --- /dev/null +++ b/src/icons/thin/room-send-invite.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/room-view-files.svg b/src/icons/thin/room-view-files.svg new file mode 100644 index 00000000..17450e8a --- /dev/null +++ b/src/icons/thin/room-view-files.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/room-view-history.svg b/src/icons/thin/room-view-history.svg new file mode 100644 index 00000000..14e31773 --- /dev/null +++ b/src/icons/thin/room-view-history.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/room-view-members.svg b/src/icons/thin/room-view-members.svg new file mode 100644 index 00000000..405b2462 --- /dev/null +++ b/src/icons/thin/room-view-members.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/room-view-notifications.svg b/src/icons/thin/room-view-notifications.svg new file mode 100644 index 00000000..dcebec68 --- /dev/null +++ b/src/icons/thin/room-view-notifications.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/room-view-settings.svg b/src/icons/thin/room-view-settings.svg new file mode 100644 index 00000000..3c1baeaa --- /dev/null +++ b/src/icons/thin/room-view-settings.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/search.svg b/src/icons/thin/search.svg new file mode 100644 index 00000000..0b52cbee --- /dev/null +++ b/src/icons/thin/search.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/set-status.svg b/src/icons/thin/set-status.svg new file mode 100644 index 00000000..72f64164 --- /dev/null +++ b/src/icons/thin/set-status.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/settings.svg b/src/icons/thin/settings.svg new file mode 100644 index 00000000..93439b12 --- /dev/null +++ b/src/icons/thin/settings.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/status.svg b/src/icons/thin/status.svg new file mode 100644 index 00000000..1541ea71 --- /dev/null +++ b/src/icons/thin/status.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/typing.svg b/src/icons/thin/typing.svg new file mode 100644 index 00000000..72f64164 --- /dev/null +++ b/src/icons/thin/typing.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/unknown-devices-inspect.svg b/src/icons/thin/unknown-devices-inspect.svg new file mode 100644 index 00000000..0b52cbee --- /dev/null +++ b/src/icons/thin/unknown-devices-inspect.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/unknown-devices-warning.svg b/src/icons/thin/unknown-devices-warning.svg new file mode 100644 index 00000000..911f3968 --- /dev/null +++ b/src/icons/thin/unknown-devices-warning.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/upload-avatar.svg b/src/icons/thin/upload-avatar.svg new file mode 100644 index 00000000..c4cde5b5 --- /dev/null +++ b/src/icons/thin/upload-avatar.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/username.svg b/src/icons/thin/username.svg new file mode 100644 index 00000000..405b2462 --- /dev/null +++ b/src/icons/thin/username.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/qml/Base/HButton.qml b/src/qml/Base/HButton.qml index 1cd39fe7..89e056cd 100644 --- a/src/qml/Base/HButton.qml +++ b/src/qml/Base/HButton.qml @@ -10,6 +10,7 @@ Button { topPadding: spacing / 2 bottomPadding: topPadding iconItem.svgName: loading ? "hourglass" : icon.name + icon.color: theme.icons.colorize enabled: ! loading onVisibleChanged: if (! visible) loading = false diff --git a/src/qml/Base/HCheckBox.qml b/src/qml/Base/HCheckBox.qml index 852de056..da0fa3d2 100644 --- a/src/qml/Base/HCheckBox.qml +++ b/src/qml/Base/HCheckBox.qml @@ -38,7 +38,7 @@ CheckBox { anchors.centerIn: parent dimension: parent.width - 2 svgName: "check-mark" - colorize: theme.controls.checkBox.checkIconColor + colorize: theme.controls.checkBox.checkIconColorize visible: scale > 0 scale: box.checked ? 1 : 0 diff --git a/src/qml/Base/HIcon.qml b/src/qml/Base/HIcon.qml index 45a06f8c..fb5357bc 100644 --- a/src/qml/Base/HIcon.qml +++ b/src/qml/Base/HIcon.qml @@ -1,15 +1,16 @@ import QtQuick 2.12 HImage { - visible: Boolean(svgName) - property string svgName: "" property int dimension: 20 + + visible: Boolean(svgName) + colorize: theme.icons.colorize + source: svgName ? - ("../../icons/" + - (theme ? theme.preferredIconPack : "light-thin") + + ("../../icons/" + (theme ? theme.icons.preferredPack : "thin") + "/" + svgName + ".svg") : "" diff --git a/src/themes/Default.qpl b/src/themes/Default.qpl index 4034c018..5104d972 100644 --- a/src/themes/Default.qpl +++ b/src/themes/Default.qpl @@ -22,7 +22,9 @@ int animationDuration: 100 real loadingElementsOpacity: 0.8 real disabledElementsOpacity: 0.3 -string preferredIconPack: "light-thin" +icons: + string preferredPack: "thin" + color colorize: "white" // "transparent" to disable fontSize: int smaller: 13 * fontScale @@ -114,8 +116,8 @@ controls: color checkedOverlay: controls.button.hoveredOverlay checkBox: - color checkIconColor: colors.accentBackground - color boxBackground: controls.button.background + color checkIconColorize: colors.accentBackground + color boxBackground: controls.button.background color boxBorder: hsluv(0, 0, 50, 0.3) color boxHoveredBorder: colors.accentBackground