26091 Commits

Author SHA1 Message Date
jelle Spijker
d97c4e2c94 Don't use new controls for the buttons 2021-08-31 09:34:23 +02:00
jelle Spijker
f730959f78 fixed discard or keep combobox on Mac
Use the new controls ComboBox
2021-08-30 16:15:02 +02:00
jelle Spijker
2548fd8014 Fix greyed out cluster printers
The PrintWindow still used an old style combobox.
This resulted in a Mac user not being able to specify
which clustered printer he wanted to send a slice to.

Using the new QtQuick.Controls and specifically setting
the currentIndex fixed it for Mac.
2021-08-30 13:41:55 +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
Jaime van Kessel
88b5c4c8be Merge branch 'CURA-8497_Image_spacing_is_misaligned_in_messages' of github.com:Ultimaker/Cura into 4.11 2021-08-25 16:57:50 +02:00
Konstantinos Karmas
bbada73550 Remove outdated image from "new printers added" message
CURA-8497
2021-08-25 15:32:42 +02:00
Jelle Spijker
392cca431f
Merge pull request #10331 from Ultimaker/CURA-8380_Align_link_style_among_OS_in_whats_new
CURA-8380: Align link style among os in whats new
2021-08-25 13:16:50 +02:00
Jelle Spijker
50c11e5fdf
Merge pull request #10330 from Ultimaker/CURA-8496_Fix_long_material_names_overlappint_with_icon
CURA-8496: Fix showing only the material type after resizing Cura's window
2021-08-25 11:57:54 +02:00
Jaime van Kessel
5b8dac8ec9
Merge pull request #10332 from fieldOfView/fix_missing_star_icon
Fix missing "star" icon in Cura 4.11
2021-08-24 16:52:01 +02:00
fieldOfView
82912ef20c Add alias for previously existing "star" icon 2021-08-24 16:34:28 +02:00
Konstantinos Karmas
99f8c85065 Style the "no plugin/material installed" texts in the installed tab
The default black text color was invisible in the dark theme.
2021-08-24 13:33:05 +02:00
Konstantinos Karmas
d24d520db0 Change background of Premium plugins and materials
Or else the link "Search materials" in the materials tab was very hard to see.

CURA-8380
2021-08-24 13:32:25 +02:00
Konstantinos Karmas
01b0d78f7b Use custom style for the links in the what's new textArea
A style had to be prepended in the text to make sure that it adheres to the style we want instead of using the OS-based link style.

Note: For some reason QML ignores all other link-style tags (such as `a:hover`, `a:focus` etc) apart from `a:link`, so we can only change the style for the normal link and NOT for when it is clicked or hovered.

CURA-8380
2021-08-24 13:31:39 +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
Konstantinos Karmas
a754b49299 Merge branch '4.11' into CURA-8496_Fix_long_material_names_overlappint_with_icon 2021-08-24 09:38:25 +02:00
Ghostkeeper
6b5ea9086f
Fix spelling in documentation
Saw this and wanted to take it along blindly with whatever next modification I made to Cura. However I need to switch branches now so it's just going to be a rather useless commit I guess.
2021-08-23 14:40:57 +02:00
Jaime van Kessel
52525038e3 Merge branch 'CURA-8496_Fix_long_material_names_overlappint_with_icon' of github.com:Ultimaker/Cura into 4.11 2021-08-23 11:00:29 +02:00
Jaime van Kessel
b887398da6 Remove unneeded width from labels
CURA-8496
2021-08-23 10:56:43 +02:00
Ghostkeeper
e27ec57b04
Fix spelling 2021-08-20 17:37:38 +02:00
Ghostkeeper
3eba7cd454
Slightly shorten AnyCubic i3 Mega S/Pro name
This was causing some files to be just over the limit of file length when given the default printer name on some operating systems. Some file systems, especially encrypted ones, have strict limitations for the maximum length of a file name. With percent-encoding and the extension and postfix we add to these file names, this could go over the limit in file name length for some operating systems.
Easy fix is to slightly shorten the name, at least to remove those brackets.

Done as a 5 minute fix.
2021-08-20 14:48:40 +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
ae3362f716 Fix "Manage printer" button pointing to the print job link
Both the "Manage printer" and the "Manage in browser" button were using the `openPrintJobControlPanel()` function, which was wrong. This is now fixed so that the "Manage printer" will use the `openPrinterControlPanel()` function as it should've in the first place.
4.11-beta
2021-08-19 12:33:46 +02:00
Jaime van Kessel
668624e13d Set lifetimes correctly 2021-08-19 10:01:01 +02:00
Ghostkeeper
1c9b3a0784
Merge branch 'CURA-8490_Make_sure_no_keyring_backend_is_available_on_Linux' into 4.11 2021-08-19 09:33:33 +02:00
Ghostkeeper
fcadba944a
Merge branch '4.11' into CURA-8491_sdk_upgrade_770 2021-08-19 09:17:17 +02:00
fvrmr
090a793e8a Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11 2021-08-18 17:28:03 +02:00
Konstantinos Karmas
ed32f24f45 Merge branch '4.11' into CURA-8490_Make_sure_no_keyring_backend_is_available_on_Linux 2021-08-18 17:27:32 +02:00
fvrmr
7493233e3f Update 4.html
Fixed a typo's
2021-08-18 17:27:16 +02:00
Konstantinos Karmas
0972f1b721 Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11 2021-08-18 17:18:51 +02:00
Konstantinos Karmas
9f31e1421b Make lifetime optional in the getBackwardsCompatibleMessage
This should fix the failing tests
2021-08-18 17:18:21 +02:00
fvrmr
1d00f959c4 Update whats new pages
Updated the links in the whats new pages
2021-08-18 17:18:07 +02:00
Konstantinos Karmas
617c4a0a5d Merge branch '4.11' into CURA-8490_Make_sure_no_keyring_backend_is_available_on_Linux 2021-08-18 17:12:53 +02:00
Remco Burema
898abc92a8
Update SDK 7.6 -> 7.7 because of API changes in 4.11
CURA-8491
2021-08-18 16:56:29 +02:00
Konstantinos Karmas
d218b0bff9 Remove check for "frozen" when setting the keyring backend
There is no need to have a different behavior from source compared to frozen builds when it comes to the keyring.

