GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 18:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,356 Commits 290 Branches 260 Tags
Commit Graph

362 Commits

Author SHA1 Message Date
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
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
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
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
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
05e17843c6
Removed previous variants of the dismiss incompatible package functionality 
CURA-7090
 2020-01-24 13:56:59 +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
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
Nino van Hooff
1287ebdc51 Change backgroundColor and margin for licenseDialog 
CURA-7129
 2020-01-21 14:43:02 +01:00
Nino van Hooff
9dd50c8804 Replace buttons by PrimaryButtons for cloud sync dialogs 
CURA-6984
 2020-01-17 13:54:39 +01:00
Dimitriovski
51ec8a539f
Added a 'Marketplace' icon in the header of the Toolbox 
CURA-7071
 2020-01-16 16:30:11 +01:00
Nino van Hooff
248a4cbb94 Fix merge issues 
CURA-6983
 2020-01-15 16:14:17 +01:00
Nino van Hooff
182bab6467 Merge remote-tracking branch 'origin/master' into CURA-6983_sync_packages 
# Conflicts:
#	plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py
#	plugins/Toolbox/src/Toolbox.py
 2020-01-15 15:40:03 +01:00
Nino van Hooff
1a1e8a9525 Fix rebase bug regarding package compatibility 
CURA-6983
 2020-01-15 11:54:34 +01:00
Dimitriovski
7359492e11
Added a Tooltip over the Dismiss button. Changed the cursor on hover. 2020-01-13 11:44:23 +01:00
Dimitriovski
071cf5517e
linting 
CURA-7090
 2020-01-13 10:37:40 +01:00
Dimitriovski
fbe38dc658
added typing, refactored some functions 
CURA-7090
 2020-01-13 09:55:18 +01:00
Dimitriovski
c86cc3ae5a
Added 'dismiss' link and logic for removing the item from the dialog 
CURA-7090
 2020-01-10 16:48:45 +01:00
Nino van Hooff
88d210d12d Fix The toolbox license dialog 
CURA-6983
 2020-01-10 11:47:36 +01:00
Nino van Hooff
89994b92b5 Finished LicensePresenter 
CURA-6983
 2020-01-10 11:43:42 +01:00
Nino van Hooff
dda3d0b4eb Fix downloadPresenter and initial LicensePresenter.py code 
CURA-6983
 2020-01-10 11:43:42 +01:00
Nino van Hooff
1a816ad010 Introduce the SyncOrchestrator 
CURA-6983
 2020-01-10 11:42:48 +01:00
Nino van Hooff
6eab5e2492 Add HttpRequestScope and fix the CompatibilityDialog 
CURA-6983
 2020-01-10 11:42:48 +01:00
Jaime van Kessel
f15e0c5477
Merge branch 'CURA-7038_remove_labels_if_no_packages' of github.com:Ultimaker/Cura 2020-01-09 13:25:39 +01:00
Dimitriovski
98a825fbf1
Rebased the subscribe function to use latest version of HttpRequestManager 
CURA-6577
 2020-01-08 11:51:07 +01:00
Dimitriovski
fc504a7cb6
Removed redundant string comparison 
CURA-7038
 2020-01-07 14:43:49 +01:00
Dimitriovski
75d2a72424
Remove the label(s) from the compatibility dialog if there are no packages 
CURA-7038
 2020-01-07 14:19:31 +01:00
Dimitriovski
1ea8145f39
Changed the hardcoded value for leftMargin 
CURA-7038
 2019-12-31 14:35:47 +01:00
Dimitriovski
93c1c1a86e
deleted unused lines 
CURA-7038
 2019-12-30 17:38:21 +01:00
Dimitriovski
ada2a776d5
Reworked the Compatibility Dialog and how it shows the subscribed packages 
CURA-7038
 2019-12-30 17:36:46 +01:00
Dimitriovski
12be21e594
Reworked the flow to show only not installed packages for installing in the Compatibility Dialog 
CURA-7038
 2019-12-23 17:23:26 +01:00
Dimitriovski
bd8c1e4c96
Initial implementation for the Compatibility Dialog window 
CURA-7038
 2019-12-23 15:18:09 +01:00
Dimitriovski
dc20db393e
Initial work for Compatiility Dialog done 
CURA-7038
 2019-12-20 13:10:22 +01:00
Jaime van Kessel
c6f42766c7
Remove hardcoded sizes from dialogs & popups 
Contributes to #6670
 2019-11-19 13:00:39 +01:00
Nino van Hooff
ed7134ded8 Organize Toolbox (marketplace) qml files according to type 
CURA-6569
 2019-11-04 17:35:24 +01:00
Nino van Hooff
3d352b3585 Show welcome page in marketplace window when not logged in 
TODO: marketplace logo

CURA-6569
 2019-11-04 15:44:04 +01:00
Nino van Hooff
ac8a7d4aeb Add whitespace between plugin name and licence string in license dialog 2019-10-16 09:44:09 +02:00
Ghostkeeper
8f97751e11
Don't make 'print core' translatable 
It is an Ultimaker name so it should never be translated.

Contributes to issue CURA-6768.
 2019-09-23 14:35:22 +02:00
Ghostkeeper
362c7d09fb
Fix displaying generic materials 
I had that commented out for debugging.
 2019-08-16 13:38:14 +02:00
Ghostkeeper
04d5423d81
Fix scrolling all the way down in Qt 5.13 
It didn't properly connect the height of the column to the scrolled length, I think. Perhaps a Qt bug. It didn't occur in 5.11 or 5.10 yet.
 2019-08-16 13:36:15 +02:00
Diego Prado Gesto
46e6baf6ae Make suggested changes 
Add anchors instead of using width

Contributes to CURA-6518.
 2019-07-23 16:17:54 +02:00
Diego Prado Gesto
1d6ba3ffb0 Merge branch 'master' into fixes_toolbox 2019-07-23 15:15:02 +02:00
Jaime van Kessel
d0cf7f04bf Don't show "Your rating" for generic materials 2019-06-05 16:45:34 +02:00
Jaime van Kessel
414e8d2b08 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 09:20:42 +02:00