Commit Graph

430 Commits

Author SHA1 Message Date
Uwe Rathmann d45e63083f background transtion fixed 2022-11-18 12:12:05 +01:00
Uwe Rathmann 5a43165126 syntax error fixed 2022-11-13 17:26:44 +01:00
Uwe Rathmann b140d1b30a QskGradientDirection introduced - no more classes derived from
QskGradient
2022-11-13 17:22:09 +01:00
Uwe Rathmann 0fb4b25bba making QskGradient types acessible for QML ( mot 100% happy with using
lists )
2022-11-13 10:09:18 +01:00
Uwe Rathmann ad67d035f3 new QskGradient 2022-10-31 14:42:08 +01:00
Uwe Rathmann 9336e60c33 minor adjustments 2022-10-26 17:02:06 +02:00
Uwe Rathmann 4aeea2d6f8 PieChartPainted renamed to EnergyMeter. Name was misleading as it is
more of a decorated arc progressbar than a pie or a doughnut chart.
2022-10-26 16:47:42 +02:00
Uwe Rathmann 70664a2f67 unused classes removed 2022-10-26 16:46:28 +02:00
Uwe Rathmann 0109ffe675 unused classes removed 2022-10-26 16:45:34 +02:00
Uwe Rathmann a52499a7fc unused member removed 2022-10-26 11:00:57 +02:00
Uwe Rathmann d5f247a6f3 use QRgb values instead of strings ( slow initialization even warned by
clazy )
2022-10-26 10:50:11 +02:00
Uwe Rathmann 03ce740b29 towards improved QskGradient 2022-10-24 16:40:47 +02:00
Uwe Rathmann 8ba6085081 code prepared for gradients branch 2022-10-21 16:45:58 +02:00
Uwe Rathmann d9976527fd using setHGradient 2022-10-21 16:45:34 +02:00
Uwe Rathmann 84adee7ea8 unused includes removed 2022-10-21 16:43:59 +02:00
Uwe Rathmann a21d96543f using QskRgb::interpolated 2022-10-20 09:23:19 +02:00
Uwe Rathmann f9fefde387 warning fixed 2022-10-07 19:00:40 +02:00
Uwe Rathmann 76af5edfce moc include added 2022-09-09 09:15:26 +02:00
Peter Hartmann 4216775891 IOT example: Use shadows from the system
... and not our own ones.

