ChrisTerBeke
833593bfa2
Merge branch 'master' into feature_sidebar_plugin_target
2017-12-05 14:14:57 +01:00
ChrisTerBeke
9a538b330a
Ignore new plugins
2017-12-05 14:14:52 +01:00
ChrisTerBeke
51405ca0f7
tmp
2017-12-05 13:29:04 +01:00
ChrisTerBeke
a6a3602840
View default view selected in view menu
2017-12-05 12:27:13 +01:00
ChrisTerBeke
030dc74f3f
Fix now showing any sidebar when in monitor mode
2017-12-05 12:19:00 +01:00
ChrisTerBeke
e33288b7c8
Move sidebar target for plugins to only middle section
2017-12-05 10:56:59 +01:00
Lipu Fei
0ac7b77572
Merge pull request #2908 from Ultimaker/thopiekar-extruder-row-comment
...
SidebarHeader: Adding missing comment about "extruder row"
2017-12-05 10:56:10 +01:00
Thomas Karl Pietrowski
6f8ed09d3d
SidebarHeader: Adding missing comment about "extruder row"
...
Just read the code and noticed that.
2017-12-05 00:14:19 +01:00
ChrisTerBeke
5673a834bc
Fix showing default sidebar, cleanup needed
2017-12-04 19:48:42 +01:00
ChrisTerBeke
caf56587fe
Implement switching sidebar views
2017-12-04 19:37:03 +01:00
Ghostkeeper
9e62b6e14b
Merge branch '3.1'
2017-12-04 17:13:52 +01:00
Ghostkeeper
a3818be46f
Reactivate layer view translation
...
The layer view mode was renamed back from Simulation View to Layer View after the string freeze. Luckily we still have this old translation.
Contributes to issue CURA-4601.
2017-12-04 17:05:38 +01:00
ChrisTerBeke
3c863fc388
Get default settings view to work as sidebar component
2017-12-04 16:28:35 +01:00
Cláudio Sampaio (Patola)
6315cbae4e
updated brazilian portuguese translations
2017-12-04 12:48:19 -02:00
ChrisTerBeke
5eeb98bbcf
Move sidebar controller init
2017-12-04 13:20:16 +01:00
Ghostkeeper
cd2c4361b8
Merge branch 'master' of github.com:Ultimaker/Cura
2017-12-04 12:55:58 +01:00
ChrisTerBeke
e8f1073af8
Add menu seperator
2017-12-04 12:48:07 +01:00
ChrisTerBeke
4ef39ca313
Add sidebar views menu item and expose model to QML
2017-12-04 12:47:08 +01:00
ChrisTerBeke
713055e320
Get meta data per sidebar view in sidebar view model
2017-12-04 12:37:29 +01:00
ChrisTerBeke
f2b4cbe182
Register sidebar controller in application, start with default sidebar view
2017-12-04 11:37:49 +01:00
Ghostkeeper
b453e0a4e7
Allow minimum layer time to be higher than the fan speed min/max threshold
...
Previously that wasn't possible because the division that calculated the slope of the fan speed ramping up towards the minimum layer time couldn't deal with negative values. Now it deals with that properly and in the limit the regular fan speed will be used.
Fixes #2328 and CURA-4272.
2017-12-04 11:27:37 +01:00
ChrisTerBeke
db2c3525c4
Sidebar view and controller scaffolding
2017-12-04 11:06:10 +01:00
ChrisTerBeke
1934bdfb99
Add sidebar view object
2017-12-04 10:52:40 +01:00
ChrisTerBeke
d69e397716
Add new plugins to ignore
2017-12-04 10:31:21 +01:00
Diego Prado Gesto
288aba0ec4
CURA-4667 Fix simulation view render race. Change the place where the
...
layer data is reset.
2017-12-04 10:18:53 +01:00
Mark Burton
ad4a27db3a
Call resetLayerData() before adding LayerDataDecorator to scene node rather than afterwards.
...
This ensures that the layer data is reset before the scene is rendered.
2017-12-04 10:18:21 +01:00
Diego Prado Gesto
53b3efb9b8
Merge branch 'smartavionics-mb-fix-simulation-view-race'
2017-12-04 09:50:58 +01:00
Diego Prado Gesto
c3d9c1b3d8
CURA-4667 Fix simulation view render race. Change the place where the
...
layer data is reset.
2017-12-04 09:49:03 +01:00
Andreea Scorojitu
d5c55ae7d3
Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1
2017-12-04 09:34:39 +01:00
Andreea Scorojitu
184bfc9dfd
Update_ChangeLog_3.1_CURA-4656
2017-12-04 09:34:30 +01:00
Mark Burton
033a4615eb
Call resetLayerData() before adding LayerDataDecorator to scene node rather than afterwards.
...
This ensures that the layer data is reset before the scene is rendered.
2017-12-01 17:47:08 +00:00
Diego Prado Gesto
585c3e4f06
CURA-4660 Fix some mismatches between quality profiles, AA0.25 variant
...
and UM3 definitions.
2017-12-01 16:45:23 +01:00
ChrisTerBeke
a52889a601
Update 3D viewer build volume when relevant machine settings are changed - CURA-4659
2017-12-01 16:29:42 +01:00
Ghostkeeper
db19f2c2e9
Merge branch '3.1'
2017-12-01 15:43:15 +01:00
Ghostkeeper
1f6510a82f
Re-enable Russian and disable Finnish
...
Russian has been translated by Bothof now so it's complete again. Finnish has been officially dropped now so we'll disable that language.
Contributes to issue CURA-4601.
2017-12-01 15:40:36 +01:00
Ghostkeeper
af8176d309
Merge branch 'master' of github.com:Ultimaker/Cura
2017-12-01 15:37:11 +01:00
Ghostkeeper
f03615c8a7
Merge branch '3.1'
2017-12-01 15:36:58 +01:00
Ghostkeeper
1a9112d598
Add missing layer view translation
...
Luckily we already have some translations which were made for other contexts. I'm assuming that the translation here doesn't really depend on the context.
Contributes to issue CURA-4601.
2017-12-01 15:33:21 +01:00
ChrisTerBeke
867836bd76
Merge pull request #2773 from fieldOfView/fix_usb_target_temperatures
...
Show USB target temperatures, (estimated) time and jobname
2017-12-01 15:29:37 +01:00
Ghostkeeper
317effd8f3
Uncomment translations for Layer View
...
The layer view was renamed back from Simulation View to layer view after the string freeze.
Contributes to issue CURA-4601.
2017-12-01 15:24:09 +01:00
Ghostkeeper
e5966de99d
Merge branch '3.1'
2017-12-01 15:13:11 +01:00
ChrisTerBeke
af2b370921
Merge pull request #2857 from fieldOfView/fix_cluster_postprocessing
...
Allow postprocessing before sending data to the printer
2017-12-01 15:12:53 +01:00
ChrisTerBeke
c3ddd12e16
Merge pull request #2882 from fieldOfView/fix_sidebar_estimation_tooltips
...
Tweak layout and alignment of print time and cost estimation
2017-12-01 15:08:37 +01:00
Ghostkeeper
62185a8ef0
Add Traditional Chinese language option
...
Contributes to issue CURA-4370.
2017-12-01 15:06:03 +01:00
Ghostkeeper
ffc439852f
Merge branch '3.1'
2017-12-01 15:00:34 +01:00
Ghostkeeper
378ad076b4
Merge branch 'master' of github.com:Ultimaker/Cura
2017-12-01 15:00:25 +01:00
Ghostkeeper
335f790b4e
Merge branch '3.1' of github.com:Ultimaker/Cura into 3.1
2017-12-01 15:00:01 +01:00
Ghostkeeper
7068f6c28c
Fix whitespace at the end
...
Otherwise gettext will complain that one of them ends with \n but the other doesn't.
Contributes to issue CURA-4601.
2017-12-01 14:59:51 +01:00
Lipu Fei
a425a1c51b
Fix legacy profile loading
...
CURA-4075
2017-12-01 14:57:59 +01:00
ChrisTerBeke
7cc953d8e7
Merge pull request #2880 from fieldOfView/fix_machinesettings_diameter_no_materials
...
Hide material diameter when the machine has no materials
2017-12-01 14:56:36 +01:00
