opensourcemirror
/
nextcloud-desktop
mirror of https://github.com/nextcloud/desktop.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Font and icon size improvements, svg transfer to new folder 

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
This commit is contained in:
Dominique Fuchs 2020-01-14 19:48:21 +01:00
parent c09dd9287c
commit 29138cc533
6 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/tray/ActivityListModel.cpp
View File

@ -111,27 +111,27 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
}
case ActionIconRole: {
if (a._type == Activity::NotificationType) {
return "qrc:///client/resources/bell.svg";
return "qrc:///client/theme/black/bell.svg";
} else if (a._type == Activity::SyncResultType) {
return "qrc:///client/resources/state-error.svg";
return "qrc:///client/theme/black/state-error.svg";
} else if (a._type == Activity::SyncFileItemType) {
if (a._status == SyncFileItem::NormalError
|| a._status == SyncFileItem::FatalError
|| a._status == SyncFileItem::DetailError
|| a._status == SyncFileItem::BlacklistedError) {
return "qrc:///client/resources/state-error.svg";
return "qrc:///client/theme/black/state-error.svg";
} else if (a._status == SyncFileItem::SoftError
|| a._status == SyncFileItem::Conflict
|| a._status == SyncFileItem::Restoration
|| a._status == SyncFileItem::FileLocked) {
return "qrc:///client/resources/state-warning.svg";
return "qrc:///client/theme/black/state-warning.svg";
} else if (a._status == SyncFileItem::FileIgnored) {
return "qrc:///client/resources/state-info.svg";
return "qrc:///client/theme/black/state-info.svg";
} else {
return "qrc:///client/resources/state-sync.svg";
return "qrc:///client/theme/black/state-sync.svg";
}
} else {
return "qrc:///client/resources/activity.svg";
return "qrc:///client/theme/black/activity.svg";
}
}
case ObjectTypeRole:

25
src/gui/tray/Window.qml
View File

@ -172,21 +172,25 @@ Window {
MenuItem {
id: syncPauseButton
font.pixelSize: 12
onClicked: systrayBackend.pauseResumeSync()
}
MenuItem {
text: qsTr("Open settings")
font.pixelSize: 12
onClicked: systrayBackend.openSettings()
}
MenuItem {
text: qsTr("Help")
font.pixelSize: 12
onClicked: systrayBackend.openHelp()
}
MenuItem {
text: qsTr("Quit Nextcloud")
font.pixelSize: 12
onClicked: systrayBackend.shutdown()
}
}
@ -449,16 +453,17 @@ Window {
height: trayWindowHeaderLayout.height
spacing: 0
visible: (activityListView.model.rowCount() > 0)
Image {
id: activityIcon
Layout.leftMargin: 6
Layout.preferredWidth: 48
Layout.preferredHeight: 48
Layout.leftMargin: 8
Layout.preferredWidth: activityButton1.icon.width
Layout.preferredHeight: activityButton1.icon.height
verticalAlignment: Qt.AlignCenter
cache: true
source: icon
sourceSize.height: 48
sourceSize.width: 48
sourceSize.height: activityButton1.icon.height
sourceSize.width: activityButton1.icon.width
}
Column {
id: activityTextColumn
@ -468,16 +473,18 @@ Window {
Text {
id: activityTextTitle
text: (type === "Activity") ? subject : message
width: 220
width: 236
elide: Text.ElideRight
font.pointSize: 9
font.pixelSize: 12
}
Text {
id: activityTextInfo
text: displaypath
width: 220
height: (displaypath === "") ? 0 : activityTextTitle.height
width: 236
elide: Text.ElideRight
font.pointSize: 8
font.pixelSize: 10
}
}
Item {

3
theme.qrc
View File

@ -140,5 +140,8 @@
<file>theme/black/user.svg</file>
<file>theme/white/add.svg</file>
<file>theme/black/add.svg</file>
<file>theme/black/activity.svg</file>
<file>theme/black/bell.svg</file>
<file>theme/black/state-info.svg</file>
</qresource>
</RCC>

2
theme/black/activity.svg Normal file
View File

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1"><path fill="#000" d="m32 2-20 36h22l-2 24 20-36h-22z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 140 B

3
theme/black/bell.svg Normal file
View File

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
<path d="m8 2c-0.5523 0-1 0.4477-1 1 0 0.0472 0.021 0.0873 0.0273 0.1328-1.7366 0.4362-3.0273 1.9953-3.0273 3.8672v2l-1 1v1h10v-1l-1-1v-2c0-1.8719-1.291-3.431-3.0273-3.8672 0.0063-0.0455 0.0273-0.0856 0.0273-0.1328 0-0.5523-0.4477-1-1-1zm-2 10c0 1.1046 0.8954 2 2 2s2-0.8954 2-2z" fill="#000"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 400 B

1
theme/black/state-info.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4.2333 4.2333" version="1.1" height="16" width="16"><g id="g3830" transform="matrix(.87498 0 0 .87498 .26458 -255.9)"><circle id="circle3818" stroke-width=".25066" fill="#000" r="2.1167" cy="294.88" cx="2.1167" /><g id="g3828" stroke-linejoin="round" stroke-linecap="round" fill="none" /></g><path style="fill:#ffffff;stroke-width:0.17859235" d="m 1.6076619,2.1122981 c 0.027682,0.068222 0.058043,0.1232286 0.115014,0.043934 0.072686,-0.047862 0.314322,-0.2548509 0.29682,-0.061078 C 1.953774,2.4553739 1.8705497,2.8125586 1.8105428,3.1738508 1.7403561,3.3728027 1.9237704,3.5430012 2.1028984,3.4078068 2.295421,3.3181535 2.4582973,3.1779584 2.6256382,3.0488362 2.599921,2.9911507 2.5809903,2.9077482 2.5191973,2.9868644 2.4356161,3.0297263 2.2566665,3.2222491 2.2163047,3.07116 2.2725613,2.681829 2.3904322,2.3041062 2.4600833,1.9170966 2.5309844,1.7376113 2.3950755,1.5200858 2.210054,1.6736753 1.985742,1.7836882 1.8010774,1.9562083 1.6076619,2.1122981 Z M 2.4041839,0.77839186 C 2.1702279,0.77446305 2.0636081,1.1609366 2.2889917,1.2561264 2.4716917,1.3236342 2.659928,1.1286114 2.6086721,0.94358974 2.5911701,0.8467927 2.5018738,0.77035521 2.4038266,0.77749894 Z" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB