7988 Commits

Author	SHA1	Message	Date
Jaime van Kessel	18163af5a3	Ensure that the default default marketplace URL is used when not defined ... CURA-7071	2020-01-30 09:42:51 +01:00
Nino van Hooff	8c250cfbbc	Process review comments ... CURA-7099	2020-01-29 11:28:29 +01:00
Matt Jani	155408d77d	Merge branch 'master' of https://github.com/Ultimaker/Cura	2020-01-28 15:28:26 +01:00
Matt Jani	f62312449b	Fixed wrong extrusion (issue #6730)	2020-01-28 15:26:43 +01:00
Ghostkeeper	242da1b3aa	Give web marketplace button a hover colour ... It needs to be the same as the bar beneath the marketplace tab buttons when highlit. Contributes to issue CURA-7071.	2020-01-28 14:47:00 +01:00
Ghostkeeper	6553443f3b	Make marketplace materials link slightly smaller ... Contributes to issue CURA-7071.	2020-01-28 14:41:29 +01:00
Ghostkeeper	38e7a9e4df	Turn Marketplace link into an actual link ... With consistent styling. The original design didn't have the link underlined but since the rest of the Cura UI has it underlined I let that happen here too. Contributes to issue CURA-7071.	2020-01-28 14:37:59 +01:00
Ghostkeeper	e51a1b18be	Add link text to marketplace search page ... Contributes to issue CURA-7071.	2020-01-28 14:19:33 +01:00
Ghostkeeper	1c79193f9a	Always go to plug-ins page regardless of active tab ... This was a requirement from UX. Apparently we're adding a link to the materials elsewhere. Contributes to issue CURA-7071.	2020-01-28 13:25:27 +01:00
Nino van Hooff	d4eb463f2d	Always subscribe to packages after installing them ... Now that we subscribe for all situations where a package is installed, it makes sense to watch package installs and create a 1:1 relation that way. Prevents code duplication. CURA-7099	2020-01-28 13:08:57 +01:00
Ghostkeeper	13644f7e41	Load different pages of Marketplace depending on current tab ... Feels intuitive actually, but if you think about it it's weird that the link should change depending on the tab that's next to it. Contributes to issue CURA-7071.	2020-01-28 11:58:56 +01:00
Ghostkeeper	ad2b8f140e	Make Marketplace link configurable from the build system ... This way you could set it to marketplace-staging if you like. Contributes to issue CURA-7071.	2020-01-28 11:52:46 +01:00
Ghostkeeper	654a28450d	Fix dark theme icon colour ... Contributes to issue CURA-7071.	2020-01-28 11:36:42 +01:00
Ghostkeeper	e6856b02a4	Make entire tooltip area clickable ... Also saves on another component. And it's more logical, easier to use and fault-tolerant. Contributes to issue CURA-7071.	2020-01-28 11:33:25 +01:00
Ghostkeeper	1d110c2c33	Reduce size of web marketplace link button ... Contributes to issue CURA-7071.	2020-01-28 11:31:10 +01:00
Ghostkeeper	812017c814	Switch out shop icon ... The sourceSize needs to be adjusted because this is an SVG that we don't necessarily want to stretch but just want to render directly at the correct size. Contributes to issue CURA-7071.	2020-01-28 11:29:01 +01:00
Nino van Hooff	5cedb2933e	Only subscribe when logged in. (When installing a package from toolbox)	2020-01-28 09:31:36 +01:00
ninovanhooff	3a0bd48e1b	Merge pull request #7011 from Ultimaker/CURA-7090-addition ... CURA-7090/Added check to reevaluate dismissed incompatible packages	2020-01-27 14:33:13 +01:00
Kostas Karmas	a720939e64	Fix max layer to correspond to starting layer ... When the starting layer was set to 0 the max layer was not adjusted to be max_layer-1. This commit makes the extra adjustment.	2020-01-27 14:21:51 +01:00
konskarm	e128dadbf5	Merge pull request #6930 from jtychu/master ... Update DisplayFilenameAndLayerOnLCD.py	2020-01-27 14:08:26 +01:00
Dimitriovski	a08bea1376	String translate improvements ... CURA-7090	2020-01-27 14:00:47 +01:00
Dimitriovski	2e0fef3bd4	Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition	2020-01-27 13:25:35 +01:00
Dimitriovski	aa2c612925	PR review changes	2020-01-27 13:25:29 +01:00
Jaime van Kessel	61a3122a78	Merge branch 'CURA-7129_license_window_design' of github.com:Ultimaker/Cura	2020-01-24 16:56:23 +01:00
Dimitriovski	537891d80b	Further improvements and refactors to the CloudPackageChecker	2020-01-24 16:05:35 +01:00
Dimitriovski	526cdac200	fixed silly merge conflict	2020-01-24 15:41:13 +01:00
Dimitriovski	38c7d80f82	Refactored the onConfirmClicked function. Added the ability to auto-dismiss the incompatible packages. Changed the button text depending on the displayed list	2020-01-24 15:39:58 +01:00
Remco Burema	40ec88ab70	Merge pull request #7005 from Ultimaker/CURA-6627_Store_extra_data_project_files ... CURA-6627_Store_extra_data_project_files	2020-01-24 15:21:04 +01:00
Dimitriovski	d829405347	Update plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py	2020-01-24 14:54:12 +01:00
Ghostkeeper	d31240ad70	Merge branch 'CURA-6627_Store_extra_data_project_files'	2020-01-24 14:53:33 +01:00
Dimitriovski	05e17843c6	Removed previous variants of the dismiss incompatible package functionality ... CURA-7090	2020-01-24 13:56:59 +01:00
Dimitriovski	7ee8270b2e	Added the mechanism to dismiss all Incompatible packages when the Compatibility Dialog is closed ... CURA-7090	2020-01-24 13:51:49 +01:00
Dimitriovski	ae494110ba	Removed unnecessary line (because we still want to show the Compatability Dialog even if there are only Incompatible packages) ... CURA-7090	2020-01-24 11:28:36 +01:00
Dimitriovski	eb3bd811c1	Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition	2020-01-24 11:27:05 +01:00
Nino van Hooff	a02e8d3b58	Use display_name for the package name in the license dialog ... Implemented for both CloudSync and Toolbox	2020-01-24 10:36:36 +01:00
Jaime van Kessel	57648e2bb0	Merge branch 'CURA-6627_Store_extra_data_project_files' of github.com:Ultimaker/Cura into CURA-6627_Store_extra_data_project_files	2020-01-23 09:29:18 +01:00
Jaime van Kessel	87fb0d7df3	Fix incorrect read location for plugin metadata ... CURA-6627	2020-01-23 09:28:28 +01:00
Nino van Hooff	b25d6360ab	More documentation for UltimakerCloudScope	2020-01-22 11:53:48 +01:00
Nino van Hooff	1324969dc2	Add some documentation for HttpRequestScope	2020-01-22 11:50:22 +01:00
Nino van Hooff	95def2850d	Make license decline button text context-dependant ... CURA-7129	2020-01-22 11:17:29 +01:00
Nino van Hooff	3b534ea986	Add icon to licenseDialog (Toolbox flow) ... CURA-7129	2020-01-22 10:54:05 +01:00
Nino van Hooff	2f3cf3c493	LicenseDialog layout tweaking ... CURA-7129	2020-01-22 10:53:43 +01:00
Nino van Hooff	b3812a3630	Add icon to licenseDialog (clowd flow) ... CURA-7129	2020-01-21 17:07:21 +01:00
Ghostkeeper	a3825c1f14	Merge branch 'master' into CURA-6627_Store_extra_data_project_files	2020-01-21 15:14:45 +01:00
Dimitriovski	369329c476	Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition	2020-01-21 15:08:24 +01:00
Dimitriovski	5c498de1e4	Use meaningful variable name && some TODOs for later. ... CURA-7090	2020-01-21 15:07:11 +01:00
Dimitriovski	e7ed93c132	fixed typing ... CURA-7090	2020-01-21 14:51:53 +01:00
Nino van Hooff	1287ebdc51	Change backgroundColor and margin for licenseDialog ... CURA-7129	2020-01-21 14:43:02 +01:00
Dimitriovski	8abaa60052	Passed the sdk_version to the reevalute() function ... CURA-7090	2020-01-21 11:24:31 +01:00
Dimitriovski	365c30fadb	Added check to reevaluate dismissed incompatible packages (in case the package gets updated and has the correct SDK version) ... CURA-7090-addition	2020-01-21 09:52:33 +01:00