17050 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	f10bd28c4a	Improve grammar and do similar fix for extruder end g-code ... Contributes to issue CURA-5906.	2018-11-16 17:25:32 +01:00
Marijn Deé	22aac7b566	Renamed TestContainerRegistry to ContainerRegistryMock	2018-11-16 16:35:08 +01:00
Marijn Deé	565f009e9b	Added comments	2018-11-16 16:34:44 +01:00
Jaime van Kessel	6b55490af8	Fix final QML warnings ... CURA-5785	2018-11-16 16:30:47 +01:00
Jaime van Kessel	bc5a2ce5b0	Make ViewSelector panel close upon selecting different view ... CURA-5785	2018-11-16 16:16:15 +01:00
Jaime van Kessel	52b2f4579a	Fix a number of QML warnings ... CURA-5785	2018-11-16 16:13:09 +01:00
Marijn Deé	1000625d69	Added spaces around all =	2018-11-16 16:07:17 +01:00
Marijn Deé	0062250238	Moved the test to the plugin directory	2018-11-16 16:06:36 +01:00
Jaime van Kessel	7f99ed1af3	ExtruderIcon will now display that it's disabled correctly ... CURA-5785	2018-11-16 16:04:11 +01:00
Marijn Deé	695d45ffbe	Initialize the models with None	2018-11-16 15:54:07 +01:00
Jaime van Kessel	d661a8e626	Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu	2018-11-16 15:23:38 +01:00
Jaime van Kessel	42399ecb24	Let headerItem fill entire component if no icon is set ... CURA-5785	2018-11-16 15:17:34 +01:00
Jaime van Kessel	b72f1bb314	Add missing screenScaleFactor for implicit sizes ... CURA-5785	2018-11-16 15:15:44 +01:00
Ghostkeeper	816d844258	Use textwidth instead of round ... CURA-5785 Co-Authored-By: nallath <nallath@gmail.com>	2018-11-16 15:14:08 +01:00
Jaime van Kessel	fe15a0a513	Made width of machineSelector popup depend on size of the element ... CURA-5785	2018-11-16 15:09:47 +01:00
Jaime van Kessel	5972bfaf03	Add round to minContentWidth ... This prevents text from getting a weird width CURA-5785	2018-11-16 15:06:21 +01:00
Jaime van Kessel	320efa443e	Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu	2018-11-16 14:58:47 +01:00
Jaime van Kessel	3fd1cc0e8c	Ensure that the added labels are also themable ... CURA-5785	2018-11-16 14:58:11 +01:00
Marijn Deé	421af26f87	Extra test on test_sendMaterialsToPrinter, removed unused code	2018-11-16 14:54:49 +01:00
Marijn Deé	e9e8c49b2d	Added tests for SendMaterialJob and refactored SendMaterialJob for ... better testability. This is part of a larger project to create tests for the UM3NetworkPrinting plugin in preparation for printing from the cloud	2018-11-16 14:16:45 +01:00
Ghostkeeper	3ef6d0544a	Fix spelling and indents ... Ant-fuckery, as they say in the low lands. Contributes to issue CURA-5785.	2018-11-16 14:11:23 +01:00
Ghostkeeper	e087db7c2e	Code style and fixes to comments ... Contributes to issue CURA-5785.	2018-11-16 14:11:22 +01:00
Ghostkeeper	514fc13045	Remove redundant documentation ... CURA-5875 Co-Authored-By: nallath <nallath@gmail.com>	2018-11-16 14:04:33 +01:00
Ghostkeeper	81b6f3ab11	Update unclear qml ID's ... CURA-5785 Co-Authored-By: nallath <nallath@gmail.com>	2018-11-16 14:03:39 +01:00
Ghostkeeper	de020b4c75	Remove commented out code ... Co-Authored-By: nallath <nallath@gmail.com>	2018-11-16 14:02:00 +01:00
Ghostkeeper	e3dd5f1c39	Add documentation about qml z fix ... Co-Authored-By: nallath <nallath@gmail.com>	2018-11-16 13:59:51 +01:00
Jaime van Kessel	93bd5fee53	Fix wrong push free shadow for one at a time. ... It was applying the size twice. CURA-5822	2018-11-16 13:44:46 +01:00
Jaime van Kessel	240ac1f06b	Clarify some setting descriptions	2018-11-16 13:03:45 +01:00
Ghostkeeper	bee563f01b	Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu	2018-11-16 13:02:24 +01:00
Jaime van Kessel	401a6b5f8b	Merge pull request #4794 from fieldOfView/fix_adhesion_type_error ... Fix adhesion type error during startup	2018-11-16 11:24:29 +01:00
Aleksei S	846d608a03	Merge branch 'master' of github.com:Ultimaker/Cura	2018-11-15 15:59:00 +01:00
Aleksei S	2bf4354fed	Removed minimum_value for the setting support_roof_offset and support_bottom_offset ... CURA-5880	2018-11-15 15:57:34 +01:00
Ghostkeeper	d732a2f953	Merge branch 'master' into ui_rework_4_0	2018-11-15 15:55:08 +01:00
Ghostkeeper	e9216936d7	Compare SDK version as Version instances ... This allows it to compare versions that are remote as integer and local as string, or vice-versa. Much more robust. Contributes to issue CURA-5940.	2018-11-15 15:20:21 +01:00
Ghostkeeper	78e6494430	Read SDK version from new semver field ... The sdk_version field should stay the ordinary plain number (the major version number of the semver field) so that older Cura versions don't break. Newly built packages will get built with both sdk_version_semver and the normal sdk_version, so that the packages can be read with any Cura version from 3.6 onwards. Contributes to issue CURA-5940.	2018-11-15 15:13:36 +01:00
Jaime van Kessel	6dd6f5ecc7	Made the hardcoded values of ExpandableComponent themable ... CURA-5785	2018-11-15 14:11:46 +01:00
Jaime van Kessel	3629e3b604	Added highlight to ExpandableComponent ... CURA-5785	2018-11-15 14:04:52 +01:00
Jaime van Kessel	eca9820fc4	Add toggle function to expandable popup ... Also ensures that the machineSelector closes the popup on making a choice CURA-5785	2018-11-15 13:55:33 +01:00
Jaime van Kessel	f0b8c1e611	Fix some minor display issues ... CURA-5785	2018-11-15 09:45:46 +01:00
Ghostkeeper	163f102dda	Make extension menu items translatable ... If these extension plug-ins don't set their menu names, the plug-in name is used as the menu name. The plug-in names are not translated, so this appears as an untranslated string then.	2018-11-15 09:38:14 +01:00
Jaime van Kessel	c08aa2205c	Fix enabled checkbox for extruder selection ... CURA-5785	2018-11-15 09:37:54 +01:00
Jaime van Kessel	21d7619a45	Added a hover effect to the expandableComponent ... CURA-5785	2018-11-14 16:57:05 +01:00
Jaime van Kessel	20b7a925a0	Remove unused code & outdated todo comment ... CURA-5785	2018-11-14 16:49:01 +01:00
Jaime van Kessel	9aa5b6fe3f	Hide one spacer if there is no viewPanel ... CURA-5785	2018-11-14 16:47:53 +01:00
Jaime van Kessel	c27f51d944	Make the view selector also use the expandableComponent ... CURA-5785	2018-11-14 16:44:36 +01:00
fieldOfView	b671a3153a	Catch an error getting an extruder value before extruders are added to the global stack	2018-11-14 14:21:39 +01:00
fieldOfView	66c3cc9204	Prevent an error during start up	2018-11-14 14:20:42 +01:00
Jaime van Kessel	429a49aa2e	Make the default size of the expandableComponent icon depend on the height of the element ... This is a way more sensible default. CURA-5785	2018-11-14 14:06:55 +01:00
Jaime van Kessel	7ca3490097	Make the collapse arrows consistent with the rest of the UI ... CURA-5785	2018-11-14 14:00:19 +01:00
Ghostkeeper	8ec7d6dba3	Fix type issues in old version upgrade plug-ins ... The one actual change was this: To give a KeyError when stuff can't be found in a dictionary, rather than returning None there and then getting a TypeError later. Contributes to issue CURA-5936.	2018-11-14 13:56:46 +01:00