qt6.5: correct some bug with the migration

Change-Id: Ic64bdb5c554cc99e323fc11a259a0cd6cbf48bc5

src/app/commoncomponents/contextmenu/BaseContextMenu.qml

@@ -68,7 +68,7 @@ Menu {
                 if (menuItems[i].addMenuSeparatorAfter) {
                     menuSeparatorComponent = Qt.createComponent("GeneralMenuSeparator.qml", Component.PreferSynchronous, root);
                     menuSeparatorComponentObj = menuSeparatorComponent.createObject(root, {
-                            "separatorColor": "#DEDEDE",
+                            "separatorColor": JamiTheme.menuSeparatorColor,
                             "separatorPreferredHeight": 0
                         });
                     generalMenuSeparatorList.push(menuSeparatorComponentObj);

src/app/constant/JamiTheme.qml

@@ -411,6 +411,7 @@ Item {
     property real lineEditContextMenuItemsHeight: 15
     property real lineEditContextMenuItemsWidth: 100
     property real lineEditContextMenuSeparatorsHeight: 2
+    property color menuSeparatorColor: darkTheme ? "#4d4d4d" : "#DEDEDE"
 
     // Recording
     property real recordingBtnSize: 12
@@ -446,7 +447,6 @@ Item {
     property real switchPreferredWidth: 40
     property real switchIndicatorPreferredWidth: 20
 
-
     // Modal Popup
     property real modalPopupRadius: 20
     property real photoPopupRadius: 5
@@ -542,7 +542,6 @@ Item {
     property real wizardViewBlocMarginSize: pixelToPoint(40)
     property real wizardViewDescriptionMarginSize: pixelToPoint(20)
 
-
     // WizardView Welcome Page
     property real welcomeLabelPointSize: 30
     property var welcomeLogo: darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg

src/app/mainview/components/CallActionBar.qml

@@ -456,11 +456,9 @@ Control {
         CallOverlayModel.addSecondaryControl(audioOutputAction, audioOutputAction.enabled);
         CallOverlayModel.addSecondaryControl(raiseHandAction, raiseHandAction.enabled);
         CallOverlayModel.addSecondaryControl(addPersonAction, addPersonAction.enabled);
-
         CallOverlayModel.addSecondaryControl(resumePauseCallAction, resumePauseCallAction.enabled);
         CallOverlayModel.addSecondaryControl(inputPanelSIPAction, inputPanelSIPAction.enabled);
         CallOverlayModel.addSecondaryControl(callTransferAction, callTransferAction.enabled);
-
         CallOverlayModel.addSecondaryControl(chatAction, chatAction.enabled);
         CallOverlayModel.addSecondaryControl(shareAction, shareAction.enabled);
         CallOverlayModel.addSecondaryControl(layoutAction, layoutAction.enabled);
@@ -486,7 +484,7 @@ Control {
 
                 orientation: ListView.Horizontal
                 implicitWidth: contentWidth
-                implicitHeight: contentHeight
+                height: root.height
                 interactive: false
 
                 model: SortFilterProxyModel {
@@ -508,6 +506,9 @@ Control {
         width: childrenRect.width
         height: root.height
 
+        //put in top
+        z: 1
+
         RowLayout {
             spacing: itemSpacing
 

src/app/mainview/components/DocumentPreview.qml

@@ -45,7 +45,7 @@ Item {
                 ctxMenu.y = mouse.y;
                 ctxMenu.openMenu();
             } else {
-                MessagesAdapter.openUrl("file://" + Body);
+                MessagesAdapter.openUrl(icon.fileSource);
             }
         }
     }

src/app/settingsview/SettingsSidePanel.qml

@@ -35,6 +35,7 @@ SidePanelBase {
     property bool isSinglePane
 
     function getHeaders() {
+        if (AppVersionManager.isUpdaterEnabled()) {
             return [{
                     "title": JamiStrings.accountSettingsMenuTitle,
                     "icon": JamiResources.account_24dp_svg,
@@ -45,8 +46,7 @@ SidePanelBase {
                             "title": JamiStrings.manageAccountSettingsTitle
                         }, {
                             "id": 1,
-                        "title": JamiStrings.customizeProfile,
-                        "visible": CurrentAccount.type !== Profile.Type.SIP
+                            "title": JamiStrings.customizeProfile
                         }, {
                             "id": 2,
                             "title": JamiStrings.linkedDevicesSettingsTitle,
@@ -111,6 +111,79 @@ SidePanelBase {
                             "title": JamiStrings.pluginSettingsTitle
                         }]
                 }];
+        } else {
+            return [{
+                    "title": JamiStrings.accountSettingsMenuTitle,
+                    "icon": JamiResources.account_24dp_svg,
+                    "first": 0,
+                    "last": 4,
+                    "children": [{
+                            "id": 0,
+                            "title": JamiStrings.manageAccountSettingsTitle
+                        }, {
+                            "id": 1,
+                            "title": JamiStrings.customizeProfile
+                        }, {
+                            "id": 2,
+                            "title": JamiStrings.linkedDevicesSettingsTitle,
+                            "visible": CurrentAccount.type !== Profile.Type.SIP
+                        }, {
+                            "id": 3,
+                            "title": JamiStrings.callSettingsTitle
+                        }, {
+                            "id": 4,
+                            "title": JamiStrings.advancedSettingsTitle
+                        }]
+                }, {
+                    "title": JamiStrings.generalSettingsTitle,
+                    "icon": JamiResources.gear_black_24dp_svg,
+                    "first": 5,
+                    "last": 11,
+                    "children": [{
+                            "id": 5,
+                            "title": JamiStrings.system
+                        }, {
+                            "id": 6,
+                            "title": JamiStrings.appearance
+                        }, {
+                            "id": 7,
+                            "title": JamiStrings.chatSettingsTitle
+                        }, {
+                            "id": 8,
+                            "title": JamiStrings.locationSharingLabel
+                        }, {
+                            "id": 9,
+                            "title": JamiStrings.callRecording
+                        }, {
+                            "id": 10,
+                            "title": JamiStrings.troubleshootTitle
+                        }]
+                }, {
+                    "title": JamiStrings.audioVideoSettingsTitle,
+                    "icon": JamiResources.media_black_24dp_svg,
+                    "first": 12,
+                    "last": 14,
+                    "children": [{
+                            "id": 12,
+                            "title": JamiStrings.audio
+                        }, {
+                            "id": 13,
+                            "title": JamiStrings.video
+                        }, {
+                            "id": 14,
+                            "title": JamiStrings.screenSharing
+                        }]
+                }, {
+                    "title": JamiStrings.pluginSettingsTitle,
+                    "icon": JamiResources.plugins_24dp_svg,
+                    "first": 15,
+                    "last": 15,
+                    "children": [{
+                            "id": 15,
+                            "title": JamiStrings.pluginSettingsTitle
+                        }]
+                }];
+        }
     }
 
     function updateModel() {

src/app/settingsview/components/SystemSettingsPage.qml

@@ -49,7 +49,7 @@ SettingsPageBase {
         anchors.left: parent.left
         anchors.leftMargin: JamiTheme.preferredSettingsMarginSize
 
-        Column {
+        ColumnLayout {
             id: enableAccount
 
             width: parent.width
@@ -73,7 +73,7 @@ SettingsPageBase {
 
             ToggleSwitch {
                 id: notificationCheckBox
-                width: parent.width
+                Layout.fillWidth: true
 
                 checked: UtilsAdapter.getAppValue(Settings.EnableNotifications)
                 labelText: JamiStrings.showNotifications
@@ -83,7 +83,7 @@ SettingsPageBase {
 
             ToggleSwitch {
                 id: enableDonation
-                width: parent.width
+                Layout.fillWidth: true
                 visible: new Date() >= new Date(Date.parse("2023-11-01"))
 
                 checked: UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible)
@@ -99,7 +99,7 @@ SettingsPageBase {
 
             ToggleSwitch {
                 id: closeOrMinCheckBox
-                width: parent.width
+                Layout.fillWidth: true
 
                 visible: UtilsAdapter.isSystemTrayIconVisible()
                 checked: UtilsAdapter.getAppValue(Settings.MinimizeOnClose) && UtilsAdapter.isSystemTrayIconVisible()
@@ -109,7 +109,7 @@ SettingsPageBase {
 
             ToggleSwitch {
                 id: applicationOnStartUpCheckBox
-                width: parent.width
+                Layout.fillWidth: true
 
                 checked: UtilsAdapter.checkStartupLink()
                 labelText: JamiStrings.runStartup
@@ -118,7 +118,7 @@ SettingsPageBase {
             }
 
             RowLayout {
-                width: parent.width
+                Layout.fillWidth: true
                 height: JamiTheme.preferredFieldHeight
 
                 Text {
@@ -156,7 +156,7 @@ SettingsPageBase {
             SettingsComboBox {
                 id: langComboBoxSetting
 
-                width: parent.width
+                Layout.fillWidth: true
                 height: JamiTheme.preferredFieldHeight
 
                 labelText: JamiStrings.language