GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 15:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,616 Commits 288 Branches 260 Tags
Commit Graph

680 Commits

Author SHA1 Message Date
Jaime van Kessel
cc29ffa40e
Disable the activate button if the machine is already active 
Fixes #8643
 2020-10-28 15:41:36 +01:00
Ghostkeeper
0ecefde880
Defensive coding: Don't get the linked material if there is no material 
Fixes Sentry issue CURA-17W.
 2020-09-18 11:24:39 +02:00
Remco Burema
3fcd7d567f
Show warning icon on import non-visible profile. 
part of CURA-7691
 2020-09-16 08:26:41 +02:00
Ghostkeeper
877e2213de
Fix disabling of zoom-to-mouse preference in orthographic camera mode 
It doesn't work then.

Done as a 5-minute-fix.
 2020-08-03 12:27:37 +02:00
Nino van Hooff
816aaafc19 Revert changes for CURA-5479 
It was decided that functionality present in existing plugins is
sufficient. No need to replicate it in our own codebase and
take on the burden of maintenance

CURA-5479
 2020-07-07 16:11:03 +02:00
Nino van Hooff
06284b6a73 Implement Review comments 
CURA-5479
 2020-07-01 16:47:20 +02:00
Nino van Hooff
c50f7aa455 Add a print job name setting to general preferences 
CURA-5479
 2020-06-30 17:04:03 +02:00
Jaime van Kessel
d2280b9afb
Fix disabling show_xray_warning 2020-06-29 13:31:08 +02:00
Jaime van Kessel
fbbd2f7484
Fix small copy paste error 
CURA-7477
 2020-06-02 14:19:13 +02:00
Jaime van Kessel
0885d1a8e2
Merge branch 'feature_single_instance_preference' of https://github.com/fieldOfView/Cura 2020-06-02 14:16:18 +02:00
Ghostkeeper
6edaedfe22
Use Czech name for the Czech language option 
This is in line with the other languages in that drop-down.
 2020-05-26 09:52:30 +02:00
Nino van Hooff
252b993169 Refactor removal warning message to CloudOutputDeviceManager 
CURA-7436
 2020-05-18 16:22:55 +02:00
Nino van Hooff
3d19e75c82 Notify user of proper way to remove cloud printer 
CURA-7436
 2020-05-18 14:48:19 +02:00
fieldOfView
1b34449242 Add a preference to use a single instance for loading files 
Contributes to #7664
 2020-05-07 17:29:18 +02:00
fieldOfView
1b3c51d98a Remove extraneous preference 2020-03-31 11:57:45 +02:00
fieldOfView
ccc0589495 Remove the checkbox option to set the preference to hide the messagebox 2020-03-31 11:50:16 +02:00
fieldOfView
b7898b5a97 Change preference to only hide the xray message, not the visualization 2020-03-31 11:39:05 +02:00
fieldOfView
4638e2b72b Fix resetting show xray warning 2020-03-31 11:27:25 +02:00
Ghostkeeper
0150f37937
Merge branch 'master' into xray_in_solid_view 2020-03-24 21:45:48 +01:00
Ghostkeeper
d7d91d2fec
Don't translate 'Language:' string 
This should make it easier to find the language drop-down again if you can't read the current language.

Done as a 5 minute fix.
 2020-03-10 11:19:32 +01:00
Ghostkeeper
7b0964abef
Merge branch 'DenyCZ-4.5' 2020-03-09 16:57:09 +01:00
Ghostkeeper
0c9a8d3a7c
Add Czech language to the list 
You can now select Czech as your Cura language.

Contributes to issue CURA-7285.
 2020-03-09 16:55:13 +01:00
Jaime van Kessel
68ad38de28
Fix sizing of the machine action dialog 
Contributes to #7224
 2020-03-06 11:02:59 +01:00
Tim Kuipers
4b1a426873 add xray error warning preference 2020-02-27 16:41:20 +01:00
Ghostkeeper
0dfa65bb6d
Disable Polish translation for 4.5 
These translations weren't updated this round, so we'll disable them from the interface. The files are still available if someone else wants to translate them.

