Commit graph

5333 commits

Author SHA1 Message Date
Ian Paschal
0f357e1078 Replace fix for 'None' materials
This was fixed in 4.0 and accidentally got reverted when merging another branch in.

Contributes to CL-1160
2018-12-11 10:51:05 +01:00
Lipu Fei
badf2962bc Change CuraDrive version to 1.2.0
CURA-6005

Because the previously version is 1.1.1
2018-12-11 10:34:03 +01:00
Ian Paschal
d43ba59b7c
Merge pull request #4959 from Ultimaker/CL-1152_config_change_monitor_tab
CL-1152 config change monitor tab
2018-12-10 16:43:57 +01:00
Ian Paschal
0e19fa731f Codestyle
Contributes to CL-1152
2018-12-10 15:47:45 +01:00
Ian Paschal
04af8fbd50 Update MonitorConfigOverrideDialog.qml
Contributes to CL-1152
2018-12-10 15:33:16 +01:00
Ian Paschal
028d993bab Format .gcode.gz files too
Contributes to CL-1152
2018-12-10 15:27:51 +01:00
Ian Paschal
32f2b7ec1f Fix some warnings
Contributes to CL-1152
2018-12-10 15:05:01 +01:00
Ian Paschal
2db5d2b231 Add support for translation plurals
Contributes to CL-1152
2018-12-10 14:54:45 +01:00
Ian Paschal
df0ae20dde Let's just get stepped up in here and get some personal space
Contributes to CL-1152
2018-12-10 14:39:15 +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
Ian Paschal
315bcf50c7 Get some personal space up in this personal space
Contributes to CL-1152
2018-12-10 14:31:49 +01:00
Aleksei S
c62cb84c75 Added CuraDirve plugin to Cura build
CURA-6005
2018-12-10 14:18:10 +01:00
Diego Prado Gesto
af37f51cf8 Make the expandable content header to be a common header for every expandable component.
Contributes to CURA-5941.
2018-12-10 13:36:06 +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
Ian Paschal
df4e5c40df Rename ClusterMonitorItem
Contributes to CL-1152
2018-12-10 12:19:52 +01:00
Ian Paschal
8a856f13d2 Re-add config changes in monitor tab
Contributes to CL-1152
2018-12-10 11:36:51 +01:00
Ian Paschal
ad7dcf6fc0 Delete ClusterControlItem.qml
Contributes to CL-1152
2018-12-10 11:36:12 +01:00
Ian Paschal
021c448627 Remove depreciated monitor tab stuff
Contributes to CL-1152
2018-12-10 11:31:18 +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
Diego Prado Gesto
46fa33fda5 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:19:19 +01:00
Diego Prado Gesto
9c873faace Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:11:15 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
2018-12-07 12:07:41 +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
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +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
alekseisasin
e29baf0cec
Merge pull request #4943 from Ultimaker/small_ui_fixes
Small ui fixes
2018-12-06 15:23:35 +01:00
Jaime van Kessel
62c5398933 Change buttons to use either secondary or primary
CURA-6006
2018-12-06 14:58:46 +01:00
Jaime van Kessel
a77ad32999 Move all the seperate tiles into loaders instead of the entire page
Otherwise the details selection didn't work anymore and I didn't want to add more hacks.

CURA-6006
2018-12-06 14:35:07 +01:00
Diego Prado Gesto
3ca749cdcb Add a bunch of renderTypes to labels in the DiscoverUM3Action. 2018-12-06 14:31:52 +01:00