GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 09:56:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,120 Commits 290 Branches 260 Tags
Commit Graph

10120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
38e907b3ae
Add minor grid lines 
Makes it feel very professional and technical.

Contributes to issue CURA-4150.
 2017-08-17 10:32:47 +02:00
Ghostkeeper
6da5dda44f
Initialise _grid_color in __init__ 
All fields should always be defined throughout the lifetime of every object, according to code style.

Contributes to issue CURA-4150.
 2017-08-17 10:21:48 +02:00
Ghostkeeper
5e63c0df48
Add major grid cells 
This draws a grid of 1x1cm.

Contributes to issue CURA-4150.
 2017-08-17 09:56:11 +02:00
Lipu Fei
16cfb768d2 Move dont show again checkbox above the buttons 
CURA-4113

The Don't show again checkbox is on the same row with the buttons. In
some translations, the text for the checkbox is very long, which
overlaps with the button.
 2017-08-16 16:07:02 +02:00
Tim Kuipers
567363fa7c feat: skin preshrink (CURA-4103) 2017-08-16 13:51:00 +02:00
Ghostkeeper
484740f2ff
Remove grid pattern 
It'll be replaced by grid lines instead of grid surfaces.

Contributes to issue CURA-4150.
 2017-08-16 13:26:17 +02:00
Lipu Fei
b9397aaa57 Check the content of definition changes container in SliceInfo 
CURA-4107

Now we always create a definition changes container for a stack,
checking if the definition changes is empty in SliceInfo doesn't work.
It should check the content too.
 2017-08-16 12:50:09 +02:00
Lipu Fei
b74c09dec8 Merge branch '2.7' 2017-08-16 11:51:26 +02:00
Jaime van Kessel
d5daf9ff81 Merge branch 'CURA-4146' of github.com:Ultimaker/Cura 2017-08-16 11:37:09 +02:00
Ghostkeeper
abcec2157e
Use the lowest of the layer heights for initial layer height 
This was discussed with the materials team. A layer height of 0.4mm for a 0.4mm nozzle could give problems. This would be even worse with a 0.25mm nozzle.
 2017-08-16 11:29:13 +02:00
Jaime van Kessel
33f843b73a Added name of output device 
CURA-4160
 2017-08-16 10:52:13 +02:00
Lipu Fei
4ad62daf61 Generate new unique names for new machines from the project files 
CURA-4144

Generate a new name for the machine loaded from a project file instead
of using new ID as the new name.
 2017-08-16 08:30:13 +02:00
alekseisasin
6177c42f0d Merge branch 'master' of github.com:Ultimaker/cura 2017-08-15 23:52:28 +02:00
alekseisasin
dc629f7c91 Solved incorrect printer name after loading a project from file 
CURA-4144
 2017-08-15 23:48:35 +02:00
Ghostkeeper
19bab721ef
Change language metadata field to contain language codes 
According to the standard specified by GNU: https://www.gnu.org/software/gettext/manual/html_node/Header-Entry.html

Contributes to issue CURA-4113.
 2017-08-15 17:51:47 +02:00
Lipu Fei
3a22d1916f Go back to "Recommended/Custom" tabs 
CURA-4146
 2017-08-15 17:42:34 +02:00
Lipu Fei
1c747a962f Merge remote-tracking branch 'CURA-4032' 2017-08-15 16:11:44 +02:00
Ghostkeeper
ddf35826dc
Merge branch '2.7' 2017-08-15 15:32:39 +02:00
Ghostkeeper
17a615d30c
Don't translate HTML tags and variable names 
It says so in the context of the build dimensions translation. Not yet in the context of the HTML tags with <filename> and such, but it will do that for the next translation round properly.

Contributes to issue CURA-4113.
 2017-08-15 15:32:23 +02:00
Ghostkeeper
31757f4ce1
Merge branch '2.7' of https://github.com/Patola/Cura into Patola-2.7 2017-08-15 15:29:24 +02:00
alekseisasin
3116ff829c Merge pull request #2200 from fieldOfView/fix_monitoritem_size 
Adapt camera image to available space
 2017-08-15 15:04:18 +02:00
alekseisasin
7ad7fb0a3c Merge pull request #2200 from fieldOfView/fix_monitoritem_size 
Adapt camera image to available space
 2017-08-15 14:45:34 +02:00
Lipu Fei
9aa65eab44 Merge branch '2.7' 2017-08-15 14:43:36 +02:00
Lipu Fei
da8b55cf62 Make sure stacks will have non-empty definitionChanges in project loading 
CURA-4107

In old Cura, there is no definitionChanges container, so loading a
project file from an old version will result in stacks with empty
defnitionChanges. This will cause an unnecessary auto-slice problem when
we switch between the extruder tabs for the first time. This action will
trigger a piece code in MachineAction which creates a definitionChanges
container for the active stack if it is empty. This eventually triggers
a propertyChanged signal and results in an unncessary auto-slicing.
 2017-08-15 14:38:49 +02:00
