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
36,076 Commits 291 Branches 260 Tags
Commit Graph

6141 Commits

Author SHA1 Message Date
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
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
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
jspijker
1ddb4d6ca0 Fixed type in source string 
Contributes to CURA-10208
 2023-03-03 14:13:39 +01:00
Jaime van Kessel
10d2235428
Merge branch 'CURA-10076' of github.com:Ultimaker/Cura into 5.3 2023-03-01 11:12:30 +01:00
Jaime van Kessel
d7d7a7302d
Set defaultExtruderIndex to activeExtruderIndex 
This doesn't fix the problem in it's entirety, but it does make the behavior
to be the same as it was in the previous releases

CURA-10342
 2023-02-28 18:00:23 +01:00
c.lamboo
c60c322b11 Add resize handle to recommended window 
CURA-10076
 2023-02-24 14:28:13 +01:00
c.lamboo
1f1353802a Prefill material sync file name 
CURA-10174
 2023-02-20 17:41:07 +01:00
Joey de l'Arago
cd09717a64 This onclick is already passed in where it is needed. It is being triggered unnecessarily when switching support extruder in recommended mode. 
CURA-10233
 2023-02-08 13:42:30 +01:00
Asteroids
17c020b3cd
Fix decimals on heated bed temperature monitor (HeatedBedBox.qml) 
Round heated bed temperature values when printer sends them with decimal digits. 
Same roundings already exist on the extruder temperatures (see ExtruderBox.qml line 50 and 85)
 2023-02-04 01:26:00 +01:00
Joey de l'Arago
12701b7dac Hacky fix for mouseArea bug. 
CURA-9522
 2023-01-06 13:25:57 +01:00
jspijker
e532e13e06 Set height and of the material brand menuitem explicitly 
Contributes to CURA-9522
 2023-01-05 13:41:26 +01:00
c.lamboo
16c64014b2 Resolve formula in Keep or Discard dialog 
CURA-10111
 2023-01-04 13:17:56 +01:00
Joey de l'Arago
bf30e69f08 Change default implicitX for MaterialBrandSubMenu. 
CURA-9522
 2023-01-02 10:21:43 +01:00
Joey de l'Arago
e99719a08f Correct solution to width being incorrect after height resize. 
CURA-9522
 2022-12-29 13:35:24 +01:00
Joey de l'Arago
70d69031fe Fix width being incorrect on first time opening popups 
CURA-9522
 2022-12-29 13:08:15 +01:00
Joey de l'Arago
8c4276946d Fix double lining between popups 
CURA-9522
 2022-12-29 13:06:49 +01:00
Remco Burema
a8570920bd Make it work in dark-mode again. 
part of CURA-9522
 2022-12-27 12:32:23 +01:00
Remco Burema
d351458b10 Make identifier unique and call the correct one. 
Wouldn't start for me without (from source, on Windows).

part of CURA-9522
 2022-12-27 12:11:21 +01:00
Remco Burema
634288a37c Fix spelling mistakes. 
part of CURA-9522
 2022-12-27 12:09:47 +01:00
c.lamboo
e490250d9d Clean up code 
Create separate re-usable component for `MaterialBrandSubMenu`

CURA-9522
 2022-12-23 19:40:27 +01:00
c.lamboo
20fdf22e35 Show bottom border of material brands 
CURA-9522
 2022-12-23 16:18:55 +01:00
c.lamboo
ab49dcceb5 Show bottom border of material brands 
CURA-9522
 2022-12-23 16:18:54 +01:00
c.lamboo
0ecfdd063d Show bottom border of material brands 
CURA-9522
 2022-12-23 16:12:25 +01:00
c.lamboo
5a8bf7f37b Fix material colors not showing up 
CURA-9522
 2022-12-23 16:11:06 +01:00
c.lamboo
92e6d5007f Remove unused property 
CURA-9793
 2022-12-23 14:21:12 +01:00
Casper Lamboo
15761b6c59
Code style 
CURA-9522
 2022-12-23 13:51:32 +01:00