casper
|
359cb673bc
|
Merge branch 'master' into CURA-8979_Materials_Preference_Page
|
2022-03-11 14:02:33 +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
|
5701f42d63
|
Move CategoryButton to cura repo
CURA-9005
|
2022-03-11 13:11:36 +01:00 |
|
casper
|
2dd440cc0c
|
Fix print settings tab in materials view
CURA-8979
|
2022-03-10 22:13:32 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
casper
|
862525bc90
|
Remove obsolete uses of system palette
CURA-8688
|
2022-03-01 12:29:09 +01:00 |
|
casper
|
2949c0fcb3
|
Color icon in preference page according to theme color
CURA-8688
|
2022-02-28 16:13:36 +01:00 |
|
Jaime van Kessel
|
5725f3d57f
|
Fix height of syncMaterialCards
CURA-8688
|
2022-02-28 15:46:04 +01:00 |
|
Jaime van Kessel
|
bb1a2a9988
|
Fix QML warning
CURA-8688
|
2022-02-28 13:46:29 +01:00 |
|
Jaime van Kessel
|
1f39a1b87f
|
Add CuraStyled rename dialog
CURA-8688
|
2022-02-28 13:30:14 +01:00 |
|
Jaime van Kessel
|
6713056a49
|
Ensure that setting visibility filter is styled
CURA-8688
|
2022-02-28 13:15:39 +01:00 |
|
Jaime van Kessel
|
14b0f66c99
|
Remove hardcoded value for visibility preset selector
CURA-8688
|
2022-02-28 13:14:23 +01:00 |
|
j.delarago
|
e2fe50baf1
|
Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup
# Conflicts:
# resources/qml/Widgets/Menu.qml
# resources/qml/Widgets/MenuItem.qml
# resources/themes/cura-dark/theme.json
# resources/themes/cura-light/theme.json
|
2022-02-28 08:51:42 +01:00 |
|
Jaime van Kessel
|
93a5c44e6c
|
Fix codestyle
CURA-8978
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
|
2022-02-24 17:22:10 +01:00 |
|
Jaime van Kessel
|
6e59cd23bb
|
Fix hide / show all in setting visibility page
CURA-8978
|
2022-02-24 15:32:39 +01:00 |
|
j.delarago
|
b14e29d214
|
Make general menu combox wider
CURA-8688
|
2022-02-23 15:13:36 +01:00 |
|
j.delarago
|
111c095f32
|
Swap RadioButton for styled Cura.RadioButton
CURA-8688
|
2022-02-23 15:04:58 +01:00 |
|
casper
|
e03176a1fa
|
Replace UM.MessageDialog with newly added Cura.MessageDialog
This dialog is different from the `UM.MessageDialog` in that it
CURA-8688
|
2022-02-23 14:09:38 +01:00 |
|
Jaime van Kessel
|
f347c6aedf
|
Remove number of unused styles imports
|
2022-02-22 11:42:41 +01:00 |
|
Jaime van Kessel
|
1343d7bdf9
|
Change font of camera rendering label
CURA-8949
|
2022-02-21 11:15:30 +01:00 |
|
Jaime van Kessel
|
b2494f4d2e
|
Change the moreInfo button for slice statistics
CURA-8949
|
2022-02-21 11:07:47 +01:00 |
|
Jaime van Kessel
|
ec407a81d3
|
Change ordering of some items in general page
As per design
CURA-8949
|
2022-02-21 10:19:02 +01:00 |
|
Jaime van Kessel
|
8b987d9537
|
Remove id left over from copy paste
CURA-8949
|
2022-02-21 10:05:09 +01:00 |
|
Jaime van Kessel
|
8e55dda3cc
|
Switch old checkbox over to styled variant
CURA-8949
|
2022-02-21 10:03:44 +01:00 |
|
Jaime van Kessel
|
af99b87bef
|
Remove close button
No idea why it was there in the first place. The dialog itself can be closed...
CURA-8949
|
2022-02-18 16:28:10 +01:00 |
|
Jaime van Kessel
|
d6b2b951f2
|
Hide background if no item is selected
CURA-8949
|
2022-02-18 16:15:43 +01:00 |
|
Jaime van Kessel
|
3a1d5a29fa
|
Add background to profiles page
CURA-8949
|
2022-02-18 16:12:23 +01:00 |
|
Jaime van Kessel
|
a458155258
|
Update look of the profilesPage
CURA-8949
|
2022-02-18 15:09:57 +01:00 |
|
Jaime van Kessel
|
9df7ccd5cc
|
Let profiles page use ManagementPage
No idea why it didn't in the first place. This caused a lot of code duplication.
CURA-8949
|
2022-02-18 14:20:16 +01:00 |
|
Jaime van Kessel
|
742f0b7dbb
|
Add defaults button to setting visibility page
CURA-8949
|
2022-02-18 12:49:59 +01:00 |
|