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

7769 Commits

Author SHA1 Message Date
Remco Burema
99cd8ab1b0
Show models outside of BP clearly in layerview. 
CURA-7586
 2020-08-12 17:42:10 +02:00
Jaime van Kessel
dd42c87da7
Merge branch 'CURA-7646_Settings_not_applied_when_creating_new_CFFF_from_project_file' of github.com:Ultimaker/Cura into 4.7 2020-08-12 13:42:14 +02:00
Ghostkeeper
4ecab892e5
Further improve translated strings 
Remove this formatting from the translated part.
 2020-08-12 10:53:37 +02:00
Ghostkeeper
5ec57d42d0
Improve translatability of cloud printer syncing texts 
Here are a number of improvements to the translated texts that make it easier for the translators to translate them:
* Never include layout elements such as <ul> or <li> in the translated text. The translators don't know what to do with them. Instead, leave the tags out of the translated parts and then wrap them around it in Python.
* If there are replacement keys in the source text, explain all of them in the context.
* Use a name within the brackets, to make it clear from context what the brackets mean and to disambiguate multiple keys if there are multiple.
* No invisible whitespace (such as space at the end of a line).
* Use plural forms with i18ncp if applicable (or i18np if no context is necessary).

I also changed the catalogue variable to lowercase with underscores, as per our code style.
 2020-08-12 09:45:51 +02:00
Ghostkeeper
c49056f319
Merge branch '4.7' 2020-08-11 13:30:09 +02:00
Ghostkeeper
55dbb1ea0c
Temporarily remove warning message for cloud cameras 
It's incorrect; the camera is possible with development firmware, but not implemented yet in Cura.

Removed this in lieu of the actual fix in CURA-7637, which takes too much time to fix for the 4.7 release.
 2020-08-11 13:29:53 +02:00
Kostas Karmas
01d5e846aa Document possible theoretical issue when loading a project file 
The issue will happen only if the machine_extruder_count is a formula.
In this case, the project loading will not work properly if "Create new" printer is selected,
as the settings of all extruders but the first one will not be applied.
Workaround in this case will be to load the project again and select to update the existing
printer, in which case all settings will load properly.

CURA-7646
 2020-08-11 12:37:34 +02:00
Kostas Karmas
84bc7f5094 Merge branch '4.7' 2020-08-11 11:34:30 +02:00
Kostas Karmas
ccd4add3ef Apply different filtering per category when pressing Back 
Back now applies the same filters that are applied when pressing the tab buttons.

CURA-7649
 2020-08-11 11:32:53 +02:00
Kostas Karmas
7690dc7bac Merge branch '4.7' 2020-08-11 11:23:25 +02:00
Kostas Karmas
c7525719d5 Fix wrong filtering in Marketplace when pressing Back 
It was trying to apply a wrong filter, which was causing a slowdown.
It is now applying the correct filter.

Fixes https://github.com/Ultimaker/Cura/issues/8161

CURA-7649
 2020-08-11 11:18:37 +02:00
Kostas Karmas
0feeccff85 Appease mypy complaints for AttributeErrors 
CURA-7646
 2020-08-10 15:30:55 +02:00
Kostas Karmas
f8a15ea29e Display only the relevant materials when opening a project 
Ignore the materials of the extruders that are not visible when opening a project file with a CFFF.

CURA-7646
 2020-08-10 15:00:08 +02:00
Kostas Karmas
61cc8c9a95 Remove reference to JIRA ticket in comments 
CURA-7646
 2020-08-10 14:58:59 +02:00
Kostas Karmas
b9d5f0dc15 Take the machine_extruder_count into consideration when opening project 
CURA-7646
 2020-08-10 14:56:37 +02:00
Ghostkeeper
1f09ea58cc
Merge branch '4.7' 2020-08-10 11:26:25 +02:00
Ghostkeeper
fc6ea28352
Don't crash if CuraStackBuilder failed to create a stack 
If it failed to create a global stack, the extruder_stack_dict variable would not be defined, and Cura crashes. It may fail to create a stack because of an indexerror in a malformed project file.

Fixes Sentry issue CURA-137.
 2020-08-10 11:25:55 +02:00
Ghostkeeper
cc99c481af
Don't apply printspeed to travel moves 
As the documentation says, only apply it to extrusion moves.

Done as a 5 minute fix.
 2020-08-07 16:07:42 +02:00
Ghostkeeper
8b522a8a58
Fix crash when processLinearMove gets called on something else than G0 or G1 
Return the original line then.
 2020-08-07 15:29:55 +02:00
Kostas Karmas
bd54ef8d5a Update the SDK version to 7.3.0 for 4.7 
CURA-7641
 2020-08-07 11:12:27 +02:00
Jaime van Kessel
3cdf5a82a4
Use correct property to search container stack 
CURA-7609
 2020-08-06 15:26:32 +02:00
Jaime van Kessel
ebdab94b98
Merge branch 'CURA-7609_Pick_any_printer_when_opening_a_project_file_single_dropdown' of github.com:Ultimaker/Cura 2020-08-06 15:26:16 +02:00
Jaime van Kessel
c8771124ad
Change function name to better reflect what it does 
CURA-7609
 2020-08-05 14:56:39 +02:00
