GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-20 01:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,744 Commits 291 Branches 260 Tags
Commit Graph

28744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
b622738ae3 Fix missing icons since move to PyQt6 2022-04-22 22:33:14 +02:00
Remco Burema
5d859ffacc
Merge pull request #11876 from Ultimaker/CURA-9146_missing_placeholder_images 
CURA-9146 missing placeholder images for Marketplace
 2022-04-22 13:38:19 +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
Jaime van Kessel
d53a40a923 Merge branch '5.0' of github.com:Ultimaker/Cura into 5.0 2022-04-22 11:01:17 +02:00
Jaime van Kessel
86534e78a0 Prevent error message when no further pages in marketplace could be loaded 
Contributes to #11858
 2022-04-22 11:00:45 +02:00
Casper Lamboo
f8bfd0ef28
Merge pull request #11839 from Ultimaker/CURA-9144_scrollbar_in_marketplace_libary_wrong 
CURA-9144 Scrollbar in Marketplace and Digital Library are acting up
 2022-04-22 10:36:57 +02:00
Jaime van Kessel
c1ed7b97f9 Use right enums for single instance 
CURA-9183
 2022-04-22 09:36:46 +02:00
Remco Burema
e1ec9d68f8
Merge pull request #11838 from Ultimaker/CURA-9134_misalinged_machine_label 
CURA-9134 Misaligned machine label
 2022-04-22 09:25:11 +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
j.delarago
e5c2f5702c Subtract previously unused rightMargin from MachineSelectorButton width. 
CURA-9143
 2022-04-21 15:04:52 +02:00
Ghostkeeper
9389a6f4e8
Merge branch 'CURA-9146_account_sync' into 5.0 5.0-beta 2022-04-21 14:04:27 +02:00
Remco Burema
38d62b73c5 Mostly? fix scrollbars in settings-tooltips. 
CURA-9112
 2022-04-21 14:02:29 +02:00
Jelle Spijker
cab56bf48e
Merge pull request #11835 from Ultimaker/Changelog 
Update change_log.txt
 2022-04-21 13:25:25 +02:00
Ghostkeeper
1e7cf21f46
Merge branch '5.0' into CURA-9146_account_sync 2022-04-21 13:18:49 +02:00
fvrmr
4ca1235c26 Update change_log.txt 
Removed @ from the contributors
 2022-04-21 13:18:32 +02:00
Ghostkeeper
345f0ea41c
Fix copyright headers and code style a bit 
Contributes to issue CURA-9146.
 2022-04-21 13:18:03 +02:00
Jaime van Kessel
8383983ff4 Merge branch 'CURA-9070_dont_lose_focus_search_field' of github.com:Ultimaker/Cura into 5.0 2022-04-21 13:11:50 +02:00
Remco Burema
950a8cc3e6
Merge pull request #11831 from Ultimaker/Changelog 
Update change_log.txt
 2022-04-21 12:53:18 +02:00
fvrmr
b1d98e0e9f Update change_log.txt 
Made some changes, discussed with @rburema
 2022-04-21 12:52:19 +02:00
Jelle Spijker
81df26e4d9
Merge pull request #11833 from Ultimaker/CURA-9149_object_settings_ovelap 
CURA-9149 Fix PerObjectSettings remove button layout
 2022-04-21 12:48:48 +02:00
fvrmr
6b2a6b0a20 Update change_log.txt 
Fixed a typo
 2022-04-21 12:41:43 +02:00
j.delarago
9a0f693ef7 Wrapping Retrieval in DFRetrieval does not seem to work in QT6, the object returned only undefined for all enum values. 
Fixed by creating and registering the enum inside DigitalFactoryController.py

CURA-9126
 2022-04-21 12:02:06 +02:00
j.delarago
5a8343ce25 Center remove button in row by giving it the same height as the input. 
Adjust width of rows when scrollbar is present so they don't overlap.

CURA-9149
 2022-04-21 11:56:17 +02:00
Remco Burema
8afb06f7ae Fix infill to 0% on upgrade to Cura 5.0. 
This is a weird one, fortunately Jaime had the idea that it had to do with a spurious update to the visual element of the slider.

CURA-9127
 2022-04-21 11:55:42 +02:00
fvrmr
1051b258cf Update change_log.txt 
Updated the changelog
 2022-04-21 11:37:05 +02:00
