355 Commits

Author SHA1 Message Date
ChrisTerBeke
d900648f99 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 09:28:22 +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
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
ChrisTerBeke
518d7fac51 Fix merge conflict 2018-12-13 13:44:33 +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
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
Jaime van Kessel
50099ab753 Make a few missed items themeable as well
CURA-6013
2018-12-07 16:02:21 +01:00
Jaime van Kessel
4742db6fec Cleanup gridTile
CURA-6013
2018-12-07 15:57:52 +01:00
Jaime van Kessel
fed9e2b623 Move the click area of the download tile to just the icon
CURA-6013
2018-12-07 15:42:46 +01:00
Jaime van Kessel
8b25e6946a Prevent attempting to rate when not logged in
CURA-6013
2018-12-07 15:33:44 +01:00
Jaime van Kessel
f4220da550 Adds rough first version of rating stars
It's not fully polished just yet

CURA-6013
2018-12-07 15:31:33 +01:00
Jaime van Kessel
ab8a2a9b2b Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-6006-login-required 2018-12-07 10:51:48 +01:00
Jaime van Kessel
eaf413997d Changed the installed button to be a secondary button
CURA-6006
2018-12-07 09:44:09 +01:00
Jaime van Kessel
9eb09132d6 Fix minor layout issue installed page
CURA-6006
2018-12-07 09:38:02 +01:00
Jaime van Kessel
b33ce7a50f Fix alignment of download grid tile
CURA-6006
2018-12-07 09:35:08 +01:00
Jaime van Kessel
eddf4e7f3d Simplify QML 2018-12-06 19:38:12 +01:00
Jaime van Kessel
d4a255c9e5 Also add the login required label at the installed plugin list
CURA-6006
2018-12-06 17:35:58 +01:00
Jaime van Kessel
2c9c9d8c96 Handle non-happy path for downloading
CURA-6006
2018-12-06 17:23:02 +01:00
Jaime van Kessel
717fb260c1 Change toolbox tabs to controls2
CURA-6006
2018-12-06 16:58:40 +01:00
Jaime van Kessel
4b8e3c32cb Also show the login required if an update is needed
CURA-6006
2018-12-06 16:37:47 +01:00
Jaime van Kessel
4e2ab163ed Add login fequired link to packages that have the login-required tag
CURA-6006
2018-12-06 16:24:12 +01:00