Contributes to issue CURA-7201.
 2020-02-24 14:17:21 +01:00
Jaime van Kessel
a706b42782
Disable create & import on materialpage if machine does not support materials 2020-01-27 16:12:26 +01:00
Remco Burema
9aeb9912c8
Merge branch '4.4' 2019-11-19 15:57:52 +01:00
Remco Burema
f1f0290458
Re-enable the Polish language. 
part of CURA-6957
 2019-11-19 14:22:53 +01:00
Jaime van Kessel
c6f42766c7
Remove hardcoded sizes from dialogs & popups 
Contributes to #6670
 2019-11-19 13:00:39 +01:00
Remco Burema
3636eed964
Instead of selecting first, return only uniques. 
part of CURA-6917
 2019-11-07 17:19:18 +01:00
Nino van Hooff
6e79f489e2 When multiple linked materials are found, only display the first 
CURA-6917
 2019-11-07 15:51:22 +01:00
Jaime van Kessel
e805c3db05
Ensure material is selected on first opening of material manager 2019-10-25 11:05:38 +02:00
Lipu Fei
38ee4bf208 Remove deprecated functions in MachineManager 
CURA-6858
 2019-10-22 14:11:40 +02:00
Lipu Fei
4aadcba01c
Merge pull request #6549 from Ultimaker/CURA-6897_qml_warnings_materials_page 
CURA-6897_qml_warnings_materials_page
 2019-10-21 08:50:31 +02:00
Jaime van Kessel
0aa2a4994c
Merge branch 'feature_restore_window_geometry' of https://github.com/fieldOfView/Cura 2019-10-18 10:45:28 +02:00
Nino van Hooff
8322a36548 Fix some QML warnings in the MaterialsPage 2019-10-16 16:59:52 +02:00
Lipu Fei
59fa73448a Fix material diameter change 
CURA-6868
 2019-10-15 15:03:35 +02:00
Lipu Fei
43fa4337f9 Fix merge conflicts 2019-10-15 13:08:00 +02:00
Lipu Fei
8b913f4009 Merge remote-tracking branch 'origin/master' into CURA-6863_duplicated_material_oddness 2019-10-14 12:23:49 +02:00
Remco Burema
09dc6ae44a Scouting: Try not to spam signals or errors as much. 
nominally part of CURA-6863
 2019-10-14 01:03:41 +02:00
Remco Burema
4277ede64f Fix 1/2 of the duplication material bug. 
The material is added multiple times to the variant nodes, and overwriting it with the eventual right one was going wrong.
This does not solve it entirely (because the less specific one still ends up selected _initially_ because it gets added first, and the order can't be guaranteed.
part of CURA-6863
 2019-10-14 01:01:19 +02:00
Nino van Hooff
c8d65e86f1 Truncate/elide/ellipsize the material name in Preferences 
if it doesn't fit it's parent

CURA-6862
 2019-10-10 15:36:14 +02:00
Jaime van Kessel
cadc145008
Prevent infinite recursion in material page if it could not be found 2019-10-08 16:49:54 +02:00
Lipu Fei
28466f7345 Elide long quality name 
CURA-6862
 2019-10-08 14:33:16 +02:00
Ghostkeeper
cf14fa6820
Merge branch 'feature_intent' 
Here we go!

Contributes to issue CURA-6864.
 2019-10-08 13:17:54 +02:00
Ghostkeeper
f8449796c9
Reset the camera origin when uninverting zoom direction 
If zoom-to-cursor has been activated the camera origin will end up behind the camera. This resets it.

Fixes #6490.
 2019-10-08 13:06:23 +02:00
Lipu Fei
c42feae11c Make intents work on quality management page 
CURA-6706
 2019-10-07 09:22:47 +02:00
Lipu Fei
ba805b9da3 Fix QML errors 
CURA-6849
 2019-10-03 12:28:07 +02:00
Lipu Fei
07269e4988 Merge remote-tracking branch 'origin/master' into feature_intent 2019-09-25 08:03:37 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00