5311 Commits

Author SHA1 Message Date
Diego Prado Gesto
635115a879
Merge pull request #4982 from Ultimaker/fix_preview_stage_menu
Fix preview stage menu
2018-12-13 09:32:01 +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
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
alekseisasin
a505adbf40
Merge pull request #4945 from Ultimaker/CURA-6006-login-required
[4.0] CURA-6006 login required
2018-12-12 11:31:38 +01:00
alekseisasin
64104e47c6
Merge pull request #4970 from Ultimaker/fix_preview_stage_menu
Fix preview stage menu
2018-12-12 11:22:08 +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
Remco Burema
1b2ef91c13 Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0 2018-12-12 10:54:36 +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
Remco Burema
65f1c9a304
Merge pull request #4969 from Ultimaker/CURA-6016_Improve_UI_Speed
Cura 6016 improve ui speed
2018-12-11 17:26:15 +01:00
Ian Paschal
1ababf38ad Use full printer name if no tag is known
Contributes to CL-1173
2018-12-11 16:42:44 +01:00
Ian Paschal
daeb86bdb1 Use short printer family tags
Contributes to CL-1173
2018-12-11 15:55:03 +01:00
Diego Prado Gesto
c804610fa6 Make the stage menu in the preview using 85 percent of the total width in order to prevent the print setup panel to be in the middle 2018-12-11 15:19:40 +01:00
Jaime van Kessel
fcaa23ed0a Added smallRating widget to featured plugins
CURA-6013
2018-12-11 15:16:21 +01:00
Diego Prado Gesto
742fc34e75 Change labels in the layer view legend 2018-12-11 14:31:12 +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
Diego Prado Gesto
db56aa028c Change the swatch from a circle to the extruder icon 2018-12-11 13:59:36 +01:00
Diego Prado Gesto
faa3f42acc Modify the header in the simulation view menu component
This is needed to align with the designs.
2018-12-11 13:53:05 +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
Jaime van Kessel
75ff03f3c8 Use setState instead of emitting the backend state
CURA-6016
2018-12-11 13:13:20 +01:00
Diego Prado Gesto
1f26b55731
Merge pull request #4966 from Ultimaker/CL-1160_fix_materials_none_type
CL-1160 Replace fix for 'None' materials
2018-12-11 12:14:34 +01:00
Diego Prado Gesto
4949f39c34 Add translatable strings to empty and unknown material
Contributes to CL-1160.
2018-12-11 12:10:32 +01:00
Diego Prado Gesto
70b0d16fa4 Fix typo
Missing parenthesis.

Contributes to CL-1160.
2018-12-11 11:53:26 +01:00
Ian Paschal
1c373b7205 Improve config override text
Contributes to CL-1152
2018-12-11 11:51:13 +01:00
Diego Prado Gesto
2b2e8ebb31 Add some safety checks when checking for the guid of the material
Don't crash if the guid doesn't exist.

Contributes to CL-1160.
2018-12-11 11:37:01 +01:00
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
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
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