ChrisTerBeke
0b5fac28b9
fix merge conflicts
2017-10-10 09:43:16 +02:00
ChrisTerBeke
284e4d47b8
Merge branch '3.0' into layerview-slider-refactor
2017-10-10 09:30:43 +02:00
ChrisTerBeke
91e8e5812b
add back missing function
2017-10-10 09:24:48 +02:00
ChrisTerBeke
641b3c21f7
fix merge conflicts
2017-10-10 09:21:31 +02:00
A.Sasin
d1bee922ab
Merge branch '3.0' of github.com:Ultimaker/cura into 3.0
2017-10-10 09:17:56 +02:00
ChrisTerBeke
4c072d5070
Merge branch '3.0' into layerview-slider-refactor
2017-10-10 09:17:07 +02:00
A.Sasin
99d9961297
Cura crashed because of RuntimeError after switching between monitor and prepare view
...
CURA-4376
2017-10-10 09:16:35 +02:00
Lipu Fei
9996c829d8
Only schedule re-slice when there is none in progress
...
CURA-4427
After the stack error check is done, only schedule a re-slice when there
is none in progress and a re-slice is needed.
2017-10-10 08:50:22 +02:00
Lipu Fei
b14ef41056
Increase the minimumHeight of the workspace summary dialog
...
CURA-4428
2017-10-10 08:30:18 +02:00
Lipu Fei
60726ce179
Increase minimumHeight of the Print Address dialog
...
CURA-4428
2017-10-10 08:24:47 +02:00
Lipu Fei
7ca2ae9771
Adjust alignments for ComboBoxes in MachineSettings dialog
...
CURA-4428
2017-10-10 08:20:39 +02:00
Lipu Fei
7b6faf0030
Adjust column width for Materials "Print Settings" page
...
CURA-4428
2017-10-10 08:03:08 +02:00
ChrisTerBeke
e7e5e86611
Finish layer slider label positions and cursor manipulation - CURA-4412
2017-10-09 17:00:03 +02:00
Simon Edwards
ebb8437bff
Avoid using fractional pixel sizes and positions. It causes poor text rendering on Windows (and may be others)
2017-10-09 16:39:57 +02:00
Simon Edwards
0191215215
Let the printer state text wrap too
...
CL-521
2017-10-09 16:39:57 +02:00
Diego Prado Gesto
1d70426224
onVisibilityChanged function removed because it's never called - CURA-4405
2017-10-09 16:36:48 +02:00
ChrisTerBeke
30a14dd7d6
Merge branch '3.0' into layerview-slider-refactor
2017-10-09 16:14:17 +02:00
ChrisTerBeke
f8a1187a8c
Re-sending after cancelling print job now really works - CURA-4398
2017-10-09 16:14:02 +02:00
ChrisTerBeke
52eac6635f
Improve layer slider label positions - CURA-4412
2017-10-09 16:11:50 +02:00
Diego Prado Gesto
cf1f0ffaf1
Adding info to be sent as JSON and send when button is pressed - CURA-4195
2017-10-09 16:05:37 +02:00
Lipu Fei
8a25605413
Fix lock issue with workspace dialog
...
CURA-4405
- Add try-except around lock release
- Fix closing the dialog with ESC
2017-10-09 15:17:56 +02:00
ChrisTerBeke
84ec494023
Merge branch '3.0' into layerview-slider-refactor
2017-10-09 14:59:00 +02:00
ChrisTerBeke
f8122320d4
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-10-09 14:49:48 +02:00
ChrisTerBeke
cbd0bcd1b5
Manually trigger upload finished callback after request finished - CURA-4398
2017-10-09 14:49:18 +02:00
Lipu Fei
1c5d352b88
Fix the case when active_extruder is None
2017-10-09 14:35:30 +02:00
A.Sasin
14936f7999
Merge branch '3.0' of github.com:Ultimaker/cura into 3.0
2017-10-09 14:24:43 +02:00
A.Sasin
97c107d011
Change log update for version 3.0.0 Beta
2017-10-09 14:23:52 +02:00
ChrisTerBeke
5740af04bb
continue layer slider labels - CURA-4412
2017-10-09 14:19:21 +02:00
Lipu Fei
2b06d04327
Fix container indices in upgrade script from 2.5 to 2.6
2017-10-09 13:54:17 +02:00
Lipu Fei
7d8fa71c4c
Exclude other UM2 machine during quality profile upgrade
...
CURA-4420
2017-10-09 13:04:55 +02:00
Lipu Fei
f10397acf9
Always set finish flag when finalizing post_reply
...
CURA-4398
2017-10-09 12:38:18 +02:00
Lipu Fei
852e59f310
Fix retrieving default values with "extruderValue()"
...
CURA-4358
Use evaluation context to override the default extruderValue()
function with getDefaultExtruderValue() so it can get the correct
default values from each extruder.
2017-10-09 12:24:08 +02:00
Mark
2e957069a8
first hide the dialog then release the lock
...
CURA-4405
2017-10-09 11:58:58 +02:00
Mark
daad5a3a97
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-10-09 11:58:13 +02:00
Mark
59fbbef43e
first hide the dialog then release the lock
...
CURA-4405
2017-10-09 11:58:00 +02:00
Diego Prado Gesto
e2edbd11b6
Changed Crash Report layout and new information included - CURA-4195
2017-10-09 11:50:30 +02:00
ChrisTerBeke
ee0dabd837
Merge branch '3.0' into layerview-slider-refactor
2017-10-09 11:33:22 +02:00
ChrisTerBeke
6c51034e5f
Fix sending another file after aborting an upload - CURA-4398
2017-10-09 11:31:32 +02:00
ChrisTerBeke
48e938675f
start adding back slider labels - CURA-4412
2017-10-09 11:26:26 +02:00
A.Sasin
c0da9cc072
Merge branch 'master' of github.com:Ultimaker/cura
2017-10-06 18:57:29 +02:00
A.Sasin
2288997697
Fixed: while project loading pass call upgrade plugin for preferences
...
CURA-4344
2017-10-06 18:56:17 +02:00
Ghostkeeper
65b92ca0e7
Merge branch '3.0'
2017-10-06 17:35:43 +02:00
Ghostkeeper
d3b1563369
Add out-of-band translations
...
These strings were added too late, after the string freeze. Now I have to figure out the translations from a secondary source...
Contributes to issue CURA-4341.
2017-10-06 17:35:12 +02:00
Ghostkeeper
e5df65ed88
Update Polish translations
...
I removed a double space somewhere but otherwise it was excellent.
Contributes to issue CURA-4341.
2017-10-06 17:32:40 +02:00
ChrisTerBeke
d435541908
create separate layerslider component, fix updating when changing view
2017-10-06 17:29:37 +02:00
Ghostkeeper
23042a458b
Add out-of-band translations for too late strings
...
These strings were added after the string freeze. We obtained them from a different translator.
Contributes to issue CURA-4341.
2017-10-06 17:23:57 +02:00
Ghostkeeper
a0f7800a0d
Merge branch '3.0'
2017-10-06 17:17:30 +02:00
Ghostkeeper
47582195f1
Fix headers of Portuguese translation files
...
The language and country codes are not in the file format specification.
Contributes to issue CURA-4341.
2017-10-06 17:13:37 +02:00
Ghostkeeper
009f41e2ed
Merge branch '3.0' of https://github.com/Patola/Cura into Patola-3.0
2017-10-06 17:11:58 +02:00
Ghostkeeper
bc419370d0
Merge branch '3.0'
2017-10-06 16:02:13 +02:00
