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

193 Commits

Author SHA1 Message Date
alexandr-vladimirov
2b05a370ca Allow to set print sequence manually 2024-01-04 06:30:23 +03:00
Caden Gobat
260743d842 Make regex pattern a raw str to prevent "invalid escape sequence" warning 2023-03-17 09:59:45 -06:00
c.lamboo
5cb67ab8c4 Add new pages in add-printer flow 
Pages added
- Page to select Ultimaker or third party printer
- Page with information how to add Ultimaker printer(s)

contributes to CURA-8689
 2022-11-01 16:11:34 +01:00
digitalfrost
fe483d4656 Merge branch 'main' into 050922b 2022-09-13 10:50:39 +02:00
Jaime van Kessel
6afdd86cc4
Merge pull request #13215 from digitalfrost/050922 
PrintInformation.py Use warning method with Logger
 2022-09-06 15:07:56 +02:00
Jaime van Kessel
6c0d76807e
Add trycatch around whatsnew & changelog pages 
Fixes CURA-4DX (sentry crash)
 2022-09-06 14:43:38 +02:00
digitalfrost
2b981daf17 PrintInformation.py: Fix grammar in docstrings 
Fix grammar and typos for:
- class docstring
- defineAbbreviatedMachineName
- _onOutputStart
 2022-09-05 20:22:45 +02:00
digitalfrost
f30fd519b7 PrintInformation.py Use warning method with Logger 
Use f-string and warning method with Logger instead of "Old Style string
formatting
 2022-09-05 19:37:34 +02:00
j.spijker@ultimaker.com
d9e3e4d395 Made slice_uuid a public field 
Contributes to CURA-9031
 2022-07-29 12:13:12 +02:00
j.spijker@ultimaker.com
a712e7517a Add the received slice_uuid to the print information 
Contributes to CURA-9031
 2022-07-27 18:12:25 +02:00
j.spijker@ultimaker.com
52a6da2d8f
Use minus sign for extra version info 
Contributes to CURA-8640
 2022-04-14 10:01:37 +02:00
j.spijker@ultimaker.com
aef483018c
Fix version on splash screen 
Contributes to CURA-8640
 2022-04-14 09:38:42 +02:00
Jaime van Kessel
111d335743 Give text more room on splashscreen 
CURA-9151
 2022-04-13 16:36:23 +02:00
Jaime van Kessel
402c53c5f1 Fix warning about Duration 2022-04-01 16:19:35 +02:00
Jelle Spijker
12ee57e4ad
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/UI/CuraSplashScreen.py
 2022-03-28 15:02:18 +02:00
10r3n20
044c3e9da2 updated splash screens 2022-03-16 17:03:03 +01:00
Remco Burema
6dc6020217
Qt5->Qt6: GUI-attributes and flips params register singletons. 
part of CURA-8591
 2021-12-28 18:36:28 +01:00
Remco Burema
32b52c6166
Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership 
part of CURA-8591
 2021-12-28 14:54:56 +01:00
Remco Burema
abe7c1bf7f
Search/replace Qt5->Qt6. 
part of upgrading Qt to v6.2: CURA-8591
 2021-12-28 14:46:02 +01:00
Ghostkeeper
9140b71b19
Merge branch 'libArachne_rebased' 
Conflicts:
	plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
	resources/definitions -> Bunch of conflicts with profile updates.
	resources/quality -> Bunch of conflicts with profile updates.
	resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
 2021-12-14 11:48:58 +01:00
Jaime van Kessel
83b56726ba CHange _getBuiltinWelcomePagePath to be static 
SHould have been static, so boyscouting it now

CURA-8696
 2021-12-01 10:33:05 +01:00
Jaime van Kessel
22fcdf5c7b Change whatsnew to whats_new 
They are seperate words, so should have an _ in between

CURA-8696
 2021-12-01 10:30:52 +01:00
Jaime van Kessel
051c3ee2e2 Fix up documentation of WelcomePageModel 
Some more boyscouting

CURA-8696
 2021-12-01 10:29:31 +01:00
Jaime van Kessel
6bce9453e4 Fix warnings in newpages model 
Boyscouting. These somehow snuck through code review

CURA-8696
 2021-12-01 10:21:07 +01:00
Jaime van Kessel
a057cbe481 Minor codestyle cleanup 
Boyscouting

CURA-8696
 2021-12-01 10:18:04 +01:00
Remco Burema
86046a32b3
Merge branch 'master' into merge_main_20211019 2021-10-20 08:38:01 +02:00
Konstantinos Karmas
6d9978e8f3 Always set the project name as the one provided by the user 
There was an inconsistent behavior between saving a project file to disk (where the printer short name was readded after saving) and saving to the DigitalLibrary (where the printer short was NOT added again).

This commit fixes that by making sure that whatever the user put as the name of the file, will be the name of the project within Cura.