c.lamboo
9a3d089bd9 Properly add and remove menu items 
Not really part of the ticket but logging was complaining

CURA-9146
 2022-04-21 11:34:16 +02:00
c.lamboo
7a3af720a8 Resolve urls through qml 
CURA-9146
 2022-04-21 11:32:46 +02:00
c.lamboo
66fde9100c Use QML defined enum in sync state 
These are the enums from cura/API/account.py
somehow exposing these enums from python to QML doesn't work properly anymore
A better solution should be found in the very near future

CURA-9146
 2022-04-21 11:32:03 +02:00
c.lamboo
d0a35bad3d Use updated type definitions 
CURA-9146
 2022-04-21 11:29:42 +02:00
Ghostkeeper
3f9c7c55dc
Fix search field losing focus when scrolling the setting list 
When scrolling the setting list, it was clearing the focus in order to close the pop-ups in the setting list. If pop-ups like for the infill pattern or extruder selection settings are not closed, the pop-up part is still rendered even if the user scrolls those settings out of view, causing the pop-up to appear somewhere on top of completely unrelated interface elements. It scrolls all the way to the top of the screen, effectively.

I couldn't find a way to cause pop-ups to be clipped with the rest of the contents of the ListView. They are always rendered on top due to the nature of the pop-up. I could find a way to trigger pop-ups to close upon changing the scrolled position without changing the focus, but that method was fairly complex with a bunch of `Connection`s and an extra signal. This is by far the simplest solution.

Contributes to issue CURA-9070.
 2022-04-21 11:17:13 +02:00
Remco Burema
c002a52b50 Remove animations from custom settings view. 
They never properly worked anyway, and now they cause the items to overlap.

CURA-9160
 2022-04-21 11:11:28 +02:00
Jelle Spijker
16d0a81911 Merge remote-tracking branch 'origin/fix_wait_for_first_slice' into 5.0 2022-04-21 09:26:48 +02:00
Casper Lamboo
1b228ecc07
Merge pull request #11824 from Ultimaker/upgrade_sdk_to_800 
Upgrade SDK version to 8.0.0 for Cura 5.0
 2022-04-20 12:16:02 +02:00
Jaime van Kessel
271868eafd Fix export material to usb 
CURA-9122
 2022-04-20 11:23:35 +02:00
Remco Burema
0232b4f639 Upgrade SDK version to 8.0.0 for Cura 5.0 2022-04-20 10:57:38 +02:00
Jaime van Kessel
15b16e3e45 Remove overlap in perobject setting panel 
CURA-9149
 2022-04-19 17:27:38 +02:00
Jaime van Kessel
e85420f9fa Fix few more instances of old usage of fileUrl vs selectedFile 2022-04-19 17:12:58 +02:00
Jaime van Kessel
f070a695b1 Change standardbutton.yes & no to dialog.yes & no 2022-04-19 17:10:51 +02:00
Jaime van Kessel
1ce84fec69 Fix all import dialogs 
Fixes CURA-9129
 2022-04-19 17:09:02 +02:00
Jaime van Kessel
ffa0106937 Check multiple settings per update of event loop 
It seems that in Qt5, the update loop was triggered a lot more often than in qt6.
Since we used that to handle the error checking, this made it so that you sometimes had to wait
for quite some time untill the slicing would start (as that is blocked by the error checker)
 2022-04-19 17:00:06 +02:00
Jaime van Kessel
965ecb744d Fix size of print setup selector 
CURA-9139
 2022-04-19 16:42:43 +02:00
Jaime van Kessel
fc03d6dfd8 No longer inject close argument 
Fixes warning in the log
 2022-04-19 15:08:45 +02:00
Jaime van Kessel
3bfd2679ab
Merge pull request #11818 from Ultimaker/CURA-9155_cant_stop_wont_stop 
[CURA-9155] Fix Cura not closing properly on Windows.
 2022-04-19 15:07:00 +02:00
Remco Burema
5a43e5945c Fix Cura not closing properly on Windows. 
May be a bit crude, but simple and readable, and we're supposed to have handled everything anyway at the point the event comes in.

CURA-9155
 2022-04-19 14:28:41 +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
5a62278097 Fix display of username 
CURA-9146
 2022-04-15 10:16:00 +02:00