6141 Commits

Author SHA1 Message Date
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
Jaime van Kessel
7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2022-01-03 11:32:06 +01:00
Jaime van Kessel
7692a6db78
Merge pull request #11165 from Ultimaker/8658_Implement_Notifications_for_the_new_marketplace
8658 implement notifications for the new marketplace
2022-01-03 10:18:20 +01:00
Jaime van Kessel
c92fcc8e03 Simplify the notifaction icon logic
CURA-8658
2022-01-03 10:14:22 +01:00
Ghostkeeper
a878cfae7a
Merge branch 'master' into marketplace_redesign 2021-12-31 14:07:51 +01:00
Ghostkeeper
05bbebf2f7
Remove traces of Shapely
It's been replaced by Pyclipper. We were only importing Shapely here, not actually using it.

Contributes to issue CURA-8592.
2021-12-31 14:06:31 +01:00
Remco Burema
1cdeaffab7
Make new Marktetplace react to 'get more materials'.
part of CURA-8588
2021-12-30 11:53:42 +01:00
Remco Burema
b794ad6ed2
Delete old 'Toolbox' in favour of new Marketplace.
part of CURA-8588
2021-12-30 11:51:54 +01:00
Remco Burema
c8ed3634ed
Qt5->Qt6: Even more renaming stuff.
part of CURA-8591
2021-12-29 12:43:56 +01:00
Remco Burema
895488a07b
Qt5->Qt6: Usee key-constants namespace.
part of CURA-8591
2021-12-29 09:10:19 +01:00
fvrmr
6962ecdf01 Update material sync link
Changed link how to load material profiles via usb
2021-12-17 10:24:18 +01:00
Jaime van Kessel
a64aa6ef2d
Merge pull request #10989 from Ultimaker/CURA-8671_dont_send_materials_to_um2c
[CURA-8671] Don't send materials to printers that can't receive them
2021-12-06 09:48:18 +01:00
Ghostkeeper
f0dc7a0eea
Adjust message to include suggestion to update firmware
Because the issue could also be that their firmware is outdated and doesn't yet support syncing material.

Contributes to issue CURA-8671.
2021-12-03 13:59:01 +01:00
Ghostkeeper
6f8a4e93e7
Fix name of capability to filter on
Contributes to issue CURA-8671.
2021-12-03 13:26:51 +01:00
Ghostkeeper
6b0979172f
Slightly adjust width of button
This is more in line with what you see, so you can click on the icon properly to open the per-object settings panel. And the text gets properly elided where the icon starts.
2021-12-03 11:51:04 +01:00
Ghostkeeper
b76df21b4b
Filter printer list by capabilities
And an example of such usage: In the material sync via cloud we only want to sync with printers that can receive those materials.

We might want to add a message for the user to also make sure the firmware is up to date. Because if the firmware is not up to date now it will show no printers and instruct the user how to connect the printer to the cloud.

Contributes to issue CURA-8671.
2021-12-02 17:55:53 +01:00
Ghostkeeper
c1f0fb1faf
Make icons smaller for tertiary buttons
These are typically visually smaller buttons, since they don't have an outline. It makes more sense to use the size of the text then, or something thereabouts.

Contributes to issue CURA-8565.
2021-11-30 14:56:09 +01:00
Ghostkeeper
c117b61503
Also use proper icon size for left icon
Almost forgot!

Contributes to issue CURA-8565.
2021-11-29 12:03:03 +01:00
Ghostkeeper
0337c1c776
Allow changing the icon size
But use the same default as what was previously hard-coded. Now we can have buttons with non-standard icon sizes then, e.g. if the button size itself is also non-standard.

Contributes to issue CURA-8565.
2021-11-29 11:57:12 +01:00
fieldOfView
e537fa562e Hide badge for disabled extruders
A configuration error or warning in a disabled extruder does not affect slicing or the available profiles for other extruder
2021-11-19 14:11:37 +01:00
fieldOfView
c805aac3cc Deactivate tooltip hover if there is no tooltip to show 2021-11-19 13:43:34 +01:00
fieldOfView
9ebd8524ad Use badge icons 2021-11-18 10:53:35 +01:00
fieldOfView
452aa4cc1c Add a tooltip explaining the status of the extruder 2021-11-16 16:05:02 +01:00
fieldOfView
d1f21ec7c4 Adjust size and position of extruder warning "badges" 2021-11-16 15:34:10 +01:00
Jaime van Kessel
439ba6671a Removed unused imports in print monitor 2021-11-16 15:07:33 +01:00
fieldOfView
19dbd1f168 Merge branch 'master' into feature_extruder_warning_icon 2021-11-16 14:56:43 +01:00
Jaime van Kessel
e1d6c89cf2 Replace toolbutton with simplebutton 2021-11-16 14:45:44 +01:00
Remco Burema
87f94e680b
Use re-usable search-bar for Settings search as well.
done as part of CURA-8559
2021-11-16 10:20:08 +01:00
Remco Burema
bc0b7301e5
Merge remote-tracking branch 'origin/marketplace_redesign' into CURA-8559_add_marketplace_search 2021-11-12 13:10:20 +01:00
Remco Burema
b5d58f78d7
Fix: Actually make SearchBar-component independant.
It still depended on the Digital Library 'parent'.

