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

28338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
j.delarago
d1a42e4e77 Update gcode text area in machine settings to have new border highlighting style and background color. 
Swapped out default Label for UM.Label so it is easier to change styling in the future.

CURA-8943
 2022-03-04 09:18:48 +01:00
Remco Burema
066a4936e3 Manually revert fuzzy skin disable. 
Re-implementing this feature for Arachne, so it should be (possible to) enable(d) again.

part of CURA-7887
 2022-03-04 07:38:27 +01:00
j.delarago
3c7498feed Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool. 
Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!

CURA-8943
 2022-03-03 15:53:30 +01:00
Jaime van Kessel
78331d8e2a Merge branch 'feature-gcodereader-filament-diameter' of https://github.com/Wikunia/Cura 2022-03-03 15:08:31 +01:00
Jaime van Kessel
efea7c9bed Clean up ordering of properties in profiles page 
Boyscouting; It was a bit of a mess

CURA-8982
 2022-03-03 14:25:33 +01:00
Jaime van Kessel
e569346750 Move scrollview caption over two lines 
CURA-8982
 2022-03-03 14:19:21 +01:00
Jaime van Kessel
950fc6f3da Hide hamburger menu if no item is selected 
CURA-8982
 2022-03-03 14:18:58 +01:00
Jaime van Kessel
802a80b702 Fix visibility of create new button in profiles page 
CURA-8982
 2022-03-03 14:12:55 +01:00
Jaime van Kessel
165172f919 Re-add Duplicate button in profiles page 
CURA-8982
 2022-03-03 14:08:47 +01:00
Jaime van Kessel
6b9e66cfb7 Add title to profiles page 
CURA-8982
 2022-03-03 14:06:27 +01:00
Jaime van Kessel
06eddc3419 Set border_main for darktheme to be darker 
CURA-8975
 2022-03-03 14:01:41 +01:00
Jaime van Kessel
cbbe961a44 Let quality intents menu use checkmark to indicate active profile 
CURA-8928
 2022-03-03 13:46:38 +01:00
Jaime van Kessel
fc577ffcbc Improve margins of qualities menu 
CURA-8928
 2022-03-03 13:09:09 +01:00
casper
eb8fd44e4c Fix launching the usb printing menu 
Some imports were incorrect/missing.

CURA-9000
 2022-03-03 13:01:42 +01:00
Jaime van Kessel
a0f9febf62 Fix highlight color of quality dropdown 
CURA-8928
 2022-03-03 12:53:46 +01:00
Jaime van Kessel
fcdc43fc71
Merge pull request #10788 from Ultimaker/replace_controls_1_for_controls_2 
Convert QtQuick.Controls 1 to QtQuick.Controls 2
 2022-03-03 12:52:13 +01:00
Ole Kröger
893da1ed38
Update plugins/GCodeReader/FlavorParser.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-03-03 11:03:33 +01:00
Ole Kröger
0ff94c6150
Update plugins/GCodeReader/FlavorParser.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-03-03 11:03:28 +01:00
Remco Burema
78bd9c7194
Merge pull request #11546 from Ultimaker/color_dialog 
Color dialog
 2022-03-02 18:09:46 +01:00
Remco Burema
37ae1cd69d Workaround on Windows. 
part of CURA-8938
 2022-03-02 18:05:50 +01:00
Remco Burema
901dc55733
Merge pull request #11535 from Ultimaker/CURA-8688_qt6_cleanup 
[CURA-8688] QT6 cleanup
 2022-03-02 16:49:53 +01:00
Ole Kroeger
812bf2f4aa use current filament diameter 2022-03-02 14:25:05 +01:00
casper
3cba9a9c7e Update color of material after accepting the color dialog 
CURA-8938
 2022-03-02 11:52:30 +01:00
j.delarago
30083c13d3 Swap implicit width/height for preferredWidth/Height to avoid binding loop error 
CURA-8688
 2022-03-02 11:34:03 +01:00
j.delarago
50ac2eacc4 Fix property binding loop for height which was causing crashes when moving list items quickly up and down the list. 
CURA-8688
 2022-03-02 10:26:09 +01:00
j.delarago
b2bed4efdd Fix setting visibility styling working in one theme and not the other. 
CURA-8688
 2022-03-02 09:06:47 +01:00
Casper Lamboo
4853350638
make onClicked action a one-liner 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-03-01 17:49:14 +01:00
Casper Lamboo
9aee7fa78a
Merge pull request #11577 from Ultimaker/CURA-8931_extruder_tabs_profile_manager_window 
Add workaround for TableModel not updating when rows are set directly
 2022-03-01 16:43:38 +01:00