Merge pull request #1015 from bridge-core/dev

Multiple Bug Fixes

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bridge",
-	"version": "2.7.4",
+	"version": "2.7.5",
 	"private": true,
 	"scripts": {
 		"dev": "vite",

src/App.vue

@@ -2,7 +2,7 @@
 	<v-app
 		ref="appContainer"
 		:style="{ fontFamily }"
-		@contextmenu.native="/*$event.preventDefault()*/"
+		@contextmenu.native="$event.preventDefault()"
 	>
 		<!-- We need access to native menus in order to hide the custom one on MacOS -->
 		<!-- <Toolbar v-if="!isMacOs" /> -->

src/components/Actions/Actions.ts

@@ -10,7 +10,7 @@ import { platform } from '/@/utils/os'
 
 export function setupActions(app: App) {
 	addViewActions(app)
-	addToolActions(app)
+	// addToolActions(app)
 	addEditActions(app)
 }
 

src/components/Compiler/Window/Logs.vue

@@ -1,7 +1,7 @@
 <template>
 	<div v-if="data.length > 0" ref="scrollElement">
 		<Sheet
-			v-for="([msg, { type }], i) in getReversedData()"
+			v-for="([msg, { type }], i) in data"
 			:key="`${type}//${msg}//${i}`"
 			class="pa-2 mb-2 d-flex"
 			style="overflow: auto"
@@ -66,9 +66,6 @@ export default {
 		getMessageParts(msg) {
 			return msg.split('\n')
 		},
-		getReversedData() {
-			return this.data.slice().reverse()
-		},
 	},
 	watch: {
 		data() {

src/components/Projects/ProjectManager.ts

@@ -372,7 +372,7 @@ export class ProjectManager extends Signal<void> {
 		// Sometimes a the writer await will resolve before the poller actually detects the change so we need to wait a tiny bit before unlocking to catch the delay
 		setTimeout(() => {
 			this.projectBeingModified--
-		}, 1)
+		}, 10)
 	}
 	async handleWatchEvent(event: any) {
 		if (this.selectedProject === null) return
@@ -392,8 +392,8 @@ export class ProjectManager extends Signal<void> {
 
 		if (this.projectBeingModified > 0) return
 
-		const app = await App.getApp()
+		// const app = await App.getApp()
 
-		app.actionManager.trigger('bridge.action.refreshProject')
+		// app.actionManager.trigger('bridge.action.refreshProject')
 	}
 }

src/components/Toolbar/Category/tools.ts

@@ -89,5 +89,79 @@ export function setupToolsCategory(app: App) {
 		})
 	)
 
+	tools.addItem(new Divider())
+
+	tools.addItem(
+		app.actionManager.create({
+			icon: 'mdi-folder-refresh-outline',
+			name: 'general.reloadBridge.name',
+			description: 'general.reloadBridge.description',
+			keyBinding: 'Ctrl + R',
+			onTrigger: () => {
+				location.reload()
+			},
+		})
+	)
+	tools.addItem(
+		app.actionManager.create({
+			id: 'bridge.action.refreshProject',
+			icon: 'mdi-folder-refresh-outline',
+			name: 'packExplorer.refresh.name',
+			description: 'packExplorer.refresh.description',
+			keyBinding:
+				platform() === 'win32' ? 'Ctrl + Alt + R' : 'Ctrl + Meta + R',
+			onTrigger: async () => {
+				if (app.isNoProjectSelected) return
+				await app.projectManager.projectReady.fired
+
+				await app.project.refresh()
+			},
+		})
+	)
+	tools.addItem(
+		app.actionManager.create({
+			icon: 'mdi-reload',
+			name: 'actions.reloadAutoCompletions.name',
+			description: 'actions.reloadAutoCompletions.description',
+			keyBinding: 'Ctrl + Shift + R',
+			onTrigger: async () => {
+				if (app.isNoProjectSelected) return
+				await app.projectManager.projectReady.fired
+
+				app.project.jsonDefaults.reload()
+			},
+		})
+	)
+	tools.addItem(
+		app.actionManager.create({
+			icon: 'mdi-puzzle-outline',
+			name: 'actions.reloadExtensions.name',
+			description: 'actions.reloadExtensions.description',
+			onTrigger: async () => {
+				// Global extensions
+				app.extensionLoader.disposeAll()
+				app.extensionLoader.loadExtensions()
+
+				if (app.isNoProjectSelected) return
+				await app.projectManager.projectReady.fired
+
+				// Local extensions
+				app.project.extensionLoader.disposeAll()
+				app.project.extensionLoader.loadExtensions()
+			},
+		})
+	)
+
+	tools.addItem(new Divider())
+
+	tools.addItem(
+		app.actionManager.create({
+			icon: 'mdi-cancel',
+			name: 'actions.clearAllNotifications.name',
+			description: 'actions.clearAllNotifications.description',
+			onTrigger: () => clearAllNotifications(),
+		})
+	)
+
 	App.toolbar.addCategory(tools)
 }

src/locales/languages.json

@@ -40,5 +40,11 @@
 		"name": "Nederlands",
 		"file": "nl.json",
 		"codes": ["nl-NL"]
+	},
+	{
+		"id": "russian",
+		"name": "Русский",
+		"file": "ru.json",
+		"codes": ["ru-RU"]
 	}
 ]