Commit 0d55838b authored by Joel Collins's avatar Joel Collins
Browse files

Added stream disable to settings

parent ebb68297

src/components/paneDisplayComponents/streamDisplay.vue

+4 −1
Original line number Diff line number Diff line 
<template>

	<div class="streamDisplay scrollTarget">



		<img class="uk-align-center" v-on:dblclick="clickmonitor" v-if="$store.getters.ready" v-bind:src="streamImgUri" alt="Stream">

		<img class="uk-align-center" v-on:dblclick="clickmonitor" v-if="showStream" v-bind:src="streamImgUri" alt="Stream">



		<div v-else-if="$store.state.waiting" class="uk-position-center">

			<div uk-spinner="ratio: 4.5" ></div>
@@ -32,6 +32,9 @@ export default { 
  },



  computed: {

		showStream: function () {

			return this.$store.getters.ready && !this.$store.state.settings.disableStream

		},

    streamImgUri: function () {

      return this.$store.getters.uri + "/stream"

    }

src/components/paneSettings.vue

+26 −2
Original line number Diff line number Diff line 
<template>

  <div id="paneSettings">

    <h3>Settings</h3>

    <div class="uk-placeholder uk-text-center">Global settings coming soon...</div>



    <div class="uk-child-width-1-2" uk-grid>

      <p><label><input v-model="disableStream" class="uk-checkbox" type="checkbox"> Disable stream</label></p>

      <p><label><input v-model="autoGpuPreview" class="uk-checkbox" type="checkbox"> GPU preview</label></p>

    </div>



  </div>

</template>
@@ -11,6 +15,26 @@ 
// Export main app

export default {

  name: 'paneSettings',



  computed: {

    disableStream: {

      get() {

        return this.$store.state.settings.disableStream;

      },

      set(value) {

        this.$store.commit("changeSetting", ['disableStream', value]);

      }

    },

    autoGpuPreview: {

      get() {

        return this.$store.state.settings.autoGpuPreview;

      },

      set(value) {

        this.$store.commit("changeSetting", ['autoGpuPreview', value]);

      }

    }

  }



}

</script>

src/components/panelLeft.vue

+4 −4
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 
      <li v-bind:class="disableIfDisconnected"><a href="#" uk-switcher-item="navigate" uk-icon="location" uk-tooltip="Navigate"></a></li>

      <li v-bind:class="disableIfDisconnected"><a href="#" uk-switcher-item="capture" uk-icon="camera" uk-tooltip="Capture"></a></li>

      <li v-bind:class="disableIfDisconnected"><a href="#" uk-switcher-item="plugins" uk-icon="git-fork" uk-tooltip="Plugins"></a></li>

      <li v-bind:class="disableIfDisconnected"><a href="#" uk-switcher-item="settings" uk-icon="settings" uk-tooltip="Settings"></a></li>

      <li><a href="#" uk-switcher-item="settings" uk-icon="settings" uk-tooltip="Settings"></a></li>

    </ul>

    <ul class="uk-switcher uk-padding-small uk-flex uk-flex-1 panel-content">

      <li class="uk-width-expand"><paneConnect/></li>

      <li v-if="$store.getters.ready" class="uk-width-expand"><paneNavigate/></li>

      <li v-if="$store.getters.ready" class="uk-width-expand"><paneCapture/></li>

      <li v-if="$store.getters.ready" class="uk-width-expand"><panePlugins/></li>

      <li class="uk-width-expand"><div v-if="$store.getters.ready"><paneNavigate/></div></li>

      <li class="uk-width-expand"><div v-if="$store.getters.ready"><paneCapture/></div></li>

      <li class="uk-width-expand"><div v-if="$store.getters.ready"><panePlugins/></div></li>

      <li class="uk-width-expand"><paneSettings/></li>

    </ul>

  </div>

src/store.js

+8 −1
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ export default new Vuex.Store({ 
    error: '',

    apiConfig: {},

    apiState: {},

    moveLock: false

    moveLock: false,

    settings: {

      disableStream: false,

      autoGpuPreview: false

    }

  },



  mutations: {
@@ -42,6 +46,9 @@ export default new Vuex.Store({ 
    },

    commitState(state, stateData) {

      state.apiState = stateData;

    },

    changeSetting(state, [key, value]) {

      state.settings[key] = value;

    }

  },