Skip to content

Commit

Permalink
Merge branch 'development' into full-screen-startup-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
absidue committed May 21, 2024
2 parents c2a4e7f + 11a61d2 commit cf9d7c7
Show file tree
Hide file tree
Showing 18 changed files with 146 additions and 44 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^7.1.1",
"css-minimizer-webpack-plugin": "^7.0.0",
"electron": "^30.0.3",
"electron": "^30.0.6",
"electron-builder": "^24.13.3",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
Expand Down
16 changes: 5 additions & 11 deletions src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,11 @@ function runApp() {
await createWindow()

if (process.env.NODE_ENV === 'development') {
installDevTools()
try {
require('vue-devtools').install()
} catch (err) {
console.error(err)
}
}

if (isDebug) {
Expand Down Expand Up @@ -592,16 +596,6 @@ function runApp() {
}
}

async function installDevTools() {
try {
/* eslint-disable */
require('vue-devtools').install()
/* eslint-enable */
} catch (err) {
console.error(err)
}
}

const htmlFullscreenWindowIds = new Set()

async function createWindow(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,20 @@
inline-size: calc(100% - 200px);
}

.floatingRefreshSection.hideLabelsSideBar {
inline-size: calc(100% - 60px);
}

.lastRefreshTimestamp {
margin-block: 0;
text-align: center;
font-size: 16px;
}

@media only screen and (width <= 680px) {
.floatingRefreshSection, .floatingRefreshSection.sideNavOpen {
.floatingRefreshSection,
.floatingRefreshSection.sideNavOpen,
.floatingRefreshSection.hideLabelsSideBar {
inline-size: 100%;
border-inline-start: none;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ export default defineComponent({
computed: {
isSideNavOpen: function () {
return this.$store.getters.getIsSideNavOpen
},

hideLabelsSideBar: function () {
return this.$store.getters.getHideLabelsSideBar
}
},
methods: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<div
class="floatingRefreshSection"
:class="{
sideNavOpen: isSideNavOpen
sideNavOpen: isSideNavOpen,
hideLabelsSideBar: hideLabelsSideBar && !isSideNavOpen
}"
>
<p
Expand Down
37 changes: 22 additions & 15 deletions static/locales/bg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Forward: 'Напред'
# Global
# Anything shared among components / views should be put here
Global:
Videos: 'видеа'
Videos: 'Видеа'
Shorts: Кратки видеа
Live: На живо
Community: Общност
Expand Down Expand Up @@ -167,6 +167,10 @@ User Playlists:
This playlist is protected and cannot be removed.: Този плейлист е защитен и
не може да бъде премахнат.
This playlist does not exist: Този плейлист не съществува
This playlist is already being used for quick bookmark.: Този плейлист вече
се използва за бързи отметки.
Playlist {playlistName} is the new quick bookmark playlist.: Плейлиста {playlistName}
е новият списък за бързи отметки.
Search for Videos: Търсене за видеа
CreatePlaylistPrompt:
Toast:
Expand Down Expand Up @@ -222,6 +226,9 @@ User Playlists:
Remove from Favorites: Премахване от {playlistName}
Move Video Down: Преместване надолу
Playlists with Matching Videos: Плейлисти със съвпадащи видеа
Quick Bookmark Enabled: Бързите отметки са активирани
Cannot delete the quick bookmark target playlist.: Не може да се изтрие целевия
списък за плейлисти с бързи отметки.
History:
# On History Page
History: 'История'
Expand Down Expand Up @@ -336,14 +343,14 @@ Settings:
Catppuccin Mocha Lavender: Catppuccin Mocha Лавандула
Catppuccin Mocha Blue: Catppuccin Mocha Синьо
Catppuccin Mocha Green: Catppuccin Mocha Зелено
Solarized Yellow: Solarized жълта
Solarized Orange: Solarized оранжева
Solarized Red: Solarized червена
Solarized Magenta: Solarized пурпурна
Solarized Violet: Solarized виолетова
Solarized Blue: Solarized синя
Solarized Cyan: Solarized синьо-зелена
Solarized Green: Solarized зелена
Solarized Yellow: Solarized Жълто
Solarized Orange: Solarized Оранжево
Solarized Red: Solarized Червено
Solarized Magenta: Solarized Пурпурно
Solarized Violet: Solarized Виолетово
Solarized Blue: Solarized Синьо
Solarized Cyan: Solarized Синьозелено
Solarized Green: Solarized Зелено
Secondary Color Theme: 'Вторична цветова тема'
#* Main Color Theme
UI Scale: Мащаб на интерфейса
Expand Down Expand Up @@ -988,8 +995,8 @@ Playlist:
#& Views
Playlist: Плейлист
Sort By:
DateAddedNewest: Първо последно добавени
DateAddedOldest: Първо най-рано добавени
DateAddedNewest: Първо най-новите
DateAddedOldest: Първо най-старите
Sort By: Подреждане по
AuthorAscending: Автор (A-Z)
AuthorDescending: Автор (Z-A)
Expand Down Expand Up @@ -1032,10 +1039,10 @@ Comments:
Show Comments: 'Показване на коментари'
Hide Comments: 'Скриване на коментарите'
# Context: View 10 Replies, View 1 Reply
View: 'Изглед'
View: 'Показване на'
Hide: 'Скриване'
Replies: 'Отговори'
Reply: 'Отговаряне'
Replies: 'Отговора'
Reply: 'Отговор'
There are no comments available for this video: 'Към това видео няма коментари'
Load More Comments: 'Зареждане на още коментари'
No more comments available: Не са налични повече коментари
Expand Down Expand Up @@ -1222,7 +1229,7 @@ Close Banner: Затваряне на банер
Search character limit: Заявката за търсене е над лимита от {searchCharacterLimit}
символа
Feed:
Feed Last Updated: '{feedName} последната актуализация на емисията: {date}'
Feed Last Updated: 'Последна актуализация на емисията {feedName}: {date}'
Refresh Feed: Обновяване на {subscriptionName}
Yes, Delete: Да, изтрий
Yes, Restart: Да, рестартирай
Expand Down
7 changes: 7 additions & 0 deletions static/locales/es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ User Playlists:
Haga clic aquí para deshacer
Reverted to use {oldPlaylistName} for quick bookmark: Revertido para usar {oldPlaylistName}
para un marcador rápido
This playlist is already being used for quick bookmark.: Esta lista de reproducción
ya se utiliza como marcador rápido.
Playlist {playlistName} is the new quick bookmark playlist.: L lista de reproducción
{playlistName} es la nueva lista de reproducción de marcadores rápidos.
Search for Videos: Buscar vídeos
Are you sure you want to delete this playlist? This cannot be undone: ¿Estás seguro
de que quieres borrar esta lista de reproducción? Esto no se puede deshacer.
Expand Down Expand Up @@ -220,6 +224,9 @@ User Playlists:
de reproducción
Disable Quick Bookmark: Desactivar el marcador rápido
Playlists with Matching Videos: Listas de reproducción con vídeos relacionados
Quick Bookmark Enabled: Marcador rápido habilitado
Cannot delete the quick bookmark target playlist.: No se puede eliminar la lista
de reproducción de destino de marcadores rápidos.
History:
# On History Page
History: 'Historial'
Expand Down
7 changes: 7 additions & 0 deletions static/locales/et.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ User Playlists:
Quick bookmark disabled: Kiirjärjehoidjad ei ole kasutusel
Reverted to use {oldPlaylistName} for quick bookmark: Võtsime {oldPlaylistName}
uuesti kasutusele kiirjärjehoidjate jaoks
Playlist {playlistName} is the new quick bookmark playlist.: Esitusloend {playlistName}
on uus kiirjärjehoidjate esitusloend.
This playlist is already being used for quick bookmark.: See esitusloend juba
on kasutusel kiirjärjehoidjate jaoks.
Search for Videos: Otsi videoid
Are you sure you want to delete this playlist? This cannot be undone: Kas sa oled
kindel, et soovid selle esitusloendi kustutada? Seda tegevust ei saa tagasi pöörata.
Expand Down Expand Up @@ -219,6 +223,9 @@ User Playlists:
Enable Quick Bookmark With This Playlist: Võimalda kiirjärjehoidjate kasutamist
selle esitusloendiga
Playlists with Matching Videos: Sobivate videotega esitusloendid
Quick Bookmark Enabled: Kasuta kiirjärjehoidjaid
Cannot delete the quick bookmark target playlist.: Ei saa kustutada esitusloendit,
mis on kasutusel kiirjärjehoidjate jaoks.
History:
# On History Page
History: 'Ajalugu'
Expand Down
7 changes: 7 additions & 0 deletions static/locales/fr-FR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,10 @@ User Playlists:
de {oldPlaylistName}. Cliquez ici pour annuler
Reverted to use {oldPlaylistName} for quick bookmark: Reprise de {oldPlaylistName}
pour un marque-page rapide
This playlist is already being used for quick bookmark.: Cette liste de lecture
est déjà utilisée comme signet rapide.
Playlist {playlistName} is the new quick bookmark playlist.: La liste de lecture
{playlistName} est la nouvelle liste de lecture des signets rapides.
Search for Videos: Rechercher des vidéos
Are you sure you want to delete this playlist? This cannot be undone: Êtes-vous
sûr(e) de vouloir supprimer cette liste de lecture ? Cette opération ne peut être
Expand Down Expand Up @@ -230,6 +234,9 @@ User Playlists:
liste de lecture
Disable Quick Bookmark: Désactiver le marque-page rapide
Playlists with Matching Videos: Listes de lecture avec des vidéos correspondantes
Quick Bookmark Enabled: Signet rapide activé
Cannot delete the quick bookmark target playlist.: Impossible de supprimer la liste
de lecture cible des signets rapides.
History:
# On History Page
History: 'Historique'
Expand Down
9 changes: 8 additions & 1 deletion static/locales/it.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ User Playlists:
This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Questa
playlist è ora usata per i segnalibri rapidi al posto di {oldPlaylistName}.
Fai clic qui per annullare
This playlist is already being used for quick bookmark.: Questa playlist è già
utilizzata per i segnalibri rapidi.
Playlist {playlistName} is the new quick bookmark playlist.: La playlist {playlistName}
è la nuova playlist con segnalibri rapidi.
Search for Videos: Cerca video
Are you sure you want to delete this playlist? This cannot be undone: Sei sicuro
di voler eliminare questa playlist? Questa operazione non può essere annullata.
Expand Down Expand Up @@ -219,7 +223,10 @@ User Playlists:
Remove from Favorites: Rimuovi da {playlistName}
Enable Quick Bookmark With This Playlist: Abilita segnalibro rapido con questa playlist
Disable Quick Bookmark: Disabilita segnalibro rapido
Playlists with Matching Videos: Playlist con video corrispondenti
Playlists with Matching Videos: Playlist con video correlati
Cannot delete the quick bookmark target playlist.: Impossibile eliminare la playlist
di destinazione dei segnalibri rapidi.
Quick Bookmark Enabled: Segnalibro rapido abilitato
History:
# On History Page
History: 'Cronologia'
Expand Down
7 changes: 7 additions & 0 deletions static/locales/pl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ User Playlists:
ta playlista, zamiast „{oldPlaylistName}”, będzie używana dla funkcji Szybkiej
Zakładki . Kliknij tutaj, by cofnąć zmianę
Quick bookmark disabled: Wyłączono Szybką Zakładkę
Playlist {playlistName} is the new quick bookmark playlist.: Playlista „{playlistName}”
jest od teraz playlistą używaną dla funkcji Szybkiej Zakładki.
This playlist is already being used for quick bookmark.: Ta playlista jest już
używana dla funkcji Szybkiej Zakładki.
Search for Videos: Szukaj filmów
Are you sure you want to delete this playlist? This cannot be undone: Czy na pewno
chcesz usunąć tę playlistę? Nie można cofnąć tej czynności.
Expand Down Expand Up @@ -218,6 +222,9 @@ User Playlists:
Disable Quick Bookmark: Wyłącz Szybką Zakładkę
Enable Quick Bookmark With This Playlist: Włącz Szybką Zakładkę z tą playlistą
Playlists with Matching Videos: Playlisty z pasującymi filmami
Quick Bookmark Enabled: Włączono Szybką Zakładkę
Cannot delete the quick bookmark target playlist.: Nie można usunąć playlisty wskazanej
dla Szybkiej Zakładki.
History:
# On History Page
History: 'Historia'
Expand Down
7 changes: 7 additions & 0 deletions static/locales/pt-BR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@ User Playlists:
vídeo
Playlist has been updated.: Playlist atualizada.
Video has been removed: Vídeo removido
This playlist is already being used for quick bookmark.: Esta playlist já está
sendo usada em "Favoritos Rápidos".
Playlist {playlistName} is the new quick bookmark playlist.: Playlist {playlistName}
é a nova playlist de "Favoritos Rápidos".
Search for Videos: Pesquisar vídeos
AddVideoPrompt:
Toast:
Expand All @@ -215,6 +219,9 @@ User Playlists:
não pode ser desfeito.
Remove Watched Videos: Remove vídeos assistidos
Playlists with Matching Videos: Playlists com vídeos correspondentes
Quick Bookmark Enabled: Favoritos Rápidos ativado
Cannot delete the quick bookmark target playlist.: Não é possível excluir a playlist
de destino em "Favoritos Rápidos".
History:
# On History Page
History: 'Histórico'
Expand Down
11 changes: 5 additions & 6 deletions static/locales/sk.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Currently on Subscriptions, Playlists, and History
'This part of the app is not ready yet. Come back later when progress has been made.': >-
Táto časť aplikácie ešte nie je dokončená. Vráťte sa neskôr keď na nej spravíme
pokrok.
Táto časť aplikácie ešte nie je dokončená. Vráťte sa neskôr.
# Webkit Menu Bar
File: 'Súbor'
Expand Down Expand Up @@ -674,10 +673,10 @@ Tooltips:
využívajú menej dát. Zvukové formáty sú iba zvukové streamy.
Proxy Videos Through Invidious: Namiesto priameho pripojenia k YouTube sa pripojí
k Invidious, aby poskytoval videá. Prepíše preferenciu API.
Force Local Backend for Legacy Formats: Funguje, iba ak je predvoleným nastavením
rozhranie Invidious API. Ak je povolené, miestne API sa spustí a bude používať
pôvodné formáty, ktoré vráti, namiesto tých, ktoré vráti Invidious. Pomáha,
keď sa videá vrátené Invidious neprehrajú z dôvodu obmedzení krajín.
Force Local Backend for Legacy Formats: Funguje, iba ak je predvolené rozhranie
Invidious API. Ak je zapnuté, miestne API sa spustí a bude používať pôvodné
formáty, namiesto tých, ktoré vráti Invidious. Pomáha, keď sa videá vrátené
Invidious neprehrávajú kvôli obmedzeniam krajiny.
Scroll Playback Rate Over Video Player: Keď je kurzor nad videom, stlačte a podržte
kláves Control (kláves Command na Macu) a posúvaním kolieska myši dopredu alebo
dozadu ovládajte rýchlosť prehrávania. Stlačte a podržte kláves Control (kláves
Expand Down
7 changes: 7 additions & 0 deletions static/locales/sr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ User Playlists:
Кликните овде да поништите
Reverted to use {oldPlaylistName} for quick bookmark: Враћено на коришћење „{oldPlaylistName}“
за брзо обележавање
This playlist is already being used for quick bookmark.: Ова плејлиста се већ
користи за брзо обележавање.
Playlist {playlistName} is the new quick bookmark playlist.: Плејлиста {playlistName}
је нова плејлиста за брзо обележавање.
Search for Videos: Претрага видео снимака
Are you sure you want to delete this playlist? This cannot be undone: Желите ли
заиста да избришете ову плејлисту? Ово се не може поништити.
Expand Down Expand Up @@ -224,6 +228,9 @@ User Playlists:
Add to Favorites: Додај на плејлисту „{playlistName}“
Remove from Favorites: Уклони са плејлисте „{playlistName}“
Playlists with Matching Videos: Плејлисте с подударајућим видео снимцима
Cannot delete the quick bookmark target playlist.: Није могуће избрисати циљну плејлисту
за брзо обележавање.
Quick Bookmark Enabled: Брзо обележавање омогућено
History:
# On History Page
History: 'Историја'
Expand Down
9 changes: 8 additions & 1 deletion static/locales/tr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ User Playlists:
kullanımına geri dönüldü
This playlist is now used for quick bookmark: Bu oynatma listesi artık hızlı
yer imi için kullanılıyor
Playlist {playlistName} is the new quick bookmark playlist.: '{playlistName}
oynatma listesi yeni hızlı yer imi oynatma listesi.'
This playlist is already being used for quick bookmark.: Bu oynatma listesi
zaten hızlı yer imi için kullanılıyor.
Search for Videos: Video Ara
AddVideoPrompt:
Select a playlist to add your N videos to: Videonuzu eklemek için bir oynatma
Expand Down Expand Up @@ -219,10 +223,13 @@ User Playlists:
Remove Watched Videos: İzlenen Videoları Kaldır
Add to Favorites: '{playlistName} oynatma listesine ekle'
Remove from Favorites: '{playlistName} oynatma listesinden kaldır'
Enable Quick Bookmark With This Playlist: Bu Oynatma Listesiyle Hızlı Yer İşaretini
Enable Quick Bookmark With This Playlist: Bu Oynatma Listesiyle Hızlı Yer İmini
Etkinleştir
Disable Quick Bookmark: Hızlı Yer İşaretini Devre Dışı Bırak
Playlists with Matching Videos: Eşleşen Videoları İçeren Oynatma Listeleri
Quick Bookmark Enabled: Hızlı Yer İmi Etkin
Cannot delete the quick bookmark target playlist.: Hızlı yer imi hedef oynatma listesi
silinemiyor.
History:
# On History Page
History: 'Geçmiş'
Expand Down
5 changes: 5 additions & 0 deletions static/locales/zh-CN.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ User Playlists:
进行快速添加书签操作
This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: 此播放列表现用于快速添加书签,而非
{oldPlaylistName}。单击此处撤销
This playlist is already being used for quick bookmark.: 此播放列表已被用于快速书签。
Playlist {playlistName} is the new quick bookmark playlist.: 播放列表 {playlistName}
是新的快速书签播放列表。
Search for Videos: 搜索视频
Are you sure you want to delete this playlist? This cannot be undone: 你确定要删除此播放列表吗?此操作无法撤销。
Sort By:
Expand Down Expand Up @@ -188,6 +191,8 @@ User Playlists:
Remove from Favorites: 从播放列表 {playlistName} 删除
Disable Quick Bookmark: 停用快速添加书签
Playlists with Matching Videos: 有匹配视频的播放列表
Quick Bookmark Enabled: 启用了快速书签
Cannot delete the quick bookmark target playlist.: 无法删除快速书签目标播放列表。
History:
# On History Page
History: '历史记录'
Expand Down
Loading

0 comments on commit cf9d7c7

Please sign in to comment.