Skip to content
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

Jump to bottom

fix: add error message in webcam panel, if no webcam is available #754

Merged
merged 2 commits into from
Apr 18, 2022
Merged

fix: add error message in webcam panel, if no webcam is available #754

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
146d25b
fix: add error message in webcam panel, if no webcam is available
meteyou Apr 16, 2022
6e7473b
locale: Update en.json
meteyou Apr 17, 2022
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
5 changes: 4 additions & 1 deletion src/components/panels/WebcamPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</v-list>
</v-menu>
</template>
<v-card-text class="px-0 py-0 content d-inline-block">
<v-card-text v-if="webcams.length" class="px-0 py-0 content d-inline-block">
<v-row>
<v-col class="pb-0" style="position: relative">
<template v-if="currentCam.service === 'grid'">
Expand All @@ -60,6 +60,9 @@
</v-col>
</v-row>
</v-card-text>
<v-card-text v-else>
<p class="text-center mb-0 text--disabled">{{ $t('Panels.WebcamPanel.NoWebcam') }}</p>
</v-card-text>
</panel>
</template>

Expand Down
3 changes: 2 additions & 1 deletion src/locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,7 @@
"All": "Alle",
"FPS": "FPS",
"Headline": "Webcam",
"NoWebcam": "Keine Webcam verfügbar. Füge eine Webcam unter \"Interface Einstellungen\" -> \"Webcams\".",
"UnknownWebcamService": "Unbekannter Webcam Dienst",
"UrlNotAvailable": "URL nicht verfügbar"
},
Expand Down Expand Up @@ -742,7 +743,7 @@
"Restore": "Wiederherstellung",
"RestoreDialog": "Bitte wähle alle Abschnitte aus, die du wiederherstellen möchtest:"
},
"InterfaceSettings": "Schnittstelleneinstellungen",
"InterfaceSettings": "Interface Einstellungen",
"MacrosTab": {
"Add": "hinzufügen",
"AddGroup": "Gruppe hinzufügen",
Expand Down
1 change: 1 addition & 0 deletions src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@
"All": "All",
"FPS": "FPS",
"Headline": "Webcam",
"NoWebcam": "No webcam available. Add your webcam under the \"Interface Settings\" -> \"Webcams\".",
meteyou marked this conversation as resolved.
Show resolved Hide resolved
"UnknownWebcamService": "Unknown Webcam Service",
"UrlNotAvailable": "URL not available"
},
Expand Down