From 7bd469525d1db9743fe27678f02bc7dce04a0b02 Mon Sep 17 00:00:00 2001
From: lcoursodon <liam.coursodon@savoirfairelinux.com>
Date: Mon, 27 Nov 2023 11:10:23 -0500
Subject: [PATCH] qt6.5: correct some bug with the migration
Change-Id: Ic64bdb5c554cc99e323fc11a259a0cd6cbf48bc5
---
.../contextmenu/BaseContextMenu.qml | 2 +-
src/app/constant/JamiTheme.qml | 3 +-
src/app/mainview/components/CallActionBar.qml | 9 +-
.../mainview/components/DocumentPreview.qml | 2 +-
src/app/settingsview/SettingsSidePanel.qml | 225 ++++++++++++------
.../components/SystemSettingsPage.qml | 14 +-
6 files changed, 164 insertions(+), 91 deletions(-)
diff --git a/src/app/commoncomponents/contextmenu/BaseContextMenu.qml b/src/app/commoncomponents/contextmenu/BaseContextMenu.qml
index 395e4c552..10e35f27e 100644
--- a/src/app/commoncomponents/contextmenu/BaseContextMenu.qml
+++ b/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);
diff --git a/src/app/constant/JamiTheme.qml b/src/app/constant/JamiTheme.qml
index 716cbad30..28662b1a5 100644
--- a/src/app/constant/JamiTheme.qml
+++ b/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
diff --git a/src/app/mainview/components/CallActionBar.qml b/src/app/mainview/components/CallActionBar.qml
index 785f7f2d6..c95876ea2 100644
--- a/src/app/mainview/components/CallActionBar.qml
+++ b/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
@@ -579,7 +580,7 @@ Control {
}
}
- Behavior on color {
+ Behavior on color {
ColorAnimation {
duration: JamiTheme.shortFadeDuration
}
diff --git a/src/app/mainview/components/DocumentPreview.qml b/src/app/mainview/components/DocumentPreview.qml
index 6c5a76026..556f5e632 100644
--- a/src/app/mainview/components/DocumentPreview.qml
+++ b/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);
}
}
}
diff --git a/src/app/settingsview/SettingsSidePanel.qml b/src/app/settingsview/SettingsSidePanel.qml
index 9ebc49cba..3d6317fe4 100644
--- a/src/app/settingsview/SettingsSidePanel.qml
+++ b/src/app/settingsview/SettingsSidePanel.qml
@@ -35,82 +35,155 @@ SidePanelBase {
property bool isSinglePane
function getHeaders() {
- return [{
- "title": JamiStrings.accountSettingsMenuTitle,
- "icon": JamiResources.account_24dp_svg,
- "first": 0,
- "last": 4,
- "children": [{
- "id": 0,
- "title": JamiStrings.manageAccountSettingsTitle
- }, {
- "id": 1,
- "title": JamiStrings.customizeProfile,
- "visible": CurrentAccount.type !== Profile.Type.SIP
- }, {
- "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
- }, {
- "id": 11,
- "title": JamiStrings.updatesTitle,
- "visible": AppVersionManager.isUpdaterEnabled()
- }]
- }, {
- "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
- }]
- }];
+ if (AppVersionManager.isUpdaterEnabled()) {
+ 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
+ }, {
+ "id": 11,
+ "title": JamiStrings.updatesTitle,
+ "visible": AppVersionManager.isUpdaterEnabled()
+ }]
+ }, {
+ "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
+ }]
+ }];
+ } 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() {
diff --git a/src/app/settingsview/components/SystemSettingsPage.qml b/src/app/settingsview/components/SystemSettingsPage.qml
index d9a490e5a..a637c8707 100644
--- a/src/app/settingsview/components/SystemSettingsPage.qml
+++ b/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
--
GitLab