napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1762 from demmm/calamares

Browse Source 
[localeq] redo i18n.qml
This commit is contained in:
Adriaan de Groot 2021-08-30 13:57:17 +02:00 committed by GitHub
commit b9a1d090ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 67 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/modules/localeq/i18n.qml
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <https://calamares.io> === /* === This file is part of Calamares - <https://calamares.io> ===
* *
* SPDX-FileCopyrightText: 2020 Anke Boersma <demm@kaosx.us> * SPDX-FileCopyrightText: 2020 - 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
* *
* Calamares is Free Software: see the License-Identifier above. * Calamares is Free Software: see the License-Identifier above.
@ -16,19 +16,23 @@ import QtQuick.Layouts 1.3
import org.kde.kirigami 2.7 as Kirigami import org.kde.kirigami 2.7 as Kirigami
Item { Item {
readonly property color backgroundColor: Kirigami.Theme.backgroundColor //"#F5F5F5"
readonly property color headerBackgroundColor: Kirigami.Theme.alternateBackgroundColor //"#d3d3d3"
readonly property color backgroundLighterColor: "#ffffff"
readonly property color highlightColor: Kirigami.Theme.highlightColor //"#3498DB"
readonly property color textColor: Kirigami.Theme.textColor
readonly property color highlightedTextColor: Kirigami.Theme.highlightedTextColor
width: parent.width width: parent.width
height: parent.height height: parent.height
focus: true focus: true
MouseArea {
anchors.fill: parent
}
Rectangle { Rectangle {
id: textArea id: textArea
x: 28 x: 28
y: 14 y: 14
anchors.fill: parent anchors.fill: parent
Kirigami.Theme.backgroundColor: Kirigami.Theme.backgroundColor color: backgroundColor
Column { Column {
id: languages id: languages
@ -38,7 +42,7 @@ Item {
Rectangle { Rectangle {
width: 250 width: 250
height: 140 height: 140
color: "#d3d3d3" color: headerBackgroundColor
Text { Text {
anchors.top: parent.top anchors.top: parent.top
width: 240 width: 240
@ -57,30 +61,43 @@ Item {
id: scroll1 id: scroll1
anchors.fill: parent anchors.fill: parent
contentHeight: 800 contentHeight: 800
clip: true ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
ListView { ListView {
id: list1 id: list1
focus: true focus: true
clip: true
width: parent.width
model: config.supportedLocales model: config.supportedLocales
currentIndex: -1 currentIndex: -1 //model.currentLanguageCodeIndex
highlight: Rectangle { delegate: ItemDelegate {
color: Kirigami.Theme.highlightColor
}
delegate: Text {
text: modelData
MouseArea { hoverEnabled: true
hoverEnabled: true width: parent.width
anchors.fill: parent implicitHeight: 18
cursorShape: Qt.PointingHandCursor highlighted: ListView.isCurrentItem
onEntered: { Label {
color: "#0000ff" Layout.fillHeight: true
Layout.fillWidth: true
width: parent.width
height: 18
color: highlighted ? highlightedTextColor : textColor
text: modelData
background: Rectangle {
color: highlighted || hovered ? highlightColor : backgroundLighterColor
opacity: highlighted || hovered ? 0.5 : 0.9
} }
onClicked: {
list1.currentIndex = index MouseArea {
hoverEnabled: true
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
list1.currentIndex = index
}
} }
} }
} }
@ -98,7 +115,7 @@ Item {
Rectangle { Rectangle {
width: 250 width: 250
height: 140 height: 140
color: "#d3d3d3" color: headerBackgroundColor
Text { Text {
anchors.top: parent.top anchors.top: parent.top
width: 240 width: 240
@ -117,28 +134,42 @@ Item {
id: scroll2 id: scroll2
anchors.fill: parent anchors.fill: parent
contentHeight: 800 contentHeight: 800
clip: true ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
ListView { ListView {
id: list2 id: list2
width: 180; height: 200
focus: true focus: true
clip: true
model: config.supportedLocales model: config.supportedLocales
currentIndex: -1 currentIndex: -1 //model.currentLCCodeIndex
highlight: Rectangle { delegate: ItemDelegate {
color: Kirigami.Theme.highlightColor
}
delegate: Text {
text: modelData
MouseArea { hoverEnabled: true
hoverEnabled: true width: parent.width
anchors.fill: parent implicitHeight: 18
cursorShape: Qt.PointingHandCursor highlighted: ListView.isCurrentItem
onClicked: { Label {
list2.currentIndex = index Layout.fillHeight: true
Layout.fillWidth: true
width: parent.width
height: 18
color: highlighted ? highlightedTextColor : textColor
text: modelData
background: Rectangle {
color: highlighted || hovered ? highlightColor : backgroundLighterColor
opacity: highlighted || hovered ? 0.5 : 0.9
}
MouseArea {
hoverEnabled: true
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
list2.currentIndex = index
}
} }
} }
} }