From 22a275f4bda6d4da5060de8d2f2034d474fea29f Mon Sep 17 00:00:00 2001
From: Christian Hammacher <bmasterc@gmail.com>
Date: Wed, 6 Mar 2019 23:09:04 +0100
Subject: [PATCH] Version 2.0.0-RC6

Updated components (also fixes a bug that caused all inputs to stop working once the heightmap was activated)
Changed click behaviour of file list items to be activated on a single click again
Added touch events to event+file lists to show the context menu on devices that do not support the native JS contextmenu event
Print information is no longer cleared when a print finishes
Simplified file list reset when the connection is interrupted
Print+Simulate options are hidden when a job file is being processed
Escape closes the text editor again
Height map is automatically reloaded once 'heightmap.csv' shows up in a G-code response
Minor other changes
Bug fix: Notification when editing a large file was not displayed during download
Bug fix: Macro list did not return to the root directory when the connection was interrupted
Bug fix: Warm-up time was not displayed
Bug fix: Selected tool was no longer highlighted when the light theme was selected
Bug fix: Drag&Drop was completely broken in Chrome-based browsers and the drag animation was no longer working
---
 package-lock.json                             | 56 +++++------
 package.json                                  | 12 +--
 src/App.vue                                   |  2 +-
 src/components/buttons/ConnectBtn.vue         |  5 +-
 src/components/dialogs/FileEditDialog.vue     |  2 +-
 src/components/lists/BaseFileList.vue         | 98 +++++++++++++------
 src/components/lists/DisplayFileList.vue      | 12 +--
 src/components/lists/EventList.vue            | 33 ++++++-
 src/components/lists/FilamentFileList.vue     |  6 --
 src/components/lists/JobFileList.vue          | 18 +---
 src/components/lists/MacroFileList.vue        | 10 +-
 src/components/lists/MacroList.vue            | 11 +++
 src/components/lists/SysFileList.vue          |  6 --
 src/components/misc/DirectoryBreadcrumbs.vue  | 28 ++++--
 src/components/panels/HeightmapPanel.vue      | 16 ++-
 src/components/panels/JobControlPanel.vue     |  2 +-
 src/components/panels/JobDataPanel.vue        |  4 +-
 src/components/panels/JobEstimationsPanel.vue | 22 +++--
 src/components/panels/SettingsAboutPanel.vue  |  2 +-
 src/components/panels/ToolsPanel.vue          |  4 +-
 src/i18n/en.js                                | 16 ++-
 src/main.js                                   |  1 -
 src/plugins/display.js                        |  2 +-
 src/store/index.js                            | 12 ++-
 src/store/machine/connector/PollConnector.js  | 35 +++++--
 src/store/machine/index.js                    | 10 +-
 src/store/machine/model.js                    | 11 ---
 src/utils/colors.js                           |  4 +-
 28 files changed, 262 insertions(+), 178 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2b4171381..4abfc10a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4441,9 +4441,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz",
-      "integrity": "sha512-CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og==",
+      "version": "5.15.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.15.1.tgz",
+      "integrity": "sha512-NTcm6vQ+PTgN3UBsALw5BMhgO6i5EpIjQF/Xb5tIh3sk9QhrFafujUOczGz4J24JBlzWclSB9Vmx8d+9Z6bFCg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -4452,7 +4452,7 @@
         "cross-spawn": "^6.0.5",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
-        "eslint-scope": "^4.0.0",
+        "eslint-scope": "^4.0.2",
         "eslint-utils": "^1.3.1",
         "eslint-visitor-keys": "^1.0.0",
         "espree": "^5.0.1",
@@ -4485,9 +4485,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz",
-          "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==",
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+          "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
           "dev": true
         },
         "acorn-jsx": {
@@ -4497,9 +4497,9 @@
           "dev": true
         },
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -4533,9 +4533,9 @@
           }
         },
         "eslint-scope": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-          "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.2.tgz",
+          "integrity": "sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==",
           "dev": true,
           "requires": {
             "esrecurse": "^4.1.0",
@@ -10818,14 +10818,14 @@
       }
     },
     "three": {
-      "version": "0.101.1",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.101.1.tgz",
-      "integrity": "sha512-8ufimUVmRLtH+BTpEIbDjdGEKQOVWLMLgGynaKin1KbYTE136ZNOepJ8EgByi0tN43dQ7B1YrKLCJgXGy4bLmw=="
+      "version": "0.102.1",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.102.1.tgz",
+      "integrity": "sha512-btHBdww/Es4vdBkB2GjTE9mpj0vy8tgtxkX7ne7uxySXV8zoGxWJv1N88BydxnCqvAfmD4ZUTqPeESO7oDgeOQ=="
     },
     "three-orbitcontrols": {
-      "version": "2.101.1",
-      "resolved": "https://registry.npmjs.org/three-orbitcontrols/-/three-orbitcontrols-2.101.1.tgz",
-      "integrity": "sha512-GnTQGh0ULrnCae5doq+AoEnfRvZ5iW46wuYUwwdLpFSufmAa4ar4XGHYdGNIixYSdCGPokmPXLaqf+IaYHlAvg=="
+      "version": "2.102.1",
+      "resolved": "https://registry.npmjs.org/three-orbitcontrols/-/three-orbitcontrols-2.102.1.tgz",
+      "integrity": "sha512-mp5qc5mooCtjgSloMFzIEI2VQVkvBDWDMYtbxY3TFB/BCCYpR6NV7/dD5+EUyzR90/a9H356s9QR+2PhH48f6w=="
     },
     "through": {
       "version": "2.3.8",
@@ -11395,9 +11395,9 @@
       }
     },
     "vue": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.7.tgz",
