66 Commits

Author SHA1 Message Date
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
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
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
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
Nino van Hooff
8a12f539b5 Fix connection status z-order
CURA-7437
2020-05-27 16:37:48 +02:00
Nino van Hooff
5f574d4b64 Fix the connection status tooltip
CURA-7437
2020-05-26 16:21:51 +02:00
Nino van Hooff
8c28dd8d84 Check for internet when determining connection status
CURA-7437
2020-05-26 13:58:21 +02:00
Nino van Hooff
4d5ef91c43 Add connection status message
CURA-7437
2020-05-26 13:50:15 +02:00
Nino van Hooff
de5c6f9318 Set connection status icon + color based on new states
CURA-7437
2020-05-26 13:37:47 +02:00
Nino van Hooff
2eaa366424 WIP: add tooltip to connection status icon
wip: content and position

CURA-7437
2020-05-26 11:55:54 +02:00
Nino van Hooff
eef347ed6c Add an cloud unavailable icon to the active printer icon
CURA-7437
2020-05-20 17:20:40 +02:00
Lipu Fei
28172c9ad2 Merge remote-tracking branch 'origin/master' into feature_model_list 2019-05-16 15:17:46 +02:00
Lipu Fei
602258bb4a Fix machine name
CURA-6510
2019-05-09 09:45:30 +02:00
Diego Prado Gesto
9e5e57e6c5 Merge branch 'master' into feature_model_list 2019-05-07 11:57:31 +02:00
Jaime van Kessel
c3a373e2a2 Remove usages of deprecated activeMachineName 2019-05-03 13:38:06 +02:00
Satish
18630fa2f1 Added several ids to be used in integration tests:
-Marketplace, printer pref, add/manage printer from main mnu, print settings
2019-05-03 09:35:17 +02:00
Lipu Fei
4f5aee6298 Merge remote-tracking branch 'origin/fix_long_button_text' 2019-03-28 11:11:49 +01:00
Diego Prado Gesto
742329a170 Document where the magic numbers come from
For the maximumSize of a button.

Contributes to CURA-6412.
2019-03-28 09:29:31 +01:00
Satish
85a7d814d8 Added id to machine selector for integration tests 2019-03-25 14:34:00 +01:00
Diego Prado Gesto
a793a06b60 Add a maximumWidth to the ActionButton
In case the text is too long, it can exceed the limits of the container. This is an optional flag that will work only in case it's set up.

Contributes to CURA-6412.
2019-03-22 17:10:42 +01:00
Diego Prado Gesto
86c7d3e5ab Add a object list panel instead of the open file button 2019-02-15 17:56:03 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking
Contributes to CL-1165
2019-02-12 12:12:59 +01:00
ChrisTerBeke
f2922e2405 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-14 14:16:35 +01:00
Jaime van Kessel
b1b61fa466 Add missing return 2019-01-14 14:14:47 +01:00
fieldOfView
d03ec22dee Hide empty abbreviated machinename
Connected printers that are not Cura Connect printers may not have a connect_group_name.
2019-01-11 17:55:06 +01:00
ChrisTerBeke
3c10cca0de Fixed all codestyle and nitpicks from review 2019-01-11 16:33:49 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Jaime van Kessel
8dbebaa23c Ensure that the machine selector list scales properly
The old implementation directly listend to the height (instead of childrenRect).
This caused issues, since other things apart from adding / removing machines could
influence the height.

CURA-6060
2018-12-31 13:14:08 +01:00
ChrisTerBeke
af2061cd52 Simplify some checks for connection types and group size 2018-12-20 14:26:30 +01:00
ChrisTerBeke
2f92f6ef50 Simplify checking if cloud or network printer, small fixes 2018-12-20 13:45:59 +01:00
ChrisTerBeke
1b356a3219 Move cloud connection check logic to Python 2018-12-19 11:41:22 +01:00
ChrisTerBeke
4bf24671a2 Use the (not final) cloud icon when cloud connected 2018-12-18 16:33:39 +01:00
ChrisTerBeke
0588c54035 Start work on cloud icon 2018-12-18 16:29:13 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Jaime van Kessel
938287095f Use connection type instead of um_network_key to see if a printer has a network connection
CURA-6011
2018-12-17 10:47:14 +01:00
Jaime van Kessel
226d052468 Move the machines from machinelist into their own model
CURA-6011
2018-12-14 17:10:58 +01:00
Jaime van Kessel
5e4e52e6fc Fix blue square being shown in selector if no icon is set
CURA-5876
2018-12-14 11:09:48 +01:00
Diego Prado Gesto
17173aba06 Add a component to show when no configurations are available because lack of connection.
Contributes to CURA-5876.
2018-12-12 17:04:17 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Diego Prado Gesto
26a41c3726 Adjust the color of the printer in the printer selector
For that I needed to get rid of the IconLabel component, since in this case the color of the icon and the text is the same (and it makes sense)
2018-12-06 11:45:14 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00