Skip to content

Use new app settings components #4195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Nov 12, 2020
Merged

Use new app settings components #4195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Use new app settings components 
Signed-off-by: Marco Ambrosini <[email protected]>
  • Loading branch information
@marcoambrosini
marcoambrosini committed Nov 11, 2020
commit c26bd7ac8a9082d772c84ec56cad2d759c3948bb
3 changes: 2 additions & 1 deletion src/components/LeftSidebar/LeftSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ import { CONVERSATION } from '../../constants'
import { loadState } from '@nextcloud/initial-state'
import NewGroupConversation from './NewGroupConversation/NewGroupConversation'
import arrowNavigation from '../../mixins/arrowNavigation'
import { emit } from '@nextcloud/event-bus'

export default {

Expand Down Expand Up @@ -301,7 +302,7 @@ export default {
},

showSettings() {
EventBus.$emit('show-settings', true)
emit('show-settings')
},

handleClickSearchResult(selectedConversationToken) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/RightSidebar/RightSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
</template>

<script>
import { emit } from '@nextcloud/event-bus'
import { loadState } from '@nextcloud/initial-state'
import AppSidebar from '@nextcloud/vue/dist/Components/AppSidebar'
import AppSidebarTab from '@nextcloud/vue/dist/Components/AppSidebarTab'
Expand All @@ -86,7 +87,6 @@ import ParticipantsTab from './Participants/ParticipantsTab'
import MatterbridgeSettings from './Matterbridge/MatterbridgeSettings'
import isInLobby from '../../mixins/isInLobby'
import SetGuestUsername from '../SetGuestUsername'
import { EventBus } from '../../services/EventBus'

export default {
name: 'RightSidebar',
Expand Down Expand Up @@ -246,7 +246,7 @@ export default {
},

showSettings() {
EventBus.$emit('show-settings', true)
emit('show-settings')
},

},
Expand Down
177 changes: 80 additions & 97 deletions src/components/SettingsDialog/SettingsDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,103 +20,94 @@
-->

<template>
<Modal v-if="showSettings"
@close="showSettings = false">
<div class="wrapper">
<div class="app-settings-section">
<h2 class="app-setting-section__title">
{{ t('spreed', 'Choose devices') }}
</h2>
<MediaDevicesPreview />
</div>
<div v-if="!isGuest"
class="app-settings-section">
<h2 class="app-setting-section__title">
{{ t('spreed', 'Attachments folder') }}
</h2>
<h3 class="app-settings-section__hint">
{{ locationHint }}
</h3>
<input
type="text"
class="app-settings-section__input"
:value="attachmentFolder"
:disabled="attachmentFolderLoading"
@click="selectAttachmentFolder">
</div>
<div class="app-settings-section last">
<h2 class="app-setting-section__title">
{{ t('spreed', 'Keyboard shortcuts') }}
</h2>

<p>{{ t('spreed', 'Speed up your Talk experience with these quick shortcuts.') }}</p>

<dl>
<div>
<dt><kbd>C</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Focus the chat input') }}
</dd>
</div>
<div>
<dt><kbd>Esc</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Unfocus the chat input to use shortcuts') }}
</dd>
</div>
<div>
<dt><kbd>F</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Fullscreen the chat or call') }}
</dd>
</div>
<div>
<dt><kbd>Ctrl</kbd> + <kbd>F</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Search') }}
</dd>
</div>
</dl>

<h3>{{ t('spreed', 'Shortcuts while in a call') }}</h3>
<dl>
<div>
<dt><kbd>V</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Video on and off') }}
</dd>
</div>
<div>
<dt><kbd>M</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Microphone on and off') }}
</dd>
</div>
<div>
<dt><kbd>{{ t('spreed', 'Space bar') }}</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Push to talk or push to mute') }}
</dd>
</div>
</dl>
</div>
</div>
</Modal>
<AppSettingsDialog :open.sync="showSettings" :show-navigation="true" first-selected-section="keyboard shortcuts">
<AppSettingsSection :title="t('spreed', 'Choose devices')"
class="app-settings-section">
<MediaDevicesPreview />
</AppSettingsSection>
<AppSettingsSection v-if="!isGuest"
:title="t('spreed', 'Attachments folder')"
class="app-settings-section">
<h3 class="app-settings-section__hint">
{{ locationHint }}
</h3>
<input
type="text"
class="app-settings-section__input"
:value="attachmentFolder"
:disabled="attachmentFolderLoading"
@click="selectAttachmentFolder">
</AppSettingsSection>
<AppSettingsSection :title="t('spreed', 'Keyboard shortcuts')">
<p>{{ t('spreed', 'Speed up your Talk experience with these quick shortcuts.') }}</p>

<dl>
<div>
<dt><kbd>C</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Focus the chat input') }}
</dd>
</div>
<div>
<dt><kbd>Esc</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Unfocus the chat input to use shortcuts') }}
</dd>
</div>
<div>
<dt><kbd>F</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Fullscreen the chat or call') }}
</dd>
</div>
<div>
<dt><kbd>Ctrl</kbd> + <kbd>F</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Search') }}
</dd>
</div>
</dl>

<h3>{{ t('spreed', 'Shortcuts while in a call') }}</h3>
<dl>
<div>
<dt><kbd>V</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Video on and off') }}
</dd>
</div>
<div>
<dt><kbd>M</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Microphone on and off') }}
</dd>
</div>
<div>
<dt><kbd>{{ t('spreed', 'Space bar') }}</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Push to talk or push to mute') }}
</dd>
</div>
</dl>
</AppSettingsSection>
</AppSettingsDialog>
</template>

<script>
import Modal from '@nextcloud/vue/dist/Components/Modal'
import { getFilePickerBuilder, showError } from '@nextcloud/dialogs'
import { setAttachmentFolder } from '../../services/settingsService'
import { EventBus } from '../../services/EventBus'
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import MediaDevicesPreview from '../MediaDevicesPreview'
import AppSettingsDialog from '@nextcloud/vue/dist/Components/AppSettingsDialog'
import AppSettingsSection from '@nextcloud/vue/dist/Components/AppSettingsSection'

export default {
name: 'SettingsDialog',

components: {
Modal,
MediaDevicesPreview,
AppSettingsDialog,
AppSettingsSection,
},

data() {
Expand All @@ -141,7 +132,7 @@ export default {
},

mounted() {
EventBus.$on('show-settings', this.handleShowSettings)
subscribe('show-settings', this.handleShowSettings)
this.attachmentFolderLoading = false
},

Expand Down Expand Up @@ -176,12 +167,12 @@ export default {
})
},

handleShowSettings(showSettings) {
this.showSettings = showSettings
handleShowSettings() {
this.showSettings = true
},

beforeDestroy() {
EventBus.$off('show-settings')
unsubscribe('show-settings', this.handleShowSettings)
},
},
}
Expand Down Expand Up @@ -217,12 +208,4 @@ export default {
}
}

::v-deep .modal-container {
display: flex !important;
flex-direction: column;
min-width: 250px !important;
max-width: 500px !important;
padding: 8px !important;
}

</style>