Kostas Karmas
4a04126e91 Fix "Fetching Packages" text in the Marketplace in dark mode 
CURA-7627
 2020-08-05 14:13:39 +02:00
Kostas Karmas
3228766dd5 Fix "Fetching Packages" text in the Marketplace in dark mode 
CURA-7627
 2020-08-05 14:12:00 +02:00
Remco Burema
deec650668
Merge branch '4.7' 2020-08-05 08:17:10 +02:00
Remco Burema
b394be3583
Remove superfluous theme entry. 
It was messing with the dark side. Theme. I mean theme.
part of CURA-7627
 2020-08-05 08:16:10 +02:00
Remco Burema
60dd4f411b
Readable text in dark mode. 
part of CURA-7627
 2020-08-05 08:03:12 +02:00
Kostas Karmas
4e20c7dddc Rework the open project dialog to contain only 1 dropdown 
With the caveat that the qtQuickControls had to be updated to 2.3, due to a qt bug in 1.x that did
not update the dropdown popup list according to the ListModel.
This leads to a different look in the dropdowns and in the buttons of the open project dialog,
compaired to the rest of the application.

CURA-7609
 2020-08-04 16:33:11 +02:00
Jaime van Kessel
c8746eced6
Move some HTML codes out of the translation 
Due to string freeze we can't fix this for 4.7

CURA-7627
 2020-08-04 13:44:33 +02:00
Jaime van Kessel
af9a078d41
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-04 13:30:39 +02:00
Jaime van Kessel
955b2950e8
Change tertiary button to use link text color 
CURA-7627
 2020-08-04 13:30:01 +02:00
Kostas Karmas
e5d3271698 Fix mypy complaining that Application has no createQmlComponent 
Using CuraApplication instead fixes the problem

CURA-7609
 2020-08-03 17:43:14 +02:00
Kostas Karmas
9ad046654a Add typing in WorkspaceDialog.py 
In response to feedback comment https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309170

CURA-7609
 2020-08-03 17:31:21 +02:00
Kostas Karmas
6c59616e39 Process feedback comments 
Comments https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309980 and https://github.com/Ultimaker/Cura/pull/8142#discussion_r464310281

CURA-7609
 2020-08-03 17:30:21 +02:00
Kostas Karmas
60cfb6a8be Change name of updatable_machines to updatable_machine_names 
Since it is a list of name strings and not a list of machines.

Response to feedback comment https://github.com/Ultimaker/Cura/pull/8142#discussion_r464307564

CURA-7609
 2020-08-03 17:28:44 +02:00
Kostas Karmas
949837f041 Fix crashing when opening project files without materials 2020-08-03 16:20:44 +02:00
Kostas Karmas
a6d779e722 Sort materials based on extruder position in the open project dialog 
From eCCB
 2020-08-03 16:20:29 +02:00
Kostas Karmas
ce72bb1a0b Fix creating new machine being reverted to overridde in some cases 
CURA-7609
 2020-08-03 15:47:01 +02:00
Kostas Karmas
37febc9f60 Remove comment 
CURA-7609
 2020-08-03 09:24:40 +02:00
Kostas Karmas
db857c8c20 Add extra spacing between categories in the open project dialog 
CURA-7609
 2020-08-03 09:21:16 +02:00
Kostas Karmas
ff4e4ccf55 Change text in the combobox 
Since it was anyway truncated

CURA-7609
 2020-08-03 09:07:20 +02:00
Remco Burema
1d55befbe2
Fix missing part of filename w. dots for removable dr. 
Project names are no longer stored with their extension internally, so the removal of an extra extension wasn't necesary. Fixes #8123
 2020-07-30 13:23:46 +02:00
Kostas Karmas
52ea3e8fcc Change variable names (available -> updatable) 
CURA-7609
 2020-07-29 17:19:24 +02:00
Kostas Karmas
98cc87d1cf Allow picking any printer of the same type when opening project file 
A ComboBox was added under the "Update existing" combobox which will display all the available
printers that are of the same type with the printer in the project file. With this feature, the
user will be able to select any same-type preexisting printer in Cura to be updated, instead of
always create a new one when the project file's printer is not in Cura.

CURA-7609
 2020-07-29 13:02:34 +02:00
Jaime van Kessel
60a50ee393
Codestyle & readability cleanup for g-codeprofile reader 2020-07-29 10:47:49 +02:00
Kostas Karmas
daa66a89f3 Ignore machine network metadata when reading a project file 
CURA-7608
 2020-07-28 11:18:04 +02:00
Kostas Karmas
4b72db90ee Revert ignoring network information in VersionUpgrader 
As this will also remove them from machines that go through the VersionUpgrader.
 2020-07-28 10:27:34 +02:00
Konstantinos Karmas
7bf1af99a5
CURA-7608 Ignore machine network information when handling project files (#8116) 
CURA-7608
 2020-07-28 09:57:10 +02:00
Kostas Karmas
83c5df84d5 Change cloud labels in UM3NetworkPrinting plugin 
To be aligned with the Digital Factory.

CURA-7605
 2020-07-27 12:00:27 +02:00