Skip to content

Commit b795c81

Browse files
Deleted filter layer section
1 parent ea0867d commit b795c81

12 files changed

Lines changed: 746 additions & 494 deletions

app/qml/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,14 @@ set(MM_QML
6161
components/private/MMToolbarLongButton.qml
6262
components/private/MMToolbarShortButton.qml
6363
filters/MMFilterChip.qml
64-
filters/MMFilterLayerSection.qml
6564
filters/MMFiltersPanel.qml
6665
filters/components/MMFilterBanner.qml
66+
filters/components/MMFilterBoolInput.qml
67+
filters/components/MMFilterDateRange.qml
68+
filters/components/MMFilterDropdownEditor.qml
69+
filters/components/MMFilterRangeInput.qml
70+
filters/components/MMFilterTextEditor.qml
71+
filters/components/MMFilterTextInput.qml
6772
dialogs/MMCloseAccountDialog.qml
6873
dialogs/MMDownloadProjectDialog.qml
6974
dialogs/MMMigrateToMerginDialog.qml

app/qml/components/MMSegmentControl.qml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,19 @@ Item {
1616
enum Options { All, True, False }
1717

1818
property int selectedIndex: MMSegmentControl.Options.All
19+
property color backgroundColor: __style.polarColor
20+
21+
property string allText: qsTr( "All" )
22+
property string trueText: qsTr( "True" )
23+
property string falseText: qsTr( "False" )
1924

2025
implicitHeight: __style.row50
2126
implicitWidth: 3 * ( __style.row50 + 2 * __style.margin20 ) + 2 * __style.margin12
2227

2328
Rectangle {
2429
anchors.fill: parent
2530
radius: __style.radius12
26-
color: __style.polarColor
31+
color: root.backgroundColor
2732
}
2833

2934
Row {
@@ -56,15 +61,15 @@ Item {
5661

5762
MMText {
5863
anchors.centerIn: parent
64+
// extra padding
65+
width: parent.width - 2 * __style.margin8
66+
horizontalAlignment: Text.AlignHCenter
5967

6068
text: {
6169
switch ( segment.index ) {
62-
// 0 for All
63-
case MMSegmentControl.Options.All: return qsTr( "All" )
64-
// 1 for True
65-
case MMSegmentControl.Options.True: return qsTr( "True" )
66-
// 2 for False
67-
case MMSegmentControl.Options.False: return qsTr( "False" )
70+
case MMSegmentControl.Options.All: return root.allText
71+
case MMSegmentControl.Options.True: return root.trueText
72+
case MMSegmentControl.Options.False: return root.falseText
6873
}
6974
return ""
7075
}

0 commit comments

Comments
 (0)