CURA-8490
2021-08-18 16:54:28 +02:00
Ghostkeeper
a40c7e7410
Default lifetime for successful upload messages
There is no real reason to keep this visible indefinitely.
2021-08-18 15:36:41 +02:00
fvrmr
57c6efd427 Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11 2021-08-18 12:08:14 +02:00
fvrmr
da92033666 Update change log + whats new pages
Update change log 4.11 beta
Update whats new pages + img

Links in whats new pages still needs to be updated
2021-08-18 12:08:09 +02:00
Konstantinos Karmas
c5a956068f Fix mypy complaint
The `Keyring` is already imported from MacOS, so it's best to rename the fail on for Linux.

CURA-8490
2021-08-18 12:02:13 +02:00
Konstantinos Karmas
b1dc38f126 Don't load a keyring backend on Linux
We do not support it on Linux and it can cause problems if there is a system keyring configured.

CURA-8490
2021-08-18 11:57:09 +02:00
Konstantinos Karmas
e5856bf6bc Log the connection error message produced by the request 2021-08-17 15:52:12 +02:00
Konstantinos Karmas
bbb1f0f0f3 Fix wrong icon mapping
The deprecated icon "pencil" was being mapped to the new icon "Pencil" which is actually called "Pen".

This commit also replaces tabs with spaces in the deprecated_icons.json.

Fixes CURA-8488
2021-08-17 15:32:21 +02:00
Jelle Spijker
d87c7a70cb
Switch return order for Repetier pauseAtHeight
While testing I noticed that the movement after the pause will
first move the head down and then move to the position before
the pause. This could result in noticeable artifacts or
accidentally push thin towers from the bed.) See the code below.

```gcode
;TYPE:CUSTOM
;added code by post processing
;script: PauseAtHeight.py
;current z: 5
;current height: 5.0
M83 ; switch to relative E values for any needed retraction
G1 F300 Z6 ; move up a millimeter to get out of the way
G1 F9000 X190 Y190
G1 F300 Z20.0
M84 E0
@pause now change filament and press ; Do the actual pause
G1 F300 Z5
G1 F9000 X30.759 Y30.759
G1 F1800 ; restore extrusion feedrate
```
I have switched the lines in the script such that it will first move to the correct X, Y and then move down
```python
prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
```
As shown in the code below
```gcode
;TYPE:CUSTOM
;added code by post processing
;script: PauseAtHeight.py
;current z: 5
;current height: 5.0
M83 ; switch to relative E values for any needed retraction
G1 F300 Z6 ; move up a millimeter to get out of the way
G1 F9000 X190 Y190
G1 F300 Z20.0
M84 E0
@pause now change filament and press ; Do the actual pause
G1 F9000 X30.759 Y30.759
G1 F300 Z5
G1 F1800 ; restore extrusion feedrate
```
2021-08-17 13:38:50 +02:00
Ghostkeeper
33edc4a8c9
Fix display of unlinking button
It was not being displayed with Qt 5.15 due to the following error:
MaterialsView.qml:34:5: Unable to assign QStringList to QString
This is correct. And it should not just concatenate all of these material names; it should add a comma between them for human-readable display in the text label above the button.

Fixes #10235.
2021-08-17 13:34:43 +02:00
Konstantinos Karmas
e0e4a3f2c0 Add shadow behind the what's new pages
As discussed during the eCCB.
2021-08-16 17:00:30 +02:00
Jaime van Kessel
a124342127 Fix Pause at height issue
Fixes #8575

Thanks to @EGOiST1991 for suggesting the fix!
2021-08-16 11:15:30 +02:00
Jaime van Kessel
3dec4e228b Use leftpadding instead of binding anchors outside of siblings 2021-08-12 15:48:58 +02:00
Jaime van Kessel
4b324095ec Remove incorrect log
There is absolutely no reason that needed to be logged, since it
happens on *every* boot. It was also not a place where an exception
even happend.
2021-08-12 15:43:11 +02:00
Jaime van Kessel
1f523053d9 Add even more logging to authorization service 2021-08-12 15:35:14 +02:00
Jaime van Kessel
79ccccb1a1 Fix qml warning spam 2021-08-12 15:27:39 +02:00
Jaime van Kessel
21a076aea4 Set type of engine crash message to Error 2021-08-12 11:17:38 +02:00