GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 19:43:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 289 Branches 260 Tags
Commit Graph

358 Commits

Author SHA1 Message Date
Jelle Spijker
c6fb3fe59c
Merge branch 'main' into CURA-10475_engineplugin 2023-08-07 09:05:15 +02:00
Remco Burema
b1100cb4c5 Relevant comment specifically requests not to call closeApplication in most cases. 
done as a 5 min fix.
 2023-08-04 15:53:52 +02:00
c.lamboo
42002dac36 Update copy 
Now more then just materials can be installed. Update copy to reflect this.

CURA-10719
 2023-07-27 10:14:43 +02:00
Joey de l'Arago
1133e76e66 Add sign in wall 
CURA-10183
 2023-02-09 17:41:08 +01:00
c.lamboo
6ef0a35c15 Fix error where icon in the marketplace would not show 
CURA-10139
 2023-01-11 18:23:42 +01:00
jspijker
61623720ca Update copyright using UltiMaker 
Contributes to CURA-9808
 2022-11-28 10:48:38 +01:00
jspijker
696c0f8547 Update company name to UltiMaker 
Contributes to CURA-9808
 2022-11-28 09:05:21 +01:00
Ghostkeeper
d1747e09e1
Fix link to help page when material package is missing 
In this case we don't want to link to Ultimaker's internal help pages, but to the public support pages.
 2022-06-20 10:48:13 +02:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage 
This only needs to happen in code that uses PyQt, not in qml code
 2022-06-17 15:26:30 +02:00
c.lamboo
76180eee01 Show warning on-close of the install missing packaged dialog 
CURA-6990
 2022-06-06 22:49:49 +02:00
c.lamboo
bee4da6368 Re-use Marketplace Component in the InstallMissingPackagesDialog 
CURA-6990
 2022-06-06 22:27:31 +02:00
c.lamboo
8d3b3ae411 Use themed border width 
CURA-6990
 2022-06-03 11:13:19 +02:00
c.lamboo
4492e3fba2 Add warning border to PackageCard if information is missing 
CURA-6990
 2022-06-03 10:39:01 +02:00
c.lamboo
70c36fc80f Use correct status icon 
CURA-6990
 2022-06-03 10:13:29 +02:00
j.delarago
277a6a38b2 Update campaign link 
CURA-6990
 2022-06-02 17:40:14 +02:00
j.delarago
a0fd5afbe7 Add missing warning badge 
CURA-6990
 2022-06-02 17:38:50 +02:00
j.delarago
511b10c084 Display package cards in the package list for packages that can't be found on the marketplace api. 
When the final page of results is fetched, the list of all package_ids retrieved from the api will be compared with the ones we were searching for. Any that are missing have cards displayed with only basic information (name and version).

CURA-6990
 2022-06-02 16:54:08 +02:00
j.delarago
0df21e6073 Refactor missing packages dialog into model (MissingPackageList) and controller (InstallMissingPackagesDialog.qml) 
Rename classes and files to have unified naming.

CURA-6990
 2022-06-01 16:50:53 +02:00
Ghostkeeper
fc4585e098
Merge branch '5.0' 
Conflicts:
	plugins/Marketplace/resources/qml/PackageCardHeader.qml -> An improvement for future translations was made at the same time as a change to the label here.
 2022-05-16 15:11:39 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
 2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX" 
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
 2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
 2022-05-10 15:36:50 +02:00
Ghostkeeper
3c2c2219ac
Merge branch '5.0' 2022-05-09 14:01:40 +02:00
Ghostkeeper
763b40b8ec
Give icon of onboarding banner a colour 
It had no colour, so it was defaulting to black.
I'm making it the same as the text colour and the colour of the X button.

Fixes issue CURA-9248.
 2022-05-09 14:01:06 +02:00
