8158 Commits

Author SHA1 Message Date
Konstantinos Karmas
bde44d2c08
Merge pull request #10105 from Ultimaker/CURA-8018_add_monitor_print_button_to_cloud_print
Add monitor print button for cloud print
2021-07-13 10:29:37 +02:00
Konstantinos Karmas
329973adfb Capitalize only the first word in the message action
CURA-8018
2021-07-13 10:00:27 +02:00
Konstantinos Karmas
e31ec31f34 Make the lifetime of the "print job sent" message 30s
Previously it was 5s and the message would disappear before the user had a chance to press the "Monitor print" button.

CURA-8018
2021-07-13 09:59:05 +02:00
Jaime van Kessel
e8fc88e6b0
Use f-string formatting instead of %
CURA-8018

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2021-07-13 09:45:00 +02:00
Ghostkeeper
1269c28d0a
Reduce wait time before sending query
Most people should be able to type 5 characters per second. And those that can't will just have to see it refresh after every stroke.

Contributes to issue CURA-8009.
2021-07-12 18:46:54 +02:00
Ghostkeeper
94e229aa44
Clear list of projects every time we load the first page
Otherwise when we refresh the project list after searching it would put the new results at the end. That's not what we want.

Contributes to issue CURA-8009.
2021-07-12 18:44:11 +02:00
Ghostkeeper
02932a1f62
Add filter to API call for project list
This passes the filter on to the API call and causes the API call, so that we only get the projects that the user searched for.

Contributes to issue CURA-8009.
2021-07-12 18:43:15 +02:00
Ghostkeeper
65f7eb5ea8
Add function to update search filter when the user types
Seems to work fine.
The pyqtSignal is not technically necessary unless we display this filter in the interface anywhere. We don't currently. If the signal is not present it would complain about non-notifyable properties. And making it a slot instead of a signal seems a bit unintuitive to me in how the field is being used.

Contributes to issue CURA-8009.
2021-07-12 17:41:10 +02:00
Ghostkeeper
22826bc4d8
Add text field in a layout for search
The text field is not stylised yet, so far. Will do, but let's first make it functional.

Contributes to issue CURA-8009.
2021-07-12 17:16:16 +02:00
Jaime van Kessel
2b5747f3ee
Update plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2021-07-12 17:13:32 +02:00
Jaime van Kessel
5aa4a6f713
Merge branch 'CURA-8138_check_user_access_DF' of github.com:Ultimaker/Cura 2021-07-12 13:21:08 +02:00
Ghostkeeper
55bdb81e78
Reduce margins of options in the open file drop-down
This was a desire from the developer. It shouldn't be consistent with the printer selector. The margins being all the same is more important.

Contributes to issue CURA-8008.
2021-07-12 11:13:06 +02:00
Remco Burema
85f98bdaff
Appease type-checking system even further.
That last one should have worked really.

part of CURA-8138
2021-07-09 21:36:20 +02:00
Remco Burema
6f99837db5
Fix typing.
part of CURA-8138
2021-07-09 21:17:33 +02:00
Remco Burema
c78618bc15
Digital Library: Allow 'personal users' to DL.
Users with an account and an UM printer should have some basic access to the Digital Library. To this end, and to remain future proof, the online team has made an extension to its API so now feature budgets can be gauge. At the moment it's only checked wether the user has any access to personal projects at all. If so, the interface shows Digital Library functionality. Known issue: Removing the last printer from DF while still logged in leaves the DL access in the Cura interface until logged out or Cura restarted. Additionally, I think the response for a logged in user without any printer from the API is just 'data = empty list' instead of everything set to False and 0 (which should be the case as they're all listed as required fields in their docs ... maybe I'm missing something). In any case, the code as is now can handle that as well.

CURA-8138
2021-07-09 21:06:49 +02:00
Ghostkeeper
739f8834d0
Align layout of providers with machine selector
It's quite different in detail because there is a lot less content to show here (no machine type, icons, etc), but the basics are the same now.
One possible issue is that the button doesn't extend all the way to the right, so you can't click everywhere on the shortest item. I'll see if that can still be fixed.

