Ghostkeeper
3fa281084f
Merge branch '3.0'
2017-09-28 09:17:55 +02:00
Ghostkeeper
2884e1e5b5
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-28 09:17:40 +02:00
ChrisTerBeke
f2e362838e
Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment
2017-09-28 09:16:52 +02:00
fieldOfView
0b03681890
Hide gradual infill checkbox if the gradual infill steps setting is disabled
2017-09-27 22:28:20 +02:00
Ghostkeeper
c4fc4a7198
Add better descriptions for abbreviated units
...
This should help the translators next time to find better translations.
Contributes to issue CURA-4341.
2017-09-27 17:34:12 +02:00
Ghostkeeper
e56a6214d2
Fix grammar mistake
...
These are two sentences.
Contributes to issue CURA-4341.
2017-09-27 17:33:17 +02:00
Ghostkeeper
d999d1c7f2
Remove extra space
...
Just a typo.
Contributes to issue CURA-4341.
2017-09-27 17:32:47 +02:00
Ghostkeeper
df14ea2b1a
Proper capitalisation of 'OK'
...
This is consistent with the rest.
Contributes to issue CURA-4341.
2017-09-27 17:32:24 +02:00
Ghostkeeper
2715ef604d
Use lower case text for translation, then transform to upper case
...
The formatting is done in QML, regardless of how the data looks.
Contributes to issue CURA-4341.
2017-09-27 17:31:26 +02:00
Ghostkeeper
94846d0faf
Add missing word
...
I'm guessing it was 'This'. That must've accidentally gotten selected when working with it.
Contributes to issue CURA-4341.
2017-09-27 17:30:29 +02:00
Ghostkeeper
68b4dfd3c3
Fix spelling mistake
...
Contributes to issue CURA-4341.
2017-09-27 17:29:30 +02:00
Ghostkeeper
fcc914cf0d
Make material colour indication a circle instead of square
...
The rest of them are circles. This one should be one too.
2017-09-27 17:28:32 +02:00
Ghostkeeper
33fdca4a6b
Fix mistakes in translations from Bothof
...
What do we pay these guys for?
Contributes to issue CURA-4341.
2017-09-27 17:27:47 +02:00
Ghostkeeper
609187a4ce
Update translations from Bothof
...
These are the new translations we got from Bothof for German, Spanish, Finnish, French, Italian, Dutch, Turkish and Simplified Chinese.
Contributes to issue CURA-4341.
2017-09-27 17:26:29 +02:00
Diego Prado Gesto
dcf07e4f35
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-09-27 17:25:22 +02:00
Diego Prado Gesto
0731f942ae
Merge branch 'fix_infill_slider_rounding' into 3.0
2017-09-27 17:24:41 +02:00
Diego Prado Gesto
f8722a2d4b
Fixed code style in the function - CURA-4352
2017-09-27 17:21:43 +02:00
fieldOfView
47ad68bda7
Show ticks when they are not available
2017-09-27 17:20:55 +02:00
fieldOfView
87c7373cb0
Fix visibility when there are ticks but no available ticks
2017-09-27 17:14:41 +02:00
ChrisTerBeke
3ddb45160d
Update infill slider icon border color to not look like a checkbox, fixes #2487
2017-09-27 16:59:03 +02:00
ChrisTerBeke
e948f54ada
Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment
2017-09-27 16:37:40 +02:00
Jaime van Kessel
fa66f2c117
Merge pull request #2481 from krisrok/master
...
refine abort sequence
2017-09-27 16:18:13 +02:00
Diego Prado Gesto
c03d54f598
Merge branch '3.0' into fix_infill_slider_rounding
2017-09-27 16:11:10 +02:00
Diego Prado Gesto
4b3e83f876
Not allowing to modify the number of extruders in multiextruder printers, except Custom FDM printers - CURA-4359
2017-09-27 15:55:34 +02:00
fieldOfView
3be8f45636
Move the quality indicator to the center when there is only one quality available
...
Fixes #2485
CURA-4383
2017-09-27 15:18:53 +02:00
ChrisTerBeke
83e612c1c1
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-09-27 14:51:34 +02:00
ChrisTerBeke
c1cfb76f8a
CURA-4380 code improvements for build plate adhesion label
2017-09-27 14:51:20 +02:00
ChrisTerBeke
a8ce7185cc
CURA-4380 gradual infill checkbox closer to slider to indicate category
2017-09-27 14:35:13 +02:00
ChrisTerBeke
a337fd4e9c
CURA-4380 quality slider text disabled color when slider cannot be used
2017-09-27 14:32:05 +02:00
Mark
500989e36d
Re-add the margin between infill and support checkbox
...
CURA-4380
2017-09-27 14:28:31 +02:00
Mark
aa93c67a94
Re-add the margin between infill and support checkbox
...
CURA-4380
2017-09-27 14:27:04 +02:00
Ghostkeeper
78a6e686c1
Merge branch '3.0'
2017-09-27 14:23:20 +02:00
Ghostkeeper
d417bfc7cc
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-27 14:20:38 +02:00
Ghostkeeper
d8c1546be3
Revert making the camera image black while it doesn't react
...
This was giving segfaults sometimes on my computer. I suspect it's because the camera image could have been written to by both this Python code and by the camera itself, giving it a sort of data race or maybe that the image was discarded by the camera while it's being written to by Python. In any case, this should make it more stable.
Contributes to issue CURA-4376.
2017-09-27 14:20:20 +02:00
ChrisTerBeke
f5310ad2ff
Revert "For discard changed window retrieve data from setting "value" property instead of "resolve""
...
This reverts commit a2e0f4d64fcab35e0eeada795a20b725480013eb.
2017-09-27 14:16:56 +02:00
ChrisTerBeke
f8e8dcacdf
CURA-4381 use modulus to set infill slider step size and tick show
2017-09-27 13:55:57 +02:00
ChrisTerBeke
aed5e631dc
CURA-4352 fix passing int values as float when changing slider value
2017-09-27 13:13:55 +02:00
Jaime van Kessel
035a851eb0
Merge pull request #2480 from fieldOfView/fix_disable_solid_view
...
Make Solid View a required plugin
2017-09-27 13:03:51 +02:00
Jaime van Kessel
e87f30cf09
Merge branch '3.0' of github.com:Ultimaker/Cura
2017-09-27 13:02:21 +02:00
Jaime van Kessel
2dee054003
Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0
2017-09-27 12:57:42 +02:00
fieldOfView
0308d3d9d0
Fix margin between tools and extruders
2017-09-27 11:46:42 +02:00
fieldOfView
3d08ec6bac
Fix Simple mode sliders for Hi DPI
2017-09-27 11:43:57 +02:00
fieldOfView
72bf073101
Fix LayerView layer box width
2017-09-27 11:43:14 +02:00
alekseisasin
a2e0f4d64f
For discard changed window retrieve data from setting "value" property instead of "resolve"
...
CURA-4358
2017-09-27 11:27:29 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect
...
CURA-4376
2017-09-27 10:29:48 +02:00
Ghostkeeper
823807144f
Fix spelling mistake
...
Found by Anraf1000. Thanks.
2017-09-27 10:29:40 +02:00
Jaime van Kessel
11484bf6ad
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-27 09:37:56 +02:00
Jaime van Kessel
cd11c6832d
Added user agent header to firmware update
2017-09-27 09:37:38 +02:00
Diego Prado Gesto
568535e3e2
Adapting the code in case a multiextruder printer will use only one extruder - CURA-4359
2017-09-26 17:49:53 +02:00
fieldOfView
1479322fbe
Add screenScaleFactor to About window
2017-09-26 12:24:59 +02:00
