ChrisTerBeke
84aa9367c7
Cleanup
2017-12-12 10:54:54 +01:00
Ghostkeeper
75df653d47
Merge branch 'feature_local_container_server'
2017-12-11 15:51:17 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server
2017-12-08 16:03:05 +01:00
ChrisTerBeke
2986a17c1d
Fix for showing printer connect button on component load, use newer CuraApplication as target
2017-12-08 16:02:22 +01:00
ChrisTerBeke
c4d7a33c31
Monitor view component loader should have width and height from parent
2017-12-08 14:56:03 +01:00
ChrisTerBeke
8cd9439497
ignore octoprint plugin
2017-12-08 14:33:21 +01:00
ChrisTerBeke
c6e72abfbe
Add switch to monitor support for legacy plugin that emit signal to switch
2017-12-07 12:00:07 +01:00
ChrisTerBeke
acbef72b68
Cleanup
2017-12-07 11:52:15 +01:00
ChrisTerBeke
faf77b2795
Cleanup
2017-12-07 11:50:01 +01:00
ChrisTerBeke
7a6d75fd08
Fix sidebar top margin for um3 network monitor controls
2017-12-07 11:02:52 +01:00
ChrisTerBeke
71ae78f7b6
Fix monitoring sidebar top margin
2017-12-07 10:45:54 +01:00
ChrisTerBeke
f91a4db617
Set stage icon for monitor depending on output device state, prevent crash when accessing back-end from unloaded component
2017-12-07 10:38:06 +01:00
ChrisTerBeke
f6b570e299
Back to QUrl, fix monitor view overlay
2017-12-07 09:13:46 +01:00
ChrisTerBeke
9e3c681d66
Fix top bar tab layout when it has an icon
2017-12-06 18:47:11 +01:00
ChrisTerBeke
548761fcc3
Some cleanup
2017-12-06 18:15:17 +01:00
ChrisTerBeke
28c5debd61
Fix hiding topbar buttons in monitor stage
2017-12-06 18:11:46 +01:00
ChrisTerBeke
9702ffb794
Small fixes to sidebar layout after refactoring
2017-12-06 18:09:02 +01:00
ChrisTerBeke
ee643610e5
Fix sidebar loading and unloading depending on active stage
2017-12-06 17:46:18 +01:00
ChrisTerBeke
2d044a37ae
Sidebar and main view via loader
2017-12-06 13:33:05 +01:00
ChrisTerBeke
a57a5aab6b
Make sidebar view working for active stage
2017-12-06 12:23:41 +01:00
Jack Ha
eb171231c2
Fix removeMaterial.
...
The base_file must be removed first, or it gets loaded halfway during remove containers.
Contributes to issue CURA-4243.
2017-12-06 11:02:50 +01:00
ChrisTerBeke
0e1c9146cf
Implement stage model in top bar
2017-12-06 09:58:50 +01:00
ChrisTerBeke
9b4b6b2eae
Remove sidebar views from views menu
2017-12-06 09:44:59 +01:00
ChrisTerBeke
f1b9a17611
Remove sidebar controller implementation in favor of stages
2017-12-06 09:44:30 +01:00
ChrisTerBeke
833593bfa2
Merge branch 'master' into feature_sidebar_plugin_target
2017-12-05 14:14:57 +01:00
ChrisTerBeke
51405ca0f7
tmp
2017-12-05 13:29:04 +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
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
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
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
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
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
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
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
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
Ghostkeeper
e3b7bbb6bd
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:43:41 +01:00