part of CURA-8559
2021-11-12 11:49:37 +01:00
Remco Burema
977a12c989
Steal search-bar from DigitalFactory.
Make 'SearchBar' into a reusable component, so it can be used in the (new) Marketplace search. Also now at least the word 'Search' can be translated ;-)

part of CURA-8559
2021-11-12 09:52:24 +01:00
Remco Burema
c1f2da8820
Layout fixes.
Prevent 'height' based binding loops.

part of CURA-8561
2021-11-11 17:30:43 +01:00
Jaime van Kessel
54b52b6d4d Convert AboutDialog to controls 2 2021-11-11 15:53:24 +01:00
Jaime van Kessel
0cc46b514c Convert workspace summary dialog to Controls 2 2021-11-11 15:51:42 +01:00
Jaime van Kessel
a68584cda1 Replace more instances of label with UM.Label 2021-11-10 17:42:23 +01:00
Jaime van Kessel
f71502fe38 Replace button with reusable simple button 2021-11-10 16:46:24 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Jaime van Kessel
0bb09a4783 Replace all old controls 1 comboboxes with UM.Combobox 2021-11-10 14:57:01 +01:00
Jaime van Kessel
e0ff70dc78 Convert stage buttons to controls 2 2021-11-10 13:47:41 +01:00
Ghostkeeper
dcf78b4885
Merge branch '4.12'
Conflicts:
	resources/i18n/de_DE/fdmprinter.def.json.po -> German translations got some fixes in master while we also updated the new translations for 4.12.
2021-11-08 13:55:09 +01:00
Jelle Spijker
1b503f003e
Disabled Čeština for 4.12
Contributes to CURA-8638
2021-11-08 13:48:11 +01:00
Ghostkeeper
1b36bc2e81
Remove padding on troubleshooting button
Contributes to issue CURA-8609.
2021-11-03 13:46:47 +01:00
Ghostkeeper
9c684cbc4d
Hide entire footer when the user started syncing
If they started syncing, most likely the list of printers is just complete and the user won't need this any more.

Contributes to issue CURA-8609.
2021-11-03 11:26:37 +01:00
Ghostkeeper
e929decce5
Merge branch 'speedup_inherit_button' 2021-11-02 17:59:28 +01:00
Jaime van Kessel
e02b179fae Fix toggle indicator camera view
Setting the checked state in the javascript caused the binding to be broken.
Stupid mistake and I should have known better...

CURA-8664
2021-11-02 16:54:10 +01:00
Ghostkeeper
a35fcf493a
Allow word wrapping for error message
This prevents being able to align the text vertically with the troubleshooting button though. The text may become the larger of the two, in which case the text should be leading the height. Qt can do this with a Layout, however it then can't automatically adjust the width of the layout there since that would create a polish loop in the layout.

Contributes to issue CURA-8609.
2021-11-01 18:59:06 +01:00
Ghostkeeper
e7e513bb16
Reduce width to 0 if the icon is neutral
Because with our default theme, the neutral icon is empty. This causes the alignment of the label next to it to appear off.

Contributes to issue CURA-8609.
2021-11-01 18:27:38 +01:00
Ghostkeeper
fd79b76f07
Add troubleshooting link to footer
It's moving there now. However if there are any errors syncing with the printers, the troubleshooting link has to disappear from there.

This makes the layout quite complex, since the icon on the left and the button on the right are no longer vertically centred. The text used to be vertically centred too, but can't do that any more since the text is not the determiner of the height any more, with there being a horizontally aligned button below it. It's all a bit complex now.

Contributes to issue CURA-8609.
2021-11-01 18:18:56 +01:00
Ghostkeeper
cd286a006e
Add missing colours, fixing dark theme
Don't just use white rectangles or black text. Use the theme where appropriate. And these rectangles are just outlines.

Contributes to issue CURA-8609.
2021-10-29 15:18:40 +02:00