GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-13 04:51:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,338 Commits 295 Branches 268 Tags
Commit Graph

28338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
d186912596
Correcter font sizes according to design 
Contributes to issue CURA-8561.
 2021-11-09 17:45:44 +01:00
Ghostkeeper
d526e3be8c
Easier layout shifting when icons are invisible 
The Row element automatically hides them and removes any spacing if they are invisible.

Contributes to issue CURA-8561.
 2021-11-09 17:40:10 +01:00
Ghostkeeper
f498952830
Give text colours to text 
This way it's still visible in the dark theme, rather than black on black.

Contributes to issue CURA-8561.
 2021-11-09 17:32:22 +01:00
Ghostkeeper
4119cf4209
Fix layout of author button 
Bold, correct position and add the icon.

Contributes to issue CURA-8561.
 2021-11-09 17:30:52 +01:00
Ghostkeeper
234475547e
Use correct font for all text elements 
Contributes to issue CURA-8561.
 2021-11-09 17:25:02 +01:00
Ghostkeeper
c56240f276
Use correct icon for external links 
Contributes to issue CURA-8561.
 2021-11-09 17:22:01 +01:00
Ghostkeeper
5a698bd91f
Truncate double ellipsis where possible 
I couldn't get it to truncate it if the double ellipsis is the only text on the line, like if the description contains a white line and more than 2 lines in total. It then looks like a double ellipsis (6 dots instead of 3). Doesn't look the worst, but a bit strange, but it's really difficult to fix.

Contributes to issue CURA-8561.
 2021-11-09 17:20:37 +01:00
Jaime van Kessel
8998738237
Merge pull request #10774 from luzpaz/typos 
Fix typos
 2021-11-09 17:04:54 +01:00
Ghostkeeper
7b7cb43b02
Improved elision 
It seems to correctly place the elide character now. One more detail that's incorrect is that it shows two elision characters if it's eliding due to maximum line count. I'll see what I can do...

Contributes to issue CURA-8561.
 2021-11-09 16:58:30 +01:00
luz paz
61d7895588 Fix typos 
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
 2021-11-09 10:38:01 -05:00
Ghostkeeper
57093f0ef6
Hide Read More button if not truncated 
There would be nothing to read.

Contributes to issue CURA-8561.
 2021-11-09 16:34:21 +01:00
Ghostkeeper
c8741898bf
Decent attempt at inlining Read More button 
Not perfect yet. The elide is missing, for one.

Contributes to issue CURA-8561.
 2021-11-09 16:28:12 +01:00
Ghostkeeper
468c2b89e1
Use wrapping for package description 
Contributes to issue CURA-8561.
 2021-11-09 16:09:58 +01:00
Ghostkeeper
8c086b9fd7
Align everything to top 
This seems to be the alignment in the design. Also gets rid of binding loops because we automatically adjust the height so you can't align to the centre or the bottom then.

Contributes to issue CURA-8561.
 2021-11-09 15:58:37 +01:00
Ghostkeeper
abe8347523
Fix QML warning about not having parents 
It seems that the ListView doesn't always set the parent element correctly if it's not yet in view. This is a workaround that seems to work fine to remove the QML warnings about parent not being defined.

Contributes to issue CURA-8561.
 2021-11-09 15:54:42 +01:00
Ghostkeeper
2ce31d0e71
Add placeholder image 
The 'CicleOutline' image doesn't exist. There is no design for this image so I'm adding the placeholder that the previous Marketplace had.

Contributes to issue CURA-8561.
 2021-11-09 15:51:34 +01:00
Ghostkeeper
4014562cdc
Use rows and columns instead of anchors for layout 
This is in my opinion much easier to follow and maintain.

It also fixes the layout. The original code had a lot of overlapping parts.

Contributes to issue CURA-8561.
 2021-11-09 15:47:09 +01:00
Jaime van Kessel
b1f797f6cb Merge branch 'master' of github.com:Ultimaker/Cura 2021-11-09 15:10:39 +01:00
Jaime van Kessel
c1a839ccaa Also ensure that extruder settings are correct when discarding unsaved changes 
CURA-8584
 2021-11-09 15:10:09 +01:00
Ghostkeeper
e0508b0f4f
Correct size and margins for package icon 
Contributes to issue CURA-8561.
 2021-11-09 15:08:33 +01:00
Ghostkeeper
ca942a15e8
Don't use infinite lifetimes lightly 
This is very annoying if switching profiles. This is not a critical message. The message should disappear after the default amount of time.

Discovered while working on CURA-8584.
 2021-11-09 14:45:40 +01:00
VOLUMIC
661e44498a
Add new VOLUMIC printers model 
fixed version number
 2021-11-09 13:53:23 +01:00
