aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 9-patch export plugin for SketchJ-P Nurmi2017-10-183-1/+44
| | | | | | | | | | | | | | | | This plugin crops upscaled 9-patch PNG assets when exported from Sketch, to ensure that 9-patch borders remain 1px wide when upscaled. Change-Id: Iad46d75f37b76eecf64ac32fa38d2b9e9db8b34d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_sanity: fix "empty filename passed to function" warningsJ-P Nurmi2017-10-181-3/+6
| | | | | | | | | | Change-Id: Ia1e633af6c64c9e2d538a2d4076e0bdd9667e01e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: replace generated assets with exported assetsJ-P Nurmi2017-10-181264-0/+0
| | | | | | | | | | | | | | From now on, the assets are maintained via imagine.sketch. ;) Change-Id: Icee606115cb149f3c99b8d9b768ccb080ad909be Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update imagine.sketchJ-P Nurmi2017-10-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove @1x from - applicationwindow-overlay-modal - menuitem-arrow-disabled - rename - button-background-disabled-checked -> button-background-checked-disabled - add missing - combobox-background-editable-focused - combobox-background-focused - dial-handle-hovered - delaybutton-background-focused - drawer-overlay - drawer-overlay-modal - remove checkable states for button Now the exported assets match with the files generated by imaginator. Change-Id: Icc73cd526227150b344512d08027f772a53acac2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: add support for file selectorsJ-P Nurmi2017-10-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For example: assets/ |__ button-background.9.png |__ +custom/ |__ button-background.9.png $ QT_FILE_SELECTORS=custom ./myapp Change-Id: I26f0b82885aa1a8e62fb4e3e58c7d8b19012406e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: add "qt.quick.controls.imagine" logging categoryJ-P Nurmi2017-10-172-0/+8
| | | | | | | | | | | | | | | | | | | | The output helps to debug image asset selection. For example: qt.quick.controls.imagine: "button-background" () -> "path/to/button-background.9.png" qt.quick.controls.imagine: "button-background" ("hovered") -> "path/to/button-background-hovered.9.png" Change-Id: I3aee85d357d9b9436341bfb06486e5b3089ce86f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: remove bogus assetsv5.10.0-beta2J-P Nurmi2017-10-1664-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - flat buttons don't need checkable assets (checkable-checked vs. checked, and checkable-highlighted vs. highlighted look identical) - delegates don't need a checked background, because the checked state is visualized by the indicator - text editors have no pressed state - mirrored page-indicator is unnecessary because it looks identical (if a mirrored version was needed, then we would need to provide mirrored versions of all states including pressed, current...) Change-Id: I909f639bdcf9d9653c56b8ce2eda49b3219bdf77 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add manual test for SystemTrayIconFriedemann Kleint2017-10-166-0/+170
| | | | | | | | | | Change-Id: Icada48c4f819906c6a1fc6bd98dd18e64bf1471b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-10-1216-36/+182
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/quicktemplates2/qquickbuttongroup.cpp src/quicktemplates2/qquickoverlay.cpp tests/auto/controls/data/tst_buttongroup.qml Change-Id: Iae23aaf039c6095007966475294e93220dbead84
| * QQuickPlatformDialog: fix clazy-qenumsJ-P Nurmi2017-10-101-1/+1
| | | | | | | | | | Change-Id: I6b9e31919502fb2f47e4b3657302a745c9f85b23 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Platform: fix clazy-range-loop findingsJ-P Nurmi2017-10-103-11/+11
| | | | | | | | | | | | | | Avoid accidental detach with C++11 range for loops. Change-Id: I2a105ef5a2505d26ee086974177f8f1e4040b522 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Ensure that the last screenshot can be openedMitch Curtis2017-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | Ensure that lastSavePath (now lastSaveUrl) is converted to a URL correctly by constructing it from screenshotsDir rather than screenshotsDirStr. It was resolved as a qrc path previously. Change-Id: I5ccdad6166b3927a149875b6ff89ff53c2440c05 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Doc: state which input devices cause certain signalsMitch Curtis2017-10-101-6/+6
| | | | | | | | | | Change-Id: Ib56041e69547e03d7db10974d4638748f99fd2bf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix the QML context of popup background dimmersJ-P Nurmi2017-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We were accidentally passing QQuickOverlay as a QML context parent for dynamically created popup background dimmers. There is only one overlay per window, and the overlay is not destroyed when a popup is destroyed. QQuickOverlay is just a visual parent item for popup background dimmers, but the actual owner is QQuickPopup. Make sure to pass the popup instance as a QML context parent to ensure that the popup background dimmer's QML context is cleaned up when the popup is destroyed. Task-number: QTBUG-63672 Change-Id: I5cabbcef5035cef40af3c9edbcd8f7ae3157bd8a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: add missing title customization for GroupBoxMitch Curtis2017-10-102-0/+8
| | | | | | | | | | | | Task-number: QTBUG-63618 Change-Id: I6a32158726e4425dc24c24f4f9dc9cc80aa462bf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+79
| |\ | | | | | | | | | Change-Id: Idbaf1791ffca20c4961bea16bb411720bbcac062
| | * Add changes file for Qt 5.9.2v5.9.2Antti Kokko2017-09-271-0/+79
| | | | | | | | | | | | | | | Change-Id: I976ebebb69e583963f9578fb007fb008311a22b4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: Ifaa644970cd8da55d02c1af76acd3ce8fbedb6da
| * | tst_combobox: attempt to stabilize test_mouse()J-P Nurmi2017-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Disable hover to avoid unexpected changes. Task-number: QTBUG-60480 Change-Id: I22fab5c95daa42f3c84437072bce49cac5c705af Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | QQuickScrollView: fix binding loop with wrapping TextAreaJ-P Nurmi2017-09-282-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start keeping track of the content size only after the component is complete, to avoid creation time ping pong with content size updates and content item resizing. Task-number: QTBUG-62325 Change-Id: I4b75dc398d0b746dd7e0b04291270f47f91bb7e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: remove stray semicolons from SwipeDelegate snippetMitch Curtis2017-09-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I859b61880da16f6c58967700b179f35df656ed77 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | QQuickButtonGroup: track the checked button with a QPointerJ-P Nurmi2017-09-282-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A destroyed button removes itself from a group, but because of the workaround added for QTBUG-52358, there's a moment after clear() when a button is removed from a group and before it is added back to the group. If the button gets destroyed during that period, the group ends up with a dangling pointer. Task-number: QTBUG-62946 Task-number: QTBUG-63470 Change-Id: If994f87b221a7e77f56458866c4d132365c45d6f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Refactor imagine.sketchJ-P Nurmi2017-10-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - split to page per control - define a palette and used shared styles - use shared symbols for 9-patches, indicators, handles, etc. - minor geometrical fixes here and there Change-Id: Ib6992f5ce2f57193ac893684bed43f039f22a815 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Doc: Remove reference to $PWD variable in the doc configVenugopal Shivashankar2017-10-112-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently the environment variable is not resolved on Windows platform, leading to documentation build failure. Task-number: QTBUG-63626 Change-Id: Ia37a3f7f35007f6756f1b99422d7d6b70b9ae10f Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | QQuickImageSelector: fix clazy-qvariant-template-instantiationJ-P Nurmi2017-10-101-2/+2
| | | | | | | | | | | | | | | Change-Id: I61f56c8806f02da2cab2ecf8452598431d921ca6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Doc: fix Action snippetsJ-P Nurmi2017-10-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | These actions should be checkable. Task-number: QTBUG-63674 Change-Id: If24f00951dc3959df27482fbad844ebeb723b37d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickAction: don't uncheck the checked action of an exclusive groupJ-P Nurmi2017-10-092-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | The logic is adapted from QAction::activate(). Task-number: QTBUG-63674 Change-Id: I7af127ea917e40e6a8ca99c2528362cf6ad283b8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickActionGroup: add missing default propertyJ-P Nurmi2017-10-092-0/+20
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63674 Change-Id: I7e8eef4080f123ba5ad6b9ffa8bd8613c1b7b724 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Imagine: set icon properties as we do for ButtonMitch Curtis2017-10-061-1/+9
| | | | | | | | | | | | | | | Change-Id: Iac93ca277883984ef99ffc34acade32f7b4ce434 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Fix imagine.sketchJ-P Nurmi2017-10-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - fix content padding for delegates - fix switch indicator size - fix combobox content padding - fix groupbox content padding - fix progressbar - fix delaybutton radius - fix popup overlay - fix dial background - fix tooltip content padding - fix combobox - fix popups - fix appwindow background - fix itemdelegate-background colors - fix radiodelegate-background - fix pane padding - fix radiodelegate-indicator-pressed color - fix pageindicator - fix sliders and range sliders - fix scrollbar & indicator - fix slider progress color - fix spinbox - fix switch - fix tabs - fix textfield padding - fix toolbar, button, separator - fix drawer - fix partially checked checkbox indicator - fix checkbox pressed indicator color - fix checkbox & delegate checkmark - fix dial handle size - fix dialogbuttonbox padding Change-Id: Idbbed7c7f80c754b3852b49e0720a02fbecfca49 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | testbench: fix modal dialogJ-P Nurmi2017-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Background dimming was disabled for modal dialogs. Change-Id: I52f544364b59387249b96d4db243ad3a0982c322 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Improve testbenchMitch Curtis2017-10-064-236/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a "Fix Custom Assets" action with shortcut - Organize the settings dialog into groups so it's easier to see which options are Imagine-only. Change-Id: I20fe7ba63b3bf7770f6ca553780c47f021217ea2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Imagine: remove bogus spinbox assetsMitch Curtis2017-10-058-0/+0
| | | | | | | | | | | | | | | | | | | | | These were incorrectly generated and are not used. Change-Id: Iec5fbdbaccce96722fa9ff1adefd43ecbcc4aebb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | testbench: fix orientation for horizontal ScrollBar & ScrollIndicatorv5.10.0-beta1J-P Nurmi2017-10-042-2/+2
| | | | | | | | | | | | | | | Change-Id: I1badecf98edb5174aa4cca71553e68bf20692801 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | imagine.sketch: fix button-backgroundJ-P Nurmi2017-10-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Vertical content padding was off by one, and some flat buttons had wrong gray shade. Now buttons look identical when toggling between default and exported assets. Change-Id: I7d9bddb479292c18f500b0044a38a5ae420e6e59 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | imagine.sketch: remove white solid backgroundJ-P Nurmi2017-10-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the assets, exluding some handles and indicators, had a solid white background (for the entire image). In general, nothing should have a solid background, but the areas around button corners, slider track and so on should be transparent. This patch simply selected all exportable assets and unchecked "Background color". Change-Id: Idebc0811290e8617f1a8cf5c3ebef665f02b8b62 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | imagine.sketch: fix menuseparator-backgroundJ-P Nurmi2017-10-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove the solid white background, and make the 1px dots rectangles instead of lines. Change-Id: If31059bdbe10e04bcf9ff5b060c390761c0b4921 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | imagine.sketch: fix frame-backgroundJ-P Nurmi2017-10-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Sketch has known issues with 1px line elements. Use rectangles instead of lines for marking the content area. Change-Id: Idd3d1380637f0baeea206c0971f8fef3b1387cd2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Default: restore the style singleton attributesJ-P Nurmi2017-09-292-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is known that people have made copies of the .qml files in order to customize them to their liking. Therefore it is best to restore the old API for now as it was in 391cba9a, before the palette changes. We will deprecate and remove it gradually, to give people time to migrate to palettes. Task-number: QTBUG-63369 Change-Id: Ib0c2166b00115b1e0ca92f3d81a05216798a7337 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Default: make SpinBox use palettesJ-P Nurmi2017-09-291-6/+7
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63369 Change-Id: I2b31b35d61c61b37234c7da4ace75c4645bc076a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Default: make ComboBox use palettesJ-P Nurmi2017-09-291-7/+8
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63369 Change-Id: I68270893bd7b56585095661b1cda21a28893c631 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Imagine: add Sketch fileMitch Curtis2017-09-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | This contains the default assets for the Imagine style in Sketch's file format. Change-Id: If9658b8674a7c456fdfe7ddcd5bb83ba464a82bb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | testbench: add SpinBox states and tidy up existing onesMitch Curtis2017-09-291-3/+5
| | | | | | | | | | | | | | | Change-Id: I2d0cb1f5ec9073670fa00a86fa1ac85bd50b8373 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Doc: add cover flow screenshot of stylesMitch Curtis2017-09-296-0/+470
| | | | | | | | | | | | | | | Change-Id: I4ffcdbc519bd3e997552b5f4c1c81e01d5b1185c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Default: make RoundButton use palettesJ-P Nurmi2017-09-281-7/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63369 Change-Id: I7d4b1f7f0ad0426a79b41534030b65774cd1b07f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Default: make DelayButton use palettesJ-P Nurmi2017-09-281-4/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63369 Change-Id: I1dfccfc2066c6346d7bd5e60105230446e047183 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Default: make Button use palettesJ-P Nurmi2017-09-281-7/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63369 Change-Id: I54826f9d76a8789ffc36dd2f613648c5553103e0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickActionGroup: track the checked button with a QPointerJ-P Nurmi2017-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as 3f1229b for QQuickButtonGroup, but testing this in QML seems too tricky since you can't use Repeater for non-Item Actions, and Instantiator does not provide a suitable list-property for the objects, that could be used to reproduce the issue. Change-Id: I43dfd76214b8b595be18cf4ab0d04ad1ff2a240d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickPaddedRectangle: prevent negative width and heightJ-P Nurmi2017-09-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the padding is larger than the available size, the rectangle node should not be given a negative size, because the node is still rendered and it results to undesired rendering artifacts. Change-Id: I082649badb04fe33dbea2ca2c4efcf0f179f41a8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Default: palette-based placeholder text color for editorsJ-P Nurmi2017-09-283-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A half-translucent placeholder text color is also used in widgets. Tweak the default disabled text color a little bit to make placeholder text visible in disabled state, so that we can use the same approach that has been proven to work. ;) Task-number: QTBUG-63369 Change-Id: I9a3f0bf18fdfa4a25ef169b8fd9571c9c899ab26 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 06:05:54 +0000