2225 Commits

Author SHA1 Message Date
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
ChrisTerBeke
3c863fc388 Get default settings view to work as sidebar component 2017-12-04 16:28:35 +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
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
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
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
fieldOfView
9564bb645f Remove test code 2017-11-30 15:54:24 +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
Jaime van Kessel
339d7ca4c9 Cluster shows default controlItem again when a specific printer is selected
CL-541
2017-11-30 14:36:53 +01:00
Jaime van Kessel
dea13899b3 Cluster can now "target" one of it's printers for display
CL-541
2017-11-30 13:07:01 +01:00
fieldOfView
4303278602 Tweak layout and alignment of print time and (material) cost estimation...
improving readability

* table takes the full width and values are right-aligned
* time estimates are shortened
* values are right aligned
* feature/time/percentage are on a single line again
* handle long feature & material names gracefully

Fixes #2712
* totals are only shown when there are multiple extruders
2017-11-30 10:35:31 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
ChrisTerBeke
16e07fc461 Update color indicators for extruders when changing material color - CURA-4641 2017-11-29 10:47:39 +01:00
ChrisTerBeke
ce88b9ee67
Merge pull request #2692 from Ultimaker/reload_qml
Added reload qml action
2017-11-28 15:50:47 +01:00
ChrisTerBeke
263230f9d2 Merge branch '3.1' 2017-11-28 15:45:57 +01:00
Lipu Fei
fa1d1ee3ad Fix layer height slider auto switching
CURA-4617
2017-11-28 14:35:44 +01:00
ChrisTerBeke
68cd9df65f Merge branch '3.1' 2017-11-28 10:36:11 +01:00
ChrisTerBeke
7b30e9a6fc
Merge pull request #2856 from Ultimaker/simulation_view_gradient_changes
Adapt gradient in Simulation view for better visualization of feedrates
2017-11-28 10:34:10 +01:00
ChrisTerBeke
a072af5585 Merge branch '3.1' 2017-11-27 17:17:02 +01:00
ChrisTerBeke
b74ebc57b4 Fix per extruder setting value depending on extruder count - CURA-4627 2017-11-27 17:00:57 +01:00
Jaime van Kessel
5d3779da26 Update cluster view components
CL-541
2017-11-27 15:54:44 +01:00
Jaime van Kessel
083eee2e9d Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-27 13:43:39 +01:00
Jaime van Kessel
00eeb835ac ManualPrinterControl uses correct functions again
CL-541
2017-11-27 10:22:30 +01:00
Jaime van Kessel
5036eccd32 Moved multiple components to their own files
CL-541
2017-11-27 10:15:28 +01:00
Ghostkeeper
e0f0e098ff
Use MaterialsModel for materialsModel
This specialized InstanceContainersModel has an override that makes the model a bit more efficient when non-materials get their metadata updated.

Contributes to issue CURA-4243.
2017-11-27 09:54:40 +01:00
Diego Prado Gesto
fa00a17c78 Make UI changes in the Simulation View for adapting the color gradient
in the Feedrate color scheme. Due to the travel speed is normally very
high compared with the other speeds in the model, the gradient is now
gradual instead of linear in order to show more changes in the low
values and less changes in the high values.
Adapt also the button styles and themes' colors.
Set the play/pause button to the left and reduce the size.
2017-11-26 21:21:18 +01:00
Ruben D
ffef26097d
Merge branch '3.1' 2017-11-26 18:48:42 +01:00
Ruben D
0d0bcb8aea
Clip text that exceeds the width of the text box.
For #2802.
2017-11-26 18:48:27 +01:00
Ruben D
8847325cf8
Remove limit on length for integer arrays
The integer arrays were limited because the text in the text field is not properly clipped. I found a fix for that.

Fixes #2802.
2017-11-26 18:47:58 +01:00
Jaime van Kessel
57de028608 re-implemented abort & pause for legacy um3
CL-541
2017-11-24 11:26:30 +01:00
Jaime van Kessel
57406100ef Fixed status icon in monitor tab
CL-541
2017-11-24 10:55:24 +01:00
Diego Prado Gesto
0b434978dd CURA-4561 Add tooltip also to the Cancel button. 2017-11-24 10:34:38 +01:00
ChrisTerBeke
46a575b84f Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-24 10:31:30 +01:00
Jaime van Kessel
9d7cd72691 JobData is now shown in monitor screen again
CL-541
2017-11-24 09:38:10 +01:00
Jaime van Kessel
219e285b20 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-24 09:23:21 +01:00
Jaime van Kessel
c523a6ddf6 Progress is now shown for LegacyPrinter while printing
CL-541
2017-11-24 09:22:50 +01:00