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

185 Commits

Author SHA1 Message Date
HellAholic
2865836b8a Change option name to Export Package For Technical Support 2024-10-07 15:22:47 +02:00
Erwan MATHIEU
f28482ebac Include log file when exporting project file for support 
CURA-12138
 2024-09-27 15:38:27 +02:00
Erwan MATHIEU
8d2bef86d6 Calculate file name directly in QML 
CURA-12138
 2024-09-27 12:17:34 +02:00
HellAholic
6313e9cc48 Rename variable to exportName for clarity 2024-09-16 14:28:54 +02:00
HellAholic
7ebad9c107
Merge branch 'main' into CURA-12138-Export_for_support_option 2024-09-16 13:05:29 +02:00
HellAholic
b91051e594 fix indent 2024-09-12 14:58:06 +02:00
HellAholic
3c1e26d535 define action in qml and add alias 2024-09-12 11:37:06 +02:00
HellAholic
78394faf65 Remove from actions 2024-09-12 11:02:59 +02:00
Saumya Jain
1338a562ef added drop models to buildplate as a right click option 
Also shortcut: ctrl+B

CURA-10542
 2024-02-27 13:45:10 +01:00
Saumya Jain
355f24e29f
Merge branch 'main' into Issue-4835-allow-to-set-print-sequence-manually 2024-02-09 09:52:06 +01:00
Sophist
dc7e8998b4
Delete line rather than commenting 2024-01-20 09:53:39 +00:00
Sophist
7afa2fc94a
Stop Esc key from exiting full screen mode 2024-01-19 13:27:30 +00:00
saumya.jain
0ddf92ce62 fix for proper path for CuraAction undo redo 
CURA-7812
 2024-01-09 10:33:02 +01:00
saumya.jain
676099ccf6 Removed singleton UM.OperationStack, merged with CuraActions 
Removed ActiveTool singleton added to controller singleton

CURA-7812
 2024-01-09 10:29:45 +01:00
alexandr-vladimirov
2b05a370ca Allow to set print sequence manually 2024-01-04 06:30:23 +03:00
c.lamboo
e9cc6532d7 re-add ColorDialog class 
to avoid api breaks
 2023-10-10 12:00:55 +02:00
saumya.jain
4096fc864b grid placement available for elliptical buildplates 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>

CURA-7951
 2023-08-22 15:06:17 +02:00
saumya.jain
b662da732e review comments fixed 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>

CURA-7951
 2023-08-22 11:51:30 +02:00
saumya.jain
b62725b4f0 copy_paste in a grid 
arrange all objects in grid
place in grid

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>

CURA-7951
 2023-08-22 10:30:51 +02:00
saumya.jain
023dd3a9c5 Merge remote-tracking branch 'origin/main' into CURA-7951_lock_rotation 
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
 2023-08-21 10:10:25 +02:00
Casper Lamboo
3e63863a72
Formatting 2023-08-18 16:41:38 +02:00
saumya.jain
4f6c0001b6 Sponsor cura added at designated loc 
CURA-10832
 2023-08-18 14:55:19 +02:00
c.lamboo
c393d915d7 Disable copy paste when either 3mf reader or writer is disabled 
CURA-7913
 2023-08-08 12:17:08 +02:00
c.lamboo
f07faac422 Add copy, paste, cut functionality 
CURA-7913
 2023-08-04 13:24:06 +02:00
c.lamboo
1c07ba81f4 Add shortcut for "arrange without rotation" action 
CURA-7951
 2023-05-12 09:23:03 +02:00
c.lamboo
4f9d041ae8 Add rotation lock in arrange and multiply objects 
Add rotation lock in
- context menu item arrange and
- checkbox in multiply objects dialog

CURA-7951
 2023-05-11 16:14:38 +02:00
c.lamboo
8ce2af290c Conditionally add ctrl+, hotkey to open settings 
Only do this for mac, as it is not customary on other OSes

CURA-9939
 2022-11-30 15:10:15 +01:00
jspijker
61623720ca Update copyright using UltiMaker 
Contributes to CURA-9808
 2022-11-28 10:48:38 +01:00
jspijker
696c0f8547 Update company name to UltiMaker 
Contributes to CURA-9808
 2022-11-28 09:05:21 +01:00