Resolves #201
2022-08-31 14:41:45 +02:00
Uwe Rathmann 47fc994c70 example was broken with the different sorting of the skins. Solved by
unregistering the skin factory of the support lib
2022-08-29 10:28:38 +02:00
Uwe Rathmann b84dfc8226 QskSubcontrolLayoutEngine introduced 2022-08-26 12:56:12 +02:00
Uwe Rathmann 896145ac11 QskTextOptions as skin hints 2022-08-25 09:39:33 +02:00
Uwe Rathmann 3763bd5bad minor changes 2022-08-03 09:40:18 +02:00
Peter Hartmann 966d8a6a2e IOT dashboard: Comment out cube effect for now 2022-08-03 08:23:20 +02:00
Peter Hartmann 3e1ef84480 IOT dashboard: Improve rooms page 2022-08-03 08:23:20 +02:00
Peter Hartmann d4cffcadf7 IOT dashboard: Do the animation 2022-08-03 08:23:20 +02:00
Peter Hartmann ee4f47c0c8 IOT dashboard: Implement rooms page 2022-08-03 08:23:20 +02:00
Peter Hartmann cfab871ad8 IOT dashboard: Move some classes around 2022-08-03 08:23:20 +02:00
Peter Hartmann 520bb0a429 IOT dashboard: Rename MainContent to DashboardPage 2022-08-03 08:23:20 +02:00
Peter Hartmann d3e34f5f97 IOT dashboard: Use cube effect 2022-08-03 08:23:20 +02:00
Peter Hartmann 8bbc14b02b stack box: Add cube effect 2022-08-03 08:23:20 +02:00
Uwe Rathmann 2737bc0be3 sourceSize members replaced by strutSizeHints to make icons sizes
configurable in the skin
2022-07-28 11:37:14 +02:00
Uwe Rathmann b6031f4703 some improvememts for stack box flipping 2022-07-25 18:42:18 +02:00
Uwe Rathmann 168b8be9d0 flipping QskStackBoxAnimator added 2022-07-19 16:50:40 +02:00
Uwe Rathmann 501a8d1f65 skin transition fixed 2022-07-15 13:13:14 +02:00
Uwe Rathmann 4ef3fe3164 initial tabbar position as skin hint ( QskTabBar::Panel | QskAspect::Style ) 2022-07-15 10:44:32 +02:00
Peter Hartmann 07e3cf7fd6 Add top level application view 2022-07-15 07:55:13 +02:00
Peter Hartmann f1101f1706 Material: Fix Header and Footer boxes
At some later point, we can introduce an application window class.
Also, move tabs to bottom.
Also, add some tinted surface colors.
2022-07-15 07:55:13 +02:00
Uwe Rathmann 3b03d942e7 examples/automotive moved to playground/dashboard 2022-07-14 14:03:46 +02:00
Uwe Rathmann 1ef8078b61 wip 2022-07-14 14:03:03 +02:00
Uwe Rathmann ec1b2c928d using QskMenu for selecting the skin 2022-07-14 13:19:25 +02:00
Peter Hartmann 35e61ce52a gallery: Add tab for dialogs 2022-07-05 15:52:20 +02:00
Peter Hartmann 38d2f5e4b6 Bring back the old Material skin for now 2022-07-05 09:49:05 +02:00
Peter Hartmann 53faf27d8f Merge branch 'uwerat-master' into material-theme
This means remove the outlined and text buttons for now
2022-07-05 09:33:43 +02:00
Peter Hartmann 5ff92a9fb8 Material: Rename new skin to Material3 2022-07-05 08:46:51 +02:00
Uwe Rathmann 080fcdb69f Starting with a simpler version of QskCheckBox ( no tristate ), but with
having an optional text.
2022-07-01 11:10:59 +02:00
Uwe Rathmann 3c5b6f9f01 QskAbstractButton::Flat removed, using QskAspect::Header instead 2022-06-29 16:21:54 +02:00
Peter Hartmann 6332a27764 fix build after merge 2022-06-27 14:50:54 +02:00
Peter Hartmann 212090f62a Merge branch 'uwerat-master' into material-theme 2022-06-27 14:00:13 +02:00
Uwe Rathmann d403af14ba making QskHctColor a class, tone calculation from rgb added 2022-06-27 12:54:13 +02:00
Peter Hartmann 879b4144b1 Merge branch 'uwerat-master' into material-theme 2022-06-27 10:35:49 +02:00
Uwe Rathmann 6c7ba0489c M(aterial)2 related code replaced 2022-06-25 16:14:08 +02:00
Uwe Rathmann 061cdb0a07 minor improvements of the push button layout 2022-06-18 11:32:48 +02:00
Peter Hartmann d88edb3a02 Merge branch 'uwerat-master' into material-theme 2022-06-15 14:37:49 +02:00
Uwe Rathmann 824325eccf being more careful with setting the dirty bits of a QskBoxShadowNode 2022-06-15 10:59:39 +02:00
Peter Hartmann f39ade0606 Revert "Gallery: Use raster for textures"
This reverts commit 0c3355fa0f.
2022-06-14 09:35:59 +02:00
Peter Hartmann f53d0daeda Merge branch 'uwerat-master' into material-theme 2022-06-13 17:12:25 +02:00
Uwe Rathmann 1339a5f4cb shadows added to the box model 2022-06-13 17:01:15 +02:00
Peter Hartmann 2340b21280 Merge branch 'uwerat-master' into material-theme 2022-06-13 09:50:27 +02:00
Peter Hartmann e6b85e528b button: Add more states to cover different button types 2022-06-08 11:48:29 +02:00
Peter Hartmann 0c3355fa0f Gallery: Use raster for textures 2022-06-07 11:18:11 +02:00
Peter Hartmann c4dc6e8c2f Merge remote-tracking branch 'origin/master' into material-theme 2022-06-07 11:09:38 +02:00
Uwe Rathmann 0ed9afe2b4 QskBoxShadowNode introduced ( from playground/shadows )
- shader code migrated from glsl to vulkan-glsl
   - #ifdef "Geschnetzel" introduced to support old and rhi graphic APIs
   - iotdashboard, shadows examples adjusted
