Commit Graph

481 Commits

Author SHA1 Message Date
uwerat cf449f174f
Merge branch 'master' into qskspinbox 2023-02-19 10:25:04 +01:00
Vogel, Rick 8e8f8f5c2a added sliders to play with sizes 2023-02-17 18:34:18 +01:00
Peter Hartmann a89d3def3b Add new control QskComboBox
Resolves #102
2023-02-17 17:26:06 +01:00
Vogel, Rick ad7a20053c refactoring + focused state 2023-02-17 13:32:47 +01:00
Vogel, Rick ba9ec8e783 initial commit of QskSpinBox 2023-02-17 13:28:44 +01:00
uwerat 6071ce74d2
Merge branch 'master' into qskspinbox 2023-02-17 13:22:39 +01:00
Vogel, Rick ac8a3dea9b initial commit of QskSpinBox 2023-02-17 12:01:56 +01:00
Uwe Rathmann d71b972232 QskBoxShapeMetrics::ScalingMode: using better names, missing mode
reinserted
2023-02-16 11:30:31 +01:00
Uwe Rathmann 66db409b71 QskAspect::Placement renamed to QskAspect::Variation so that we use the
corresponding bits for an emphasis too
2023-02-15 16:37:54 +01:00
Uwe Rathmann 4c10d8b0e4 using Qt::Edge instead of QskAspect::Placement 2023-02-15 16:14:05 +01:00
Uwe Rathmann 1300761ee2 adjusted to API changes 2023-02-15 16:12:35 +01:00
Uwe Rathmann 31feeff9aa Complete support of linear gradients from the box renderer - only
expection are reflect/repeat spreading.
Code has been reimplemented or cleaned up significantly
2023-02-08 17:58:09 +01:00
Uwe Rathmann 776468953d using Circular/Elliptic 2023-02-03 11:13:11 +01:00
Peter Hartmann 5a78a365e3 segmented bar: Make API similar to QskMenu 2023-02-01 17:18:22 +01:00
Peter Hartmann 1b6f3285dc segmented bar: Improve styling 2023-02-01 17:18:22 +01:00
Peter Hartmann 9d1b2568e5 segmented bar: Allow icon and text 2023-02-01 17:18:22 +01:00
Uwe Rathmann 07da205dc0 minor improvements 2023-01-24 19:39:56 +01:00
Peter Hartmann f98af6d298 M3 buttons: Fix icons
Also for the gallery use the ones from M3.
2023-01-24 09:51:36 +01:00
Peter Hartmann 3b45b90011 CheckBox: Add error state and style for material 2023-01-16 08:15:41 +01:00
Uwe Rathmann f0d96ebfaa moc icludes added 2023-01-09 15:11:38 +01:00
Uwe Rathmann 7d7eb87cbd compiler errors fixed 2023-01-09 15:11:38 +01:00
Uwe Rathmann 061da08c61 duplicates removed 2023-01-09 15:11:38 +01:00
Rick Vogel 30363a5e41 refactoring 2023-01-09 15:11:22 +01:00
Rick Vogel a5cf5acad9 iot storage page 2023-01-06 18:03:19 +01:00
Peter Hartmann 4bd294f72c IOT dashboard: Fix gradient of circular progress bar 2023-01-05 09:12:06 +01:00
Peter Hartmann 6324908cdf IOT dashboard: support key events for cube switching
Resolves #222
2023-01-05 09:12:06 +01:00
Peter Hartmann 3fbbd6cb3f IOT dashboard: fix menu bar 2023-01-05 09:12:06 +01:00
Peter Hartmann 4b1a03cf1d IOT dashboard: fix cube logic by keeping track of which edge we are on 2023-01-05 09:12:06 +01:00
Peter Hartmann 83a9d835b5 IOT dashboard: fix swiping over 2 hops 2023-01-05 09:12:06 +01:00
Peter Hartmann 978183916f IOT dashboard: fix menu bar 2023-01-05 09:12:06 +01:00
Peter Hartmann db706737be IOT dashboard: add edges to calculate neighbors correctly 2023-01-05 09:12:06 +01:00
Peter Hartmann dc356801e4 IOT dashboard: fix cube effect for more pages 2023-01-05 09:12:06 +01:00
Peter Hartmann c904f33cf1 IOT dashboard: Add more dummy pages 2023-01-05 09:12:06 +01:00
Peter Hartmann 39d75edda0 IOT dashboard: Exclude menu bar from cube effect 2023-01-05 09:12:06 +01:00
Peter Hartmann 31f2d0c93a IOT dashboard: Make MenuBar buttons and allow switching 2023-01-05 09:12:06 +01:00
Peter Hartmann 8a91e3c54c IOT dashboard: Improve menu bar styling 2023-01-05 09:12:06 +01:00
Peter Hartmann 0db351872a IOT dashboard: Fix theming for light display 2022-12-20 16:41:49 +01:00
Peter Hartmann 3e91e83187 IOT dashboard: Use skinny shadows for light display 2022-12-20 16:41:49 +01:00
Peter Hartmann 22db20e9eb IOT dashboard: Fix rooms page theming
Resolves #231
2022-12-20 16:41:49 +01:00
Peter Hartmann 9ba2fdb2f2 IOT example: Make device buttons clickable 2022-12-20 16:41:49 +01:00
Peter Hartmann 1338c876fd IOT dashboard: Make temperature and humidity changeable with buttons 2022-12-20 16:41:49 +01:00
Uwe Rathmann 125fe1e9f4 QskBoxNode renamed to QskBoxRectangleNode, QskShadedBoxNode renamed to QskBoxNode 2022-12-05 12:34:08 +01:00
Uwe Rathmann abf325dbde QJSValue converter for QskGradient added to be compatible with new Qt
6.5 features
2022-11-30 17:05:37 +01:00
Uwe Rathmann 57c25294c4 replace qmlRegister methods by setting the registration info manually.
Hopefully this allows better finetuning and validating of what is possible in QML
for the various Qt versions.

In the long run we might want to qualify the class definitions with
QML_ELEMENT and friends to have better tool support ( qmlcachegen ??? )
See https://www.qt.io/blog/qml-type-registration-in-qt-5.15
2022-11-29 17:24:40 +01:00
Uwe Rathmann 47fad1be18 png files removed 2022-11-24 11:54:05 +01:00
Uwe Rathmann 8132c8a416 render bug fixed 2022-11-24 11:31:49 +01:00
Uwe Rathmann 8435c60b03 using c++ auto 2022-11-24 09:08:53 +01:00
Uwe Rathmann bfdecc0413 using qvg files to get rid of the qsvg dependency 2022-11-24 09:06:39 +01:00
Uwe Rathmann 2aaaa4ecb1 QskSizePolicy property names shortened 2022-11-20 15:27:08 +01:00
Uwe Rathmann 912d768a61 QskControl::Background subcontrol introduced allowing to have a default setting for
all backgrounds ( color, padding ) without changing the overall fallback settings. This made
it possible to remove the confusing autoFillBackground property.
2022-11-18 13:20:21 +01:00
Uwe Rathmann 46d2b20df0 useless hint settings removed 2022-11-18 12:13:16 +01:00
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