522 Commits

Author SHA1 Message Date
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
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
maht
f3103e5808
Update FileMenu.qml 2020-07-17 12:01:49 +02:00
maht
1ce7f1838f
Update FileMenu.qml 2020-07-17 11:29:18 +02:00
Jaime van Kessel
b7296dd700
Don't update material menu when it's not visible
Knocks off about a second of loading
2020-07-10 13:48:47 +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
Jaime van Kessel
b58730a70c
Fix decoding in recently opened menu
Fixes #7820
2020-05-27 15:30:22 +02:00
Ghostkeeper
485e37e7f5
Extruders can be undefined, not null
This happens when the printer is changed, such as when changing the Machine Width in the machine settings dialogue. It updates these menus then and if not all extruders are defined it'll give the following errors:
2020-03-20 16:56:57,839 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:51: TypeError: Cannot read property 'isEnabled' of undefined
2020-03-20 16:56:57,840 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:44: TypeError: Cannot read property 'isEnabled' of undefined
2020-03-20 16:56:57,841 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:26: TypeError: Cannot read property 'isEnabled' of undefined
2020-03-20 16:56:57,841 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:28: TypeError: Cannot read property 'material' of undefined

Done during Turbo Testing and Tooling.
2020-03-20 17:03:08 +01: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
Kostas Karmas
dbab3c6e8b Add more materials from Marketplace menu button
This commit adds a button "Add more materials from Marketplace" in the
menu that pops up in the material list while configuring the materials
into custom ones. The button redirects the user to the Marketplace
materials page (https://marketplace.ultimaker.com/app/cura/materials)

CURA-7027
2020-01-15 11:50:59 +01:00
Lipu Fei
4f91389941 Fix QML warnings 2020-01-07 11:37:37 +01:00
Jaime van Kessel
6afd669389
Speed up QMl binding evaluation for MaterialMenu 2020-01-03 16:24:56 +01:00
Nino van Hooff
8dbd67f5bd Merge remote-tracking branch 'origin/master' into CURA-6959_collapse_categories
# Conflicts:
#	resources/qml/Menus/SettingVisibilityPresetsMenu.qml
#	resources/qml/Settings/SettingView.qml
2020-01-02 15:32:26 +01:00