370 Commits

Author SHA1 Message Date
Lipu Fei
f7fb04d4ae Fix merge conflicts with 4.0 2019-01-03 15:25:40 +01:00
Ghostkeeper
4177faa6ea
Fix font usage in installed plug-ins
Several different font sizes should be used here.

Contributes to issue CURA-6025.
2018-12-31 15:37:31 +01:00
Ghostkeeper
7ef8287e52
Fix theming of back button in Marketplace
Give it a bit more space for if the translated text is wider, and if it is wider also align it properly with the arrow.

Contributes to issue CURA-6025.
2018-12-31 15:33:37 +01:00
Ghostkeeper
30ab1a957f
Make headers of Marketplace large
As per the design.

Contributes to issue CURA-6025.
2018-12-31 15:18:50 +01:00
Ghostkeeper
df0351acd4
Fix fonts of plug-in tiles
Contributes to issue CURA-6025.
2018-12-31 15:14:23 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Diego Prado Gesto
da69c16e09 Split the constants in to files, indicating which constants each file
stores.

Contributes to CURA-6005.
2018-12-18 16:14:13 +01:00
Diego Prado Gesto
3c99b69724 Merge branch '4.0' into CURA-6005_cura_drive_plugin
Remove unused file.

Contributes to CURA-6005.
2018-12-18 07:17:37 +01:00
Diego Prado Gesto
d6212d5a39 Add elide in the showcase title and reduce the height a bit so there are
only 2 lines for the title.
2018-12-17 17:29:24 +01:00
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6
Increment API version to 6
2018-12-17 15:43:09 +01:00
Jaime van Kessel
1352193654 Ensure that the sourceSize is set correctly 2018-12-17 15:26:10 +01:00
Jaime van Kessel
53da111617 Change "Rating" to "Your rating" 2018-12-17 15:21:48 +01:00
Lipu Fei
6992fd2991 Update plugin versions to match package versions
CURA-6019
2018-12-17 13:03:21 +01:00
Diego Prado Gesto
e62a570210 Merge branch '4.0' into CURA-6005_cura_drive_plugin 2018-12-17 11:25:19 +01:00
Lipu Fei
efb832702b
Merge pull request #4976 from Ultimaker/CURA-6013-rate-packages
Cura 6013 rate packages
2018-12-17 08:32:18 +01:00
Ghostkeeper
c235f339ae
Increment API version to 6
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.

Contributes to issue CURA-6019.
2018-12-14 17:29:02 +01:00
Lipu Fei
ae695b77e6 Add native rendering for QML Label
CURA-6013
2018-12-14 15:23:59 +01:00
Jaime van Kessel
edd4f6e1fa Fix some minor QML warnings
CURA-6013
2018-12-14 11:02:10 +01:00
Jaime van Kessel
7616f9c97d Make hardcoded color themeable
CURA-6013
2018-12-14 10:59:59 +01:00
Jaime van Kessel
450f301c8c Fix binding loop
CURA-6013
2018-12-14 10:56:13 +01:00
Jaime van Kessel
bb1bf14a01 Prevent rating when user is not logged in
CURA-6013
2018-12-14 10:46:31 +01:00
Lipu Fei
3225512851 Fix typing
CURA-6013
2018-12-13 15:48:06 +01:00
Lipu Fei
17c93dea80 Fix merge conflicts with 4.0 2018-12-13 14:39:28 +01:00
Diego Prado Gesto
121af7ad60 Reuse the primary button in the toolbox for the "Quit Cura" button 2018-12-13 09:41:07 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13.
Contributes to CURA-6025.
2018-12-12 17:50:21 +01:00
Lipu Fei
b6ea61612e Fix merge conflicts 2018-12-12 13:26:01 +01:00
Jaime van Kessel
901c19e270 Prevent QML warning
CURA-6013
2018-12-12 11:52:04 +01:00
Jaime van Kessel
e30ca20c54 Merge branch '4.0' of github.com:Ultimaker/Cura into CURA-6013-rate-packages 2018-12-12 11:50:26 +01:00
Jaime van Kessel
dbf91fca7f Re-added hover on showcase tiles
CURA-6013
2018-12-12 11:40:51 +01:00
Jaime van Kessel
5fd0f2b5f6 Add tooltip to rating if the rating is disabled
This makes it clearer what the user needs to do in order to rate (install package or login)

CURA-6013
2018-12-12 11:09:58 +01:00
Lipu Fei
f302a76d3a Fix typing issue in Toolbox
CURA-6006
2018-12-12 10:47:18 +01:00
Jaime van Kessel
95f70a75d8 Ensure that package name has margins in showcase tile
CURA-6013
2018-12-12 10:39:56 +01:00
Jaime van Kessel
a6dbba7090 Minor UI tweaks
CURA-6013
2018-12-12 09:41:35 +01:00
Jaime van Kessel
4d57aa8ea4 Simplify the rating widget
CURA-6013
2018-12-12 09:28:15 +01:00
Jaime van Kessel
fcaa23ed0a Added smallRating widget to featured plugins
CURA-6013
2018-12-11 15:16:21 +01:00
Jaime van Kessel
7a5701b001 Made smallrating widget re-usable
Also added it to the details page

CURA-6013
2018-12-11 14:12:34 +01:00
Jaime van Kessel
30057e2fcd Use user_rating instead of user
In the end it was implemented as user_rating (and not as user)

CURA-6013
2018-12-11 13:49:45 +01:00
Jaime van Kessel
4baf0d1bdb Always show average rating
CURA-6013
2018-12-11 13:49:20 +01:00
Lipu Fei
2275e5c71f Refactor code to use constants in CuraConstants
CURA-6005
2018-12-11 12:13:46 +01:00
Lipu Fei
69744282e6 Fix rounding issue in toolbox QML widget size
CURA-6006
2018-12-10 14:38:40 +01:00
Lipu Fei
861deaa9f7 Add renderType native for toolbox QML Labels
CURA-6006
2018-12-10 14:38:33 +01:00
Jaime van Kessel
9d1701aacb Removed hardcoded color
CURA-6013
2018-12-10 13:29:58 +01:00
Lipu Fei
b745755a7d Remove TODO in ToolboxProgressButton
CURA-6006

This file has been refactored.
2018-12-10 13:22:38 +01:00
Lipu Fei
1487af167b Disable async loading for ToolboxDetailTile
CURA-6006
2018-12-10 13:20:38 +01:00
Jaime van Kessel
70b9a44ae4 Removed import of CuraVersion
CURA-6013
2018-12-10 13:04:02 +01:00
Jaime van Kessel
82322d8575 Show that a downloaded plugin has a user rating or not
CURA-6013
2018-12-10 11:12:25 +01:00
Jaime van Kessel
99f0e96131 Ensure that the local model is updated correctly on local vote
CURA-6013
2018-12-10 11:01:55 +01:00
Jaime van Kessel
098adc45ff Move the rating logic outside of the rating widget
That way it's easier to re-use the component if that's ever required.

CURA-6013
2018-12-10 10:40:54 +01:00
Jaime van Kessel
04f3601c27 Ensure that local votes are displayed right away
So even before an update is received, ensure that the data is updated

CURA-6013
2018-12-10 09:54:26 +01:00
Jaime van Kessel
e92bd01fb2 Removed the rating from the download grid
It felt a bit weird to already have it in the grid layout

CURA-6013
2018-12-07 17:28:42 +01:00