aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* Fixes: license headerThomas Hartmann2022-07-2210-82/+326
| | | | | | | | Use GNU General Public License instead of commercial license only. Task-number: QTCREATORBUG-27895 Change-Id: I1782638871f79b9729f0c7ce06abb38f6c34ed7a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Add default Connections to wizard templateThomas Hartmann2022-07-151-1/+49
| | | | | | | Task-number: QDS-5963 Change-Id: I894ce59adfaafa6ff71d6fa958b8aa836564a20a Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Enable drag-n-drop a material to a model in NavigatorMahmoud Badri2022-06-291-2/+5
| | | | | | | | Fixes: QDS-6694 Change-Id: I2fb32052559b1d459cc8025e9f30368b0189e8ab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* update fixed version of icon fontBrook Cronin2022-06-241-0/+0
| | | | | Change-Id: Iedf945b3718d4df245e24ac1ba756b20f6ed9cf1 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Unify the background of 3D preview imagesMiikka Heikkinen2022-06-238-55/+51
| | | | | | | | | | | | | | | | Added 3D checkerboard floor on all 3D previews. Since shadows generally look bad for arbitrary 3D scenes, and would mostly be obscured by the model itself as we want the light mostly from the front, removed shadows also from the material preview to unify the previews. Qt5 had issues rendering the 3D floor texture, so used a static image there, as Qt5 only generates previews of one size. Fixes: QDS-7078 Change-Id: I74d094878ed01e6e531ad60df1f8d9d7cf415860 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix hover color for ButtonRowHenning Gruendl2022-06-221-1/+1
| | | | | | | | | | | | Use the default background color for ButtonRow buttons on global hover. This needs to be done to distinguish between hover and global hover on ButtonRow buttons as we unified the two colors as an attempt to make the UI a bit less noisy. Change-Id: I63f9c730367e9b906a772a63210c7ca548647352 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix material editor/browser textsMiikka Heikkinen2022-06-223-6/+9
| | | | | | | Fixes: QDS-7083 Change-Id: Ib4a5269e275c7811a5645bbff54e3b0ec95ec302 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Show IconButton tooltip also when button is disabledMiikka Heikkinen2022-06-221-5/+10
| | | | | | Fixes: QDS-7076 Change-Id: If412827e22c6f71a9f073d1c868dcdb325870c1d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix FontComboBox drag'n'dropHenning Gruendl2022-06-211-3/+5
| | | | | | | | | | * Fix URL schema to also work under macOS * Avoid setting font name and further processing if error during font loading occurred Change-Id: I9d07a3daad8f7c8c464422b0cf3f94d61e4b231d Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add a wizard for a ui.qml .qml file pairThomas Hartmann2022-06-215-0/+170
| | | | | | Task-number: QDS-5963 Change-Id: I16ee8361779f11ca2f24f35877869f3e83279d10 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Ensure materials render properly after puppet resetMiikka Heikkinen2022-06-162-1/+42
| | | | | | | | | | | This is a workaround for quick3d issue QTBUG-103316, where material library materials for editor are properly initialized only if the first encountered View3D in the scene is also rendered first. Fixes: QDS-7084 Change-Id: I8bb6a8e6bfe2fcffddfe86f92157d386fdf4095d Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QDS Editor 3D: Allow the user to select (and reset) the color of grid linesSamuel Ghinet2022-06-1610-18/+62
| | | | | | | Task-number: QDS-7122 Change-Id: I686269e61b53bd5e3d5d1225376930612d869072 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Use changed properties to update 3D previewThomas Hartmann2022-06-131-4/+4
| | | | | | | | | EffectReference is always dirty and it is the only dirty flag. Instead, we update now if any property changed. Task-number: QDS-7079 Change-Id: I157cf2d3b15120c33f4a6b3f53e526d555c7f80c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Do not apply smooth rendering if root is a 3D nodeThomas Hartmann2022-06-131-5/+5
| | | | | | Task-number: QDS-7136 Change-Id: I5260153b8d6131160a8d4b67418e81c6f6e4d862 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Apply root item transform in Node component previewsMiikka Heikkinen2022-06-104-6/+6
| | | | | | | | | When generating a preview from a component with a 3D node for a root, the root Node transform is now applied when calculating camera zoom. Fixes: QDS-7131 Change-Id: I73054a09b3e82868c999ef6f9797dc941e625b33 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Queue puppet processes during importMiikka Heikkinen2022-06-101-2/+1
| | | | | | | | | | On some systems launcing multiple simultaneous import processes causes imports to fail. Fixed by only launching single process at a time and queuing the rest. Fixes: QDS-7107 Change-Id: I330c5920dcbd74d3b4f2e7f40899795a4fbaf3ac Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add option for smooth rendering in form editorThomas Hartmann2022-06-102-4/+11
| | | | | | | | | | | | | | | | Smooth rendering turns on MSAA and doubles the resolution for rendered items. With this option enabled everything stays smooth when zooming in. Around factor 8-10 pixels become clearly visible again, but it still looks relatively smooth. I added both MSAA and increased the resolution to one option, for simplicity. The smooth mode takes 4 times the shared memory, which should not be an issue in most cases. For now, the option is not the default. Task-number: QDS-7129 Task-number: QDS-7128 Change-Id: I8a778650bb40f8ba796960db9bc966e8a1efff4e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Fix templateThomas Hartmann2022-06-091-0/+1
| | | | | | | | Add missing '}' Task-number: QDS-7125 Change-Id: I7ecf80d681de0400368e28b98179488db560381e Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add drag'n'drop to PropertyEditorViewHenning Gruendl2022-06-086-28/+139
| | | | | | | | | | | | | * Implement drag and drop for UrlChooser and FontComboBox * Change the style of controls accepting drag payload and drag hovering. Utilize states for those styles. * Fix aspect ratio of drag pixmap * Fix issue that causes drag to continue after pressing the escape key Change-Id: I5cf67175abe936e60e8af00fa8c2f7a2dec355b3 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Add tooltips to UrlChooserHenning Gruendl2022-06-081-12/+138
| | | | | | | | | | | | | | | * Add tooltips with thumbnails to UrlChooser enable preview of image formats and meshes * Add property editor image provider which makes use of the image cache * Add mesh image cache collector in order to create thumbnails for meshes and built-in primitves * Fix typo in explicit image cache image provider * Add return value in time stamp provider if provided file does not exist Change-Id: I2290d2ace87ddd90e9899e343f2ad1ecd2993fdf Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Change FileResourcesModelHenning Gruendl2022-06-082-15/+22
| | | | | | | | | | Change FileResourcesModel to have one list of FileResourcesItem with properties absoluteFilePath, relativeFilePath and fileName instead of having two separated lists. Change-Id: Ib4b4884a6739658434844d2adb9c05c3871104e7 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Fix node component missing state propHenning Gruendl2022-06-081-1/+1
| | | | | | | | | | | Fix node components not showing the states property in the property editor. This is caused by querying majorVersion instead of majorQtQuickVersion. Task-number: QDS-6981 Change-Id: I0a87d921ce985f7fd58b92f526531c49622bb235 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Update QDS version in templateThomas Hartmann2022-06-081-1/+1
| | | | | Change-Id: I0bfbd469d49568ec2be0b6b936c46bbc9160fbcb Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Make text label visible in 3d wizardThomas Hartmann2022-06-081-6/+7
| | | | | | Task-number: QDS-7054 Change-Id: I44a2d01c799b619b553c6b1e76c003324e7b80ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add material library to 3D application project templateMiikka Heikkinen2022-06-061-5/+10
| | | | | | | Fixes: QDS-7065 Change-Id: Ifd270312c352d47facd32ff50543003171c0f718 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Import3D: Update call to importFile() after change in QtQuick3dChristian Strømme2022-06-062-3/+17
| | | | | | | | | | | The function in QtQuick3d will from Qt 6.4.0 accept the json object directly meaning it's no longer necessary to convert to a variant map first. Change-Id: If180672963cbfea78582f245431e246f84111c9b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix issues with quick3d private API changes in Qt 6.4Miikka Heikkinen2022-06-032-0/+18
| | | | | | Change-Id: I5974c7f663262c88810ddaac6f9c775d95749266 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Update MCUs metadata for MCUs 2.2Aleksei German2022-06-022-1/+232
| | | | | | Task-number: QDS-7064 Change-Id: I645ece6228e30cb5d645c67a57b51f76e7375a3b Reviewed-by: Aleksei German <aleksei.german@qt.io>
* Allow changing the 3D Editor's background colorSamuel Ghinet2022-06-017-40/+95
| | | | | | Task-number: QDS-6585 Change-Id: Ibcac69d3792b521b29dfbdce2d49557d36de99a9 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix wizardsThomas Hartmann2022-05-316-28/+35
| | | | | | | | | | | Since we define an import for QtQuick to distinguish between Qt 6.2 and Qt 6.3, the way we determine "IsQt6Project" was broken. This patch reuses "IsQt6Project" now to determine the default style name and if we need a versions for imports. Task-number: QDS-7053 Change-Id: I7b5fc0b76e71c2874f5e6ac8457ba1deb87bb999 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Handle picking of models under View3D component properlyMiikka Heikkinen2022-05-319-19/+161
| | | | | | | | | | | | | If a model defined inside the View3D component is picked on 3D editor, the parent View3D is selected instead as there is no instance for the model itself. This is similar to how Node based component picking works. Fixes: QDS-6934 Change-Id: I4f273972da8cb1c55f03cab323dd9804a5d10def Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix 3D application wizard quick3d import version handlingMiikka Heikkinen2022-05-311-3/+6
| | | | | | Change-Id: I80eecdcd5ac9938715b084bd8b89c82d62aa7323 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Highlight material editor properties upon asset dragMahmoud Badri2022-05-314-20/+29
| | | | | | | | | | | When starting an asset drag in the assets view, highlight all supported properties in the material editor. Change-Id: I60935756e4c1384edcc284068163d08ebe529a05 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Refactor library icon generation for imported 3D assetsMiikka Heikkinen2022-05-3014-110/+84
| | | | | | | | | | | | | | | | | | | | | | Previously, icon generation was done at import time, but that was wasteful, as we now have image cache backed icon generation available for component library icons. Added the few remaining missing bits to support icon generation for image cache and disabled the old icon generation implementation for Qt6. A few issues in fit algorithm for preview image generation were also uncovered and fixed to make icons render scene in comparable size to the old version. Qt5 imports still generate using old way since component library 3D previews generation doesn't work on Qt5. Fixes: QDS-6205 Change-Id: I5418fa19d86e81adcd184be023f1dfbc813d0bf5 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Remove hardcoded timeout from 3D import puppetMiikka Heikkinen2022-05-301-3/+2
| | | | | | | | | | It doesn't seem that this timeout is needed. Fixes: QDS-6909 Change-Id: I7794d8548acd75fbb220a20458d091f413b5fcbb Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Implement "duplicate material" featureMahmoud Badri2022-05-271-1/+7
| | | | | | | | | Fixes: QDS-7013 Change-Id: I28a11dbd9d6586631c0edcf8003e551917eaac98 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner.Wizards: Extend version comboboxThomas Hartmann2022-05-278-19/+63
| | | | | | | | This patch allows to distinguish between 6.2 and 6.3. Change-Id: I9ba4c9984673e9e9e6f7d50a1ea35704f7e00211 Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Show form editor preview for 3D material root nodesMiikka Heikkinen2022-05-2711-191/+406
| | | | | | | | | Fixes: QDS-6561 Change-Id: I62a06eb6c83b0a4813a1b20f91b09e17b04a1332 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Unify empty text between material editor and browserMahmoud Badri2022-05-242-3/+4
| | | | | | | | Make the text indicating that there are no materials, same size and content between the material editor and browser. Change-Id: I6e9e46c30d89aed090b504b256b113e2601b4659 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Disable apply material to selected when no selection existMahmoud Badri2022-05-242-3/+3
| | | | | | | | | When there is no valid model selected, disable the "apply to selected" actions in the material editor and browser. Change-Id: Id8e771c64e69c0ba2f42dff01d19ffbf4afafb77 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Clear components view search box upon loadMahmoud Badri2022-05-244-3/+9
| | | | | | | | | i.e. upon changing from edit mode to QDS mode. This also removed a warning. Change-Id: Ibd3ee3bd30febfcee9a05cb87047e79b8ed1bf61 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Maintain asset thumbnail's aspect ratioMahmoud Badri2022-05-241-0/+1
| | | | | | Change-Id: I22aa85afbe7bd56df8cf80f792b6bfb93ec01541 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Fix puppet build for Qt5Christian Stenger2022-05-241-1/+7
| | | | | | | | Amends f09d4538e73dfd8. Change-Id: Ibff8b834e65fd18f6345431c8729b7592eab0c5c Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Implement Material EditorMahmoud Badri2022-05-2324-191/+1003
| | | | | | | | | | Task-number: QDS-6438 Task-number: QDS-6439 Change-Id: I04e899a68aea665f0df8b65e21523632174ec76b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix missing reference to backendValuev7.0.2Henning Gruendl2022-05-201-16/+16
| | | | | | | | | | While this fixes an error with a backendValue not being referenced correctly, it also adds more strict referencing to the getBackendValue function calls. Change-Id: Ib1609c71e30fda6c6418d4542cf443b05d0bd6e8 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Bump version in wizardThomas Hartmann2022-05-201-1/+1
| | | | | Change-Id: I7919a3191775dfabedc9178cdbeb169c46bb1a53 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix FilterComboBox same value submitHenning Gruendl2022-05-201-12/+24
| | | | | | | | | | | * Fix issue when same URL gets submitted twice in a row * Fix selection of model item when submitting a custom URL that aligns with an item in the model Change-Id: Ica8819f72a1f2dc0c239eb2ced25a11a1355d81f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Show id-less scenes properly in 3D edit viewMiikka Heikkinen2022-05-182-8/+18
| | | | | | | Fixes: QDS-6942 Change-Id: I5b7fa966bf9d7321b1735ef0ea7cb904b82f542d Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix typoHenning Gruendl2022-05-181-1/+1
| | | | | | Change-Id: If6860fe3094124dcac381f72ae88722759167354 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Input lose focus after pressing enterHenning Gruendl2022-05-179-143/+183
| | | | | | | | | | | | | * Add losing focus after pressing Return/Enter for all TextInputs * Add losing focus and reverting values after pressing Escape for all TextInputs * FontComboBox fix initial value selection * Code cleanup Task-number: QDS-5972 Task-number: QDS-6028 Change-Id: Ice7449e89088f6e7da76eb7c2edefab647b109de Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 03:06:56 +0000