GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 20:04:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,466 Commits 289 Branches 260 Tags
Commit Graph

5965 Commits

Author SHA1 Message Date
c.lamboo
f07faac422 Add copy, paste, cut functionality 
CURA-7913
 2023-08-04 13:24:06 +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
c.lamboo
333c573dcc Resolve alignment issues 
If the material list is too long the printer name/print button should be aligned to the top according to the figma design

CURA-10507
 2023-05-05 10:43:26 +02:00
c.lamboo
afed736125 Fix compatible printers window UI issues 
CURA-10507
 2023-05-03 19:33:19 +02:00
c.lamboo
cf7bc063f1 Fix: Make "add printer" sections individually collapsable 
One variable was incorrectly named

CURA-10484
 2023-04-06 21:52:50 +02:00
c.lamboo
20b171dbeb Make "add printer" sections individually collapsable 
CURA-10484
 2023-04-06 21:46:51 +02:00
Jelle Spijker
980de97162 Set FileMode ExistingFile in the open file dialog 2023-03-30 15:05:25 +02:00
Jaime van Kessel
1e0fc60008
Merge branch '5.3' of github.com:Ultimaker/Cura 2023-03-17 10:42:36 +01:00
c.lamboo
71a0044bf8 Fix extruder number 
most important change was changing
```
        currentIndex: function () {
          ...
        }
```
to
        currentIndex: {
          ...
        }
```
This changed the behavior so that the variables inside the code blocked are watched so that `currentIndex` is automatically updated. No longer needed to set the `currentIndex` from any where else anymore.

CURA-10374
 2023-03-15 18:18:31 +01:00
Jelle Spijker
5d41604a21
Merge branch '5.3' 2023-03-15 12:45:47 +01:00
c.lamboo
37f4271c9b Fix comboboxes not updating the accosiated value 
Was introduced by this commit: 788ab7da1b

CURA-10374
 2023-03-14 19:28:01 +01:00
c.lamboo
035a609277 Boyscouting 
CURA-10374
 2023-03-14 19:27:57 +01:00
Jaime van Kessel
e099304fce
Merge branch 'patch-1' of github.com:asteroids1975/Cura 
CURA-10400
 2023-03-14 12:51:09 +01:00
Jaime van Kessel
aec8a9ad49
Fix the hover for SettingItem 
This was broken due to the switch to Qt6

Fixes CURA-10375 and fixes #14790
 2023-03-08 16:23:56 +01:00
c.lamboo
62812393b0 Fix typos in translations 
CURA-10369
 2023-03-07 10:29:37 +01:00
jspijker
a8ccb7d2ff Removed translations from WelcomContent 
This is only shown during the on-boarding flow

Contribute to CURA-10208
 2023-03-06 12:07:29 +01:00
jspijker
e64e090814 Remove translations from DataCollectionsContent 
Contribute to CURA-10208
 2023-03-06 11:59:17 +01:00