14353 Commits

Author SHA1 Message Date
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
fieldOfView
660cc12382 Use UM.StatusIcon instead of our own 2021-08-24 17:58:50 +02:00
fieldOfView
96a1019f1e Merge branch 'master' into feature_extruder_warning_icon 2021-08-24 17:39:28 +02:00
fieldOfView
82912ef20c Add alias for previously existing "star" icon 2021-08-24 16:34:28 +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
Jaime van Kessel
78b6bf2ed4 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-23 11:01:01 +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
Jaime van Kessel
2350712633 Remove incorrect reference to icons in some machine definitions 2021-08-22 19:57:09 +02:00
Ghostkeeper
44913c0d87
Merge branch '4.11' 2021-08-20 17:37:49 +02:00
Ghostkeeper
e27ec57b04
Fix spelling 2021-08-20 17:37:38 +02:00
Cyril
53263cf054
Improve FLSUN Super Racer profile (#10192)
* Improve FLSUN Super Racer profile

- Added quality profiles based on profiles provided by FLSUN
- Improved machine settings based on FLSUN's Marlin sources
- Replaced Super Racer STL with correct one

* Update flsun_SuperRacer.stl

* Update definitions

* Update flsun_sr.stl

* Update flsun_sr.stl

* Update flsun_sr.def.json

* Improve platform

* Normal quality by default

* Improvements

* Fix double settings

CURA-8510
2021-08-20 17:18:37 +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
Cláudio 'Patola' Sampaio
9affc9ac1d Updated pt_BR strings for 4.11 2021-08-20 03:38:21 +02:00
Ghostkeeper
b23b7119d2
Remove superfluous profile duplicates of all GreenTecPro colours for Weedo
We match these profiles by material type. Since they are all the same, we only need to retain one.

All other profiles than the black one weren't being loaded because all of these quality profiles had their 'material' metadata field set to be the black one.

Contributes to issue CURA-8469.
2021-08-19 16:56:15 +02:00
Ghostkeeper
a3b8b95ade
Remove stylised caps
We don't condone stylized caps as they give an unfair advantage to some printers. We don't show logos here, just textual names.

Contributes to issue CURA-8469.
2021-08-19 16:32:17 +02:00
Ghostkeeper
41a259228f
Merge branch 'master' of https://github.com/x40-Community/Cura into x40-Community-master 2021-08-19 16:23:03 +02:00
Jaime van Kessel
0348293f87 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-19 10:01:20 +02:00
Ghostkeeper
fcadba944a
Merge branch '4.11' into CURA-8491_sdk_upgrade_770 2021-08-19 09:17:17 +02:00
X40-Community
d199d2f297 USB connection and gerneric_pc removed 2021-08-18 20:13:04 +02:00
fvrmr
7493233e3f Update 4.html
Fixed a typo's
2021-08-18 17:27:16 +02:00
fvrmr
1d00f959c4 Update whats new pages
Updated the links in the whats new pages
2021-08-18 17:18:07 +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
Ghostkeeper
8650dd9b0f
Merge branch '4.11' 2021-08-18 16:18:43 +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
AnnaKang0219
40025c0d63 Fix machine_extruder_trains not set
Fix machine_extruder_trains not set
2021-08-18 13:04:23 +08:00
Konstantinos Karmas
e5374ada3b Merge branch '4.11' 2021-08-17 15:59:53 +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
Ghostkeeper
901b05d1a6
Merge branch '4.11' 2021-08-17 13:35:00 +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
AnnaKang0219
1662398cda Add Jr.Pro Xe+ Definition
Add Jr.Pro Xe+ Definition
2021-08-17 17:17:40 +08:00
AnnaKang0219
778855c06f Add XYZprinting Printer Definitions
Hi,
I just add Definitions for XYZprinting Printers,
Please help to check,thank you.
2021-08-17 14:12:16 +08:00
X40-Community
0b666cce20 Error in line 24 fixed 2021-08-16 18:51:39 +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
Konstantinos Karmas
2299f90808 Add shadow behind the what's new pages
As discussed during the eCCB.
2021-08-16 16:57:57 +02:00
nani
01aa6772fa minor changes 2021-08-16 16:07:54 +05:30
Jaime van Kessel
bb2651bc0b Merge branch 'master' of https://github.com/NilsRo/Cura 2021-08-16 11:11:46 +02:00
X40-Community
f848f1c937 Code corrected, duplicate parameters deleted 2021-08-15 19:08:32 +02:00
root
2939294018 Merge branch 'master' of https://github.com/x40-Community/Cura
M192 removed from start code, parking position changed to X351 in start code
2021-08-12 22:14:37 +02:00
root
742c8fed21 M192 removed from start code, parking position changed to X351 2021-08-12 22:12:49 +02:00
NilsRo
b33f4640ad Updated Acceleration to firmware default
Updated Acceleration to firmware default to increase time estimation accuracy and match firmware default
2021-08-12 22:10:37 +02:00
x40-Community
0c762dcd81
Merge branch 'Ultimaker:master' into master 2021-08-12 22:03:58 +02:00
root
9ea6dbf668 Since I can't program a phyton, the script author doesn't have time for a revision and I haven't found any in the X40 community either, I deleted the X40Snapshot.py script. 2021-08-12 22:01:48 +02:00
Jelle Spijker
4986861727
Merge branch 'master' into libArachne_rebased 2021-08-12 18:50:29 +02:00
Jaime van Kessel
44ba8e3d1f Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 15:49:41 +02:00
Jaime van Kessel
3dec4e228b Use leftpadding instead of binding anchors outside of siblings 2021-08-12 15:48:58 +02:00