635 Commits

Author	SHA1	Message	Date
Ghostkeeper	bcf4bc8138	Simplify _is_any_version_compatible ... It now literally says: for any version, is it compatible? Contributes to issue CURA-7207.	2020-02-11 11:02:32 +01:00
Nino van Hooff	5beba6050f	Fix api version checking ... CURA-7207	2020-02-11 09:52:39 +01:00
Ghostkeeper	6f707f3149	Bump SDK version number of Cura 4.5 to 7.1 ... We've added new things to our API. This allows plug-in developers to use them. Contributes to issue CURA-7205.	2020-02-10 10:45:07 +01:00
Nino van Hooff	050ff62344	Don't show license Screen when there are no licenses to show ... CURA-7198	2020-02-07 13:47:15 +01:00
Jaime van Kessel	15d83cc6da	Fix typing issue	2020-02-04 13:38:52 +01:00
konskarm	35903e7dd3	Merge pull request #6988 from Ultimaker/CURA-7071 ... CURA-7071/Added option to redirect to Web MP from Cura MP	2020-02-04 11:02:30 +01:00
Ghostkeeper	66e2ca6aa5	Merge branch 'CURA-7099_sync_sideloaded_plugins'	2020-02-03 16:12:56 +01:00
Jaime van Kessel	1fc0705c31	Remove a bit of over verbose logging ... It would put the content of the entire licence file into the log, which seems a bit much to me.	2020-02-03 13:20:08 +01:00
Jaime van Kessel	42f7cead4d	Merge branch 'CURA-7155_confusing_license_dialog_page_count' of github.com:Ultimaker/Cura	2020-02-03 13:16:23 +01:00
Nino van Hooff	a02b753d53	Count the number of packages which have a license to display ... CURA-7155	2020-01-30 16:42:42 +01:00
Ghostkeeper	d437d480dc	Code style: Spaces around binary operators ... Contributes to issue CURA-7099.	2020-01-30 16:10:36 +01:00
Jaime van Kessel	37471b7861	Merge branch 'CURA-7152_unreadable_license_dialog' of github.com:Ultimaker/Cura	2020-01-30 15:32:21 +01:00
Remco Burema	99680db819	Merge branch 'master' of https://github.com/Ultimaker/Cura	2020-01-30 15:07:06 +01:00
Remco Burema	c6b6af14cf	Fix typo.	2020-01-30 15:06:47 +01:00
Nino van Hooff	eec7d2f0cd	Use default timeout for sync dialog	2020-01-30 14:56:19 +01:00
Nino van Hooff	8ea3004c73	Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog ... CURA-7152	2020-01-30 12:51:13 +01:00
Jaime van Kessel	d15e64cc5b	Remove unused import	2020-01-30 09:44:15 +01:00
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
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
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
Dimitriovski	d829405347	Update plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py	2020-01-24 14:54:12 +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
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