142 Commits

Author SHA1 Message Date
Jaime van Kessel
017560480a
Ensure that alignment is as set in the design
CURA-9278
2022-09-16 14:34:36 +02:00
Jaime van Kessel
614ab8ee7a
Increase size of print button for selector card
CURA-9278
2022-09-16 14:30:06 +02:00
Jaime van Kessel
681d33de81
Fix spacing between extruders in selector card
CURA-9278
2022-09-16 14:29:34 +02:00
Casper Lamboo
96bc5ed602
Simplify string notation
CURA-9278
2022-09-12 14:20:28 +02:00
Remco Burema
6adf05bbf0 Complete interface for selecting cloud printer.
CURA-9278
2022-09-09 11:05:05 +02:00
Remco Burema
04cd76cb3b Get extruder configs to frontend.
When choosing the printer, all possible (single) extruder configs need to be shown for that printer.

CURA-9278
2022-09-08 13:36:42 +02:00
Joey de l'Arago
9c1e624b43 typo
CURA-9278
2022-09-05 17:58:33 +02:00
Joey de l'Arago
7f98ef70f0 Add printer cards
CURA-9278
2022-09-05 17:38:21 +02:00
c.lamboo
c73b980a3d Merge branch 'main' into CURA-9422_abstract_cloud_monitor_redux
# Conflicts:
#	resources/qml/PrinterSelector/MachineListButton.qml
2022-08-31 16:05:00 +02:00
Remco Burema
afeec473f6 Small fixes (mostly QML warnings and the like).
done as part of CURA-9422
2022-08-31 14:15:05 +02:00
joeydelarago
19835844bf Change listType -> componentType. Makes it a bit more clear that this variable decides which component should be used for the model.
CURA-9514
2022-08-31 10:50:20 +02:00
joeydelarago
2ff0aed171 Remove height binding loop.
CURA-9514
2022-08-31 10:26:23 +02:00
c.lamboo
60b12b9247 Use list model to display show hide buttons
CURA-9514
2022-08-31 07:58:05 +02:00
c.lamboo
ac732e9604 Add button to hide/show connected printers
CURA-9514
2022-08-30 23:15:54 +02:00
c.lamboo
8b84db7059 Remove AbstractMachine
Having a separate class for the AbstractMachine complicated things; it's behaviour was extremely similar to the GlobalStack so adding one more stack container type in addition to the many similar setting container types we already have adds complexity to the system. Having these different classes for machines and abstract machines also add complexity to the update script as the abstract machines were stored in a separate folder from the machine types.

Because of these reasons we decided to replace the AbstractMachine by a GlobalStack where the is_abstract_machine property metadata property is set to True.

CURA-9514, CURA-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-26 10:45:45 +02:00
Joey de l'Arago
2013ad6baf
Update resources/qml/PrinterSelector/MachineListButton.qml
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-08-24 14:22:17 +02:00
joeydelarago
721f63b0d1 Give machine selector minimum width so it displays correctly on smaller screens.
CURA-9514
2022-08-24 10:06:03 +02:00
joeydelarago
db0b668739 Adjust button size according to width
CURA-9514
2022-08-23 16:17:36 +02:00
joeydelarago
790c373b38 Show icon for offline printers
CURA-9514
2022-08-23 15:57:40 +02:00
joeydelarago
e541890c07 Fix drop down not dynamically resizing width
CURA-9514
2022-08-23 15:56:50 +02:00
joeydelarago
93e2bef303 Group printers by section (Connected Printers/Other Printers)
Cleanup redundant code.

CURA-9514
2022-08-23 15:44:16 +02:00
joeydelarago
b18080c332 Rename AbstractStacksModel.py -> MachineListModel.py since this model includes both abstract machine stacks and regular machines
Add machineCount for displaying the number of machines of a type.

MachineSelectorButton is in use in other places, swapped it out for a new Component MachineListButton.

CURA-9514
2022-08-23 14:29:05 +02:00
joeydelarago
7ffa770fb4 Searching container registry returns ContainerStacks.
Made typing more generic to work with an ContainerStack to compensate.

Made AbstractMachine getMachines a classmethod so it can be called with ContainerStacks.

