911 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
46fac4263b Fix styling issues in the material sync dialog
CURA 8939
2022-02-11 13:10:24 +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
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
casper
2e1f2a37a3 Fix centering of MessageDialog
Instead of centering in the parent the dialog is now center within the
`Overlay.overlay`. This is the window container.

CURA 8687
2022-02-09 16:45:34 +01:00
casper
84ecc8d168 Remove unused imports
CURA 8687
2022-02-09 15:50:05 +01:00
j.delarago
1375b1c657 Remove unused QtQuick.Dialogs imports
Cura-8687
2022-02-09 14:56:06 +01:00
casper
9c2d370e72 Allow SpinBox components to contain fractional values 2022-02-08 15:52:49 +01:00
casper
a0e5d66299 Disable stepSize in all SpinBoxes where stepSize is a non integer value
This should be enabled. However this is a feature gap of QtControls 2.x
2022-02-08 12:01:42 +01:00
casper
c10d7d7537 Fix ProfilesPage
The properties were not (fully) updated to the updated properties

Cura 8687
2022-02-07 22:03:37 +01:00
casper
f957cc289e Fix Qt warnings
resolve binding loo in `SyncState`
move `updateCostPerMeter` function to root of `MaterialView` such that it is available of all sub components

Cura 8687
2022-02-07 22:01:45 +01:00
casper
7b8e73ae34 Update UM.ConfirmRemoveDialog
Cura 8687
2022-02-07 21:23:17 +01:00
casper
1746e24dd9 Make SpinBox a reusable component
Forgot to update Readonly `SpinBox`es to Qt 2 when implementing Cura
8684. As the spinbox is used in various places with the same
functionality it made sense to create a reusable component.

There is still a feature gap in the implementation; The `SpinBox`es
from QtControls 2.x value is defined as an integer. For some use-cases
we do require a fractional value in the `SpinBox`. The only two places
where this is required are the `material_diameter` and
`material_density` fields in the material prefference page.

Cura 8684
2022-02-07 19:59:57 +01:00
Ghostkeeper
2606a3b847
Change remaining MessageDialogs to our version
Contributes to issue CURA-8687.
2022-02-04 15:49:06 +01:00
Ghostkeeper
a03988d146
Replace MessageDialogs with new custom version
Changing a few fields.

Contributes to issue CURA-8687.
2022-02-04 14:38:25 +01:00
Ghostkeeper
7f8591718d
Remove central messageBox in favour of local box
The profile import/export was the only place where it was used, in our code base.

Contributes to issue CURA-8687.
2022-02-04 14:31:27 +01:00
Ghostkeeper
ee81326d6a
Fix remaining merge conflicts
- When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed.
- There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket.

Contributes to issue CURA-8684.
2022-01-31 17:08:56 +01:00
Ghostkeeper
6db4a55f6e
Merge branch 'replace_controls_1_for_controls_2' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'
Conflicts:
	plugins/ImageReader/ConfigUI.qml
	plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
	plugins/PerObjectSettingsTool/SettingPickDialog.qml
	resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
	resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
	resources/qml/Preferences/GeneralPage.qml
	resources/qml/Preferences/Materials/MaterialsPage.qml
	resources/qml/Preferences/Materials/MaterialsView.qml
	resources/qml/Preferences/ProfilesPage.qml

These conflicts are all arising from headers/includes being updated at the same time, or from the two branches marking the other one's components as needing OldControls.
This introduced more OldControls markers which don't get marked as merge conflicts by Git. This happens when an element could just be left as the original name but from the new import (e.g. a Button stays a Button in Controls 2, but should be marked as from OldControls on the branch that doesn't update the Button).
2022-01-31 16:53:45 +01:00
casper
b2af6308e5 Add validator to material cost/weight spinboxes
This way only valid numbers can be entered

CURA-8684
2022-01-31 15:18:58 +01:00
casper
14767a92c6 Allow mouse selection in SpinBox
CURA-8684
2022-01-31 14:35:21 +01:00
casper
264ce3bdd1 Make texts fields selectable by mouse for various components
This enables mouse-selectable for
- The image reader dialog
- Layer view text field (in simulation view)
- The TextField with unit component (for instace used to set the scale
 of models)
- Rename dialog(s)
- Currency text field
- The settings filter text field

CURA-8684
2022-01-31 10:28:00 +01:00
casper
f62a5e7340 Allow decimal point for values input in materials view
CURA-8684
2022-01-30 23:19:11 +01:00
Casper Lamboo
a5e2e29055
Update resources/qml/Preferences/GeneralPage.qml
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2022-01-27 16:04:10 +01:00
j.delarago
05d542c8d0 Bump UM version for CheckBox 2022-01-26 09:53:17 +01:00