From eec09310a77092eeb51fca6b0f1222ef6de1a9ac Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 7 May 2021 18:59:01 +0200 Subject: [PATCH] Fix license check --- examples/iot-dashboard/main.60 | 57 ++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/examples/iot-dashboard/main.60 b/examples/iot-dashboard/main.60 index f11b11308..f697fa9fb 100644 --- a/examples/iot-dashboard/main.60 +++ b/examples/iot-dashboard/main.60 @@ -1,3 +1,49 @@ +/* LICENSE BEGIN + This file is part of the SixtyFPS Project -- https://sixtyfps.io + Copyright (c) 2020 Olivier Goffart + Copyright (c) 2020 Simon Hausmann + + SPDX-License-Identifier: GPL-3.0-only + This file is also available under commercial licensing terms. + Please contact info@sixtyfps.io for more information. +LICENSE END */ + +/* + The design from this file is inspired from the design in + https://github.com/peter-ha/qskinny/tree/iot-dashboard/examples/iot-dashboard + Original license: +/**************************************************************************** +** +** Copyright 2021 Edelhirsch Software GmbH. All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of the copyright holder nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** +****************************************************************************/ +*/ struct Palette := { menuBar : brush, @@ -275,6 +321,13 @@ UsageDiagram := Box { Rectangle {} } +// From LightIntensity.cpp +// ## FIXME +LightIntensity := Box { + title: "Light intensity"; + Rectangle {} +} + MainContent := VerticalLayout { spacing: 24px; TopBar { } @@ -302,9 +355,9 @@ MainContent := VerticalLayout { row: 2; col: 0; colspan: 2; } - /*LightIntensity { + LightIntensity { row: 2; col: 2; - }*/ + } } }