Jaime van Kessel
7265509054 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-05-03 13:48:31 +02:00
j.delarago
c11ff2ebf6 Add context to "By" string, lots of questions from the translators about this one. 2022-05-02 15:11:51 +02:00
j.delarago
16bb9952c7 Fix marketplace external link button being tiny. 
CURA-9194
 2022-04-26 15:55:08 +02:00
j.delarago
68de54c803 Path for placeholder image was one to many folders up. 
CURA-9146
 2022-04-22 11:01:26 +02:00
j.delarago
c294680022 Fix scrollbar filling space by replacing custom implementation with generic UM.ScrollBar 
CURA-9144
 2022-04-21 15:52:15 +02:00
c.lamboo
7a3af720a8 Resolve urls through qml 
CURA-9146
 2022-04-21 11:32:46 +02:00
Jaime van Kessel
773ff5fa7e Remove unneeded renderType 
CURA-9146
 2022-04-19 11:21:12 +02:00
Jaime van Kessel
3aff3d5825 Fix "read more" not being translated 
Yeah, i know, this breaks the stringfreeze. But this wasn't translated in the
first place. So the actual effect here is zero (but at least it will be translated
in the next round!)

CURA-9146
 2022-04-19 11:19:58 +02:00
Jaime van Kessel
05263b9a58 Fix layout of dialog 
CURA-9146
 2022-04-19 11:17:38 +02:00
Jaime van Kessel
3ed182cd74 Rename MarketplaceLicenseDialog to MultipleLicenceDialog 
CURA-9146
 2022-04-19 11:08:54 +02:00
Jaime van Kessel
5ce5ce769e Re-add the CloudSync functionality 
It got removed in the marketplace upgrade.

CURA-9146
 2022-04-15 13:12:06 +02:00
Jaime van Kessel
5bec905cb9 Remove fill from multiple SVG's 2022-04-11 11:40:04 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
Jaime van Kessel
c88ed076a1 Fix resolving of URL's 2022-04-06 09:57:45 +02:00
Jaime van Kessel
605280255f Use right enum for alignment 2022-04-06 09:53:48 +02:00
Jaime van Kessel
3c6412d5d7 FIx deprecation warning 2022-04-06 09:53:27 +02:00
j.delarago
99a3a8d11d QTQuick.Dialogs jumped to using 6.0 in QT6 
Update imports to use correct version number.

CURA-8640
 2022-03-29 16:04:02 +02:00
j.spijker@ultimaker.com
55cb86ebbd
use namespace AlignmentFlag 
Contributes to CURA-8640
 2022-03-24 11:58:42 +01:00
casper
70f66648f4 Recolor placeholder icon for packages/plugins correctly in dark-mode 
As we don't want to recolor the icon if the package has a custom icon
a `Image` or `UM.RecolorImage` is shown conditionally.

CURA-8975
 2022-03-09 12:10:49 +01:00
j.delarago
e1068fb3bc Replace Text.Align with custom enum alignment 
CURA-8943
 2022-03-04 14:12:11 +01:00
j.delarago
3c7498feed Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool. 
Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!

CURA-8943
 2022-03-03 15:53:30 +01:00
j.delarago
30083c13d3 Swap implicit width/height for preferredWidth/Height to avoid binding loop error 
CURA-8688
 2022-03-02 11:34:03 +01:00
Jaime van Kessel
5f638ed6c6 Generalize the size of the licence window 
No need to have a seperate size of the licence window. Just use
the default modal one
 2022-02-25 13:22:55 +01:00
Casper Lamboo
9fa6698da3
Merge pull request #11536 from Ultimaker/CURA-8834_marketplace_packages_install_status_in_list 
Show install, uninstall & disable buttons in packages list
 2022-02-24 13:39:49 +01:00
Jaime van Kessel
26c027cbdf Remove unneeded properties from package card 
As per review.

CURA-8762
 2022-02-24 13:30:25 +01:00
Jaime van Kessel
0d2c8777c5 Add clarifying comment to a small hack 
CURA-8762
 2022-02-24 13:28:39 +01:00