Commit graph

9774 commits

Author SHA1 Message Date
alekseisasin
e88f74fe5a Merge branch 'master' of github.com:Ultimaker/cura 2017-08-14 15:07:59 +02:00
Ghostkeeper
6349f1b5e6
Add context for 'Browse plugins' translated text
So that the translator knows what sort of text this is. It's the menu item in the application menu.

Contributes to issue CURA-4113.
2017-08-14 14:55:50 +02:00
Ghostkeeper
3316f3aa13
Add warning contexts to not translate XML tags
This went wrong a few times with previous translations. Let's hope that this prevents it from happening again.

Contributes to issue CURA-4113.
2017-08-14 14:06:20 +02:00
alekseisasin
160f21cdac Merge branch 'feature_move_printing_time' 2017-08-14 13:55:18 +02:00
Ghostkeeper
7ab6a551c1
Clarify that XML material tags don't get translated
Some of the translators got this wrong last time. Let's see how good they read this next time...

Contributes to issue CURA-4113.
2017-08-14 13:54:11 +02:00
Lipu Fei
dce575f661 Remove wall_extruder_nr from ExtruderManager.getUsedExtruderStacks
CURA-4145
2017-08-14 13:39:56 +02:00
Lipu Fei
2a695517f7 Remove wall_extruder_nr from fdmprinter
CURA-4145

 - Remove "wall_extruder_nr"
 - Remove all "limit_to_extruder" for all parent wall settings
 - Change settings that used to depend on the wall extruder to get
   value from the inner wall extruder
2017-08-14 13:21:26 +02:00
alekseisasin
a4ddd28e8f Removed gap between material length and it's measuring unit
feature_move_printing_time
2017-08-14 13:09:31 +02:00
Ghostkeeper
5866b759a8
Move material estimate properties to sidebar as well
That's where they are used after all.

Contributes to issue CURA-4149.
2017-08-14 12:06:03 +02:00
Ghostkeeper
5423228e02
Revert "Revert "Add settings for skipping some zags""
This reverts commit cc26d52af3.
2017-08-14 11:09:14 +02:00
Ghostkeeper
f1322d1656
Merge branch '2.7' 2017-08-14 11:09:03 +02:00
Ghostkeeper
cc26d52af3
Revert "Add settings for skipping some zags"
This reverts commit a0e59dd6aa.
2017-08-14 11:08:28 +02:00
Ghostkeeper
019b5852ab
Merge branch '2.7' 2017-08-14 11:02:48 +02:00
Ghostkeeper
70a0a6ef1c
Fix infill before walls check
This could be dependent on either the inner or the outer wall, depending on how many walls you have. However usually it will be the inner wall.

Contributes to issue CURA-4145.
2017-08-14 11:02:32 +02:00
Ghostkeeper
6a4329c1a0
Align progress bar and save button better
So that they don't overlap with the now larger fonts and such.

Contributes to issue CURA-4149.
2017-08-14 10:36:39 +02:00
Ghostkeeper
addf6429e5
Adjust font sizes of time/material estimates
Emphasize the time estimate.

Contributes to issue CURA-4149.
2017-08-14 09:45:12 +02:00
Ghostkeeper
bff00d41d0
Add description for print time
It looks a bit weird right below the print time but we'll discuss that later.

Contributes to issue CURA-4149.
2017-08-14 09:42:46 +02:00
Ghostkeeper
454293f926
Remove superfluous rectangles
There's only one item in there. It makes no sense to group them by rows and that only makes the bindings more complicated.

Contributes to issue CURA-4149.
2017-08-14 09:38:40 +02:00
Ghostkeeper
e514a9f474
Fix some binding loops
Contributes to issue CURA-4149.
2017-08-14 09:34:52 +02:00
Ghostkeeper
c4305c7b1e
Rearrange and align time/material estimates
They look correct now but the log says there is a binding loop in here. We'll fix that next.

Contributes to issue CURA-4149.
2017-08-14 09:23:56 +02:00
Ghostkeeper
fb3a0b701c
Remove superfluous item
This item was just transparently being the same size as its parent, no ID or nothing. We can just remove it.

Contributes to issue CURA-4149.
2017-08-14 09:12:21 +02:00
Ghostkeeper
0430a274d9
Make slicing status text smaller
Makes more room for the time/material estimates.

Contributes to issue CURA-4149.
2017-08-14 09:10:35 +02:00
Ghostkeeper
067449192a
Move time/material estimates code to sidebar
It sort of works but is aligned all wrong right now.

Contributes to issue CURA-4149.
2017-08-14 09:04:26 +02:00
Lipu Fei
bb1316fc88 Check if a material is being used based on base_file
CURA-4129
2017-08-14 08:48:07 +02:00
Ghostkeeper
d9e1154cc3
Merge branch '2.7' 2017-08-11 16:57:34 +02:00
Ghostkeeper
0b19b20c24
Fix language metadata
For some reason PoEdit seems to automatically put this back every time. Maybe it's time to switch to a different standard.

