27405 Commits

Author SHA1 Message Date
casper
aeb433b2a1 Keep showing ip enter dialog after wrongly entered ip address
In component discover um 3 dialog. After a "complete" action the
dialog will immediately close. This was undesired behaviour as we want
to keep the dialog active if an IP address is wrongly added.

Additionally, it is no longer necessary to close/hide the dialog after
a reject/accept as this is done by default.

CURA-8955
2022-02-15 09:29:32 +01:00
Jaime van Kessel
b9feac9816
Merge pull request #11460 from Ultimaker/CURA-8687_dialogs
Replace Dialogs in preparation for Qt 6.x upgrade
2022-02-11 15:04:01 +01:00
casper
3f658a4914 Change UM.Dialog to Controls.Dialog in connect to printer by ip window
As `UM.Dialog` is opened using in a new window, the error-confirmation
that was displayed in a `UM.Dialog` was displayed _behind_ the window
object.

CURA 8687
2022-02-11 14:37:32 +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 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
7abe62a8ec Fix weird wrapping in monitor page 2022-02-10 11:29:14 +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
Jaime van Kessel
ddc43446e6 Fix wrapping in sync menu 2022-02-10 10:37:26 +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
adcf312de7 Resolve Qt warnings
CURA 8687
2022-02-09 13:11:17 +01:00
casper
6ca14ecbae Update DiscardOrKeepProfileChangesDialog
CURA 8687
2022-02-09 13:05:48 +01:00
casper
72c038a8b1 Update AskOpenAsProjectOrModelsDialog
CURA 8687
2022-02-09 12:36:56 +01:00
casper
f59a23fd82 Update OpenFiles Dialog
CURA 8687
2022-02-09 12:36:00 +01:00
casper
8fc0fb2737 Update AboutDialog
CURA 8687
2022-02-09 12:34:18 +01:00
casper
6b85423948 Update WorkSpaceSummaryDialog
CURA 8687
2022-02-09 12:31:26 +01:00
casper
30bd9e7d67 Update Dialog in context menu
CURA 8687
2022-02-09 11:17:19 +01:00
Casper Lamboo
0932252ca3
Merge pull request #11431 from Ultimaker/update_spinboxes
Make `SpinBox` a reusable component
2022-02-08 17:01:15 +01:00
casper
4737fed9d4 Allow commas as number input 2022-02-08 16:48:10 +01:00
casper
3a74417e6e Add comments 2022-02-08 16:01:29 +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
50820048f7 Update SpinBox in ContextMenu 2022-02-08 11:34:54 +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
9a3cab1ec2
Change easy dialogs to UM.MessageDialog
A few fields have changed.
There's also a harder one, a generic one that is re-usable. I want to do that one in a separate commit since it'll need to be checked all over the code for its usage.

Contributes to issue CURA-8687.
2022-02-04 13:24:14 +01:00
Jaime van Kessel
b18582e1fb Fix size of USB manual control buttons
CURA-8684
2022-02-02 10:23:00 +01:00
Jaime van Kessel
b8e4baba0e Clean up the manual printer control QML
The QML could be simplified quite a bit to get the same results.

CURA-8684
2022-02-02 10:13:33 +01:00