Commit graph

28416 commits

Author SHA1 Message Date
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
Casper Lamboo
0c58488eb1
Merge pull request #11627 from Ultimaker/CURA-9004_materials_selection_dropdown
[CURA-9004] materials selection dropdown improvements
2022-03-08 08:43:00 +01:00
j.delarago
59158db34b Lining at the bottom of UnderlineBackground and at the top of the menu give a double width lining.
Moved the menu up slightly so lining of UnderlineBackground is hidden.

CURA-9004
2022-03-07 17:07:14 +01:00
Jaime van Kessel
90bb250d8f Merge branch 'CURA-9007_burger_menu' of github.com:Ultimaker/Cura 2022-03-07 16:58:11 +01:00
j.delarago
a49aa6502c Set material and nozzle selection menus to appear at bottom of button like drop downs.
CURA-9004
2022-03-07 16:56:26 +01:00
10r3n20
4f2e7116b7 minor fix to align setting visibility with settings 2022-03-07 16:25:14 +01:00
j.delarago
37a4986406 Reduce width of preferences dialog page selection buttons.
Reduce width of profiles list and printers list.

CURA-9008
2022-03-07 16:17:03 +01:00
10r3n20
5499a4cc4c tiny improvements 2022-03-07 16:11:33 +01:00
j.delarago
1eb887010a Swap TextField for Cura.TextField so it has the same styling as the rest of text fields.
CURA-9010
2022-03-07 15:00:51 +01:00
j.delarago
aa25e0746c Make burger invisible when no printer is selected in Printer page
CURA-9007
2022-03-07 14:35:09 +01:00
j.delarago
016cc4e48f Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-07 13:37:58 +01:00
j.delarago
eb88316eee Give PerObjectSettingsPanel.qml the same margin between settings as main settings
CURA-9005
2022-03-07 13:36:11 +01:00
Casper Lamboo
6cf7fae607
Merge pull request #11596 from Ultimaker/CURA-8982_Profile_tab_fixes
Profile tab fixes (preferences)
2022-03-07 13:28:55 +01:00
j.delarago
dc5a1ae120 Remove redundant reference to spacer
CURA-9005
2022-03-07 13:26:50 +01:00
j.delarago
76d9cf6f4d Remove margins that keep listview items from being under the scrollbar. Instead set width of listView smaller so it doesn't overlap.
Update per object setting visibility dialog to have same category design as SettingVisibilityCategory.qml and SettingCategory.qml

CURA-9005
2022-03-07 13:20:05 +01:00
Casper Lamboo
da9f33f93f
Merge pull request #11599 from Ultimaker/CURA-8943_tool_panel_icon_size
[CURA-8943] Update Tool Panel Icons style
2022-03-07 12:58:25 +01:00
j.delarago
f58411d086 Merge branch 'master' into CURA-8943_tool_panel_icon_size
# Conflicts:
#	resources/qml/ToolTip.qml
2022-03-07 12:46:36 +01:00
j.delarago
798e86646c Make CategoryButton generic, it is used in SettingCategory.qml, PerObjectCategory.qml and SettingVisibilityCategory.qml.
Remove left margin on categories

CURA-9005
2022-03-07 12:04:37 +01:00
Casper Lamboo
64e3e8b31d
Use template literals to format string 2022-03-07 11:31:24 +01:00
Casper Lamboo
24fc1ae2a2
Merge pull request #11595 from Ultimaker/CURA-8928_menu_visual_fixes
Leftover menu fixes
2022-03-07 10:53:24 +01:00
j.delarago
c2cb837f4e update indentation
CURA-9005
2022-03-07 10:46:03 +01:00
Casper Lamboo
11d7afe505
Formatting of inline if statement 2022-03-07 10:44:24 +01:00
Casper Lamboo
58ca09e1c6
Remove unused id 2022-03-07 10:43:46 +01:00
Jaime van Kessel
0d2ebcb802
Merge pull request #11606 from Ultimaker/CURA-8991_align_input_compontent_styling
[CURA-8991] Align input component styling
2022-03-07 10:40:39 +01:00
j.delarago
06a30a702c Update Settings view category items to new style
Removed the fixed height from the SettingView list so that the SettingItems can have a larger height than the SettingCategory

CURA-9005
2022-03-04 17:23:36 +01:00
Jaime van Kessel
4c61768104
Merge pull request #11605 from Ultimaker/CURA-7887_fuzzy_spider
[CURA-7887] Manually revert fuzzy skin disable.
2022-03-04 16:42:34 +01:00
j.delarago
7b0e954f12 Change machine setting page text box text highlight color to match designs.
CURA-8991
2022-03-04 15:20:46 +01:00
j.delarago
719257bb63 Update validation colors to match new designs
CURA-8991
2022-03-04 15:05:30 +01:00
Ghostkeeper
45fa33584b
Restore loadProjectFile function
It is being used when you want to load a project file. Pretty important!

Discovered while testing CURA-7950.
2022-03-04 15:05:27 +01:00
j.delarago
e1068fb3bc Replace Text.Align with custom enum alignment
CURA-8943
2022-03-04 14:12:11 +01:00
Tim Kuipers
4f66ea4cc6 new parent settings for line thresholds
This should be more intuitive and more helpful to the user and our own material profile experts
2022-03-04 13:59:14 +01:00
j.delarago
1eb16c0ec5 Update SettingTextField to match TextField
CURA-8991
2022-03-04 13:53:59 +01:00
j.delarago
7dabcfafb0 Add checkbox square coloring back.
CURA-8991
2022-03-04 13:48:01 +01:00
j.delarago
fb42679d08 Update TextField to match designs when disabled.
CURA-8991
2022-03-04 13:39:50 +01:00
j.delarago
1fc6b8ced6 New designs use dark mode border_main for dark theme.
Remove uses of border_main_light. The only puprose of this color was to give dark mode access to the border_main of the light theme.

CURA-8991
2022-03-04 13:22:55 +01:00
j.delarago
b3e8c7190e Align radio buttons with new designs.
Fix radiobutton looking the same checked and unchecked when disabled

CURA-8991
2022-03-04 13:18:00 +01:00
j.delarago
b86b1133df Remove enable:false assignment that was used for testing
CURA-8991
2022-03-04 13:02:21 +01:00
j.delarago
a26b54f6e2 Fix checkboxes not showing check marks when disabled.
Update checkboxes to align with new designs.

Update SettingCheckBox to match checkbox styling.

Remove duplicated styling inside cura-dark/theme.json

CURA-8991
2022-03-04 11:28:11 +01:00
Jaime van Kessel
2ed68beb22 Fix display of profile name in header
Without no-wrap, longer names would be put on multiple lines.
These would then spill out of the display element
2022-03-04 10:30:26 +01:00