Improve importing/changing config in Qt Quick GUI

Martchus · Martchus · commit bf4132a6a050 · 2024-12-23T00:31:49.000+01:00
diff --git a/syncthingconnector/syncthingconfig.cpp b/syncthingconnector/syncthingconfig.cpp
@@ -113,7 +113,10 @@ static void xmlAttributesToJsonObject(QXmlStreamReader &xmlReader, QJsonObject &
  */
 static void xmlElementToJsonValue(QXmlStreamReader &xmlReader, QJsonObject &object)
 {
-    static const auto arrayElements = QHash<QString, QString>{ { QStringLiteral("device"), QStringLiteral("devices") } };
+    static const auto arrayElements = QHash<QString, QString>{
+        { QStringLiteral("device"), QStringLiteral("devices") },
+        { QStringLiteral("address"), QStringLiteral("addresses") },
+    };
     auto name = xmlReader.name().toString();
     auto arrayName = arrayElements.find(name);
     auto text = QString();
diff --git a/syncthingconnector/syncthingconnection.h b/syncthingconnector/syncthingconnection.h
@@ -308,6 +308,7 @@ public Q_SLOTS:
 #endif
     bool applySettings(Data::SyncthingConnectionSettings &connectionSettings);
     void applyRawConfig();
+    void postRawConfig(const QByteArray &rawConfig);
 
     // methods to initiate/close connection
     void connect();
diff --git a/syncthingconnector/syncthingconnection_requests.cpp b/syncthingconnector/syncthingconnection_requests.cpp
@@ -1934,6 +1934,17 @@ SyncthingConnection::QueryResult SyncthingConnection::postConfigFromJsonObject(
     return postConfigFromByteArray(QJsonDocument(rawConfig).toJson(QJsonDocument::Compact), std::move(callback));
 }
 
+/*!
+ * \brief Posts the specified \a rawConfig.
+ * \remarks
+ * This function is a slot (in contrast to postConfigFromJsonObject()) and thus may be invoked via QMetaObject::invokeMethod() from
+ * another thread.
+ */
+void Data::SyncthingConnection::postRawConfig(const QByteArray &rawConfig)
+{
+    postConfigFromByteArray(rawConfig, std::function<void(QString &&)>());
+}
+
 /*!
  * \brief Posts the specified \a rawConfig.
  * \param rawConfig A valid JSON document containing the configuration. It is directly passed to Syncthing.
diff --git a/syncthingconnector/testfiles/testconfig/config.xml b/syncthingconnector/testfiles/testconfig/config.xml
@@ -46,6 +46,7 @@
     </folder>
     <device id="MMGUI6U-WUEZQCP-XZZ6VYB-LCT4TVC-ER2HAVX-QYT6X7D-S6ZSG2B-323KLQ7" name="Test dev 2" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
         <address>tcp://192.168.2.2:22001</address>
+        <address>tcp://192.168.2.2:22002</address>
         <paused>true</paused>
         <autoAcceptFolders>false</autoAcceptFolders>
         <maxSendKbps>0</maxSendKbps>
diff --git a/syncthingconnector/tests/connectiontests.cpp b/syncthingconnector/tests/connectiontests.cpp
@@ -447,8 +447,9 @@ void ConnectionTests::checkDevices()
             CPPUNIT_ASSERT_EQUAL_MESSAGE("paused device", QStringLiteral("Paused"), dev.statusString());
             CPPUNIT_ASSERT_EQUAL_MESSAGE("name", QStringLiteral("Test dev 2"), dev.name);
             CPPUNIT_ASSERT_MESSAGE("no introducer", !dev.introducer);
-            CPPUNIT_ASSERT_EQUAL(static_cast<decltype(dev.addresses.size())>(1), dev.addresses.size());
+            CPPUNIT_ASSERT_EQUAL(static_cast<decltype(dev.addresses.size())>(2), dev.addresses.size());
             CPPUNIT_ASSERT_EQUAL(QStringLiteral("tcp://192.168.2.2:22001"), dev.addresses.front());
+            CPPUNIT_ASSERT_EQUAL(QStringLiteral("tcp://192.168.2.2:22002"), dev.addresses.back());
             dev2 = &dev;
             dev2Index = index;
         } else if (dev.id == QStringLiteral("6EIS2PN-J2IHWGS-AXS3YUL-HC5FT3K-77ZXTLL-AKQLJ4C-7SWVPUS-AZW4RQ4")) {
diff --git a/syncthingconnector/tests/misctests.cpp b/syncthingconnector/tests/misctests.cpp
@@ -148,15 +148,22 @@ void MiscTests::testParsingConfigWithDetails()
     CPPUNIT_ASSERT_EQUAL(static_cast<QJsonArray::size_type>(2), devices.size());
 
     const auto device1 = devices.at(0).toObject();
+    const auto device1Addresses = device1.value(QLatin1String("addresses")).toArray();
     CPPUNIT_ASSERT_EQUAL(
         QStringLiteral("MMGUI6U-WUEZQCP-XZZ6VYB-LCT4TVC-ER2HAVX-QYT6X7D-S6ZSG2B-323KLQ7"), device1.value(QLatin1String("deviceID")).toString());
-    CPPUNIT_ASSERT_EQUAL(QStringLiteral("tcp://192.168.2.2:22001"), device1.value(QLatin1String("address")).toString());
+    CPPUNIT_ASSERT_EQUAL(static_cast<QJsonArray::size_type>(2), device1Addresses.size());
+    CPPUNIT_ASSERT_EQUAL(QStringLiteral("tcp://192.168.2.2:22001"), device1Addresses.first().toString());
+    CPPUNIT_ASSERT_EQUAL(QStringLiteral("tcp://192.168.2.2:22002"), device1Addresses.last().toString());
+    CPPUNIT_ASSERT_EQUAL(false, device1.contains(QStringLiteral("address")));
     CPPUNIT_ASSERT_EQUAL(true, device1.value(QLatin1String("paused")).toBool());
 
     const auto device2 = devices.at(1).toObject();
+    const auto device2Addresses = device2.value(QLatin1String("addresses")).toArray();
     CPPUNIT_ASSERT_EQUAL(
         QStringLiteral("6EIS2PN-J2IHWGS-AXS3YUL-HC5FT3K-77ZXTLL-AKQLJ4C-7SWVPUS-AZW4RQ4"), device2.value(QLatin1String("deviceID")).toString());
-    CPPUNIT_ASSERT_EQUAL(QStringLiteral("dynamic"), device2.value(QLatin1String("address")).toString());
+    CPPUNIT_ASSERT_EQUAL(static_cast<QJsonArray::size_type>(1), device2Addresses.size());
+    CPPUNIT_ASSERT_EQUAL(QStringLiteral("dynamic"), device2Addresses.first().toString());
+    CPPUNIT_ASSERT_EQUAL(false, device2.contains(QStringLiteral("address")));
     CPPUNIT_ASSERT_EQUAL(false, device2.value(QLatin1String("paused")).toBool());
 }
 
diff --git a/tray/gui/qml/AdvancedConfigPage.qml b/tray/gui/qml/AdvancedConfigPage.qml
@@ -76,9 +76,13 @@ ObjectConfigPage {
             App.showError("Can't apply, key is already used.");
             return false;
         }
-        advancedConfigPage.configObjectExists = true;
-        advancedConfigPage.disableInitialProperties();
-        App.postSyncthingConfig(cfg, (error) => (error.length === 0) && (advancedConfigPage.hasUnsavedChanges = false));
+        App.postSyncthingConfig(cfg, (error) => {
+            if (error.length === 0) {
+                advancedConfigPage.configObjectExists = true;
+                advancedConfigPage.hasUnsavedChanges = false;
+                advancedConfigPage.disableInitialProperties();
+            }
+        });
         return true;
     }
 
@@ -93,8 +97,10 @@ ObjectConfigPage {
             return false;
         }
         entries.splice(index, 1);
-        advancedConfigPage.configObjectExists = false;
-        App.postSyncthingConfig(cfg);
+        App.postSyncthingConfig(cfg, (error) => {
+            advancedConfigPage.configObjectExists = false;
+            advancedConfigPage.hasUnsavedChanges = false;
+        });
         return true;
     }
 }
diff --git a/tray/gui/qml/ImportPage.qml b/tray/gui/qml/ImportPage.qml
@@ -61,10 +61,11 @@ Page {
                             text: qsTr("App configuration")
                             elide: Text.ElideRight
                             font.weight: Font.Medium
+                            wrapMode: Text.WordWrap
                         }
                         Label {
                             Layout.fillWidth: true
-                            text: qsTr("Replace the app configuration with the one from the selected directory")
+                            text: qsTr("Replace the app configuration with the one from the selected directory.")
                             elide: Text.ElideRight
                             font.weight: Font.Light
                             wrapMode: Text.WordWrap
@@ -95,10 +96,11 @@ Page {
                             text: qsTr("Full Syncthing configuration and database")
                             elide: Text.ElideRight
                             font.weight: Font.Medium
+                            wrapMode: Text.WordWrap
                         }
                         Label {
                             Layout.fillWidth: true
-                            text: qsTr("Replace entire (existing) Syncthing configuration and database with the one from the selected directory")
+                            text: qsTr("Replace entire (existing) Syncthing configuration and database with the one from the selected directory. Use this with care as restoring the database is potentially dangerous.")
                             elide: Text.ElideRight
                             font.weight: Font.Light
                             wrapMode: Text.WordWrap
@@ -108,53 +110,56 @@ Page {
                         id: fullImport
                         onToggled: {
                             if (fullImport.checked) {
-                                selectedFolders.checked = false;
-                                selectedDevices.checked = false;
+                                folderSelection.selectionEnabled = false;
+                                deviceSelection.selectionEnabled = false;
                             }
                         }
                     }
                 }
             }
             SelectiveImportDelegate {
+                id: folderSelection
                 enabled: availableSettings.folders !== undefined && !fullImport.checked
                 iconName: "folder"
                 text: qsTr("Selected folders")
-                description: qsTr("Merge the selected folders into the existing Syncthing configuration - make sure paths are valid when importing folders from another physical device!")
+                description: qsTr("Merge the selected folders into the existing Syncthing configuration. You can change paths in case they differ on this device.")
                 dialogTitle: qsTr("Select folders to import")
                 model: ListModel {
                     id: foldersModel
                     Component.onCompleted: {
                         const folders = importPage.availableSettings.folders;
                         if (Array.isArray(folders)) {
-                            folders.forEach((folder, index) => foldersModel.append({index: index, displayName: folder.label?.length > 0 ? folder.label : folder.id, checked: false}));
+                            folders.forEach((folder, index) => foldersModel.append({index: index, displayName: folder.label?.length > 0 ? folder.label : folder.id, path: folder.path, checked: false}));
                         }
                     }
                 }
             }
             SelectiveImportDelegate {
+                id: deviceSelection
                 enabled: availableSettings.devices !== undefined && !fullImport.checked
                 iconName: "sitemap"
                 text: qsTr("Selected devices")
-                description: qsTr("Merge the selected devices into the existing Syncthing configuration")
+                description: qsTr("Merge the selected devices into the existing Syncthing configuration.")
                 dialogTitle: qsTr("Select devices to import")
                 model: ListModel {
                     id: devicesModel
                     Component.onCompleted: {
                         const devices = importPage.availableSettings.devices;
                         if (Array.isArray(devices)) {
-                            devices.forEach((device, index) => devicesModel.append({index: index, displayName: device.name?.length > 0 ? device.name : device.deviceID, checked: false}));
+                            devices.forEach((device, index) => devicesModel.append({index: index, displayName: device.name?.length > 0 ? `${device.name}\n${device.deviceID}` : device.deviceID, checked: false}));
                         }
                     }
                 }
             }
         }
     }
     required property var availableSettings
+    readonly property bool isDangerous: fullImport.checked
     property var selectedConfig: ({
         appConfig: appConfig.checked,
         syncthingHome: fullImport.checked,
-        selectedFolders: getSelectedIndexes(foldersModel),
-        selectedDevices: getSelectedIndexes(devicesModel),
+        selectedFolders: folderSelection.selectionEnabled ? handleSelectedIndexes(foldersModel) : [],
+        selectedDevices: deviceSelection.selectionEnabled ? handleSelectedIndexes(devicesModel) : [],
     })
     property list<Action> actions: [
         Action {
@@ -163,10 +168,17 @@ Page {
             onTriggered: (source) => App.importSettings(importPage.availableSettings, importPage.selectedConfig)
         }
     ]
-    function getSelectedIndexes(model) {
+    function handleSelectedIndexes(model) {
         const indexes = [];
+        const folders = importPage.availableSettings.folders;
         for (let i = 0, count = model.count; i !== count; ++i) {
-            if (model.get(i).checked) {
+            const modelData = model.get(i);
+            if (modelData.checked) {
+                // update paths
+                const path = modelData.path;
+                if (path !== undefined && Array.isArray(folders) && i < folders.length) {
+                    folders[i].path = path;
+                }
                 indexes.push(i);
             }
         }
diff --git a/tray/gui/qml/Main.qml b/tray/gui/qml/Main.qml
@@ -508,7 +508,7 @@ ApplicationWindow {
         if (App.showToast(message)) {
             return;
         }
-        notifictionToolTip.text = message;
+        notifictionToolTip.text = notifictionToolTip.visible ? `${notifictionToolTip.text}\n${message}` : message;
         notifictionToolTip.open();
     }
 }
diff --git a/tray/gui/qml/SelectiveImportDelegate.qml b/tray/gui/qml/SelectiveImportDelegate.qml
@@ -25,6 +25,7 @@ ItemDelegate {
                 Layout.fillWidth: true
                 elide: Text.ElideRight
                 font.weight: Font.Medium
+                wrapMode: Text.WordWrap
             }
             Label {
                 id: descriptionLabel
@@ -46,10 +47,42 @@ ItemDelegate {
         contentItem: CustomListView {
             id: selectionView
             height: availableHeight
-            delegate: CheckBox {
+            delegate: ItemDelegate {
                 width: selectionView.width
-                text: modelData.displayName
-                onToggled: selectionView.model.setProperty(modelData.index, "checked", checked)
+                onClicked: {
+                    selectionCheckBox.toggle();
+                    selectionCheckBox.toggled();
+                }
+                contentItem: RowLayout {
+                    CheckBox {
+                        id: selectionCheckBox
+                        onToggled: selectionView.model.setProperty(modelData.index, "checked", checked)
+                    }
+                    ColumnLayout {
+                        Layout.fillWidth: true
+                        Label {
+                            Layout.fillWidth: true
+                            text: modelData.displayName
+                            font.weight: Font.Medium
+                        }
+                        ItemDelegate {
+                            Layout.fillWidth: true
+                            visible: modelData.path !== undefined
+                            height: visible ? implicitHeight : 0
+                            text: modelData.path ?? ""
+                            icon.source: App.faUrlBase + "folder-open-o"
+                            icon.width: App.iconSize
+                            icon.height: App.iconSize
+                            onClicked: folderDlg.open()
+                        }
+                    }
+                }
+                FolderDialog {
+                    id: folderDlg
+                    title: qsTr("Set folder path of %1").arg(modelData.displayName)
+                    currentFolder: "file://" + encodeURIComponent(modelData.path ?? "")
+                    onAccepted: selectionView.model.setProperty(modelData.index, "path", App.resolveUrl(folderDlg.selectedFolder))
+                }
                 required property var modelData
             }
         }
diff --git a/tray/gui/qml/StartPage.qml b/tray/gui/qml/StartPage.qml
@@ -79,7 +79,7 @@ Page {
                                 value: remoteCompletion.percentage
                             }
                             Label {
-                                text: remoteProgressBar.position >= 1 ? qsTr("Up to Date") : (Number.isNan(remoteCompletion.percentage) ? qsTr("Not available") : qsTr("%1 %").arg(Math.round(remoteCompletion.percentage)))
+                                text: remoteProgressBar.position >= 1 ? qsTr("Up to Date") : (Number.isNaN(remoteCompletion.percentage) ? qsTr("Not available") : qsTr("%1 %").arg(Math.round(remoteCompletion.percentage)))
                                 font.weight: Font.Light
                             }
                         }
diff --git a/tray/gui/quick/app.cpp b/tray/gui/quick/app.cpp
@@ -1103,7 +1103,7 @@ bool App::importSettings(const QVariantMap &availableSettings, const QVariantMap
 
     setImportExportStatus(ImportExportStatus::Importing);
 
-    QtConcurrent::run([this, importSyncthingHome, availableSettings, selectedSettings] {
+    QtConcurrent::run([this, importSyncthingHome, availableSettings, selectedSettings, rawConfig = m_connection.rawConfig()] () mutable {
         // copy selected files from import directory to settings directory
         auto summary = QStringList();
         try {
@@ -1139,23 +1139,31 @@ bool App::importSettings(const QVariantMap &availableSettings, const QVariantMap
             const auto availableDevices = availableSettings.value(QStringLiteral("devices")).toJsonArray();
             const auto selectedFolders = selectedSettings.value(QStringLiteral("selectedFolders")).value<QVariantList>();
             const auto selectedDevices = selectedSettings.value(QStringLiteral("selectedDevices")).value<QVariantList>();
-            const auto defaults = m_connection.rawConfig().value(QStringLiteral("defaults")).toObject();
+            const auto defaults = rawConfig.value(QStringLiteral("defaults")).toObject();
             const auto folderTemplate = defaults.value(QStringLiteral("folder")).toObject();
             const auto deviceTemplate = defaults.value(QStringLiteral("device")).toObject();
-            auto folders = m_connection.rawConfig().value(QStringLiteral("folders")).toArray();
-            auto devices = m_connection.rawConfig().value(QStringLiteral("devices")).toArray();
+            const auto foldersVal = rawConfig.value(QStringLiteral("folders"));
+            const auto devicesVal = rawConfig.value(QStringLiteral("devices"));
+            if (!foldersVal.isArray() || !devicesVal.isArray()) {
+                return std::make_pair(tr("Unable to find folders/devices in current Syncthing config."), true);
+            }
+            auto folders = foldersVal.toArray();
+            auto devices = devicesVal.toArray();
             const auto importedFolders = importObjects(folderTemplate, availableFolders, selectedFolders, folders);
             const auto importedDevices = importObjects(deviceTemplate, availableDevices, selectedDevices, devices);
             if (importedFolders || importedDevices) {
-                auto newConfig = m_connection.rawConfig();
                 if (importedFolders) {
-                    newConfig.insert(QStringLiteral("folders"), folders);
+                    rawConfig.insert(QStringLiteral("folders"), folders);
                 }
                 if (importedDevices) {
-                    newConfig.insert(QStringLiteral("devices"), devices);
+                    rawConfig.insert(QStringLiteral("devices"), devices);
+                }
+                auto newConfigJson = QJsonDocument(rawConfig).toJson(QJsonDocument::Compact);
+                if (QMetaObject::invokeMethod(&m_connection, &SyncthingConnection::postRawConfig, Qt::QueuedConnection, std::move(newConfigJson))) {
+                    summary.append(tr("Merging %1 folders and %2 devices").arg(importedFolders).arg(importedDevices));
+                } else {
+                    return std::make_pair(tr("Unable to import folders/devices."), true);
                 }
-                m_connection.postConfigFromJsonObject(newConfig);
-                summary.append(tr("Imported %1 folders and %2 devices.").arg(importedFolders).arg(importedDevices));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,13 @@ ObjectConfigPage {`
`76`	`76`	`App.showError("Can't apply, key is already used.");`
`77`	`77`	`return false;`
`78`	`78`	`}`
`79`		`- advancedConfigPage.configObjectExists = true;`
`80`		`- advancedConfigPage.disableInitialProperties();`
`81`		`- App.postSyncthingConfig(cfg, (error) => (error.length === 0) && (advancedConfigPage.hasUnsavedChanges = false));`
	`79`	`+ App.postSyncthingConfig(cfg, (error) => {`
	`80`	`+ if (error.length === 0) {`
	`81`	`+ advancedConfigPage.configObjectExists = true;`
	`82`	`+ advancedConfigPage.hasUnsavedChanges = false;`
	`83`	`+ advancedConfigPage.disableInitialProperties();`
	`84`	`+ }`
	`85`	`+ });`
`82`	`86`	`return true;`
`83`	`87`	`}`
`84`	`88`
`@@ -93,8 +97,10 @@ ObjectConfigPage {`
`93`	`97`	`return false;`
`94`	`98`	`}`
`95`	`99`	`entries.splice(index, 1);`
`96`		`- advancedConfigPage.configObjectExists = false;`
`97`		`- App.postSyncthingConfig(cfg);`
	`100`	`+ App.postSyncthingConfig(cfg, (error) => {`
	`101`	`+ advancedConfigPage.configObjectExists = false;`
	`102`	`+ advancedConfigPage.hasUnsavedChanges = false;`
	`103`	`+ });`
`98`	`104`	`return true;`
`99`	`105`	`}`
`100`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,11 @@ Page {`
`61`	`61`	`text: qsTr("App configuration")`
`62`	`62`	`elide: Text.ElideRight`
`63`	`63`	`font.weight: Font.Medium`
	`64`	`+ wrapMode: Text.WordWrap`
`64`	`65`	`}`
`65`	`66`	`Label {`
`66`	`67`	`Layout.fillWidth: true`
`67`		`- text: qsTr("Replace the app configuration with the one from the selected directory")`
	`68`	`+ text: qsTr("Replace the app configuration with the one from the selected directory.")`
`68`	`69`	`elide: Text.ElideRight`
`69`	`70`	`font.weight: Font.Light`
`70`	`71`	`wrapMode: Text.WordWrap`
`@@ -95,10 +96,11 @@ Page {`
`95`	`96`	`text: qsTr("Full Syncthing configuration and database")`
`96`	`97`	`elide: Text.ElideRight`
`97`	`98`	`font.weight: Font.Medium`
	`99`	`+ wrapMode: Text.WordWrap`
`98`	`100`	`}`
`99`	`101`	`Label {`
`100`	`102`	`Layout.fillWidth: true`
`101`		`- text: qsTr("Replace entire (existing) Syncthing configuration and database with the one from the selected directory")`
	`103`	`+ text: qsTr("Replace entire (existing) Syncthing configuration and database with the one from the selected directory. Use this with care as restoring the database is potentially dangerous.")`
`102`	`104`	`elide: Text.ElideRight`
`103`	`105`	`font.weight: Font.Light`
`104`	`106`	`wrapMode: Text.WordWrap`
`@@ -108,53 +110,56 @@ Page {`
`108`	`110`	`id: fullImport`
`109`	`111`	`onToggled: {`
`110`	`112`	`if (fullImport.checked) {`
`111`		`- selectedFolders.checked = false;`
`112`		`- selectedDevices.checked = false;`
	`113`	`+ folderSelection.selectionEnabled = false;`
	`114`	`+ deviceSelection.selectionEnabled = false;`
`113`	`115`	`}`
`114`	`116`	`}`
`115`	`117`	`}`
`116`	`118`	`}`
`117`	`119`	`}`
`118`	`120`	`SelectiveImportDelegate {`
	`121`	`+ id: folderSelection`
`119`	`122`	`enabled: availableSettings.folders !== undefined && !fullImport.checked`
`120`	`123`	`iconName: "folder"`
`121`	`124`	`text: qsTr("Selected folders")`
`122`		`- description: qsTr("Merge the selected folders into the existing Syncthing configuration - make sure paths are valid when importing folders from another physical device!")`
	`125`	`+ description: qsTr("Merge the selected folders into the existing Syncthing configuration. You can change paths in case they differ on this device.")`
`123`	`126`	`dialogTitle: qsTr("Select folders to import")`
`124`	`127`	`model: ListModel {`
`125`	`128`	`id: foldersModel`
`126`	`129`	`Component.onCompleted: {`
`127`	`130`	`const folders = importPage.availableSettings.folders;`
`128`	`131`	`if (Array.isArray(folders)) {`
`129`		`- folders.forEach((folder, index) => foldersModel.append({index: index, displayName: folder.label?.length > 0 ? folder.label : folder.id, checked: false}));`
	`132`	`+ folders.forEach((folder, index) => foldersModel.append({index: index, displayName: folder.label?.length > 0 ? folder.label : folder.id, path: folder.path, checked: false}));`
`130`	`133`	`}`
`131`	`134`	`}`
`132`	`135`	`}`
`133`	`136`	`}`
`134`	`137`	`SelectiveImportDelegate {`
	`138`	`+ id: deviceSelection`
`135`	`139`	`enabled: availableSettings.devices !== undefined && !fullImport.checked`
`136`	`140`	`iconName: "sitemap"`
`137`	`141`	`text: qsTr("Selected devices")`
`138`		`- description: qsTr("Merge the selected devices into the existing Syncthing configuration")`
	`142`	`+ description: qsTr("Merge the selected devices into the existing Syncthing configuration.")`
`139`	`143`	`dialogTitle: qsTr("Select devices to import")`
`140`	`144`	`model: ListModel {`
`141`	`145`	`id: devicesModel`
`142`	`146`	`Component.onCompleted: {`
`143`	`147`	`const devices = importPage.availableSettings.devices;`
`144`	`148`	`if (Array.isArray(devices)) {`
`145`		`- devices.forEach((device, index) => devicesModel.append({index: index, displayName: device.name?.length > 0 ? device.name : device.deviceID, checked: false}));`
	`149`	+ devices.forEach((device, index) => devicesModel.append({index: index, displayName: device.name?.length > 0 ? `${device.name}\n${device.deviceID}` : device.deviceID, checked: false}));
`146`	`150`	`}`
`147`	`151`	`}`
`148`	`152`	`}`
`149`	`153`	`}`
`150`	`154`	`}`
`151`	`155`	`}`
`152`	`156`	`required property var availableSettings`
	`157`	`+ readonly property bool isDangerous: fullImport.checked`
`153`	`158`	`property var selectedConfig: ({`
`154`	`159`	`appConfig: appConfig.checked,`
`155`	`160`	`syncthingHome: fullImport.checked,`
`156`		`- selectedFolders: getSelectedIndexes(foldersModel),`
`157`		`- selectedDevices: getSelectedIndexes(devicesModel),`
	`161`	`+ selectedFolders: folderSelection.selectionEnabled ? handleSelectedIndexes(foldersModel) : [],`
	`162`	`+ selectedDevices: deviceSelection.selectionEnabled ? handleSelectedIndexes(devicesModel) : [],`
`158`	`163`	`})`
`159`	`164`	`property list<Action> actions: [`
`160`	`165`	`Action {`
`@@ -163,10 +168,17 @@ Page {`
`163`	`168`	`onTriggered: (source) => App.importSettings(importPage.availableSettings, importPage.selectedConfig)`
`164`	`169`	`}`
`165`	`170`	`]`
`166`		`- function getSelectedIndexes(model) {`
	`171`	`+ function handleSelectedIndexes(model) {`
`167`	`172`	`const indexes = [];`
	`173`	`+ const folders = importPage.availableSettings.folders;`
`168`	`174`	`for (let i = 0, count = model.count; i !== count; ++i) {`
`169`		`- if (model.get(i).checked) {`
	`175`	`+ const modelData = model.get(i);`
	`176`	`+ if (modelData.checked) {`
	`177`	`+ // update paths`
	`178`	`+ const path = modelData.path;`
	`179`	`+ if (path !== undefined && Array.isArray(folders) && i < folders.length) {`
	`180`	`+ folders[i].path = path;`
	`181`	`+ }`
`170`	`182`	`indexes.push(i);`
`171`	`183`	`}`
`172`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ ApplicationWindow {`
`508`	`508`	`if (App.showToast(message)) {`
`509`	`509`	`return;`
`510`	`510`	`}`
`511`		`- notifictionToolTip.text = message;`
	`511`	+ notifictionToolTip.text = notifictionToolTip.visible ? `${notifictionToolTip.text}\n${message}` : message;
`512`	`512`	`notifictionToolTip.open();`
`513`	`513`	`}`
`514`	`514`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ Page {`
`79`	`79`	`value: remoteCompletion.percentage`
`80`	`80`	`}`
`81`	`81`	`Label {`
`82`		`- text: remoteProgressBar.position >= 1 ? qsTr("Up to Date") : (Number.isNan(remoteCompletion.percentage) ? qsTr("Not available") : qsTr("%1 %").arg(Math.round(remoteCompletion.percentage)))`
	`82`	`+ text: remoteProgressBar.position >= 1 ? qsTr("Up to Date") : (Number.isNaN(remoteCompletion.percentage) ? qsTr("Not available") : qsTr("%1 %").arg(Math.round(remoteCompletion.percentage)))`
`83`	`83`	`font.weight: Font.Light`
`84`	`84`	`}`
`85`	`85`	`}`