summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlurchi <lurchi@strangeplace.net>2017-02-16 11:53:15 +0100
committerlurchi <lurchi@strangeplace.net>2017-02-16 11:53:15 +0100
commit9cf6724086ad5b9af315a3d7976bb5541341b505 (patch)
treee960e420581a316996f246ee254fe39db8305574
parent729592b15fb842e977d0a33ce8fc3850f4f5f10b (diff)
downloadsecushare-9cf6724086ad5b9af315a3d7976bb5541341b505.tar.gz
secushare-9cf6724086ad5b9af315a3d7976bb5541341b505.zip
updated qml demo
Diffstat
-rw-r--r--prototype_2016/resources/qml/+material/StyledRectangle.qml2
-rw-r--r--prototype_2016/resources/qml/+universal/+material/StyledRectangle.qml22
-rw-r--r--prototype_2016/resources/qml/+universal/BasicComponents.qml80
-rw-r--r--prototype_2016/resources/qml/+universal/CMakeLists.txt10
-rw-r--r--prototype_2016/resources/qml/+universal/CompoundComponents.qml76
-rw-r--r--prototype_2016/resources/qml/+universal/MaterialComponents.qml74
-rw-r--r--prototype_2016/resources/qml/+universal/NavigationComponents.qml74
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Basic/BusyIndicatorPage.qml34
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Basic/ButtonPage.qml105
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Basic/CheckBoxPage.qml91
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Basic/ProgressBarPage.qml117
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Basic/RadioButtonPage.qml90
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Basic/SliderPage.qml142
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Basic/SwitchPage.qml90
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Compound/CardPage.qml77
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Compound/InfoBarPage.qml32
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Compound/ListItemPage.qml40
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Compound/SubPage.qml31
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Material/ActionButtonPage.qml60
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Material/WavePage.qml41
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Navigation/NavDrawerPage.qml27
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Style/PalettePage.qml121
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Style/PaletteSwatch.qml173
-rw-r--r--prototype_2016/resources/qml/+universal/Pages/Style/TypographyPage.qml81
-rw-r--r--prototype_2016/resources/qml/+universal/Style.qml75
-rw-r--r--prototype_2016/resources/qml/+universal/StyledRectangle.qml9
-rw-r--r--prototype_2016/resources/qml/+universal/main.qml83
-rw-r--r--prototype_2016/resources/qml/+universal/main.qml.old89
-rw-r--r--prototype_2016/resources/qml/+universal/qtquickcontrols2.conf2
-rw-r--r--prototype_2016/resources/qml/+universal/secushare_qml.pro8
-rw-r--r--prototype_2016/resources/qml/+universal/secushare_qml.qrc30
-rw-r--r--prototype_2016/resources/qml/BasicComponents.qml4
-rw-r--r--prototype_2016/resources/qml/CompoundComponents.qml4
-rw-r--r--prototype_2016/resources/qml/MaterialComponents.qml4
-rw-r--r--prototype_2016/resources/qml/NavigationComponents.qml4
-rw-r--r--prototype_2016/resources/qml/Pages/Basic/BusyIndicatorPage.qml30
-rw-r--r--prototype_2016/resources/qml/Pages/Basic/ButtonPage.qml134
-rw-r--r--prototype_2016/resources/qml/Pages/Basic/CheckBoxPage.qml112
-rw-r--r--prototype_2016/resources/qml/Pages/Basic/ProgressBarPage.qml148
-rw-r--r--prototype_2016/resources/qml/Pages/Basic/RadioButtonPage.qml110
-rw-r--r--prototype_2016/resources/qml/Pages/Basic/SliderPage.qml246
-rw-r--r--prototype_2016/resources/qml/Pages/Basic/SwitchPage.qml110
-rw-r--r--prototype_2016/resources/qml/Pages/Compound/CardPage.qml7
-rw-r--r--prototype_2016/resources/qml/Pages/Compound/InfoBarPage.qml6
-rw-r--r--prototype_2016/resources/qml/Pages/Compound/ListItemPage.qml2
-rw-r--r--prototype_2016/resources/qml/Pages/Compound/SubPage.qml2
-rw-r--r--prototype_2016/resources/qml/Pages/Material/ActionButtonPage.qml60
-rw-r--r--prototype_2016/resources/qml/Pages/Material/WavePage.qml8
-rw-r--r--prototype_2016/resources/qml/Pages/Navigation/NavDrawerPage.qml7
-rw-r--r--prototype_2016/resources/qml/Pages/Style/PalettePage.qml194
-rw-r--r--prototype_2016/resources/qml/Pages/Style/PaletteSwatch.qml2
-rw-r--r--prototype_2016/resources/qml/Pages/Style/TypographyPage.qml10
-rw-r--r--prototype_2016/resources/qml/Style.qml2
-rw-r--r--prototype_2016/resources/qml/StyledRectangle.qml2
-rw-r--r--prototype_2016/resources/qml/main.qml25
-rw-r--r--prototype_2016/resources/qml/main.qml.old89
56 files changed, 680 insertions, 2628 deletions
diff --git a/prototype_2016/resources/qml/+material/StyledRectangle.qml b/prototype_2016/resources/qml/+material/StyledRectangle.qml
index b433b92..7da64ab 100644
--- a/prototype_2016/resources/qml/+material/StyledRectangle.qml
+++ b/prototype_2016/resources/qml/+material/StyledRectangle.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
diff --git a/prototype_2016/resources/qml/+universal/+material/StyledRectangle.qml b/prototype_2016/resources/qml/+universal/+material/StyledRectangle.qml
deleted file mode 100644
index b433b92..0000000
--- a/prototype_2016/resources/qml/+universal/+material/StyledRectangle.qml
+++ /dev/null
@@ -1,22 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls.Material 2.0
17
18Rectangle {
19 color: Material.background
20
21 Material.theme: index == 0 ? Material.Light : Material.Dark
22}
diff --git a/prototype_2016/resources/qml/+universal/BasicComponents.qml b/prototype_2016/resources/qml/+universal/BasicComponents.qml
deleted file mode 100644
index 895b95b..0000000
--- a/prototype_2016/resources/qml/+universal/BasicComponents.qml
+++ /dev/null
@@ -1,80 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Controls.Material 2.0
18import QtQuick.Controls.Universal 2.0
19import Fluid.Controls 1.0
20import "Pages/Basic"
21
22Tab {
23 title: qsTr("Basic Components")
24
25 Pane {
26 id: listPane
27 anchors {
28 left: parent.left
29 top: parent.top
30 bottom: parent.bottom
31 }
32 width: 200
33 padding: 0
34 z: 2
35
36 Material.background: "white"
37 Material.elevation: 1
38
39 Universal.background: Universal.accent
40
41 ListView {
42 id: listView
43 anchors.fill: parent
44 currentIndex: 0
45 model: ListModel {
46 ListElement { title: qsTr("Button"); source: "qrc:/Pages/Basic/ButtonPage.qml" }
47 ListElement { title: qsTr("CheckBox"); source: "qrc:/Pages/Basic/CheckBoxPage.qml" }
48 ListElement { title: qsTr("RadioButton"); source: "qrc:/Pages/Basic/RadioButtonPage.qml" }
49 ListElement { title: qsTr("Switch"); source: "qrc:/Pages/Basic/SwitchPage.qml" }
50 ListElement { title: qsTr("ProgressBar"); source: "qrc:/Pages/Basic/ProgressBarPage.qml" }
51 ListElement { title: qsTr("BusyIndicator"); source: "qrc:/Pages/Basic/BusyIndicatorPage.qml" }
52 ListElement { title: qsTr("Slider"); source: "qrc:/Pages/Basic/SliderPage.qml" }
53 }
54 header: Subheader {
55 text: qsTr("Demos")
56 }
57 delegate: ListItem {
58 text: model.title
59 highlighted: ListView.isCurrentItem
60 onClicked: {
61 listView.currentIndex = index
62 stackView.push(model.source)
63 }
64 }
65
66 ScrollBar.vertical: ScrollBar {}
67 }
68 }
69
70 StackView {
71 id: stackView
72 anchors {
73 left: listPane.right
74 top: parent.top
75 right: parent.right
76 bottom: parent.bottom
77 }
78 initialItem: ButtonPage {}
79 }
80}
diff --git a/prototype_2016/resources/qml/+universal/CMakeLists.txt b/prototype_2016/resources/qml/+universal/CMakeLists.txt
deleted file mode 100644
index a4f9ab6..0000000
--- a/prototype_2016/resources/qml/+universal/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
1set(SOURCES main.cpp demo.qrc)
2file(GLOB_RECURSE QML_SOURCES
3 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.qml")
4
5add_executable(fluid-demo ${SOURCES} ${QML_SOURCES})
6target_link_libraries(fluid-demo Qt5::Gui Qt5::Qml Qt5::QuickControls2)
7
8install(TARGETS fluid-demo
9 BUNDLE DESTINATION .
10 RUNTIME DESTINATION ${BIN_INSTALL_DIR})
diff --git a/prototype_2016/resources/qml/+universal/CompoundComponents.qml b/prototype_2016/resources/qml/+universal/CompoundComponents.qml
deleted file mode 100644
index 2cea4a5..0000000
--- a/prototype_2016/resources/qml/+universal/CompoundComponents.qml
+++ /dev/null
@@ -1,76 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Controls.Material 2.0
18import QtQuick.Controls.Universal 2.0
19import Fluid.Controls 1.0
20import "Pages/Compound"
21
22Tab {
23 title: qsTr("Compound Components")
24
25 Pane {
26 id: listPane
27 anchors {
28 left: parent.left
29 top: parent.top
30 bottom: parent.bottom
31 }
32 width: 200
33 padding: 0
34 z: 2
35
36 Material.background: "white"
37 Material.elevation: 1
38
39 Universal.background: Universal.accent
40
41 ListView {
42 id: listView
43 anchors.fill: parent
44 currentIndex: 0
45 model: ListModel {
46 ListElement { title: qsTr("ListItem"); source: "qrc:/Pages/Compound/ListItemPage.qml" }
47 ListElement { title: qsTr("Card"); source: "qrc:/Pages/Compound/CardPage.qml" }
48 ListElement { title: qsTr("InfoBar"); source: "qrc:/Pages/Compound/InfoBarPage.qml" }
49 }
50 header: Subheader {
51 text: qsTr("Demos")
52 }
53 delegate: ListItem {
54 text: model.title
55 highlighted: ListView.isCurrentItem
56 onClicked: {
57 listView.currentIndex = index
58 stackView.push(model.source)
59 }
60 }
61
62 ScrollBar.vertical: ScrollBar {}
63 }
64 }
65
66 StackView {
67 id: stackView
68 anchors {
69 left: listPane.right
70 top: parent.top
71 right: parent.right
72 bottom: parent.bottom
73 }
74 initialItem: ListItemPage {}
75 }
76}
diff --git a/prototype_2016/resources/qml/+universal/MaterialComponents.qml b/prototype_2016/resources/qml/+universal/MaterialComponents.qml
deleted file mode 100644
index 2c72424..0000000
--- a/prototype_2016/resources/qml/+universal/MaterialComponents.qml
+++ /dev/null
@@ -1,74 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Controls.Material 2.0
18import QtQuick.Controls.Universal 2.0
19import Fluid.Controls 1.0
20import "Pages/Material"
21
22Tab {
23 title: qsTr("Material Components")
24
25 Pane {
26 id: listPane
27 anchors {
28 left: parent.left
29 top: parent.top
30 bottom: parent.bottom
31 }
32 width: 200
33 padding: 0
34 z: 2
35
36 Material.background: "white"
37 Material.elevation: 1
38
39 Universal.background: Universal.accent
40
41 ListView {
42 id: listView
43 anchors.fill: parent
44 currentIndex: 0
45 model: ListModel {
46 ListElement { title: qsTr("ActionButton"); source: "qrc:/Pages/Material/ActionButtonPage.qml" }
47 }
48 header: Subheader {
49 text: qsTr("Demos")
50 }
51 delegate: ListItem {
52 text: model.title
53 highlighted: ListView.isCurrentItem
54 onClicked: {
55 listView.currentIndex = index
56 stackView.push(model.source)
57 }
58 }
59
60 ScrollBar.vertical: ScrollBar {}
61 }
62 }
63
64 StackView {
65 id: stackView
66 anchors {
67 left: listPane.right
68 top: parent.top
69 right: parent.right
70 bottom: parent.bottom
71 }
72 initialItem: ActionButtonPage {}
73 }
74}
diff --git a/prototype_2016/resources/qml/+universal/NavigationComponents.qml b/prototype_2016/resources/qml/+universal/NavigationComponents.qml
deleted file mode 100644
index 9958bf9..0000000
--- a/prototype_2016/resources/qml/+universal/NavigationComponents.qml
+++ /dev/null
@@ -1,74 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Controls.Material 2.0
18import QtQuick.Controls.Universal 2.0
19import Fluid.Controls 1.0
20import "Pages/Navigation"
21
22Tab {
23 title: qsTr("Nagitation Components")
24
25 Pane {
26 id: listPane
27 anchors {
28 left: parent.left
29 top: parent.top
30 bottom: parent.bottom
31 }
32 width: 200
33 padding: 0
34 z: 2
35
36 Material.background: "white"
37 Material.elevation: 1
38
39 Universal.background: Universal.accent
40
41 ListView {
42 id: listView
43 anchors.fill: parent
44 currentIndex: 0
45 model: ListModel {
46 ListElement { title: qsTr("NavigationDrawer"); source: "qrc:/Pages/Navigation/NavDrawerPage.qml" }
47 }
48 header: Subheader {
49 text: qsTr("Demos")
50 }
51 delegate: ListItem {
52 text: model.title
53 highlighted: ListView.isCurrentItem
54 onClicked: {
55 listView.currentIndex = index
56 stackView.push(model.source)
57 }
58 }
59
60 ScrollBar.vertical: ScrollBar {}
61 }
62 }
63
64 StackView {
65 id: stackView
66 anchors {
67 left: listPane.right
68 top: parent.top
69 right: parent.right
70 bottom: parent.bottom
71 }
72 initialItem: NavDrawerPage {}
73 }
74}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Basic/BusyIndicatorPage.qml b/prototype_2016/resources/qml/+universal/Pages/Basic/BusyIndicatorPage.qml
deleted file mode 100644
index 13c206f..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Basic/BusyIndicatorPage.qml
+++ /dev/null
@@ -1,34 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Layouts 1.0
18import "../.."
19
20ColumnLayout {
21 Repeater {
22 model: 2
23
24 StyledRectangle {
25 Layout.fillWidth: true
26 Layout.fillHeight: true
27
28 BusyIndicator {
29 anchors.centerIn: parent
30 running: true
31 }
32 }
33 }
34}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Basic/ButtonPage.qml b/prototype_2016/resources/qml/+universal/Pages/Basic/ButtonPage.qml
deleted file mode 100644
index dbe22d6..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Basic/ButtonPage.qml
+++ /dev/null
@@ -1,105 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Layouts 1.0
18import Fluid.Controls 1.0
19import "../.."
20
21ColumnLayout {
22 Repeater {
23 model: 2
24
25 StyledRectangle {
26 Layout.fillWidth: true
27 Layout.fillHeight: true
28 Layout.minimumWidth: grid.width + 80
29 Layout.minimumHeight: grid.height + 80
30
31 GridLayout {
32 id: grid
33 anchors.centerIn: parent
34 columns: 2
35 rows: 4
36
37 // Row 1
38
39 TitleLabel {
40 text: qsTr("Enabled")
41
42 Layout.alignment: Qt.AlignHCenter
43 }
44
45 TitleLabel {
46 text: qsTr("Disabled")
47
48 Layout.alignment: Qt.AlignHCenter
49 }
50
51 // Row 2
52
53 Button {
54 text: qsTr("Button")
55 }
56
57 Button {
58 text: qsTr("Button")
59 enabled: false
60 }
61
62 // Row 3
63
64 Button {
65 text: qsTr("Checked")
66 checkable: false
67 checked: true
68 }
69
70 Button {
71 text: qsTr("Checked")
72 checkable: false
73 checked: true
74 enabled: false
75 }
76
77 // Row 4
78
79 Button {
80 text: qsTr("Flat")
81 flat: true
82 }
83
84 Button {
85 text: qsTr("Flat")
86 flat: true
87 enabled: false
88 }
89
90 // Row 5
91
92 Button {
93 text: qsTr("Highlighted")
94 highlighted: true
95 }
96
97 Button {
98 text: qsTr("Highlighted")
99 highlighted: true
100 enabled: false
101 }
102 }
103 }
104 }
105}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Basic/CheckBoxPage.qml b/prototype_2016/resources/qml/+universal/Pages/Basic/CheckBoxPage.qml
deleted file mode 100644
index bf5c96a..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Basic/CheckBoxPage.qml
+++ /dev/null
@@ -1,91 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
6 *
7 * $BEGIN_LICENSE:MPL2$
8 *
9 * This Source Code Form is subject to the terms of the Mozilla Public
10 * License, v. 2.0. If a copy of the MPL was not distributed with this
11 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
12 *
13 * $END_LICENSE$
14 */
15
16import QtQuick 2.0
17import QtQuick.Controls 2.0
18import QtQuick.Layouts 1.0
19import Fluid.Controls 1.0
20import "../.."
21
22ColumnLayout {
23 Repeater {
24 model: 2
25
26 StyledRectangle {
27 Layout.fillWidth: true
28 Layout.fillHeight: true
29 Layout.minimumWidth: grid.width + 80
30 Layout.minimumHeight: grid.height + 80
31
32 GridLayout {
33 id: grid
34 anchors.centerIn: parent
35 columns: 3
36 rows: 3
37
38 // Row 1
39
40 Item {
41 width: 1
42 height: 1
43 }
44
45 TitleLabel {
46 text: qsTr("Enabled")
47
48 Layout.alignment: Qt.AlignHCenter
49 }
50
51 TitleLabel {
52 text: qsTr("Disabled")
53
54 Layout.alignment: Qt.AlignHCenter
55 }
56
57 // Row 2
58
59 Label {
60 text: qsTr("On")
61 }
62
63 CheckBox {
64 checked: true
65 text: qsTr("CheckBox")
66 }
67
68 CheckBox {
69 checked: true
70 enabled: false
71 text: qsTr("CheckBox")
72 }
73
74 // Row 3
75
76 Label {
77 text: qsTr("Off")
78 }
79
80 CheckBox {
81 text: qsTr("CheckBox")
82 }
83
84 CheckBox {
85 text: qsTr("CheckBox")
86 enabled: false
87 }
88 }
89 }
90 }
91}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Basic/ProgressBarPage.qml b/prototype_2016/resources/qml/+universal/Pages/Basic/ProgressBarPage.qml
deleted file mode 100644
index 77267fe..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Basic/ProgressBarPage.qml
+++ /dev/null
@@ -1,117 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Layouts 1.0
18import Fluid.Controls 1.0
19import "../.."
20
21ColumnLayout {
22 Repeater {
23 model: 2
24
25 StyledRectangle {
26 Layout.fillWidth: true
27 Layout.fillHeight: true
28 Layout.minimumWidth: grid.width + 80
29 Layout.minimumHeight: grid.height + 80
30
31 GridLayout {
32 id: grid
33 anchors.centerIn: parent
34 columns: 3
35
36 // Row 1
37
38 Item {
39 width: 1
40 height: 1
41 }
42
43 TitleLabel {
44 text: qsTr("Determinate")
45
46 Layout.alignment: Qt.AlignHCenter
47 }
48
49 TitleLabel {
50 text: qsTr("Indeterminate")
51
52 Layout.alignment: Qt.AlignHCenter
53 }
54
55 // Row 2
56
57 Label {
58 text: qsTr("Static")
59 }
60
61 ProgressBar {
62 from: 0.0
63 to: 1.0
64 value: 0.5
65 indeterminate: false
66 }
67
68 ProgressBar {
69 from: 0.0
70 to: 1.0
71 value: 0.5
72 indeterminate: true
73 }
74
75 // Row 3
76
77 Label {
78 text: qsTr("Animated")
79 }
80
81 ProgressBar {
82 from: 0.0
83 to: 1.0
84 indeterminate: false
85
86 SequentialAnimation on value {
87 running: true
88 loops: NumberAnimation.Infinite
89
90 NumberAnimation {
91 from: 0.0
92 to: 1.0
93 duration: 3000
94 }
95 }
96 }
97
98 ProgressBar {
99 from: 0.0
100 to: 1.0
101 indeterminate: true
102
103 SequentialAnimation on value {
104 running: true
105 loops: NumberAnimation.Infinite
106
107 NumberAnimation {
108 from: 0.0
109 to: 1.0
110 duration: 3000
111 }
112 }
113 }
114 }
115 }
116 }
117}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Basic/RadioButtonPage.qml b/prototype_2016/resources/qml/+universal/Pages/Basic/RadioButtonPage.qml
deleted file mode 100644
index 90c187f..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Basic/RadioButtonPage.qml
+++ /dev/null
@@ -1,90 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Layouts 1.0
18import Fluid.Controls 1.0
19import "../.."
20
21ColumnLayout {
22 Repeater {
23 model: 2
24
25 StyledRectangle {
26 Layout.fillWidth: true
27 Layout.fillHeight: true
28 Layout.minimumWidth: grid.width + 80
29 Layout.minimumHeight: grid.height + 80
30
31 GridLayout {
32 id: grid
33 anchors.centerIn: parent
34 columns: 3
35 rows: 3
36
37 // Row 1
38
39 Item {
40 width: 1
41 height: 1
42 }
43
44 TitleLabel {
45 text: qsTr("Enabled")
46
47 Layout.alignment: Qt.AlignHCenter
48 }
49
50 TitleLabel {
51 text: qsTr("Disabled")
52
53 Layout.alignment: Qt.AlignHCenter
54 }
55
56 // Row 2
57
58 Label {
59 text: qsTr("On")
60 }
61
62 RadioButton {
63 checked: true
64 text: qsTr("RadioButton")
65 }
66
67 RadioButton {
68 checked: true
69 enabled: false
70 text: qsTr("RadioButton")
71 }
72
73 // Row 3
74
75 Label {
76 text: qsTr("Off")
77 }
78
79 RadioButton {
80 text: qsTr("RadioButton")
81 }
82
83 RadioButton {
84 text: qsTr("RadioButton")
85 enabled: false
86 }
87 }
88 }
89 }
90}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Basic/SliderPage.qml b/prototype_2016/resources/qml/+universal/Pages/Basic/SliderPage.qml
deleted file mode 100644
index 840e3b8..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Basic/SliderPage.qml
+++ /dev/null
@@ -1,142 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Layouts 1.0
18import Fluid.Controls 1.0
19import "../.."
20
21ColumnLayout {
22 Repeater {
23 model: 2
24
25 StyledRectangle {
26 Layout.fillWidth: true
27 Layout.fillHeight: true
28 Layout.minimumWidth: grid.width + 80
29 Layout.minimumHeight: grid.height + 80
30
31 GridLayout {
32 id: grid
33 anchors.centerIn: parent
34 columns: 3
35 rows: 3
36
37 // Row 1
38
39 Item {
40 width: 1
41 height: 1
42 }
43
44 TitleLabel {
45 text: qsTr("Enabled")
46
47 Layout.alignment: Qt.AlignHCenter
48 }
49
50 TitleLabel {
51 text: qsTr("Disabled")
52
53 Layout.alignment: Qt.AlignHCenter
54 }
55
56 // Row 2
57
58 Label {
59 text: qsTr("Horizontal / Single")
60 }
61
62 Slider {
63 from: 0.0
64 to: 1.0
65 value: 0.5
66 }
67
68 Slider {
69 from: 0.0
70 to: 1.0
71 value: 0.5
72 enabled: false
73 }
74
75 // Row 3
76
77 Label {
78 text: qsTr("Horizontal / Range")
79 }
80
81 RangeSlider {
82 from: 0.0
83 to: 1.0
84 first.value: 0.4
85 second.value: 0.6
86 }
87
88 RangeSlider {
89 from: 0.0
90 to: 1.0
91 first.value: 0.4
92 second.value: 0.6
93 enabled: false
94 }
95
96 // Row 4
97
98 Label {
99 text: qsTr("Vertical / Single")
100 }
101
102 Slider {
103 from: 0.0
104 to: 1.0
105 value: 0.5
106 orientation: Qt.Vertical
107 }
108
109 Slider {
110 from: 0.0
111 to: 1.0
112 value: 0.5
113 enabled: false
114 orientation: Qt.Vertical
115 }
116
117 // Row 5
118
119 Label {
120 text: qsTr("Vertical / Range")
121 }
122
123 RangeSlider {
124 from: 0.0
125 to: 1.0
126 first.value: 0.4
127 second.value: 0.6
128 orientation: Qt.Vertical
129 }
130
131 RangeSlider {
132 from: 0.0
133 to: 1.0
134 first.value: 0.4
135 second.value: 0.6
136 enabled: false
137 orientation: Qt.Vertical
138 }
139 }
140 }
141 }
142}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Basic/SwitchPage.qml b/prototype_2016/resources/qml/+universal/Pages/Basic/SwitchPage.qml
deleted file mode 100644
index abbd9ac..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Basic/SwitchPage.qml
+++ /dev/null
@@ -1,90 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Layouts 1.0
18import Fluid.Controls 1.0
19import "../.."
20
21ColumnLayout {
22 Repeater {
23 model: 2
24
25 StyledRectangle {
26 Layout.fillWidth: true
27 Layout.fillHeight: true
28 Layout.minimumWidth: grid.width + 80
29 Layout.minimumHeight: grid.height + 80
30
31 GridLayout {
32 id: grid
33 anchors.centerIn: parent
34 columns: 3
35 rows: 3
36
37 // Row 1
38
39 Item {
40 width: 1
41 height: 1
42 }
43
44 TitleLabel {
45 text: qsTr("Enabled")
46
47 Layout.alignment: Qt.AlignHCenter
48 }
49
50 TitleLabel {
51 text: qsTr("Disabled")
52
53 Layout.alignment: Qt.AlignHCenter
54 }
55
56 // Row 2
57
58 Label {
59 text: qsTr("On")
60 }
61
62 Switch {
63 checked: true
64 text: qsTr("Switch")
65 }
66
67 Switch {
68 checked: true
69 enabled: false
70 text: qsTr("Switch")
71 }
72
73 // Row 3
74
75 Label {
76 text: qsTr("Off")
77 }
78
79 Switch {
80 text: qsTr("Switch")
81 }
82
83 Switch {
84 text: qsTr("Switch")
85 enabled: false
86 }
87 }
88 }
89 }
90}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Compound/CardPage.qml b/prototype_2016/resources/qml/+universal/Pages/Compound/CardPage.qml
deleted file mode 100644
index e7be3e6..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Compound/CardPage.qml
+++ /dev/null
@@ -1,77 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import Fluid.Controls 1.0
18
19Page {
20 title: qsTr("Cards")
21
22 Card {
23 anchors.centerIn: parent
24 width: 400
25 height: 400
26
27 Image {
28 id: picture
29 anchors {
30 left: parent.left
31 top: parent.top
32 right: parent.right
33 }
34 height: 200
35 source: "https://www.nps.gov/yose/planyourvisit/images/glacier-point-people-960web.jpg"
36 }
37
38 Column {
39 id: column
40 anchors {
41 left: parent.left
42 top: picture.bottom
43 right: parent.right
44 margins: Units.smallSpacing * 2
45 }
46 spacing: Units.smallSpacing * 2
47
48 TitleLabel {
49 text: qsTr("Yosemite National Park")
50 }
51
52 BodyLabel {
53 text: qsTr("First protected in 1864, Yosemite National Park " +
54 "is best known for its waterfalls, but within its " +
55 "nearly 1,200 square miles, you can find deep " +
56 "valleys, grand meadows, ancient giant sequoias, " +
57 "a vast wilderness area, and much more.")
58 wrapMode: Text.WordWrap
59 width: parent.width
60 }
61
62 Row {
63 spacing: Units.smallSpacing
64
65 Button {
66 text: qsTr("Share")
67 flat: true
68 }
69
70 Button {
71 text: qsTr("Explore")
72 flat: true
73 }
74 }
75 }
76 }
77}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Compound/InfoBarPage.qml b/prototype_2016/resources/qml/+universal/Pages/Compound/InfoBarPage.qml
deleted file mode 100644
index f383549..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Compound/InfoBarPage.qml
+++ /dev/null
@@ -1,32 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import Fluid.Controls 1.0
18
19Page {
20 title: qsTr("InfoBar")
21
22 Button {
23 anchors.centerIn: parent
24 text: qsTr("Open")
25 onClicked: infoBar.open(qsTr("Message sent"))
26 }
27
28 InfoBar {
29 id: infoBar
30 buttonText: qsTr("OK")
31 }
32}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Compound/ListItemPage.qml b/prototype_2016/resources/qml/+universal/Pages/Compound/ListItemPage.qml
deleted file mode 100644
index b35f863..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Compound/ListItemPage.qml
+++ /dev/null
@@ -1,40 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import Fluid.Controls 1.0
18import "../.."
19
20Page {
21 ListView {
22 anchors.fill: parent
23 model: ListModel {
24 ListElement { title: "List Item 1"; source: "qrc:/Pages/Compound/SubPage.qml" }
25 ListElement { title: "List Item 2"; source: "qrc:/Pages/Compound/SubPage.qml" }
26 ListElement { title: "List Item 3"; source: "qrc:/Pages/Compound/SubPage.qml" }
27 ListElement { title: "List Item 4"; source: "qrc:/Pages/Compound/SubPage.qml" }
28 ListElement { title: "List Item 5"; source: "qrc:/Pages/Compound/SubPage.qml" }
29 }
30 header: Subheader {
31 text: "Header"
32 }
33 delegate: ListItem {
34 text: model.title
35 onClicked: pageStack.push(model.source)
36 }
37
38 ScrollIndicator.vertical: ScrollIndicator {}
39 }
40}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Compound/SubPage.qml b/prototype_2016/resources/qml/+universal/Pages/Compound/SubPage.qml
deleted file mode 100644
index 2367508..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Compound/SubPage.qml
+++ /dev/null
@@ -1,31 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick.Controls 2.0
16import Fluid.Controls 1.0
17
18Page {
19 title: "Sub page demo"
20
21 actions: [
22 Action {
23 iconName: "action/settings"
24 }
25 ]
26
27 Label {
28 anchors.centerIn: parent
29 text: "Testing"
30 }
31}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Material/ActionButtonPage.qml b/prototype_2016/resources/qml/+universal/Pages/Material/ActionButtonPage.qml
deleted file mode 100644
index ff0b801..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Material/ActionButtonPage.qml
+++ /dev/null
@@ -1,60 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Controls.Material 2.0
18import Fluid.Material 1.0
19import "../.."
20
21Page {
22 title: qsTr("Action button")
23
24 Repeater {
25 model: 2
26
27 StyledRectangle {
28 y: height * index
29 width: parent.width
30 height: parent.height / 2
31
32 Column {
33 anchors.centerIn: parent
34
35 ActionButton {
36 iconName: "device/airplanemode_active"
37 }
38
39 ActionButton {
40 iconName: "navigation/check"
41
42 Material.elevation: 1
43 }
44
45 ActionButton {
46 iconName: "device/airplanemode_active"
47
48 Material.background: Material.primaryColor
49 }
50
51 ActionButton {
52 iconName: "navigation/check"
53
54 Material.elevation: 1
55 Material.background: Material.primaryColor
56 }
57 }
58 }
59 }
60}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Material/WavePage.qml b/prototype_2016/resources/qml/+universal/Pages/Material/WavePage.qml
deleted file mode 100644
index 85b969f..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Material/WavePage.qml
+++ /dev/null
@@ -1,41 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick.Controls 2.0
16import QtQuick.Controls.Material 2.0
17import Fluid.Controls 1.0
18import "../.."
19
20Page {
21 title: qsTr("Wave transition")
22
23 Wave {
24 id: wave
25 initialX: parent.width - size
26 initialY: parent.height - size
27 size: 48
28 color: Material.accentColor
29 }
30
31 Button {
32 anchors.centerIn: parent
33 text: qsTr("Toggle")
34 onClicked: {
35 if (wave.opened)
36 wave.close(parent.width - wave.size, parent.height - wave.size)
37 else
38 wave.open(0, 0)
39 }
40 }
41}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Navigation/NavDrawerPage.qml b/prototype_2016/resources/qml/+universal/Pages/Navigation/NavDrawerPage.qml
deleted file mode 100644
index 2d81f2e..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Navigation/NavDrawerPage.qml
+++ /dev/null
@@ -1,27 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick.Controls 2.0
16import Fluid.Controls 1.0
17import "../.."
18
19Page {
20 title: qsTr("Navigation drawer")
21
22 Button {
23 anchors.centerIn: parent
24 text: qsTr("Open")
25 onClicked: navDrawer.open()
26 }
27}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Style/PalettePage.qml b/prototype_2016/resources/qml/+universal/Pages/Style/PalettePage.qml
deleted file mode 100644
index deecca5..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Style/PalettePage.qml
+++ /dev/null
@@ -1,121 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Controls.Material 2.0
18import QtQuick.Layouts 1.0
19import Fluid.Core 1.0
20import Fluid.Controls 1.0
21import "../.."
22
23GridLayout {
24 id: grid
25
26 property color whiteColor: Qt.rgba(255, 255, 255, 1)
27 property color blackColor: Qt.rgba(0, 0, 0, 1)
28
29 anchors.centerIn: parent
30 columns: width / 300
31 width: parent.width
32 rowSpacing: Units.smallSpacing
33 columnSpacing: Units.smallSpacing
34
35 Repeater {
36 model: ListModel {
37 ListElement {
38 paletteIndex: Material.Red
39 name: "Red"
40 }
41 ListElement {
42 paletteIndex: Material.Pink
43 name: "Pink"
44 }
45 ListElement {
46 paletteIndex: Material.Purple
47 name: "Purple"
48 }
49 ListElement {
50 paletteIndex: Material.DeepPurple
51 name: "DeepPurple"
52 }
53 ListElement {
54 paletteIndex: Material.Indigo
55 name: "Indigo"
56 }
57 ListElement {
58 paletteIndex: Material.Blue
59 name: "Blue"
60 }
61 ListElement {
62 paletteIndex: Material.LightBlue
63 name: "LightBlue"
64 }
65 ListElement {
66 paletteIndex: Material.Cyan
67 name: "Cyan"
68 }
69 ListElement {
70 paletteIndex: Material.Teal
71 name: "Teal"
72 }
73 ListElement {
74 paletteIndex: Material.Green
75 name: "Green"
76 }
77 ListElement {
78 paletteIndex: Material.LightGreen
79 name: "LightGreen"
80 }
81 ListElement {
82 paletteIndex: Material.Lime
83 name: "Lime"
84 }
85 ListElement {
86 paletteIndex: Material.Yellow
87 name: "Yellow"
88 }
89 ListElement {
90 paletteIndex: Material.Amber
91 name: "Amber"
92 }
93 ListElement {
94 paletteIndex: Material.Orange
95 name: "Orange"
96 }
97 ListElement {
98 paletteIndex: Material.DeepOrange
99 name: "DeepOrange"
100 }
101 ListElement {
102 paletteIndex: Material.Grey
103 name: "Grey"
104 }
105 ListElement {
106 paletteIndex: Material.BlueGrey
107 name: "BlueGrey"
108 }
109 ListElement {
110 paletteIndex: Material.Brown
111 name: "Brown"
112 }
113 }
114
115 PaletteSwatch {
116 paletteIndex: model.paletteIndex
117 paletteName: model.name
118 paletteColor: Material.color(model.paletteIndex, Material.Shade500)
119 }
120 }
121}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Style/PaletteSwatch.qml b/prototype_2016/resources/qml/+universal/Pages/Style/PaletteSwatch.qml
deleted file mode 100644
index fb74886..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Style/PaletteSwatch.qml
+++ /dev/null
@@ -1,173 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Controls.Material 2.0
18import Fluid.Core 1.0
19import Fluid.Controls 1.0
20import "../.."
21
22Column {
23 id: mainLayout
24
25 property int paletteIndex
26 property string paletteName
27 property color paletteColor
28
29 spacing: 0
30
31 Rectangle {
32 width: 300
33 height: 80
34 color: paletteColor
35
36 Label {
37 anchors {
38 top: parent.top
39 left: parent.left
40 margins: Units.smallSpacing * 2
41 }
42 font.bold: true
43 color: Utils.lightDark(parent.color, blackColor, whiteColor)
44 text: paletteName
45 }
46 }
47
48 Column {
49 spacing: 0
50
51 Repeater {
52 model: ListModel {
53 ListElement {
54 shadeIndex: Material.Shade100
55 name: "100"
56 }
57 ListElement {
58 shadeIndex: Material.Shade200
59 name: "200"
60 }
61 ListElement {
62 shadeIndex: Material.Shade300
63 name: "300"
64 }
65 ListElement {
66 shadeIndex: Material.Shade400
67 name: "400"
68 }
69 ListElement {
70 shadeIndex: Material.Shade500
71 name: "500"
72 }
73 ListElement {
74 shadeIndex: Material.Shade600
75 name: "600"
76 }
77 ListElement {
78 shadeIndex: Material.Shade700
79 name: "700"
80 }
81 ListElement {
82 shadeIndex: Material.Shade800
83 name: "800"
84 }
85 ListElement {
86 shadeIndex: Material.Shade900
87 name: "900"
88 }
89 }
90
91 Rectangle {
92 width: 300
93 height: 40
94 color: Material.color(paletteIndex, model.shadeIndex)
95
96 Label {
97 anchors {
98 left: parent.left
99 verticalCenter: parent.verticalCenter
100 margins: Units.smallSpacing * 2
101 }
102 font.bold: true
103 color: Utils.lightDark(parent.color, blackColor, whiteColor)
104 text: model.name
105 }
106
107 Label {
108 anchors {
109 right: parent.right
110 verticalCenter: parent.verticalCenter
111 margins: Units.smallSpacing * 2
112 }
113 font.bold: true
114 color: Utils.lightDark(parent.color, blackColor, whiteColor)
115 text: parent.color
116 }
117 }
118 }
119 }
120
121 Column {
122 spacing: 0
123
124 Repeater {
125 model: ListModel {
126 ListElement {
127 shadeIndex: Material.ShadeA100
128 name: "A100"
129 }
130 ListElement {
131 shadeIndex: Material.ShadeA200
132 name: "A200"
133 }
134 ListElement {
135 shadeIndex: Material.ShadeA400
136 name: "A400"
137 }
138 ListElement {
139 shadeIndex: Material.ShadeA700
140 name: "A700"
141 }
142 }
143
144 Rectangle {
145 width: 300
146 height: 40
147 color: Material.color(paletteIndex, model.shadeIndex)
148
149 Label {
150 anchors {
151 left: parent.left
152 verticalCenter: parent.verticalCenter
153 margins: Units.smallSpacing * 2
154 }
155 font.bold: true
156 color: Utils.lightDark(parent.color, blackColor, whiteColor)
157 text: model.name
158 }
159
160 Label {
161 anchors {
162 right: parent.right
163 verticalCenter: parent.verticalCenter
164 margins: Units.smallSpacing * 2
165 }
166 font.bold: true
167 color: Utils.lightDark(parent.color, blackColor, whiteColor)
168 text: parent.color
169 }
170 }
171 }
172 }
173}
diff --git a/prototype_2016/resources/qml/+universal/Pages/Style/TypographyPage.qml b/prototype_2016/resources/qml/+universal/Pages/Style/TypographyPage.qml
deleted file mode 100644
index 8cf47ff..0000000
--- a/prototype_2016/resources/qml/+universal/Pages/Style/TypographyPage.qml
+++ /dev/null
@@ -1,81 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Layouts 1.0
17import QtQuick.Controls 2.0
18import Fluid.Controls 1.0
19import "../.."
20
21Item {
22 ColumnLayout {
23 anchors.fill: parent
24 anchors.margins: Units.mediumSpacing
25 spacing: Units.smallSpacing
26
27 DisplayLabel {
28 level: 4
29 text: "Display 4"
30 }
31
32 DisplayLabel {
33 level: 3
34 text: "Display 3"
35 }
36
37 DisplayLabel {
38 level: 2
39 text: "Display 2"
40 }
41
42 DisplayLabel {
43 level: 1
44 text: "Display 1"
45 }
46
47 HeadlineLabel {
48 text: "Headline"
49 }
50
51 TitleLabel {
52 text: "Title"
53 }
54
55 SubheadingLabel {
56 text: "Subheading"
57 }
58
59 BodyLabel {
60 level: 2
61 text: "Body 2"
62 }
63
64 BodyLabel {
65 level: 1
66 text: "Body 1"
67 }
68
69 CaptionLabel {
70 text: "Caption"
71 }
72
73 Label {
74 text: "Label"
75 }
76
77 Item {
78 Layout.fillHeight: true
79 }
80 }
81}
diff --git a/prototype_2016/resources/qml/+universal/Style.qml b/prototype_2016/resources/qml/+universal/Style.qml
deleted file mode 100644
index 8de8d3f..0000000
--- a/prototype_2016/resources/qml/+universal/Style.qml
+++ /dev/null
@@ -1,75 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 *
6 * $BEGIN_LICENSE:MPL2$
7 *
8 * This Source Code Form is subject to the terms of the Mozilla Public
9 * License, v. 2.0. If a copy of the MPL was not distributed with this
10 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
11 *
12 * $END_LICENSE$
13 */
14
15import QtQuick 2.0
16import QtQuick.Controls 2.0
17import QtQuick.Controls.Material 2.0
18import QtQuick.Controls.Universal 2.0
19import Fluid.Controls 1.0
20import "Pages/Style"
21
22Tab {
23 title: qsTr("Style")
24
25 Pane {
26 id: listPane
27 anchors {
28 left: parent.left
29 top: parent.top
30 bottom: parent.bottom
31 }
32 width: 200
33 padding: 0
34 z: 2
35
36 Material.background: "white"
37 Material.elevation: 1
38
39 Universal.background: Universal.accent
40
41 ListView {
42 id: listView
43 anchors.fill: parent
44 currentIndex: 0
45 model: ListModel {
46 ListElement { title: qsTr("Palette"); source: "qrc:/Pages/Style/PalettePage.qml" }
47 ListElement { title: qsTr("Typography"); source: "qrc:/Pages/Style/TypographyPage.qml" }
48 }
49 header: Subheader {
50 text: qsTr("Demos")
51 }
52 delegate: ListItem {
53 text: model.title
54 highlighted: ListView.isCurrentItem
55 onClicked: {
56 listView.currentIndex = index
57 stackView.push(model.source)
58 }
59 }
60
61 ScrollBar.vertical: ScrollBar {}
62 }
63 }
64
65 StackView {
66 id: stackView
67 anchors {
68 left: listPane.right
69 top: parent.top
70 right: parent.right
71 bottom: parent.bottom
72 }
73 initialItem: PalettePage {}
74 }
75}
diff --git a/prototype_2016/resources/qml/+universal/StyledRectangle.qml b/prototype_2016/resources/qml/+universal/StyledRectangle.qml
index 9d3937c..ca1999b 100644
--- a/prototype_2016/resources/qml/+universal/StyledRectangle.qml
+++ b/prototype_2016/resources/qml/+universal/StyledRectangle.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -13,9 +13,10 @@
13 */ 13 */
14 14
15import QtQuick 2.0 15import QtQuick 2.0
16import QtQuick.Controls.Universal 2.0
16 17
17Rectangle { 18Rectangle {
18 // Default styled rectangle is red to spot errors 19 color: Universal.background
19 // related to how styles are loaded 20
20 color: "red" 21 Universal.theme: index == 0 ? Universal.Light : Universal.Dark
21} 22}
diff --git a/prototype_2016/resources/qml/+universal/main.qml b/prototype_2016/resources/qml/+universal/main.qml
deleted file mode 100644
index 44ae1a4..0000000
--- a/prototype_2016/resources/qml/+universal/main.qml
+++ /dev/null
@@ -1,83 +0,0 @@
1/*
2 * This file is part of Fluid.
3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
6 *
7 * $BEGIN_LICENSE:MPL2$
8 *
9 * This Source Code Form is subject to the terms of the Mozilla Public
10 * License, v. 2.0. If a copy of the MPL was not distributed with this
11 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
12 *
13 * $END_LICENSE$
14 */
15
16import QtQuick 2.6
17import QtQuick.Controls 2.0
18import QtQuick.Controls.Material 2.0
19import QtQuick.Controls.Universal 2.0
20import QtQuick.Layouts 1.3
21import Fluid.Controls 1.0
22
23FluidWindow {
24 id: window
25
26 visible: true
27
28 width: 1024
29 height: 800
30
31 title: qsTr("Fluid Demo")
32
33 Material.primary: Material.LightBlue
34 Material.accent: Material.Blue
35
36 Universal.accent: Universal.Cobalt
37
38 NavigationDrawer {
39 id: navDrawer
40
41 //width: Math.min(window.width, window.height) / 3 * 2
42 height: window.height
43
44 topContent: [
45 Rectangle {
46 color: Material.primary
47 height: 48
48
49 Label {
50 anchors.centerIn: parent
51 text: qsTr("Top Content")
52 }
53
54 Layout.fillWidth: true
55 }
56 ]
57
58 actions: [
59 Action {
60 text: qsTr("Action 1")
61 onTriggered: console.log("action1 triggered")
62 },
63 Action {
64 text: qsTr("Action 2")
65 onTriggered: console.log("action2 triggered")
66 },
67 Action {
68 text: qsTr("Action 3")
69 onTriggered: console.log("action3 triggered")
70 }
71 ]
72 }
73
74 initialPage: TabbedPage {
75 title: window.title
76
77 BasicComponents {}
78 CompoundComponents {}
79 MaterialComponents {}
80 NavigationComponents {}
81 Style {}
82 }
83}
diff --git a/prototype_2016/resources/qml/+universal/main.qml.old b/prototype_2016/resources/qml/+universal/main.qml.old
deleted file mode 100644
index 2a7e762..0000000
--- a/prototype_2016/resources/qml/+universal/main.qml.old
+++ /dev/null
@@ -1,89 +0,0 @@
1import QtQuick 2.6
2import QtQuick.Controls 2.0
3import QtQuick.Controls.Material 2.0
4import QtQuick.Controls.Universal 2.0
5import QtQuick.Layouts 1.3
6import Fluid.Controls 1.0
7
8ApplicationWindow {
9 id: app
10
11 title: "secushare %1".arg(version)
12
13 theme {
14 primaryColor: "orange"
15 accentColor: "purple"
16 tabHighlightColor: "white"
17 }
18
19 visible: true
20
21 initialPage: TabbedPage {
22 title: "Secushare"
23
24 // FIXME: no qrc files yet
25 actions: [
26 Action {
27 iconName: 'action/search'
28 text: 'Search'
29 },
30
31
32 Action {
33 iconName: 'action/settings'
34 text: 'Settings'
35 }
36 ]
37
38 Tab {
39 title: "Conversations"
40
41 Item {
42 Sidebar {
43 Column {
44 anchors.fill: parent
45
46 Item {
47 width: parent.width
48 height: 8
49 }
50
51 ListItem.Standard {
52 text: "Conversation with Paul"
53 }
54
55 ListItem.Standard {
56 text: "Secushare prototype release"
57 }
58 }
59 }
60 }
61 }
62
63 Tab {
64 title: "Contacts"
65
66 Item {
67 Sidebar {
68 Column {
69 anchors.fill: parent
70
71 Item {
72 width: parent.width
73 height: 8
74 }
75
76 Repeater {
77 model: contacts
78
79 delegate: ListItem.Standard {
80 text: "%1 %2".arg(first_name).arg(surname)
81 }
82 }
83 }
84 }
85 }
86 }
87
88 }
89}
diff --git a/prototype_2016/resources/qml/+universal/qtquickcontrols2.conf b/prototype_2016/resources/qml/+universal/qtquickcontrols2.conf
deleted file mode 100644
index b6c7c87..0000000
--- a/prototype_2016/resources/qml/+universal/qtquickcontrols2.conf
+++ /dev/null
@@ -1,2 +0,0 @@
1[Controls]
2Style=Material
diff --git a/prototype_2016/resources/qml/+universal/secushare_qml.pro b/prototype_2016/resources/qml/+universal/secushare_qml.pro
deleted file mode 100644
index 6b54fed..0000000
--- a/prototype_2016/resources/qml/+universal/secushare_qml.pro
+++ /dev/null
@@ -1,8 +0,0 @@
1TEMPLATE = lib
2TARGET = secushare_qml
3
4QT += qml gui quickcontrols2
5CONFIG += c++11
6CONFIG += staticlib
7
8RESOURCES += secushare_qml.qrc qtquickcontrols2.conf
diff --git a/prototype_2016/resources/qml/+universal/secushare_qml.qrc b/prototype_2016/resources/qml/+universal/secushare_qml.qrc
deleted file mode 100644
index b447c47..0000000
--- a/prototype_2016/resources/qml/+universal/secushare_qml.qrc
+++ /dev/null
@@ -1,30 +0,0 @@
1<RCC>
2 <qresource prefix="/">
3 <file>main.qml</file>
4 <file>BasicComponents.qml</file>
5 <file>CompoundComponents.qml</file>
6 <file>MaterialComponents.qml</file>
7 <file>NavigationComponents.qml</file>
8 <file>Style.qml</file>
9 <file>StyledRectangle.qml</file>
10 <file>+material/StyledRectangle.qml</file>
11 <file>+universal/StyledRectangle.qml</file>
12 <file>Pages/Basic/BusyIndicatorPage.qml</file>
13 <file>Pages/Basic/ButtonPage.qml</file>
14 <file>Pages/Basic/CheckBoxPage.qml</file>
15 <file>Pages/Basic/ProgressBarPage.qml</file>
16 <file>Pages/Basic/RadioButtonPage.qml</file>
17 <file>Pages/Basic/SliderPage.qml</file>
18 <file>Pages/Basic/SwitchPage.qml</file>
19 <file>Pages/Compound/ListItemPage.qml</file>
20 <file>Pages/Compound/SubPage.qml</file>
21 <file>Pages/Compound/CardPage.qml</file>
22 <file>Pages/Compound/InfoBarPage.qml</file>
23 <file>Pages/Style/PalettePage.qml</file>
24 <file>Pages/Style/PaletteSwatch.qml</file>
25 <file>Pages/Style/TypographyPage.qml</file>
26 <file>Pages/Material/ActionButtonPage.qml</file>
27 <file>Pages/Material/WavePage.qml</file>
28 <file>Pages/Navigation/NavDrawerPage.qml</file>
29 </qresource>
30</RCC>
diff --git a/prototype_2016/resources/qml/BasicComponents.qml b/prototype_2016/resources/qml/BasicComponents.qml
index 895b95b..a46f083 100644
--- a/prototype_2016/resources/qml/BasicComponents.qml
+++ b/prototype_2016/resources/qml/BasicComponents.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -20,7 +20,7 @@ import Fluid.Controls 1.0
20import "Pages/Basic" 20import "Pages/Basic"
21 21
22Tab { 22Tab {
23 title: qsTr("Basic Components") 23 title: qsTr("Basic")
24 24
25 Pane { 25 Pane {
26 id: listPane 26 id: listPane
diff --git a/prototype_2016/resources/qml/CompoundComponents.qml b/prototype_2016/resources/qml/CompoundComponents.qml
index 2cea4a5..2de7bd2 100644
--- a/prototype_2016/resources/qml/CompoundComponents.qml
+++ b/prototype_2016/resources/qml/CompoundComponents.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -20,7 +20,7 @@ import Fluid.Controls 1.0
20import "Pages/Compound" 20import "Pages/Compound"
21 21
22Tab { 22Tab {
23 title: qsTr("Compound Components") 23 title: qsTr("Compound")
24 24
25 Pane { 25 Pane {
26 id: listPane 26 id: listPane
diff --git a/prototype_2016/resources/qml/MaterialComponents.qml b/prototype_2016/resources/qml/MaterialComponents.qml
index 2c72424..444b049 100644
--- a/prototype_2016/resources/qml/MaterialComponents.qml
+++ b/prototype_2016/resources/qml/MaterialComponents.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -20,7 +20,7 @@ import Fluid.Controls 1.0
20import "Pages/Material" 20import "Pages/Material"
21 21
22Tab { 22Tab {
23 title: qsTr("Material Components") 23 title: qsTr("Material")
24 24
25 Pane { 25 Pane {
26 id: listPane 26 id: listPane
diff --git a/prototype_2016/resources/qml/NavigationComponents.qml b/prototype_2016/resources/qml/NavigationComponents.qml
index 9958bf9..ce0a2fd 100644
--- a/prototype_2016/resources/qml/NavigationComponents.qml
+++ b/prototype_2016/resources/qml/NavigationComponents.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -20,7 +20,7 @@ import Fluid.Controls 1.0
20import "Pages/Navigation" 20import "Pages/Navigation"
21 21
22Tab { 22Tab {
23 title: qsTr("Nagitation Components") 23 title: qsTr("Navigation")
24 24
25 Pane { 25 Pane {
26 id: listPane 26 id: listPane
diff --git a/prototype_2016/resources/qml/Pages/Basic/BusyIndicatorPage.qml b/prototype_2016/resources/qml/Pages/Basic/BusyIndicatorPage.qml
index 13c206f..1a6341e 100644
--- a/prototype_2016/resources/qml/Pages/Basic/BusyIndicatorPage.qml
+++ b/prototype_2016/resources/qml/Pages/Basic/BusyIndicatorPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -17,17 +17,27 @@ import QtQuick.Controls 2.0
17import QtQuick.Layouts 1.0 17import QtQuick.Layouts 1.0
18import "../.." 18import "../.."
19 19
20ColumnLayout { 20Flickable {
21 Repeater { 21 clip: true
22 model: 2 22 contentHeight: Math.max(layout.implicitHeight, height)
23 23
24 StyledRectangle { 24 ScrollBar.vertical: ScrollBar {}
25 Layout.fillWidth: true
26 Layout.fillHeight: true
27 25
28 BusyIndicator { 26 ColumnLayout {
29 anchors.centerIn: parent 27 id: layout
30 running: true 28 anchors.fill: parent
29
30 Repeater {
31 model: 2
32
33 StyledRectangle {
34 Layout.fillWidth: true
35 Layout.fillHeight: true
36
37 BusyIndicator {
38 anchors.centerIn: parent
39 running: true
40 }
31 } 41 }
32 } 42 }
33 } 43 }
diff --git a/prototype_2016/resources/qml/Pages/Basic/ButtonPage.qml b/prototype_2016/resources/qml/Pages/Basic/ButtonPage.qml
index dbe22d6..6cf94fe 100644
--- a/prototype_2016/resources/qml/Pages/Basic/ButtonPage.qml
+++ b/prototype_2016/resources/qml/Pages/Basic/ButtonPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -18,86 +18,96 @@ import QtQuick.Layouts 1.0
18import Fluid.Controls 1.0 18import Fluid.Controls 1.0
19import "../.." 19import "../.."
20 20
21ColumnLayout { 21Flickable {
22 Repeater { 22 clip: true
23 model: 2 23 contentHeight: Math.max(layout.implicitHeight, height)
24 24
25 StyledRectangle { 25 ScrollBar.vertical: ScrollBar {}
26 Layout.fillWidth: true
27 Layout.fillHeight: true
28 Layout.minimumWidth: grid.width + 80
29 Layout.minimumHeight: grid.height + 80
30 26
31 GridLayout { 27 ColumnLayout {
32 id: grid 28 id: layout
33 anchors.centerIn: parent 29 anchors.fill: parent
34 columns: 2
35 rows: 4
36 30
37 // Row 1 31 Repeater {
32 model: 2
38 33
39 TitleLabel { 34 StyledRectangle {
40 text: qsTr("Enabled") 35 Layout.fillWidth: true
36 Layout.fillHeight: true
37 Layout.minimumWidth: grid.width + 80
38 Layout.minimumHeight: grid.height + 80
41 39
42 Layout.alignment: Qt.AlignHCenter 40 GridLayout {
43 } 41 id: grid
42 anchors.centerIn: parent
43 columns: 2
44 rows: 4
44 45
45 TitleLabel { 46 // Row 1
46 text: qsTr("Disabled")
47 47
48 Layout.alignment: Qt.AlignHCenter 48 TitleLabel {
49 } 49 text: qsTr("Enabled")
50 50
51 // Row 2 51 Layout.alignment: Qt.AlignHCenter
52 }
52 53
53 Button { 54 TitleLabel {
54 text: qsTr("Button") 55 text: qsTr("Disabled")
55 }
56 56
57 Button { 57 Layout.alignment: Qt.AlignHCenter
58 text: qsTr("Button") 58 }
59 enabled: false
60 }
61 59
62 // Row 3 60 // Row 2
63 61
64 Button { 62 Button {
65 text: qsTr("Checked") 63 text: qsTr("Button")
66 checkable: false 64 }
67 checked: true
68 }
69 65
70 Button { 66 Button {
71 text: qsTr("Checked") 67 text: qsTr("Button")
72 checkable: false 68 enabled: false
73 checked: true 69 }
74 enabled: false
75 }
76 70
77 // Row 4 71 // Row 3
78 72
79 Button { 73 Button {
80 text: qsTr("Flat") 74 text: qsTr("Checked")
81 flat: true 75 checkable: false
82 } 76 checked: true
77 }
83 78
84 Button { 79 Button {
85 text: qsTr("Flat") 80 text: qsTr("Checked")
86 flat: true 81 checkable: false
87 enabled: false 82 checked: true
88 } 83 enabled: false
84 }
89 85
90 // Row 5 86 // Row 4
91 87
92 Button { 88 Button {
93 text: qsTr("Highlighted") 89 text: qsTr("Flat")
94 highlighted: true 90 flat: true
95 } 91 }
92
93 Button {
94 text: qsTr("Flat")
95 flat: true
96 enabled: false
97 }
98
99 // Row 5
100
101 Button {
102 text: qsTr("Highlighted")
103 highlighted: true
104 }
96 105
97 Button { 106 Button {
98 text: qsTr("Highlighted") 107 text: qsTr("Highlighted")
99 highlighted: true 108 highlighted: true
100 enabled: false 109 enabled: false
110 }
101 } 111 }
102 } 112 }
103 } 113 }
diff --git a/prototype_2016/resources/qml/Pages/Basic/CheckBoxPage.qml b/prototype_2016/resources/qml/Pages/Basic/CheckBoxPage.qml
index bf5c96a..6e53e73 100644
--- a/prototype_2016/resources/qml/Pages/Basic/CheckBoxPage.qml
+++ b/prototype_2016/resources/qml/Pages/Basic/CheckBoxPage.qml
@@ -1,8 +1,8 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com> 5 * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
6 * 6 *
7 * $BEGIN_LICENSE:MPL2$ 7 * $BEGIN_LICENSE:MPL2$
8 * 8 *
@@ -19,71 +19,81 @@ import QtQuick.Layouts 1.0
19import Fluid.Controls 1.0 19import Fluid.Controls 1.0
20import "../.." 20import "../.."
21 21
22ColumnLayout { 22Flickable {
23 Repeater { 23 clip: true
24 model: 2 24 contentHeight: Math.max(layout.implicitHeight, height)
25 25
26 StyledRectangle { 26 ScrollBar.vertical: ScrollBar {}
27 Layout.fillWidth: true
28 Layout.fillHeight: true
29 Layout.minimumWidth: grid.width + 80
30 Layout.minimumHeight: grid.height + 80
31 27
32 GridLayout { 28 ColumnLayout {
33 id: grid 29 id: layout
34 anchors.centerIn: parent 30 anchors.fill: parent
35 columns: 3
36 rows: 3
37 31
38 // Row 1 32 Repeater {
33 model: 2
39 34
40 Item { 35 StyledRectangle {
41 width: 1 36 Layout.fillWidth: true
42 height: 1 37 Layout.fillHeight: true
43 } 38 Layout.minimumWidth: grid.width + 80
39 Layout.minimumHeight: grid.height + 80
44 40
45 TitleLabel { 41 GridLayout {
46 text: qsTr("Enabled") 42 id: grid
43 anchors.centerIn: parent
44 columns: 3
45 rows: 3
47 46
48 Layout.alignment: Qt.AlignHCenter 47 // Row 1
49 }
50 48
51 TitleLabel { 49 Item {
52 text: qsTr("Disabled") 50 width: 1
51 height: 1
52 }
53 53
54 Layout.alignment: Qt.AlignHCenter 54 TitleLabel {
55 } 55 text: qsTr("Enabled")
56 56
57 // Row 2 57 Layout.alignment: Qt.AlignHCenter
58 }
58 59
59 Label { 60 TitleLabel {
60 text: qsTr("On") 61 text: qsTr("Disabled")
61 }
62 62
63 CheckBox { 63 Layout.alignment: Qt.AlignHCenter
64 checked: true 64 }
65 text: qsTr("CheckBox")
66 }
67 65
68 CheckBox { 66 // Row 2
69 checked: true
70 enabled: false
71 text: qsTr("CheckBox")
72 }
73 67
74 // Row 3 68 Label {
69 text: qsTr("On")
70 }
75 71
76 Label { 72 CheckBox {
77 text: qsTr("Off") 73 checked: true
78 } 74 text: qsTr("CheckBox")
75 }
79 76
80 CheckBox { 77 CheckBox {
81 text: qsTr("CheckBox") 78 checked: true
82 } 79 enabled: false
80 text: qsTr("CheckBox")
81 }
82
83 // Row 3
84
85 Label {
86 text: qsTr("Off")
87 }
88
89 CheckBox {
90 text: qsTr("CheckBox")
91 }
83 92
84 CheckBox { 93 CheckBox {
85 text: qsTr("CheckBox") 94 text: qsTr("CheckBox")
86 enabled: false 95 enabled: false
96 }
87 } 97 }
88 } 98 }
89 } 99 }
diff --git a/prototype_2016/resources/qml/Pages/Basic/ProgressBarPage.qml b/prototype_2016/resources/qml/Pages/Basic/ProgressBarPage.qml
index 77267fe..440db51 100644
--- a/prototype_2016/resources/qml/Pages/Basic/ProgressBarPage.qml
+++ b/prototype_2016/resources/qml/Pages/Basic/ProgressBarPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -18,96 +18,106 @@ import QtQuick.Layouts 1.0
18import Fluid.Controls 1.0 18import Fluid.Controls 1.0
19import "../.." 19import "../.."
20 20
21ColumnLayout { 21Flickable {
22 Repeater { 22 clip: true
23 model: 2 23 contentHeight: Math.max(layout.implicitHeight, height)
24 24
25 StyledRectangle { 25 ScrollBar.vertical: ScrollBar {}
26 Layout.fillWidth: true
27 Layout.fillHeight: true
28 Layout.minimumWidth: grid.width + 80
29 Layout.minimumHeight: grid.height + 80
30 26
31 GridLayout { 27 ColumnLayout {
32 id: grid 28 id: layout
33 anchors.centerIn: parent 29 anchors.fill: parent
34 columns: 3
35 30
36 // Row 1 31 Repeater {
32 model: 2
37 33
38 Item { 34 StyledRectangle {
39 width: 1 35 Layout.fillWidth: true
40 height: 1 36 Layout.fillHeight: true
41 } 37 Layout.minimumWidth: grid.width + 80
38 Layout.minimumHeight: grid.height + 80
42 39
43 TitleLabel { 40 GridLayout {
44 text: qsTr("Determinate") 41 id: grid
42 anchors.centerIn: parent
43 columns: 3
45 44
46 Layout.alignment: Qt.AlignHCenter 45 // Row 1
47 }
48 46
49 TitleLabel { 47 Item {
50 text: qsTr("Indeterminate") 48 width: 1
49 height: 1
50 }
51 51
52 Layout.alignment: Qt.AlignHCenter 52 TitleLabel {
53 } 53 text: qsTr("Determinate")
54 54
55 // Row 2 55 Layout.alignment: Qt.AlignHCenter
56 }
56 57
57 Label { 58 TitleLabel {
58 text: qsTr("Static") 59 text: qsTr("Indeterminate")
59 }
60 60
61 ProgressBar { 61 Layout.alignment: Qt.AlignHCenter
62 from: 0.0 62 }
63 to: 1.0
64 value: 0.5
65 indeterminate: false
66 }
67 63
68 ProgressBar { 64 // Row 2
69 from: 0.0
70 to: 1.0
71 value: 0.5
72 indeterminate: true
73 }
74 65
75 // Row 3 66 Label {
67 text: qsTr("Static")
68 }
76 69
77 Label { 70 ProgressBar {
78 text: qsTr("Animated") 71 from: 0.0
79 } 72 to: 1.0
73 value: 0.5
74 indeterminate: false
75 }
80 76
81 ProgressBar { 77 ProgressBar {
82 from: 0.0 78 from: 0.0
83 to: 1.0 79 to: 1.0
84 indeterminate: false 80 value: 0.5
81 indeterminate: true
82 }
85 83
86 SequentialAnimation on value { 84 // Row 3
87 running: true
88 loops: NumberAnimation.Infinite
89 85
90 NumberAnimation { 86 Label {
91 from: 0.0 87 text: qsTr("Animated")
92 to: 1.0 88 }
93 duration: 3000 89
90 ProgressBar {
91 from: 0.0
92 to: 1.0
93 indeterminate: false
94
95 SequentialAnimation on value {
96 running: true
97 loops: NumberAnimation.Infinite
98
99 NumberAnimation {
100 from: 0.0
101 to: 1.0
102 duration: 3000
103 }
94 } 104 }
95 } 105 }
96 }
97 106
98 ProgressBar { 107 ProgressBar {
99 from: 0.0 108 from: 0.0
100 to: 1.0 109 to: 1.0
101 indeterminate: true 110 indeterminate: true
102 111
103 SequentialAnimation on value { 112 SequentialAnimation on value {
104 running: true 113 running: true
105 loops: NumberAnimation.Infinite 114 loops: NumberAnimation.Infinite
106 115
107 NumberAnimation { 116 NumberAnimation {
108 from: 0.0 117 from: 0.0
109 to: 1.0 118 to: 1.0
110 duration: 3000 119 duration: 3000
120 }
111 } 121 }
112 } 122 }
113 } 123 }
diff --git a/prototype_2016/resources/qml/Pages/Basic/RadioButtonPage.qml b/prototype_2016/resources/qml/Pages/Basic/RadioButtonPage.qml
index 90c187f..80c98d5 100644
--- a/prototype_2016/resources/qml/Pages/Basic/RadioButtonPage.qml
+++ b/prototype_2016/resources/qml/Pages/Basic/RadioButtonPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -18,71 +18,81 @@ import QtQuick.Layouts 1.0
18import Fluid.Controls 1.0 18import Fluid.Controls 1.0
19import "../.." 19import "../.."
20 20
21ColumnLayout { 21Flickable {
22 Repeater { 22 clip: true
23 model: 2 23 contentHeight: Math.max(layout.implicitHeight, height)
24 24
25 StyledRectangle { 25 ScrollBar.vertical: ScrollBar {}
26 Layout.fillWidth: true
27 Layout.fillHeight: true
28 Layout.minimumWidth: grid.width + 80
29 Layout.minimumHeight: grid.height + 80
30 26
31 GridLayout { 27 ColumnLayout {
32 id: grid 28 id: layout
33 anchors.centerIn: parent 29 anchors.fill: parent
34 columns: 3
35 rows: 3
36 30
37 // Row 1 31 Repeater {
32 model: 2
38 33
39 Item { 34 StyledRectangle {
40 width: 1 35 Layout.fillWidth: true
41 height: 1 36 Layout.fillHeight: true
42 } 37 Layout.minimumWidth: grid.width + 80
38 Layout.minimumHeight: grid.height + 80
43 39
44 TitleLabel { 40 GridLayout {
45 text: qsTr("Enabled") 41 id: grid
42 anchors.centerIn: parent
43 columns: 3
44 rows: 3
46 45
47 Layout.alignment: Qt.AlignHCenter 46 // Row 1
48 }
49 47
50 TitleLabel { 48 Item {
51 text: qsTr("Disabled") 49 width: 1
50 height: 1
51 }
52 52
53 Layout.alignment: Qt.AlignHCenter 53 TitleLabel {
54 } 54 text: qsTr("Enabled")
55 55
56 // Row 2 56 Layout.alignment: Qt.AlignHCenter
57 }
57 58
58 Label { 59 TitleLabel {
59 text: qsTr("On") 60 text: qsTr("Disabled")
60 }
61 61
62 RadioButton { 62 Layout.alignment: Qt.AlignHCenter
63 checked: true 63 }
64 text: qsTr("RadioButton")
65 }
66 64
67 RadioButton { 65 // Row 2
68 checked: true
69 enabled: false
70 text: qsTr("RadioButton")
71 }
72 66
73 // Row 3 67 Label {
68 text: qsTr("On")
69 }
74 70
75 Label { 71 RadioButton {
76 text: qsTr("Off") 72 checked: true
77 } 73 text: qsTr("RadioButton")
74 }
78 75
79 RadioButton { 76 RadioButton {
80 text: qsTr("RadioButton") 77 checked: true
81 } 78 enabled: false
79 text: qsTr("RadioButton")
80 }
81
82 // Row 3
83
84 Label {
85 text: qsTr("Off")
86 }
87
88 RadioButton {
89 text: qsTr("RadioButton")
90 }
82 91
83 RadioButton { 92 RadioButton {
84 text: qsTr("RadioButton") 93 text: qsTr("RadioButton")
85 enabled: false 94 enabled: false
95 }
86 } 96 }
87 } 97 }
88 } 98 }
diff --git a/prototype_2016/resources/qml/Pages/Basic/SliderPage.qml b/prototype_2016/resources/qml/Pages/Basic/SliderPage.qml
index 840e3b8..72d9c11 100644
--- a/prototype_2016/resources/qml/Pages/Basic/SliderPage.qml
+++ b/prototype_2016/resources/qml/Pages/Basic/SliderPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -18,123 +18,133 @@ import QtQuick.Layouts 1.0
18import Fluid.Controls 1.0 18import Fluid.Controls 1.0
19import "../.." 19import "../.."
20 20
21ColumnLayout { 21Flickable {
22 Repeater { 22 clip: true
23 model: 2 23 contentHeight: Math.max(layout.implicitHeight, height)
24 24
25 StyledRectangle { 25 ScrollBar.vertical: ScrollBar {}
26 Layout.fillWidth: true 26
27 Layout.fillHeight: true 27 ColumnLayout {
28 Layout.minimumWidth: grid.width + 80 28 id: layout
29 Layout.minimumHeight: grid.height + 80 29 anchors.fill: parent
30 30
31 GridLayout { 31 Repeater {
32 id: grid 32 model: 2
33 anchors.centerIn: parent 33
34 columns: 3 34 StyledRectangle {
35 rows: 3 35 Layout.fillWidth: true
36 36 Layout.fillHeight: true
37 // Row 1 37 Layout.minimumWidth: grid.width + 80
38 38 Layout.minimumHeight: grid.height + 80
39 Item { 39
40 width: 1 40 GridLayout {
41 height: 1 41 id: grid
42 } 42 anchors.centerIn: parent
43 43 columns: 3
44 TitleLabel { 44 rows: 3
45 text: qsTr("Enabled") 45
46 46 // Row 1
47 Layout.alignment: Qt.AlignHCenter 47
48 } 48 Item {
49 49 width: 1
50 TitleLabel { 50 height: 1
51 text: qsTr("Disabled") 51 }
52 52
53 Layout.alignment: Qt.AlignHCenter 53 TitleLabel {
54 } 54 text: qsTr("Enabled")
55 55
56 // Row 2 56 Layout.alignment: Qt.AlignHCenter
57 57 }
58 Label { 58
59 text: qsTr("Horizontal / Single") 59 TitleLabel {
60 } 60 text: qsTr("Disabled")
61 61
62 Slider { 62 Layout.alignment: Qt.AlignHCenter
63 from: 0.0 63 }
64 to: 1.0 64
65 value: 0.5 65 // Row 2
66 } 66
67 67 Label {
68 Slider { 68 text: qsTr("Horizontal / Single")
69 from: 0.0 69 }
70 to: 1.0 70
71 value: 0.5 71 Slider {
72 enabled: false 72 from: 0.0
73 } 73 to: 1.0
74 74 value: 0.5
75 // Row 3 75 }
76 76
77 Label { 77 Slider {
78 text: qsTr("Horizontal / Range") 78 from: 0.0
79 } 79 to: 1.0
80 80 value: 0.5
81 RangeSlider { 81 enabled: false
82 from: 0.0 82 }
83 to: 1.0 83
84 first.value: 0.4 84 // Row 3
85 second.value: 0.6 85
86 } 86 Label {
87 87 text: qsTr("Horizontal / Range")
88 RangeSlider { 88 }
89 from: 0.0 89
90 to: 1.0 90 RangeSlider {
91 first.value: 0.4 91 from: 0.0
92 second.value: 0.6 92 to: 1.0
93 enabled: false 93 first.value: 0.4
94 } 94 second.value: 0.6
95 95 }
96 // Row 4 96
97 97 RangeSlider {
98 Label { 98 from: 0.0
99 text: qsTr("Vertical / Single") 99 to: 1.0
100 } 100 first.value: 0.4
101 101 second.value: 0.6
102 Slider { 102 enabled: false
103 from: 0.0 103 }
104 to: 1.0 104
105 value: 0.5 105 // Row 4
106 orientation: Qt.Vertical 106
107 } 107 Label {
108 108 text: qsTr("Vertical / Single")
109 Slider { 109 }
110 from: 0.0 110
111 to: 1.0 111 Slider {
112 value: 0.5 112 from: 0.0
113 enabled: false 113 to: 1.0
114 orientation: Qt.Vertical 114 value: 0.5
115 } 115 orientation: Qt.Vertical
116 116 }
117 // Row 5 117
118 118 Slider {
119 Label { 119 from: 0.0
120 text: qsTr("Vertical / Range") 120 to: 1.0
121 } 121 value: 0.5
122 122 enabled: false
123 RangeSlider { 123 orientation: Qt.Vertical
124 from: 0.0 124 }
125 to: 1.0 125
126 first.value: 0.4 126 // Row 5
127 second.value: 0.6 127
128 orientation: Qt.Vertical 128 Label {
129 } 129 text: qsTr("Vertical / Range")
130 130 }
131 RangeSlider { 131
132 from: 0.0 132 RangeSlider {
133 to: 1.0 133 from: 0.0
134 first.value: 0.4 134 to: 1.0
135 second.value: 0.6 135 first.value: 0.4
136 enabled: false 136 second.value: 0.6
137 orientation: Qt.Vertical 137 orientation: Qt.Vertical
138 }
139
140 RangeSlider {
141 from: 0.0
142 to: 1.0
143 first.value: 0.4
144 second.value: 0.6
145 enabled: false
146 orientation: Qt.Vertical
147 }
138 } 148 }
139 } 149 }
140 } 150 }
diff --git a/prototype_2016/resources/qml/Pages/Basic/SwitchPage.qml b/prototype_2016/resources/qml/Pages/Basic/SwitchPage.qml
index abbd9ac..15c679b 100644
--- a/prototype_2016/resources/qml/Pages/Basic/SwitchPage.qml
+++ b/prototype_2016/resources/qml/Pages/Basic/SwitchPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -18,71 +18,81 @@ import QtQuick.Layouts 1.0
18import Fluid.Controls 1.0 18import Fluid.Controls 1.0
19import "../.." 19import "../.."
20 20
21ColumnLayout { 21Flickable {
22 Repeater { 22 clip: true
23 model: 2 23 contentHeight: Math.max(layout.implicitHeight, height)
24 24
25 StyledRectangle { 25 ScrollBar.vertical: ScrollBar {}
26 Layout.fillWidth: true
27 Layout.fillHeight: true
28 Layout.minimumWidth: grid.width + 80
29 Layout.minimumHeight: grid.height + 80
30 26
31 GridLayout { 27 ColumnLayout {
32 id: grid 28 id: layout
33 anchors.centerIn: parent 29 anchors.fill: parent
34 columns: 3
35 rows: 3
36 30
37 // Row 1 31 Repeater {
32 model: 2
38 33
39 Item { 34 StyledRectangle {
40 width: 1 35 Layout.fillWidth: true
41 height: 1 36 Layout.fillHeight: true
42 } 37 Layout.minimumWidth: grid.width + 80
38 Layout.minimumHeight: grid.height + 80
43 39
44 TitleLabel { 40 GridLayout {
45 text: qsTr("Enabled") 41 id: grid
42 anchors.centerIn: parent
43 columns: 3
44 rows: 3
46 45
47 Layout.alignment: Qt.AlignHCenter 46 // Row 1
48 }
49 47
50 TitleLabel { 48 Item {
51 text: qsTr("Disabled") 49 width: 1
50 height: 1
51 }
52 52
53 Layout.alignment: Qt.AlignHCenter 53 TitleLabel {
54 } 54 text: qsTr("Enabled")
55 55
56 // Row 2 56 Layout.alignment: Qt.AlignHCenter
57 }
57 58
58 Label { 59 TitleLabel {
59 text: qsTr("On") 60 text: qsTr("Disabled")
60 }
61 61
62 Switch { 62 Layout.alignment: Qt.AlignHCenter
63 checked: true 63 }
64 text: qsTr("Switch")
65 }
66 64
67 Switch { 65 // Row 2
68 checked: true
69 enabled: false
70 text: qsTr("Switch")
71 }
72 66
73 // Row 3 67 Label {
68 text: qsTr("On")
69 }
74 70
75 Label { 71 Switch {
76 text: qsTr("Off") 72 checked: true
77 } 73 text: qsTr("Switch")
74 }
78 75
79 Switch { 76 Switch {
80 text: qsTr("Switch") 77 checked: true
81 } 78 enabled: false
79 text: qsTr("Switch")
80 }
81
82 // Row 3
83
84 Label {
85 text: qsTr("Off")
86 }
87
88 Switch {
89 text: qsTr("Switch")
90 }
82 91
83 Switch { 92 Switch {
84 text: qsTr("Switch") 93 text: qsTr("Switch")
85 enabled: false 94 enabled: false
95 }
86 } 96 }
87 } 97 }
88 } 98 }
diff --git a/prototype_2016/resources/qml/Pages/Compound/CardPage.qml b/prototype_2016/resources/qml/Pages/Compound/CardPage.qml
index e7be3e6..ec33a3e 100644
--- a/prototype_2016/resources/qml/Pages/Compound/CardPage.qml
+++ b/prototype_2016/resources/qml/Pages/Compound/CardPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -16,10 +16,9 @@ import QtQuick 2.0
16import QtQuick.Controls 2.0 16import QtQuick.Controls 2.0
17import Fluid.Controls 1.0 17import Fluid.Controls 1.0
18 18
19Page { 19Item {
20 title: qsTr("Cards")
21
22 Card { 20 Card {
21 id: card
23 anchors.centerIn: parent 22 anchors.centerIn: parent
24 width: 400 23 width: 400
25 height: 400 24 height: 400
diff --git a/prototype_2016/resources/qml/Pages/Compound/InfoBarPage.qml b/prototype_2016/resources/qml/Pages/Compound/InfoBarPage.qml
index f383549..1830e39 100644
--- a/prototype_2016/resources/qml/Pages/Compound/InfoBarPage.qml
+++ b/prototype_2016/resources/qml/Pages/Compound/InfoBarPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -16,9 +16,7 @@ import QtQuick 2.0
16import QtQuick.Controls 2.0 16import QtQuick.Controls 2.0
17import Fluid.Controls 1.0 17import Fluid.Controls 1.0
18 18
19Page { 19Item {
20 title: qsTr("InfoBar")
21
22 Button { 20 Button {
23 anchors.centerIn: parent 21 anchors.centerIn: parent
24 text: qsTr("Open") 22 text: qsTr("Open")
diff --git a/prototype_2016/resources/qml/Pages/Compound/ListItemPage.qml b/prototype_2016/resources/qml/Pages/Compound/ListItemPage.qml
index b35f863..f86f81b 100644
--- a/prototype_2016/resources/qml/Pages/Compound/ListItemPage.qml
+++ b/prototype_2016/resources/qml/Pages/Compound/ListItemPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
diff --git a/prototype_2016/resources/qml/Pages/Compound/SubPage.qml b/prototype_2016/resources/qml/Pages/Compound/SubPage.qml
index 2367508..8a86a28 100644
--- a/prototype_2016/resources/qml/Pages/Compound/SubPage.qml
+++ b/prototype_2016/resources/qml/Pages/Compound/SubPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com> 4 * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
diff --git a/prototype_2016/resources/qml/Pages/Material/ActionButtonPage.qml b/prototype_2016/resources/qml/Pages/Material/ActionButtonPage.qml
index ff0b801..1fcf516 100644
--- a/prototype_2016/resources/qml/Pages/Material/ActionButtonPage.qml
+++ b/prototype_2016/resources/qml/Pages/Material/ActionButtonPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -18,41 +18,49 @@ import QtQuick.Controls.Material 2.0
18import Fluid.Material 1.0 18import Fluid.Material 1.0
19import "../.." 19import "../.."
20 20
21Page { 21Flickable {
22 title: qsTr("Action button") 22 clip: true
23 contentHeight: Math.max(layout.implicitHeight, height)
23 24
24 Repeater { 25 ScrollBar.vertical: ScrollBar {}
25 model: 2
26 26
27 StyledRectangle { 27 Column {
28 y: height * index 28 id: layout
29 width: parent.width 29 anchors.fill: parent
30 height: parent.height / 2
31 30
32 Column { 31 Repeater {
33 anchors.centerIn: parent 32 model: 2
34 33
35 ActionButton { 34 StyledRectangle {
36 iconName: "device/airplanemode_active" 35 //y: height * index
37 } 36 width: parent.width
37 height: parent.height / 2
38 38
39 ActionButton { 39 Column {
40 iconName: "navigation/check" 40 anchors.centerIn: parent
41 41
42 Material.elevation: 1 42 ActionButton {
43 } 43 iconName: "device/airplanemode_active"
44 }
44 45
45 ActionButton { 46 ActionButton {
46 iconName: "device/airplanemode_active" 47 iconName: "navigation/check"
47 48
48 Material.background: Material.primaryColor 49 Material.elevation: 1
49 } 50 }
51
52 ActionButton {
53 iconName: "device/airplanemode_active"
54
55 Material.background: Material.primaryColor
56 }
50 57
51 ActionButton { 58 ActionButton {
52 iconName: "navigation/check" 59 iconName: "navigation/check"
53 60
54 Material.elevation: 1 61 Material.elevation: 1
55 Material.background: Material.primaryColor 62 Material.background: Material.primaryColor
63 }
56 } 64 }
57 } 65 }
58 } 66 }
diff --git a/prototype_2016/resources/qml/Pages/Material/WavePage.qml b/prototype_2016/resources/qml/Pages/Material/WavePage.qml
index 85b969f..58cae01 100644
--- a/prototype_2016/resources/qml/Pages/Material/WavePage.qml
+++ b/prototype_2016/resources/qml/Pages/Material/WavePage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -12,14 +12,14 @@
12 * $END_LICENSE$ 12 * $END_LICENSE$
13 */ 13 */
14 14
15import QtQuick 2.0
15import QtQuick.Controls 2.0 16import QtQuick.Controls 2.0
16import QtQuick.Controls.Material 2.0 17import QtQuick.Controls.Material 2.0
17import Fluid.Controls 1.0 18import Fluid.Controls 1.0
19import Fluid.Material 1.0
18import "../.." 20import "../.."
19 21
20Page { 22Item {
21 title: qsTr("Wave transition")
22
23 Wave { 23 Wave {
24 id: wave 24 id: wave
25 initialX: parent.width - size 25 initialX: parent.width - size
diff --git a/prototype_2016/resources/qml/Pages/Navigation/NavDrawerPage.qml b/prototype_2016/resources/qml/Pages/Navigation/NavDrawerPage.qml
index 2d81f2e..4c7dd21 100644
--- a/prototype_2016/resources/qml/Pages/Navigation/NavDrawerPage.qml
+++ b/prototype_2016/resources/qml/Pages/Navigation/NavDrawerPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -12,13 +12,12 @@
12 * $END_LICENSE$ 12 * $END_LICENSE$
13 */ 13 */
14 14
15import QtQuick 2.0
15import QtQuick.Controls 2.0 16import QtQuick.Controls 2.0
16import Fluid.Controls 1.0 17import Fluid.Controls 1.0
17import "../.." 18import "../.."
18 19
19Page { 20Item {
20 title: qsTr("Navigation drawer")
21
22 Button { 21 Button {
23 anchors.centerIn: parent 22 anchors.centerIn: parent
24 text: qsTr("Open") 23 text: qsTr("Open")
diff --git a/prototype_2016/resources/qml/Pages/Style/PalettePage.qml b/prototype_2016/resources/qml/Pages/Style/PalettePage.qml
index deecca5..bc34dab 100644
--- a/prototype_2016/resources/qml/Pages/Style/PalettePage.qml
+++ b/prototype_2016/resources/qml/Pages/Style/PalettePage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -20,102 +20,116 @@ import Fluid.Core 1.0
20import Fluid.Controls 1.0 20import Fluid.Controls 1.0
21import "../.." 21import "../.."
22 22
23GridLayout { 23Flickable {
24 id: grid 24 clip: true
25 contentHeight: Math.max(grid.implicitHeight, height)
26
27 ScrollBar.vertical: ScrollBar {}
25 28
26 property color whiteColor: Qt.rgba(255, 255, 255, 1) 29 property color whiteColor: Qt.rgba(255, 255, 255, 1)
27 property color blackColor: Qt.rgba(0, 0, 0, 1) 30 property color blackColor: Qt.rgba(0, 0, 0, 1)
28 31
29 anchors.centerIn: parent 32 GridLayout {
30 columns: width / 300 33 id: grid
31 width: parent.width
32 rowSpacing: Units.smallSpacing
33 columnSpacing: Units.smallSpacing
34 34
35 Repeater { 35 anchors {
36 model: ListModel { 36 top: parent.top
37 ListElement { 37 bottom: parent.bottom
38 paletteIndex: Material.Red 38 horizontalCenter: parent.horizontalCenter
39 name: "Red" 39 topMargin: Units.largeSpacing
40 }
41 ListElement {
42 paletteIndex: Material.Pink
43 name: "Pink"
44 }
45 ListElement {
46 paletteIndex: Material.Purple
47 name: "Purple"
48 }
49 ListElement {
50 paletteIndex: Material.DeepPurple
51 name: "DeepPurple"
52 }
53 ListElement {
54 paletteIndex: Material.Indigo
55 name: "Indigo"
56 }
57 ListElement {
58 paletteIndex: Material.Blue
59 name: "Blue"
60 }
61 ListElement {
62 paletteIndex: Material.LightBlue
63 name: "LightBlue"
64 }
65 ListElement {
66 paletteIndex: Material.Cyan
67 name: "Cyan"
68 }
69 ListElement {
70 paletteIndex: Material.Teal
71 name: "Teal"
72 }
73 ListElement {
74 paletteIndex: Material.Green
75 name: "Green"
76 }
77 ListElement {
78 paletteIndex: Material.LightGreen
79 name: "LightGreen"
80 }
81 ListElement {
82 paletteIndex: Material.Lime
83 name: "Lime"
84 }
85 ListElement {
86 paletteIndex: Material.Yellow
87 name: "Yellow"
88 }
89 ListElement {
90 paletteIndex: Material.Amber
91 name: "Amber"
92 }
93 ListElement {
94 paletteIndex: Material.Orange
95 name: "Orange"
96 }
97 ListElement {
98 paletteIndex: Material.DeepOrange
99 name: "DeepOrange"
100 }
101 ListElement {
102 paletteIndex: Material.Grey
103 name: "Grey"
104 }
105 ListElement {
106 paletteIndex: Material.BlueGrey
107 name: "BlueGrey"
108 }
109 ListElement {
110 paletteIndex: Material.Brown
111 name: "Brown"
112 }
113 } 40 }
114 41
115 PaletteSwatch { 42 width: parent.width * 0.8
116 paletteIndex: model.paletteIndex 43
117 paletteName: model.name 44 columns: width / 300
118 paletteColor: Material.color(model.paletteIndex, Material.Shade500) 45 rowSpacing: Units.smallSpacing
46 columnSpacing: Units.smallSpacing
47
48 Repeater {
49 model: ListModel {
50 ListElement {
51 paletteIndex: Material.Red
52 name: "Red"
53 }
54 ListElement {
55 paletteIndex: Material.Pink
56 name: "Pink"
57 }
58 ListElement {
59 paletteIndex: Material.Purple
60 name: "Purple"
61 }
62 ListElement {
63 paletteIndex: Material.DeepPurple
64 name: "DeepPurple"
65 }
66 ListElement {
67 paletteIndex: Material.Indigo
68 name: "Indigo"
69 }
70 ListElement {
71 paletteIndex: Material.Blue
72 name: "Blue"
73 }
74 ListElement {
75 paletteIndex: Material.LightBlue
76 name: "LightBlue"
77 }
78 ListElement {
79 paletteIndex: Material.Cyan
80 name: "Cyan"
81 }
82 ListElement {
83 paletteIndex: Material.Teal
84 name: "Teal"
85 }
86 ListElement {
87 paletteIndex: Material.Green
88 name: "Green"
89 }
90 ListElement {
91 paletteIndex: Material.LightGreen
92 name: "LightGreen"
93 }
94 ListElement {
95 paletteIndex: Material.Lime
96 name: "Lime"
97 }
98 ListElement {
99 paletteIndex: Material.Yellow
100 name: "Yellow"
101 }
102 ListElement {
103 paletteIndex: Material.Amber
104 name: "Amber"
105 }
106 ListElement {
107 paletteIndex: Material.Orange
108 name: "Orange"
109 }
110 ListElement {
111 paletteIndex: Material.DeepOrange
112 name: "DeepOrange"
113 }
114 ListElement {
115 paletteIndex: Material.Grey
116 name: "Grey"
117 }
118 ListElement {
119 paletteIndex: Material.BlueGrey
120 name: "BlueGrey"
121 }
122 ListElement {
123 paletteIndex: Material.Brown
124 name: "Brown"
125 }
126 }
127
128 PaletteSwatch {
129 paletteIndex: model.paletteIndex
130 paletteName: model.name
131 paletteColor: Material.color(model.paletteIndex, Material.Shade500)
132 }
119 } 133 }
120 } 134 }
121} 135}
diff --git a/prototype_2016/resources/qml/Pages/Style/PaletteSwatch.qml b/prototype_2016/resources/qml/Pages/Style/PaletteSwatch.qml
index fb74886..ac5c9b3 100644
--- a/prototype_2016/resources/qml/Pages/Style/PaletteSwatch.qml
+++ b/prototype_2016/resources/qml/Pages/Style/PaletteSwatch.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
diff --git a/prototype_2016/resources/qml/Pages/Style/TypographyPage.qml b/prototype_2016/resources/qml/Pages/Style/TypographyPage.qml
index 8cf47ff..d87d00c 100644
--- a/prototype_2016/resources/qml/Pages/Style/TypographyPage.qml
+++ b/prototype_2016/resources/qml/Pages/Style/TypographyPage.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
@@ -18,8 +18,14 @@ import QtQuick.Controls 2.0
18import Fluid.Controls 1.0 18import Fluid.Controls 1.0
19import "../.." 19import "../.."
20 20
21Item { 21Flickable {
22 clip: true
23 contentHeight: Math.max(layout.implicitHeight, height)
24
25 ScrollBar.vertical: ScrollBar {}
26
22 ColumnLayout { 27 ColumnLayout {
28 id: layout
23 anchors.fill: parent 29 anchors.fill: parent
24 anchors.margins: Units.mediumSpacing 30 anchors.margins: Units.mediumSpacing
25 spacing: Units.smallSpacing 31 spacing: Units.smallSpacing
diff --git a/prototype_2016/resources/qml/Style.qml b/prototype_2016/resources/qml/Style.qml
index 8de8d3f..9f997bd 100644
--- a/prototype_2016/resources/qml/Style.qml
+++ b/prototype_2016/resources/qml/Style.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
diff --git a/prototype_2016/resources/qml/StyledRectangle.qml b/prototype_2016/resources/qml/StyledRectangle.qml
index 9d3937c..3af12dd 100644
--- a/prototype_2016/resources/qml/StyledRectangle.qml
+++ b/prototype_2016/resources/qml/StyledRectangle.qml
@@ -1,7 +1,7 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * 5 *
6 * $BEGIN_LICENSE:MPL2$ 6 * $BEGIN_LICENSE:MPL2$
7 * 7 *
diff --git a/prototype_2016/resources/qml/main.qml b/prototype_2016/resources/qml/main.qml
index 44ae1a4..37b0077 100644
--- a/prototype_2016/resources/qml/main.qml
+++ b/prototype_2016/resources/qml/main.qml
@@ -1,8 +1,8 @@
1/* 1/*
2 * This file is part of Fluid. 2 * This file is part of Fluid.
3 * 3 *
4 * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> 4 * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
5 * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com> 5 * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
6 * 6 *
7 * $BEGIN_LICENSE:MPL2$ 7 * $BEGIN_LICENSE:MPL2$
8 * 8 *
@@ -58,14 +58,17 @@ FluidWindow {
58 actions: [ 58 actions: [
59 Action { 59 Action {
60 text: qsTr("Action 1") 60 text: qsTr("Action 1")
61 iconName: "action/info"
61 onTriggered: console.log("action1 triggered") 62 onTriggered: console.log("action1 triggered")
62 }, 63 },
63 Action { 64 Action {
64 text: qsTr("Action 2") 65 text: qsTr("Action 2")
66 iconName: "action/info"
65 onTriggered: console.log("action2 triggered") 67 onTriggered: console.log("action2 triggered")
66 }, 68 },
67 Action { 69 Action {
68 text: qsTr("Action 3") 70 text: qsTr("Action 3")
71 iconName: "action/info"
69 onTriggered: console.log("action3 triggered") 72 onTriggered: console.log("action3 triggered")
70 } 73 }
71 ] 74 ]
@@ -74,6 +77,24 @@ FluidWindow {
74 initialPage: TabbedPage { 77 initialPage: TabbedPage {
75 title: window.title 78 title: window.title
76 79
80 actions: [
81 Action {
82 text: qsTr("Dummy error")
83 iconName: "alert/warning"
84 onTriggered: console.log("Dummy error")
85 },
86 Action {
87 text: qsTr("Colors")
88 iconName: "image/color_lens"
89 onTriggered: console.log("Colors")
90 },
91 Action {
92 text: qsTr("Settings")
93 iconName: "action/settings"
94 onTriggered: console.log("Settings clicked")
95 }
96 ]
97
77 BasicComponents {} 98 BasicComponents {}
78 CompoundComponents {} 99 CompoundComponents {}
79 MaterialComponents {} 100 MaterialComponents {}
diff --git a/prototype_2016/resources/qml/main.qml.old b/prototype_2016/resources/qml/main.qml.old
deleted file mode 100644
index 2a7e762..0000000
--- a/prototype_2016/resources/qml/main.qml.old
+++ /dev/null
@@ -1,89 +0,0 @@
1import QtQuick 2.6
2import QtQuick.Controls 2.0
3import QtQuick.Controls.Material 2.0
4import QtQuick.Controls.Universal 2.0
5import QtQuick.Layouts 1.3
6import Fluid.Controls 1.0
7
8ApplicationWindow {
9 id: app
10
11 title: "secushare %1".arg(version)
12
13 theme {
14 primaryColor: "orange"
15 accentColor: "purple"
16 tabHighlightColor: "white"
17 }
18
19 visible: true
20
21 initialPage: TabbedPage {
22 title: "Secushare"
23
24 // FIXME: no qrc files yet
25 actions: [
26 Action {
27 iconName: 'action/search'
28 text: 'Search'
29 },
30
31
32 Action {
33 iconName: 'action/settings'
34 text: 'Settings'
35 }
36 ]
37
38 Tab {
39 title: "Conversations"
40
41 Item {
42 Sidebar {
43 Column {
44 anchors.fill: parent
45
46 Item {
47 width: parent.width
48 height: 8
49 }
50
51 ListItem.Standard {
52 text: "Conversation with Paul"
53 }
54
55 ListItem.Standard {
56 text: "Secushare prototype release"
57 }
58 }
59 }
60 }
61 }
62
63 Tab {
64 title: "Contacts"
65
66 Item {
67 Sidebar {
68 Column {
69 anchors.fill: parent
70
71 Item {
72 width: parent.width
73 height: 8
74 }
75
76 Repeater {
77 model: contacts
78
79 delegate: ListItem.Standard {
80 text: "%1 %2".arg(first_name).arg(surname)
81 }
82 }
83 }
84 }
85 }
86 }
87
88 }
89}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 20:14:21 +0000