lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 14:55:43 +02:00
Code Activity

misc: invert horizontal and vertical view labels

Browse source 
Change-Id: Ic00b2f5073ee3c3b866c8042be3c19993d446699
GitLab: #1142
This commit is contained in:
Sébastien Blin 2023-06-15 14:53:59 -04:00
parent cb0e45c3fa
commit c8ec980a3b
3 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/commoncomponents/MaterialRadioButton.qml
View file

@ -74,7 +74,7 @@ RadioButton {
spacing: 10 spacing: 10
anchors.left: root.indicator.right anchors.left: root.indicator.right
anchors.leftMargin: root.spacing anchors.leftMargin: 10
ResponsiveImage { ResponsiveImage {
color: borderColor color: borderColor
@ -89,6 +89,8 @@ RadioButton {
font.pixelSize: JamiTheme.settingsDescriptionPixelSize font.pixelSize: JamiTheme.settingsDescriptionPixelSize
text: root.text text: root.text
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
Layout.fillWidth: true
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
} }
} }

8
src/app/mainview/components/OngoingCallPage.qml
View file

@ -125,18 +125,18 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
property bool isHorizontal: false // Calculated when showing the stack view property bool isHorizontal: false // Calculated when showing the stack view
orientation: isHorizontal ? Qt.Horizontal : Qt.Vertical orientation: isHorizontal ? Qt.Vertical : Qt.Horizontal // Chatview is horizontal if split is vertical (so chatview takes full width)
handle: Rectangle { handle: Rectangle {
implicitWidth: mainColumnLayout.isHorizontal ? JamiTheme.splitViewHandlePreferredWidth : root.width implicitWidth: mainColumnLayout.isHorizontal ? root.width : JamiTheme.splitViewHandlePreferredWidth
implicitHeight: mainColumnLayout.isHorizontal ? root.height : JamiTheme.splitViewHandlePreferredWidth implicitHeight: mainColumnLayout.isHorizontal ? JamiTheme.splitViewHandlePreferredWidth : root.height
color: SplitHandle.pressed ? JamiTheme.pressColor : (SplitHandle.hovered ? JamiTheme.hoverColor : JamiTheme.tabbarBorderColor) color: SplitHandle.pressed ? JamiTheme.pressColor : (SplitHandle.hovered ? JamiTheme.hoverColor : JamiTheme.tabbarBorderColor)
} }
Rectangle { Rectangle {
id: callPageMainRect id: callPageMainRect
SplitView.preferredHeight: mainColumnLayout.isHorizontal ? root.height : (root.height / 3) * 2 SplitView.preferredHeight: mainColumnLayout.isHorizontal ? (root.height / 3) * 2 : root.height
SplitView.minimumWidth: JamiTheme.mainViewPaneMinWidth SplitView.minimumWidth: JamiTheme.mainViewPaneMinWidth
SplitView.fillWidth: true SplitView.fillWidth: true

38
src/app/settingsview/components/CallSettingsPage.qml
View file

@ -342,32 +342,14 @@ SettingsPageBase {
id: optionsB id: optionsB
} }
MaterialRadioButton {
id: verticalRadio
width: 255
height: 60
text: JamiStrings.verticalViewOpt
ButtonGroup.group: optionsB
iconSource: JamiResources.horizontal_view_svg
onCheckedChanged: {
if (checked) {
UtilsAdapter.setAppValue(Settings.Key.ShowChatviewHorizontally, false);
}
}
}
MaterialRadioButton { MaterialRadioButton {
id: horizontalRadio id: horizontalRadio
width: 255 width: 255
height: 60 height: 60
text: JamiStrings.horizontalViewOpt text: JamiStrings.horizontalViewOpt
ButtonGroup.group: optionsB ButtonGroup.group: optionsB
//color: JamiTheme.blackColor iconSource: JamiResources.horizontal_view_svg
iconSource: JamiResources.vertical_view_svg
onCheckedChanged: { onCheckedChanged: {
if (checked) { if (checked) {
@ -375,6 +357,24 @@ SettingsPageBase {
} }
} }
} }
MaterialRadioButton {
id: verticalRadio
width: 255
height: 60
text: JamiStrings.verticalViewOpt
ButtonGroup.group: optionsB
//color: JamiTheme.blackColor
iconSource: JamiResources.vertical_view_svg
onCheckedChanged: {
if (checked) {
UtilsAdapter.setAppValue(Settings.Key.ShowChatviewHorizontally, false);
}
}
}
} }
} }
} }