3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 04:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
28040 commits 312 branches 275 tags 718 MiB
Commit graph

12517 commits

Author SHA1 Message Date
Jaime van Kessel
2d0ce01ff5 Add menu to react on the hamburger menu 
CURA-8949
 2022-02-18 12:28:03 +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
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
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
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
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
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
Jaime van Kessel
821581bc65 Remove ProgressBar style and use UM.ProgressBar instead 
CURA-8685
 2022-02-15 17:07:22 +01:00
10r3n20
4383f2ddf2 adjusted colors and size of origin gizmo 2022-02-15 16:45:57 +01:00
Jaime van Kessel
13227249b5 Remove catalog from Textfield 
The creation of the catalog is rather slow, so it's better not to create it for every component
 2022-02-15 16:28:29 +01:00
Jaime van Kessel
eb7ab657fe Use Cura.Textfield in readonlyTextfield 
Less code duplication, which is always good

CURA-8685
 2022-02-15 16:26:58 +01:00
10r3n20
a9e3acb623 adjusted buildplate grid color 2022-02-15 16:26:27 +01:00
Jaime van Kessel
d7758c0ee9 Swap out the GeneralPage items to use the themed ones 
CURA-8685
 2022-02-15 16:11:06 +01:00
Jaime van Kessel
6ea7622a55 Fix reference to property that didn't exist 
CURA-8685
 2022-02-15 15:57:50 +01:00
Jaime van Kessel
b45b3faa3c Replace textField in JobSpecs 
CURA-8685
 2022-02-15 15:32:29 +01:00
Jaime van Kessel
6be75c75f8 Simpify Readonly textarea 
CURA-8685
 2022-02-15 15:18:04 +01:00
Jaime van Kessel
da96cb833c Swap ReadOnlyTextfield to controls 2 
CURA-8685
 2022-02-15 15:16:16 +01:00
Jaime van Kessel
a20dac4c9b Update ReadOnlyTextArea to controls 2 
CURA-8685
 2022-02-15 15:08:06 +01:00
casper
99478d6a15 Add "Ok" button in export/import materials popup dialog 
Proposed solution takes a different approach compared to the previous
solution. Previously there was one message dialog that was hidden by
default. When the import/export material confirm dialog was triggered
the text and body of this message dialog would change.

I did deviate from this pattern as this might introduce hard to debug
issues when a property would be set on this dialog. As this dialog is
used for various instances every instance should update the same
properties. If one property is missed then the popup might show unwanted
information.

I propose a different solution instead. Here a popup is created
dynamically. This way the properties used for each instance is clear.
This might add a delay when showing the popup as the whole component
needs to be created when called.

CURA-8959
 2022-02-15 11:18:02 +01:00
NilsRo
dec31d7f44 Update anycubic_i3_mega_s.def.json 
Deleted travel_compensate_overlapping_wall as property is removed
 2022-02-14 19:22:23 +01:00
Superbrain8
fda6758042
Added Nylon quality presets for the Artillery Printer (#11463) 
* Added Definitions for Nylon

CURA-8952
 2022-02-11 14:09:49 +01:00
casper
ca0d84dcae Always prefix text in ColorDialog with a hashtag 
CURA 8687
 2022-02-11 13:48:57 +01:00
casper
959caece90 Make input field in ColorDialog selectable by mouse 
CURA 8687
 2022-02-11 13:45:03 +01:00
casper
86392ab471 Remove empty file 
CURA 8687
 2022-02-11 13:31:19 +01:00
casper
2edd634909 Provide a title with the color picker 
CURA 8687
 2022-02-11 13:27:41 +01:00
casper
7f95dc98e6 Translate text within the color picker 
CURA 8687
 2022-02-11 13:27:29 +01:00
casper
46fac4263b Fix styling issues in the material sync dialog 
CURA 8939
 2022-02-11 13:10:24 +01:00
Casper Lamboo
5063b84c9a
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:32:12 +01:00
Casper Lamboo
8c0b0ddc5b
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:32:03 +01:00
Casper Lamboo
02f648d40a
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:31:54 +01:00
Casper Lamboo
b2f3b365c9
Remove setting duplicate properties of UM.Label default settings 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:31:30 +01:00
Jaime van Kessel
c1d5526537 Add some documentation to ColorDialog 
CURA-8687
 2022-02-11 11:08:11 +01:00
casper
91c95a0ed6 Remove duplicate function 
CURA 8687
 2022-02-11 10:47:37 +01:00
casper
1c711129e2 Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs 
# Conflicts:
#	resources/qml/Account/SyncState.qml
#	resources/qml/Preferences/ReadOnlySpinBox.qml
 2022-02-11 10:44:52 +01:00
casper
1eabf251f4 Remove unused function 
CURA 8687
 2022-02-10 18:07:42 +01:00
casper
fca6ef29ae Move ColorDialog to Cura repo 
Move component to the Cura repo as `Cura.SecondaryButton` and
`Cura.PrimaryButton` are used.

CURA 8687
 2022-02-10 18:06:43 +01:00
j.delarago
9bad66b6ce Add custom ColorDialog.qml with simple hex value selector. 
Cura-8681
 2022-02-10 17:28:29 +01:00
Jaime van Kessel
f15f01e32f Fix styling of visibilityPresetCombobox 2022-02-10 11:24:07 +01:00
Jaime van Kessel
1b9c86603c Fix layout of multiply object dialog 2022-02-10 10:59:21 +01:00
Jaime van Kessel
78523789e7 Use correct styling in settingmenu 2022-02-10 10:49:18 +01:00
Jaime van Kessel
5615ec82a3 Prevent text in configuration menu from spilling out of the menu 2022-02-10 10:45:51 +01:00