From 9b476a5caab91dd6e12e58878c484baa5b3b7118 Mon Sep 17 00:00:00 2001 From: Izabela Bakollari Date: Mon, 18 Mar 2019 09:39:49 +0100 Subject: [PATCH 01/13] Add files via upload --- resources/next.svg | 1 + resources/previous.svg | 1 + 2 files changed, 2 insertions(+) create mode 100644 resources/next.svg create mode 100644 resources/previous.svg diff --git a/resources/next.svg b/resources/next.svg new file mode 100644 index 0000000000..662b2172da --- /dev/null +++ b/resources/next.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/previous.svg b/resources/previous.svg new file mode 100644 index 0000000000..492f8f50d7 --- /dev/null +++ b/resources/previous.svg @@ -0,0 +1 @@ + \ No newline at end of file From ff7b0aace915ec16b1faa7360f51e6fabe15ba20 Mon Sep 17 00:00:00 2001 From: Izabela Bakollari Date: Mon, 18 Mar 2019 14:36:10 +0100 Subject: [PATCH 02/13] Modified slideshow buttons and edited "Host your own server" link --- client.qrc | 2 + src/gui/wizard/owncloudsetupnocredspage.ui | 145 ++++++++++++++++++++- src/gui/wizard/owncloudsetuppage.cpp | 6 +- 3 files changed, 148 insertions(+), 5 deletions(-) diff --git a/client.qrc b/client.qrc index 471f4c23d8..7cff06a101 100644 --- a/client.qrc +++ b/client.qrc @@ -37,6 +37,8 @@ resources/confirm.svg resources/copy.svg resources/state-sync.svg + ../desktop/resources/next.svg + ../desktop/resources/previous.svg diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index bc0ec84b92..315de545b6 100644 --- a/src/gui/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui @@ -206,8 +206,51 @@ - - + + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + <a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#888888;">Host your own server</span></a> + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 12 @@ -285,7 +328,7 @@ - Server Address + Ser&ver Address leUrl @@ -401,6 +444,100 @@ + + + + true + + + + 0 + 0 + + + + false + + + false + + + Qt::RightToLeft + + + false + + + + + + + :/client/desktop/resources/next.svg:/client/desktop/resources/next.svg + + + false + + + false + + + false + + + false + + + true + + + + + + + true + + + + 0 + 0 + + + + + 70 + 0 + + + + false + + + false + + + + + + + :/client/desktop/resources/previous.svg:/client/desktop/resources/previous.svg + + + false + + + false + + + false + + + false + + + true + + + @@ -416,7 +553,7 @@ - + diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp index e56ca06ae4..b645c6f07a 100644 --- a/src/gui/wizard/owncloudsetuppage.cpp +++ b/src/gui/wizard/owncloudsetuppage.cpp @@ -84,7 +84,11 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent) _ui.slideShow->addSlide(Theme::hidpiFileName(":/client/theme/colored/wizard-files.png"), tr("Secure collaboration & file exchange")); _ui.slideShow->addSlide(Theme::hidpiFileName(":/client/theme/colored/wizard-groupware.png"), tr("Easy-to-use web mail, calendaring & contacts")); _ui.slideShow->addSlide(Theme::hidpiFileName(":/client/theme/colored/wizard-talk.png"), tr("Screensharing, online meetings & web conferences")); - connect(_ui.slideShow, &SlideShow::clicked, _ui.slideShow, &SlideShow::nextSlide); + + connect(_ui.slideShow, &SlideShow::clicked, _ui.slideShow, &SlideShow::stopShow); + connect(_ui.nextButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::nextSlide); + connect(_ui.previousButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::previousSlide); + _ui.slideShow->startShow(); QPalette pal = _ui.slideShow->palette(); From 04fedf83b4d1f8122398abb3cb83a28fbe3528be Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Thu, 12 Sep 2019 16:43:24 +0200 Subject: [PATCH 03/13] Added newly created next/prev svg's and fixed reduntant layout parts in wizard Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- resources/next.svg | 13 +++++++- resources/previous.svg | 13 +++++++- src/gui/wizard/owncloudsetupnocredspage.ui | 36 ---------------------- 3 files changed, 24 insertions(+), 38 deletions(-) diff --git a/resources/next.svg b/resources/next.svg index 662b2172da..4b7875f66f 100644 --- a/resources/next.svg +++ b/resources/next.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + + + + + + + + + + diff --git a/resources/previous.svg b/resources/previous.svg index 492f8f50d7..954c518331 100644 --- a/resources/previous.svg +++ b/resources/previous.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + + + + + + + + + + diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index 315de545b6..a58e3dc559 100644 --- a/src/gui/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui @@ -211,42 +211,6 @@ 0 - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - <a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#888888;">Host your own server</span></a> - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - From c873da75e44defeca1b5fa2b44d11878891fb6ac Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Thu, 12 Sep 2019 17:52:31 +0200 Subject: [PATCH 04/13] Fixed wrong resource paths Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- client.qrc | 4 +- src/gui/wizard/owncloudsetupnocredspage.ui | 303 ++++++++++----------- 2 files changed, 146 insertions(+), 161 deletions(-) diff --git a/client.qrc b/client.qrc index 8b691ef700..14c6bd3da5 100644 --- a/client.qrc +++ b/client.qrc @@ -27,8 +27,8 @@ resources/confirm.svg resources/copy.svg resources/state-sync.svg - ../desktop/resources/next.svg - ../desktop/resources/previous.svg + resources/next.svg + resources/previous.svg resources/add.png resources/state-info.svg diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index b11dbf952e..a3a0161e57 100644 --- a/src/gui/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui @@ -27,22 +27,6 @@ - - - - 0 - 0 - - - - TextLabel - - - Qt::RichText - - - - 0 @@ -85,13 +69,13 @@ - - - - - 0 - 0 - + + + + + 0 + 0 + TextLabel @@ -99,15 +83,41 @@ Qt::RichText - - Qt::AlignCenter - - - true - - + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 20 + + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 20 + + + + + 6 @@ -190,41 +200,10 @@ - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - - - - 0 - - - - - - - 12 - 75 - true - - - + - + @@ -392,115 +371,121 @@ - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - - - - true - + + - + 0 0 - - false - - - false - - - Qt::RightToLeft - - - false - - + TextLabel - - - :/client/desktop/resources/next.svg:/client/desktop/resources/next.svg + + Qt::RichText - - false + + Qt::AlignCenter - - false - - - false - - - false - - + true - - - - true - - - - 0 - 0 - - - - - 70 - 0 - - - - false - - - false - - - - - - - :/client/desktop/resources/previous.svg:/client/desktop/resources/previous.svg - - - false - - - false - - - false - - - false - - - true - - + + + + + + true + + + + 0 + 0 + + + + + 50 + 0 + + + + + + + + :/client/desktop/resources/previous.svg:/client/desktop/resources/previous.svg + + + false + + + false + + + false + + + true + + + + + + + + 12 + 75 + true + + + + + + + + true + + + + 0 + 0 + + + + + 50 + 0 + + + + Qt::RightToLeft + + + + + + + :/client/desktop/resources/next.svg:/client/desktop/resources/next.svg + + + false + + + false + + + false + + + true + + + + From f49cd1850ce8eb37716fe5217f543d3b8f8edc19 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Thu, 12 Sep 2019 20:53:40 +0200 Subject: [PATCH 05/13] Restructured layout, as the initial change were too broken (after additions through the last months) Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/wizard/owncloudsetupnocredspage.ui | 455 ++++++++++----------- 1 file changed, 207 insertions(+), 248 deletions(-) diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index a3a0161e57..99365c91f2 100644 --- a/src/gui/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui @@ -25,83 +25,8 @@ - - - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - <a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a> - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - 0 - - - - TextLabel - - - Qt::RichText - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - + + Qt::Vertical @@ -117,93 +42,84 @@ - - - - 6 + + + + + 0 + 0 + - - 20 + + TextLabel + + Qt::RichText + + + Qt::AlignCenter + + + true + + + + + - - - Qt::Horizontal - - + + 40 - 20 - - - - - - - - - 150 - 0 - - - - false - - - Register with a provider - - - false - - - - - - - - 0 - 0 - - - - - 150 0 - Log in + - - false - - - true + + + :/client/resources/previous.svg:/client/resources/previous.svg - false + true - - - Qt::Horizontal + + + + 12 + 75 + true + - + + + + + 40 - 20 + 0 - + + + + + + :/client/resources/next.svg:/client/resources/next.svg + + + true + + - - - - + @@ -271,7 +187,7 @@ - Ser&ver Address + Server Address leUrl @@ -371,13 +287,155 @@ - - - - - 0 - 0 - + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 20 + + + + + + + + 6 + + + 20 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 150 + 0 + + + + false + + + Register with a provider + + + false + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Log in + + + false + + + true + + + false + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + <a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a> + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + 0 + 0 + TextLabel @@ -385,108 +443,8 @@ Qt::RichText - - Qt::AlignCenter - - - true - - - - - - - true - - - - 0 - 0 - - - - - 50 - 0 - - - - - - - - :/client/desktop/resources/previous.svg:/client/desktop/resources/previous.svg - - - false - - - false - - - false - - - true - - - - - - - - 12 - 75 - true - - - - - - - - true - - - - 0 - 0 - - - - - 50 - 0 - - - - Qt::RightToLeft - - - - - - - :/client/desktop/resources/next.svg:/client/desktop/resources/next.svg - - - false - - - false - - - false - - - true - - - - - @@ -502,6 +460,7 @@ + From ff5bf8634fbbabecbdc046b3c05f1b8969d57296 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Thu, 12 Sep 2019 20:59:03 +0200 Subject: [PATCH 06/13] fix naming for slide navigation, adapted everywhere to be consistent Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/wizard/owncloudsetuppage.cpp | 2 +- src/gui/wizard/slideshow.cpp | 2 +- src/gui/wizard/slideshow.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp index 4db645f19f..67bb8b88ca 100644 --- a/src/gui/wizard/owncloudsetuppage.cpp +++ b/src/gui/wizard/owncloudsetuppage.cpp @@ -87,7 +87,7 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent) connect(_ui.slideShow, &SlideShow::clicked, _ui.slideShow, &SlideShow::stopShow); connect(_ui.nextButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::nextSlide); - connect(_ui.previousButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::previousSlide); + connect(_ui.prevButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::prevSlide); _ui.slideShow->startShow(); diff --git a/src/gui/wizard/slideshow.cpp b/src/gui/wizard/slideshow.cpp index 721adaad3d..01ea9eacad 100644 --- a/src/gui/wizard/slideshow.cpp +++ b/src/gui/wizard/slideshow.cpp @@ -116,7 +116,7 @@ void SlideShow::nextSlide() _reverse = false; } -void SlideShow::previousSlide() +void SlideShow::prevSlide() { setCurrentSlide((_currentIndex > 0 ? _currentIndex : _labels.count()) - 1); _reverse = true; diff --git a/src/gui/wizard/slideshow.h b/src/gui/wizard/slideshow.h index 6cb53bf062..65743ec1fa 100644 --- a/src/gui/wizard/slideshow.h +++ b/src/gui/wizard/slideshow.h @@ -51,7 +51,7 @@ public slots: void startShow(int interval = 0); void stopShow(); void nextSlide(); - void previousSlide(); + void prevSlide(); void reset(); signals: From 1d96b102c0b77673617f408982ae5be0102fd5f4 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Thu, 12 Sep 2019 22:00:43 +0200 Subject: [PATCH 07/13] Layout optimizations and tab access for self-hosting link Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/wizard/owncloudsetupnocredspage.ui | 36 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index 99365c91f2..67462e4715 100644 --- a/src/gui/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui @@ -74,6 +74,12 @@ 0 + + + 80 + 16777215 + + @@ -105,6 +111,12 @@ 0 + + + 80 + 16777215 + + @@ -405,13 +417,25 @@ - - - <a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a> - - - true + + + Qt::TabFocus + + + + + <a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a> + + + true + + + Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse + + + + From af05db895c94e2f6c0b6fae6f00588258a40f67c Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Fri, 13 Sep 2019 08:08:39 +0200 Subject: [PATCH 08/13] [WIP] Resource file and include changes as well as new control icons for wizard slide buttons Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- client.qrc | 2 -- src/gui/wizard/owncloudsetupnocredspage.ui | 1 - theme.qrc | 6 +++++- theme/black/control-next.svg | 9 +++++++++ theme/black/control-prev.svg | 9 +++++++++ resources/next.svg => theme/white/control-next.svg | 5 +---- resources/previous.svg => theme/white/control-prev.svg | 5 +---- 7 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 theme/black/control-next.svg create mode 100644 theme/black/control-prev.svg rename resources/next.svg => theme/white/control-next.svg (69%) rename resources/previous.svg => theme/white/control-prev.svg (69%) diff --git a/client.qrc b/client.qrc index 14c6bd3da5..f9952965a4 100644 --- a/client.qrc +++ b/client.qrc @@ -27,8 +27,6 @@ resources/confirm.svg resources/copy.svg resources/state-sync.svg - resources/next.svg - resources/previous.svg resources/add.png resources/state-info.svg diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index 67462e4715..ae6f12f658 100644 --- a/src/gui/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui @@ -485,7 +485,6 @@ - diff --git a/theme.qrc b/theme.qrc index 44d0dfc728..006056b87b 100644 --- a/theme.qrc +++ b/theme.qrc @@ -43,7 +43,7 @@ theme/white/state-sync-64.png theme/white/state-sync-128.png theme/white/state-sync-256.png - theme/black/state-error-32.png + theme/black/state-error-32.png theme/black/state-error-64.png theme/black/state-error-128.png theme/black/state-error-256.png @@ -79,6 +79,8 @@ theme/colored/state-warning-64.png theme/colored/state-warning-128.png theme/colored/state-warning-256.png + theme/black/control-next.svg + theme/black/control-prev.svg theme/black/state-error.svg theme/black/state-error-16.png theme/black/state-offline.svg @@ -99,6 +101,8 @@ theme/black/state-warning-64.png theme/black/state-warning-128.png theme/black/state-warning-256.png + theme/white/control-next.svg + theme/white/control-prev.svg theme/white/state-error.svg theme/white/state-error-16.png theme/white/state-offline.svg diff --git a/theme/black/control-next.svg b/theme/black/control-next.svg new file mode 100644 index 0000000000..05886b8735 --- /dev/null +++ b/theme/black/control-next.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/theme/black/control-prev.svg b/theme/black/control-prev.svg new file mode 100644 index 0000000000..11fb0fb963 --- /dev/null +++ b/theme/black/control-prev.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/resources/next.svg b/theme/white/control-next.svg similarity index 69% rename from resources/next.svg rename to theme/white/control-next.svg index 4b7875f66f..097c5ee0c5 100644 --- a/resources/next.svg +++ b/theme/white/control-next.svg @@ -3,10 +3,7 @@ - + - - - diff --git a/resources/previous.svg b/theme/white/control-prev.svg similarity index 69% rename from resources/previous.svg rename to theme/white/control-prev.svg index 954c518331..348b4482fd 100644 --- a/resources/previous.svg +++ b/theme/white/control-prev.svg @@ -3,10 +3,7 @@ - + - - - From 544229d1e85388f2bc0a4b3addc80e2f810307e2 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Fri, 13 Sep 2019 08:24:02 +0200 Subject: [PATCH 09/13] [WIP] themed button implementation Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/wizard/owncloudsetupnocredspage.ui | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index ae6f12f658..9afb1f8cb1 100644 --- a/src/gui/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui @@ -84,8 +84,8 @@ - - :/client/resources/previous.svg:/client/resources/previous.svg + + :/client/theme/black/control-prev.svg:/client/theme/black/control-prev.svg true @@ -121,8 +121,8 @@ - - :/client/resources/next.svg:/client/resources/next.svg + + :/client/theme/black/control-next.svg:/client/theme/black/control-next.svg true From ace3da841c15b6c520055bca065f3974857cc8bf Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Fri, 13 Sep 2019 17:26:39 +0200 Subject: [PATCH 10/13] (Maybe) finished implementation of themed wizard buttons and accessibility refinements and thus implementation of helper fct. to retrieve themed QIcons. Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/wizard/owncloudsetupnocredspage.ui | 17 +++-------------- src/gui/wizard/owncloudsetuppage.cpp | 3 +++ src/libsync/theme.cpp | 8 ++++++++ src/libsync/theme.h | 8 ++++++++ 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index 9afb1f8cb1..2ed3ed1163 100644 --- a/src/gui/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui @@ -76,17 +76,13 @@ - 80 + 40 16777215 - - - :/client/theme/black/control-prev.svg:/client/theme/black/control-prev.svg - true @@ -113,17 +109,13 @@ - 80 + 40 16777215 - - - :/client/theme/black/control-next.svg:/client/theme/black/control-next.svg - true @@ -418,14 +410,11 @@ - - Qt::TabFocus - - <a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a> + <a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#7a7a7a;">Host your own server</span></a> true diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp index 67bb8b88ca..03a68e4082 100644 --- a/src/gui/wizard/owncloudsetuppage.cpp +++ b/src/gui/wizard/owncloudsetuppage.cpp @@ -89,6 +89,9 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent) connect(_ui.nextButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::nextSlide); connect(_ui.prevButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::prevSlide); + _ui.nextButton->setIcon(theme->uiThemeIcon(QString("control-next.svg"), false)); + _ui.prevButton->setIcon(theme->uiThemeIcon(QString("control-prev.svg"), false)); + _ui.slideShow->startShow(); QPalette pal = _ui.slideShow->palette(); diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index ed29647295..093995513c 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -177,6 +177,14 @@ QIcon Theme::themeIcon(const QString &name, bool sysTray, bool sysTrayMenuVisibl return cached; } +QIcon Theme::uiThemeIcon(const QString &iconName, bool uiHasDarkBg) const +{ + QString themeResBasePath = ":/client/theme/"; + QString iconPath = themeResBasePath + (uiHasDarkBg?"white/":"black/") + iconName; + std::string icnPath = iconPath.toUtf8().constData(); + return QIcon(QPixmap(iconPath)); +} + QString Theme::hidpiFileName(const QString &fileName, QPaintDevice *dev) { qreal devicePixelRatio = dev ? dev->devicePixelRatio() : qApp->primaryScreen()->devicePixelRatio(); diff --git a/src/libsync/theme.h b/src/libsync/theme.h index f703fd8b57..bccb239d7d 100644 --- a/src/libsync/theme.h +++ b/src/libsync/theme.h @@ -347,6 +347,14 @@ public: * important dependency versions. */ virtual QString versionSwitchOutput() const; + + /** + * @brief Request suitable QIcon resource depending on the background colour of the parent widget. + * + * This should be replaced (TODO) by a real theming implementation for the client UI + * (actually 2019/09/13 only systray theming). + */ + virtual QIcon uiThemeIcon(const QString &iconName, bool uiHasDarkBg) const; protected: #ifndef TOKEN_AUTH_ONLY From e8c8fe42234899323cae9f85518f4bce356a2954 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Fri, 13 Sep 2019 20:38:03 +0200 Subject: [PATCH 11/13] Added slight svg transparency as requested in ref issue, fixed bg detection logic Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/wizard/owncloudsetuppage.cpp | 13 +++++++++++-- theme/black/control-next.svg | 2 +- theme/black/control-prev.svg | 2 +- theme/white/control-next.svg | 2 +- theme/white/control-prev.svg | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp index 03a68e4082..8ea2903961 100644 --- a/src/gui/wizard/owncloudsetuppage.cpp +++ b/src/gui/wizard/owncloudsetuppage.cpp @@ -89,8 +89,17 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent) connect(_ui.nextButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::nextSlide); connect(_ui.prevButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::prevSlide); - _ui.nextButton->setIcon(theme->uiThemeIcon(QString("control-next.svg"), false)); - _ui.prevButton->setIcon(theme->uiThemeIcon(QString("control-prev.svg"), false)); + auto color = OwncloudSetupPage::palette().color(OwncloudSetupPage::backgroundRole()).lightness(); + bool widgetHasDarkBg = + (OwncloudSetupPage::palette().color(OwncloudSetupPage::backgroundRole()).lightness() >= 125) + ? false + : true; + _ui.nextButton->setIcon(theme->uiThemeIcon(QString("control-next.svg"), widgetHasDarkBg)); + _ui.prevButton->setIcon(theme->uiThemeIcon(QString("control-prev.svg"), widgetHasDarkBg)); + + // QPushButtons are a mess when it comes to consistent background coloring without stylesheets, + // so we do it here even though this is an exceptional styling method here + _ui.createAccountButton->setStyleSheet("QPushButton {background-color: #0082C9; color: white}"); _ui.slideShow->startShow(); diff --git a/theme/black/control-next.svg b/theme/black/control-next.svg index 05886b8735..19c7d0159b 100644 --- a/theme/black/control-next.svg +++ b/theme/black/control-next.svg @@ -3,7 +3,7 @@ - + diff --git a/theme/black/control-prev.svg b/theme/black/control-prev.svg index 11fb0fb963..97fe7a90df 100644 --- a/theme/black/control-prev.svg +++ b/theme/black/control-prev.svg @@ -3,7 +3,7 @@ - + diff --git a/theme/white/control-next.svg b/theme/white/control-next.svg index 097c5ee0c5..9194dbe6ee 100644 --- a/theme/white/control-next.svg +++ b/theme/white/control-next.svg @@ -3,7 +3,7 @@ - + diff --git a/theme/white/control-prev.svg b/theme/white/control-prev.svg index 348b4482fd..e3a3225947 100644 --- a/theme/white/control-prev.svg +++ b/theme/white/control-prev.svg @@ -3,7 +3,7 @@ - + From 1eb61b7949657988dca55f5d7f8d1b365f8fefc8 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Fri, 13 Sep 2019 20:49:59 +0200 Subject: [PATCH 12/13] Fixed unused var Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/wizard/owncloudsetuppage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp index 8ea2903961..fb2499c86b 100644 --- a/src/gui/wizard/owncloudsetuppage.cpp +++ b/src/gui/wizard/owncloudsetuppage.cpp @@ -89,9 +89,9 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent) connect(_ui.nextButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::nextSlide); connect(_ui.prevButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::prevSlide); - auto color = OwncloudSetupPage::palette().color(OwncloudSetupPage::backgroundRole()).lightness(); + auto widgetBgLightness = OwncloudSetupPage::palette().color(OwncloudSetupPage::backgroundRole()).lightness(); bool widgetHasDarkBg = - (OwncloudSetupPage::palette().color(OwncloudSetupPage::backgroundRole()).lightness() >= 125) + (widgetBgLightness >= 125) ? false : true; _ui.nextButton->setIcon(theme->uiThemeIcon(QString("control-next.svg"), widgetHasDarkBg)); From a35b346e629bcc106385588ee1acb427bfad09da Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Sun, 15 Sep 2019 11:53:57 +0200 Subject: [PATCH 13/13] Fixed e2e key transmission issue after generation (forgotten content type on sendrequest()) Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/libsync/clientsideencryptionjobs.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libsync/clientsideencryptionjobs.cpp b/src/libsync/clientsideencryptionjobs.cpp index f9db267931..5321f938ac 100644 --- a/src/libsync/clientsideencryptionjobs.cpp +++ b/src/libsync/clientsideencryptionjobs.cpp @@ -432,6 +432,7 @@ void SignPublicKeyApiJob::start() { QNetworkRequest req; req.setRawHeader("OCS-APIREQUEST", "true"); + req.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/x-www-form-urlencoded")); QUrlQuery query; query.addQueryItem(QLatin1String("format"), QLatin1String("json")); QUrl url = Utility::concatUrlPath(account()->url(), path());