Contributes to issue CURA-8008.
2021-07-09 17:20:32 +02:00
Ghostkeeper
f8aa6a3398
Add list of open file providers to submenu
The layout isn't quite there yet, but it mostly works and I want to have a save point to return to if I tinker too much.

Contributes to issue CURA-8008.
2021-07-09 17:02:38 +02:00
Ghostkeeper
0db1f1034b
Add header, and make popup grow to its contents
It was quite a hassle to allow the column to grow to the size of its contents. For some reason, things update the size to 0. And the size updates again once the pop-up actually gets opened for the first time, because then the column actually gets populated lazily.

Contributes to issue CURA-8008.
2021-07-09 16:47:51 +02:00
Ghostkeeper
5bc3848301
Show either openFileButton or openFileMenu, depending on provider count
If there's just 1 provider, show the button. If there are multiple, show the menu. If there are 0, also show the button but disable the button.
The behaviour is not yet implemented though. It doesn't actually look at which providers are available and what they do.

Contributes to issue CURA-8008.
2021-07-09 15:33:57 +02:00
Ghostkeeper
c100ba88d0
Move pop-up code to external item to re-use ExpandablePopup element
All of what we were about to implement is already implemented in ExpandablePopup. So let's re-use that one. That guarantees that it looks consistent too.

Contributes to issue CURA-8008.
2021-07-09 15:27:12 +02:00
Ghostkeeper
6203a5c987
Correct chevron size and colour
This is the same as what ExpandablePopup does.

Contributes to issue CURA-8008.
2021-07-09 14:27:32 +02:00
Ghostkeeper
f4f48c0fda
Move padding to only be around row
Not around the individual icons. This way the chevron can be placed next to the icon closer.

Contributes to issue CURA-8008.
2021-07-09 14:23:14 +02:00
Ghostkeeper
41642a35ff
Add chevron to select where to load models from
The chevron looks a little big now. No worries, we can fix that.

Contributes to issue CURA-8008.
2021-07-08 18:00:35 +02:00
Ghostkeeper
ffa89bb1a1
Allow open file button to resize depending on content items
This re-links the widths, heights and paddings such that we can later change the width of the button depending on its contents.
However there is a complication: Buttons automatically change the size of the contents based on the size of the button minus its padding. So making the size of the button in turn depend on its contents causes a binding loop.
To get around this binding loop, we need to manually calculate the size of the button, such that the size of the contents ends up exactly right.

Contributes to issue CURA-8008.
2021-07-08 17:49:44 +02:00
Jaime van Kessel
b4a8cb1b82
Add monitor print button for cloud print
The button redirects the user to the cloud page

CURA-8018
2021-07-08 17:01:03 +02:00
Ghostkeeper
ba6e79c81f
Rework parts of camera button
The new button should be consistent with the looks of the tool buttons. I've given it the same size as the inner part of the tool buttons, reworked the background so that it matches. I'm also giving it the 'secondary button' style which is also used for one other button. But that other detail button should get the same style anyway so that's fine too.

I've also turned this icon into an actual button. That way it can get focus when using keyboard navigation and works better with tools for blind and such.

Contributes to issue CURA-8202.
2021-07-07 11:36:11 +02:00
Ghostkeeper
8e5485330f
Align sizes of prepare and preview menus
For some reason, the prepare menu is still one pixel too small. I think it's got to do with that one being a layout rather than a normal row.

