ChrisTerBeke
a7f28e688e
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-09-22 11:31:56 +02:00
ChrisTerBeke
781f2d56c8
CURA-4182 code improvements for slider property calcs 2
2017-09-22 11:31:24 +02:00
Ghostkeeper
3d921c1b4e
Add type hinting of return values
...
I thought this might help find some bugs there.
Contributes to issue CURA-4357.
2017-09-22 11:30:35 +02:00
Diego Prado Gesto
4d113a746c
Merge changes
2017-09-22 11:29:29 +02:00
ChrisTerBeke
f016e5346a
CURA-4182 code improvements for slider property calcs
2017-09-22 11:29:18 +02:00
Diego Prado Gesto
37da9f654b
Reverted changes done that makes sliders fail - CURA-4327
2017-09-22 11:20:57 +02:00
Ghostkeeper
1596437bbd
getActiveGlobalAndContainerStacks may return None
...
Change the code to reflect on this. Mostly this is to fix up the type warnings, because we were already checking for there being no global container stack but that was not thread-safe.
Contributes to issue CURA-4357.
2017-09-22 11:17:42 +02:00
ChrisTerBeke
ae6b1a9f15
CURA-4182 better variable names
2017-09-22 11:14:13 +02:00
Ghostkeeper
88155d35e8
Correct signature of activeMachine
...
Because there isn't always a global container stack.
Contributes to issue CURA-4357.
2017-09-22 11:11:34 +02:00
ChrisTerBeke
7f909df84a
CURA-4182 refactor quality slider to use model for updating
2017-09-22 11:04:46 +02:00
Ghostkeeper
12ccc8abe0
Merge branch '3.0'
2017-09-22 09:55:05 +02:00
ChrisTerBeke
ab8bcc4ae3
small code fixes
2017-09-22 09:51:59 +02:00
ChrisTerBeke
21ea99d9f2
CURA-4269 small code improvement for z-offset in project loading
2017-09-22 09:34:24 +02:00
Ghostkeeper
1bb11b521e
Merge branch 'master' of github.com:Ultimaker/Cura
2017-09-22 09:32:03 +02:00
ChrisTerBeke
e7e24caf97
CURA-4269 small code improvement for z-offset in project loading
2017-09-22 09:31:11 +02:00
Mark
d2de039371
dont disappear when click on splashscreen
...
CURA-4343
2017-09-22 09:11:35 +02:00
Aleksei Sasin
879b3df816
On Windows platform the qualitys slider is properly aligned CURA-4182
2017-09-21 21:20:54 +02:00
alekseisasin
5832169db0
Merge branch '3.0' of github.com:Ultimaker/cura into 3.0
2017-09-21 17:38:25 +02:00
alekseisasin
7c462f5703
After loading a model from a project Y position is ignored
...
CURA-4269
2017-09-21 17:36:12 +02:00
ChrisTerBeke
fd41f3d17f
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-09-21 17:35:19 +02:00
ChrisTerBeke
ecafa24888
code cleanup
2017-09-21 17:35:12 +02:00
Diego Prado Gesto
e73e218c4e
Detecting whether the profile is created for multiple extrusion printers or not - CURA-4327
2017-09-21 16:28:50 +02:00
alekseisasin
9ce7658c56
Merge branch 'master' of github.com:Ultimaker/cura
2017-09-21 16:10:41 +02:00
Mark
f7d14c5b7f
dont disappear when click on splashscreen
...
CURA-4343
2017-09-21 16:08:46 +02:00
ChrisTerBeke
a74a6a59fc
CURA-4182 fix merge conflicts with 3.0 branch
2017-09-21 15:33:00 +02:00
alekseisasin
bd6bb872b7
Changed Quality slider
...
CURA-4182
2017-09-21 15:24:40 +02:00
Jaime van Kessel
c6e589e7d9
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-21 15:19:35 +02:00
Jaime van Kessel
78987ba666
When tool icon can not be found in theme, try to find it in the plugin folder
...
CURA-4345
2017-09-21 15:19:00 +02:00
ChrisTerBeke
ddfb5f0b48
fix conflict after revert
2017-09-21 15:09:04 +02:00
ChrisTerBeke
cdc1b9ba66
CURA-4303 infill slider icon color, border, alignment
2017-09-21 14:28:22 +02:00
Ghostkeeper
adb41a19b7
Fix typos in description of Zig Zaggify Infill
2017-09-21 12:59:46 +02:00
Ghostkeeper
382fcdb4fe
Better title for export succeeded message
2017-09-21 12:54:04 +02:00
Ghostkeeper
11060e010b
Clarify message title
...
The title should add something to the message, such as a summary.
2017-09-21 12:52:07 +02:00
Diego Prado Gesto
4d99fb067f
After disconnect a signal, now is reconnected the correct one - CURA-4327
2017-09-20 17:19:44 +02:00
Jaime van Kessel
b434fdb875
Layerview scrollbar now has fixed size.
...
Instead of using the size of the other items. This worked when the bar was still part of the larger view, but since it's now
below the item it broke it.
CURA-4342
2017-09-20 13:35:13 +02:00
Jaime van Kessel
ade1c039ea
Print information not being set won't cause crash anymore
2017-09-20 11:03:20 +02:00
Jaime van Kessel
3cdf3f6097
Merge branch '3.0' of github.com:Ultimaker/Cura
2017-09-20 10:43:06 +02:00
Jaime van Kessel
ddacdf523e
Fixed some small issues when certain qml objects were null
...
CURA-4349
2017-09-20 09:48:00 +02:00
Diego Prado Gesto
ebd180bfdc
Custom profiles are now shown in the preference panel - CURA-4327
2017-09-20 08:50:58 +02:00
Jaime van Kessel
5d4b23e72a
Merge branch 'feature_home_camera' of https://github.com/fieldOfView/Cura
2017-09-19 16:47:40 +02:00
Jaime van Kessel
c4f5c970e5
Removed uneeded logging
2017-09-19 16:39:51 +02:00
Jaime van Kessel
e5eebd7737
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-19 14:02:38 +02:00
Jaime van Kessel
e5f3d45385
When project loading needs to create a new machine, also create a new definition changes
...
CURA-4345
2017-09-19 14:02:01 +02:00
Ghostkeeper
8a1b5d3cda
Update translation templates again
...
Last minute changes...
Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
d47bc710bf
Last minute string changes
...
Some new message that still needed to be in...
Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
19222a3221
Update translation templates for 3.0
...
These are the files that should be translated by our translators for the 3.0 release.
Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
f231c73072
Add translation texts for future features
...
These texts are meant to be included in the final release, but the features aren't ready yet.
Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
b94bcdfa91
Remove duplicate entry
...
This happens because the last bits are obtained separately from plug-in JSON files that are manually tacked on the end by a script. The script doesn't check for duplicates.
Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
8cfe65787f
Update translation templates for 3.0 release
...
These are generated by calling 'make extract-messages' and then modifying the headers a bit.
Contributes to issue CURA-4341.
2017-09-19 13:36:50 +02:00
Mark
03a159e423
Add some margin for the helper boxes, not perfect yet
...
CURA-4303
2017-09-19 11:36:05 +02:00