2022-06-04 17:56:14 +02:00
Peter Hartmann d1fb1e71cb fixup 2022-06-02 18:25:35 +02:00
Uwe Rathmann 54b55c0324 default graphic pipeline without native OpenGL calls.
code is QRHI compiant now
2022-06-02 16:02:42 +02:00
Uwe Rathmann 942e6cc13a iotdashboard enabled for Qt6 ( BoxShadowNode #ifdef'd for the moment ) 2022-05-30 20:03:56 +02:00
Uwe Rathmann 56a5494b57 memory leak fixed 2022-05-30 17:15:52 +02:00
Uwe Rathmann 8593a5cf2e hide QskGraphicNode, QskTextNode in QskSkinlet, where possible.
We will have less dependencies, when moving QskGraphicNode to something
that works better with the QRhi abstraction
2022-05-30 15:16:46 +02:00
Uwe Rathmann 974e1b6b1e quit menu option added 2022-05-30 07:49:58 +02:00
Peter Hartmann 3491c6735d
IOT dashboard: Use SVGs instead of PNGs (#191)
Resolves #129
2022-05-18 13:45:09 +02:00
Uwe Rathmann 12a3dd06da boilerplate code to have QskSegmentedBar in the gallery. 2022-04-20 15:25:15 +02:00
Uwe Rathmann 99ebaa7569 passsing parent fixed 2022-04-20 13:51:37 +02:00
Uwe Rathmann 8abbae3661 textinput page added 2022-04-19 08:42:53 +02:00
Uwe Rathmann d0b926b868 using Qt::Edge instead of Qsk::Position 2022-04-17 12:37:13 +02:00
Uwe Rathmann 15e04de169 inverted as bool instead of Qsk::Position 2022-04-17 12:25:51 +02:00
Uwe Rathmann 69e4152b4c QskPlacementPolicy introduced 2022-04-08 16:46:20 +02:00
Uwe Rathmann c17e3defd3 qskItemSize() removed, QQuickItem::size() is available since Qt 5.10 2022-04-07 15:43:45 +02:00
Uwe Rathmann 247c0a4044 alignment fixed 2022-04-06 10:56:29 +02:00
Uwe Rathmann 676e0d5e9f colorswitch example removed 2022-04-06 08:41:32 +02:00
Uwe Rathmann 2a6d27d78d wip 2022-04-05 11:38:23 +02:00
Uwe Rathmann 4d7db7c479 wip 2022-04-05 10:41:36 +02:00
Uwe Rathmann b06687662b custom sliders moved from gallery to tabview. we do not want to have
custom controlsin the gallery, that is intended to show the default
versions
2022-04-04 17:45:49 +02:00
Uwe Rathmann ae5a348b50 spelling aligned with Qt checkboxes ( triState -> tristate ) 2022-04-04 14:39:24 +02:00
Uwe Rathmann 49cdc1a029 formal cheges, check box added to gallery 2022-04-04 14:14:07 +02:00
Uwe Rathmann de48deb7c8 more switches 2022-04-03 16:38:25 +02:00
Uwe Rathmann 0c7b14401b change skin button added 2022-04-01 15:58:47 +02:00
Uwe Rathmann 4cb3301045 push buttons added 2022-04-01 14:54:31 +02:00
Uwe Rathmann ff8b4245a6 text box reimplemented 2022-04-01 14:43:22 +02:00
Uwe Rathmann a676caf994 support lib reorganized 2022-04-01 13:56:16 +02:00
Uwe Rathmann 105fdec8d7 no more page backgrounds - preparation for better themeing 2022-03-28 20:15:54 +02:00
Uwe Rathmann f86e38ef12 using reserve where possible 2022-03-25 10:29:12 +01:00
Uwe Rathmann 55d5f99575 introducing QskHashValue to work around Qt5/6 incompatibilities 2022-03-25 10:28:06 +01:00
Uwe Rathmann a8b176aa71 QskSkinTransition pimpled 2022-03-24 11:17:03 +01:00
Uwe Rathmann e0792beb5f unused code removed 2022-03-24 08:49:49 +01:00
Uwe Rathmann f44208213c Squashed commit of the following:
commit 547927f937a3260d5b23068f06cd181de9b7c763
Author: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date:   Wed Mar 23 15:38:40 2022 +0100

    wip

commit ca06b1da4bf9c5b30ef2857f0b6c1e4fb137a64e
Author: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date:   Wed Mar 23 15:30:31 2022 +0100

    using private classes

commit 4977b0afa481039f22b64e7f55262be8053a26c2
Author: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date:   Wed Mar 23 15:18:20 2022 +0100

    avoid using private Qt headers in examples
2022-03-23 15:39:17 +01:00
Uwe Rathmann 1cc0dff8d5 uncrustified 2022-03-23 11:54:34 +01:00
Uwe Rathmann 7f5d289808 obsolete code for earlier versions removed 2022-03-20 14:22:11 +01:00
Uwe Rathmann ae2c6d87a8 upport for Qt < Qt 5.12 dropped 2022-03-08 11:53:46 +01:00
Peter Hartmann ac8ef9cd5a
Box renderer: Support border gradients (#158)
* QskBoxBorderColors: Use gradients instead of colors

* QskBoxBorderColors: rename API

* render gradients on borders

* boxes example: Also draw gradient borders

* calculate proper numbers of needed border colors

* fixup with example

* support rounded corners

* support more colors in rounded color gradients

I THINK WE DON'T REALLY NEED THIS COMMIT

* We don't need this commit either

* Revert "We don't need this commit either"

This reverts commit 2dc38064f7fee1d0505262fe5cebcf9e1fb16cea.

* Revert "support more colors in rounded color gradients"

This reverts commit 5754d2d0773d8273d42ae1775b53d40f5e6af26a.

* fix borders for rect ellipses

* play around a bit

* small fixes

* some helper stuff and missing stuff

* user border colors

* close to something working somehow

* works a bit better

* put it into an own function

* rearrange a bit

* something's off

* still off, but seems like we need an additional line

* works but hackish

* now it works

* bring back samples

* correction

* pimp up example

* fix normal rendering

* some more debugging etc.

* turn around gradients

* turn around rectangular gradients as well

* turn around easier

* more test cases

* fix fill case

* more test cases

* clean up a bit

* clean up example

* clean up some more

* incorporate feedback from Uwe

* fix bug when using horizontal gradients
2022-02-04 16:11:11 +01:00
Uwe Rathmann 36001a6fec menu separators added 2022-01-06 18:36:15 +01:00
Uwe Rathmann 1feccd942a QskPageIndicator improved 2022-01-04 13:58:34 +01:00
Uwe Rathmann 4a3f56e842 QskPopup::execPopup introduced 2022-01-01 18:13:33 +01:00
Uwe Rathmann 9cef7705d8 QskMenu::exec added 2021-12-30 11:13:48 +01:00
Uwe Rathmann f45be55e90 using positionHint methods 2021-12-29 17:05:29 +01:00
Uwe Rathmann 05bb54e48d avoiding deprecation warnings 2021-12-29 15:21:09 +01:00
Uwe Rathmann 2201c80d09 implementation improved 2021-12-27 18:47:46 +01:00
Uwe Rathmann b6f464316c menu items changed 2021-12-27 17:34:52 +01:00
Uwe Rathmann 6c46c0160d some functions copied from QskFunctions to QskPlatform 2021-12-26 12:57:02 +01:00
Uwe Rathmann 8010d70e4a QskMenu added ( work in progress ) 2021-12-23 18:36:32 +01:00
Uwe Rathmann 47f7737985 QskListView::Selected state introduced 2021-12-22 15:08:27 +01:00
Peter Hartmann 0ed89c111d
Iot dashboard: Fix light display input (#153)
* IOT dashboard: Fix light display input

* move tolerance in mouse handlinge code

* Revert "move tolerance in mouse handlinge code"

This reverts commit 2214d2160fd4c37151f9f6451f06ce12f7b7dada.

We keep the tolerance handling inside the other function.
2021-12-17 15:45:28 +01:00
Uwe Rathmann 738de14d4c hiding the devicePixelRato scaling in the nodes 2021-12-13 16:43:34 +01:00
Uwe Rathmann f69dedcb13 Qt 5.6 incompatibility fixed 2021-12-06 19:55:19 +01:00
Uwe Rathmann 985fcf1e2d tabpage background fixed 2021-12-06 19:20:59 +01:00
Uwe Rathmann 0a0c3dfb17 background fixed 2021-12-06 19:12:27 +01:00
Uwe Rathmann b5bc26eb63 using degrees for arcs ( not multiplied by 16, what QPainter wants ) 2021-12-02 17:15:41 +01:00
Peter Hartmann 2b78922b43
IOT example: Make text label retain position when changing value (#150) 2021-11-22 15:51:40 +01:00
Peter Hartmann 927d2dd51c
Iot dashboard light intensity (#142)
* IOT dashboard: Make light dimmer use arc renderer

* use shadow

* add value text

* add warm and cold parts

* add knob

* handle input

* only move knob when drawing along the arc

* improve input handling

* add tickmarks

* add tickmarks node

* clean up a bit

* Update screenshot of IOT dashboard for github site
2021-11-19 15:02:57 +01:00
Uwe Rathmann 8413651bda comments fixed 2021-11-19 14:05:27 +01:00
Peter Hartmann 26f1d1329a
Iot dashboard: Add own shadows (#135)
* remove current shadow implementation

* add our own shadow code
2021-10-31 11:16:03 +01:00
Peter Hartmann c7eae4c3d1
IOT example: Fix alpha value of gradients (#139)
We were calling the new constructor of QskGradientStop with a
completely transparent alpha value.
2021-10-27 16:36:46 +02:00
Uwe Rathmann 0d9dbf4c58 QML export as QskGadientStops does nor work - we need to stay with
QVector
2021-10-27 15:08:06 +02:00
Peter Hartmann b89621a3d4
Iot dashboard arc rendering (#134)
* add QskArcNode and QskArcRenderer

* IOT example: Use QskArcNode instead of own arc node

* move some functionality to the arc renderer

* add QskArcMetrics

* add methods to QskSkinlet

* remove circular bar graph node

We can now use updateArcNode() and don't need our own method.

* support linear gradients in the arc renderer

* clean up

* incorporate Uwe's changes

* add overloads for updateArcNode() when the angles are set dynamically

The angles don't always come from the style, so we need overloads
in QskSkinlet to set them dynamically.
2021-10-20 07:50:25 +02:00
Uwe Rathmann c6fd012fa0 Qt 6.2 workaround added - once
https://github.com/uwerat/qskinny/issues/131 is in place we hopefully
can remove it again
2021-10-07 12:29:42 +02:00
Uwe Rathmann 6c7ed043fc moc include added 2021-09-17 13:36:06 +02:00
Uwe Rathmann c4e3a3aa92 QskGradientStops added 2021-09-17 13:35:47 +02:00
Uwe Rathmann 71da4dcdff QskCorner removed - using QskBoxShapeMetrics instead 2021-09-15 17:54:44 +02:00
Uwe Rathmann 99822fc7aa QskSkinHintTableEditor API simplified 2021-09-04 16:48:02 +02:00
Uwe Rathmann f51f3b65ab QskSkinHintTableEditor extended 2021-09-03 06:51:50 +02:00
Uwe Rathmann 2bed344f52 setting states without clearing others 2021-09-01 08:34:59 +02:00
Uwe Rathmann 01b6207fa6 GraphicProvider added 2021-08-26 17:02:31 +02:00
Uwe Rathmann 2951e25de6 using QskGraphiclabel::panel 2021-08-26 15:24:13 +02:00
Uwe Rathmann bd0c40b241 leftover code removed 2021-08-25 15:46:08 +02:00
Uwe Rathmann 3983da2025 uncrustified 2021-08-24 14:38:03 +02:00
Peter Hartmann 3a1a7c635c
Iot dashboard: Make circular progress bar a QskControl (#124)
* IOT example, circular progress bar: Use a pen instead of a brush

That way we don't have to draw two circles, and we can in addition
use a conical gradient.

* IOT example: Make circular progress bar a QskControl

... and internally use a QskPaintedNode for now. By doing this we
already have the API ready (similar to QskProgressBar) and can
swap the QskPaintedNode with an arc renderer at a later point in
time.
2021-08-24 08:46:26 +02:00
Uwe Rathmann 279ec9537c using flat caps 2021-08-06 14:39:40 +02:00
Uwe Rathmann 304e89da8a alternative implemenation showing using a different type of gradient 2021-08-06 14:23:52 +02:00
Uwe Rathmann 3181270afe layout code improved 2021-08-05 11:06:48 +02:00
Uwe Rathmann 9cb938b5e7 using subControl proxies + other improvements 2021-08-04 18:55:18 +02:00
Uwe Rathmann 12553ee48f typo fixed 2021-08-04 18:48:11 +02:00
Uwe Rathmann 3606f61c65 QskSkinnable::subcontrolProxy added 2021-08-04 15:06:44 +02:00
Uwe Rathmann d947920abe Squashed commit of the following:
commit f429d3ab4e82ab06bfd40577aef8e2d5fdfd59fd
Author: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date:   Wed Aug 4 14:40:36 2021 +0200

    subcontrolProxy introduced
2021-08-04 15:06:04 +02:00
Uwe Rathmann 3956f123f5 using pragma once for the examples 2021-08-04 10:11:12 +02:00
Uwe Rathmann 923affe749 uncrustified 2021-08-04 09:31:16 +02:00
Uwe Rathmann 66cc68bcda getting rid of the confusing QskAbstractButton::Checkable state 2021-08-04 08:24:36 +02:00
Uwe Rathmann 0e334e5fd9 switch button adjustments 2021-08-02 19:17:04 +02:00
Uwe Rathmann 4a7d7d0e2d switchbuttons example moved to the gallery 2021-08-02 13:27:30 +02:00
Clemens Manert 13faf53495
Add SwitchButton (#121) 2021-08-02 13:22:37 +02:00
Uwe Rathmann 13867df163 making clang happy 2021-07-14 14:43:12 +02:00
Uwe Rathmann 841595729f iot-dashboard -> iotdashboard 2021-06-04 12:05:15 +02:00