Contributes to issue CURA-8202.
2021-07-07 11:36:10 +02:00
Konstantinos Karmas
18377d2726 Change extruder icon in monitor tab to be same as preview tab
There are still some discrepancies (e.g. when the extruder is empty, the Preview tab just keeps it disabled and mentions "Generic PLA" while the Monitor tab shows it disabled by mentions "Empty" in the material. But we consider this acceptable for the time being, since it has been like that for a long time.

CURA-8011
2021-07-05 11:31:23 +02:00
Konstantinos Karmas
1a273714a3 Make the width of the PreviewMenu headers dynamic
CURA-8011
2021-07-05 10:37:19 +02:00
Konstantinos Karmas
a7446d681f Set header border and color by default in ExpandablePopup and Component
CURA-8202
2021-07-01 14:20:57 +02:00
Konstantinos Karmas
0505842235 Remove DropShadow from ExpandablePopup and ExpandableComponent
Since they are not used anywhere anymore

CURA-8202
2021-07-01 12:07:35 +02:00
Konstantinos Karmas
ce88392137 Replace shadow with border in machine selector in monitor page
CURA-8202
2021-07-01 11:57:14 +02:00
Konstantinos Karmas
bf40ccc3f2 Replace shadow with border in headerbar in simulation view
CURA-8202
2021-07-01 11:55:24 +02:00
Konstantinos Karmas
1f612f3e1a Align extruder labels in monitor page with the extruder icon
CURA-8202
2021-07-01 11:37:03 +02:00
Konstantinos Karmas
196e5ba397 Increase size of buildplate icon in monitor page
CURA-8202
2021-07-01 11:21:45 +02:00
Konstantinos Karmas
c3a7cd59be Add medium quality "Folder" icon
CURA-8202
2021-06-30 12:24:49 +02:00
Konstantinos Karmas
348bf0c4c1 Remove unused import
CURA-8013
2021-06-29 15:33:44 +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
Konstantinos Karmas
5a3675df95 Calculate the width of the header items only once
CURA-8013
2021-06-29 10:54:46 +02:00
Ghostkeeper
9046506f2a
Convert icons to UTF-8
As per our architecture design, all of these files should be UTF-8. Luckily it maps well.

Contributes to issue CURA-8342.
2021-06-28 18:28:50 +02:00
Ghostkeeper
1d0620908e
Remove useless and unused SVG elements
- Remove unused imports of xlink.
- Remove comments about which application originally wrote the text file. It's untrue because PyCharm edited it, etc.
- Remove unused IDs.
- Remove unused colours for icons rendered with RecolorImage.
- Remove useless x and y positions on 0, which is the default.
- Remove useless style setting the background to transparent.
- Remove useless whitespace in the path d attribute, and remove the then-useless XML space preserving attribute.
- Remove unused groups.
- Remove unused CSS classes.

Contributes to issue CURA-8342.
2021-06-28 18:22:52 +02:00
Konstantinos Karmas
294b67f72f Replace the shadow of the PrepareMenu with a border
In order for that to be possible, the background border of the ExpandablePopup and the ExpandableComponent had to be exposed.

In addition, since in the `RowLayout` the `ConfigurationMenu` and the `MachineSelector` both draw a border around them, it means that there will be a double "divider" (one border line from each button). To overcome that, we set the spacing of the `RowLayout` as a `- border_width`, which ensures then that there will be only a single line of border between the two adjacent buttons.

CURA-8013
2021-06-28 17:50:38 +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
bbfa93c9a7 Make the machineSelection header adjust its width
Whenever the window gets resized, the machineSelector header will now change it size, similar to the configurationSelector next to it.

CURA-8013
2021-06-28 14:48:54 +02:00
Ghostkeeper
7ff86547ef
Add fallback for if the example file can't be read
Fixes Sentry issue CURA-2KM.
2021-06-28 14:32:12 +02:00
Ghostkeeper
e296b0897b
Merge branch '4.10' 2021-06-25 14:16:23 +02:00
Remco Burema
ca2ecfbc6e
Merge pull request #10020 from Ultimaker/CURA-8331_superfluous_g92_pause_at_height
Only add G92 for Griffin if redoing layer in Pause At Height
2021-06-25 14:04:25 +02:00
Jaime van Kessel
1cece590d7
Remove unneeded qml imports
Found these while looking at what would be needed to upgrade to qt 6.x
This module is dropped, hence me going over all of the cases where it's used.
2021-06-25 12:37:05 +02:00
Konstantinos Karmas
d35f018729 Prevent exception being logged if no backups window was created
CURA-8313
2021-06-25 09:52:48 +02:00
Jaime van Kessel
7e7a09ffa7
Merge branch '4.10' of github.com:Ultimaker/Cura 2021-06-23 14:26:19 +02:00