From f313c72a977f12f524e77c72684716b4d9bc5858 Mon Sep 17 00:00:00 2001 From: blue Date: Mon, 24 Jun 2019 17:16:03 +0300 Subject: [PATCH] subscription state fallback icons --- global.cpp | 14 ++++++++ global.h | 33 +++++++++++++++++++ .../fallback/dark/big/arrow-down-double.svg | 10 ++++++ .../fallback/dark/big/arrow-up-double.svg | 10 ++++++ resources/images/fallback/dark/big/clean.svg | 14 ++++++++ .../images/fallback/dark/big/dialog-ok.svg | 14 ++++++++ .../images/fallback/dark/big/edit-none.svg | 10 ++++++ .../images/fallback/dark/big/question.svg | 14 ++++++++ resources/images/fallback/dark/big/send.svg | 17 ++++++++++ .../fallback/dark/small/arrow-down-double.svg | 13 ++++++++ .../fallback/dark/small/arrow-up-double.svg | 13 ++++++++ .../images/fallback/dark/small/clean.svg | 13 ++++++++ .../images/fallback/dark/small/dialog-ok.svg | 13 ++++++++ .../images/fallback/dark/small/edit-none.svg | 10 ++++++ .../images/fallback/dark/small/question.svg | 14 ++++++++ resources/images/fallback/dark/small/send.svg | 13 ++++++++ .../fallback/light/big/arrow-down-double.svg | 10 ++++++ .../fallback/light/big/arrow-up-double.svg | 10 ++++++ resources/images/fallback/light/big/clean.svg | 14 ++++++++ .../images/fallback/light/big/dialog-ok.svg | 14 ++++++++ .../images/fallback/light/big/edit-none.svg | 10 ++++++ .../images/fallback/light/big/question.svg | 14 ++++++++ resources/images/fallback/light/big/send.svg | 14 ++++++++ .../light/small/arrow-down-double.svg | 13 ++++++++ .../fallback/light/small/arrow-up-double.svg | 13 ++++++++ .../images/fallback/light/small/clean.svg | 13 ++++++++ .../images/fallback/light/small/dialog-ok.svg | 13 ++++++++ .../images/fallback/light/small/edit-none.svg | 10 ++++++ .../images/fallback/light/small/question.svg | 14 ++++++++ .../images/fallback/light/small/send.svg | 13 ++++++++ resources/resources.qrc | 27 +++++++++++++++ 31 files changed, 427 insertions(+) create mode 100644 resources/images/fallback/dark/big/arrow-down-double.svg create mode 100644 resources/images/fallback/dark/big/arrow-up-double.svg create mode 100644 resources/images/fallback/dark/big/clean.svg create mode 100644 resources/images/fallback/dark/big/dialog-ok.svg create mode 100644 resources/images/fallback/dark/big/edit-none.svg create mode 100644 resources/images/fallback/dark/big/question.svg create mode 100644 resources/images/fallback/dark/big/send.svg create mode 100644 resources/images/fallback/dark/small/arrow-down-double.svg create mode 100644 resources/images/fallback/dark/small/arrow-up-double.svg create mode 100644 resources/images/fallback/dark/small/clean.svg create mode 100644 resources/images/fallback/dark/small/dialog-ok.svg create mode 100644 resources/images/fallback/dark/small/edit-none.svg create mode 100644 resources/images/fallback/dark/small/question.svg create mode 100644 resources/images/fallback/dark/small/send.svg create mode 100644 resources/images/fallback/light/big/arrow-down-double.svg create mode 100644 resources/images/fallback/light/big/arrow-up-double.svg create mode 100644 resources/images/fallback/light/big/clean.svg create mode 100644 resources/images/fallback/light/big/dialog-ok.svg create mode 100644 resources/images/fallback/light/big/edit-none.svg create mode 100644 resources/images/fallback/light/big/question.svg create mode 100644 resources/images/fallback/light/big/send.svg create mode 100644 resources/images/fallback/light/small/arrow-down-double.svg create mode 100644 resources/images/fallback/light/small/arrow-up-double.svg create mode 100644 resources/images/fallback/light/small/clean.svg create mode 100644 resources/images/fallback/light/small/dialog-ok.svg create mode 100644 resources/images/fallback/light/small/edit-none.svg create mode 100644 resources/images/fallback/light/small/question.svg create mode 100644 resources/images/fallback/light/small/send.svg diff --git a/global.cpp b/global.cpp index 89a9dee..6a8427a 100644 --- a/global.cpp +++ b/global.cpp @@ -267,3 +267,17 @@ QIcon Shared::availabilityIcon(Shared::Availability av, bool big) return QIcon::fromTheme(availabilityThemeIcons[av], QIcon(fallback[av])); } + +QIcon Shared::subscriptionStateIcon(Shared::SubscriptionState ss, bool big) +{ + const std::deque& fallback = QApplication::palette().window().color().lightnessF() > 0.5 ? + big ? + Shared::fallbackSubscriptionStateThemeIconsDarkBig: + Shared::fallbackSubscriptionStateThemeIconsDarkSmall: + big ? + Shared::fallbackSubscriptionStateThemeIconsLightBig: + Shared::fallbackSubscriptionStateThemeIconsLightSmall; + + return QIcon::fromTheme(subscriptionStateThemeIcons[ss], QIcon(fallback[ss])); +} + diff --git a/global.h b/global.h index 7af9849..fdaab1b 100644 --- a/global.h +++ b/global.h @@ -130,6 +130,14 @@ static const std::deque fallbackAvailabilityThemeIconsLightBig = { ":images/fallback/light/big/offline.svg" }; +static const std::deque fallbackSubscriptionStateThemeIconsLightBig = { + ":images/fallback/light/big/edit-none.svg", + ":images/fallback/light/big/arrow-down-double.svg", + ":images/fallback/light/big/arrow-up-double.svg", + ":images/fallback/light/big/dialog-ok.svg", + ":images/fallback/light/big/question.svg" +}; + static const std::deque fallbackAvailabilityThemeIconsLightSmall = { ":images/fallback/light/small/online.svg", ":images/fallback/light/small/away.svg", @@ -140,6 +148,14 @@ static const std::deque fallbackAvailabilityThemeIconsLightSmall = { ":images/fallback/light/small/offline.svg" }; +static const std::deque fallbackSubscriptionStateThemeIconsLightSmall = { + ":images/fallback/light/small/edit-none.svg", + ":images/fallback/light/small/arrow-down-double.svg", + ":images/fallback/light/small/arrow-up-double.svg", + ":images/fallback/light/small/dialog-ok.svg", + ":images/fallback/light/small/question.svg" +}; + static const std::deque fallbackAvailabilityThemeIconsDarkBig = { ":images/fallback/dark/big/online.svg", ":images/fallback/dark/big/away.svg", @@ -150,6 +166,14 @@ static const std::deque fallbackAvailabilityThemeIconsDarkBig = { ":images/fallback/dark/big/offline.svg" }; +static const std::deque fallbackSubscriptionStateThemeIconsDarkBig = { + ":images/fallback/dark/big/edit-none.svg", + ":images/fallback/dark/big/arrow-down-double.svg", + ":images/fallback/dark/big/arrow-up-double.svg", + ":images/fallback/dark/big/dialog-ok.svg", + ":images/fallback/dark/big/question.svg" +}; + static const std::deque fallbackAvailabilityThemeIconsDarkSmall = { ":images/fallback/dark/small/online.svg", ":images/fallback/dark/small/away.svg", @@ -160,7 +184,16 @@ static const std::deque fallbackAvailabilityThemeIconsDarkSmall = { ":images/fallback/dark/small/offline.svg" }; +static const std::deque fallbackSubscriptionStateThemeIconsDarkSmall = { + ":images/fallback/dark/small/edit-none.svg", + ":images/fallback/dark/small/arrow-down-double.svg", + ":images/fallback/dark/small/arrow-up-double.svg", + ":images/fallback/dark/small/dialog-ok.svg", + ":images/fallback/dark/small/question.svg" +}; + QIcon availabilityIcon(Availability av, bool big = false); +QIcon subscriptionStateIcon(SubscriptionState ss, bool big = false); }; diff --git a/resources/images/fallback/dark/big/arrow-down-double.svg b/resources/images/fallback/dark/big/arrow-down-double.svg new file mode 100644 index 0000000..1b72870 --- /dev/null +++ b/resources/images/fallback/dark/big/arrow-down-double.svg @@ -0,0 +1,10 @@ + + + + diff --git a/resources/images/fallback/dark/big/arrow-up-double.svg b/resources/images/fallback/dark/big/arrow-up-double.svg new file mode 100644 index 0000000..54da453 --- /dev/null +++ b/resources/images/fallback/dark/big/arrow-up-double.svg @@ -0,0 +1,10 @@ + + + + diff --git a/resources/images/fallback/dark/big/clean.svg b/resources/images/fallback/dark/big/clean.svg new file mode 100644 index 0000000..28e7e37 --- /dev/null +++ b/resources/images/fallback/dark/big/clean.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/resources/images/fallback/dark/big/dialog-ok.svg b/resources/images/fallback/dark/big/dialog-ok.svg new file mode 100644 index 0000000..8f3b156 --- /dev/null +++ b/resources/images/fallback/dark/big/dialog-ok.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/resources/images/fallback/dark/big/edit-none.svg b/resources/images/fallback/dark/big/edit-none.svg new file mode 100644 index 0000000..b476271 --- /dev/null +++ b/resources/images/fallback/dark/big/edit-none.svg @@ -0,0 +1,10 @@ + + + + diff --git a/resources/images/fallback/dark/big/question.svg b/resources/images/fallback/dark/big/question.svg new file mode 100644 index 0000000..36dba69 --- /dev/null +++ b/resources/images/fallback/dark/big/question.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/resources/images/fallback/dark/big/send.svg b/resources/images/fallback/dark/big/send.svg new file mode 100644 index 0000000..1f3725e --- /dev/null +++ b/resources/images/fallback/dark/big/send.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/resources/images/fallback/dark/small/arrow-down-double.svg b/resources/images/fallback/dark/small/arrow-down-double.svg new file mode 100644 index 0000000..c6d5465 --- /dev/null +++ b/resources/images/fallback/dark/small/arrow-down-double.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/resources/images/fallback/dark/small/arrow-up-double.svg b/resources/images/fallback/dark/small/arrow-up-double.svg new file mode 100644 index 0000000..ceb2c81 --- /dev/null +++ b/resources/images/fallback/dark/small/arrow-up-double.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/resources/images/fallback/dark/small/clean.svg b/resources/images/fallback/dark/small/clean.svg new file mode 100644 index 0000000..36a7b48 --- /dev/null +++ b/resources/images/fallback/dark/small/clean.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/resources/images/fallback/dark/small/dialog-ok.svg b/resources/images/fallback/dark/small/dialog-ok.svg new file mode 100644 index 0000000..f7480c0 --- /dev/null +++ b/resources/images/fallback/dark/small/dialog-ok.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/resources/images/fallback/dark/small/edit-none.svg b/resources/images/fallback/dark/small/edit-none.svg new file mode 100644 index 0000000..1b70494 --- /dev/null +++ b/resources/images/fallback/dark/small/edit-none.svg @@ -0,0 +1,10 @@ + + + + diff --git a/resources/images/fallback/dark/small/question.svg b/resources/images/fallback/dark/small/question.svg new file mode 100644 index 0000000..36dba69 --- /dev/null +++ b/resources/images/fallback/dark/small/question.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/resources/images/fallback/dark/small/send.svg b/resources/images/fallback/dark/small/send.svg new file mode 100644 index 0000000..3adce3b --- /dev/null +++ b/resources/images/fallback/dark/small/send.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/resources/images/fallback/light/big/arrow-down-double.svg b/resources/images/fallback/light/big/arrow-down-double.svg new file mode 100644 index 0000000..3562f4f --- /dev/null +++ b/resources/images/fallback/light/big/arrow-down-double.svg @@ -0,0 +1,10 @@ + + + + diff --git a/resources/images/fallback/light/big/arrow-up-double.svg b/resources/images/fallback/light/big/arrow-up-double.svg new file mode 100644 index 0000000..3a37d63 --- /dev/null +++ b/resources/images/fallback/light/big/arrow-up-double.svg @@ -0,0 +1,10 @@ + + + + diff --git a/resources/images/fallback/light/big/clean.svg b/resources/images/fallback/light/big/clean.svg new file mode 100644 index 0000000..33f83c2 --- /dev/null +++ b/resources/images/fallback/light/big/clean.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/resources/images/fallback/light/big/dialog-ok.svg b/resources/images/fallback/light/big/dialog-ok.svg new file mode 100644 index 0000000..0b2f3d5 --- /dev/null +++ b/resources/images/fallback/light/big/dialog-ok.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/resources/images/fallback/light/big/edit-none.svg b/resources/images/fallback/light/big/edit-none.svg new file mode 100644 index 0000000..43afffb --- /dev/null +++ b/resources/images/fallback/light/big/edit-none.svg @@ -0,0 +1,10 @@ + + + + diff --git a/resources/images/fallback/light/big/question.svg b/resources/images/fallback/light/big/question.svg new file mode 100644 index 0000000..98e7e2a --- /dev/null +++ b/resources/images/fallback/light/big/question.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/resources/images/fallback/light/big/send.svg b/resources/images/fallback/light/big/send.svg new file mode 100644 index 0000000..ea151f4 --- /dev/null +++ b/resources/images/fallback/light/big/send.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/resources/images/fallback/light/small/arrow-down-double.svg b/resources/images/fallback/light/small/arrow-down-double.svg new file mode 100644 index 0000000..778ba69 --- /dev/null +++ b/resources/images/fallback/light/small/arrow-down-double.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/resources/images/fallback/light/small/arrow-up-double.svg b/resources/images/fallback/light/small/arrow-up-double.svg new file mode 100644 index 0000000..2b513f0 --- /dev/null +++ b/resources/images/fallback/light/small/arrow-up-double.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/resources/images/fallback/light/small/clean.svg b/resources/images/fallback/light/small/clean.svg new file mode 100644 index 0000000..09bee39 --- /dev/null +++ b/resources/images/fallback/light/small/clean.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/resources/images/fallback/light/small/dialog-ok.svg b/resources/images/fallback/light/small/dialog-ok.svg new file mode 100644 index 0000000..fb3aae7 --- /dev/null +++ b/resources/images/fallback/light/small/dialog-ok.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/resources/images/fallback/light/small/edit-none.svg b/resources/images/fallback/light/small/edit-none.svg new file mode 100644 index 0000000..abb357d --- /dev/null +++ b/resources/images/fallback/light/small/edit-none.svg @@ -0,0 +1,10 @@ + + + + diff --git a/resources/images/fallback/light/small/question.svg b/resources/images/fallback/light/small/question.svg new file mode 100644 index 0000000..98e7e2a --- /dev/null +++ b/resources/images/fallback/light/small/question.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/resources/images/fallback/light/small/send.svg b/resources/images/fallback/light/small/send.svg new file mode 100644 index 0000000..b80ff98 --- /dev/null +++ b/resources/images/fallback/light/small/send.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/resources/resources.qrc b/resources/resources.qrc index e6f8ec1..2c9505b 100644 --- a/resources/resources.qrc +++ b/resources/resources.qrc @@ -11,6 +11,13 @@ images/fallback/dark/big/user.svg images/fallback/dark/big/chatty.svg + images/fallback/dark/big/arrow-down-double.svg + images/fallback/dark/big/arrow-up-double.svg + images/fallback/dark/big/dialog-ok.svg + images/fallback/dark/big/edit-none.svg + images/fallback/dark/big/question.svg + + images/fallback/dark/small/absent.svg images/fallback/dark/small/away.svg images/fallback/dark/small/busy.svg @@ -20,6 +27,13 @@ images/fallback/dark/small/user.svg images/fallback/dark/small/chatty.svg + images/fallback/dark/small/arrow-down-double.svg + images/fallback/dark/small/arrow-up-double.svg + images/fallback/dark/small/dialog-ok.svg + images/fallback/dark/small/edit-none.svg + images/fallback/dark/small/question.svg + + images/fallback/light/big/absent.svg images/fallback/light/big/away.svg images/fallback/light/big/busy.svg @@ -29,6 +43,13 @@ images/fallback/light/big/user.svg images/fallback/light/big/chatty.svg + images/fallback/light/big/arrow-down-double.svg + images/fallback/light/big/arrow-up-double.svg + images/fallback/light/big/dialog-ok.svg + images/fallback/light/big/edit-none.svg + images/fallback/light/big/question.svg + + images/fallback/light/small/absent.svg images/fallback/light/small/away.svg images/fallback/light/small/busy.svg @@ -37,5 +58,11 @@ images/fallback/light/small/online.svg images/fallback/light/small/user.svg images/fallback/light/small/chatty.svg + + images/fallback/light/small/arrow-down-double.svg + images/fallback/light/small/arrow-up-double.svg + images/fallback/light/small/dialog-ok.svg + images/fallback/light/small/edit-none.svg + images/fallback/light/small/question.svg