CURA-8566
 2021-09-15 14:37:53 +02:00
Konstantinos Karmas
52c224c779 Revert "Revert "Only change project name when saving to project files."" 
This reverts commit 9e2b556ce8f28294f9b44a3d8801af42043d3956.
 2021-09-15 12:26:30 +02:00
Konstantinos Karmas
87add2c8de Revert "Revert "Use optional last output (file) name from output-dev to set project name."" 
This reverts commit 24ff3692bd5b73828a1c5a58cdd55400cdddad9c.
 2021-09-15 12:26:18 +02:00
Konstantinos Karmas
98eba28885 Revert "Revert "Set the job name whenever the workspaceLoaded is called"" 
This reverts commit a6a69c249cfc96e19ace64ec01aa7e4fc07a76d1.
 2021-09-15 12:25:13 +02:00
Jaime van Kessel
cfb147853e Merge branch 'master' of github.com:Ultimaker/Cura into libArachne_rebased 2021-09-13 14:57:40 +02:00
Ghostkeeper
a6a69c249c
Revert "Set the job name whenever the workspaceLoaded is called" 
This reverts commit 6ad358a55db7dfc4825233a7e453bab31931fba0.
 2021-09-10 16:47:20 +02:00
Ghostkeeper
24ff3692bd
Revert "Use optional last output (file) name from output-dev to set project name." 
This reverts commit c2c53d51c1954315324982bd916b8aad5c19946d.
 2021-09-10 16:46:53 +02:00
Ghostkeeper
9e2b556ce8
Revert "Only change project name when saving to project files." 
This reverts commit b97920e5b155caaab6a8b3bb167853a00ae4b604.
 2021-09-10 16:46:39 +02:00
luz paz
d68f375e38 Fix various typos 
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
 2021-09-07 11:33:54 -04:00
Remco Burema
b97920e5b1
Only change project name when saving to project files. 
CURA-8358
 2021-09-01 18:11:10 +02:00
Remco Burema
c2c53d51c1
Use optional last output (file) name from output-dev to set project name. 
Instead of relying on the filename emitted when the workspace is changed. This is done so the user can also change the project name when saving to an output device, such as a local file, or the digital library, that supports changeing the (file)name.

CURA-8358
 2021-09-01 16:04:05 +02:00
Konstantinos Karmas
6ad358a55d Set the job name whenever the workspaceLoaded is called 
CURA-8358
 2021-08-23 17:07:36 +02:00
Remco Burema
6c08bbfc9d
Merge branch 'master' into libArachne_rebased 2021-07-16 08:49:46 +02:00
Ghostkeeper
bcd11636d5
Catch error when release notes file could not be read 
And show an error message to the user in that case.
This could happen if the user modified their installation or their resource folder.

Fixes Sentry issue CURA-2P2.
 2021-07-09 13:36:53 +02:00
Ghostkeeper
88954922d4
Merge branch 'master' into libArachne_rebased 
Conflicts:
	resources/texts/change_log.txt -> Adding 4.10 release notes in between 4.9 and Arachne.
 2021-06-30 16:46:19 +02:00
Remco Burema
4f63e5eaf5
Fix capitalization for extensions in whats-new. 2021-06-29 11:40:20 +02:00
Ghostkeeper
611208368c
Merge branch 'master' into libArachne_rebased 
Conflicts:
	cura/CuraApplication.py: Setting version
	fdmprinter and fdmextruder: Setting version
	intents, qualities and variants: Setting version
	Changelog: 4.9.1 was added, should be below Arachne changes
 2021-06-16 18:04:54 +02:00
fieldOfView
0ad49dd412 Allow renaming groups to something other than "Group #n" 2021-04-19 22:14:14 +02:00
Ghostkeeper
9462366158
Merge branch 'master' into libArachne_rebased 2021-03-30 16:50:56 +02:00
Kostas Karmas
179d77ef5c Transfer the "What's new" and "Changelog" pages at the end of wizard 
To match the requirements specified in the ticket.

CURA-8014
 2021-03-25 13:29:17 +01:00
Kostas Karmas
55cb7f88a7 Change bottom left button text to "Skip" 
Or else the page shows two buttons "Next" buttons.

CURA-8014
 2021-03-25 12:47:07 +01:00
Remco Burema
f1cbe1a958
... and fix typing as a result of the last commit. 
CURA-8014
 2021-03-24 16:29:38 +01:00
Remco Burema
f95c09db37
Type-checks, not just type comments, and static- over class-method. 
CURA-8014
 2021-03-24 16:18:56 +01:00
Remco Burema
5083db8d44
On new install or update, have highlights not just changelog. 
Place images in resources/images/whats_new/N.format and texts in resources/texts/whats_new/N.format where N is the ordinal and format the respective allowed formats.

CURA-8014
 2021-03-24 12:00:05 +01:00