GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 17:45:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,991 Commits 294 Branches 267 Tags
Commit Graph

8099 Commits

Author SHA1 Message Date
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
Kostas Karmas
8a7dd2cfdf Update Toolbox labels to be aligned with the Digital Factory 
CURA-7605
 2020-07-27 11:58:55 +02:00
Kostas Karmas
2c6cbc7be4 Fix qml warnings in ToolboxAuthorPage 2020-07-27 10:40:53 +02:00
Jaime van Kessel
94fb779dff
Merge branch 'CURA-7606_remove_ratings' of github.com:Ultimaker/Cura 2020-07-22 14:56:24 +02:00
Remco Burema
3898516607
More remove rating packages/materials. 
Forgot some lines in the previous commit.

CURA-7606
 2020-07-22 13:56:22 +02:00
Remco Burema
51a13675a5
Remove rating packages/materials. 
Online teams decided not to support ratings anymore, making this a rather useless feature in the upcoming release.

CURA-7606
 2020-07-22 12:51:20 +02:00
Jaime van Kessel
6362d5145e
Merge branch 'master' of github.com:Ultimaker/Cura 2020-07-22 11:24:48 +02:00
Jaime van Kessel
ae33053369
Add missing setting version from g-code profile writer 2020-07-22 11:24:23 +02:00
Ghostkeeper
9daab5ed9b
Workaround for bug in PySerial: Don't crash if file doesn't exist 
Gonna report this upstream at the PySerial folks, if nobody else found this yet.

Fixes Sentry issue CURA-11W.
 2020-07-22 09:50:46 +02:00
Ghostkeeper
8714ff9edb
Add more explanations for HWID being None 2020-07-21 17:32:59 +02:00
Ghostkeeper
db15bc84cf
Correct and consistent spelling of g-code 
This spelling is in Ultimaker's style guide.
We use g-code, and capitalise the G if it's at the start of a sentence or header.
Pretty good score, considering there are literally thousands of user- or log-visible strings mentioning g-code across Cura.
 2020-07-20 13:36:49 +02:00
Ghostkeeper
e6c305de40
Merge branch 'master' of github.com:Ultimaker/Cura 2020-07-20 13:27:41 +02:00
Ghostkeeper
a84598a8c9
Remove default value for g-code before pause 
It's best to just leave it as is. Not everyone appreciates bleeps.

Contributes to issue CURA-7599.
 2020-07-20 13:24:18 +02:00
Ghostkeeper
13ff186c8e
Correct spelling of 'g-code' 
This is the convention we're holding in this application.
 2020-07-20 13:23:24 +02:00
Ghostkeeper
ededb2a8d2
Merge branch 'master' of https://github.com/rodrigosclosa/Cura into rodrigosclosa-master 
Conflicts:
	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py -> Merging other pausing scripts into this one
	plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py -> Has been removed upstream
 2020-07-20 13:17:27 +02:00
Kostas Karmas
94d1e1d77b Fix preferences.cfg not being updated in project files 
Since the metadata/setting_version field was not written in project files from the 3MF writer,
the preferences were never really updated, because their preferences version was marked as 6000000
(basically omitting the setting_version). Now, if any project file is found without a metadata
setting_version tag, it will default to preference version 6000000 and thus it will start calling
the updatedPreferences() functions starting from VersionUpgrade34to35, properly updating the
preferences and adding the metadata/setting_version field in the preferences.cfg of the project
file.

CURA-6711
 2020-07-20 12:23:52 +02:00
Ghostkeeper
8c4533a2c3
Fix crash when port gets disconnected while iterating 
Fixes Sentry issue CURA-11T.
 2020-07-20 12:10:08 +02:00
Ghostkeeper
528c8e2226
Also store setting_version in preferences file for project files 
This allows the version upgrade system to update these preferences in order to display the correct list of visible settings.
 2020-07-20 11:48:29 +02:00
Nino van Hooff
18cdce6ef0 Add support_structure to custom visible settings if support_tree_enable 
is in that list

CURA-6711
 2020-07-15 16:08:18 +02:00
Nino van Hooff
bc51db321f Merge branch 'master' into CURA-6711_support_structure_dropdown 2020-07-15 11:57:34 +02:00
Nino van Hooff
bc34c8dd0b Version upgrade support_tree_enable -> support_structure 
CURA-6711
 2020-07-13 15:51:14 +02:00