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

6082 Commits

Author SHA1 Message Date
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
Casper Lamboo
45b2dd1d64
Merge pull request #16509 from Ultimaker/CURA-9374_make_long_messages_scrollable 
CURA-9374 Add scrollable area around text messages
 2023-08-22 10:21:40 +02:00
Erwan MATHIEU
89cb69a376 Restored QML import versions 
Restore versions to minimize the impact of CURA-9374
 2023-08-21 15:57:36 +02:00
Erwan MATHIEU
0c405288e0 Add wrapper to Cura.ScrollableTextArea 
Add wrapper to legacy Cura.ScrollableTextArea class which has now moved to Uranium, in order to keep plugins working in case they use it.
CURA-9374
 2023-08-21 15:50:52 +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
Saumya Jain
62a32fc725
Update resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml 
translating sponser cura

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2023-08-18 17:34:54 +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
Erwan MATHIEU
a3d664571a Add scrollable area around text messages 
CURA-9374
 2023-08-18 14:45:02 +02:00
Jelle Spijker
c898c70bfc Merge branch 'main' into CURA-7913 2023-08-09 14:18:38 +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
Casper Lamboo
84bcdc3bf4
Merge pull request #16331 from Ultimaker/CURA-10770_Developer_about_dialog 
Fixed for all the used python packages in venv
 2023-08-07 14:28:15 +02:00
saumya.jain
fc9a228062 Deleting Shake detection 
CURA-10770
 2023-08-04 14:24:38 +02:00
c.lamboo
f07faac422 Add copy, paste, cut functionality 
CURA-7913
 2023-08-04 13:24:06 +02:00
saumya.jain
e686baaf92 Fixed for all the used python packages in venv 
CURA-10770
 2023-07-31 11:47:15 +02:00
Jaime van Kessel
1d91eca483
Use correct value for multiple file open enum 
Previously we used the qdialog enum, which isn't the one you should
use for the qml dialog.

CURA-10741
 2023-07-28 10:52:27 +02:00
Remco Burema
3d289d75f9
Merge pull request #16270 from Ultimaker/CURA-10583_force_left_to_right_setting_field 
Force left to right reading direction for numeric textfield
 2023-07-26 16:43:25 +02:00
Casper Lamboo
112171937e
Merge pull request #16268 from Ultimaker/CURA-10770_Developer_about_dialog 
Cura about dialog when shaked gives extra info
 2023-07-26 09:02:05 +02:00
saumya.jain
58048598b4 fixing Review Comments 
CURA-10770
 2023-07-25 15:10:02 +02:00
Casper Lamboo
23d79de4b9
Make show custom button more visible in darkmode 
CURA-10782
 2023-07-25 13:34:29 +02:00
Jaime van Kessel
86cb3851fe
Force left to right reading direction for numeric textfield 
CURA-10583
 2023-07-25 13:20:26 +02:00
saumya.jain
0c7d0540b9 Cura about dialog when shaked gives extra info 
CURA-10770
 2023-07-25 11:20:58 +02:00
saumya.jain
4d99dabefc Discription added in the tooltip about skirt presence even after disabling it 
CURA-10758
 2023-07-17 10:42:07 +02:00
Remco Burema
f272dda946
Merge pull request #16120 from Ultimaker/CURA-10687_Restore_Color_Picker 
Color Picker from Qt 6.4
 2023-07-13 13:20:27 +02:00
saumya.jain
9407345377 Color Picker from Qt 6.4 
Native platform dialog is available on iOS,Linux (when running with the GTK+ platform theme) and macOS

fixes: CURA-10687
 2023-07-12 16:04:56 +02:00
saumya.jain
3e18082db6 Code review comments 
fixes: CURA-8754
 2023-07-11 11:45:37 +02:00
saumya.jain
d12659f71f Added refresh moving icon for feedback purpose 
While refreshing the material sync, no feedback was provided before, now there is a refreshing icon animation available for "refresh in progress"

fixes: CURA-8754
 2023-07-10 14:36:14 +02:00
