зеркало из https://github.com/nextcloud/desktop.git
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>
This commit is contained in:
Родитель
f9f1b49298
Коммит
73667a5367
|
@ -32,6 +32,8 @@ set(client_UI_SRCS
|
||||||
shareusergroupwidget.ui
|
shareusergroupwidget.ui
|
||||||
shareuserline.ui
|
shareuserline.ui
|
||||||
sslerrordialog.ui
|
sslerrordialog.ui
|
||||||
|
systemtray.qml
|
||||||
|
traywindow.qml
|
||||||
addcertificatedialog.ui
|
addcertificatedialog.ui
|
||||||
proxyauthdialog.ui
|
proxyauthdialog.ui
|
||||||
mnemonicdialog.ui
|
mnemonicdialog.ui
|
||||||
|
|
|
@ -3,7 +3,7 @@ import Qt.labs.platform 1.1
|
||||||
|
|
||||||
SystemTrayIcon {
|
SystemTrayIcon {
|
||||||
visible: true
|
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";
|
icon.source: "qrc:/client/theme/colored/state-sync-32.png";
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
|
@ -12,7 +12,7 @@ SystemTrayIcon {
|
||||||
|
|
||||||
onActivated: {
|
onActivated: {
|
||||||
var component = Qt.createComponent("qrc:/qml/src/gui/traywindow.qml")
|
var component = Qt.createComponent("qrc:/qml/src/gui/traywindow.qml")
|
||||||
win = component.createObject()
|
var win = component.createObject()
|
||||||
win.show()
|
win.show()
|
||||||
win.raise()
|
win.raise()
|
||||||
win.requestActivate()
|
win.requestActivate()
|
||||||
|
|
|
@ -12,9 +12,11 @@ Window {
|
||||||
flags: Qt.FramelessWindowHint
|
flags: Qt.FramelessWindowHint
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
// desktopAvailableWidth and Height doesn't include the system tray bar
|
/* desktopAvailableWidth and Height doesn't include the system tray bar
|
||||||
setX(Screen.desktopAvailableWidth - width);
|
but breaks application anyway on windows when using multi monitor setup,
|
||||||
setY(Screen.desktopAvailableHeight + height);
|
will look for a better solution later, for now just get this thing complete */
|
||||||
|
//setX(Screen.desktopAvailableWidth - width);
|
||||||
|
//setY(Screen.desktopAvailableHeight + height);
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
@ -56,7 +58,7 @@ Window {
|
||||||
height: (trayWindowHeaderBackground.height - 12)
|
height: (trayWindowHeaderBackground.height - 12)
|
||||||
antialiasing: true
|
antialiasing: true
|
||||||
Layout.margins: 4
|
Layout.margins: 4
|
||||||
source: "../avatar.png"
|
//source: "../avatar.png"
|
||||||
}
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
|
@ -117,13 +119,11 @@ Window {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Label {
|
Image {
|
||||||
text: "\u25BC"
|
|
||||||
Layout.bottomMargin: 10
|
Layout.bottomMargin: 10
|
||||||
Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
|
Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
|
||||||
font.pointSize: 9
|
|
||||||
color: "white"
|
|
||||||
verticalAlignment: Qt.AlignBottom
|
verticalAlignment: Qt.AlignBottom
|
||||||
|
source: "qrc:///client/theme/white/caret-down.svg"
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
@ -141,7 +141,7 @@ Window {
|
||||||
Layout.preferredWidth: (trayWindowHeaderBackground.height - 12)
|
Layout.preferredWidth: (trayWindowHeaderBackground.height - 12)
|
||||||
Layout.preferredHeight: (trayWindowHeaderBackground.height - 12)
|
Layout.preferredHeight: (trayWindowHeaderBackground.height - 12)
|
||||||
|
|
||||||
icon.source: "../files.png"
|
icon.source: "qrc:///client/theme/white/folder.svg"
|
||||||
icon.color: "transparent"
|
icon.color: "transparent"
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
@ -169,7 +169,7 @@ Window {
|
||||||
flat: true
|
flat: true
|
||||||
Layout.margins: 4
|
Layout.margins: 4
|
||||||
|
|
||||||
icon.source: "../talk.png"
|
icon.source: "qrc:///client/theme/white/talk-app.svg"
|
||||||
icon.color: "transparent"
|
icon.color: "transparent"
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
@ -197,7 +197,7 @@ Window {
|
||||||
flat: true
|
flat: true
|
||||||
Layout.margins: 4
|
Layout.margins: 4
|
||||||
|
|
||||||
icon.source: "../apps.png"
|
icon.source: "qrc:///client/theme/white/more-apps.svg"
|
||||||
icon.color: "transparent"
|
icon.color: "transparent"
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
|
12
theme.qrc
12
theme.qrc
|
@ -43,7 +43,7 @@
|
||||||
<file>theme/white/state-sync-64.png</file>
|
<file>theme/white/state-sync-64.png</file>
|
||||||
<file>theme/white/state-sync-128.png</file>
|
<file>theme/white/state-sync-128.png</file>
|
||||||
<file>theme/white/state-sync-256.png</file>
|
<file>theme/white/state-sync-256.png</file>
|
||||||
<file>theme/black/state-error-32.png</file>
|
<file>theme/black/state-error-32.png</file>
|
||||||
<file>theme/black/state-error-64.png</file>
|
<file>theme/black/state-error-64.png</file>
|
||||||
<file>theme/black/state-error-128.png</file>
|
<file>theme/black/state-error-128.png</file>
|
||||||
<file>theme/black/state-error-256.png</file>
|
<file>theme/black/state-error-256.png</file>
|
||||||
|
@ -80,7 +80,7 @@
|
||||||
<file>theme/colored/state-warning-128.png</file>
|
<file>theme/colored/state-warning-128.png</file>
|
||||||
<file>theme/colored/state-warning-256.png</file>
|
<file>theme/colored/state-warning-256.png</file>
|
||||||
<file>theme/black/control-next.svg</file>
|
<file>theme/black/control-next.svg</file>
|
||||||
<file>theme/black/control-prev.svg</file>
|
<file>theme/black/control-prev.svg</file>
|
||||||
<file>theme/black/state-error.svg</file>
|
<file>theme/black/state-error.svg</file>
|
||||||
<file>theme/black/state-error-16.png</file>
|
<file>theme/black/state-error-16.png</file>
|
||||||
<file>theme/black/state-offline.svg</file>
|
<file>theme/black/state-offline.svg</file>
|
||||||
|
@ -101,8 +101,8 @@
|
||||||
<file>theme/black/state-warning-64.png</file>
|
<file>theme/black/state-warning-64.png</file>
|
||||||
<file>theme/black/state-warning-128.png</file>
|
<file>theme/black/state-warning-128.png</file>
|
||||||
<file>theme/black/state-warning-256.png</file>
|
<file>theme/black/state-warning-256.png</file>
|
||||||
<file>theme/white/control-next.svg</file>
|
<file>theme/white/control-next.svg</file>
|
||||||
<file>theme/white/control-prev.svg</file>
|
<file>theme/white/control-prev.svg</file>
|
||||||
<file>theme/white/state-error.svg</file>
|
<file>theme/white/state-error.svg</file>
|
||||||
<file>theme/white/state-error-16.png</file>
|
<file>theme/white/state-error-16.png</file>
|
||||||
<file>theme/white/state-offline.svg</file>
|
<file>theme/white/state-offline.svg</file>
|
||||||
|
@ -131,5 +131,9 @@
|
||||||
<file>theme/colored/wizard-nextcloud@2x.png</file>
|
<file>theme/colored/wizard-nextcloud@2x.png</file>
|
||||||
<file>theme/colored/wizard-talk.png</file>
|
<file>theme/colored/wizard-talk.png</file>
|
||||||
<file>theme/colored/wizard-talk@2x.png</file>
|
<file>theme/colored/wizard-talk@2x.png</file>
|
||||||
|
<file>theme/white/folder.svg</file>
|
||||||
|
<file>theme/white/more-apps.svg</file>
|
||||||
|
<file>theme/white/talk-app.svg</file>
|
||||||
|
<file>theme/white/caret-down.svg</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
До Ширина: | Высота: | Размер: 145 B После Ширина: | Высота: | Размер: 145 B |
Загрузка…
Ссылка в новой задаче