Font and icon size improvements, svg transfer to new folder

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>

diff --git a/src/gui/tray/ActivityListModel.cpp b/src/gui/tray/ActivityListModel.cpp
index 9e6ae09ddd1f359daf53a0d29382eac4d9ea7c8c..964b1f7acd1d78b8eb99a32d7661f41d53f0644d 100644 (file)
--- a/src/gui/tray/ActivityListModel.cpp
+++ b/src/gui/tray/ActivityListModel.cpp
@@ -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:

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

diff --git a/theme.qrc b/theme.qrc
index 42bda010fd40e6a63fa00e35b1aab21168b7f8d5..2a2881e96302ec5975ee962a00e449b31bc2392e 100644 (file)
--- a/theme.qrc
+++ b/theme.qrc
@@ -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>

diff --git a/theme/black/activity.svg b/theme/black/activity.svg
new file mode 100644 (file)
index 0000000..b6282ba
--- /dev/null
+++ b/theme/black/activity.svg
@@ -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>

diff --git a/theme/black/bell.svg b/theme/black/bell.svg
new file mode 100644 (file)
index 0000000..9de878f
--- /dev/null
+++ b/theme/black/bell.svg
@@ -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>
\ No newline at end of file

diff --git a/theme/black/state-info.svg b/theme/black/state-info.svg
new file mode 100644 (file)
index 0000000..762de03
--- /dev/null
+++ b/theme/black/state-info.svg
@@ -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>
\ No newline at end of file