mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Merge branch 'develop' into dependabot/npm_and_yarn/gui/develop/electron-log-5.0.3
This commit is contained in:
commit
2f0f7da8f4
|
@ -38,7 +38,6 @@ import { Scatter } from "vue-chartjs";
|
||||||
let count = ref(0);
|
let count = ref(0);
|
||||||
let grid = null; // DO NOT use ref(null) as proxies GS will break all logic when comparing structures... see https://github.com/gridstack/gridstack.js/issues/2115
|
let grid = null; // DO NOT use ref(null) as proxies GS will break all logic when comparing structures... see https://github.com/gridstack/gridstack.js/issues/2115
|
||||||
let items = ref([]);
|
let items = ref([]);
|
||||||
let gridEnabledLocal = ref(true);
|
|
||||||
class gridWidget {
|
class gridWidget {
|
||||||
//Contains the vue component
|
//Contains the vue component
|
||||||
component2;
|
component2;
|
||||||
|
@ -356,6 +355,7 @@ onMounted(() => {
|
||||||
},
|
},
|
||||||
false,
|
false,
|
||||||
);
|
);
|
||||||
|
setGridEditState();
|
||||||
});
|
});
|
||||||
function onChange(event, changeItems) {
|
function onChange(event, changeItems) {
|
||||||
// update item position
|
// update item position
|
||||||
|
@ -432,9 +432,15 @@ function remove(widget) {
|
||||||
grid.removeWidget(selector, false);
|
grid.removeWidget(selector, false);
|
||||||
saveGridLayout();
|
saveGridLayout();
|
||||||
}
|
}
|
||||||
function disableGrid() {
|
function toggleGridEdit() {
|
||||||
gridEnabledLocal.value = !gridEnabledLocal.value
|
//Toggle setting
|
||||||
if (gridEnabledLocal.value)
|
settingsStore.local.grid_enabled = !settingsStore.local.grid_enabled
|
||||||
|
setGridEditState();
|
||||||
|
}
|
||||||
|
function setGridEditState()
|
||||||
|
{
|
||||||
|
//Apply grid state setting (allows/disallows moving, resizing, showing remove icon)
|
||||||
|
if (settingsStore.local.grid_enabled)
|
||||||
grid.enable();
|
grid.enable();
|
||||||
else
|
else
|
||||||
grid.disable();
|
grid.disable();
|
||||||
|
@ -487,7 +493,7 @@ function quickfill() {
|
||||||
<button
|
<button
|
||||||
@click="remove(w)"
|
@click="remove(w)"
|
||||||
class="btn-close grid-stack-floaty-btn"
|
class="btn-close grid-stack-floaty-btn"
|
||||||
:class="gridEnabledLocal === true ? 'visible':'invisible'"
|
:class="settingsStore.local.grid_enabled === true ? 'visible':'invisible'"
|
||||||
></button>
|
></button>
|
||||||
<component :is="w.component2" />
|
<component :is="w.component2" />
|
||||||
</div>
|
</div>
|
||||||
|
@ -506,12 +512,13 @@ function quickfill() {
|
||||||
<div class="offcanvas-header">
|
<div class="offcanvas-header">
|
||||||
<h5 class="offcanvas-title" id="offcanvasGridItemsLabel">
|
<h5 class="offcanvas-title" id="offcanvasGridItemsLabel">
|
||||||
Manage grid widgets <button
|
Manage grid widgets <button
|
||||||
class="btn btn-sm btn-outline-info"
|
class="btn btn-sm"
|
||||||
|
:class="settingsStore.local.grid_enabled == true ? 'btn-outline-success' : 'btn-outline-danger'"
|
||||||
type="button"
|
type="button"
|
||||||
@click="disableGrid"
|
@click="toggleGridEdit"
|
||||||
title="Lock/unloack changes to grid"
|
title="Lock/unloack changes to grid"
|
||||||
>
|
>
|
||||||
<i class="bi" :class="gridEnabledLocal == true ? 'bi-unlock-fill' : 'bi-lock-fill'"></i>
|
<i class="bi" :class="settingsStore.local.grid_enabled == true ? 'bi-unlock-fill' : 'bi-lock-fill'"></i>
|
||||||
</button>
|
</button>
|
||||||
</h5>
|
</h5>
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ nconf.defaults({
|
||||||
enable_sys_notification: false,
|
enable_sys_notification: false,
|
||||||
grid_layout: "[]",
|
grid_layout: "[]",
|
||||||
grid_preset: "[]",
|
grid_preset: "[]",
|
||||||
|
grid_enabled: true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -36,6 +37,7 @@ export const settingsStore = reactive({
|
||||||
enable_sys_notification: false,
|
enable_sys_notification: false,
|
||||||
grid_layout: "[]",
|
grid_layout: "[]",
|
||||||
grid_preset: "[]",
|
grid_preset: "[]",
|
||||||
|
grid_enabled: true,
|
||||||
},
|
},
|
||||||
remote: {
|
remote: {
|
||||||
AUDIO: {
|
AUDIO: {
|
||||||
|
|
|
@ -32,7 +32,7 @@ class FrameHandler():
|
||||||
call_with_ssid = self.config['STATION']['mycall'] + "-" + str(self.config['STATION']['myssid'])
|
call_with_ssid = self.config['STATION']['mycall'] + "-" + str(self.config['STATION']['myssid'])
|
||||||
ft = self.details['frame']['frame_type']
|
ft = self.details['frame']['frame_type']
|
||||||
print(self.details)
|
print(self.details)
|
||||||
|
valid = False
|
||||||
# Check for callsign checksum
|
# Check for callsign checksum
|
||||||
if ft in ['ARQ_SESSION_OPEN', 'ARQ_SESSION_OPEN_ACK', 'PING', 'PING_ACK']:
|
if ft in ['ARQ_SESSION_OPEN', 'ARQ_SESSION_OPEN_ACK', 'PING', 'PING_ACK']:
|
||||||
valid, mycallsign = helpers.check_callsign(
|
valid, mycallsign = helpers.check_callsign(
|
||||||
|
@ -59,8 +59,6 @@ class FrameHandler():
|
||||||
|
|
||||||
return valid
|
return valid
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def should_respond(self):
|
def should_respond(self):
|
||||||
return self.is_frame_for_me()
|
return self.is_frame_for_me()
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,6 @@ class StateManager:
|
||||||
self.arq_irs_sessions[session.id] = session
|
self.arq_irs_sessions[session.id] = session
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
def check_if_running_arq_session(self, irs=False):
|
def check_if_running_arq_session(self, irs=False):
|
||||||
sessions = self.arq_irs_sessions if irs else self.arq_iss_sessions
|
sessions = self.arq_irs_sessions if irs else self.arq_iss_sessions
|
||||||
|
|
||||||
|
@ -130,11 +129,12 @@ class StateManager:
|
||||||
self.remove_arq_irs_session(session_id)
|
self.remove_arq_irs_session(session_id)
|
||||||
else:
|
else:
|
||||||
self.remove_arq_iss_session(session_id)
|
self.remove_arq_iss_session(session_id)
|
||||||
|
|
||||||
# check if ongoing sessions available
|
# check again if session id exists in session because of cleanup
|
||||||
if sessions[session_id].state.name not in ['ENDED', 'ABORTED', 'FAILED']:
|
if session_id in sessions and sessions[session_id].state.name not in ['ENDED', 'ABORTED', 'FAILED']:
|
||||||
print(f"[State Manager] running session...[{session_id}]")
|
print(f"[State Manager] running session...[{session_id}]")
|
||||||
return True
|
return True
|
||||||
|
return False
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def get_arq_iss_session(self, id):
|
def get_arq_iss_session(self, id):
|
||||||
|
|
Loading…
Reference in a new issue