saumya.jain
cca33bb4a5 Added refresh moving icon for feedback purpose 
While refreshing the material sync, no feedback was provided before, now there is a refreshing icon animation available for "refresh in progress"

fixes: CURA-8754
 2023-07-10 13:50:37 +02:00
saumya.jain
3187ef14cf SpinBox fixed for values above the max value 
Review comments
Fixes CURA-10096
 2023-07-07 15:05:52 +02:00
saumya.jain
83bef10cfb Merge remote-tracking branch 'origin/CURA-10096_Multiply_Models_allows_entering_values_over_99_but_won't_multiply_higher_than_99' into CURA-10096_Multiply_Models_allows_entering_values_over_99_but_won't_multiply_higher_than_99 2023-07-07 11:46:56 +02:00
saumya.jain
1ebde31397 SpinBox fixed for values above the max value 
Review comments
Fixes CURA-10096
 2023-07-07 11:46:29 +02:00
Jelle Spijker
4185fbb88a
Merge remote-tracking branch 'origin/main' into CURA-10096_Multiply_Models_allows_entering_values_over_99_but_won't_multiply_higher_than_99 
# 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-07-06 16:59:26 +02:00
saumya.jain
fe5893feb6 SpinBox fixed for values above the max value 
Spinbox now doesn't take values above the designated maximum
Fixes CURA-10096
 2023-07-06 16:07:40 +02:00
Jelle Spijker
f2ac1ebe32
Merge branch '5.4' 
# Conflicts:
#	conanfile.py
 2023-07-04 17:47:53 +02:00
MariMakes
d181ade2af Increase Boxes for Printjob Information 
Proposed by contributed by @Diegovd
 2023-06-28 16:16:58 +02:00
Jaime van Kessel
151ab6bf44
Merge branch '5.4' of github.com:Ultimaker/Cura 2023-06-13 16:13:56 +02:00
c.lamboo
eca903430e Fix setting text fields overlapping in per-object-settings 
CURA-10669
 2023-06-13 15:24:59 +02:00
Jaime van Kessel
cd3e45c7c4
Merge branch '5.4' of github.com:Ultimaker/Cura 2023-06-12 15:34:54 +02:00
Jaime van Kessel
1c0be9c5ed
Also prevent warning spam if icon isn't set 2023-06-12 15:33:08 +02:00
Jaime van Kessel
7103b9b333
Prevent qml warning spam if custom_icon isn't set 2023-06-12 14:48:31 +02:00
Jaime van Kessel
a2d9f53854
Merge branch '5.4' of github.com:Ultimaker/Cura 2023-06-12 14:45:23 +02:00
c.lamboo
9c90bcc06e Fix setting text fields overlapping in per-object-settings 
CURA-10669
 2023-06-12 14:29:30 +02:00
c.lamboo
f18e470260 Fix setting text fields overlapping in per-object-settings 
CURA-10669
 2023-06-12 11:15:45 +02:00
Jelle Spijker
0f0d729549
Merge branch '5.4' 
# Conflicts:
#	conanfile.py
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po
 2023-06-08 12:36:46 +02:00
Jelle Spijker
22134f2d3c
Merge branch '5.4' into CURA-9709_custom_icons_with_profiles 
# Conflicts:
#	cura/Machines/Models/IntentSelectionModel.py
 2023-06-07 16:20:48 +02:00
c.lamboo
57bece831f Don't scroll beyond bounds in recommended menu 
CURA-10650
 2023-06-06 16:31:36 +02:00
Jaime van Kessel
d8a88739a6
Ensure that menu items for extruder are added to right spot in context menu 
Fixes CURA-10649
 2023-06-02 13:51:43 +02:00
c.lamboo
bba1362bad Fix um s5 initially not showing up in printer list 
CURA-10627
 2023-05-31 13:30:26 +02:00
c.lamboo
27cc89ff89 Allow for custom descriptions/icons in packaged intents 
CURA-9709
 2023-05-31 12:54:56 +02:00