181 Commits

Author SHA1 Message Date
Jaime van Kessel
0ac4fa20fd Fix injection warning for hamburger menu 2022-05-10 13:30:24 +02:00
j.delarago
ba3913395c Add catalog to files that weren't translating
CURA-9141
2022-05-05 16:42:01 +02:00
Casper Lamboo
784cd2c99b
Apply suggestions from code review 2022-04-29 10:30:11 +02:00
j.delarago
8bb1b0bee8 selectedNameFilter is now an object instead of a string. The nameFilter has to be manually pulled out using the index in selectedNameFilter.
If only one filter is supplied to nameFilters, the index will always be -1. I assume this is because we are not selecting the file type in the Dialog, it just defaults to the only item.

This code should still work if the behaviour is changed in the future.

FileDialog now uses currentFolder instead of folder.

CURA-9214
2022-04-28 14:29:44 +02:00
Jaime van Kessel
f070a695b1 Change standardbutton.yes & no to dialog.yes & no 2022-04-19 17:10:51 +02:00
Jaime van Kessel
1ce84fec69 Fix all import dialogs
Fixes CURA-9129
2022-04-19 17:09:02 +02:00
j.delarago
f327c2479b Update Dialog imports to remove version
Update FileDialogs selectExisting -> fileMode and folder -> currentFolder

CURA-8640
2022-04-01 16:08:35 +02:00
j.delarago
99a3a8d11d QTQuick.Dialogs jumped to using 6.0 in QT6
Update imports to use correct version number.

CURA-8640
2022-03-29 16:04:02 +02:00
casper
d7cf7ee97d Re-implement showing active profile as italic
This went got removed during a merge conflict

see
https://github.com/Ultimaker/Cura/pull/11696
https://github.com/Ultimaker/Uranium/pull/798

CURA-9044
2022-03-22 11:43:36 +01:00
j.delarago
4b853b89bd Fix typo
CURA-8979
2022-03-15 16:23:18 +01:00
casper
2f8f56d762 Merge branch 'master' into CURA-8979_Materials_Preference_Page
# Conflicts:
#	resources/qml/Preferences/ProfilesPage.qml
2022-03-11 13:57:30 +01:00
casper
9ba44f1d30 Move details plane caption to management page
This way the caption can be correctly aligned with the hamburger menu
button

CURA-8979
2022-03-10 10:15:31 +01:00
Jaime van Kessel
ec1f8f7125 Add extra info label
CURA-9023
2022-03-09 16:30:32 +01:00
Jaime van Kessel
84bb4790f8 Fix spacing between update & discard actions
CURA-9023
2022-03-09 16:28:26 +01:00
Jaime van Kessel
a285e39799 Set defaultname for create new profile
CURA-9023
2022-03-09 16:26:01 +01:00
Jaime van Kessel
cbf995cb85 Add tooltip to create new button
CURA-9023
2022-03-09 16:24:49 +01:00
Jaime van Kessel
6aeac2b2a4 Shorten copy of update button
Added the full text in the tooltip

CURA-9023
2022-03-09 16:13:41 +01:00
Jaime van Kessel
efea7c9bed Clean up ordering of properties in profiles page
Boyscouting; It was a bit of a mess

CURA-8982
2022-03-03 14:25:33 +01:00
Jaime van Kessel
e569346750 Move scrollview caption over two lines
CURA-8982
2022-03-03 14:19:21 +01:00
Jaime van Kessel
950fc6f3da Hide hamburger menu if no item is selected
CURA-8982
2022-03-03 14:18:58 +01:00
Jaime van Kessel
802a80b702 Fix visibility of create new button in profiles page
CURA-8982
2022-03-03 14:12:55 +01:00
Jaime van Kessel
165172f919 Re-add Duplicate button in profiles page
CURA-8982
2022-03-03 14:08:47 +01:00
Jaime van Kessel
6b9e66cfb7 Add title to profiles page
CURA-8982
2022-03-03 14:06:27 +01:00
casper
862525bc90 Remove obsolete uses of system palette
CURA-8688
2022-03-01 12:29:09 +01:00
Jaime van Kessel
1f39a1b87f Add CuraStyled rename dialog
CURA-8688
2022-02-28 13:30:14 +01:00
casper
e03176a1fa Replace UM.MessageDialog with newly added Cura.MessageDialog
This dialog is different from the `UM.MessageDialog` in that it

