Merge pull request #379 from jmlich/improve-debug-messages

[kirigami] Minor improvements
piggz · Jun 2, 2024 · 21e3ddc · 21e3ddc
2 parents e5ab77c + 425b0e1
commit 21e3ddc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/daemon/src/harbour-amazfish-daemon.cpp b/daemon/src/harbour-amazfish-daemon.cpp
@@ -26,7 +26,11 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS
 {
     QByteArray localMsg = msg.toLocal8Bit();
     const char* time = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz").toLocal8Bit();
+#ifdef QT_MESSAGELOGCONTEXT
+    fprintf(stderr,"%s %s:%d: %s\n", time, context.file, context.line, localMsg.constData());
+#else
     fprintf(stderr, "%s : %s\n", time, localMsg.constData());
+#endif
 }
 
 int main(int argc, char **argv)

diff --git a/ui/qml/components/platform.kirigami/ListItemPL.qml b/ui/qml/components/platform.kirigami/ListItemPL.qml
@@ -33,7 +33,7 @@ import "."
 Item {
     id: root
     height: item.height
-    width: parent.width
+    width: parent !== null ? parent.width : undefined
 
     default property alias content: itemData.data
     property real  contentHeight

diff --git a/ui/qml/components/platform.kirigami/PagePL.qml b/ui/qml/components/platform.kirigami/PagePL.qml
@@ -46,7 +46,9 @@ Kirigami.ScrollablePage {
             enabled: page.canNavigateForward === true
             icon.name: page.acceptIconName
             visible: !page.hideAcceptButton && (page.isDialog || app.pages.hasAttached(page))
-            text: "" + (page.isDialog ? app.tr("Accept") : app.pages.nextPage().title)
+            text: "" + (page.isDialog || app.pages.nextPage() == undefined
+                        ? app.tr("Accept")
+                        : app.pages.nextPage().title)
             onTriggered: {
                 if (acceptCallback) acceptCallback();
                 else app.pages.navigateForward();

diff --git a/ui/qml/components/platform.qtcontrols/TimePickerDialogPL.qml b/ui/qml/components/platform.qtcontrols/TimePickerDialogPL.qml
@@ -45,7 +45,7 @@ DialogPL {
                 maximumLength: 2
                 validator: IntValidator { bottom: 0;  top: 23 }
                 Keys.onReturnPressed: gM.focus = true
-                onTextChanged: hours = parseInt(text)
+                onTextChanged: hour = parseInt(text)
             }
 
             LabelPL {
@@ -70,8 +70,9 @@ DialogPL {
             hour = time.getHours();
             minute = time.getMinutes();
         }
-        gH.text = ("00" + hour).substr(-2);
-        gM.text = ("00" + minute).substr(-2);
+        // NaN value is converted to -2147483648
+        gH.text = (hour >= 0) ? ("00" + hour).substr(-2) : "00";
+        gM.text = (minute >= 0) ? ("00" + minute).substr(-2) : "00";
         gH.forceActiveFocus();
     }
 

diff --git a/ui/qml/harbour-amazfish.qml b/ui/qml/harbour-amazfish.qml
@@ -215,7 +215,7 @@ ApplicationWindowPL
     }
 
     function supportsFeature(feature) {
-        console.log("Checking if feature is supported:", feature, (supportedFeatures & feature) === feature);
+        // console.log("Checking if feature is supported:", feature, (supportedFeatures & feature) === feature);
         return (supportedFeatures & feature) === feature;
     }
 

diff --git a/ui/src/daemoninterface.cpp b/ui/src/daemoninterface.cpp
@@ -55,7 +55,7 @@ void DaemonInterface::connectDaemon()
 
 void DaemonInterface::pair(const QString &name, QString address)
 {
-    qDebug() << Q_FUNC_INFO;
+    qDebug() << Q_FUNC_INFO << name << address;
 
     if (m_connectionState == "pairing") {
         return;