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

28353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
f9814520f7 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-8979_Materials_Preference_Page 2022-03-15 11:07:44 +01:00
Jaime van Kessel
97124bf5a9 Fix various QML warnings 
CURA-8979
 2022-03-15 10:32:44 +01:00
Jaime van Kessel
f760ca146d Fix sizing of materialBrandSelection 
This also cleans up some stuff from the theme. Huzzah

CURA-8979
 2022-03-15 10:25:56 +01:00
Jaime van Kessel
93405bdb93 Add identation for the materials preferences page 
CURA-8979
 2022-03-15 10:19:34 +01:00
j.delarago
067cdda401 Add missing UM import 
CURA-9005
 2022-03-15 09:05:38 +01:00
Jaime van Kessel
c6326eff64 Ensure that "update profile" button in preferences has correct enabled state 
CURA-9023
 2022-03-14 11:56:45 +01:00
Jaime van Kessel
0084001e2f Remove . from button string 
CURA-9023
 2022-03-14 11:47:19 +01:00
Jaime van Kessel
97732336e3 Increase width of dropdown boxes in general page 
CURA-8990
 2022-03-14 11:42:50 +01:00
Jaime van Kessel
ea03236f03 Remove unneeded font assignment 
The default font is, you guessed it, already default.
 2022-03-14 11:40:05 +01:00
Jaime van Kessel
790c2c23c1 Display profile name correctly in dropdown 
CURA-9040
 2022-03-14 11:38:31 +01:00
Ghostkeeper
cfeb5101e7
Reset Max Skin Angle for Expansion to 90 
It has been found that the 20 degree leads to overhangs that this printer doesn't handle well.

Fixes #11553.
 2022-03-14 02:37:14 +01:00
casper
5136838f56 Update materials list in materials preference page 
Main improvement of this commit is that the reusable category button
component is used as the collapsable header component for the material
brands/types.

CURA-8979
 2022-03-11 16:42:11 +01:00
casper
b2f13cc6c9 Update Category Button 
Put content of category button in a `RowLayout` so individual content
Components can easily be removed by hiding said component while keeping
margins and spacings work as intended.

Additionaly make the icon property optional

CURA-8979
 2022-03-11 16:40:32 +01:00
casper
e2c9e0a461 Elide text in materials slot 
CURA-8979
 2022-03-11 16:29:37 +01:00
Jaime van Kessel
22f9b2a0ec Increase the indentation margin for settings 
CURA-8921
 2022-03-11 15:38:34 +01:00
casper
359cb673bc Merge branch 'master' into CURA-8979_Materials_Preference_Page 2022-03-11 14:02:33 +01:00
Casper Lamboo
50bf87a41d
Merge pull request #11622 from Ultimaker/CURA-9005_restyle_print_setting_category 
[CURA-9005] Restyle print setting category
 2022-03-11 14:01:15 +01:00
casper
2f8f56d762 Merge branch 'master' into CURA-8979_Materials_Preference_Page 
# Conflicts:
#	resources/qml/Preferences/ProfilesPage.qml
 2022-03-11 13:57:30 +01:00
Casper Lamboo
60f7b2dccb
Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-11 13:43:33 +01:00
casper
c6b8abd53e Update materials slot 
CURA-8979
 2022-03-11 13:22:45 +01:00
casper
1b976693dc Remove dangling comment 
CURA-9005
 2022-03-11 13:13:25 +01:00
casper
5701f42d63 Move CategoryButton to cura repo 
CURA-9005
 2022-03-11 13:11:36 +01:00
Ghostkeeper
25e914b1cb
Fix checkbox for automatic plug-in update checking 
The checkbox was still there in the preferences page, but it didn't work at all, for two reasons:
- The preference entry didn't exist. This was causing warnings in the log (which is why I saw it).
- It wasn't checking the preference before making that API call. Could make a bunch of people pretty angry.
 2022-03-11 10:25:31 +01:00
Ghostkeeper
d778b539c2
Parse up to 16 extruders 
CuraEngine supports up to 16, so we should allow at least that.
 2022-03-11 10:13:44 +01:00