-      "integrity": "sha512-g7ADfQ82QU+j6F/bVDioVQf2ccIMYLuR4E8ev+RsDBlmwRkhGO3HhgF4PF9vpwjdPpxyb1zzLur2nQ2oIMAMEg=="
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.8.tgz",
+      "integrity": "sha512-+vp9lEC2Kt3yom673pzg1J7T1NVGuGzO9j8Wxno+rQN2WYVBX2pyo/RGQ3fXCLh2Pk76Skw/laAPCuBuEQ4diw=="
     },
     "vue-cli-plugin-vuetify": {
       "version": "0.4.6",
@@ -11460,9 +11460,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.7.tgz",
-      "integrity": "sha512-ZjxJLr6Lw2gj6aQGKwBWTxVNNd28/qggIdwvr5ushrUHUvqgbHD0xusOVP2yRxT4pX3wRIJ2LfxjgFT41dEtoQ==",
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.8.tgz",
+      "integrity": "sha512-SwWKANE5ee+oJg+dEJmsdxsxWYICPsNwk68+1AFjOS8l0O/Yz2845afuJtFqf3UjS/vXG7ECsPeHHEAD65Cjng==",
       "dev": true,
       "requires": {
         "de-indent": "^1.0.2",
@@ -11476,9 +11476,9 @@
       "dev": true
     },
     "vuetify": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.5.4.tgz",
-      "integrity": "sha512-hlTJHh4a1vAZQq4XwIcEpdDXoKNPqXbE95iV2a780FXvFnacu7qjHO4BrOUOkWGeAuFb1NTQM2vJtb4Jhxn26Q=="
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.5.5.tgz",
+      "integrity": "sha512-WXFpRNO+AX4WjmA/+maDOBLQpHpkw8xf7O9iV8KKbKVQv7OBbLOEt7a0LBKRRNJboZPyOFXtt7K4+Q/KYc6dnQ=="
     },
     "vuetify-loader": {
       "version": "1.2.1",
diff --git a/package.json b/package.json
index e9bcdc722..c8578d933 100644
--- a/package.json
+++ b/package.json
@@ -19,12 +19,12 @@
     "jszip": "^3.2.0",
     "piecon": "^0.5.0",
     "roboto-fontface": "*",
-    "three": "^0.101.1",
-    "three-orbitcontrols": "^2.101.1",
-    "vue": "^2.6.7",
+    "three": "^0.102.1",
+    "three-orbitcontrols": "^2.102.1",
+    "vue": "^2.6.8",
     "vue-i18n": "^8.8.2",
     "vue-router": "^3.0.1",
-    "vuetify": "^1.5.4",
+    "vuetify": "^1.5.5",
     "vuex": "^3.1.0"
   },
   "devDependencies": {
@@ -35,14 +35,14 @@
     "babel-plugin-transform-builtin-extend": "^1.1.2",
     "compression-webpack-plugin": "^2.0.0",
     "core-js": "^2.6.5",
-    "eslint": "^5.14.1",
+    "eslint": "^5.15.1",
     "eslint-plugin-vue": "^5.2.2",
     "material-design-icons-iconfont": "^4.0.5",
     "rimraf": "^2.6.3",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.1",
     "vue-cli-plugin-vuetify": "^0.4.6",
-    "vue-template-compiler": "^2.6.7",
+    "vue-template-compiler": "^2.6.8",
     "vuetify-loader": "^1.2.1",
     "zip-webpack-plugin": "^3.0.0"
   }