CURA-9514
2022-08-23 10:35:00 +02:00
j.delarago
e5c2f5702c Subtract previously unused rightMargin from MachineSelectorButton width.
CURA-9143
2022-04-21 15:04:52 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
j.delarago
cfad991120 Popup will now resize based on the implicitWidth/implicitHeight of it's children.
This causes a binding loop when using layouts like Column.

To resolve this the height/width of the popup in ExpandablePopup can now be set explicitly with contentWidth and contentHeight

For ExpandablePopups with contentItems that are not Layouts the implicitWidth/implicitHeight can be set directly in the contentItem.

CURA-8640
2022-04-01 09:31:27 +02:00
j.delarago
3c7498feed Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool.
Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!

CURA-8943
2022-03-03 15:53:30 +01:00
Ghostkeeper
c57126fb00
Use re-useable scrollbar and remove ScrollView
The machine selector has the scroll view inside of the listview. It just needs to use our new scrollbar element instead of the default.

Contributes to issue CURA-8686.
2022-01-19 14:32:12 +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
1560ae074d
Round position of printer connection icon
It does become noticeably sharper with this. And doesn't appear out of place at all.

Contributes to issue CURA-8202.
2021-09-03 13:07:01 +02:00
Ghostkeeper
62916cb7d4
Remove outline of background around connectivity badge
After feedback from our designer, this turns out to no longer be desirable.

Contributes to issue CURA-8247.
2021-07-05 17:34:13 +02:00
Ghostkeeper
43237c91c6
Merge branch 'CURA-8011_Replace_extruder_icons' into CURA-8247_badge_background_colour 2021-07-05 15:19:38 +02:00
Ghostkeeper
f9fcbf2492
Add new colour for background of the printer connectivity badge
This should be different from the background colour in case of the dark theme. The design asks for a white background for the badge in the dark theme.

Contributes to issue CURA-8247.
2021-07-05 15:19:15 +02:00
Ghostkeeper
fa4c69cb2b
Merge CloudBlueBG and CloudGreyBG into one icon without colour
We don't use the colour of icons. The colour is determined by the theme, and recoloured by UM.RecolorImage.

Contributes to issue CURA-8247.
2021-07-05 15:09:15 +02:00
Konstantinos Karmas
3c2e336153 Align the printer status icon properly
CURA-8202
2021-06-30 15:17:37 +02:00
Konstantinos Karmas
72ca4a9564 Use medium quality Printer icon in the MachineSelector
CURA-8202
2021-06-30 12:25:28 +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
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
Kostas Karmas
f887db23f6 Use detail_level to describe the icons (instead of size)
Previously the icons were organized according to "size" which could prove to be confusing.
This commit fixes that by organizing them according to "detail_level".

CURA-8010
2021-04-28 18:53:32 +02:00
jelle Spijker
9ea97f7561
SVG are not correlated to pixel size.
Although this deviates from the UX practices. It tended to confuse the
programmers ;-) The variances in level of detail for the icons are now
placed in the sub-directories. small, default and big.

CURA-8010_new_icons
2021-04-28 15:45: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
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
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Jaime van Kessel
afb29724ff
Give the machineButton selectors a fixed width
This prevents them from popping out of the interface for certain
languages
2020-08-25 10:59:14 +02:00
Kostas Karmas
5c898b8c57 Allow the machine manager to set an empty active machine
Gracefully handle the case where the machine manager is requested to
delete the last machine in Cura. In this case, instead of deleting
everything of this machine and still keep it as an active machine,
the machine manager will set the active machine to None.

The QML files which depend on the active machine were changed to
properly handle themselves when there is no active machine.

CURA-7454
2020-06-09 15:33:22 +02:00
Kostas Karmas
4bebaaaddb Display an appropriate tooltip when device is removed from the account
The tooltip is updated to reflect the case where a cloud printer is
removed from the users account.

CURA-7438
2020-06-04 15:08:27 +02:00
Kostas Karmas
65dd0250b3 Change property connectionStatusMessage into a get function
This way the tooltip text can be re-evaluated every time we hover over
the instead of only once when the active machine is updated. With this
change, the text will be updated properly when there is a change.

CURA-7438
2020-06-04 14:22:14 +02:00
Kostas Karmas
a06035cf38 Display appropriate tooltip message when cloud printer is offline
Display a different message in the popup tooltip when the internet
is reachable but the printer is offline.

CURA-7460
2020-06-02 16:12:05 +02:00