Casper Lamboo
addc5e36a7
Apply suggestions from code review 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-03-11 09:59:20 +01:00
casper
2dd440cc0c Fix print settings tab in materials view 
CURA-8979
 2022-03-10 22:13:32 +01:00
Remco Burema
d2ab7d3d4d
Merge pull request #11633 from Ultimaker/CURA-9012_application_menu_fixes 
Application menu fixes
 2022-03-10 12:55:54 +01:00
Remco Burema
1445419406
Merge pull request #11634 from Ultimaker/CURA-9023_Fix_profile_page_uppdate_create_new 
Profile page fixes
 2022-03-10 12:47:47 +01:00
Jaime van Kessel
dbcf571340 Apply right theme colors for secondary button 
CURA-9014
 2022-03-10 11:54:58 +01:00
Jaime van Kessel
a5098f469b Lower the max flick velocity of settingview 
On my system it was 2500, which made it almost impossible to work with
the trackpad

CURA-9025
 2022-03-10 11:45:39 +01:00
Jaime van Kessel
84a0c732c1 Fix warnings caused by combobox 
Parent wasn't always set, which caused ocasional warnings
 2022-03-10 11:34:11 +01:00
casper
9ba44f1d30 Move details plane caption to management page 
This way the caption can be correctly aligned with the hamburger menu
button

CURA-8979
 2022-03-10 10:15:31 +01:00
Jaime van Kessel
ec1f8f7125 Add extra info label 
CURA-9023
 2022-03-09 16:30:32 +01:00
Jaime van Kessel
84bb4790f8 Fix spacing between update & discard actions 
CURA-9023
 2022-03-09 16:28:26 +01:00
Jaime van Kessel
a285e39799 Set defaultname for create new profile 
CURA-9023
 2022-03-09 16:26:01 +01:00
Jaime van Kessel
cbf995cb85 Add tooltip to create new button 
CURA-9023
 2022-03-09 16:24:49 +01:00
Jaime van Kessel
6aeac2b2a4 Shorten copy of update button 
Added the full text in the tooltip

CURA-9023
 2022-03-09 16:13:41 +01:00
casper
418f88a4da boy scouting 
CURA-8975
 2022-03-09 15:59:21 +01:00
casper
f9a5cb33fd Implement basic styling of material management page 
CURA-8979
 2022-03-09 15:26:55 +01:00
Jaime van Kessel
91b6ceb951 Fix spacing for menu 
CURA-9012
 2022-03-09 14:01:54 +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
dab67d9b38 Ensure that invisible menu seperators have a height of 0 
CURA-9012
 2022-03-09 13:26:16 +01:00
Jaime van Kessel
01ecc799fa Change background color of Discard or keepchanges dialog 
CURA-8951
 2022-03-09 13:06:28 +01:00
casper
fd3ef23784 Swap buttons in MonitorConfigOverrideDialog for cura buttons 
CURA-8975
 2022-03-09 12:23:21 +01:00
casper
70f66648f4 Recolor placeholder icon for packages/plugins correctly in dark-mode 
As we don't want to recolor the icon if the package has a custom icon
a `Image` or `UM.RecolorImage` is shown conditionally.

CURA-8975
 2022-03-09 12:10:49 +01:00
casper
0e2848796c Increase text field width to prevent inner text from shifting 
CURA-9010
 2022-03-09 09:46:57 +01:00
Jaime van Kessel
79464106a9 Merge branch 'master' of github.com:Ultimaker/Cura 2022-03-08 14:27:43 +01:00
Jaime van Kessel
a9a0d4280a Fix Jobspecs text alignment 
CURA-9010
 2022-03-08 14:27:00 +01:00
Casper Lamboo
61554a70c8
Merge pull request #11626 from Ultimaker/CURA-9008_reduce_profile_column_width 
[CURA-9008] Reduce width of preferences dialog page selection buttons.
 2022-03-08 10:16:07 +01:00
casper
912db08b23 Let height of preferences_page_list themes value set height of list item 
CURA-9008
 2022-03-08 09:11:49 +01:00