1712 Commits

Author SHA1 Message Date
casper
fd3ef23784 Swap buttons in MonitorConfigOverrideDialog for cura buttons
CURA-8975
2022-03-09 12:23:21 +01:00
casper
071ddfb2b1 Fix text elide/word wrap issue in monitor page
The print job name wasn't elided causing the text to overflow the
progress bar card.

CURA-8688
2022-03-01 12:38:54 +01:00
casper
6159ccbdc7 Fix darkmode issues in the DiscoverUM3Actions dialog
CURA-8688
2022-02-28 12:20:46 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
2022-02-28 08:51:42 +01:00
Jaime van Kessel
75ec6f508c Remove unneeded fixed line hight properties
No idea why this was even done, but there just isnt' a reason to use these.
2022-02-25 14:27:47 +01:00
Jaime van Kessel
3f4f7f0fcf Remove some extra unneeded theme stuff for monitor page 2022-02-25 14:12:25 +01:00
Jaime van Kessel
2327a71642 Remove monitor margin
No idea why it was even there as it's own size.
2022-02-25 13:16:59 +01:00
casper
4a71278d7c Fix monitor page
CURA-8688
2022-02-25 10:54:03 +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
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
Jaime van Kessel
58e6cde6e8 Remove incorrect refferents to btnOk 2022-02-17 15:10:18 +01:00
Jaime van Kessel
40f835ed13 Replace labels for UM.Label in DiscoverUM3Action
CURA-8685
2022-02-15 15:51:07 +01:00
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
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
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
Jaime van Kessel
7abe62a8ec Fix weird wrapping in monitor page 2022-02-10 11:29:14 +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
Ghostkeeper
2606a3b847
Change remaining MessageDialogs to our version
Contributes to issue CURA-8687.
2022-02-04 15:49:06 +01:00
Ghostkeeper
85d0749f5f
Use Controls2 ListView instead of ScrollView for print job list
No need for a ScrollView in Controls 2. And specialise the scroll bar.
Be sure to also align the right side of the contents with the scroll bar though.

Contributes to issue CURA-8686.
2022-01-18 17:27:51 +01:00
Ghostkeeper
d87551ac9c
Use Controls2 ListView instead of Controls1 ScrollView to scroll
Just a listview with a specialised scroll bar.

Contributes to issue CURA-8686.
2022-01-18 17:01:16 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
Remco Burema
0e3524cddb
Reintroduce hack for waiting state in monitor.
Some printers don't send the correct state it seems, so we have to have this hack back.

CURA-8764
2021-12-17 11:50:45 +01:00
Ghostkeeper
9674c54efb
Better type checking and handling of optionals
Adds type checking here and there to catch such errors in the future.
This makes it handle the optional fields of this model better.

Contributes to issue CURA-8730.
2021-12-08 17:36:09 +01:00
Ghostkeeper
770adb2c02
Don't store None as capabilities, but empty list
This makes a few things easier. You could see None as being a signalling value to indicate that we don't know capabilities, but this signalling would get lost anyway in the serialising to the metadata. So just an empty list is fine for now.

Contributes to issue CURA-8671.
2021-12-03 13:36:06 +01:00
Ghostkeeper
6d9142579a
Add debuging repr to print more nicely
Otherwise you just see <CloudClusterResponse object> when you try to print this.

Contributes to issue CURA-8671.
2021-12-03 13:26:29 +01:00
Ghostkeeper
0477ba44b2
Encode capabilities as comma-separated list
Previously it was encoded as a stringified Python list of strings, which is much harder to parse.
This would go wrong if any of these capabilities have a comma in them, but I think that would be bad practice for keywords like this anyway.

Contributes to issue CURA-8671.
2021-12-03 13:25:41 +01:00
Remco Burema
1253b41537
Only perform materials-sync-job for capable printers.
part of CURA-8671
2021-12-02 12:22:55 +01:00
casper
6be0d58039 Add handling of missing printJob status cases
The `printJob` now also contains a status for detecting aborted prints
that were awaiting cleanup, preventing the need for the additional
checks in the `await_cleanup` status.
2021-11-19 17:22:13 +01:00
Jaime van Kessel
cefffe62cd Remove most of controls 1 references from networking plugin 2021-11-16 15:26:23 +01:00
Jaime van Kessel
980ac986df Let DiscoverUM3Action use controls 2 2021-11-11 15:59:51 +01:00
Jaime van Kessel
8195b9be28 Remove more references to old controls 2021-11-10 17:30:42 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Ghostkeeper
dcf78b4885
Merge branch '4.12'
Conflicts:
	resources/i18n/de_DE/fdmprinter.def.json.po -> German translations got some fixes in master while we also updated the new translations for 4.12.
2021-11-08 13:55:09 +01:00
Ghostkeeper
db637802bd
First translate, then process replacement keys
If we first process the replacement keys, the replaced string can't be found in the translation database, so you don't get a translation of the phrase 'Finishes x at y'.

Fixes #10718.
2021-11-08 13:49:54 +01:00
Ghostkeeper
8234276204
Add log entry when syncing with cloud printers
Not only do I now have an interface where the user doesn't get any feedback when syncing happens, but even in the log there was nothing shown when it happens.

Contributes to issue CURA-8609.
2021-10-08 14:13:54 +02:00
Ghostkeeper
93953630ec
Update online status when updating account printer status
This updates the metadata entries. Naturally this updates every 60 seconds in Cura, but it could also manually be triggered by the refresh button.

Contributes to issue CURA-8609.
2021-10-08 14:08:02 +02:00
Jelle Spijker
501b4c4fde
Spaces around assignment operator
According to UM codestyle

Contributes to CURA-8601
2021-10-05 13:54:13 +02:00
Jaime van Kessel
527de2b6ef Use image instead of custom message type
CURA-8601
2021-10-05 10:20:52 +02:00
Jaime van Kessel
dc7a45eacf Remove cloud-flow-start icon
It wasn't used anymore

CURA-8601
2021-10-01 16:51:39 +02:00
Jaime van Kessel
6bc9aaa4bf Add message type to cloud
CURA-8601
2021-10-01 11:54:27 +02:00
Jaime van Kessel
d4c4b11927 Update the copy of the connect to cloud message
CURA-8601
2021-10-01 11:38:13 +02:00
Ghostkeeper
426e3064d2
Don't crash when material file can't be opened for sending to printer
It seems that due to the threaded nature, the limit to the number of open file handlers could be reached here. Or it could just be locked or something of course.

Fixes Sentry issue CURA-2V2.
2021-09-22 14:59:27 +02:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04:00
Ghostkeeper
34531656d6
Merge branch 'CURA-8520_Fix_missing_icons_in_deprecated_icons_list' into 4.11 2021-08-31 13:35:33 +02:00
jelle Spijker
d97c4e2c94 Don't use new controls for the buttons 2021-08-31 09:34:23 +02:00
jelle Spijker
2548fd8014 Fix greyed out cluster printers
The PrintWindow still used an old style combobox.
This resulted in a Mac user not being able to specify
which clustered printer he wanted to send a slice to.

Using the new QtQuick.Controls and specifically setting
the currentIndex fixed it for Mac.
2021-08-30 13:41:55 +02:00
Konstantinos Karmas
3e0b395c72 Add the Buildplate.svg to the Cura icons
The icon existed only in the UM3NetworkPrinting plugin but it was also used in the ConfigurationItem.qml in Cura, so it had to be moved to the Cura icons.

CURA-8520
2021-08-30 10:45:45 +02:00
Konstantinos Karmas
bbada73550 Remove outdated image from "new printers added" message
CURA-8497
2021-08-25 15:32:42 +02:00