diff --git a/src/App.vue b/src/App.vue
index 9f4c5ad00..445e42c9c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -202,7 +202,7 @@ export default {
 	},
 	mounted() {
 		// Attempt to disconnect from every machine when the page is being unloaded
-		window.addEventListener('onunload', this.disconnectAll);
+		window.addEventListener('unload', this.disconnectAll);
 
 		// Connect if running on a board
 		if (!this.isLocal) {
diff --git a/src/components/buttons/ConnectBtn.vue b/src/components/buttons/ConnectBtn.vue
index 90373626b..4ac85b253 100644
--- a/src/components/buttons/ConnectBtn.vue
+++ b/src/components/buttons/ConnectBtn.vue
@@ -16,8 +16,9 @@ import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
 export default {
 	computed: {
 		...mapState(['isConnecting', 'isDisconnecting', 'isLocal']),
+		...mapState('machine', ['isReconnecting']),
 		...mapGetters(['isConnected']),
-		isBusy() { return this.isConnecting || this.isDisconnecting },
+		isBusy() { return this.isConnecting || this.isReconnecting || this.isDisconnecting },
 		buttonColor() {
 			return this.isBusy ? 'warning'
 				: (this.isConnected ? 'success' : 'primary');
@@ -26,7 +27,7 @@ export default {
 			return this.isConnected ? 'close' : 'power_settings_new';
 		},
 		caption() {
-			return this.$t(this.isConnecting ? 'button.connect.connecting'
+			return this.$t((this.isConnecting || this.isReconnecting) ? 'button.connect.connecting'
 				: this.isDisconnecting ? 'button.connect.disconnecting'
 					: this.isConnected ? 'button.connect.disconnect'
 						: 'button.connect.connect');
diff --git a/src/components/dialogs/FileEditDialog.vue b/src/components/dialogs/FileEditDialog.vue
index d8023cae0..ff02a7062 100644
--- a/src/components/dialogs/FileEditDialog.vue
+++ b/src/components/dialogs/FileEditDialog.vue
@@ -56,7 +56,7 @@
 				</v-toolbar-items>
 			</v-toolbar>
 
-			<v-textarea ref="textarea" :value="innerValue" @blur="innerValue = $event.target.value" @keydown.tab.exact.prevent="onTextareaTab" :rows="null" hide-details solo class="edit-textarea" browser-autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></v-textarea>
+			<v-textarea ref="textarea" :value="innerValue" @blur="innerValue = $event.target.value" @keydown.tab.exact.prevent="onTextareaTab" @keydown.esc="close" :rows="null" hide-details solo class="edit-textarea" browser-autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></v-textarea>
 		</v-card>
 	</v-dialog>
 </template>
diff --git a/src/components/lists/BaseFileList.vue b/src/components/lists/BaseFileList.vue
index d891413d3..37a9e60c3 100644
--- a/src/components/lists/BaseFileList.vue
+++ b/src/components/lists/BaseFileList.vue
@@ -45,9 +45,9 @@ th.checkbox {
 			</template>
 
 			<template slot="items" slot-scope="props">
-				<tr :active="props.selected" @click="props.selected = !props.selected" @dblclick="itemClicked(props.item)" @contextmenu.prevent="itemContextmenu(props, $event)" :data-filename="(props.item.isDirectory ? '*' : '') + props.item.name" draggable="true" @dragstart="dragStart(props.item, $event)" @dragover="dragOver(props.item, $event)" @drop.prevent="dragDrop(props.item, $event)" v-tab-control.contextmenu.dblclick @keydown.space="props.selected = !props.selected">
+				<tr :active="props.selected" @touchstart="onItemTouchStart(props, $event)" @touchend="onItemTouchEnd" @click="onItemClick(props)" @contextmenu.prevent="onItemContextmenu(props, $event)" :data-filename="(props.item.isDirectory ? '*' : '') + props.item.name" draggable="true" @dragstart="onItemDragStart(props.item, $event)" @dragover="onItemDragOver(props.item, $event)" @drop.prevent="onItemDragDrop(props.item, $event)" v-tab-control.contextmenu @keydown.space="props.selected = !props.selected">
 					<td class="pr-0">
-						<v-checkbox :input-value="props.selected" tabindex="-1" primary hide-details></v-checkbox>
+						<v-checkbox :input-value="props.selected" @touchstart.stop="" @touchend.stop="" @click.stop.prevent="props.selected = !props.selected" primary hide-details></v-checkbox>
 					</td>
 					<template v-for="header in headers">
 						<td v-if="header.value === 'name'" :key="header.value">
@@ -91,7 +91,7 @@ th.checkbox {
 				<v-list-tile v-show="!noDownload && innerValue.length === 1 && filesSelected" @click="download">
 					<v-icon class="mr-1">cloud_download</v-icon> {{ $tc('list.baseFileList.download', innerValue.length) }}
 				</v-list-tile>
-				<v-list-tile v-show="!noEdit && innerValue.length === 1 && filesSelected" :disabled="!canEditFile" @click="edit">
+				<v-list-tile v-show="!noEdit && innerValue.length === 1 && filesSelected" :disabled="!canEditFile" @click="edit(innerValue[0])">
 					<v-icon class="mr-1">edit</v-icon> {{ $t('list.baseFileList.edit') }}
 				</v-list-tile>
 				<v-list-tile v-show="!noRename && innerValue.length === 1" @click="rename">
@@ -175,6 +175,7 @@ export default {
 	computed: {
 		...mapState(['selectedMachine']),
 		...mapGetters(['isConnected']),
+		...mapState('machine', ['isReconnecting']),
 		...mapState('machine/cache', ['sorting']),
 		...mapState('machine/model', ['storages']),
 		storageIndex() {
@@ -211,6 +212,7 @@ export default {
 			innerValue: [],
 			contextMenu: {
 				shown: false,
+				touchTimer: undefined,
 				x: 0,
 				y: 0
 			},
@@ -355,20 +357,32 @@ export default {
 			}
 			return (item[prop] !== null) ? this.$displayTime(item[prop]) : this.$t('generic.noValue');
 		},
-		itemClicked(item) {
-			if (item.isDirectory) {
-				this.loadDirectory(Path.combine(this.innerDirectory, item.name));
+		onItemTouchStart(props, e) {
+			const that = this;
+			this.contextMenu.touchTimer = setTimeout(function() {
+				that.contextMenu.touchTimer = undefined;
+				that.onItemContextmenu(props, { clientX: e.targetTouches[0].clientX, clientY: e.targetTouches[0].clientY });
+			}, 1000);
+		},
+		onItemTouchEnd() {
+			if (this.contextMenu.touchTimer) {
+				clearTimeout(this.contextMenu.touchTimer);
+				this.contextMenu.touchTimer = undefined;
+			}
+		},
+		onItemClick(props) {
+			if (props.item.isDirectory) {
+				this.loadDirectory(Path.combine(this.innerDirectory, props.item.name));
 			} else {
-				this.$emit('fileClicked', item);
+				this.$emit('fileClicked', props.item);
 			}
 		},
-		itemContextmenu(props, e) {
+		onItemContextmenu(props, e) {
+			this.onItemTouchEnd();
+
 			// Deal with selection
 			if (!props.selected) {
-				this.innerValue = [];
-				this.$nextTick(() => {
-					props.selected = true;
-				});
+				props.selected = true;
 			}
 
 			// Open the context menu
@@ -379,7 +393,7 @@ export default {
 				this.contextMenu.shown = true;
 			});
 		},
-		dragStart(item, e) {
+		onItemDragStart(item, e) {
 			if (this.noDragDrop) {
 				return;
 			}
@@ -423,9 +437,10 @@ export default {
 			const x = e.clientX - table.getClientRects()[0].left;
 			const y = e.clientY - e.target.closest('tr').getClientRects()[0].top + offsetY;
 			e.dataTransfer.setDragImage(tableClone, x, y);
-			this.$nextTick(() => tableClone.remove());
+
+			setTimeout(() => tableClone.remove(), 0);
 		},
-		dragOver(item, e) {
+		onItemDragOver(item, e) {
 			if (!this.noDragDrop && item.isDirectory) {
 				const jsonData = e.dataTransfer.getData('application/json');
 				if (jsonData) {
@@ -434,20 +449,29 @@ export default {
 						e.preventDefault();
 						e.stopPropagation();
 					}
+				} else {
+					// Fix for Chrome: It does not grant access to dataTransfer on the same domain "for security reasons"...
+					e.preventDefault();
+					e.stopPropagation();
 				}
 			}
 		},
-		async dragDrop(item, e) {
-			const data = JSON.parse(e.dataTransfer.getData('application/json'));
-			const directory = this.innerDirectory;
-			for (let i = 0; i < data.items.length; i++) {
-				const from = Path.combine(data.directory, data.items[i].name);
-				const to = Path.combine(directory, item.name, data.items[i].name);
-				try {
-					await this.machineMove({ from, to });
-				} catch (e) {
-					this.$makeNotification('error', `Failed to move ${data.items[i].name} to ${directory}`, e.message);
-					break;
+		async onItemDragDrop(item, e) {
+			const jsonData = e.dataTransfer.getData('application/json');
+			if (jsonData) {
+				const data = JSON.parse(jsonData);
+				if (data.type === 'dwcFiles' && !data.items.some(dataItem => dataItem.isDirectory && dataItem.name === item.name)) {
+					const directory = this.innerDirectory;
+					for (let i = 0; i < data.items.length; i++) {
+						const from = Path.combine(data.directory, data.items[i].name);
+						const to = Path.combine(directory, item.name, data.items[i].name);
+						try {
+							await this.machineMove({ from, to });
+						} catch (e) {
+							this.$makeNotification('error', `Failed to move ${data.items[i].name} to ${directory}`, e.message);
+							break;
+						}
+					}
 				}
 			}
 		},
@@ -465,14 +489,14 @@ export default {
 		},
 		async edit(item) {
 			try {
-				const filename = Path.combine(this.innerDirectory, (item && item.name) ? item.name : this.innerValue[0].name);
-				const response = await this.machineDownload({ filename, type: 'text', showSuccess: false });
 				let notification, showDelay = 0;
-				if (response.length > bigFileThreshold) {
-					notification = this.$makeNotification('warning', this.$t('notification.loading.title'), this.$t('notification.loading.message'), false);
+				if (item.size > bigFileThreshold) {
+					notification = this.$makeNotification('warning', this.$t('notification.loadingFile.title'), this.$t('notification.loadingFile.message'), false);
 					showDelay = 1000;
 				}
 
+				const filename = Path.combine(this.innerDirectory, item.name);
+				const response = await this.machineDownload({ filename, type: 'text', showSuccess: false });
 				const editDialog = this.editDialog;
 				setTimeout(function() {
 					editDialog.filename = filename;
@@ -616,8 +640,22 @@ export default {
 		this.unsubscribe();
 	},
 	watch: {
+		isConnected(to) {
+			if (to) {
+				this.refresh();
+			} else {
+				this.innerDirectory = this.initialDirectory;
+				this.innerFilelist = [];
+
+				this.editDialog.shown = false;
+				this.renameDialog.shown = false;
+			}
+		},
 		selectedMachine() {
+			// TODO store current directory per selected machine
+			this.innerDirectory = this.initialDirectory;
 			this.innerFilelist = [];
+
 			this.editDialog.shown = false;
 			this.renameDialog.shown = false;
 		},
diff --git a/src/components/lists/DisplayFileList.vue b/src/components/lists/DisplayFileList.vue
index f5cd843ae..7d91a6cd5 100644
--- a/src/components/lists/DisplayFileList.vue
+++ b/src/components/lists/DisplayFileList.vue
@@ -46,15 +46,12 @@
 <script>
 'use strict'
 
-import { mapState, mapGetters } from 'vuex'
+import { mapGetters } from 'vuex'
 
 import Path from '../../utils/path.js'
 
 export default {
-	computed: {
-		...mapState(['selectedMachine']),
-		...mapGetters(['uiFrozen'])
-	},
+	computed: mapGetters(['uiFrozen']),
 	data() {
 		return {
 			sortBy: 'name',
@@ -73,11 +70,6 @@ export default {
 		fileClicked(item) {
 			this.$refs.filelist.edit(item);
 		}
-	},
-	watch: {
-		selectedMachine() {
-			this.directory = Path.sys;
-		}
 	}
 }
 </script>
diff --git a/src/components/lists/EventList.vue b/src/components/lists/EventList.vue
index 1459ea04d..f710b3802 100644
--- a/src/components/lists/EventList.vue
+++ b/src/components/lists/EventList.vue
@@ -14,11 +14,20 @@ td.title-cell {
 .message {
 	white-space: pre-wrap;
 }
+
+.no-selection {
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
 </style>
 
 <template>
 	<div class="component">
-		<v-data-table :headers="headers" :items="events" :pagination.sync="pagination" hide-actions class="elevation-3" :class="{ 'empty-table-fix' : !events.length }">
+		<v-data-table :headers="headers" :items="events" :pagination.sync="pagination" hide-actions class="elevation-3 no-selection" :class="{ 'empty-table-fix' : !events.length }">
 			<template slot="no-data">
 				<v-alert :value="true" type="info" class="ma-0" @contextmenu.prevent="">
 					{{ $t('list.eventLog.noEvents') }}
@@ -35,7 +44,7 @@ td.title-cell {
 			</template>
 
 			<template slot="items" slot-scope="{ item }">
-				<tr :class="getClassByEvent(item.type)" @contextmenu.prevent="showContextMenu($event, item)" v-tab-control.contextmenu>
+				<tr :class="getClassByEvent(item.type)" @touchstart="onItemTouchStart(item, $event)" @touchend="onItemTouchEnd" @contextmenu.prevent="onItemContextmenu(item, $event)" v-tab-control.contextmenu>
 					<td class="log-cell title-cell">
 						{{ item.date.toLocaleString() }}
 					</td>
@@ -50,7 +59,7 @@ td.title-cell {
 
 		<v-menu v-model="contextMenu.shown" :position-x="contextMenu.x" :position-y="contextMenu.y" absolute offset-y v-tab-control.contextmenu>
 			<v-list>
-				<v-list-tile ref="firstMenuItem" v-show="contextMenu.item" @click="copy" tabindex="0">
+				<v-list-tile v-show="contextMenu.item" @click="copy" tabindex="0">
 					<v-icon class="mr-1">assignment</v-icon> {{ $t('list.eventLog.copy') }}
 				</v-list-tile>
 				<v-list-tile @click="clearLog" tabindex="0">
@@ -85,6 +94,7 @@ export default {
 		return {
 			contextMenu: {
 				shown: false,
+				touchTimer: undefined,
 				item: null,
 				x: 0,
 				y: 0
@@ -141,7 +151,22 @@ export default {
 				this.pagination.descending = false;
 			}
 		},
-		showContextMenu(e, item) {
+		onItemTouchStart(item, e) {
+			const that = this;
+			this.contextMenu.touchTimer = setTimeout(function() {
+				that.contextMenu.touchTimer = undefined;
+				that.onItemContextmenu(item, { clientX: e.targetTouches[0].clientX, clientY: e.targetTouches[0].clientY });
+			}, 1000);
+		},
+		onItemTouchEnd() {
+			if (this.contextMenu.touchTimer) {
+				clearTimeout(this.contextMenu.touchTimer);
+				this.contextMenu.touchTimer = undefined;
+			}
+		},
+		onItemContextmenu(item, e) {
+			this.onItemTouchEnd();
+
 			this.contextMenu.shown = false;
 			this.contextMenu.item = item;
 			this.contextMenu.x = e.clientX;
diff --git a/src/components/lists/FilamentFileList.vue b/src/components/lists/FilamentFileList.vue
index d29f78063..6dab51585 100644
--- a/src/components/lists/FilamentFileList.vue
+++ b/src/components/lists/FilamentFileList.vue
@@ -68,7 +68,6 @@ import Path from '../../utils/path.js'
 
 export default {
 	computed: {
-		...mapState(['selectedMachine']),
 		...mapGetters(['uiFrozen']),
 		...mapState('machine/model', ['tools']),
 		isRootDirectory() { return this.directory === Path.filaments; },
@@ -207,11 +206,6 @@ export default {
 		fileClicked(item) {
 			this.$refs.filelist.edit(item);
 		}
-	},
-	watch: {
-		selectedMachine() {
-			this.directory = Path.filaments;
-		}
 	}
 }
 </script>
diff --git a/src/components/lists/JobFileList.vue b/src/components/lists/JobFileList.vue
index 271609937..52def258b 100644
--- a/src/components/lists/JobFileList.vue
+++ b/src/components/lists/JobFileList.vue
@@ -25,10 +25,10 @@
 			</template>
 
 			<template slot="context-menu">
-				<v-list-tile v-show="isFile" @click="start">
+				<v-list-tile v-show="isFile && !state.isPrinting" @click="start">
 					<v-icon class="mr-1">play_arrow</v-icon> {{ $t('list.jobs.start') }}
 				</v-list-tile>
-				<v-list-tile v-show="isFile" @click="simulate">
+				<v-list-tile v-show="isFile && !state.isPrinting" @click="simulate">
 					<v-icon class="mr-1">fast_forward</v-icon> {{ $t('list.jobs.simulate') }}
 				</v-list-tile>
 			</template>
@@ -61,10 +61,8 @@ import Path from '../../utils/path.js'
 
 export default {
 	computed: {
-		...mapState(['selectedMachine']),
 		...mapGetters(['isConnected', 'uiFrozen']),
-		...mapState('machine', ['isReconnecting']),
-		...mapState('machine/model', ['storages']),
+		...mapState('machine/model', ['state', 'storages']),
 		...mapState('settings', ['language']),
 		isFile() {
 			return (this.selection.length === 1) && !this.selection[0].isDirectory;
@@ -235,7 +233,7 @@ export default {
 						item.filament = null;
 						item.generatedBy = null;
 						item.printTime = null;
-						item.simuatedTime = null;
+						item.simulatedTime = null;
 					}
 				});
 				this.requestFileInfo(directory, 0, this.filelist.length);
@@ -253,14 +251,6 @@ export default {
 		simulate(item) {
 			this.sendCode(`M37 P"${Path.combine(this.directory, (item && item.name) ? item.name : this.selection[0].name)}"`);
 		}
-	},
-	watch: {
-		isReconnecting() {
-			this.directory = Path.gcodes;
-		},
-		selectedMachine() {
-			this.directory = Path.gcodes;
-		}
 	}
 }
 </script>
diff --git a/src/components/lists/MacroFileList.vue b/src/components/lists/MacroFileList.vue
index 444c7e7bf..0987baa27 100644
--- a/src/components/lists/MacroFileList.vue
+++ b/src/components/lists/MacroFileList.vue
@@ -53,13 +53,12 @@
 <script>
 'use strict'
 
-import { mapState, mapGetters, mapActions } from 'vuex'
+import { mapGetters, mapActions } from 'vuex'
 
 import Path from '../../utils/path.js'
 
 export default {
 	computed: {
-		...mapState(['selectedMachine']),
 		...mapGetters(['uiFrozen']),
 		isFile() {
 			return (this.selection.length === 1) && !this.selection[0].isDirectory;
@@ -86,7 +85,7 @@ export default {
 			this.$refs.filelist.refresh();
 		},
 		fileClicked(item) {
-			this.runMacroDialog.question = this.$t('dialog.runMacro.title');
+			this.runMacroDialog.question = this.$t('dialog.runMacro.title', [item.name]);
 			this.runMacroDialog.prompt = this.$t('dialog.runMacro.prompt', [item.name]);
 			this.runMacroDialog.filename = item.name;
 			this.runMacroDialog.shown = true;
@@ -94,11 +93,6 @@ export default {
 		runFile(filename) {
 			this.sendCode(`M98 P"${Path.combine(this.directory, filename)}"`);
 		}
-	},
-	watch: {
-		selectedMachine() {
-			this.directory = Path.macros;
-		}
 	}
 }
 </script>
diff --git a/src/components/lists/MacroList.vue b/src/components/lists/MacroList.vue
index 51af4fd3b..97376217a 100644
--- a/src/components/lists/MacroList.vue
+++ b/src/components/lists/MacroList.vue
@@ -148,11 +148,22 @@ export default {
 		this.unsubscribe();
 	},
 	watch: {
+		isConnected(to) {
+			if (to) {
+				this.wasMounted = this.storages.length && this.storages[0].mounted;
+				this.loadDirectory();
+			} else {
+				this.directory = Path.macros;
+				this.filelist = [];
+			}
+		},
 		selectedMachine() {
+			// TODO store current directory per selected machine
 			if (this.isConnected) {
 				this.wasMounted = this.storages.length && this.storages[0].mounted;
 				this.loadDirectory();
 			} else {
+				this.directory = Path.macros;
 				this.filelist = [];
 			}
 		},
diff --git a/src/components/lists/SysFileList.vue b/src/components/lists/SysFileList.vue
index 1c9d5aeea..e07f6657e 100644
--- a/src/components/lists/SysFileList.vue
+++ b/src/components/lists/SysFileList.vue
@@ -53,7 +53,6 @@ import Path from '../../utils/path.js'
 
 export default {
 	computed: {
-		...mapState(['selectedMachine']),
 		...mapState('machine/model', ['state']),
 		...mapGetters(['uiFrozen'])
 	},
@@ -91,11 +90,6 @@ export default {
 				// this is expected
 			}
 		}
-	},
-	watch: {
-		selectedMachine() {
-			this.directory = Path.sys;
-		}
 	}
 }
 </script>
diff --git a/src/components/misc/DirectoryBreadcrumbs.vue b/src/components/misc/DirectoryBreadcrumbs.vue
index d66cc5021..9afb9689e 100644
--- a/src/components/misc/DirectoryBreadcrumbs.vue
+++ b/src/components/misc/DirectoryBreadcrumbs.vue
@@ -88,18 +88,28 @@ export default {
 					e.preventDefault();
 					e.stopPropagation();
 				}
+			} else {
+				// Fix for Chrome: It does not grant access to dataTransfer on the same domain "for security reasons"...
+				e.preventDefault();
+				e.stopPropagation();
 			}
 		},
 		async dragDrop(directory, e) {
-			const data = JSON.parse(e.dataTransfer.getData('application/json'));
-			for (let i = 0; i < data.items.length; i++) {
-				const from = Path.combine(data.directory, data.items[i].name);
-				const to = Path.combine(directory, data.items[i].name);
-				try {
-					await this.move({ from, to });
-				} catch (e) {
-					this.$log('error', this.$t('error.move', [data.items[i].name, directory]), e.message);
-					break;
+			const jsonData = e.dataTransfer.getData('application/json');
+			if (jsonData) {
+				const data = JSON.parse(jsonData);
+				if (data.type === 'dwcFiles' && !data.items.some(dataItem => dataItem.isDirectory && directory === Path.combine(data.directory, dataItem.name))) {
+					const data = JSON.parse(jsonData);
+					for (let i = 0; i < data.items.length; i++) {
+						const from = Path.combine(data.directory, data.items[i].name);
+						const to = Path.combine(directory, data.items[i].name);
+						try {
+							await this.move({ from, to });
+						} catch (e) {
+							this.$log('error', this.$t('error.move', [data.items[i].name, directory]), e.message);
+							break;
+						}
+					}
 				}
 			}
 		}
diff --git a/src/components/panels/HeightmapPanel.vue b/src/components/panels/HeightmapPanel.vue
index aa57db410..27e3ac3f3 100644
--- a/src/components/panels/HeightmapPanel.vue
+++ b/src/components/panels/HeightmapPanel.vue
@@ -165,7 +165,9 @@ export default {
 			minDiff: undefined,
 			maxDiff: undefined,
 			meanError: undefined,
-			rmsError: undefined
+			rmsError: undefined,
+
+			unsubscribe: undefined
 		}
 	},
 	methods: {
@@ -217,7 +219,8 @@ export default {
 		showCSV(csvData) {
 			// Load the CSV. The first line is a comment that can be removed
 			const csv = new CSV(csvData.substr(csvData.indexOf("\n") + 1));
-			const radius = parseFloat(csv.get('radius'));
+			let radius = parseFloat(csv.get('radius'));
+			if (radius <= 0) { radius = undefined; }
 			const xMin = parseFloat(csv.get('xmin'));
 			const yMin = parseFloat(csv.get('ymin'));
 			let xSpacing = parseFloat(csv.get('xspacing'));
@@ -419,10 +422,19 @@ export default {
 		this.isActive = false;
 	},
 	mounted() {
+		const getHeightmap = this.getHeightmap;
+		this.unsubscribe = this.$store.subscribeAction(function(action) {
+			if (action.type.endsWith('onCodeCompleted') && action.payload.reply.indexOf('heightmap.csv') !== -1) {
+				getHeightmap();
+			}
+		});
+
 		// FIXME give the grid some time to resize everything...
 		setTimeout(this.init, 100);
 	},
 	beforeDestroy() {
+		this.unsubscribe();
+
 		threeInstances = threeInstances.filter(item => item !== this);
 		if (this.three.renderer) {
 			this.three.renderer.forceContextLoss();
diff --git a/src/components/panels/JobControlPanel.vue b/src/components/panels/JobControlPanel.vue
index 0954f8e0b..5ccf95f98 100644
--- a/src/components/panels/JobControlPanel.vue
+++ b/src/components/panels/JobControlPanel.vue
@@ -1,6 +1,6 @@
 <template>
 	<v-card>
-		<v-card-title>
+		<v-card-title class="pb-1">
 			<v-icon small class="mr-1">build</v-icon> {{ $t('panel.jobControl.caption') }}
 		</v-card-title>
 
diff --git a/src/components/panels/JobDataPanel.vue b/src/components/panels/JobDataPanel.vue
index 81c2316da..cc9babc8d 100644
--- a/src/components/panels/JobDataPanel.vue
+++ b/src/components/panels/JobDataPanel.vue
@@ -9,10 +9,10 @@
 				<v-flex>
 					<v-layout column>
 						<v-flex tag="strong">
-							{{ $t('panel.jobData.warmUpTime') }}
+							{{ $t('panel.jobData.warmUpDuration') }}
 						</v-flex>
 						<v-flex tag="span">
-							{{ $displayTime(job.warmUpTime) }}
+							{{ $displayTime(job.warmUpDuration) }}
 						</v-flex>
 					</v-layout>
 				</v-flex>
diff --git a/src/components/panels/JobEstimationsPanel.vue b/src/components/panels/JobEstimationsPanel.vue
index b98ee86a8..476fc8a8f 100644
--- a/src/components/panels/JobEstimationsPanel.vue
+++ b/src/components/panels/JobEstimationsPanel.vue
@@ -36,13 +36,23 @@
 						</v-flex>
 					</v-layout>
 				</v-flex>
-				<v-flex v-if="totalTime">
+				<v-flex v-show="job.file.printTime && !state.isSimulating">
+					<v-layout column>
+						<v-flex tag="strong">
+							{{ $t('panel.jobEstimations.slicer') }}
+						</v-flex>
+						<v-flex>
+							{{ $displayTime(state.isPrinting ? Math.max(0, job.file.printTime - job.duration) : job.file.printTime) }}
+						</v-flex>
+					</v-layout>
+				</v-flex>
+				<v-flex v-show="job.file.simulatedTime && !state.isSimulating">
 					<v-layout column>
 						<v-flex tag="strong">
 							{{ $t('panel.jobEstimations.simulation') }}
 						</v-flex>
 						<v-flex>
-							{{ $displayTime(Math.max(0, totalTime - job.duration)) }}
+							{{ $displayTime(state.isPrinting ? Math.max(0, job.file.simulatedTime - job.duration) : job.file.simulatedTime) }}
 						</v-flex>
 					</v-layout>
 				</v-flex>
@@ -57,12 +67,6 @@
 import { mapState } from 'vuex'
 
 export default {
-	computed: {
-		...mapState('machine/model', ['job']),
-		totalTime() {
-			// Simulated times are usually more accurate than the slicers' print time estmations
-			return this.job.file.simulatedTime ? this.job.file.simulatedTime : this.job.file.printTime;
-		}
-	}
+	computed: mapState('machine/model', ['job', 'state'])
 }
 </script>
diff --git a/src/components/panels/SettingsAboutPanel.vue b/src/components/panels/SettingsAboutPanel.vue
index 1bfc21b61..0b83d267b 100644
--- a/src/components/panels/SettingsAboutPanel.vue
+++ b/src/components/panels/SettingsAboutPanel.vue
@@ -1,7 +1,7 @@
 <template>
 	<v-card>
 		<v-card-title>
-			<span>Duet Web Control 2.0.0-RC5</span>
+			<span>Duet Web Control 2.0.0-RC6</span>
 			<v-spacer></v-spacer>
 			<a href="https://github.com/chrishamm/DuetWebControl/tree/next" target="_blank">
 				<v-icon small>star</v-icon> GitHub
diff --git a/src/components/panels/ToolsPanel.vue b/src/components/panels/ToolsPanel.vue
index f8fb51e46..8762a9516 100644
--- a/src/components/panels/ToolsPanel.vue
+++ b/src/components/panels/ToolsPanel.vue
@@ -67,7 +67,7 @@ table.extra tr > td:first-child {
 					</thead>
 					<tbody>
 						<template v-for="(tool, index) in tools">
-							<tr :class="{ [selectedToolClass] : tool.number === state.currentTool }" :key="`tool-${index}-${tool.heaters.length && tool.heaters[0]}`">
+							<tr :class="{ [selectedToolClass] : (tool.number === state.currentTool) }" :key="`tool-${index}-${tool.heaters.length && tool.heaters[0]}`">
 								<th :rowspan="Math.max(1, tool.heaters.length)" class="pl-2" :class="{ 'pt-2 pb-2' : !tool.heaters.length}">
 									<a href="#" @click.prevent="toolClick(tool)">
 										{{ tool.name || $t('panel.tools.tool', [tool.number]) }}
@@ -318,7 +318,7 @@ export default {
 			return !this.uiFrozen && this.heat.heaters.some(heater => heater.state);
 		},
 		selectedToolClass() {
-			return this.darkTheme ? 'grey darken-3' : 'grey lighten-4';
+			return this.darkTheme ? 'grey darken-3' : 'blue lighten-5';
 		}
 	},
 	data() {
diff --git a/src/i18n/en.js b/src/i18n/en.js
index 39386bd23..6165ca386 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -204,7 +204,6 @@ export default {
 		invalidPassword: 'Invalid password!',
 		noFreeSession: 'No more free sessions!',
 		connect: 'Failed to connect to {0}',
-		connectionError: 'Failed to maintain connection to {0}',
 		disconnect: 'Could not disconnect cleanly from {0}',
 		disconnected: 'Could not complete action because the connection has been terminated',
 		cancelled: 'Operation has been cancelled',
@@ -228,6 +227,14 @@ export default {
 		filamentsLoadFailed: 'Failed to load filaments',
 		move: 'Failed to move {0} to {1}'
 	},
+	events: {
+		connected: 'Connected to {0}',
+		connectionLost: 'Failed to maintain connection to {0}',
+		emergencyStop: 'Emergency stop, attemping to reconnect...',
+		reconnecting: 'Connection interrupted, attempting to reconnect...',
+		reconnected: 'Connection established',
+		disconnected: 'Disconnected from {0}'
+	},
 	generic: {
 		ok: 'OK',
 		cancel: 'Cancel',
@@ -378,7 +385,6 @@ export default {
 			message: 'Please stand by while your files are being compressed...',
 			errorTitle: 'Failed to compress files'
 		},
-		connected: 'Connected to {0}',
 		delete: {
 			errorTitle: 'Failed to delete {0}',
 			errorMessageDirectory: 'Please make sure that this directory is empty',
@@ -390,7 +396,6 @@ export default {
 			errorStillLoaded: 'At least one of the selected filaments is still loaded. Please unload them before you proceed',
 			errorSubDirectories: 'The filament {0} contains sub-directories. Please delete them manually and try again.'
 		},
-		disconnected: 'Disconnected from {0}',
 		download: {
 			title: 'Downloading {0} @ {1}, {2}% complete',
 			message: 'Please stand by while the file is being downloaded...',
@@ -399,7 +404,7 @@ export default {
 			error: 'Failed to download {0}'
 		},
 		loadingFile: {
-			title: 'Loading file',
+			title: 'Loading file...',
 			message: 'This file is relatively big so it may take a while before it is displayed.'
 		},
 		message: 'Message',
@@ -508,7 +513,7 @@ export default {
 		},
 		jobData: {
 			caption: 'Collected Data',
-			warmUpTime: 'Warm-Up Time',
+			warmUpDuration: 'Warm-Up Time',
 			currentLayerTime: 'Current Layer Time',
 			lastLayerTime: 'Last Layer Time',
 			jobDuration: 'Job Duration'
@@ -518,6 +523,7 @@ export default {
 			filament: 'Based on Filament Usage',
 			file: 'Based on File Progress',
 			layer: 'Based on Layer Time',
+			slicer: 'Based on Slicer',
 			simulation: 'Based on Simulation'
 		},
 		jobInfo: {
diff --git a/src/main.js b/src/main.js
index 3d9692287..f75f7ca6f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,7 +13,6 @@ import router from './routes'
 import store from './store'
 
 Vue.config.productionTip = false
-window.Vue = Vue
 
 Vue.use(plugins)
 Vue.use(Vuetify, {
diff --git a/src/plugins/display.js b/src/plugins/display.js
index 33d253972..6deff80b5 100644
--- a/src/plugins/display.js
+++ b/src/plugins/display.js
@@ -71,7 +71,7 @@ export function displaySpeed(bytesPerSecond) {
 }
 
 export function displayTime(value, showTrailingZeroes = false) {
-	if (isNaN(value)) {
+	if (value === null || isNaN(value)) {
 		return i18n.t('generic.noValue');
 	}
 
diff --git a/src/store/index.js b/src/store/index.js
index 1e5038787..7866f7140 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -39,7 +39,7 @@ const store = new Vuex.Store({
 	},
 	actions: {
 		// Connect to the given hostname using the specified credentials
-		async connect({ state, commit, dispatch }, { hostname, username = defaultUsername, password = defaultPassword } = { hostname: location.host, username: defaultUsername, password: defaultPassword }) {
+		async connect({ state, commit, dispatch }, { hostname = location.host, username = defaultUsername, password = defaultPassword } = {}) {
 			if (!hostname || hostname === defaultMachine) {
 				throw new Error('Invalid hostname');
 			}
@@ -58,7 +58,7 @@ const store = new Vuex.Store({
 				connectorInstance.register(moduleInstance);
 
 				commit('setSelectedMachine', hostname);
-				logGlobal('success', i18n.t('notification.connected', [hostname]));
+				logGlobal('success', i18n.t('events.connected', [hostname]));
 
 				if (state.isLocal) {
 					commit('settings/setLastHostname', hostname);
@@ -77,7 +77,7 @@ const store = new Vuex.Store({
 		},
 
 		// Disconnect from the given hostname
-		async disconnect({ state, commit, dispatch }, { hostname, doDisconnect = true } = { hostname: state.selectedMachine, doDisconnect: true }) {
+		async disconnect({ state, commit, dispatch }, { hostname = state.selectedMachine, doDisconnect = true } = {}) {
 			if (!hostname || hostname === defaultMachine) {
 				throw new Error('Invalid hostname');
 			}
@@ -92,7 +92,7 @@ const store = new Vuex.Store({
 				commit('setDisconnecting', true);
 				try {
 					await dispatch(`machines/${hostname}/disconnect`);
-					logGlobal('success', i18n.t('notification.disconnected', [hostname]));
+					logGlobal('success', i18n.t('events.disconnected', [hostname]));
 					// Disconnecting must always work - even if it does not always happen cleanly
 				} catch (e) {
 					logGlobal('warning', i18n.t('error.disconnect', [hostname]), e.message);
@@ -120,13 +120,15 @@ const store = new Vuex.Store({
 
 		// Called when a machine cannot stay connected
 		async onConnectionError({ state, dispatch, commit }, { hostname, error }) {
-			logGlobal('error', i18n.t('error.connectionError', [hostname]), error.message);
 			if (error instanceof InvalidPasswordError) {
+				logGlobal('error', i18n.t('events.connectionLost', [hostname]), error.message);
 				await dispatch('disconnect', { hostname, doDisconnect: false });
 				commit('askForPassword');
 			} else if (state.isLocal) {
+				logGlobal('error', i18n.t('events.connectionLost', [hostname]), error.message);
 				await dispatch('disconnect', { hostname, doDisconnect: false });
 			} else {
+				logGlobal('warning', i18n.t('events.reconnecting', [hostname]), error.message);
 				dispatch(`machines/${hostname}/reconnect`);
 			}
 		}
diff --git a/src/store/machine/connector/PollConnector.js b/src/store/machine/connector/PollConnector.js
index 761066eae..44c07486f 100644
--- a/src/store/machine/connector/PollConnector.js
+++ b/src/store/machine/connector/PollConnector.js
@@ -414,16 +414,31 @@ export default class PollConnector extends BaseConnector {
 			newData.job  = {
 				file: {},
 				filePosition: response.data.filePosition,
-				extrudedRaw: response.data.extrRaw,
-				duration: response.data.printDuration,
-				layer: response.data.currentLayer,
-				layerTime: response.data.currentLayerTime,
-				warmUpDuration: response.data.warmUpDuration,
-				timesLeft: {
-					file: response.data.timesLeft.file,
-					filament: response.data.timesLeft.filament,
-					layer: response.data.timesLeft.layer
-				}
+				extrudedRaw: response.data.extrRaw
+			}
+
+			// Update some stats only if the print is still live
+			if (isPrinting) {
+				quickPatch(newData.job, {
+					duration: response.data.printDuration,
+					layer: response.data.currentLayer,
+					layerTime: response.data.currentLayerTime,
+					warmUpDuration: response.data.warmUpDuration,
+					timesLeft: {
+						file: response.data.timesLeft.file,
+						filament: response.data.timesLeft.filament,
+						layer: response.data.timesLeft.layer
+					}
+				});
+			} else {
+				quickPatch(newData.job, {
+					layerTime: null,
+					timesLeft: {
+						file: null,
+						filament: null,
+						layer: null
+					}
+				});
 			}
 
 			// See if we need to record more layer stats
diff --git a/src/store/machine/index.js b/src/store/machine/index.js
index 97b265933..3c7023176 100644
--- a/src/store/machine/index.js
+++ b/src/store/machine/index.js
@@ -187,9 +187,17 @@ export default function(hostname, connector) {
 				// Is an update or emergency reset in progress?
 				const reconnect = (state.model.state.status === 'updating') || (state.model.state.status === 'halted');
 				if (reconnect) {
-					commit('setReconnecting', true);
+					if (!state.isReconnecting) {
+						if (state.model.state.status === 'halted') {
+							log('warning', i18n.t('events.emergencyStop'));
+						} else {
+							log('warning', i18n.t('events.reconnecting'));
+						}
+						commit('setReconnecting', true);
+					}
 				} else {
 					if (state.isReconnecting) {
+						log('success', i18n.t('events.reconnected'));
 						commit('setReconnecting', false);
 					}
 					
diff --git a/src/store/machine/model.js b/src/store/machine/model.js
index 15f7473d9..e05a60842 100644
--- a/src/store/machine/model.js
+++ b/src/store/machine/model.js
@@ -233,17 +233,6 @@ export default function(connector) {
 					} else if (wasPrinting) {
 						state.state.isSimulating = false;
 
-						for (let key in state.job) {
-							if (!(state.job[key] instanceof Array)) {
-								if (state.job[key] instanceof Object) {
-									for (let subkey in state.job[key]) {
-										state.job[key][subkey] = null;
-									}
-								} else {
-									state.job[key] = null;
-								}
-							}
-						}
 						state.job.lastFileName = lastJobFile;
 						state.job.lastFileSimulated = wasSimulating;
 					}
diff --git a/src/utils/colors.js b/src/utils/colors.js
index f278cfa58..600b3583c 100644
--- a/src/utils/colors.js
+++ b/src/utils/colors.js
@@ -9,12 +9,12 @@ const heaterColors = [
 	'lime',
 	'black',
 	'purple',
+	'yellow',
 	'teal',
 	'brown',
 	'deep-orange',
 	'pink',
-	'blue-grey',
-	'yellow'
+	'blue-grey'
 ]
 
 export function getHeaterColor(heater) {