diff options
Diffstat (limited to 'basicsuite')
25 files changed, 265 insertions, 49 deletions
diff --git a/basicsuite/basicsuite.pro b/basicsuite/basicsuite.pro index e8954f1..bc391f4 100644 --- a/basicsuite/basicsuite.pro +++ b/basicsuite/basicsuite.pro @@ -6,7 +6,3 @@ qtHaveModule(multimedia) { SUBDIRS += \ camera } - -qtHaveModule(datavisualization) { - SUBDIRS += enterprise-qtdatavis3d -} diff --git a/basicsuite/canvas3d-planets/canvas3d-planets.pro b/basicsuite/canvas3d-planets/canvas3d-planets.pro new file mode 100644 index 0000000..c3c3ff5 --- /dev/null +++ b/basicsuite/canvas3d-planets/canvas3d-planets.pro @@ -0,0 +1,15 @@ +TARGET = canvas3d-planets + +include(../shared/shared.pri) +b2qtdemo_deploy_defaults() + +content.files = \ + *.qml \ + *.js \ + images + +content.path = $$DESTPATH + +OTHER_FILES += $${content.files} + +INSTALLS += target content diff --git a/basicsuite/canvas3d-planets/description.txt b/basicsuite/canvas3d-planets/description.txt new file mode 100644 index 0000000..18beb91 --- /dev/null +++ b/basicsuite/canvas3d-planets/description.txt @@ -0,0 +1 @@ +The Planets example showcases Qt Canvas 3D. This demo combines WebGL code and three.js with QML and Qt Quick Controls. diff --git a/basicsuite/canvas3d-planets/exclude.txt b/basicsuite/canvas3d-planets/exclude.txt new file mode 100644 index 0000000..95b02e4 --- /dev/null +++ b/basicsuite/canvas3d-planets/exclude.txt @@ -0,0 +1,4 @@ +linux-raspberrypi +linux-beaglebone +android-beaglebone +linux-colibri-vf diff --git a/basicsuite/canvas3d-planets/main.qml b/basicsuite/canvas3d-planets/main.qml new file mode 100644 index 0000000..a8f6e25 --- /dev/null +++ b/basicsuite/canvas3d-planets/main.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +Loader { + source: "planets.qml" +} diff --git a/basicsuite/canvas3d-planets/preview_l.jpg b/basicsuite/canvas3d-planets/preview_l.jpg Binary files differnew file mode 100644 index 0000000..e7222d6 --- /dev/null +++ b/basicsuite/canvas3d-planets/preview_l.jpg diff --git a/basicsuite/canvas3d-planets/title.txt b/basicsuite/canvas3d-planets/title.txt new file mode 100644 index 0000000..855cad6 --- /dev/null +++ b/basicsuite/canvas3d-planets/title.txt @@ -0,0 +1 @@ +080. Qt Canvas3D - Planets diff --git a/basicsuite/enterprise-dashboard/description.txt b/basicsuite/enterprise-dashboard/description.txt index dcf2b94..2e5780a 100644 --- a/basicsuite/enterprise-dashboard/description.txt +++ b/basicsuite/enterprise-dashboard/description.txt @@ -1 +1 @@ -The dashboard demo uses Qt Quick Enterprise Controls to create a digital dashboard for a car. +The dashboard demo uses Qt Quick Extras to create a digital dashboard for a car. diff --git a/basicsuite/enterprise-dashboard/title.txt b/basicsuite/enterprise-dashboard/title.txt index 443fdd7..0cecefb 100644 --- a/basicsuite/enterprise-dashboard/title.txt +++ b/basicsuite/enterprise-dashboard/title.txt @@ -1 +1 @@ -060. Qt Quick Enterprise Controls - Dashboard +060. Qt Quick Extras Dashboard diff --git a/basicsuite/enterprise-flat-controls/description.txt b/basicsuite/enterprise-flat-controls/description.txt index 81038e7..98b01e5 100644 --- a/basicsuite/enterprise-flat-controls/description.txt +++ b/basicsuite/enterprise-flat-controls/description.txt @@ -1 +1 @@ -The Flat Style Gallery example showcases the Qt Quick Controls. This demo combines both the standard Qt Quick Controls as well as the Qt Quick Enterprise Controls both of which are using the new Flat style. The Flat style for Qt Quick Controls has a modern look and feel and is perfect for the touch driven interfaces commonly developed by device creators. +The Flat Style Gallery example showcases the Qt Quick Controls. This demo combines both the standard Qt Quick Controls as well as the Qt Quick Extras both of which are using the new Flat style. The Flat style for Qt Quick Controls has a modern look and feel and is perfect for the touch driven interfaces commonly developed by device creators. diff --git a/basicsuite/enterprise-gallery/description.txt b/basicsuite/enterprise-gallery/description.txt index 93b45f6..b7f1d75 100644 --- a/basicsuite/enterprise-gallery/description.txt +++ b/basicsuite/enterprise-gallery/description.txt @@ -1,3 +1,3 @@ -The Gallery example showcases Qt Quick Enterprise Controls. These controls are developed based on the input and feedback coming directly from Qt Enterprise Embedded customers. +The Gallery example showcases Qt Quick Extras. These controls are developed based on the input and feedback coming directly from Qt Enterprise Embedded customers. Each control can be customized and styled through the API. We have included a small subset of these customization options in the gallery example, which you can explore and interact with under the "cog" or "gear" icon on the lower right corner of each control's page. diff --git a/basicsuite/enterprise-gallery/exclude.txt b/basicsuite/enterprise-gallery/exclude.txt deleted file mode 100644 index 0702cb5..0000000 --- a/basicsuite/enterprise-gallery/exclude.txt +++ /dev/null @@ -1 +0,0 @@ -all diff --git a/basicsuite/enterprise-gallery/title.txt b/basicsuite/enterprise-gallery/title.txt index 00ece55..da88dee 100644 --- a/basicsuite/enterprise-gallery/title.txt +++ b/basicsuite/enterprise-gallery/title.txt @@ -1 +1 @@ -070. Qt Quick Enterprise Controls - Gallery +070. Qt Quick Extras - Gallery diff --git a/basicsuite/launchersettings/WifiNetworkList.qml b/basicsuite/launchersettings/WifiNetworkList.qml index 80acaa5..b30d230 100644 --- a/basicsuite/launchersettings/WifiNetworkList.qml +++ b/basicsuite/launchersettings/WifiNetworkList.qml @@ -103,26 +103,17 @@ Item { font.italic: true } - Rectangle { + ProgressBar { id: signalStrengthBar height: engine.mm(3) - radius: 20 - antialiasing: true + width: networkBox.width * 0.5 anchors.margins: engine.mm(2) anchors.right: parent.right anchors.top: parent.top - color: "#BF8888" - border.color: "#212126" - // ### TODO - Qt Wifi library should provide alternative methods - // of describing signal strength besides dBm. - property int strengthBarWidth: Math.max(100 + signalStrength, 0) / 100 * parent.width - onStrengthBarWidthChanged: { - if (strengthBarWidth > parent.width * 0.55) - signalStrengthBar.width = parent.width * 0.55 - else - signalStrengthBar.width = strengthBarWidth - } - + minimumValue: 0 + maximumValue: 100 + property int level: signalStrength + onLevelChanged: signalStrengthBar.value = level } MouseArea { diff --git a/basicsuite/launchersettings/preview_l.jpg b/basicsuite/launchersettings/preview_l.jpg Binary files differindex a5496b0..f4d34b5 100644 --- a/basicsuite/launchersettings/preview_l.jpg +++ b/basicsuite/launchersettings/preview_l.jpg diff --git a/basicsuite/webengine/content/common/ddg.png b/basicsuite/webengine/content/common/ddg.png Binary files differnew file mode 100644 index 0000000..06ebe7c --- /dev/null +++ b/basicsuite/webengine/content/common/ddg.png diff --git a/basicsuite/webengine/content/common/open-sans.css b/basicsuite/webengine/content/common/open-sans.css new file mode 100644 index 0000000..6342492 --- /dev/null +++ b/basicsuite/webengine/content/common/open-sans.css @@ -0,0 +1,131 @@ +/* Open Sans @font-face kit */ + +/* BEGIN Light */ +@font-face { + font-family: 'Open Sans'; + src: url('opensans/Light/OpenSans-Light.eot'); + src: url('opensans/Light/OpenSans-Light.eot?#iefix') format('embedded-opentype'), + url('opensans/Light/OpenSans-Light.woff') format('woff'), + url('opensans/Light/OpenSans-Light.ttf') format('truetype'), + url('opensans/Light/OpenSans-Light.svg#OpenSansLight') format('svg'); + font-weight: 300; + font-style: normal; +} +/* END Light */ + +/* BEGIN Light Italic */ +@font-face { + font-family: 'Open Sans'; + src: url('opensans/LightItalic/OpenSans-LightItalic.eot'); + src: url('opensans/LightItalic/OpenSans-LightItalic.eot?#iefix') format('embedded-opentype'), + url('opensans/LightItalic/OpenSans-LightItalic.woff') format('woff'), + url('opensans/LightItalic/OpenSans-LightItalic.ttf') format('truetype'), + url('opensans/LightItalic/OpenSans-LightItalic.svg#OpenSansLightItalic') format('svg'); + font-weight: 300; + font-style: italic; +} +/* END Light Italic */ + +/* BEGIN Regular */ +@font-face { + font-family: 'Open Sans'; + src: url('opensans/Regular/OpenSans-Regular.eot'); + src: url('opensans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), + url('opensans/Regular/OpenSans-Regular.woff') format('woff'), + url('opensans/Regular/OpenSans-Regular.ttf') format('truetype'), + url('opensans/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg'); + font-weight: normal; + font-style: normal; +} +/* END Regular */ + +/* BEGIN Italic */ +@font-face { + font-family: 'Open Sans'; + src: url('opensans/Italic/OpenSans-Italic.eot'); + src: url('opensans/Italic/OpenSans-Italic.eot?#iefix') format('embedded-opentype'), + url('opensans/Italic/OpenSans-Italic.woff') format('woff'), + url('opensans/Italic/OpenSans-Italic.ttf') format('truetype'), + url('opensans/Italic/OpenSans-Italic.svg#OpenSansItalic') format('svg'); + font-weight: normal; + font-style: italic; +} +/* END Italic */ + +/* BEGIN Semibold */ +@font-face { + font-family: 'Open Sans'; + src: url('opensans/Semibold/OpenSans-Semibold.eot'); + src: url('opensans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), + url('opensans/Semibold/OpenSans-Semibold.woff') format('woff'), + url('opensans/Semibold/OpenSans-Semibold.ttf') format('truetype'), + url('opensans/Semibold/OpenSans-Semibold.svg#OpenSansSemibold') format('svg'); + font-weight: 600; + font-style: normal; +} +/* END Semibold */ + +/* BEGIN Semibold Italic */ +@font-face { + font-family: 'Open Sans'; + src: url('opensans/SemiboldItalic/OpenSans-SemiboldItalic.eot'); + src: url('opensans/SemiboldItalic/OpenSans-SemiboldItalic.eot?#iefix') format('embedded-opentype'), + url('opensans/SemiboldItalic/OpenSans-SemiboldItalic.woff') format('woff'), + url('opensans/SemiboldItalic/OpenSans-SemiboldItalic.ttf') format('truetype'), + url('opensans/SemiboldItalic/OpenSans-SemiboldItalic.svg#OpenSansSemiboldItalic') format('svg'); + font-weight: 600; + font-style: italic; +} +/* END Semibold Italic */ + +/* BEGIN Bold */ +@font-face { + font-family: 'Open Sans'; + src: url('opensans/Bold/OpenSans-Bold.eot'); + src: url('opensans/Bold/OpenSans-Bold.eot?#iefix') format('embedded-opentype'), + url('opensans/Bold/OpenSans-Bold.woff') format('woff'), + url('opensans/Bold/OpenSans-Bold.ttf') format('truetype'), + url('opensans/Bold/OpenSans-Bold.svg#OpenSansBold') format('svg'); + font-weight: bold; + font-style: normal; +} +/* END Bold */ + +/* BEGIN Bold Italic */ +@font-face { + font-family: 'Open Sans'; + src: url('opensans/BoldItalic/OpenSans-BoldItalic.eot'); + src: url('opensans/BoldItalic/OpenSans-BoldItalic.eot?#iefix') format('embedded-opentype'), + url('opensans/BoldItalic/OpenSans-BoldItalic.woff') format('woff'), + url('opensans/BoldItalic/OpenSans-BoldItalic.ttf') format('truetype'), + url('opensans/BoldItalic/OpenSans-BoldItalic.svg#OpenSansBoldItalic') format('svg'); + font-weight: bold; + font-style: italic; +} +/* END Bold Italic */ + +/* BEGIN Extrabold */ +@font-face { + font-family: 'Open Sans'; + src: url('opensans/ExtraBold/OpenSans-ExtraBold.eot'); + src: url('opensans/ExtraBold/OpenSans-ExtraBold.eot?#iefix') format('embedded-opentype'), + url('opensans/ExtraBold/OpenSans-ExtraBold.woff') format('woff'), + url('opensans/ExtraBold/OpenSans-ExtraBold.ttf') format('truetype'), + url('opensans/ExtraBold/OpenSans-ExtraBold.svg#OpenSansExtrabold') format('svg'); + font-weight: 800; + font-style: normal; +} +/* END Extrabold */ + +/* BEGIN Extrabold Italic */ +@font-face { + font-family: 'Open Sans'; + src: url('opensans/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot'); + src: url('opensans/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot?#iefix') format('embedded-opentype'), + url('opensans/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff') format('woff'), + url('opensans/ExtraBoldItalic/OpenSans-ExtraBoldItalic.ttf') format('truetype'), + url('opensans/ExtraBoldItalic/OpenSans-ExtraBoldItalic.svg#OpenSansExtraboldItalic') format('svg'); + font-weight: 800; + font-style: italic; +} +/* END Extrabold Italic */ diff --git a/basicsuite/webengine/content/common/opensans/Light/OpenSans-Light.woff b/basicsuite/webengine/content/common/opensans/Light/OpenSans-Light.woff Binary files differnew file mode 100644 index 0000000..937323d --- /dev/null +++ b/basicsuite/webengine/content/common/opensans/Light/OpenSans-Light.woff diff --git a/basicsuite/webengine/content/common/opensans/Regular/OpenSans-Regular.woff b/basicsuite/webengine/content/common/opensans/Regular/OpenSans-Regular.woff Binary files differnew file mode 100644 index 0000000..bd0f824 --- /dev/null +++ b/basicsuite/webengine/content/common/opensans/Regular/OpenSans-Regular.woff diff --git a/basicsuite/webengine/content/common/osm.png b/basicsuite/webengine/content/common/osm.png Binary files differnew file mode 100644 index 0000000..d6390aa --- /dev/null +++ b/basicsuite/webengine/content/common/osm.png diff --git a/basicsuite/webengine/content/common/qt-io.png b/basicsuite/webengine/content/common/qt-io.png Binary files differnew file mode 100644 index 0000000..1596e73 --- /dev/null +++ b/basicsuite/webengine/content/common/qt-io.png diff --git a/basicsuite/webengine/content/common/reddit.png b/basicsuite/webengine/content/common/reddit.png Binary files differnew file mode 100644 index 0000000..5f6aaef --- /dev/null +++ b/basicsuite/webengine/content/common/reddit.png diff --git a/basicsuite/webengine/content/common/style.css b/basicsuite/webengine/content/common/style.css new file mode 100644 index 0000000..ceecf60 --- /dev/null +++ b/basicsuite/webengine/content/common/style.css @@ -0,0 +1,84 @@ +a, a:link, a:active, a:visited { + text-decoration:none; +} + +body { + margin: 2px; + background-color: black; + font-family: "Open Sans"; + font-weight: 300; + color: white; +} + +h1 { + font-size: 56px; + font-weight: 500; + margin: 0.7em; + text-align: center; +} + +.bookmark { + margin-top: 4px; + padding-top: 9%; + padding-bottom: 2%; + -webkit-filter: grayscale(80%); + transition: -webkit-filter 0.5s; +} +.bookmark:hover { +/* -webkit-filter: none;*/ + -webkit-filter: saturate(130%); +} +.bookmark span{ + font-size: 48px; + color: #eee; + margin-left: 10%; + text-shadow: black 6px 4px 8px ; + background: rgba(160, 160, 160,0.3); + padding: 5px; + border-radius: 0.2em; +} +/* + * url(attr()) is not really such a good combo. expand by hand + */ +#qt-io { + background-image: url("qt-io.png"); + background-size: 100% auto; +} +#youtube-tv { + background-image: url("youtube-tv.png"); + background-size: 100% auto; +} +#osm { + background-image: url("osm.png"); + background-size: 100% auto; +} +#ddg { + background-image: url("ddg.png"); + background-position: 0% 25%; + background-size: 100% auto; +} +#reddit { + background-image: url("reddit.png"); + background-size: 100% auto; +} +/* Flexbox stuff */ +#links-container { + display:flex; + flex-direction: column; +} +#examples-container { + display:flex; + flex-direction: row; +} +.example { + flex-grow: 1; + transition: flex-grow 0.5s; + width: 15%; + margin:2px; +} +.example:hover { + flex-grow: 3; +} +.example_image{ + width: 100%; +} diff --git a/basicsuite/webengine/content/common/youtube-tv.png b/basicsuite/webengine/content/common/youtube-tv.png Binary files differnew file mode 100644 index 0000000..489167e --- /dev/null +++ b/basicsuite/webengine/content/common/youtube-tv.png diff --git a/basicsuite/webengine/content/index.html b/basicsuite/webengine/content/index.html index 98c6df3..9610cbf 100644 --- a/basicsuite/webengine/content/index.html +++ b/basicsuite/webengine/content/index.html @@ -4,34 +4,23 @@ <meta charset=utf-8 /> <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"> <title>Qt WebEngine Demo</title> - <style> - a, a:link, a:active, a:visited { - text-decoration:none; - font-family: "Helvetica"; - font-size: 18px; - color: rgb(0,0,0) - } - .bookmark { - margin: 28px; - } - .example { - display: inline-block; - } - .example_image { - width: 300px; - height: 175px; - } - </style> + <link rel="stylesheet" type="text/css" href="common/open-sans.css"> + <link rel="stylesheet" type="text/css" href="common/style.css"> </head> - <body bgcolor="#AAAAAA"> - <div style="text-align: center; padding-top: 100px;"> - <div class="bookmark"><a href="http://www.qt.io">http://www.qt.io</a></div> - <div class="bookmark"><a href="http://qt-project.org/doc/qt-5">http://qt-project.org/doc/qt-5</a></div> - <div class="bookmark"><a href="http://www.google.com">http://www.google.com</a></div> + <body> + <div id="links-container"> + <a href="http://www.qt.io"><div class="bookmark" id="qt-io"><span>The Qt Company</span></div></a> + <a href="https://www.youtube.com/tv"><div class="bookmark" id="youtube-tv"><span>YouTube TV</span></div></a> + <a href="http://www.openstreetmap.org"><div class="bookmark" id="osm"><span>OpenStreetMap</span></div></a> + <a href="http://www.duckduckgo.com"><div class="bookmark" id="ddg"><span>DuckDuckGo</span></div></a> + <a href="http://www.reddit.com"><div class="bookmark" id="reddit"><span>Reddit</span></div></a> + </div> + <h1>Offline demos</h1> + <div id="examples-container"> <!-- <div class="example"><a href="../content/webgl/helloqt.html"><img class="example_image" src="../content/webgl/screenshot.png"></a></div> --> <div class="example"><a href="../content/csstetrahedron/index.html"><img class="example_image" src="../content/csstetrahedron/screenshot.png"></a></div> <div class="example"><a href="../content/rubiks/index.html"><img class="example_image" src="../content/rubiks/screenshot.png"></a></div> <div class="example"><a href="../content/morphingcubes/index.html"><img class="example_image" src="../content/morphingcubes/screenshot.png"></a></div> - </div> + </div> </body> </html> |