Contributes to issue CURA-4113.
2017-08-11 16:57:14 +02:00
Ghostkeeper
9243444c0e
Merge branch 'halfakop-2.7' into 2.7 2017-08-11 16:55:51 +02:00
Ghostkeeper
23aeb7efa8
Merge branch '2.7' of https://github.com/halfakop/Cura into halfakop-2.7 2017-08-11 16:55:29 +02:00
Ghostkeeper
0528a03363
Merge branch '2.7' 2017-08-11 16:23:58 +02:00
Ghostkeeper
5416504fcb
Update Korean translations
These files are directly copied from the translator. They seem to be perfect though so I don't see a reason to modify them further (apart from the fact that I don't know any Korean; the format is correct though).

Contributes to issue CURA-4113.
2017-08-11 16:19:49 +02:00
Ghostkeeper
4728f31996
Merge branch '2.7' 2017-08-11 12:38:49 +02:00
Ghostkeeper
824849a878
Make manufacturer for base fdm- definitions unknown
They are always overwritten, but if it isn't overwritten we don't know the manufacturer for the printer.

Contributes to issue CURA-4159.
2017-08-11 12:38:34 +02:00
Lipu Fei
3e870d2e40 Always update raft thickness and extra z clearance before rebuilding the build volume
CURA-4154
2017-08-11 12:27:45 +02:00
Ghostkeeper
76e0156076
Merge branch '2.7' 2017-08-11 11:18:15 +02:00
Ghostkeeper
b03847447f
Take manufacturer from XML profile if available
Otherwise we fall back to the manufacturer in the machine definition. If that fails too, we fall back to Unknown (rather than an empty string).

Contributes to issue CURA-4157.
2017-08-11 11:13:23 +02:00
Ghostkeeper
e1266ceb1f Change Ultimaker manufacturer to Ultimaker B.V.
The material profiles are sent to UM3 with a manufacturer that's obtained from the printer definition rather than the material definition. The printer definition was 'Ultimaker' rather than 'Ultimaker B.V.' and the printer checked against this.

Contributes to issue CURA-4159.
2017-08-11 10:24:13 +02:00
Lipu Fei
def2e1f203 Merge branch '2.7' 2017-08-10 12:24:51 +02:00
Lipu Fei
4bac499c22 Use QualityManager._getFilteredContainersForStack() to get qualities
CURA-4151

The quality searching code in _configureProfile() for importing quality
profiles doesn't take into account base materials. Use the function in
QualityManager to solve this problem.
2017-08-10 12:14:43 +02:00
Ruslan Popov
d349854bdd Update russian translation. 2017-08-09 19:28:25 +03:00
Lipu Fei
0a76e5c38f Merge branch '2.7' 2017-08-09 16:59:56 +02:00
Lipu Fei
a49c956cfa Temporary work around for "not overriden" limit to extruder features
CURA-4145

When features with limit to extruder set to "not overriden" and its
value is retrieved with "extruderValue()", because the extruder number
is "-1", extruderValue() falls back to the global stack. As a result,
values can be incorrect. This workaround using the variants temporarily
solves the problem for outer and inner wall line widths.
2017-08-09 16:57:21 +02:00
Lipu Fei
1aba451149 Fix value for outer wall_line_width
CURA-4145
2017-08-09 13:52:05 +02:00
Lipu Fei
66b26bafd4 Show quality name in project loading summary
CURA-4142

In case the quality changes container is not there, show the quality
name of the quality profile.
2017-08-09 13:27:00 +02:00
Lipu Fei
98b72fb971 Merge branch '2.7' 2017-08-09 13:16:43 +02:00
Lipu Fei
ccabbd8ca0 Mark definition changes container found instead of conflict
CURA-4143

Reverts 65554b60e1
2017-08-09 13:12:06 +02:00
Lipu Fei
65554b60e1 Mark definition_changes conflict if it is not found
CURA-4143
2017-08-09 13:06:18 +02:00
Lipu Fei
6fd3963e8f Fix material searching in isContainerUsed()
CURA-4129

Searching for used materials should also take into account the material
container ID.
2017-08-09 09:47:36 +02:00
Ghostkeeper
c0d96a1d79
Remove heat/cool speeds that are equal to default
The default value for both of these settings in fdmprinter is 2.
2017-08-09 09:46:22 +02:00
Lipu Fei
e414621250 Fix code style 2017-08-09 09:27:42 +02:00
Lipu Fei
ab3d8349b6 Also skip empty containers when getting layer height for a quality profile
CURA-4133

On some machines such as UM2, there is no material. Getting the layer
height in this case will result back to the global stack itself, which
is the layer height of the current setting. This is a problem for
"Normal" (or "Fine") quality because it uses the machine's default layer
height.
2017-08-09 09:24:04 +02:00