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

28174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
j.delarago
104a34d05a Vertically center aligns "Material", "PrintCore" and dropdowns in extruder configuration menu. 
CURA-8688
 2022-02-21 10:46:39 +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
j.delarago
c00eb5b432 Align checkbox with category icon in per object visibility settings dialog and preferences visibility settings. 
Move "Information" icon to the right of checkboxes in settings visibilty preferences page. This allows clean aligning of checkboxes with category icon.

CURA-8688
 2022-02-18 18:15:48 +01:00
j.delarago
d333b4639c Align per object settings visibility checkbox with icon 
CURA-8688
 2022-02-18 17:20:49 +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
j.delarago
7c9038b43c Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-18 16:11:34 +01:00
casper
84fe432239 Use cura-styled button in machines page 
CURA-8688
 2022-02-18 16:11:25 +01:00
j.delarago
2ed1894a27 Set Dialog margin as it was in 4.13 
CURA-8688
 2022-02-18 16:11:18 +01:00
casper
ec186f140b Use cura-styled button in about page 
CURA-8688
 2022-02-18 16:01:51 +01:00
casper
7be54a47ec Use cura-styled button in settings pick dialog 
CURA-8688
 2022-02-18 16:00:03 +01:00
Jaime van Kessel
a458155258 Update look of the profilesPage 
CURA-8949
 2022-02-18 15:09:57 +01:00
casper
26470440f0 Update buttons in work space dialog 
Use Cura-styled buttons
Use dialog accecpt-reject handlers

CURA-8688
 2022-02-18 14:21:37 +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
casper
67c80e8a37 Update image loader dialog 
- Changed the slider to a Cura.Spinbox
- Use Cura-styled buttons

CURA-8688
 2022-02-18 14:02:09 +01:00
Jaime van Kessel
742f0b7dbb Add defaults button to setting visibility page 
CURA-8949
 2022-02-18 12:49:59 +01:00
Jaime van Kessel
5aed6bb3c8 Move reset to defaults button for general page 
CURA-8949
 2022-02-18 12:33:07 +01:00
Jaime van Kessel
2d0ce01ff5 Add menu to react on the hamburger menu 
CURA-8949
 2022-02-18 12:28:03 +01:00
10r3n20
58137e4987 inverted y and z colors 2022-02-18 12:08:11 +01:00
Jaime van Kessel
8feaa32769 Codestyle cleanups 
Mostly just removing ;'s from QML

CURA-8949
 2022-02-18 11:28:40 +01:00
Jaime van Kessel
46e7217646 Layout tweaks for general page 
CURA-8949
 2022-02-18 11:22:19 +01:00
Jaime van Kessel
2b220c627f Disable wordwrap in combobox 
CURA-8949
 2022-02-18 11:06:33 +01:00
Jaime van Kessel
3e5a51503e Change font of the headings in general page 
CURA-8949
 2022-02-18 10:59:23 +01:00
casper
5134a071b1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-18 10:55:09 +01:00
casper
d88f7d4267 Replace Cura.Checkbox with UM.CheckBox 2022-02-18 10:54:11 +01:00
Jaime van Kessel
9d364a324b
Merge pull request #11501 from alexandr-vladimirov/master 
Fix cura-build-environment link in README.md
 2022-02-18 10:41:29 +01:00
j.delarago
e60b8ac30c Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-18 10:32:21 +01:00
j.delarago
9b05dbdb85 MenuItem height has to be set to 0 when visible: false otherwise there is white space in place of the MenuItem. 
This functionality is included in UM and was being overwritten in Cura.MenuItem.

CURA-8688
 2022-02-18 10:29:55 +01:00
Jaime van Kessel
ee7bcc3f5f Use UM checkbox 
CURA-8949
 2022-02-18 10:27:08 +01:00
Jaime van Kessel
48fa6cddf0 Merge branch 'replace_controls_1_for_controls_2' of github.com:Ultimaker/Cura into CURA-8949_preferences_styling 2022-02-18 10:24:06 +01:00
Jaime van Kessel
6e5e5152be Change machine actions buttons to secondaryButtons 
CURA-8949
 2022-02-18 10:14:47 +01:00
casper
ab17df15b5 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-18 10:08:12 +01:00
Casper Lamboo
9285256ac7
Merge pull request #11492 from Ultimaker/CURA-8685-replace_text_and_progress_bars 
Replace text and progress bars
 2022-02-18 09:08:31 +01:00
casper
5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars 
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
 2022-02-18 09:07:25 +01:00
casper
9f7581d4e8 Remove ReadOnlyTextField 
and use a
```
UM.TextField
{
   enabled: false
}
```
instead

CURA-8688
 2022-02-18 08:57:38 +01:00
alexandr-vladimirov
7677f999ec Fix cura-build-environment link in README.md 2022-02-18 00:09:04 +05:30
j.delarago
e990e970be Revert background to Rectangle as it was in previous versions of this file. 
This gives the bar a white background, instead of a transparent background.

CURA-8688
 2022-02-17 15:42:25 +01:00
j.delarago
b2811b1125 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-17 15:21:19 +01:00
Jaime van Kessel
5f9e916f29 Merge branch 'Ok_button_dialog' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:21:15 +01:00
Jaime van Kessel
f7dc2fc2d1 Merge branch 'materials_sync' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:13:15 +01:00
Jaime van Kessel
58e6cde6e8 Remove incorrect refferents to btnOk 2022-02-17 15:10:18 +01:00
Jaime van Kessel
266214d651 Merge branch 'Ip_adress_dialog' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:08:02 +01:00
Jaime van Kessel
b5136ba70c Fix merge conflics 2022-02-17 15:07:48 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Jaime van Kessel
c528616d12 Set selection color of textfields 
CURA-8947
 2022-02-17 14:39:11 +01:00
Jaime van Kessel
e66628e2da Merge branch 'CURA-8031_modifier_meshes_in_one_at_a_time_mode' of github.com:Ultimaker/Cura 2022-02-17 14:18:54 +01:00
Jaime van Kessel
614fe6fd4f
Merge pull request #11023 from NilsRo/master 
Update anycubic_i3_mega_s.def.json

CURA-8971
 2022-02-17 09:48:25 +01:00