CURA-8688
2022-02-23 14:09:38 +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
Jaime van Kessel
a458155258 Update look of the profilesPage
CURA-8949
2022-02-18 15:09:57 +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
c10d7d7537 Fix ProfilesPage
The properties were not (fully) updated to the updated properties

Cura 8687
2022-02-07 22:03:37 +01:00
Ghostkeeper
2606a3b847
Change remaining MessageDialogs to our version
Contributes to issue CURA-8687.
2022-02-04 15:49:06 +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
Ghostkeeper
cfafdf878a
Move contents of ProfileTab to ProfileOverview file
This way it is re-useable, and no longer connected to the concept of a tab view.

We can then display it in the profile manager.

Contributes to issue CURA-8686.
2022-01-25 13:34:13 +01:00
Ghostkeeper
50960ce5cf
Use UM.TabRow instead of a tab view
This styles it for us automatically.
However the contents of the tab disappears now. I'll have to restore that, but since that moves a bunch of code I'd rather do that in a separate commit.
I also changed the item to a column so that we don't have to link up the anchors very weirdly/difficulty with all of the buttons and messages that are optional. This just automatically makes space if there need to be extra buttons and messages in between, and even deals with the spacing correctly.

Contributes to issue CURA-8686.
2022-01-25 12:09:59 +01:00
casper
6dc535063b Update profiles preferences page to QtControls 2
CURA-8684
2022-01-24 22:37:39 +01:00
Ghostkeeper
4614b3a9e1
Use new ListView instead of ScrollView, with correct scrollbar
I also fixed an undefined reference for whether a button needed to be enabled, if no profile was selected yet. The button was invisible if it was undefined, but it was still giving QML warnings.

Contributes to issue CURA-8686.
2022-01-18 18:37:34 +01:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
Konstantinos Karmas
180732788b
Merge pull request #9472 from Ultimaker/CURA-7813_QML_warnings
Cura 7813 qml modules version bump
2021-03-30 09:42:59 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
2021-03-30 09:02:48 +02:00
jelle Spijker
9da321ffb9
Update Layouts, Control.Styles and Dialogs
CURA-7813
2021-03-29 18:04:47 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Ghostkeeper
1f9b4c3964
Handle deleting profiles better
When deleting profiles, the current item is set to null.
The Activate button was checking if the current profile was already active, and disabling the button if it was. But the button was still enabled if the current item is null because isCurrentItemActivated is only true if there is a current item. So to properly disable the button we need to check also if there is a current item.
The onItemsChanged signal can also trigger if the item that matches the toSelectItemName has no quality_changes_group, i.e. a built-in profile.

Probably fixes Sentry issue CURA-43.
2021-03-18 02:21:14 +01:00
Remco Burema
3fcd7d567f
Show warning icon on import non-visible profile.
part of CURA-7691
2020-09-16 08:26:41 +02:00
Lipu Fei
38ee4bf208 Remove deprecated functions in MachineManager
CURA-6858
2019-10-22 14:11:40 +02:00
Lipu Fei
28466f7345 Elide long quality name
CURA-6862
2019-10-08 14:33:16 +02:00
Lipu Fei
c42feae11c Make intents work on quality management page
CURA-6706
2019-10-07 09:22:47 +02:00
Ghostkeeper
47e1dbe38d
Remove usage of Quality Manager
This class is deprecated. Constructing it here means that the class gets constructed on the Qt thread and makes it inaccessible for the rest.

Contributes to issue CURA-6600.
2019-09-10 14:55:32 +02:00