370 Commits

Author SHA1 Message Date
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
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
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
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
ae3362f716 Fix "Manage printer" button pointing to the print job link
Both the "Manage printer" and the "Manage in browser" button were using the `openPrintJobControlPanel()` function, which was wrong. This is now fixed so that the "Manage printer" will use the `openPrinterControlPanel()` function as it should've in the first place.
2021-08-19 12:33:46 +02:00
Jaime van Kessel
8b2904ee3b Merge branch 'CURA-8441_campaign_links' of github.com:Ultimaker/Cura 2021-08-09 14:09:27 +02:00
Konstantinos Karmas
e18a840c43 Change troubleshooting link
CURA-8441
2021-08-09 13:00:25 +02:00
Jaime van Kessel
57e66a5796 Add campaign links
CURA-8441
2021-08-05 15:42:23 +02:00
Remco Burema
1e5ea055aa
Changed cloud-printer message into proposal from growth group.
CURA-8436
2021-08-04 13:20:43 +02:00
Konstantinos Karmas
b0702e2312 Remove NativeRendering type in the MonitorInfoBlurb
Since it makes the letters look weird.

CURA-8436
2021-08-03 16:56:05 +02:00
Konstantinos Karmas
de9b1f82b9 Enable the tooltip when the camera button is disabled
CURA-8436
2021-08-03 16:55:11 +02:00
Ghostkeeper
ba6e79c81f
Rework parts of camera button
The new button should be consistent with the looks of the tool buttons. I've given it the same size as the inner part of the tool buttons, reworked the background so that it matches. I'm also giving it the 'secondary button' style which is also used for one other button. But that other detail button should get the same style anyway so that's fine too.

I've also turned this icon into an actual button. That way it can get focus when using keyboard navigation and works better with tools for blind and such.

Contributes to issue CURA-8202.
2021-07-07 11:36:11 +02:00
Konstantinos Karmas
18377d2726 Change extruder icon in monitor tab to be same as preview tab
There are still some discrepancies (e.g. when the extruder is empty, the Preview tab just keeps it disabled and mentions "Generic PLA" while the Monitor tab shows it disabled by mentions "Empty" in the material. But we consider this acceptable for the time being, since it has been like that for a long time.

CURA-8011
2021-07-05 11:31:23 +02:00
Konstantinos Karmas
1f612f3e1a Align extruder labels in monitor page with the extruder icon
CURA-8202
2021-07-01 11:37:03 +02:00
Konstantinos Karmas
196e5ba397 Increase size of buildplate icon in monitor page
CURA-8202
2021-07-01 11:21:45 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Jaime van Kessel
1cece590d7
Remove unneeded qml imports
Found these while looking at what would be needed to upgrade to qt 6.x
This module is dropped, hence me going over all of the cases where it's used.
2021-06-25 12:37:05 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Kostas Karmas
adc8072991 Hide queue in Monitor page if printer does not support it
CURA-7784
2020-10-30 12:44:59 +01:00
Kostas Karmas
f576e07c11 Add "preparing" status in monitor page
CURA-7745
2020-10-20 09:49:11 +02:00
Jaime van Kessel
3ad5219f5d
Simplify the printer state display
CURA-7745
2020-10-12 11:06:49 +02:00
Jaime van Kessel
77290451e1
Remove a bunch of unneeded properties from the labels
CURA-7745
2020-10-08 18:00:53 +02:00
Jaime van Kessel
ec5796400b
Remove hardcoded narrow_margins
CURA-7745
2020-10-08 17:55:11 +02:00
Jaime van Kessel
3e67d20890
Remove monitor_text_primary
It's so close to the text one that it really doesn't make sense to keep it.
Boyscouting the code a bit here

CURA-7745
2020-10-08 17:31:19 +02:00
Jaime van Kessel
910d8ec472
Fix reference error
CURA-7745
2020-10-08 17:22:24 +02:00
Jaime van Kessel
99f42c179f
Remove hardcoded value for num extruders
CURA-7745
2020-10-08 17:18:24 +02:00
Ghostkeeper
55dbb1ea0c
Temporarily remove warning message for cloud cameras
It's incorrect; the camera is possible with development firmware, but not implemented yet in Cura.

Removed this in lieu of the actual fix in CURA-7637, which takes too much time to fix for the 4.7 release.
2020-08-11 13:29:53 +02:00
Remco Burema
b394be3583
Remove superfluous theme entry.
It was messing with the dark side. Theme. I mean theme.
part of CURA-7627
2020-08-05 08:16:10 +02:00
Nino van Hooff
214e41f983 Use a more specific link for the network troubleshooting guide
CURA-7434
2020-04-14 16:55:36 +02:00
Ghostkeeper
3dbbd17e32
Round coordinates
This would have worked out of the box if this plug-in actually used the theme rather than hard-coding its sizes here. However that is too big of a change for me to make in 5 minutes, so it'll have to wait. Also fixed some missing screen scale factors.

Done as a 5 minute fix to try to amend #7125.
2020-02-25 15:00:41 +01:00
ChrisTerBeke
9a3ff527ac Bring back the printer selection dialog for networked printers 2019-10-25 12:25:41 +02:00
Ghostkeeper
867283ffc3
Code style 2019-10-24 13:23:44 +02:00
Lipu Fei
96a9bcccbb Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-01 09:41:05 +02:00
ChrisTerBeke
99832c3a68
Use printer type name instead of id 2019-09-27 21:09:53 +02:00
Remco Burema
7a1850a87b Actually fix QML nullptr warnings for real. 2019-09-27 12:53:32 +02:00
Ian Paschal
72ba6153c2 Boyscout some stuff
CS-158
2019-09-11 14:50:54 +02:00
Ian Paschal
3b5cf115f1 Reduce progress bar length
CS-158
2019-09-11 14:50:42 +02:00