macO improvements

emericg · Sep 17, 2023 · bd2b254 · bd2b254
1 parent c124243
commit bd2b254
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 26 deletions.
diff --git a/assets/assets.qrc b/assets/assets.qrc
@@ -2,6 +2,7 @@
     <qresource prefix="/assets">
         <file>logos/logo.svg</file>
         <file>logos/icon.svg</file>
+        <file>logos/splash.svg</file>
         <file>logos/github.svg</file>
 
         <file>icons_bootstrap/bluetooth.svg</file>

diff --git a/assets/logos/icon.svg b/assets/logos/icon.svg
diff --git a/assets/logos/splash.svg b/assets/logos/splash.svg
diff --git a/qml/DesktopApplication.qml b/qml/DesktopApplication.qml
@@ -74,14 +74,13 @@ ApplicationWindow {
         function onUbertoothButtonClicked() { screenUbertooth.loadScreen() }
         function onSettingsButtonClicked() { screenSettings.loadScreen() }
     }
-/*
+
     Connections {
         target: menubarManager
         function onSensorsClicked() { appContent.state = "Scanner" }
-        function onSettingsClicked() { screenSettings.loadScreen() }
-        function onAboutClicked() { screenAbout.loadScreen() }
+        function onAboutClicked() { screenSettings.loadScreen() }
     }
-*/
+
     Connections {
         target: Qt.application
         function onStateChanged() {
@@ -401,7 +400,7 @@ ApplicationWindow {
                 anchors.centerIn: parent
                 width: 320
                 height: 320
-                source: "qrc:/assets/logos/icon.svg"
+                source: "qrc:/assets/logos/splash.svg"
                 sourceSize: Qt.size(width, height)
 
                 Behavior on opacity { OpacityAnimator { duration: 666; } }

diff --git a/qml/PanelDeviceInfos.qml b/qml/PanelDeviceInfos.qml
@@ -69,10 +69,10 @@ Flickable {
                 anchors.rightMargin: 8
                 anchors.verticalCenter: parent.verticalCenter
 
-                property int legendWidth: 80
+                property int legendWidth: 64
 
                 Component.onCompleted: {
-                    legendWidth = 80
+                    legendWidth = 64
                     legendWidth = Math.max(legendWidth, legendName.contentWidth)
                     legendWidth = Math.max(legendWidth, legendBluetooth.contentWidth)
                     if (Qt.platform.os === "osx") {
@@ -286,10 +286,10 @@ Flickable {
                 anchors.rightMargin: 8
                 anchors.verticalCenter: parent.verticalCenter
 
-                property int legendWidth: 80
+                property int legendWidth: 64
 
                 Component.onCompleted: {
-                    legendWidth = 80
+                    legendWidth = 64
                     legendWidth = Math.max(legendWidth, legendCategory.contentWidth)
                     legendWidth = Math.max(legendWidth, legendDeviceType.contentWidth)
                     legendWidth = Math.max(legendWidth, legendService.contentWidth)
@@ -424,7 +424,7 @@ Flickable {
                     anchors.right: parent.right
                     spacing: 12
 
-                    property int www: (width > 320) ? ((width - spacing) / 2) : width
+                    property int www: (width > 400) ? ((width - spacing) / 2) : width
 
                     ButtonScanMenu {
                         width: parent.www
@@ -616,10 +616,10 @@ Flickable {
                 anchors.right: parent.right
                 anchors.rightMargin: 8
 
-                property int legendWidth: 80
+                property int legendWidth: 64
 
                 Component.onCompleted: {
-                    legendWidth = 80
+                    legendWidth = 64
                     legendWidth = Math.max(legendWidth, legendRSSI.contentWidth)
                     legendWidth = Math.max(legendWidth, legendAdvertising.contentWidth)
                 }

diff --git a/qml/components/ButtonScanMenu.qml b/qml/components/ButtonScanMenu.qml
@@ -190,6 +190,7 @@ T.Button {
             Layout.fillWidth: true
             Layout.alignment: Qt.AlignVCenter
 
+            font: control.font
             elide: Text.ElideMiddle
             horizontalAlignment: Text.AlignLeft
             verticalAlignment: Text.AlignVCenter

diff --git a/src/main.cpp b/src/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 
 #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
     // Application icon
-    QIcon appIcon(":/assets/logos/logo.svg");
+    QIcon appIcon(":/assets/logos/icon.svg");
     app.setWindowIcon(appIcon);
 #endif