bfg-common 1.5.421 → 1.5.423

package/components/common/spiceConsole/SpiceConsole.vue

@@ -1,127 +1,127 @@
-<template>
-  <div ref="fullScreen" class="spice-console">
-    <div id="vmw" ref="vmScreen" @scroll="onConsoleScroll"></div>
-    <common-spice-console-drawer
-      @toggle-fullscreen="toggle"
-      @send-alt-command="onSendAltCommand"
-    />
-  </div>
-</template>
-<script setup lang="ts">
-import { useFullscreen } from '@vueuse/core'
-import RFB from '@novnc/novnc/core/rfb.js'
-import SpiceConsole from '~/plugins/spice-console/spice.console'
-
-const props = defineProps<{
-  wsUrl: string
-  vmType: string
-  vmId: string
-  host: string
-  port: number
-}>()
-
-let rfb: any
-const vmScreen = ref<any>(null)
-const fullScreen = ref<any>(null)
-const { toggle } = useFullscreen(fullScreen)
-
-const connectWS = (): void => {
-  if (props.vmType === 'VNC') {
-    connectVNC()
-  } else if (props.vmType === 'SPICE') {
-    SpiceConsole.init(props.wsUrl)
-  }
-}
-
-const connectVNC = (): void => {
-  rfb = new RFB(vmScreen.value, props.wsUrl, {
-    protocols: {},
-  })
-}
-
-const vmDisconnect = (): void => {
-  if (props.vmType === 'VNC') {
-    if (rfb) {
-      rfb.disconnect()
-    }
-  }
-}
-
-const onSendAltCommand = (): void => {
-  // @ts-ignore
-  window.app.sendCtrlAltDelete()
-}
-
-const onConsoleScroll = (event: any): void => {
-  app.clientGui.setClientOffset(
-    app.clientGui.clientOffsetX,
-    event.target.scrollTop
-  )
-}
-
-const blockCtrlOrCmdCommands = (e): void => {
-  const blockedKeys = [
-    'e',
-    's',
-    'p',
-    'u',
-    'r',
-    'o',
-    'i',
-    'j',
-    'k',
-    'n',
-    't',
-    'w',
-    'h',
-    'd',
-  ]
-
-  const key = e.key
-  const ctrlOrCmd = e.ctrlKey || e.metaKey
-
-  // Block Ctrl+key or Cmd+key
-  if (ctrlOrCmd && blockedKeys.includes(key.toLowerCase())) {
-    e.preventDefault()
-    e.stopPropagation()
-    // console.log(`Blocked key: ${key}`);
-    return false
-  }
-
-  // Optionally block right-click menu key (context menu)
-  // if (e.key === 'ContextMenu') {
-  //   e.preventDefault();
-  //   return false;
-  // }
-
-  // Optional: block F5/Reload with Ctrl+R as fallback
-  // if (key === 'F5' || (ctrlOrCmd && key.toLowerCase() === 'r')) {
-  //   e.preventDefault();
-  //   return false;
-  // }
-}
-onMounted(() => {
-  connectWS()
-  document.addEventListener('keydown', blockCtrlOrCmdCommands)
-})
-
-onBeforeUnmount(() => {
-  vmDisconnect()
-  document.removeEventListener('keydown', blockCtrlOrCmdCommands)
-})
-</script>
-<style scoped lang="scss">
-.spice-console {
-  width: 100vw;
-  height: 100vh;
-  overflow: hidden;
-  position: relative;
-}
-#vmw {
-  overflow-y: auto;
-  overflow-x: auto;
-  position: relative;
-  height: 100vh;
-  background-color: #000;
-}
-</style>
+<template>
+  <div ref="fullScreen" class="spice-console">
+    <div id="vmw" ref="vmScreen" @scroll="onConsoleScroll"></div>
+    <common-spice-console-drawer
+      @toggle-fullscreen="toggle"
+      @send-alt-command="onSendAltCommand"
+    />
+  </div>
+</template>
+<script setup lang="ts">
+import { useFullscreen } from '@vueuse/core'
+import RFB from '@novnc/novnc/core/rfb.js'
+import SpiceConsole from '~/plugins/spice-console/spice.console'
+
+const props = defineProps<{
+  wsUrl: string
+  vmType: string
+  vmId: string
+  host: string
+  port: number
+}>()
+
+let rfb: any
+const vmScreen = ref<any>(null)
+const fullScreen = ref<any>(null)
+const { toggle } = useFullscreen(fullScreen)
+
+const connectWS = (): void => {
+  if (props.vmType === 'VNC') {
+    connectVNC()
+  } else if (props.vmType === 'SPICE') {
+    SpiceConsole.init(props.wsUrl)
+  }
+}
+
+const connectVNC = (): void => {
+  rfb = new RFB(vmScreen.value, props.wsUrl, {
+    protocols: {},
+  })
+}
+
+const vmDisconnect = (): void => {
+  if (props.vmType === 'VNC') {
+    if (rfb) {
+      rfb.disconnect()
+    }
+  }
+}
+
+const onSendAltCommand = (): void => {
+  // @ts-ignore
+  window.app.sendCtrlAltDelete()
+}
+
+const onConsoleScroll = (event: any): void => {
+  app.clientGui.setClientOffset(
+    app.clientGui.clientOffsetX,
+    event.target.scrollTop
+  )
+}
+
+const blockCtrlOrCmdCommands = (e): void => {
+  const blockedKeys = [
+    'e',
+    's',
+    'p',
+    'u',
+    'r',
+    'o',
+    'i',
+    'j',
+    'k',
+    'n',
+    't',
+    'w',
+    'h',
+    'd',
+  ]
+
+  const key = e.key
+  const ctrlOrCmd = e.ctrlKey || e.metaKey
+
+  // Block Ctrl+key or Cmd+key
+  if (ctrlOrCmd && blockedKeys.includes(key.toLowerCase())) {
+    e.preventDefault()
+    e.stopPropagation()
+    // console.log(`Blocked key: ${key}`);
+    return false
+  }
+
+  // Optionally block right-click menu key (context menu)
+  // if (e.key === 'ContextMenu') {
+  //   e.preventDefault();
+  //   return false;
+  // }
+
+  // Optional: block F5/Reload with Ctrl+R as fallback
+  // if (key === 'F5' || (ctrlOrCmd && key.toLowerCase() === 'r')) {
+  //   e.preventDefault();
+  //   return false;
+  // }
+}
+onMounted(() => {
+  connectWS()
+  document.addEventListener('keydown', blockCtrlOrCmdCommands)
+})
+
+onBeforeUnmount(() => {
+  vmDisconnect()
+  document.removeEventListener('keydown', blockCtrlOrCmdCommands)
+})
+</script>
+<style scoped lang="scss">
+.spice-console {
+  width: 100vw;
+  height: 100vh;
+  overflow: hidden;
+  position: relative;
+}
+#vmw {
+  overflow-y: auto;
+  overflow-x: auto;
+  position: relative;
+  height: 100vh;
+  background-color: #000;
+}
+</style>

