542 Commits

Author SHA1 Message Date
Jaime van Kessel
2baada8a70 Use the material name instead of brand + type + color
CURA-8514
Fixes #10421
2021-10-19 11:23:21 +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
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
8de5e1e5b9 Account for the width of the arrow in the Extruders row
Although the ExpandablePopup already sets the anchors of the `headerItem` to account for the arrow icon on the right side, the ConfigurationMenu's extruder row was ignoring it, thus making the elided text of the last extruder to overlap with the arrow icon a bit.

This commit fixes that by explicitly accounting for the width of the arrow in the extruders row.

**Note:** if the Cura window gets resized way too much, the extruder icons will still overlap with the arrow, since there is no space to fit everything.

CURA-8496
2021-08-26 13:31:27 +02:00
Konstantinos Karmas
2718d6a69a Change the ColumnLayout to Column in the ConfigurationMenu
When the labels were getting truncated and invisible after reducing the width of Cura's window, their visibility wasn't being restored back and, as a result, the `materialTypeLabel` was the only one that was remaining visible, even if there was enough space for the full `materialBrandColorTypeLabel`.

Changing the ColumnLayout to a Column, where the width is inherited from the parent, fixes that issue.

CURA-8496
2021-08-24 10:35:33 +02:00
Jaime van Kessel
b887398da6 Remove unneeded width from labels
CURA-8496
2021-08-23 10:56:43 +02:00
Konstantinos Karmas
0bcea3f4cd Fix long material names overlapping with extruder icons
Both the `preferredWidth` AND the `width` need to be set for the labels to be properly elided if there is no more room  in the ColumnLayout. In addition, the ColumnLayout that contains the variants and material names needs to be visible only if width>0, otherwise when the width is negative, for some reason the `materialTypeLabel` appears again.

CURA-8496
2021-08-20 09:49:21 +02:00
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
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
6fc1088cdb
Merge branch 'fix_visibilitymenu_style' of https://github.com/fieldOfView/Cura 2021-06-01 16:33:10 +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
fieldOfView
6e803c41f4 Add Cura-styled Menu, MenuItem and MenuSeparator controls 2021-05-20 12:20:19 +02:00
Ghostkeeper
b134405b2c
Add bottom camera angle menu item to view menu
It doesn't really clutter the interface in this menu.

Done as a 5 minute fix for #7609.
2021-05-06 11:39:11 +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
Jaime van Kessel
45f5a222f0
Downgrade version of certain qml impots to as low as they need to be 2021-04-14 10:58:05 +02:00
Remco Burema
e0e77327b5
Dropdown menu wasn't closing on MacOS.
CURA-8172
2021-04-13 13:38:58 +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
3baa71fd48
Update QtGraphicalEffects, Window and Dialogs
CURA-7813
2021-03-29 18:12:35 +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
Jaime van Kessel
cc1aadde12
Set & use enabled property for saving projects when ufp/gcode is loaded
CURA-8034
2021-03-05 14:09:39 +01:00
Kostas Karmas
cdedb56a9a Restore arguments in the SaveProjectMenu
Or else the LocalFileOutputDevice will output a mesh 3mf file and not a Cura 3mf project when
being called from the 'File -> Save Project -> To Disk' submenu item.

CURA-7865
2021-01-20 21:13:36 +01:00
Kostas Karmas
b7e613a271 Remove file_type argument from the saveWorkspaceDialog
Because we also want to export ufp files, which are not workspace files.

CURA-7865
2021-01-19 21:39:16 +01:00
Kostas Karmas
f1e152955c Correct the Menu title
CURA-7865
2021-01-18 18:00:05 +01:00
Kostas Karmas
2774ec7bdf Remove unnecessary kwargs
CURA-7865
2021-01-15 17:42:42 +01:00
Kostas Karmas
a45af1da25 Add save projects submenu
CURA-7866
2021-01-15 09:50:23 +01:00
Kostas Karmas
fd3c985440 Fix ambiguous Ctrl+O shortcut not opening the local file dialog
Ctrl+O was assigned as a shortcut in two places:
  1. To the "File->Open File(s)" menu item, which is visible when only the local file
	 provider is enabled (i.e. the DF file provider is disabled)
  2. To the "File->Open File(s)->From Disk" menu item, which is visible when there are
     more than one file providers enabled.

This was creating an ambiguous shortcut, thus never opening the local file dialog.

This is now fixed by disabling the shortcuts when the respective items are not visible.

CURA-7868
2021-01-11 17:50:26 +01:00
Kostas Karmas
96c4d66029 Revert making the open file dialog a separate LocalFileProvider plugin
This reverts commits 00de7497a4c2986cf8fd13be8f598a0f615f3d63 to 5f6b3b52c1848416c98f7d276fe02f08d067f675

CURA-7868
2021-01-07 16:35:40 +01:00
Ghostkeeper
5f6b3b52c1
Don't trigger open menu upon starting Cura
That would be very annoying.

Contributes to issue CURA-7868.
2021-01-04 18:13:18 +01:00
Ghostkeeper
b266904d76
Replace other references to the open action with the file provider model
This adds a function 'triggerFirst' to the file provider that triggers the first file provider in the model. That should then be the local file provider, but if the plug-in is disabled for some reason it would use another plug-in.

Contributes to issue CURA-7868.
2021-01-04 18:12:15 +01:00
Ghostkeeper
4b375ce2fe
Remove unused hasMesh signal
This is logic that shouldn't be in QML anyway. It's not used by anything at this point. Let's remove it.

Contributes to issue CURA-7868.
2021-01-04 18:11:00 +01:00
Kostas Karmas
e5038ab46d Update year in the copyright comment.
CURA-7868
2021-01-04 15:12:53 +01:00
Kostas Karmas
70550594cd Connect the visibility of the components through their properties
As Ghostkeeper suspected correctly in the review comment https://github.com/Ultimaker/Cura/pull/9012#discussion_r549707433
the binding wasn't working because the model was being retrieved using a function
(CuraApplication.getFileProviderModel()).

Separating this model into a variable allows us to properly bind the "visible" properties of the
menu items with the count property of the model without a problem.

CURA-7868
2021-01-04 15:07:53 +01:00
Kostas Karmas
71994eaaf9 Change the Open File(s) option according to the file providers count
When there is only one file provider (i.e. the local file provider), the Open File(s) will be a
simple item in the File menu.
When there are more than one file providers, the Open File(s) will become a submenu in the File
menu, which will contain all the file providers as submenu items.

CURA-7868
2020-12-23 17:13:14 +01:00
Kostas Karmas
430550452f Add a new file menu option when there are multiple file providers
CURA-7868
2020-12-15 18:31:15 +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