VOLUMIC
a350354b21
Add new VOLUMIC printers model 2021-11-09 13:44:02 +01:00
VOLUMIC
0f31efc8c3
Add new VOLUMIC printers model 2021-11-09 13:43:12 +01:00
VOLUMIC
bd70b7e294
Add new VOLUMIC printers model 2021-11-09 13:42:49 +01:00
VOLUMIC
150ae506c8
Add new VOLUMIC printers model 2021-11-09 13:42:17 +01:00
p.kuiper
de04c7d79b PP-60: Major clean up. Moved all common (libArachne + 4.12) settings to ultimaker.def.json from which all Ultimaker machines inherit their values 2021-11-09 12:13:02 +01:00
p.kuiper
b477a9bf2a PP-60: Iteration 3 settings + 4.12 settings changes applied to the S5 machine 2021-11-09 11:25:32 +01:00
p.kuiper
5e165cd990 PP-60: Iteration 3 settings + 4.12 settings changes applied to the S3 machine 2021-11-09 11:21:23 +01:00
p.kuiper
2db0a90ce4 PP-60: Iteration 3 settings + 4.12 settings changes applied to the UM Original machine 2021-11-09 11:15:44 +01:00
p.kuiper
1eac809cda PP-60: Iteration 3 settings changes applied to the UM3 machines 2021-11-09 11:11:49 +01:00
p.kuiper
5be721c4f5 PP-60: top-bottom pattern "lines" is the default in fdm printers. Better to remove the override. 2021-11-09 11:07:31 +01:00
p.kuiper
1585c98e05 PP-60: Update UM2 machines to reflect the iteration 3 setting changes 2021-11-09 11:04:25 +01:00
p.kuiper
d207d871a4 PP-60: Increasing the warning level for the Middle line Threshold otherwise the default settings for Ultimaker machines would show a warning. 2021-11-09 10:59:19 +01:00
p.kuiper
9c10904020 PP-60: Increasing the warning level for the Maximum Extrusion Area Deviation otherwise the default settings for Ultimaker machines would show a warning. 2021-11-09 10:56:05 +01:00
Jelle Spijker
40be115b17
Use Spanish translation for lightning infill 
Contributes to CURA-8638
4.12.0 		2021-11-09 10:53:07 +01:00
fvrmr
75a77bf34f Update change log 
Fixed some typo's
 2021-11-09 10:31:21 +01:00
fvrmr
ad5937ee6a Updated whats new pages 
Updated whats new pages and images
Updated the change log
 2021-11-09 10:18:00 +01:00
Jaime van Kessel
73ca50d958 Handle exception when adhesion extruder could not be found 
This should be pretty rare; the crash would only happen due to a race condition

cura-8584
 2021-11-09 10:17:32 +01:00
Remco Burema
51c5572f0f
Add draw-range behaviour to legacy-mode shaders. 2021-11-08 21:39:12 +01:00
Remco Burema
f486177465
Remove dead (shader) code. 
These shader (files) are now only used for compatability mode. The 'modern' code is found in the '...3d.shader' versions of these files.
 2021-11-08 21:37:57 +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
Ghostkeeper
db637802bd
First translate, then process replacement keys 
If we first process the replacement keys, the replaced string can't be found in the translation database, so you don't get a translation of the phrase 'Finishes x at y'.

Fixes #10718.
 2021-11-08 13:49:54 +01:00
Jelle Spijker
1b503f003e
Disabled Čeština for 4.12 
Contributes to CURA-8638
 2021-11-08 13:48:11 +01:00
Jelle Spijker
fb3706d501
Merge pull request #10738 from Patola/4.12 
Updated pt_BR strings for Cura 4.12
 2021-11-08 13:19:36 +01:00
Jelle Spijker
8cae8b128b
Merge branch 'zh_tw_4.12' into 4.12 2021-11-08 13:14:22 +01:00
Jelle Spijker
e88a086a5b
Merge branch 'smartling_4.12' into 4.12 2021-11-08 13:14:04 +01:00
Sekisback
260cafab0f
Update fdmprinter.def.json.po 
some German translation fixes

(cherry picked from commit d725fa880647336a2835e3f495196dc43ef25651)
 2021-11-08 13:11:56 +01:00
Sekisback
3d1bc36f3d
Update fdmprinter.def.json.po 
mistyping fixed

(cherry picked from commit 12c5a29d3ec7c00099608720f111d896585ef5f5)
 2021-11-08 13:09:59 +01:00
Jelle Spijker
48d8841d5f
Updated translations for 4.12 
From Smartling

- Chinese Simplified
- Dutch
- French
- German
- Italian
- Japanese
- Korean
- Portuguese
- Rusian
- Spanish
- Turkish

Contributes to CURA-8638
 2021-11-08 13:04:13 +01:00