package/components/common/spiceConsole/lib/models/interfaces.ts

@@ -1,5 +1,5 @@
-export interface UI_I_DeviceOption {
-  label: string
-  value: any
-  disabled?: boolean
-}
+export interface UI_I_DeviceOption {
+  label: string
+  value: any
+  disabled?: boolean
+}

package/components/common/split/horizontal/HorizontalNew.vue

@@ -216,12 +216,29 @@ onUnmounted(() => {
 
 <style>
 :root.is-new-view {
+  --split-horizontal-border-color: #e9ebed;
+  --horizontal-panel-bg-color: #fff;
+  --trigger-bg-color: #e9ebeda3;
+  --trigger-color: #213444;
+  --new-gutter-bg-color: #e9ebed;
+  --new-gutter-hover-bg-color: #008fd6;
+  --new-gutter-before-bg-color: rgba(255, 255, 255, 0.8);
+
   /*rtl*/
   --horizontal-split-button-border-radius: 4px 0 0 4px;
   --horizontal-split-button-border-radius-collapsed: 0 4px 4px 0;
   --horizontal-split-button-rotate: 90deg;
   --horizontal-split-button-rotate-collapsed: -90deg;
 }
+:root.dark-theme {
+  --split-horizontal-border-color: #e9ebed1f;
+  --horizontal-panel-bg-color: #213444;
+  --trigger-bg-color: #314352;
+  --trigger-color: #e9ebed;
+  --new-gutter-bg-color: #394a58;
+  --new-gutter-hover-bg-color: #2ba2de;
+  --new-gutter-before-bg-color: rgba(33, 52, 68, 0.8);
+}
 :root.is-new-view[dir='rtl'] {
   --horizontal-split-button-border-radius: 0 4px 4px 0;
   --horizontal-split-button-border-radius-collapsed: 4px 0 0 4px;
@@ -256,8 +273,8 @@ onUnmounted(() => {
         align-items: center;
         justify-content: space-between;
         min-height: 48px;
-        border-bottom: 1px solid var(--new-split-horizontal-border-color);
-        background-color: var(--new-horizontal-panel-bg-color);
+        border-bottom: 1px solid var(--split-horizontal-border-color);
+        background-color: var(--horizontal-panel-bg-color);
 
         &.collapsed {
           border: none;
@@ -283,8 +300,8 @@ onUnmounted(() => {
           border: 0;
           padding: 0;
           margin: 0;
-          background-color: var(--new-trigger-bg-color);
-          color: var(--new-trigger-color);
+          background-color: var(--trigger-bg-color);
+          color: var(--trigger-color);
           outline: none;
           cursor: pointer;
           border-radius: var(--horizontal-split-button-border-radius);
@@ -301,7 +318,7 @@ onUnmounted(() => {
         .panel-inner {
           position: relative;
           height: 100%;
-          background: var(--new-horizontal-panel-bg-color);
+          background: var(--horizontal-panel-bg-color);
           border-radius: 0;
           border: 0;
 

package/components/common/split/horizontal/HorizontalOld.vue

@@ -185,6 +185,13 @@ onUnmounted(() => {
 </script>
 
 <style>
+:root:not(.is-new-view) {
+  --horizontal-panel-bg-color: #fff;
+}
+:root:not(.is-new-view).dark-theme {
+  --horizontal-panel-bg-color: #1b2a32;
+}
+
 :root {
   --horizontal-split-button-border-right: 1px solid var(--global-border-color);
   --horizontal-split-button-border-left: none;
@@ -264,7 +271,7 @@ onUnmounted(() => {
         .panel-inner {
           position: relative;
           height: 100%;
-          background: var(--old-horizontal-panel-bg-color);
+          background: var(--horizontal-panel-bg-color);
           border-radius: 0;
           border: 0;
 

package/components/common/split/vertical/VerticalNew.vue

@@ -38,6 +38,17 @@ const props = defineProps<{
 }>()
 </script>
 
+<style>
+:root {
+  --gutter-handler-active-bg-color: #ffffffcc;
+  --second-panel-box-shadow: 0 4px 20px 0 #0000001f;
+}
+:root.dark-theme {
+  --gutter-handler-active-bg-color: #213444cc;
+  --second-panel-box-shadow: 0 4px 20px 0 #0000001f, 0 -1px 12px 0 #00000014;
+}
+</style>
+
 <style scoped lang="scss">
 .fill-parent {
   &.dragging {
@@ -84,7 +95,7 @@ const props = defineProps<{
       cursor: row-resize;
 
       &:before {
-        background-color: var(--new-gutter-handler-active-bg-color);
+        background-color: var(--gutter-handler-active-bg-color);
       }
     }
 
@@ -106,7 +117,7 @@ const props = defineProps<{
     height: auto;
     overflow: hidden;
     flex: 1;
-    box-shadow: var(--new-second-panel-box-shadow);
+    box-shadow: var(--second-panel-box-shadow);
     //z-index: calc(var(--z-default) + 1);
   }
 }

package/components/common/summary/notification/NotificationNew.vue

@@ -73,11 +73,27 @@ watch(
 )
 </script>
 
+<style>
+:root {
+  --summary-notification-item-text: #4d5d69;
+  --summary-notification-action-toggle: #4d5d69;
+  --summary-notification-action-toggle-border: #e9ebed;
+  --summary-notification-action-active-toggle: #008fd6;
+}
+
+:root.dark-theme {
+  --summary-notification-item-text: #e9eaec;
+  --summary-notification-action-toggle: #e9eaec;
+  --summary-notification-action-toggle-border: rgba(233, 235, 237, 0.12);
+  --summary-notification-action-active-toggle: #2ba2de;
+}
+</style>
+
 <style scoped lang="scss">
 .notification-item-text {
   font-size: 14px;
   font-weight: 400;
-  color: var(--new-summary-notification-item-text);
+  color: var(--summary-notification-item-text);
   line-height: 16.94px;
   margin-right: 16px;
 }
@@ -88,7 +104,7 @@ watch(
 
   .actions-toggle-button {
     width: 100%;
-    color: var(--new-summary-notification-action-toggle);
+    color: var(--summary-notification-action-toggle);
     font-weight: 500;
     display: flex;
     align-items: center;
@@ -98,13 +114,13 @@ watch(
     outline: unset;
     padding: 8px 0 8px 16px;
     background: unset;
-    border-left: solid 1px var(--new-summary-notification-action-toggle-border);
+    border-left: solid 1px var(--summary-notification-action-toggle-border);
     cursor: pointer;
     font-family: 'Inter', sans-serif;
     font-size: 14px;
 
     &.active {
-      color: var(--new-summary-notification-action-active-toggle);
+      color: var(--summary-notification-action-active-toggle);
 
       .arrow-icon-content {
         transform: rotateZ(0deg);

package/components/common/titleBar/titleBarNew/notification/Notification.vue

@@ -195,6 +195,37 @@ watch(
 )
 </script>
 
+<style>
+:root {
+  --summary-action-btn-color: #213444;
+  --summary-action-btn-hover-color: #1b2a37;
+  --summary-action-btn-active-border-color: #008fd6;
+  --summary-dropdown-notifications-bg-color: #ffffff;
+  --summary-dropdown-notifications-title-color: #4d5d69;
+  --summary-dropdown-notifications-mark-all-color: #008fd6;
+  --summary-dropdown-tabs-content-border-color: #e9ebed;
+  --summary-dropdown-notification-item-new-bg-color: #008fd60f;
+  --summary-dropdown-notification-item-hover-bg-color: #e9ebed66;
+  --summary-dropdown-notification-item-hover-action-color: #008fd6;
+  --summary-dropdown-notification-item-text-color: #4d5d69;
+  --summary-dropdown-notification-item-action-color: #4d5d69;
+}
+:root.dark-theme {
+  --summary-action-btn-color: #e9eaec;
+  --summary-action-btn-hover-color: #ffffff;
+  --summary-action-btn-active-border-color: #2ba2de;
+  --summary-dropdown-notifications-bg-color: #334453;
+  --summary-dropdown-notifications-title-color: #e9eaec;
+  --summary-dropdown-notifications-mark-all-color: #2ba2de;
+  --summary-dropdown-tabs-content-border-color: #e9ebed1f;
+  --summary-dropdown-notification-item-new-bg-color: #2ba2de0f;
+  --summary-dropdown-notification-item-hover-bg-color: #e9ebed0f;
+  --summary-dropdown-notification-item-hover-action-color: #2ba2de;
+  --summary-dropdown-notification-item-text-color: #e9eaec;
+  --summary-dropdown-notification-item-action-color: #e9eaec;
+}
+</style>
+
 <style scoped lang="scss">
 .notification-content {
   #notification-toggle {