Ladnessness
dc06ccb698 Update Actions.qml 
Add shortcut command to preferences to allow easier access. Similar to MacOS implementation.
 2022-09-18 17:11:41 +10:00
Jaime van Kessel
e925f07aad Remove old arranger code 
Major vesion upgrade, time to clean some stuff up!

CURA-7810
 2022-03-24 13:37:29 +01:00
Jaime van Kessel
d752f34b70 Shorten english string for show troubleshooting 
Doesn't solve all of the issues here, but at least fixes it for english.
I feel that the word guide also doesn't actually add any meaningfull info anyway

CURA-9012
 2022-03-09 13:30:22 +01:00
Jaime van Kessel
cbbe961a44 Let quality intents menu use checkmark to indicate active profile 
CURA-8928
 2022-03-03 13:46:38 +01:00
Jaime van Kessel
26262e3cac Fix marketplace opening 2022-02-28 11:26:18 +01:00
Jaime van Kessel
b5136ba70c Fix merge conflics 2022-02-17 15:07:48 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Ghostkeeper
efcd00e2f3
Merge branch 'master' into marketplace_redesign 
Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.
 2022-01-20 15:57:28 +01:00
Ghostkeeper
dbb2bce157
Fix icon name with Controls 2 action 
The text above this icon name got changed in master, which led to a minor merge conflict here that wasn't discovered.
 2022-01-18 17:19:52 +01:00
Ghostkeeper
e0a6cb3383
Merge branch 'master' into replace_controls_1_for_controls_2 
Conflicts:
	resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
 2022-01-18 17:17:10 +01:00
Jaime van Kessel
052898ce21 Switch out the file, view and edit menu for controls 2 
CURA-8683
 2022-01-10 16:55:28 +01:00
Ghostkeeper
3e7b74954d
Indicate that Marketplace shouldn't get translated 2022-01-10 15:14:40 +01:00
Ghostkeeper
aed52cea74
Split functionality of the two marketplace buttons 
One now opens the old one again. One still opens the new one (but with a new name).

Contributes to issue CURA-8556.
 2021-10-25 01:11:26 +02:00
Konstantinos Karmas
b37716de58 Add missing campaign tags 
CURA-8441
 2021-08-09 12:59:29 +02:00
Ghostkeeper
e04a2b5e92
Also don't translate 'configure' keyword on MacOS 
Another attempt at finalising CURA-8245.
 2021-07-21 13:30:19 +02:00
Ghostkeeper
e591f3db5b
Don't translate certain keywords in the application menu on MacOS 
There's a suspicion that this is causing a crash on exit. From the traceback it seems like it's attempting to find a certain property on a deleted item. I'm thinking it might be trying to update properties on an item that was already deleted by the system here because the item got moved to a system-specific menu. Qt doesn't realise that. By not translating that property, it's not necessary to update and hopefully this prevents the need to look up data on the deleted item.
Not translating it is not an issue anyway, since the menu will also be renamed by Qt to some system-specific name, which is then also translated to the user's system-language by MacOS itself.

It's not at all sure if this will fix it. Tests are necessary.

Contributes to issue CURA-8245.
 2021-07-19 17:34:44 +02:00
Ghostkeeper
b134405b2c
Add bottom camera angle menu item to view menu 
It doesn't really clutter the interface in this menu.

Done as a 5 minute fix for #7609.
 2021-05-06 11:39:11 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls 
CURA-7813
 2021-03-29 17:55:19 +02:00
Remco Burema
729d3afd32
Workaround discinction model/models/group. 
Fixes #9448
 2021-03-26 11:26:03 +01:00
Kostas Karmas
fd3c985440 Fix ambiguous Ctrl+O shortcut not opening the local file dialog 
Ctrl+O was assigned as a shortcut in two places:
  1. To the "File->Open File(s)" menu item, which is visible when only the local file
	 provider is enabled (i.e. the DF file provider is disabled)
  2. To the "File->Open File(s)->From Disk" menu item, which is visible when there are
     more than one file providers enabled.

This was creating an ambiguous shortcut, thus never opening the local file dialog.

This is now fixed by disabling the shortcuts when the respective items are not visible.

CURA-7868
 2021-01-11 17:50:26 +01:00