Skip to content
Snippets Groups Projects
Commit 7bd46952 authored by Liam Coursodon's avatar Liam Coursodon
Browse files

qt6.5: correct some bug with the migration 

Change-Id: Ic64bdb5c554cc99e323fc11a259a0cd6cbf48bc5
parent f457ed50
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 164 additions and 91 deletions
src/app/commoncomponents/contextmenu/BaseContextMenu.qml
+ 1
− 1
View file @ 7bd46952
...@@ -68,7 +68,7 @@ Menu { ...@@ -68,7 +68,7 @@ Menu {
if (menuItems[i].addMenuSeparatorAfter) { if (menuItems[i].addMenuSeparatorAfter) {
menuSeparatorComponent = Qt.createComponent("GeneralMenuSeparator.qml", Component.PreferSynchronous, root); menuSeparatorComponent = Qt.createComponent("GeneralMenuSeparator.qml", Component.PreferSynchronous, root);
menuSeparatorComponentObj = menuSeparatorComponent.createObject(root, { menuSeparatorComponentObj = menuSeparatorComponent.createObject(root, {
"separatorColor": "#DEDEDE", "separatorColor": JamiTheme.menuSeparatorColor,
"separatorPreferredHeight": 0 "separatorPreferredHeight": 0
}); });
generalMenuSeparatorList.push(menuSeparatorComponentObj); generalMenuSeparatorList.push(menuSeparatorComponentObj);
......
src/app/constant/JamiTheme.qml
+ 1
− 2
View file @ 7bd46952
...@@ -411,6 +411,7 @@ Item { ...@@ -411,6 +411,7 @@ Item {
property real lineEditContextMenuItemsHeight: 15 property real lineEditContextMenuItemsHeight: 15
property real lineEditContextMenuItemsWidth: 100 property real lineEditContextMenuItemsWidth: 100
property real lineEditContextMenuSeparatorsHeight: 2 property real lineEditContextMenuSeparatorsHeight: 2
property color menuSeparatorColor: darkTheme ? "#4d4d4d" : "#DEDEDE"
// Recording // Recording
property real recordingBtnSize: 12 property real recordingBtnSize: 12
...@@ -446,7 +447,6 @@ Item { ...@@ -446,7 +447,6 @@ Item {
property real switchPreferredWidth: 40 property real switchPreferredWidth: 40
property real switchIndicatorPreferredWidth: 20 property real switchIndicatorPreferredWidth: 20
// Modal Popup // Modal Popup
property real modalPopupRadius: 20 property real modalPopupRadius: 20
property real photoPopupRadius: 5 property real photoPopupRadius: 5
...@@ -542,7 +542,6 @@ Item { ...@@ -542,7 +542,6 @@ Item {
property real wizardViewBlocMarginSize: pixelToPoint(40) property real wizardViewBlocMarginSize: pixelToPoint(40)
property real wizardViewDescriptionMarginSize: pixelToPoint(20) property real wizardViewDescriptionMarginSize: pixelToPoint(20)
// WizardView Welcome Page // WizardView Welcome Page
property real welcomeLabelPointSize: 30 property real welcomeLabelPointSize: 30
property var welcomeLogo: darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg property var welcomeLogo: darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg
......
src/app/mainview/components/CallActionBar.qml
+ 5
− 4
View file @ 7bd46952
...@@ -456,11 +456,9 @@ Control { ...@@ -456,11 +456,9 @@ Control {
CallOverlayModel.addSecondaryControl(audioOutputAction, audioOutputAction.enabled); CallOverlayModel.addSecondaryControl(audioOutputAction, audioOutputAction.enabled);
CallOverlayModel.addSecondaryControl(raiseHandAction, raiseHandAction.enabled); CallOverlayModel.addSecondaryControl(raiseHandAction, raiseHandAction.enabled);
CallOverlayModel.addSecondaryControl(addPersonAction, addPersonAction.enabled); CallOverlayModel.addSecondaryControl(addPersonAction, addPersonAction.enabled);
CallOverlayModel.addSecondaryControl(resumePauseCallAction, resumePauseCallAction.enabled); CallOverlayModel.addSecondaryControl(resumePauseCallAction, resumePauseCallAction.enabled);
CallOverlayModel.addSecondaryControl(inputPanelSIPAction, inputPanelSIPAction.enabled); CallOverlayModel.addSecondaryControl(inputPanelSIPAction, inputPanelSIPAction.enabled);
CallOverlayModel.addSecondaryControl(callTransferAction, callTransferAction.enabled); CallOverlayModel.addSecondaryControl(callTransferAction, callTransferAction.enabled);
CallOverlayModel.addSecondaryControl(chatAction, chatAction.enabled); CallOverlayModel.addSecondaryControl(chatAction, chatAction.enabled);
CallOverlayModel.addSecondaryControl(shareAction, shareAction.enabled); CallOverlayModel.addSecondaryControl(shareAction, shareAction.enabled);
CallOverlayModel.addSecondaryControl(layoutAction, layoutAction.enabled); CallOverlayModel.addSecondaryControl(layoutAction, layoutAction.enabled);
...@@ -486,7 +484,7 @@ Control { ...@@ -486,7 +484,7 @@ Control {
orientation: ListView.Horizontal orientation: ListView.Horizontal
implicitWidth: contentWidth implicitWidth: contentWidth
implicitHeight: contentHeight height: root.height
interactive: false interactive: false
model: SortFilterProxyModel { model: SortFilterProxyModel {
...@@ -508,6 +506,9 @@ Control { ...@@ -508,6 +506,9 @@ Control {
width: childrenRect.width width: childrenRect.width
height: root.height height: root.height
//put in top
z: 1
RowLayout { RowLayout {
spacing: itemSpacing spacing: itemSpacing
...@@ -579,7 +580,7 @@ Control { ...@@ -579,7 +580,7 @@ Control {
} }
} }
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
duration: JamiTheme.shortFadeDuration duration: JamiTheme.shortFadeDuration
} }
......
src/app/mainview/components/DocumentPreview.qml
+ 1
− 1
View file @ 7bd46952
...@@ -45,7 +45,7 @@ Item { ...@@ -45,7 +45,7 @@ Item {
ctxMenu.y = mouse.y; ctxMenu.y = mouse.y;
ctxMenu.openMenu(); ctxMenu.openMenu();
} else { } else {
MessagesAdapter.openUrl("file://" + Body); MessagesAdapter.openUrl(icon.fileSource);
} }
} }
} }
......
src/app/settingsview/SettingsSidePanel.qml
+ 149
− 76
View file @ 7bd46952
...@@ -35,82 +35,155 @@ SidePanelBase { ...@@ -35,82 +35,155 @@ SidePanelBase {
property bool isSinglePane property bool isSinglePane
function getHeaders() { function getHeaders() {
return [{ if (AppVersionManager.isUpdaterEnabled()) {
"title": JamiStrings.accountSettingsMenuTitle, return [{
"icon": JamiResources.account_24dp_svg, "title": JamiStrings.accountSettingsMenuTitle,
"first": 0, "icon": JamiResources.account_24dp_svg,
"last": 4, "first": 0,
"children": [{ "last": 4,
"id": 0, "children": [{
"title": JamiStrings.manageAccountSettingsTitle "id": 0,
}, { "title": JamiStrings.manageAccountSettingsTitle
"id": 1, }, {
"title": JamiStrings.customizeProfile, "id": 1,
"visible": CurrentAccount.type !== Profile.Type.SIP "title": JamiStrings.customizeProfile
}, { }, {
"id": 2, "id": 2,
"title": JamiStrings.linkedDevicesSettingsTitle, "title": JamiStrings.linkedDevicesSettingsTitle,
"visible": CurrentAccount.type !== Profile.Type.SIP "visible": CurrentAccount.type !== Profile.Type.SIP
}, { }, {
"id": 3, "id": 3,
"title": JamiStrings.callSettingsTitle "title": JamiStrings.callSettingsTitle
}, { }, {
"id": 4, "id": 4,
"title": JamiStrings.advancedSettingsTitle "title": JamiStrings.advancedSettingsTitle
}] }]
}, { }, {
"title": JamiStrings.generalSettingsTitle, "title": JamiStrings.generalSettingsTitle,
"icon": JamiResources.gear_black_24dp_svg, "icon": JamiResources.gear_black_24dp_svg,
"first": 5, "first": 5,
"last": 11, "last": 11,
"children": [{ "children": [{
"id": 5, "id": 5,
"title": JamiStrings.system "title": JamiStrings.system
}, { }, {
"id": 6, "id": 6,
"title": JamiStrings.appearance "title": JamiStrings.appearance
}, { }, {
"id": 7, "id": 7,
"title": JamiStrings.chatSettingsTitle "title": JamiStrings.chatSettingsTitle
}, { }, {
"id": 8, "id": 8,
"title": JamiStrings.locationSharingLabel "title": JamiStrings.locationSharingLabel
}, { }, {
"id": 9, "id": 9,
"title": JamiStrings.callRecording "title": JamiStrings.callRecording
}, { }, {
"id": 10, "id": 10,
"title": JamiStrings.troubleshootTitle "title": JamiStrings.troubleshootTitle
}, { }, {
"id": 11, "id": 11,
"title": JamiStrings.updatesTitle, "title": JamiStrings.updatesTitle,
"visible": AppVersionManager.isUpdaterEnabled() "visible": AppVersionManager.isUpdaterEnabled()
}] }]
}, { }, {
"title": JamiStrings.audioVideoSettingsTitle, "title": JamiStrings.audioVideoSettingsTitle,
"icon": JamiResources.media_black_24dp_svg, "icon": JamiResources.media_black_24dp_svg,
"first": 12, "first": 12,
"last": 14, "last": 14,
"children": [{ "children": [{
"id": 12, "id": 12,
"title": JamiStrings.audio "title": JamiStrings.audio
}, { }, {
"id": 13, "id": 13,
"title": JamiStrings.video "title": JamiStrings.video
}, { }, {
"id": 14, "id": 14,
"title": JamiStrings.screenSharing "title": JamiStrings.screenSharing
}] }]
}, { }, {
"title": JamiStrings.pluginSettingsTitle, "title": JamiStrings.pluginSettingsTitle,
"icon": JamiResources.plugins_24dp_svg, "icon": JamiResources.plugins_24dp_svg,
"first": 15, "first": 15,
"last": 15, "last": 15,
"children": [{ "children": [{
"id": 15, "id": 15,
"title": JamiStrings.pluginSettingsTitle "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() { function updateModel() {
......
src/app/settingsview/components/SystemSettingsPage.qml
+ 7
− 7
View file @ 7bd46952
...@@ -49,7 +49,7 @@ SettingsPageBase { ...@@ -49,7 +49,7 @@ SettingsPageBase {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: JamiTheme.preferredSettingsMarginSize anchors.leftMargin: JamiTheme.preferredSettingsMarginSize
Column { ColumnLayout {
id: enableAccount id: enableAccount
width: parent.width width: parent.width
...@@ -73,7 +73,7 @@ SettingsPageBase { ...@@ -73,7 +73,7 @@ SettingsPageBase {
ToggleSwitch { ToggleSwitch {
id: notificationCheckBox id: notificationCheckBox
width: parent.width Layout.fillWidth: true
checked: UtilsAdapter.getAppValue(Settings.EnableNotifications) checked: UtilsAdapter.getAppValue(Settings.EnableNotifications)
labelText: JamiStrings.showNotifications labelText: JamiStrings.showNotifications
...@@ -83,7 +83,7 @@ SettingsPageBase { ...@@ -83,7 +83,7 @@ SettingsPageBase {
ToggleSwitch { ToggleSwitch {
id: enableDonation id: enableDonation
width: parent.width Layout.fillWidth: true
visible: new Date() >= new Date(Date.parse("2023-11-01")) visible: new Date() >= new Date(Date.parse("2023-11-01"))
checked: UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible) checked: UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible)
...@@ -99,7 +99,7 @@ SettingsPageBase { ...@@ -99,7 +99,7 @@ SettingsPageBase {
ToggleSwitch { ToggleSwitch {
id: closeOrMinCheckBox id: closeOrMinCheckBox
width: parent.width Layout.fillWidth: true
visible: UtilsAdapter.isSystemTrayIconVisible() visible: UtilsAdapter.isSystemTrayIconVisible()
checked: UtilsAdapter.getAppValue(Settings.MinimizeOnClose) && UtilsAdapter.isSystemTrayIconVisible() checked: UtilsAdapter.getAppValue(Settings.MinimizeOnClose) && UtilsAdapter.isSystemTrayIconVisible()
...@@ -109,7 +109,7 @@ SettingsPageBase { ...@@ -109,7 +109,7 @@ SettingsPageBase {
ToggleSwitch { ToggleSwitch {
id: applicationOnStartUpCheckBox id: applicationOnStartUpCheckBox
width: parent.width Layout.fillWidth: true
checked: UtilsAdapter.checkStartupLink() checked: UtilsAdapter.checkStartupLink()
labelText: JamiStrings.runStartup labelText: JamiStrings.runStartup
...@@ -118,7 +118,7 @@ SettingsPageBase { ...@@ -118,7 +118,7 @@ SettingsPageBase {
} }
RowLayout { RowLayout {
width: parent.width Layout.fillWidth: true
height: JamiTheme.preferredFieldHeight height: JamiTheme.preferredFieldHeight
Text { Text {
...@@ -156,7 +156,7 @@ SettingsPageBase { ...@@ -156,7 +156,7 @@ SettingsPageBase {
SettingsComboBox { SettingsComboBox {
id: langComboBoxSetting id: langComboBoxSetting
width: parent.width Layout.fillWidth: true
height: JamiTheme.preferredFieldHeight height: JamiTheme.preferredFieldHeight
labelText: JamiStrings.language labelText: JamiStrings.language
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment