From 73667a536731f2d15ee5e251f836b64685f0f78e Mon Sep 17 00:00:00 2001
From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Tue, 29 Oct 2019 08:13:05 +0100
Subject: [PATCH] Updated vecto icons and names, disabled init position (breaks
on multiple monitors on windows), integrated new icons in qml
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
---
src/gui/CMakeLists.txt | 2 ++
src/gui/systemtray.qml | 4 ++--
src/gui/traywindow.qml | 22 +++++++++----------
theme.qrc | 12 ++++++----
.../white/{caret-white.svg => caret-down.svg} | 0
5 files changed, 23 insertions(+), 17 deletions(-)
rename theme/white/{caret-white.svg => caret-down.svg} (100%)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 2d6e98595..faf22230c 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -32,6 +32,8 @@ set(client_UI_SRCS
shareusergroupwidget.ui
shareuserline.ui
sslerrordialog.ui
+ systemtray.qml
+ traywindow.qml
addcertificatedialog.ui
proxyauthdialog.ui
mnemonicdialog.ui
diff --git a/src/gui/systemtray.qml b/src/gui/systemtray.qml
index c1398bebf..2d6c88d8d 100644
--- a/src/gui/systemtray.qml
+++ b/src/gui/systemtray.qml
@@ -3,7 +3,7 @@ import Qt.labs.platform 1.1
SystemTrayIcon {
visible: true
- //icon.source: "qrc:/client/theme/colored/state-offiline-32.png"
+ //icon.source: "qrc:/client/theme/colored/state-offline-32.png"
icon.source: "qrc:/client/theme/colored/state-sync-32.png";
Component.onCompleted: {
@@ -12,7 +12,7 @@ SystemTrayIcon {
onActivated: {
var component = Qt.createComponent("qrc:/qml/src/gui/traywindow.qml")
- win = component.createObject()
+ var win = component.createObject()
win.show()
win.raise()
win.requestActivate()
diff --git a/src/gui/traywindow.qml b/src/gui/traywindow.qml
index c40aa5273..56fbff3d4 100644
--- a/src/gui/traywindow.qml
+++ b/src/gui/traywindow.qml
@@ -12,9 +12,11 @@ Window {
flags: Qt.FramelessWindowHint
Component.onCompleted: {
- // desktopAvailableWidth and Height doesn't include the system tray bar
- setX(Screen.desktopAvailableWidth - width);
- setY(Screen.desktopAvailableHeight + height);
+ /* desktopAvailableWidth and Height doesn't include the system tray bar
+ but breaks application anyway on windows when using multi monitor setup,
+ will look for a better solution later, for now just get this thing complete */
+ //setX(Screen.desktopAvailableWidth - width);
+ //setY(Screen.desktopAvailableHeight + height);
}
Rectangle {
@@ -56,7 +58,7 @@ Window {
height: (trayWindowHeaderBackground.height - 12)
antialiasing: true
Layout.margins: 4
- source: "../avatar.png"
+ //source: "../avatar.png"
}
Button {
@@ -117,13 +119,11 @@ Window {
}
}
- Label {
- text: "\u25BC"
+ Image {
Layout.bottomMargin: 10
Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
- font.pointSize: 9
- color: "white"
verticalAlignment: Qt.AlignBottom
+ source: "qrc:///client/theme/white/caret-down.svg"
}
Item {
@@ -141,7 +141,7 @@ Window {
Layout.preferredWidth: (trayWindowHeaderBackground.height - 12)
Layout.preferredHeight: (trayWindowHeaderBackground.height - 12)
- icon.source: "../files.png"
+ icon.source: "qrc:///client/theme/white/folder.svg"
icon.color: "transparent"
MouseArea {
@@ -169,7 +169,7 @@ Window {
flat: true
Layout.margins: 4
- icon.source: "../talk.png"
+ icon.source: "qrc:///client/theme/white/talk-app.svg"
icon.color: "transparent"
MouseArea {
@@ -197,7 +197,7 @@ Window {
flat: true
Layout.margins: 4
- icon.source: "../apps.png"
+ icon.source: "qrc:///client/theme/white/more-apps.svg"
icon.color: "transparent"
MouseArea {
diff --git a/theme.qrc b/theme.qrc
index 006056b87..8b593df98 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
@@ -80,7 +80,7 @@
theme/colored/state-warning-128.png
theme/colored/state-warning-256.png
theme/black/control-next.svg
- theme/black/control-prev.svg
+ theme/black/control-prev.svg
theme/black/state-error.svg
theme/black/state-error-16.png
theme/black/state-offline.svg
@@ -101,8 +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/control-next.svg
+ theme/white/control-prev.svg
theme/white/state-error.svg
theme/white/state-error-16.png
theme/white/state-offline.svg
@@ -131,5 +131,9 @@
theme/colored/wizard-nextcloud@2x.png
theme/colored/wizard-talk.png
theme/colored/wizard-talk@2x.png
+ theme/white/folder.svg
+ theme/white/more-apps.svg
+ theme/white/talk-app.svg
+ theme/white/caret-down.svg
diff --git a/theme/white/caret-white.svg b/theme/white/caret-down.svg
similarity index 100%
rename from theme/white/caret-white.svg
rename to theme/white/caret-down.svg