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
Adam Rumjahn
d2e2f13bd7
Merge branch 'master' into master
2017-12-05 21:26:23 -05:00
Adam Rumjahn
f690961900
Deactivated G32 autoleveling
...
Update form last commit, complied with new syntax
2017-12-05 21:20:43 -05: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
Ghostkeeper
2236e0016d
Merge branch '3.1'
2017-12-01 14:41:41 +01:00
Dinow
c5baabd8a3
Update cura.po for 3.1
2017-12-01 14:40:51 +01:00
Dinow
4c1024fcc2
Update fdmprinter for 3.1
2017-12-01 14:40:41 +01:00
Dinow
302543cad2
update from pot files
2017-12-01 14:40:27 +01:00
Dinow
fb9645d185
import from 3.0
2017-12-01 14:40:15 +01:00
Ghostkeeper
b429966ab6
Merge branch 'translate-zh_TW' of github.com:dinowchang/Cura into dinowchang-translate-zh_TW
2017-12-01 14:37:57 +01:00
Ghostkeeper
c039535ee3
Fix retraction window of PLA and Nylon of 0.25mm profiles
...
This was probably caused by having wrong default profiles.
We're checking the rest of the settings again now just to be sure, because this probably has more implications elsewhere too.
2017-12-01 13:57:10 +01:00
Ghostkeeper
c0e7446f2a
Correct label of Save Project menu item
...
Capital P. Ellipses to indicate that a modal window is coming. Ampersand to enable the hotkey.
2017-12-01 10:44:56 +01:00
Ghostkeeper
f045b85db3
Merge branch '3.1'
2017-12-01 10:19:36 +01:00
Ghostkeeper
0336af3b4a
Merge branch '3.1' of github.com:Anraf1001/Cura into anraf1001-3.1
2017-12-01 09:52:17 +01:00
Ghostkeeper
96c38bce2b
Merge branch '3.1'
2017-11-30 16:57:01 +01:00
Ghostkeeper
93159c8986
Corrections to translations
...
Made by Vandrasc.
Contributes to issue CURA-4601.
2017-11-30 16:32:52 +01:00
Ghostkeeper
31104bcdc4
Corrections to Dutch translation
...
Not all too bad this time.
Contributes to issue CURA-4601.
2017-11-30 16:32:52 +01:00
fieldOfView
9564bb645f
Remove test code
2017-11-30 15:54:24 +01:00
Ghostkeeper
0fdb21fc91
Update translations for 3.1
...
The rest of the ones from Bothof.
Contributes to issue CURA-4601.
2017-11-30 15:12:44 +01:00
Jaime van Kessel
1c1c195b93
When an printer gets added / removed, this is now correctly shown
...
CL-541
2017-11-30 15:01:28 +01:00
