diff options
author | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2016-01-21 14:24:11 +0100 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2016-02-18 15:56:45 +0000 |
commit | 92bb87e3dde3016bbc08e04757be3227753a6454 (patch) | |
tree | 02d9c5fb0c2749f2e1143435b2cb93f3895aa1b1 /boards | |
parent | b3f10d156349727310ec30b27d01e639cce4f570 (diff) | |
download | neptune-ui-92bb87e3dde3016bbc08e04757be3227753a6454.tar.gz |
Demo updates
Since the Neptune was used in recent demos for CES 2016, some offline changes
were made and now they are pushed upstream. Changes:
- new layout for Music application
- unit conversion, metric to imp US
- other UI improvements.
Change-Id: I202eb88c382e840990b988d03e22d3b9f0d67fc1
Reviewed-by: Juergen Bocklage-Ryannel <juergen.bocklage-ryannel@pelagicore.com>
Diffstat (limited to 'boards')
-rw-r--r-- | boards/AppButtonBoard.qml | 2 | ||||
-rw-r--r-- | boards/AssetsBoard.qml | 2 | ||||
-rw-r--r-- | boards/BaseBoard.qml | 2 | ||||
-rw-r--r-- | boards/ButtonBoard.qml | 2 | ||||
-rw-r--r-- | boards/IconBoard.qml | 2 | ||||
-rw-r--r-- | boards/LabelBoard.qml | 2 | ||||
-rw-r--r-- | boards/LetterPickerBoard.qml | 43 | ||||
-rw-r--r-- | boards/ListItemBoard.qml | 2 | ||||
-rw-r--r-- | boards/SliderBoard.qml | 2 | ||||
-rw-r--r-- | boards/StyleBoard.qml | 2 | ||||
-rw-r--r-- | boards/SwitchBoard.qml | 2 | ||||
-rw-r--r-- | boards/TabBoard.qml | 2 | ||||
-rw-r--r-- | boards/TemperatureSliderBoard.qml | 2 | ||||
-rw-r--r-- | boards/TextFieldBoard.qml | 2 | ||||
-rw-r--r-- | boards/ToolBoard.qml | 2 | ||||
-rw-r--r-- | boards/VolumeSliderBoard.qml | 2 | ||||
-rw-r--r-- | boards/WebBrowserBoard.qml | 2 |
17 files changed, 59 insertions, 16 deletions
diff --git a/boards/AppButtonBoard.qml b/boards/AppButtonBoard.qml index 82542fc..9e0388e 100644 --- a/boards/AppButtonBoard.qml +++ b/boards/AppButtonBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/AssetsBoard.qml b/boards/AssetsBoard.qml index 332c299..f79c033 100644 --- a/boards/AssetsBoard.qml +++ b/boards/AssetsBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/BaseBoard.qml b/boards/BaseBoard.qml index 64ea20f..7604d68 100644 --- a/boards/BaseBoard.qml +++ b/boards/BaseBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/ButtonBoard.qml b/boards/ButtonBoard.qml index 9be033b..607394f 100644 --- a/boards/ButtonBoard.qml +++ b/boards/ButtonBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/IconBoard.qml b/boards/IconBoard.qml index c818913..89ff569 100644 --- a/boards/IconBoard.qml +++ b/boards/IconBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/LabelBoard.qml b/boards/LabelBoard.qml index 032c0f0..118003e 100644 --- a/boards/LabelBoard.qml +++ b/boards/LabelBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/LetterPickerBoard.qml b/boards/LetterPickerBoard.qml new file mode 100644 index 0000000..9ebd8c1 --- /dev/null +++ b/boards/LetterPickerBoard.qml @@ -0,0 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Pelagicore AG +** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** +** This file is part of the Neptune IVI UI. +** +** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** Commercial License Usage +** Licensees holding valid commercial Pelagicore Neptune IVI UI +** 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 +** Pelagicore. For licensing terms and conditions, contact us at: +** http://www.pelagicore.com. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3 requirements will be +** met: http://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +** SPDX-License-Identifier: GPL-3.0 +** +****************************************************************************/ + +import QtQuick 2.0 +import utils 1.0 +import controls 1.0 + +BaseBoard { + + title: "Letter Picker" + + LetterPicker { + + } +} + diff --git a/boards/ListItemBoard.qml b/boards/ListItemBoard.qml index 786cea3..209bd32 100644 --- a/boards/ListItemBoard.qml +++ b/boards/ListItemBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/SliderBoard.qml b/boards/SliderBoard.qml index b7ef9ea..6c531e7 100644 --- a/boards/SliderBoard.qml +++ b/boards/SliderBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/StyleBoard.qml b/boards/StyleBoard.qml index 2976db4..ef54d47 100644 --- a/boards/StyleBoard.qml +++ b/boards/StyleBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/SwitchBoard.qml b/boards/SwitchBoard.qml index 7906fd4..f1348af 100644 --- a/boards/SwitchBoard.qml +++ b/boards/SwitchBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/TabBoard.qml b/boards/TabBoard.qml index b9e7111..e643118 100644 --- a/boards/TabBoard.qml +++ b/boards/TabBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/TemperatureSliderBoard.qml b/boards/TemperatureSliderBoard.qml index 171c04f..6295b32 100644 --- a/boards/TemperatureSliderBoard.qml +++ b/boards/TemperatureSliderBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/TextFieldBoard.qml b/boards/TextFieldBoard.qml index da353f3..409eecc 100644 --- a/boards/TextFieldBoard.qml +++ b/boards/TextFieldBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/ToolBoard.qml b/boards/ToolBoard.qml index fa1fb87..8d11701 100644 --- a/boards/ToolBoard.qml +++ b/boards/ToolBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/VolumeSliderBoard.qml b/boards/VolumeSliderBoard.qml index a852421..62c0ea6 100644 --- a/boards/VolumeSliderBoard.qml +++ b/boards/VolumeSliderBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. diff --git a/boards/WebBrowserBoard.qml b/boards/WebBrowserBoard.qml index 812cb46..5078bf8 100644 --- a/boards/WebBrowserBoard.qml +++ b/boards/WebBrowserBoard.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the Neptune IVI UI. |