312 Commits

Author SHA1 Message Date
Konstantinos Karmas
83fe65b8eb Use the StatusIcon qml component for the warning icons
CURA-8349
2021-07-28 18:17:54 +02:00
Konstantinos Karmas
01c4a0f72d Change warning icon background to the CircleSolid.svg
CURA-8439
2021-07-28 16:55:36 +02:00
Jaime van Kessel
4470fa198e
Swap out warning icon
CURA-8439
2021-07-27 15:26:51 +02:00
fieldOfView
14cf23c65f Update to new icon names 2021-07-26 14:17:58 +02:00
fieldOfView
9c05d990ea Merge branch 'master' into feature_extruder_warning_icon
# Conflicts:
#	resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
2021-07-26 14:12:30 +02:00
Ghostkeeper
52018a6048
Adjust size and margin of guide book icon
The icon was rendered at a too small size, such that it would get a different line width or look-and-feel than the rest. However making it bigger doesn't properly centre it either.
To centre it we also reduced the margin.

Contributes to issue CURA-8202.
2021-07-07 11:36:11 +02:00
Konstantinos Karmas
5ae4ad5429 Center the material label if no variant in the ConfigurationMenu header
CURA-8011
2021-07-05 17:33:03 +02:00
Konstantinos Karmas
0319fdcc41 Get the opacity of the extruder from the theme
CURA-8011
2021-07-05 12:27:29 +02:00
Konstantinos Karmas
cc30510058 Let ExtruderIcon decide its size in the ConfigurationMenu
CURA-8011
2021-07-02 12:12:18 +02:00
Konstantinos Karmas
7c02e1b5e5 Merge branch 'CURA-8202_Resize_new_icons' into CURA-8011_Replace_extruder_icons 2021-07-02 10:35:35 +02:00
Konstantinos Karmas
327acfd49c Align the material and variant labels in the center of the header
CURA-8013
2021-06-30 11:10:25 +02:00
Jaime van Kessel
53fd47e8db
Set opacity of disabled extruder text
CURA-8011
2021-06-29 16:26:59 +02:00
Konstantinos Karmas
8a22eaa5cc Merge branch 'master' into CURA-8013_Adjust_sizes_of_header_and_toolbar 2021-06-29 11:04:51 +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
Konstantinos Karmas
fae5e2cffd Adjust the text of the material according to the size of the window
Now, when the size of the Cura window changes and the configurationSelector gets resized, instead of eliding the material text it will now change as follows:

* If it fits, display "Brand, Color, and Type" of material (e.g. Ultimaker Black PLA)
* If "Brand, Color, and Type" doesn't fit, change it to "Color and Type" of material (e.g. Black PLA)
* If "Color Type" doesn't fit either, display only the type (e.g. PLA)
* If "Type" doesn't fit, elide it

CURA-8013
2021-06-28 14:53:50 +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
Remco Burema
7520e3b148
Workaround old-style menu's not closeable on Mac OSX.
Menu's didn't always close, and on newer Macs users wouldnt be able to even close the menu, making this a blocker. Will fix this properly before the final, but at least the beta should be usable now.

CURA-8142
2021-04-06 12:21:59 +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
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
fieldOfView
0c668053e5 Add warning icon to show which extruder makes the configuration Not Supported 2020-11-12 14:04:58 +01:00
Ghostkeeper
8f9e0da400
Fix binding of extruder enable checkbox if there is no active stack
There was a typo there.

Contributes to issue CURA-7501.
2020-10-16 14:03:59 +02:00
Jaime van Kessel
b09a88075e
Show a visual indication of enabled directly after click
This doesn't actually speed up the process, but it does give some indication
that something is going on while the changes are happening

Contributes to #8250
2020-09-04 14:48:55 +02:00
Kostas Karmas
58218d76c2 Fix missing visibility in the RowLayout of the ConfigurationMenu
This fixes the issue of the "Select configuration" label appearing on
top of the extruders in the configuration menu. This could be observed
when adding a UM2 with Olsson block.
2020-06-16 16:35:22 +02:00
Nino van Hooff
e5a7ad2eca
Merge pull request #7904 from Ultimaker/CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message
CURA-7454: Add "remove printers" button in removed printers from account message
2020-06-12 17:35:09 +02:00
Kostas Karmas
df2c20f647 Convert back Row to RowLayout
RowLayout is better for resizable interfaces

CURA-7479
2020-06-10 11:37:51 +02:00
Kostas Karmas
62047d585f Convert RowLayout into Row in ConfigurationMenu
CURA-7479
2020-06-10 11:23:17 +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
Ghostkeeper
d9c768e0d3
Merge branch 'CURA-7480_Remove_flicabkle_config_panel' 2020-06-08 14:26:21 +02:00
Kostas Karmas
3073d7c349 Fix height binding loop QmlWarning in ConfigurationListView
Done during Turbo Testing and Tooling
2020-06-05 15:54:53 +02:00
Jaime van Kessel
c095cb1f22
Converted the listview into a RowLayout
I have no idea why i thought a listview was needed for this when
this was made. The data shouldn't be flicable, so it makes way more sense to
use a row layout

CURA-7480
2020-06-04 14:06:03 +02:00
Lipu Fei
65e1314538 Fix QML null warnings 2020-02-13 12:26:49 +01:00
Lipu Fei
15f4d1231b Fix QML null warnings 2020-02-13 12:11:25 +01:00
Lipu Fei
1f3a7c976f Remove deprecated MachineManager.activeMachineHasRemoteConnection
CURA-6858
2019-10-22 14:14:14 +02:00
Lipu Fei
38ee4bf208 Remove deprecated functions in MachineManager
CURA-6858
2019-10-22 14:11:40 +02:00
Jaime van Kessel
07a20e131a
Prevent changing material / variant of disabled extruder
It is disabled, so changing it's material / variant doesn't make that much sense...

CURA-6872
2019-10-10 13:03:39 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Diego Prado Gesto
0085660153 Use non-abbreviated names in the configurations list 2019-09-16 15:59:21 +02:00
Lipu Fei
52f3f9b773 Update QML import versions and add headings
CURA-6598
2019-09-03 11:17:20 +02:00
Jaime van Kessel
87fedc2620 Fix elide for the variant in configuration menu 2019-08-29 11:53:25 +02:00
Jaime van Kessel
a0c705e900 Remove usage of some deprecated functions 2019-05-16 14:49:53 +02:00
Jaime van Kessel
c786770a44 Remove usage of deprecated functions 2019-05-03 13:52:45 +02:00
Jaime van Kessel
d42f446d70 Remove usages of deprecated function 2019-05-03 13:17:10 +02:00
Remco Burema
55dcf31e3c Fix QML binding loop warnings for CustomConfiguration. 2019-04-11 16:24:51 +02:00
Diego Prado Gesto
9594545f2c Remove the link to show the compatibility chart
Actually it only made sense for ultimaker materials. Now that we can include instruction link in every materials, a specific link for every material can be used instead.

Contributes to CURA-6423.
2019-04-04 14:46:20 +02:00
Lipu Fei
4d3211e651 Merge remote-tracking branch 'origin/4.0' 2019-02-22 13:38:29 +01:00
Lipu Fei
2694ef98e0
Merge pull request #5338 from Ultimaker/CURA-6232_config_menu_tab_fix
Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232]
2019-02-22 13:37:10 +01:00