aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNedim Hadzic <nedim.hadzic@pelagicore.com>2017-07-03 16:45:44 +0200
committerNedim Hadzic <nedim.hadzic@pelagicore.com>2017-07-13 12:10:27 +0000
commitd4d44f4bd5b292904ef496954531e8b58bf14823 (patch)
treed6fe8dae64818b721d8ae9c2c66349407bf04dcf
parentc0f8f301dd48bae5f8204673c908c16d6509ff77 (diff)
Move boards folder to sheets app
Integrate boards into the seets app so everything is within one application. Update to use folder model due to future scalability. Change-Id: Ia7eb28e1e396f946e17c9d14f1c8154f4dd3b1a1 Reviewed-by: Juergen Bocklage-Ryannel <jbocklage-ryannel@luxoft.com>
-rw-r--r--apps/com.pelagicore.sheets/Main.qml11
-rw-r--r--apps/com.pelagicore.sheets/MenuPane.qml39
-rw-r--r--apps/com.pelagicore.sheets/boards/AppButtonBoard.qml (renamed from boards/AppButtonBoard.qml)3
-rw-r--r--apps/com.pelagicore.sheets/boards/AssetsBoard.qml (renamed from boards/AssetsBoard.qml)2
-rw-r--r--apps/com.pelagicore.sheets/boards/BaseBoard.qml (renamed from boards/BaseBoard.qml)22
-rw-r--r--apps/com.pelagicore.sheets/boards/ButtonBoard.qml (renamed from boards/ButtonBoard.qml)26
-rw-r--r--apps/com.pelagicore.sheets/boards/ColorBoard.qml (renamed from apps/com.pelagicore.sheets/pages/ColorPage.qml)3
-rw-r--r--apps/com.pelagicore.sheets/boards/ColorButton.qml (renamed from apps/com.pelagicore.sheets/pages/ColorButton.qml)0
-rw-r--r--apps/com.pelagicore.sheets/boards/FrameBoard.qml (renamed from apps/com.pelagicore.sheets/pages/FramePage.qml)2
-rw-r--r--apps/com.pelagicore.sheets/boards/IconBoard.qml (renamed from boards/IconBoard.qml)4
-rw-r--r--apps/com.pelagicore.sheets/boards/ImageButtonBoard.qml (renamed from apps/com.pelagicore.sheets/pages/ImageButtonPage.qml)2
-rw-r--r--apps/com.pelagicore.sheets/boards/LabelBoard.qml (renamed from boards/LabelBoard.qml)4
-rw-r--r--apps/com.pelagicore.sheets/boards/LetterPickerBoard.qml (renamed from boards/LetterPickerBoard.qml)2
-rw-r--r--apps/com.pelagicore.sheets/boards/ListItemBoard.qml148
-rw-r--r--apps/com.pelagicore.sheets/boards/PaneBoard.qml (renamed from apps/com.pelagicore.sheets/pages/PanePage.qml)2
-rw-r--r--apps/com.pelagicore.sheets/boards/SliderBoard.qml (renamed from boards/SliderBoard.qml)1
-rw-r--r--apps/com.pelagicore.sheets/boards/StyleBoard.qml (renamed from boards/StyleBoard.qml)4
-rw-r--r--apps/com.pelagicore.sheets/boards/SwitchBoard.qml (renamed from boards/SwitchBoard.qml)3
-rw-r--r--apps/com.pelagicore.sheets/boards/SwitchDelegateBoard.qml (renamed from apps/com.pelagicore.sheets/pages/SwitchDelegatePage.qml)2
-rw-r--r--apps/com.pelagicore.sheets/boards/TabBoard.qml (renamed from boards/TabBoard.qml)5
-rw-r--r--apps/com.pelagicore.sheets/boards/TemperatureSliderBoard.qml (renamed from boards/TemperatureSliderBoard.qml)2
-rw-r--r--apps/com.pelagicore.sheets/boards/TextFieldBoard.qml (renamed from apps/com.pelagicore.sheets/pages/TextFieldPage.qml)2
-rw-r--r--apps/com.pelagicore.sheets/boards/ToolBoard.qml (renamed from boards/ToolBoard.qml)8
-rw-r--r--apps/com.pelagicore.sheets/boards/ToolButtonBoard.qml (renamed from apps/com.pelagicore.sheets/pages/ToolButtonPage.qml)2
-rw-r--r--apps/com.pelagicore.sheets/boards/VolumeSliderBoard.qml (renamed from boards/VolumeSliderBoard.qml)14
-rw-r--r--apps/com.pelagicore.sheets/boards/WelcomePage.qml (renamed from apps/com.pelagicore.sheets/pages/WelcomePage.qml)3
-rw-r--r--apps/com.pelagicore.sheets/pages/BasePage.qml44
-rw-r--r--apps/com.pelagicore.sheets/pages/ButtonPage.qml63
-rw-r--r--apps/com.pelagicore.sheets/pages/ItemDelegatePage.qml55
-rw-r--r--apps/com.pelagicore.sheets/pages/LabelPage.qml57
-rw-r--r--apps/com.pelagicore.sheets/pages/SliderPage.qml46
-rw-r--r--apps/com.pelagicore.sheets/pages/SwitchPage.qml53
-rw-r--r--boards/ListItemBoard.qml123
-rw-r--r--boards/TextFieldBoard.qml56
-rw-r--r--boards/WebBrowserBoard.qml52
35 files changed, 232 insertions, 633 deletions
diff --git a/apps/com.pelagicore.sheets/Main.qml b/apps/com.pelagicore.sheets/Main.qml
index a6bb51c..73f4d86 100644
--- a/apps/com.pelagicore.sheets/Main.qml
+++ b/apps/com.pelagicore.sheets/Main.qml
@@ -36,13 +36,10 @@ import utils 1.0
AppUIScreen {
id: root
title: "Neptune Sheets App"
- UIScreen {
- anchors.fill: parent
+
+ MenuPane {
+ anchors.centerIn: parent
+
onBackScreen: { root.back(); }
- MenuPane {
- anchors.centerIn: parent
- width: Style.hspan(13)
- height: Style.vspan(24)
- }
}
}
diff --git a/apps/com.pelagicore.sheets/MenuPane.qml b/apps/com.pelagicore.sheets/MenuPane.qml
index 5b3c4dc..0d9c91b 100644
--- a/apps/com.pelagicore.sheets/MenuPane.qml
+++ b/apps/com.pelagicore.sheets/MenuPane.qml
@@ -31,48 +31,42 @@
import QtQuick 2.8
import QtQuick.Controls 2.1
+import utils 1.0
+import controls 1.0
+import Qt.labs.folderlistmodel 2.0
-Item {
+UIScreen {
id: root
- ListModel {
- id: listEntries
- ListElement { title: 'Welcome!' ; source: 'pages/WelcomePage.qml' }
- ListElement { title: 'Buttons' ; source: 'pages/ButtonPage.qml' }
- ListElement { title: 'Tool Buttons' ; source: 'pages/ToolButtonPage.qml' }
- ListElement { title: 'TextField' ; source: 'pages/TextFieldPage.qml' }
- ListElement { title: 'Label' ; source: 'pages/LabelPage.qml' }
- ListElement { title: 'Slider' ; source: 'pages/SliderPage.qml' }
- ListElement { title: 'Switch' ; source: 'pages/SwitchPage.qml' }
- ListElement { title: 'Colors' ; source: 'pages/ColorPage.qml' }
- ListElement { title: 'Item Delegate' ; source: 'pages/ItemDelegatePage.qml' }
- ListElement { title: 'Switch Delegate' ; source: 'pages/SwitchDelegatePage.qml' }
- ListElement { title: 'Image Buttons' ; source: 'pages/ImageButtonPage.qml' }
- ListElement { title: 'Frame' ; source: 'pages/FramePage.qml' }
- ListElement { title: 'Pane' ; source: 'pages/PanePage.qml' }
+ FolderListModel {
+ id: folderModel
+ folder: "boards"
+ nameFilters: ["*.qml"]
}
Frame {
id: navigationPane
width: root.width / 4
+ height: Style.vspan(20)
+ anchors.left: parent.left
+ anchors.leftMargin: Style.hspan(3)
anchors.top: parent.top
- anchors.bottom: parent.bottom
ListView {
id: view
anchors.topMargin: 20
anchors.fill: parent
- model: listEntries
+ model: folderModel
clip: true
delegate: ItemDelegate {
width: ListView.view.width
- text: model.title
+ text: fileName
highlighted: ListView.isCurrentItem
font.pixelSize: 20
onClicked: {
view.currentIndex = index;
//make sure there is nothing else on the stack
stackView.clear();
- stackView.replace(Qt.resolvedUrl(model.source));
+ stackView.replace(Qt.resolvedUrl(model.filePath));
}
}
}
@@ -80,10 +74,11 @@ Item {
StackView {
id: stackView
- width: root.width - navigationPane.width
+ width: root.width - navigationPane.width - Style.hspan(3)
+ anchors.left: navigationPane.right
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
- initialItem: Qt.resolvedUrl(listEntries.get(0).source)
+ initialItem: Qt.resolvedUrl(folderModel.get(0).filePath)
}
}
diff --git a/boards/AppButtonBoard.qml b/apps/com.pelagicore.sheets/boards/AppButtonBoard.qml
index aff7d83..d593447 100644
--- a/boards/AppButtonBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/AppButtonBoard.qml
@@ -39,8 +39,7 @@ import utils 1.0
BaseBoard {
id: root
- title: "App Launcher Grid Delegate Board"
- color: "#333"
+ description: "App Launcher Grid Delegate Board"
Component.onCompleted: Style.debugMode = true
ColumnLayout {
diff --git a/boards/AssetsBoard.qml b/apps/com.pelagicore.sheets/boards/AssetsBoard.qml
index 4627655..78b0b2a 100644
--- a/boards/AssetsBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/AssetsBoard.qml
@@ -36,8 +36,6 @@ import Qt.labs.folderlistmodel 2.0
import utils 1.0
BaseBoard {
- color: '#333'
-
Item {
id: content
diff --git a/boards/BaseBoard.qml b/apps/com.pelagicore.sheets/boards/BaseBoard.qml
index 6d2166b..d3d8a95 100644
--- a/boards/BaseBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/BaseBoard.qml
@@ -34,30 +34,24 @@ import QtQuick.Controls 2.0
import controls 1.0
import utils 1.0
-Item {
+Page {
id: root
- width: Style.hspan(12)
- height: Style.vspan(24)
- property alias title: label.text
default property alias content: content.children
- property alias color: background.color
- Rectangle {
- id: background
- anchors.fill: parent
- color: '#000000'
- }
+ property alias description: label.text
- Label {
+ header: Label {
id: label
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: parent.top
+ padding: 20
+ wrapMode: Label.Wrap
+ font.pixelSize: 20
}
Item {
id: content
- anchors.top: label.bottom
+ anchors.top: parent.top
+ anchors.topMargin: Style.vspan(2)
anchors.margins: Style.padding
anchors.bottom: parent.bottom
anchors.left: parent.left
diff --git a/boards/ButtonBoard.qml b/apps/com.pelagicore.sheets/boards/ButtonBoard.qml
index 43c5246..bda6695 100644
--- a/boards/ButtonBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/ButtonBoard.qml
@@ -39,7 +39,10 @@ import utils 1.0
BaseBoard {
id: root
- title: "Button Board"
+ description: " The push button is perhaps the most commonly used widget in any" +
+ " graphical user interface. Pushing (or clicking) a button commands the computer" +
+ " to perform some action or answer a question. Common examples of buttons are OK," +
+ " Apply, Cancel, Close, Yes, No, and Help buttons."
Flickable {
id: scrollView
@@ -83,7 +86,6 @@ BaseBoard {
Layout.preferredWidth: Style.hspan(1)
Layout.preferredHeight: Style.vspan(2)
width: Style.hspan(1); height: Style.vspan(2)
- symbol: "widgets_play_track"
Marker { anchors.fill: parent; visible: parent.pressed }
}
@@ -94,11 +96,29 @@ BaseBoard {
Layout.preferredHeight: Style.vspan(3)
width: Style.hspan(3); height: Style.vspan(3)
- symbol: "widgets_play_track"
text: "Hello World"
Marker { anchors.fill: parent; visible: parent.pressed }
}
+
+ Label { width: Style.hspan(8); text: "Regular Button" }
+ Button {
+ id: buttonControl
+ text: qsTr("Button")
+ width: Style.hspan(3)
+
+ onClicked: console.log("Button Clicked!");
+
+ contentItem: Label {
+ text: buttonControl.text
+ font: buttonControl.font
+ opacity: enabled ? 1.0 : 0.3
+ color: buttonControl.down ? "#db9432" : "#ffffff"
+ horizontalAlignment: Label.AlignHCenter
+ verticalAlignment: Label.AlignVCenter
+ elide: Label.ElideRight
+ }
+ }
}
}
}
diff --git a/apps/com.pelagicore.sheets/pages/ColorPage.qml b/apps/com.pelagicore.sheets/boards/ColorBoard.qml
index 10d1f2c..0cc8b20 100644
--- a/apps/com.pelagicore.sheets/pages/ColorPage.qml
+++ b/apps/com.pelagicore.sheets/boards/ColorBoard.qml
@@ -34,8 +34,7 @@ import QtQuick.Controls 2.1
import QtQuick.Layouts 1.1
import QtQuick.Controls.impl 2.1
-
-BasePage {
+BaseBoard {
id: root
description: "Colors used in UI"
diff --git a/apps/com.pelagicore.sheets/pages/ColorButton.qml b/apps/com.pelagicore.sheets/boards/ColorButton.qml
index f0d1acd..f0d1acd 100644
--- a/apps/com.pelagicore.sheets/pages/ColorButton.qml
+++ b/apps/com.pelagicore.sheets/boards/ColorButton.qml
diff --git a/apps/com.pelagicore.sheets/pages/FramePage.qml b/apps/com.pelagicore.sheets/boards/FrameBoard.qml
index 00c2b89..81f45fd 100644
--- a/apps/com.pelagicore.sheets/pages/FramePage.qml
+++ b/apps/com.pelagicore.sheets/boards/FrameBoard.qml
@@ -32,7 +32,7 @@
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.1
-BasePage {
+BaseBoard {
id: root
description: "Frame is used to layout a logical group of controls together within a visual frame."
diff --git a/boards/IconBoard.qml b/apps/com.pelagicore.sheets/boards/IconBoard.qml
index 43755de..ed19eb9 100644
--- a/boards/IconBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/IconBoard.qml
@@ -31,14 +31,14 @@
import QtQuick 2.6
import QtQuick.Layouts 1.0
-
+import QtQuick.Controls 2.0
import controls 1.0
import utils 1.0
BaseBoard {
id: root
- title: "Icon Board"
+ description: "Icon Board"
Grid {
anchors.fill: parent; anchors.margins: Style.padding
diff --git a/apps/com.pelagicore.sheets/pages/ImageButtonPage.qml b/apps/com.pelagicore.sheets/boards/ImageButtonBoard.qml
index 472b8e0..9a301cf 100644
--- a/apps/com.pelagicore.sheets/pages/ImageButtonPage.qml
+++ b/apps/com.pelagicore.sheets/boards/ImageButtonBoard.qml
@@ -33,7 +33,7 @@ import QtQuick 2.8
import controls 1.0
import utils 1.0
-BasePage {
+BaseBoard {
id: root
description: "The image button is a custom widget made as an example. It supports plain text plus and image on the left side."
diff --git a/boards/LabelBoard.qml b/apps/com.pelagicore.sheets/boards/LabelBoard.qml
index 5f69129..a8802d2 100644
--- a/boards/LabelBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/LabelBoard.qml
@@ -31,14 +31,14 @@
import QtQuick 2.6
import QtQuick.Layouts 1.0
-
+import QtQuick.Controls 2.0
import controls 1.0
import utils 1.0
BaseBoard {
id: root
- title: "Label Board"
+ description: "Label Board"
Component.onCompleted: Style.debugMode = true
diff --git a/boards/LetterPickerBoard.qml b/apps/com.pelagicore.sheets/boards/LetterPickerBoard.qml
index 0837eda..0d7790f 100644
--- a/boards/LetterPickerBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/LetterPickerBoard.qml
@@ -35,7 +35,7 @@ import controls 1.0
BaseBoard {
- title: "Letter Picker"
+ description: "Letter Picker"
LetterPicker {
diff --git a/apps/com.pelagicore.sheets/boards/ListItemBoard.qml b/apps/com.pelagicore.sheets/boards/ListItemBoard.qml
new file mode 100644
index 0000000..3e85c5b
--- /dev/null
+++ b/apps/com.pelagicore.sheets/boards/ListItemBoard.qml
@@ -0,0 +1,148 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Neptune IVI UI.
+**
+** $QT_BEGIN_LICENSE:GPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company. For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: GPL-3.0
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import controls 1.0
+import utils 1.0
+
+BaseBoard {
+ width: 800
+
+ description: "List Items"
+
+ Flickable {
+ id: scrollView
+ anchors.fill: parent
+
+ flickableDirection: Flickable.VerticalFlick
+ contentWidth: layout.width;
+ contentHeight: layout.height
+
+ ColumnLayout {
+ id: layout
+ anchors.horizontalCenter: parent.horizontalCenter
+
+ ListViewManager {
+ id: categoryListView
+ width: Style.hspan(6)
+ height: Style.vspan(8)
+ model: 5
+ header: Label {
+ width: parent.width
+ text: "Category List Item"
+ }
+
+ delegate: CategoryListItem {
+ width: Style.hspan(6)
+ height: Style.vspan(3)
+
+ text: "CATEGORY ITEM #" + (index + 1)
+ symbol: "tire_pressure"
+ onClicked: categoryListView.currentIndex = index
+ }
+
+ }
+
+ ListViewManager {
+ id: settingsListView
+ width: Style.hspan(6)
+ height: Style.vspan(8)
+ model: 6
+ header: Label {
+ width: parent.width
+ text: "Settings List Item"
+ }
+
+ delegate: SettingsItemDelegate {
+ width: Style.hspan(6)
+ height: Style.vspan(2)
+ checkable: index%2 === 0 ? true : false
+ text: index%2 === 0 ? "Settings item with check option": "Settings item without check option"
+ icon: "tire_pressure"
+ }
+
+ }
+
+ ListViewManager {
+ id: listView
+ width: Style.hspan(11)
+ height: Style.vspan(8)
+ model: ListModel {
+ ListElement {
+ text: "Normal List Item"
+ }
+ ListElement {
+ text: "Normal List Item"
+ }
+ ListElement {
+ text: "Normal List Item"
+ }
+ ListElement {
+ text: "Normal List Item"
+ }
+ ListElement {
+ text: "Normal List Item"
+ }
+ }
+
+ header: Label {
+ width: parent.width
+ text: "Settings List Item"
+ }
+
+ delegate: ListItem {
+ width: Style.hspan(11)
+ height: Style.vspan(2)
+
+ titleText: "Normal List Item"
+ iconName: Style.symbol("tire_pressure", Style.defaultSymbolSize, false)
+ }
+
+ }
+
+ ListView {
+ model: 10
+ width: Style.hspan(11)
+ height: Style.vspan(8)
+
+ delegate: ItemDelegate {
+ font.pixelSize: 20
+ text: modelData
+ highlighted: ListView.isCurrentItem
+ onClicked: currentIndex = index
+ }
+ }
+ }
+ }
+
+}
diff --git a/apps/com.pelagicore.sheets/pages/PanePage.qml b/apps/com.pelagicore.sheets/boards/PaneBoard.qml
index e96cb4d..ba15535 100644
--- a/apps/com.pelagicore.sheets/pages/PanePage.qml
+++ b/apps/com.pelagicore.sheets/boards/PaneBoard.qml
@@ -32,7 +32,7 @@
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.1
-BasePage {
+BaseBoard {
id: root
description: "Pane provides a background color that matches with the application style" +
diff --git a/boards/SliderBoard.qml b/apps/com.pelagicore.sheets/boards/SliderBoard.qml
index 1f38126..d4edfaf 100644
--- a/boards/SliderBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/SliderBoard.qml
@@ -30,6 +30,7 @@
****************************************************************************/
import QtQuick 2.0
+import QtQuick.Controls 2.0
import utils 1.0
import controls 1.0
diff --git a/boards/StyleBoard.qml b/apps/com.pelagicore.sheets/boards/StyleBoard.qml
index 72095d0..c5a388f 100644
--- a/boards/StyleBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/StyleBoard.qml
@@ -31,13 +31,13 @@
import QtQuick 2.0
import QtQuick.Layouts 1.0
-
+import QtQuick.Controls 2.0
import controls 1.0
import utils 1.0
BaseBoard {
id: root
- title: 'Style Board'
+ description: 'Style Board'
GridLayout {
anchors.fill: parent
diff --git a/boards/SwitchBoard.qml b/apps/com.pelagicore.sheets/boards/SwitchBoard.qml
index 4ae9ee4..f59baa6 100644
--- a/boards/SwitchBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/SwitchBoard.qml
@@ -37,8 +37,7 @@ import utils 1.0
BaseBoard {
id: root
- title: 'Switch Board'
- color: "#666"
+ description: 'Switch Board'
GridLayout {
anchors.fill: parent; anchors.margins: Style.padding
diff --git a/apps/com.pelagicore.sheets/pages/SwitchDelegatePage.qml b/apps/com.pelagicore.sheets/boards/SwitchDelegateBoard.qml
index 3185de8..23ff913 100644
--- a/apps/com.pelagicore.sheets/pages/SwitchDelegatePage.qml
+++ b/apps/com.pelagicore.sheets/boards/SwitchDelegateBoard.qml
@@ -32,7 +32,7 @@
import QtQuick 2.8
import QtQuick.Controls 2.1
-BasePage {
+BaseBoard {
id: root
description: "A Switch is a toggle button that can be switched on (checked) or off (unchecked)."
diff --git a/boards/TabBoard.qml b/apps/com.pelagicore.sheets/boards/TabBoard.qml
index 171ed45..5ae709b 100644
--- a/boards/TabBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/TabBoard.qml
@@ -31,16 +31,15 @@
import QtQuick 2.6
import QtQuick.Layouts 1.0
-
+import QtQuick.Controls 2.0
import controls 1.0
import utils 1.0
-import QtQuick.Controls 2.0
BaseBoard {
id: root
- title: "Tab Board"
+ description: "Tab Board"
DisplayBackground {
anchors.fill: parent
diff --git a/boards/TemperatureSliderBoard.qml b/apps/com.pelagicore.sheets/boards/TemperatureSliderBoard.qml
index e236ec6..f1fa911 100644
--- a/boards/TemperatureSliderBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/TemperatureSliderBoard.qml
@@ -39,7 +39,7 @@ import utils 1.0
BaseBoard {
id: root
- title: "Label Board"
+ description: "Label Board"
Row {
diff --git a/apps/com.pelagicore.sheets/pages/TextFieldPage.qml b/apps/com.pelagicore.sheets/boards/TextFieldBoard.qml
index 8c4f868..f8b72cf 100644
--- a/apps/com.pelagicore.sheets/pages/TextFieldPage.qml
+++ b/apps/com.pelagicore.sheets/boards/TextFieldBoard.qml
@@ -31,7 +31,7 @@
import QtQuick.Controls 2.1
-BasePage {
+BaseBoard {
id: root
description: "Displays a single line of editable plain text."
diff --git a/boards/ToolBoard.qml b/apps/com.pelagicore.sheets/boards/ToolBoard.qml
index e5020d2..b79afb1 100644
--- a/boards/ToolBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/ToolBoard.qml
@@ -30,17 +30,17 @@
****************************************************************************/
import QtQuick 2.6
-
+import QtQuick.Controls 2.0
import controls 1.0
import utils 1.0
BaseBoard {
- title: "Tool Board"
+ description: "Tool Board"
Column {
- anchors.centerIn: parent
- spacing: 50
+ anchors.horizontalCenter: parent.horizontalCenter
+ spacing: 30
Tool {
symbol: "music"
diff --git a/apps/com.pelagicore.sheets/pages/ToolButtonPage.qml b/apps/com.pelagicore.sheets/boards/ToolButtonBoard.qml
index 7b9f04c..491c6c5 100644
--- a/apps/com.pelagicore.sheets/pages/ToolButtonPage.qml
+++ b/apps/com.pelagicore.sheets/boards/ToolButtonBoard.qml
@@ -33,7 +33,7 @@ import QtQuick 2.8
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.1
-BasePage {
+BaseBoard {
id: root
description: "Provides a button type that is typically used within a ToolBar."
diff --git a/boards/VolumeSliderBoard.qml b/apps/com.pelagicore.sheets/boards/VolumeSliderBoard.qml
index 21bd716..37112ec 100644
--- a/boards/VolumeSliderBoard.qml
+++ b/apps/com.pelagicore.sheets/boards/VolumeSliderBoard.qml
@@ -30,24 +30,24 @@
****************************************************************************/
import QtQuick 2.0
+import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import controls 1.0
+import utils 1.0
BaseBoard {
- title: 'Volume Board'
- color: "#333"
+
+ description: 'Volume Board'
ColumnLayout {
- anchors.horizontalCenter: parent.horizontalCenter
VolumeSlider {
value: 0.0
- Layout.fillWidth: true
}
VolumeSlider {
value: 0.5
- Layout.fillWidth: true
}
- VolumeSlider { value: 1.0 }
+ VolumeSlider {
+ value: 1.0
+ }
}
-
}
diff --git a/apps/com.pelagicore.sheets/pages/WelcomePage.qml b/apps/com.pelagicore.sheets/boards/WelcomePage.qml
index 5455922..fb0a00a 100644
--- a/apps/com.pelagicore.sheets/pages/WelcomePage.qml
+++ b/apps/com.pelagicore.sheets/boards/WelcomePage.qml
@@ -29,8 +29,7 @@
**
****************************************************************************/
-BasePage {
- id: root
+BaseBoard {
description: "Welcome to the widgets gallery of NEPTUNE UI!"
}
diff --git a/apps/com.pelagicore.sheets/pages/BasePage.qml b/apps/com.pelagicore.sheets/pages/BasePage.qml
deleted file mode 100644
index 8448e38..0000000
--- a/apps/com.pelagicore.sheets/pages/BasePage.qml
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Neptune IVI UI.
-**
-** $QT_BEGIN_LICENSE:GPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite licenses may use
-** this file in accordance with the commercial license agreement provided
-** with the Software or, alternatively, in accordance with the terms
-** contained in a written agreement between you and The Qt Company. For
-** licensing terms and conditions see https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: GPL-3.0
-**
-****************************************************************************/
-
-import QtQuick.Controls 2.1
-
-Page {
- id: root
- property alias description: label.text
-
- header: Label {
- id: label
- padding: 20
- wrapMode: Label.Wrap
- font.pixelSize: 20
- }
-}
diff --git a/apps/com.pelagicore.sheets/pages/ButtonPage.qml b/apps/com.pelagicore.sheets/pages/ButtonPage.qml
deleted file mode 100644
index e43c703..0000000
--- a/apps/com.pelagicore.sheets/pages/ButtonPage.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Neptune IVI UI.
-**
-** $QT_BEGIN_LICENSE:GPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite licenses may use
-** this file in accordance with the commercial license agreement provided
-** with the Software or, alternatively, in accordance with the terms
-** contained in a written agreement between you and The Qt Company. For
-** licensing terms and conditions see https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: GPL-3.0
-**
-****************************************************************************/
-
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.1
-
-BasePage {
- id: root
-
- description: " The push button is perhaps the most commonly used widget in any" +
- " graphical user interface. Pushing (or clicking) a button commands the computer" +
- " to perform some action or answer a question. Common examples of buttons are OK," +
- " Apply, Cancel, Close, Yes, No, and Help buttons."
-
- Button {
- id: buttonControl
- text: qsTr("Button")
- width: 100
- anchors.top: parent.top
- anchors.topMargin: 150
- anchors.horizontalCenter: parent.horizontalCenter
-
- onClicked: console.log("Button Clicked!");
-
- contentItem: Label {
- text: buttonControl.text
- font: buttonControl.font
- opacity: enabled ? 1.0 : 0.3
- color: buttonControl.down ? "#db9432" : "#ffffff"
- horizontalAlignment: Label.AlignHCenter
- verticalAlignment: Label.AlignVCenter
- elide: Label.ElideRight
- }
- }
-}
diff --git a/apps/com.pelagicore.sheets/pages/ItemDelegatePage.qml b/apps/com.pelagicore.sheets/pages/ItemDelegatePage.qml
deleted file mode 100644
index 6627736..0000000
--- a/apps/com.pelagicore.sheets/pages/ItemDelegatePage.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Neptune IVI UI.
-**
-** $QT_BEGIN_LICENSE:GPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite licenses may use
-** this file in accordance with the commercial license agreement provided
-** with the Software or, alternatively, in accordance with the terms
-** contained in a written agreement between you and The Qt Company. For
-** licensing terms and conditions see https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: GPL-3.0
-**
-****************************************************************************/
-
-import QtQuick 2.8
-import QtQuick.Controls 2.1
-
-BasePage {
- id: root
-
- description: "Item delegate with a switch indicator that can be toggled on or off."
-
- ListView {
- id: listView
- model: 10
- width: 120
- height: 900
- anchors.top: parent.top
- anchors.topMargin: 50
- anchors.horizontalCenter: parent.horizontalCenter
- delegate: ItemDelegate {
- font.pixelSize: 20
- text: modelData
- highlighted: ListView.isCurrentItem
- onClicked: listView.currentIndex = index
- }
- }
-}
diff --git a/apps/com.pelagicore.sheets/pages/LabelPage.qml b/apps/com.pelagicore.sheets/pages/LabelPage.qml
deleted file mode 100644
index 45e6147..0000000
--- a/apps/com.pelagicore.sheets/pages/LabelPage.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Neptune IVI UI.
-**
-** $QT_BEGIN_LICENSE:GPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite licenses may use
-** this file in accordance with the commercial license agreement provided
-** with the Software or, alternatively, in accordance with the terms
-** contained in a written agreement between you and The Qt Company. For
-** licensing terms and conditions see https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: GPL-3.0
-**
-****************************************************************************/
-
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.1
-
-BasePage {
- id: root
-
- description: "In addition to the normal Text type, Label follows the font and color" +
- " scheme of the system. "
-
- Frame {
- anchors.top: parent.top
- anchors.topMargin: 50
- anchors.horizontalCenter: parent.horizontalCenter
- ColumnLayout {
- Label {
- text: "Hello world"
- }
- Label {
- text: "Hello world"
- font.pixelSize: 22
- font.italic: true
- color: "steelblue"
- }
- }
- }
-}
diff --git a/apps/com.pelagicore.sheets/pages/SliderPage.qml b/apps/com.pelagicore.sheets/pages/SliderPage.qml
deleted file mode 100644
index 799dc31..0000000
--- a/apps/com.pelagicore.sheets/pages/SliderPage.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Neptune IVI UI.
-**
-** $QT_BEGIN_LICENSE:GPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite licenses may use
-** this file in accordance with the commercial license agreement provided
-** with the Software or, alternatively, in accordance with the terms
-** contained in a written agreement between you and The Qt Company. For
-** licensing terms and conditions see https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: GPL-3.0
-**
-****************************************************************************/
-
-import QtQuick.Controls 2.1
-
-BasePage {
- id: root
-
- description: "Provides a vertical or horizontal slider control."
-
- Slider {
- width: 300
- height: 50
- anchors.top: parent.top
- anchors.topMargin: 50
- anchors.horizontalCenter: parent.horizontalCenter
- }
-}
diff --git a/apps/com.pelagicore.sheets/pages/SwitchPage.qml b/apps/com.pelagicore.sheets/pages/SwitchPage.qml
deleted file mode 100644
index e2eca9a..0000000
--- a/apps/com.pelagicore.sheets/pages/SwitchPage.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Neptune IVI UI.
-**
-** $QT_BEGIN_LICENSE:GPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite licenses may use
-** this file in accordance with the commercial license agreement provided
-** with the Software or, alternatively, in accordance with the terms
-** contained in a written agreement between you and The Qt Company. For
-** licensing terms and conditions see https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: GPL-3.0
-**
-****************************************************************************/
-
-import QtQuick.Controls 2.1
-
-BasePage {
- id: root
- anchors.fill: parent
-
- description: "A Switch is a toggle button that can be switched on (checked) or off (unchecked)."
-
- Switch {
- id: checkedSwitch
- anchors.top: parent.top
- anchors.topMargin: 50
- anchors.horizontalCenter: parent.horizontalCenter
- checked: true
- }
- Switch {
- id: uncheckedSwitch
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: checkedSwitch.bottom
- anchors.topMargin: 20
- }
-}
diff --git a/boards/ListItemBoard.qml b/boards/ListItemBoard.qml
deleted file mode 100644
index a0096ca..0000000
--- a/boards/ListItemBoard.qml
+++ /dev/null
@@ -1,123 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Neptune IVI UI.
-**
-** $QT_BEGIN_LICENSE:GPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite licenses may use
-** this file in accordance with the commercial license agreement provided
-** with the Software or, alternatively, in accordance with the terms
-** contained in a written agreement between you and The Qt Company. For
-** licensing terms and conditions see https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: GPL-3.0
-**
-****************************************************************************/
-
-import QtQuick 2.6
-
-import controls 1.0
-import utils 1.0
-
-BaseBoard {
- width: 800
-
- title: "List Items"
-
- ListViewManager {
- id: categoryListView
- width: 300
- height: parent.height/3
- model: 5
- header: Label {
- width: parent.width
- text: "Category List Item"
- }
-
- delegate: CategoryListItem {
- width: 300
- height: Style.vspan(3)
-
- text: "CATEGORY ITEM #" + (index + 1)
- symbol: "tire_pressure"
- onClicked: categoryListView.currentIndex = index
- }
-
- }
-
- ListViewManager {
- id: settingsListView
- anchors.top: categoryListView.bottom
- width: parent.width
- height: parent.height/3
- model: 6
- header: Label {
- width: parent.width
- text: "Settings List Item"
- }
-
- delegate: SettingsItemDelegate {
- width: Style.hspan(6)
- height: Style.vspan(2)
- checkable: index%2 === 0 ? true : false
- text: index%2 === 0 ? "Settings item with check option": "Settings item without check option"
- icon: "tire_pressure"
- }
-
- }
-
- ListViewManager {
- id: listView
- anchors.top: settingsListView.bottom
- width: Style.hspan(11)
- height: parent.height/3
- model: ListModel {
- ListElement {
- text: "Normal List Item"
- }
- ListElement {
- text: "Normal List Item"
- }
- ListElement {
- text: "Normal List Item"
- }
- ListElement {
- text: "Normal List Item"
- }
- ListElement {
- text: "Normal List Item"
- }
- }
-
- scrollVisible: true
- header: Label {
- width: parent.width
- text: "Settings List Item"
- }
-
- delegate: ListItem {
- width: Style.hspan(11)
- height: Style.vspan(2)
-
- titleText: "Normal List Item"
- iconName: Style.symbol("tire_pressure", Style.defaultSymbolSize, false)
- }
-
- }
-
-}
diff --git a/boards/TextFieldBoard.qml b/boards/TextFieldBoard.qml
deleted file mode 100644
index 32bdfd3..0000000
--- a/boards/TextFieldBoard.qml
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Neptune IVI UI.
-**
-** $QT_BEGIN_LICENSE:GPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite licenses may use
-** this file in accordance with the commercial license agreement provided
-** with the Software or, alternatively, in accordance with the terms
-** contained in a written agreement between you and The Qt Company. For
-** licensing terms and conditions see https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: GPL-3.0
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import controls 1.0
-import utils 1.0
-
-BaseBoard {
-
- title: "Text Field Board"
-
- Column {
- anchors.centerIn: parent
-
- TextField {
- hintText: "Hint Text"
- }
-
- TextField {
- text: "Real Text"
- }
-
- TextTool {
- text: "Text Tool"
- name: "music"
- }
- }
-}
diff --git a/boards/WebBrowserBoard.qml b/boards/WebBrowserBoard.qml
deleted file mode 100644
index 2dbf006..0000000
--- a/boards/WebBrowserBoard.qml
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Neptune IVI UI.
-**
-** $QT_BEGIN_LICENSE:GPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite licenses may use
-** this file in accordance with the commercial license agreement provided
-** with the Software or, alternatively, in accordance with the terms
-** contained in a written agreement between you and The Qt Company. For
-** licensing terms and conditions see https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: GPL-3.0
-**
-****************************************************************************/
-
-import QtQuick 2.6
-import QtQuick.Layouts 1.0
-
-import controls 1.0
-import utils 1.0
-
-BaseBoard {
- id: root
-
- width: Style.hspan(20)
- height: Style.vspan(12)
-
- title: "WebBrowser Board"
-
- color: "darkgray"
-
- WebBrowser {
- anchors.fill: parent
- url: ""
- }
-}