Skip to content

Commit

Permalink
0.10.09
Browse files Browse the repository at this point in the history
  • Loading branch information
@MintyTrebor
MintyTrebor authored May 5, 2022
1 parent 0f63a59 commit a3fd26d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/BtnCmdGlobalSettingsDialogue.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</v-tooltip>
</v-col>
</v-row>
<v-row dense v-if="!mobileActive">
<!-- <v-row dense v-if="!mobileActive">
<v-col cols="12">
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
Expand All @@ -49,7 +49,7 @@
</v-tooltip>
<confirm-dialog :shown.sync="confirmEnableEvents" title="Confirm Enabling Events" :prompt="eventText" @dismissed="passedObject.enableEvents = false"></confirm-dialog>
</v-col>
</v-row>
</v-row> -->
<v-row dense v-if="showToggButt">
<v-col cols="12">
<v-tooltip bottom>
Expand Down
28 changes: 14 additions & 14 deletions src/BtnCmdMainPanel.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@
<BtnCmdMMPanelDialogue @exit="saveSettings()" v-if="showMMPanelEdit" v-model="showMMPanelEdit" :passedObject="panelObjectToPass[0]" :enableSelects="btnCmd.globalSettings.enableSelects"></BtnCmdMMPanelDialogue>
<BtnCmdVInputDialogue @exit="saveSettings()" v-if="showVInputPanelEdit" v-model="showVInputPanelEdit" :passedObject="panelObjectToPass[0]" :enableSelects="btnCmd.globalSettings.enableSelects"></BtnCmdVInputDialogue>
<BtnCmdGlobalSettingsDialogue @exit="saveSettings()" v-if="showGSEdit" v-model="showGSEdit" :showBottomNavigation="showBottomNavigation" :mobileActive="mobileActive" :passedObject="btnCmd.globalSettings" @rldSBCCSet="reloadSBCCSet = true" :systemDSFVer="systemDSFVer"></BtnCmdGlobalSettingsDialogue>
<BtnCmdEventSettingsDialogue @exit="saveSettings()" v-if="showESEdit" v-model="showESEdit" :bMQTT="btnCmd.globalSettings.enableMQTT" :passedObject="btnCmd" :enableSelects="btnCmd.globalSettings.enableSelects"></BtnCmdEventSettingsDialogue>
<!-- <BtnCmdEventSettingsDialogue @exit="saveSettings()" v-if="showESEdit" v-model="showESEdit" :bMQTT="btnCmd.globalSettings.enableMQTT" :passedObject="btnCmd" :enableSelects="btnCmd.globalSettings.enableSelects"></BtnCmdEventSettingsDialogue> -->
<BtnCmdSBCCSettingsDialogue @exit="saveSettings()" @updateSettings="saveSBCCSettingsToFile()" v-if="showSBCCEdit" v-model="showSBCCEdit" :enableSelects="btnCmd.globalSettings.enableSelects" :tmpSBCCUsr="btnCmd"></BtnCmdSBCCSettingsDialogue>
<confirm-dialog :shown.sync="confirmRstSettings" title="Reset Settings" prompt="Are you sure?" @confirmed="resetSettings()"></confirm-dialog>
<confirm-dialog :shown.sync="confirmDelTab" title="Delete" prompt="Delete with all content?" @confirmed="doTabDelete()"></confirm-dialog>
Expand Down Expand Up @@ -527,7 +527,7 @@
<span>Edit Plugin Global Settings</span>
</v-tooltip>
</div>
<div class="mx-2" v-if="btnCmd.globalSettings.enableEvents && !mobileActive">
<!-- <div class="mx-2" v-if="btnCmd.globalSettings.enableEvents && !mobileActive">
<v-tooltip top>
<template v-slot:activator="{ on, attrs }">
<v-btn :small="!mobileActive" :x-small="mobileActive" :fab="mobileActive" v-bind="attrs" v-on="on" :disabled="editMode || backupMode" color="primary" @click="showESEdit = !showESEdit">
Expand All @@ -536,7 +536,7 @@
</template>
<span>Configure Status Event Monitoring</span>
</v-tooltip>
</div>
</div> -->
<div class="mx-2" v-if="btnCmd.globalSettings.enableSBCC && systemDSFVer">
<v-tooltip top>
<template v-slot:activator="{ on, attrs }">
Expand Down Expand Up @@ -761,7 +761,7 @@
import BtnCmdSettingsDialogue from './BtnCmdSettingsDialogue.vue';
import BtnCmdTabSettingsDialogue from './BtnCmdTabSettingsDialogue.vue';
import BtnCmdGlobalSettingsDialogue from './BtnCmdGlobalSettingsDialogue.vue';
import BtnCmdEventSettingsDialogue from './BtnCmdEventSettingsDialogue.vue';
//import BtnCmdEventSettingsDialogue from './BtnCmdEventSettingsDialogue.vue';
import BtnCmdPanelSettingsDialogue from './BtnCmdPanelSettingsDialogue.vue';
import BtnCmdSBCCSettingsDialogue from './BtnCmdSBCCSettingsDialogue.vue';
import { mapGetters, mapState, mapActions, mapMutations } from 'vuex';
Expand All @@ -775,7 +775,7 @@ import BtnCmdMMPanel from './BtnCmdMMPanel.vue';
import BtnCmdAWCPanelDialogue from './BtnCmdAWCPanelDialogue.vue';
import BtnCmdMMPanelDialogue from './BtnCmdMMPanelDialogue.vue';
import BtnCmdDataFunctions from './BtnCmdDataFunctions.js';
import BtnCmdEventFunctions from './BtnCmdEventFunctions.js';
//import BtnCmdEventFunctions from './BtnCmdEventFunctions.js';
import BtnCmdBtnActionFunctions from './BtnCmdBtnActionFunctions.js';
import BtnCmdCustomPanel from './BtnCmdCustomPanel.vue';
import BtnCmdVInputDialogue from './BtnCmdVInputDialogue.vue';
Expand All @@ -791,7 +791,7 @@ export default {
BtnCmdTabSettingsDialogue,
BtnCmdGlobalSettingsDialogue,
altWebCamPanel,
BtnCmdEventSettingsDialogue,
//BtnCmdEventSettingsDialogue,
VueDraggableResizable,
BtnCmdPanelSettingsDialogue,
BtnCmdWebPanel,
Expand Down Expand Up @@ -883,7 +883,7 @@ export default {
},
mixins: [
BtnCmdDataFunctions,
BtnCmdEventFunctions,
//BtnCmdEventFunctions,
BtnCmdBtnActionFunctions,
BtnCmdSCCFunctions
],
Expand Down Expand Up @@ -1678,13 +1678,13 @@ export default {
},
watch: {
status: function (val) {
//console.log("Checking Conditions Status change to :" + val);
if(this.btnCmd.globalSettings.enableEvents && !this.isSimulating && !this.mobileActive){
//console.log("Conditions Met lauching checkEvents");
this.checkEvents('status', val);
}
},
// status: function (val) {
// //console.log("Checking Conditions Status change to :" + val);
// if(this.btnCmd.globalSettings.enableEvents && !this.isSimulating && !this.mobileActive){
// //console.log("Conditions Met lauching checkEvents");
// this.checkEvents('status', val);
// }
// },
mobileActive (val) {
if(val){
try{
Expand Down

0 comments on commit a3fd26d

Please sign in to comment.