Lipu Fei
3ebaacfa11 Use the extruder count in the global stack in project loading 
CURA-4167

Custom FDM printers have multiple extruder stacks by default but not all
of them may be used. The actual number of extruders depends on what's
defined in the global stack. Because in the current architecture,
single-extrusion machines don't have extruder stacks, in project
loading, the extruder count in the global stack should be used so these
cases can be handled properly.
 2017-08-15 14:19:23 +02:00
Lipu Fei
3a46a337ff In SliceInfo, use the global stack if it is a single-extrusion machine 
CURA-4167

Single extrusion machines don't have extruder stacks in the current
architecture.
 2017-08-15 14:19:23 +02:00
Lipu Fei
e67286c0d8 Do not add extruder stacks for single-extrusion machines 
CURA-4167

In the current architecture, single-extrusion machines don't have
extruder stacks.
 2017-08-15 14:19:23 +02:00
Ghostkeeper
72bf74e513
Merge branch '2.7' 2017-08-15 14:16:08 +02:00
Ghostkeeper
3110349f5e
Fix misunderstood translation 
Literally it should've been 'weergavenaam', but I'm now opting for a less literal translation because weergavenaam sounds so weird.

Contributes to issue CURA-4113.
 2017-08-15 14:15:51 +02:00
Cláudio Sampaio (Patola)
0449e4e63a Updated brazilian portuguese translation 2017-08-15 09:06:50 -03:00
Ghostkeeper
59058ad77f
Merge branch '2.7' 2017-08-15 11:24:00 +02:00
Ghostkeeper
1f778e8d2f
Fix translated replacement strings 
Bad translators! Bad! It even says so in the context!

Contributes to issue CURA-4113.
 2017-08-15 11:13:48 +02:00
Ghostkeeper
8f46733dec
Correct whitespace of fatal exception text 
It's not salient for our translation files really, since it is displayed in QML in the end which removes those. It is salient for gettext though, which gives an error when one message ends in a newline and the other doesn't.

Contributes to issue CURA-4113.
 2017-08-15 11:05:50 +02:00
Lipu Fei
026244fb53 Add comments for conflict detection 
CURA-4143
 2017-08-15 10:49:11 +02:00
Lipu Fei
9ff6ae010a Use findInstanceContainers() for definition_changes 
CURA-4167
 2017-08-15 10:44:23 +02:00
Ghostkeeper
cbc60c7689
Minor fixes for German translations 
Contributes to issue CURA-4113.
 2017-08-15 09:58:42 +02:00
Ghostkeeper
262691c1ff
Update German translations 
These are the translations from Bothof. They look mostly correct.

Contributes to issue CURA-4113.
 2017-08-15 09:56:57 +02:00
Ghostkeeper
f6c84e054b
Fix HTML tags 
They shouldn't be translated. Bad translator! BAD!

Contributes to issue CURA-4113.
 2017-08-15 09:28:42 +02:00
Ghostkeeper
5ddbbd91db
Merge branch '2.7' 2017-08-14 17:30:45 +02:00
Ghostkeeper
4f471ea1a4
Update Spanish translations 
These are the updates from Bothof. I found some older mistakes here, which I'll solve next.

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00
Ghostkeeper
1e1e6386fc
Update Finnish translation 
These are the translation files from Bothof. They are excellent as far as I could detect.

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00
Ghostkeeper
22d7312265
Minor fixes to French translations 
These must've been in there for a while...

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00
Ghostkeeper
cd8b485e98
Update French translations 
These are the new translations from Bothof. I've found some mistakes in cura.po which I'll fix in the next commit to make it clear which changes are from me.

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00
Ghostkeeper
50508baad7
Minor interpunction fixes for Italian translation 
The one with the href attribute is pretty serious.

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00
Ghostkeeper
7c86e476c8
Update Italian translations 
These look almost correct. Just one mistake with an HTML tag.

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00
Ghostkeeper
45673a3586
Fixes to Dutch translations 
Some consistency fixes and several places where they misunderstood the meaning of a text.

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00
Ghostkeeper
92f5a4c392
Update Dutch translations 
There's several mistakes in these translations. I'm fixing those in the next commit to keep it separate.

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00
Ghostkeeper
673e281e4d
Fix XML tags in Turkish translation 
Bad, BAD translator!

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00
Ghostkeeper
7682ffad08
Update Turkish translations 
Some of these are plain wrong. We'll fix those in the next commit.

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00
Ghostkeeper
fa49c7a939
Update Japanese translations 
These are the new texts for 2.7.

Contributes to issue CURA-4113.
 2017-08-14 17:30:14 +02:00