Commit graph

27417 commits

Author SHA1 Message Date
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
Ghostkeeper
02c517a841
Enforce minimum column width through binding formula
We can't enforce it when resizing, due to the width rescaling with the width. But we can enforce it through the binding formula after applying the width scale.

Contributes to issue CURA-8686.
2022-02-01 13:04:16 +01:00
Ghostkeeper
8de1f923a4
Fix clicking, and don't allow dragging if not needed
When I changed the MouseArea into a TooltipArea, the clicking broke because the tooltip area doesn't catch mouse events. I could add another mouse area on top, but for better efficiency it's nice to re-use the TooltipArea. Just need to remember to allow clicking it.
I also found a small issue where you could flick the table even if it's not big enough to scroll. This should fix that.

Contributes to issue CURA-8686.
2022-02-01 11:54:43 +01:00
Jaime van Kessel
2294214bcf
Merge pull request #11336 from Ultimaker/CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'
Cura 8684 qt controls replacement buttons, actions & 'exclusivity'
2022-01-31 17:33:15 +01:00
Jaime van Kessel
ecba5b409c Fix binding loop in objectItemButton
CURA-8684
2022-01-31 17:32:10 +01:00
Jaime van Kessel
cef3b5db16 Fix mergeconflict
CURA-8684
2022-01-31 17:30:03 +01:00
Ghostkeeper
474497b8bb
Merge branch 'CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'' of github.com:Ultimaker/Cura into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity' 2022-01-31 17:09:06 +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
Jaime van Kessel
6ef28db458 Remove unneeded semicolon
CURA-8684
2022-01-31 17:06:59 +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
4cb4e0e38c Re-enable validators in ImageLoaderPlugin
CURA-8684
2022-01-31 15:47:42 +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
1ecc1ad753 Update styling in image loader plugin
CURA-8684
2022-01-31 13:43:08 +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
5aa67770a2 Add properties (with defaults) to the PrintSetupHeaderButton state-props
Resolves 2 QML-warnings

CURA-8684
2022-01-31 09:00:30 +01:00
casper
f94813a98e Fix description
CURA-8684
2022-01-31 08:59:23 +01:00
casper
8979632457 Resolve Qt warning
CURA-8684
2022-01-30 23:30:39 +01:00
casper
ac080f3cd7 Provide height in the line type combobox of the simulation view
CURA-8684
2022-01-30 23:22:58 +01:00
casper
f62a5e7340 Allow decimal point for values input in materials view
CURA-8684
2022-01-30 23:19:11 +01:00
Remco Burema
b96f58799c
Merge pull request #11342 from Ultimaker/CURA-8686_views_controls2
Update views and tabs to use Controls 2
2022-01-28 17:30:48 +01:00
Ghostkeeper
fbb72d6f0a
Remove horizontal scrollbar policies from Cura.ScrollableTextArea
There is no horizontal scrollbar any more so these are giving errors now.

Contributes to issue CURA-8686.
2022-01-28 15:27:47 +01:00
Ghostkeeper
8d10e1d5a7
Simplify check for when quality profiles are activated
Should behave the same way.

Contributes to issue CURA-8686.
2022-01-28 11:34:44 +01:00
Ghostkeeper
92ed791f53
Simplify anchors of background rectangle
Contributes to issue CURA-8686.
2022-01-28 11:06:07 +01:00
Ghostkeeper
7bc109d1f0
Remove outdated comment
It's no longer limiting the width to be at least 10 pixels, due to how it has to scale with the width of the table.

Contributes to issue CURA-8686.
2022-01-28 10:57:00 +01:00
casper
29fc98fea4 Add documentation to PrintSetupHeaderButton
CURA-8684
2022-01-28 10:33:01 +01:00
casper
2290b46bf3 Use the Cura Combobox Component in simulation view
CURA-8684
2022-01-28 09:47:44 +01:00
casper
4ef394fa2d Update manual printer control to QtControls 2
CURA-8684
2022-01-28 09:47:01 +01:00
Casper Lamboo
7f17ef6c51
Update resources/qml/PrintSetupHeaderButton.qml
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2022-01-27 16:04:17 +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
Casper Lamboo
69de60eb14
Update resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2022-01-27 16:03:58 +01:00
Ghostkeeper
43d4075309
Bring changes from TableView to Digital Library version
The classes should be approximately the same. There's 2 differences now though:
* The ScrollBar is re-implemented in the Digital Library because the re-useable component is not available in all Cura editions that the Digital Library needs to support.
* The sections are not working. It was removing big parts of the table for some reason and I don't think it's worth debugging since this version of the table doesn't use it at all. It's also a bit faster this way.

Contributes to issue CURA-8686.
2022-01-26 17:24:24 +01:00
Ghostkeeper
7a1c3e1bd5
Use customised TableView for Keep/Discard Changes dialogue
Had to make some more modifications to get it to work again this time, due to the way the width of the table scales with the dialogue. But it's nice now.

Contributes to issue CURA-8686.
2022-01-26 16:30:50 +01:00
Ghostkeeper
ec21b167d0
Resize columns when TableView is resized
They should retain their width proportionally.
This also fixes a case where the width of the TableView was initialised as 0 but then changed for some anchors due to weird bindings. Because it now updates the tableView when the width is changed.

Contributes to issue CURA-8686.
2022-01-26 16:29:09 +01:00
Ghostkeeper
fa177f5192
Implement section headers
I'm not real happy with the limitations I had to work with here. The TableView can only accept a table of strings, so I basically had to fit everything into editing this dictionary of strings. Not the best. But it's very effective.

Contributes to issue CURA-8686.
2022-01-26 15:37:17 +01:00
Ghostkeeper
5c71671585
Make setting names italic if changed in quality-changes profile
This was the behaviour before.

Contributes to issue CURA-8686.
2022-01-26 14:00:29 +01:00
casper
a2d03af2f1 Use states to set border&background color in print setup header button
CURA-8684
2022-01-26 12:15:13 +01:00
casper
a66275ce73 Fix PrintSetupHeaderButton displaying text twice
CURA-8684
2022-01-26 12:01:30 +01:00
casper
b3a6d8a1fc Use UM.Label in print setup header button
CURA-8684
2022-01-26 11:47:14 +01:00