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

28255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
06eddc3419 Set border_main for darktheme to be darker 
CURA-8975
 2022-03-03 14:01:41 +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
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
casper
53b31e816a Set size of color swatch from theme 
CURA-8983
 2022-03-01 16:16:53 +01:00
casper
c8be7832c8 Remove debugging code 
CURA-8983
 2022-03-01 16:06:48 +01:00
Joey de l'Arago
cb2f0b9bd2
Merge pull request #11540 from Ultimaker/CURA-8978_fix_checkbox_style_and_functionality 
Fix hide / show all in setting visibility page
 2022-03-01 15:43:33 +01:00
j.delarago
5dfc5971e3 Dialogs inheriting from incorrect Component, causing the buttons to be styled incorrectly 
CURA-8688
 2022-03-01 14:53:51 +01:00
j.delarago
1b6c3516bd Set default overlay background to background_1 
CURA-8688
 2022-03-01 14:37:48 +01:00
Jaime van Kessel
8784f0182c Add workaround for TableModel not updating when rows are set directly 
It's not a great solution, but I just can't figure out why it wouldn't update.
The binding is correctly in place, so it should work. Might be a bug with QT?

CURA-8931
 2022-03-01 14:20:42 +01:00
j.delarago
6ad3ef8e7d Update monitor page background colors 
CURA-8688
 2022-03-01 13:22:51 +01:00
j.delarago
01802c9a97 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-03-01 13:14:08 +01:00
j.delarago
2e92a986db adjust dropdown background hover color 
CURA-8688
 2022-03-01 13:13:54 +01:00
casper
6274a6e15b Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-03-01 13:12:42 +01:00
casper
4ea93c5939 Fix text rendering issue in the menu bar 
To denote the hotkey assigned with each menu item an ampersand is used
in the configuration. This ampersand was previously rendered directly
to the screen due to the `UM.Label`. This is now correctly replaced by
an underline.

CURA-8688
 2022-03-01 13:12:35 +01:00
j.delarago
ef5fced686 adjust setting valid background color 
CURA-8688
 2022-03-01 12:51:55 +01:00
j.delarago
fbe74b384f Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-03-01 12:45:45 +01:00
j.delarago
fc3f0a4ad3 Update setting profile combobox to new style 
CURA-8688
 2022-03-01 12:44:52 +01:00
casper
71e0489c3e Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-03-01 12:39:01 +01:00
casper
071ddfb2b1 Fix text elide/word wrap issue in monitor page 
The print job name wasn't elided causing the text to overflow the
progress bar card.

CURA-8688
 2022-03-01 12:38:54 +01:00
j.delarago
ac907ca451 Update highlight colors 
CURA-8688
 2022-03-01 12:33:19 +01:00
casper
862525bc90 Remove obsolete uses of system palette 
CURA-8688
 2022-03-01 12:29:09 +01:00
casper
1b116aa76e Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-03-01 12:09:35 +01:00
casper
a3a5b613ae Style menu bar according to theme 
CURA-8688
 2022-03-01 12:09:27 +01:00
j.delarago
a6801fc88a Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-03-01 11:48:57 +01:00
j.delarago
2fdd7b82d5 Update settings extruder comboboxes and material selection combobox to match new designs 
CURA-8688
 2022-03-01 11:48:41 +01:00
casper
82173c5766 Update remaining qt controls 1 imports 
CURA-8688
 2022-03-01 11:48:15 +01:00
casper
ceee0e9b4b Update RecommnededQualityProfileSelector to Controls 2 
CURA-8688
 2022-03-01 11:38:29 +01:00
casper
bd1b0fb34c Update usb printing menu to qt controls 2 
CURA-8688
 2022-03-01 11:36:47 +01:00
casper
e131c596df Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-03-01 11:16:45 +01:00
casper
a4b8fe23eb Update Infill Slider to qt controls 2 
CURA-8688
 2022-03-01 11:16:14 +01:00
j.delarago
b129eb805f Update message background to match new designs 
CURA-8688
 2022-03-01 10:35:43 +01:00
j.delarago
330b3f8119 Update settings visibility pages to have correct background color on categories 
CURA-8688
 2022-03-01 10:26:59 +01:00
j.delarago
b3c9a98879 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-03-01 10:20:48 +01:00
j.delarago
195278aa55 Make all text fields use updated background and lining style. 
CURA-8688
 2022-03-01 10:20:39 +01:00
casper
7ebc5eaac4 Use Cura.TextField in the spinbox component 
CURA-8688
 2022-03-01 09:30:02 +01:00
casper
8dde0f4fd2 remove debugging code 
beepboop

CURA-8688
 2022-02-28 16:51:34 +01:00