From 49d6762255a28e67a5923ab4ed5a1a8ec6542730 Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Mon, 6 Aug 2012 22:31:41 +0200 Subject: [PATCH] Imported Upstream version 1.4.3 --- CHANGES | 7 + locale/ca_ES.ts | 803 ++++++++++++++++++++++++++++++++++++++++ locale/es_ES.ts | 164 ++++---- locale/fi.ts | 803 ++++++++++++++++++++++++++++++++++++++++ locale/locale.pri | 3 +- locale/sv_SE.ts | 803 ++++++++++++++++++++++++++++++++++++++++ locale/uk_UA.ts | 803 ++++++++++++++++++++++++++++++++++++++++ minitube.pro | 2 +- src/MainWindow.cpp | 5 +- src/MediaView.cpp | 15 +- src/SearchView.cpp | 1 + src/downloadmanager.cpp | 12 +- src/downloadmanager.h | 2 +- src/video.cpp | 1 + src/videoareawidget.cpp | 14 + src/videoareawidget.h | 1 + 16 files changed, 3346 insertions(+), 93 deletions(-) create mode 100644 locale/ca_ES.ts create mode 100644 locale/fi.ts create mode 100644 locale/sv_SE.ts create mode 100644 locale/uk_UA.ts diff --git a/CHANGES b/CHANGES index 5d037f1..2abed00 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +1.4.3 - May 15, 2011 +- Really fixed some videos not playing +- Hide toolbar and playlist in fullscreen on mouseleave (multiscreen) (Patch by Rob Halff) +- Fixed volume level in the statusbar showing as a decimal (Patch by mru00) +- Fixed disabled search box when in fullscreen on Linux +- New and updated translations + 1.4.2 - April 15, 2011 - Fix some videos not playing - Full length videos now start faster diff --git a/locale/ca_ES.ts b/locale/ca_ES.ts new file mode 100644 index 0000000..1e891c3 --- /dev/null +++ b/locale/ca_ES.ts @@ -0,0 +1,803 @@ + +UTF-8 + + AboutView + + + There's life outside the browser! + Hi ha vida fora del navegador! + + + + Version %1 + Versió %1 + + + + %1 is Free Software but its development takes precious time. + %1 és Software Lliure però el seu desenvolupament pren un temps preciós. + + + + Please <a href='%1'>donate</a> to support the continued development of %2. + Siusplau <a href='%1'>dóna</a> per ajudar al desenvolupament continuat del %2. + + + + Report bugs and send in your ideas to %1 + Informeu d'errors i envieu les vostres idees a %1 + + + + Icon designed by %1. + Icona dissenyada per %1. + + + + Compact mode contributed by %1. + Mode compacte aportat per %1. + + + + HTTP proxy support contributed by %1. + Suport de servidor intermediari HTTP aportat per %1. + + + + Translated by %1 + Traduït per %1 + + + + Released under the <a href='%1'>GNU General Public License</a> + Alliberat sota la <a href='%1'>Llicència Pública General de GNU</a> + + + + &Close + &Tanca + + + + About + Quant a + + + + What you always wanted to know about %1 and never dared to ask + El que sempre havíeu volgut saber sobre el %1 i mai us havíeu atrevit a preguntar + + + + ClearButton + + + Clear + Neteja + + + + DownloadItem + + + bytes + bytes + + + + KB + KB + + + + MB + MB + + + + bytes/sec + bytes/seg + + + + KB/sec + KB/seg + + + + MB/sec + MB/seg + + + + seconds + segons + + + + minutes + minuts + + + + %4 %5 remaining + %4 %5 restant + + + + DownloadManager + + + This is just the demo version of %1. + Aquesta només és la versió de demostració del %1. + + + + It can only download videos shorter than %1 minutes so you can test the download functionality. + Només pot baixar vídeos de menys de %1 minuts per tal que en pugui provar aquesta funció. + + + + Continue + Continua + + + + Get the full version + Aconsegueix la versió completa + + + + %n Download(s) + %n Baixada%n Baixades + + + + DownloadSettings + + + Change location... + Canvia la ubicació... + + + + Choose the download location + Escull la ubicació de les baixades + + + + Download location changed. + Ubicació de baixades canviada. + + + + Current downloads will still go in the previous location. + Les baixades actuals encara aniran a la ubicació prèvia. + + + + Downloading to: %1 + Baixant a: %1 + + + + DownloadView + + + + Downloads + Baixades + + + + GlobalShortcuts + + + Play + Reprodueix + + + + Pause + Pausa + + + + Play/Pause + Reprodueix/Pausa + + + + Stop + Atura + + + + Stop playing after current track + Atura en acabar la peça actual + + + + Next track + Peça següent + + + + Previous track + Peça prèvia + + + + Increase volume + Augmenta el volum + + + + Decrease volume + Disminuex el volum + + + + Mute + Silenci + + + + Seek forward + Cerca endavant + + + + Seek backward + Cerca enrere + + + + ListModel + + + Searching... + Buscant... + + + + Show %1 More + Mostra %1 Més + + + + No videos + Cap vídeo + + + + No more videos + Cap més vídeo + + + + LoadingWidget + + + Error + Error + + + + MainWindow + + + &Stop + &Atura + + + + Stop playback and go back to the search view + Atura la reproducció i torna a la vista de búsqueda + + + + S&kip + &Salta + + + + Skip to the next video + Salta al vídeo següent + + + + + &Pause + &Pausa + + + + + Pause playback + Pausa la reproducció + + + + + &Full Screen + Pantalla &Completa + + + + Go full screen + Passa a pantalla completa + + + + &Compact mode + &Mode compacte + + + + Hide the playlist and the toolbar + Amaga la llista de reproducció i la barra d'eines + + + + Open the &YouTube page + Obre la pàgina de &YouTube + + + + Go to the YouTube video page and pause playback + Ves a la pàgina del vídeo de YouTube i pausa la reproducció + + + + Copy the YouTube &link + Copia l'&enllaç de YouTube + + + + Copy the current video YouTube link to the clipboard + Copia l'enllaç del vídeo actual de YouTube al porta-retalls + + + + Copy the video stream &URL + Copia el &URL del flux de vídeo + + + + Copy the current video stream URL to the clipboard + Copia el URL del flux de vídeo actual al porta-retalls + + + + &Remove + &Elimina + + + + Remove the selected videos from the playlist + Elimina els vídeos seleccionats de la llista de reproducció + + + + Move &Up + Mou &Amunt + + + + Move up the selected videos in the playlist + Mou amunt en la llista de reproducció els vídeos seleccionats + + + + Move &Down + Mou A&vall + + + + Move down the selected videos in the playlist + Mou avall en la llista de reproducció els vídeos seleccionats + + + + &Clear recent searches + &Neteja búsquedes recents + + + + Clear the search history. Cannot be undone. + Neteja l'historial de búsquedes. No es pot desfer. + + + + &Quit + &Surt + + + + Ctrl+Q + Ctrl+Q + + + + Bye + Adéu + + + + &Website + Pàgina &Web + + + + %1 on the Web + %1 en la Web + + + + Make a &donation + Fer una &donació + + + + Please support the continued development of %1 + Siusplau recolza el desenvolupament continuat del %1 + + + + &About + &Quant a + + + + Info about %1 + Info sobre %1 + + + + Search + Busca + + + + Mute volume + Silencia volum + + + + Ctrl+M + Ctrl+M + + + + + &Downloads + &Baixades + + + + Show details about video downloads + Mostra detalls de les descàrregues de vídeo + + + + &Download + &Baixa + + + + Download the current video + Baixa el vídeo actual + + + + &Application + &Aplicació + + + + &Playlist + &Llista de reproducció + + + + &Video + &Vídeo + + + + &Help + A&juda + + + + Press %1 to raise the volume, %2 to lower it + Prem %1 per pujar el volum, %2 per baixar-lo + + + + + Opening %1 + Obrint %1 + + + + Do you want to exit %1 with a download in progress? + Vol abandonar el %1 amb una baixada en curs? + + + + If you close %1 now, this download will be cancelled. + Si tanca el %1 ara, aquesta baixada es cancel·larà. + + + + Close and cancel download + Tanca i cancel·la la baixada + + + + Wait for download to finish + Espera a acabar la baixada + + + + Fatal error: %1 + Error fatal: %1 + + + + Error: %1 + Error: %1 + + + + &Play + &Reprodueix + + + + Resume playback + Continua la reproducció + + + + Exit &Full Screen + Abandona la Pantalla &Completa + + + + Remaining time: %1 + Temps restant: %1 + + + + Volume at %1% + Volum al %1% + + + + Volume is muted + Volum silenciat + + + + Volume is unmuted + Volum de-silenciat + + + + Maximum video definition set to %1 + Resolució màxima de vídeo fixada a %1 + + + + Your privacy is now safe + La seva privacitat està protegida + + + + Downloads complete + Baixades completes + + + + MediaView + + + Most relevant + Més rellevant + + + + Most recent + Més recent + + + + Most viewed + Més vist + + + + You can now paste the YouTube link into another application + Ja pot enganxar l'enllaç de YouTube en una altra aplicació + + + + You can now paste the video stream URL into another application + Ja pot enganxar el URL del flux de vídeo en una altra aplicació + + + + The link will be valid only for a limited time. + L'enllaç només serà vàlid durant un temps limitat. + + + + This is just the demo version of %1. + Aquesta només és la versió de demostració del %1. + + + + It allows you to test the application and see if it works for you. + Li permet probar l'aplicació i veure si li va bé. + + + + Continue + Continua + + + + Get the full version + Aconsegueix la versió completa + + + + Downloading %1 + Baixant %1 + + + + NetworkAccess + + + Network error: %1 + Error de xarxa: %1 + + + + PrettyItemDelegate + + + %1 views + %1 visualitzacions + + + + %1 of %2 (%3) — %4 + %1 de %2 (%3) — %4 + + + + Preparing + Preparant + + + + Failed + Fallit + + + + Completed + Completat + + + + Stopped + Aturat + + + + Stop downloading + Atura la baixada + + + + Show in %1 + Mostra en %1 + + + + Open parent folder + Obre el directori superior + + + + Restart downloading + Recomença la baixada + + + + SearchLineEdit + + + Search + Busca + + + + SearchView + + + Welcome to <a href='%1'>%2</a>, + Benvingut al <a href='%1'>%2</a>, + + + + Get the full version + Aconsegueix la versió completa + + + + Enter + "Enter", as in "type". The whole frase says: "Enter a keyword to start watching videos" + Introdueix + + + + a keyword + una paraula + + + + a channel + un canal + + + + to start watching videos. + per comencar a veure vídeos. + + + + Watch + Veure + + + + Recent keywords + Búsquedes recents + + + + Recent channels + Canals recents + + + + A new version of %1 is available. Please <a href='%2'>update to version %3</a> + Disponible una nova versió del %1. Siusplau <a href='%2'>actualitza a la versió %3</a> + + + + Make yourself comfortable + Posi's còmode + + + + Video + + + Cannot get video stream for %1 + No es pot obtenir flux de vídeo per %1 + + + + Network error: %1 for %2 + Error de xarxa: %1 per %2 + + + \ No newline at end of file diff --git a/locale/es_ES.ts b/locale/es_ES.ts index d488c47..e23fead 100644 --- a/locale/es_ES.ts +++ b/locale/es_ES.ts @@ -40,7 +40,7 @@ HTTP proxy support contributed by %1. - + Soporte de proxy HTTP aportado por %1 @@ -293,12 +293,12 @@ Stop playback and go back to the search view - + Parar reproducción y volver a la vista de búsqueda S&kip - + Sa&ltar @@ -315,7 +315,7 @@ Pause playback - + Pausar reproducción @@ -336,7 +336,7 @@ Hide the playlist and the toolbar - + Ocultar la lista de reproducción y la barra de herramientas @@ -346,7 +346,7 @@ Go to the YouTube video page and pause playback - + Ir a la página del vídeo en YouTube y pausar la reproducción @@ -356,62 +356,62 @@ Copy the current video YouTube link to the clipboard - + Copiar al portapapeles el enlace del vídeo de YouTube actual Copy the video stream &URL - + Copiar la &URL del stream de vídeo Copy the current video stream URL to the clipboard - + Copiar al portapapeles la &URL del stream de vídeo actual &Remove - + Elimina&r Remove the selected videos from the playlist - + Eliminar los vídeos seleccionados de la lista de reproducción Move &Up - + S&ubir Move up the selected videos in the playlist - + Subir en la lista de reproducción los vídeos seleccionados Move &Down - + &Bajar Move down the selected videos in the playlist - + Bajar en la lista de reproducción los vídeos seleccionados &Clear recent searches - + &Limpiar las búsquedas recientes Clear the search history. Cannot be undone. - + Limpiar el historial de búsquedas. Esta acción no puede deshacerse. &Quit - + &Salir @@ -421,42 +421,42 @@ Bye - + Adiós &Website - + Sitio &Web %1 on the Web - + %1 en la Web Make a &donation - + Haz una &donación Please support the continued development of %1 - + Por favor, apoye el continuo desarrollo de %1 &About - + &Acerca de Info about %1 - + Información sobre %1 Search - + Búsqueda @@ -472,118 +472,118 @@ &Downloads - + &Descargas Show details about video downloads - + Muestra detalles sobre las descargas de vídeos &Download - + &Descargar Download the current video - + Descarga el vídeo actual &Application - + &Aplicación &Playlist - + Lista de Re&producción &Video - + &Vídeo &Help - + &Ayuda Press %1 to raise the volume, %2 to lower it - + Presiona %1 para subir el volumen, %2 para bajarlo Opening %1 - + Abriendo %1 Do you want to exit %1 with a download in progress? - + ¿Deseas salir de %1 con una descarga activa? If you close %1 now, this download will be cancelled. - + Si cierras %1, esta descarga se cancelará. Close and cancel download - + Cerrar y cancelar la descarga Wait for download to finish - + Esperar la finalización de la descarga Fatal error: %1 - + Error fatal: %1 Error: %1 - + Error: %1 &Play - + Re&producir Resume playback - + Reiniciar la reproducción Exit &Full Screen - + Salir de pantalla &completa Remaining time: %1 - + Tiempo restante: %1 Volume at %1% - + Volumen al %1% Volume is muted - + El volumen está desactivado Volume is unmuted - + El volumen está activado @@ -598,7 +598,7 @@ Downloads complete - + Descargas completadas @@ -606,37 +606,37 @@ Most relevant - + Más relevantes Most recent - + Más recientes Most viewed - + Más vistos You can now paste the YouTube link into another application - + Ahora puedes pegar el enlace de Youtube en otra aplicación You can now paste the video stream URL into another application - + Ahora puedes pegar la URL del stream de vídeo en otra aplicación The link will be valid only for a limited time. - + EL enlace será válido sólo por un plazo de tiempo limitado. This is just the demo version of %1. - + Esta es sólo la versión de demo de %1. @@ -646,17 +646,17 @@ Continue - + Continuar Get the full version - + Obtener la versión completa Downloading %1 - + Descargand %1 @@ -664,7 +664,7 @@ Network error: %1 - + Error de red: %1 @@ -672,52 +672,52 @@ %1 views - + %1 vistas %1 of %2 (%3) — %4 - + %1 de %2 (%3) -- %4 Preparing - + Preparando Failed - + Falló Completed - + Completo Stopped - + Parado Stop downloading - + Parar descarga Show in %1 - + Mostrar en %1 Open parent folder - + Abrir carpeta padre Restart downloading - + Reiniciar descarga @@ -725,7 +725,7 @@ Search - + Buscar @@ -733,48 +733,48 @@ Welcome to <a href='%1'>%2</a>, - + Bienvenido/a a <a href='%1'>%2</a>, Get the full version - + Obtener la versión completa Enter "Enter", as in "type". The whole frase says: "Enter a keyword to start watching videos" - + Introducir a keyword - + una palabra clave a channel - + un canal to start watching videos. - + empezar a ver vídeos Watch - + Ver Recent keywords - + Palabras clave recientes Recent channels - + Canales recientes @@ -784,7 +784,7 @@ Make yourself comfortable - + Siéntete como en casa diff --git a/locale/fi.ts b/locale/fi.ts new file mode 100644 index 0000000..3271823 --- /dev/null +++ b/locale/fi.ts @@ -0,0 +1,803 @@ + +UTF-8 + + AboutView + + + There's life outside the browser! + Selaimen ulkopuolellakin on elämää! + + + + Version %1 + Versionumero: %1 + + + + %1 is Free Software but its development takes precious time. + %1 on vapaa ohjelmisto, mutta sen kehitys vie kallisarvoista aikaa. + + + + Please <a href='%1'>donate</a> to support the continued development of %2. + Tue %2 :n jatkuvaa kehitystä <a href='%1'>lahjoittamalla</a>. + + + + Report bugs and send in your ideas to %1 + Ilmoita viat ja kerro ehdotukseksi osoitteeseen %1 + + + + Icon designed by %1. + Kuvakkeen suunnitteli %1 + + + + Compact mode contributed by %1. + + + + + HTTP proxy support contributed by %1. + HTTP-välityspalvelintuen teki %1 + + + + Translated by %1 + Käännöksen ovat tehneet %1 + + + + Released under the <a href='%1'>GNU General Public License</a> + Julkaistu <a href='%1'>GNU General Public License</a> lisenssin alaisena + + + + &Close + &Sulje + + + + About + Tietoja + + + + What you always wanted to know about %1 and never dared to ask + Mitä olet aina halunnut tietää %1sta, muttet ole koskaan kehdannut kysyä + + + + ClearButton + + + Clear + Pyyhi + + + + DownloadItem + + + bytes + bittiä + + + + KB + Kt + + + + MB + Mt + + + + bytes/sec + bittiä/sek. + + + + KB/sec + Kt/sek. + + + + MB/sec + Mt/sek. + + + + seconds + sekuntia + + + + minutes + minuuttia + + + + %4 %5 remaining + %4 %5 jäljellä + + + + DownloadManager + + + This is just the demo version of %1. + Tämä on %1-ohjelman kokeiluversio. + + + + It can only download videos shorter than %1 minutes so you can test the download functionality. + Voit ladata vain videoita jotka ovat lyhyempiä kuin %1 minuuttia, jotta voit testata latausominaisuutta. + + + + Continue + Jatka + + + + Get the full version + + + + + %n Download(s) + %n lataus%n latausta + + + + DownloadSettings + + + Change location... + Muuta sijainti... + + + + Choose the download location + Valitse latauskansio + + + + Download location changed. + Latauskansio vaihdettu. + + + + Current downloads will still go in the previous location. + Nykyiskäynnissä olevat lataukset ladataan vanhaan latauskansioon. + + + + Downloading to: %1 + Ladataan: %1 + + + + DownloadView + + + + Downloads + Lataukset + + + + GlobalShortcuts + + + Play + Toista + + + + Pause + Keskeytä + + + + Play/Pause + Toista/Keskeytä + + + + Stop + Pysäytä + + + + Stop playing after current track + Pysäytä toisto nykyisen kappaleen jälkeen + + + + Next track + Seuraava kappale + + + + Previous track + Edellinen kappale + + + + Increase volume + Lisää äänenvoimakkuutta + + + + Decrease volume + Vähennä äänenvoimakkuutta + + + + Mute + Mykistä + + + + Seek forward + + + + + Seek backward + + + + + ListModel + + + Searching... + Haetaan... + + + + Show %1 More + + + + + No videos + Ei videoita + + + + No more videos + + + + + LoadingWidget + + + Error + Virhe + + + + MainWindow + + + &Stop + &Pysäytä + + + + Stop playback and go back to the search view + Pysäytä soittolista ja palaa hakuun + + + + S&kip + O&hita + + + + Skip to the next video + Siirry seuraavaan videoon + + + + + &Pause + &Keskeytä + + + + + Pause playback + Keskeytä soittolista + + + + + &Full Screen + &Kokoruututila + + + + Go full screen + Näytä kokoruudulla + + + + &Compact mode + + + + + Hide the playlist and the toolbar + + + + + Open the &YouTube page + + + + + Go to the YouTube video page and pause playback + Mene YouTube-videosivulle ja keskeytä soittolista + + + + Copy the YouTube &link + + + + + Copy the current video YouTube link to the clipboard + + + + + Copy the video stream &URL + + + + + Copy the current video stream URL to the clipboard + + + + + &Remove + + + + + Remove the selected videos from the playlist + + + + + Move &Up + + + + + Move up the selected videos in the playlist + + + + + Move &Down + + + + + Move down the selected videos in the playlist + + + + + &Clear recent searches + + + + + Clear the search history. Cannot be undone. + + + + + &Quit + + + + + Ctrl+Q + Ctrl+Q + + + + Bye + + + + + &Website + &Kotisivu + + + + %1 on the Web + + + + + Make a &donation + + + + + Please support the continued development of %1 + + + + + &About + + + + + Info about %1 + + + + + Search + + + + + Mute volume + + + + + Ctrl+M + + + + + + &Downloads + + + + + Show details about video downloads + + + + + &Download + + + + + Download the current video + + + + + &Application + + + + + &Playlist + + + + + &Video + + + + + &Help + &Ohje + + + + Press %1 to raise the volume, %2 to lower it + + + + + + Opening %1 + + + + + Do you want to exit %1 with a download in progress? + + + + + If you close %1 now, this download will be cancelled. + + + + + Close and cancel download + + + + + Wait for download to finish + + + + + Fatal error: %1 + + + + + Error: %1 + + + + + &Play + + + + + Resume playback + + + + + Exit &Full Screen + + + + + Remaining time: %1 + + + + + Volume at %1% + + + + + Volume is muted + + + + + Volume is unmuted + + + + + Maximum video definition set to %1 + + + + + Your privacy is now safe + + + + + Downloads complete + + + + + MediaView + + + Most relevant + + + + + Most recent + + + + + Most viewed + + + + + You can now paste the YouTube link into another application + + + + + You can now paste the video stream URL into another application + + + + + The link will be valid only for a limited time. + + + + + This is just the demo version of %1. + + + + + It allows you to test the application and see if it works for you. + + + + + Continue + + + + + Get the full version + + + + + Downloading %1 + + + + + NetworkAccess + + + Network error: %1 + + + + + PrettyItemDelegate + + + %1 views + %1 näyttökertaa + + + + %1 of %2 (%3) — %4 + + + + + Preparing + + + + + Failed + + + + + Completed + + + + + Stopped + Pysäytetty + + + + Stop downloading + Pysäytä lataus + + + + Show in %1 + + + + + Open parent folder + + + + + Restart downloading + + + + + SearchLineEdit + + + Search + + + + + SearchView + + + Welcome to <a href='%1'>%2</a>, + + + + + Get the full version + + + + + Enter + "Enter", as in "type". The whole frase says: "Enter a keyword to start watching videos" + + + + + a keyword + + + + + a channel + + + + + to start watching videos. + + + + + Watch + + + + + Recent keywords + + + + + Recent channels + + + + + A new version of %1 is available. Please <a href='%2'>update to version %3</a> + + + + + Make yourself comfortable + + + + + Video + + + Cannot get video stream for %1 + + + + + Network error: %1 for %2 + + + + \ No newline at end of file diff --git a/locale/locale.pri b/locale/locale.pri index eebfe9b..4ad9ee1 100644 --- a/locale/locale.pri +++ b/locale/locale.pri @@ -4,8 +4,7 @@ INCLUDEPATH += $$PWD DEPENDPATH += $$PWD # ls -1 *.ts | tr '\n' ' ' -TRANSLATIONS += ar.ts bg.ts bg_BG.ts cs_CZ.ts de_DE.ts el.ts el_GR.ts en_US.ts es.ts es_AR.ts es_ES.ts fi_FI.ts fr_FR.ts gl.ts he_IL.ts hr.ts hr_HR.ts hu_HU.ts id.ts id_ID.ts it_IT.ts ja_JP.ts jv.ts lv.ts nb_NO.ts nl.ts nl_NL.ts pl_PL.ts pt_BR.ts pt_PT.ts ro.ts ro_RO.ts ru_RU.ts sr.ts tr_TR.ts uk.ts zh_CN.ts - +TRANSLATIONS += ar.ts bg.ts bg_BG.ts ca_ES.ts cs_CZ.ts de_DE.ts el.ts el_GR.ts en_US.ts es.ts es_AR.ts es_ES.ts fi.ts fi_FI.ts fr_FR.ts gl.ts he_IL.ts hr.ts hr_HR.ts hu_HU.ts id.ts id_ID.ts it_IT.ts ja_JP.ts jv.ts lv.ts nb_NO.ts nl.ts nl_NL.ts pl_PL.ts pt_BR.ts pt_PT.ts ro.ts ro_RO.ts ru_RU.ts sq.ts sr.ts sv_SE.ts tr_TR.ts uk.ts uk_UA.ts zh_CN.ts isEmpty(QMAKE_LRELEASE) { win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease diff --git a/locale/sv_SE.ts b/locale/sv_SE.ts new file mode 100644 index 0000000..1c7e3d3 --- /dev/null +++ b/locale/sv_SE.ts @@ -0,0 +1,803 @@ + +UTF-8 + + AboutView + + + There's life outside the browser! + Det finns ett liv utanför webläsaren! + + + + Version %1 + Version %1 + + + + %1 is Free Software but its development takes precious time. + %1 är fri programvara men utveklingen tar värdefull tid. + + + + Please <a href='%1'>donate</a> to support the continued development of %2. + Vänligen <a href='%1'> donera</a> för att stöda den fortsatta utveklingen utav %2 + + + + Report bugs and send in your ideas to %1 + Rapportera fel och skicka in dina idéer till %1 + + + + Icon designed by %1. + Ikon designad av %1 + + + + Compact mode contributed by %1. + Kompakt läge bidragit av %1. + + + + HTTP proxy support contributed by %1. + HTTP-proxy stöd bidragit av %1. + + + + Translated by %1 + Översatt av %1 + + + + Released under the <a href='%1'>GNU General Public License</a> + Släppt under <a href='%1'>GNU General Public License</a> + + + + &Close + &Stäng + + + + About + Om + + + + What you always wanted to know about %1 and never dared to ask + Vad du alltid velat veta om %1 och aldrig vågat fråga om + + + + ClearButton + + + Clear + Rensa + + + + DownloadItem + + + bytes + bytes + + + + KB + KB + + + + MB + MB + + + + bytes/sec + byte / sekund + + + + KB/sec + KB / sekund + + + + MB/sec + MB / sekund + + + + seconds + sekunder + + + + minutes + minuter + + + + %4 %5 remaining + %4 %5 återstår + + + + DownloadManager + + + This is just the demo version of %1. + Detta är bara en demo version av %1. + + + + It can only download videos shorter than %1 minutes so you can test the download functionality. + Det kan bara ladda ner filmer kortare än %1 minuter så att du kan testa ladda ner funktionen. + + + + Continue + Fortsätt + + + + Get the full version + Få den fullständiga versionen + + + + %n Download(s) + %n Nedladning (ar)%n Nedladning (ar) + + + + DownloadSettings + + + Change location... + Byt plats ... + + + + Choose the download location + Välj hämtningsplats + + + + Download location changed. + Hämtningsplatsen har ändrats. + + + + Current downloads will still go in the previous location. + Aktuella nedladdningar kommer fortfarande att hamna i den tidigare hämtningsplatsen. + + + + Downloading to: %1 + + + + + DownloadView + + + + Downloads + Nedladdningar + + + + GlobalShortcuts + + + Play + Spela + + + + Pause + Pausa + + + + Play/Pause + Spela / Pausa + + + + Stop + Stoppa + + + + Stop playing after current track + Sluta spela efter nuvarande spår + + + + Next track + Nästa spår + + + + Previous track + Föregående spår + + + + Increase volume + Öka volymen + + + + Decrease volume + Minska volymen + + + + Mute + Mute + + + + Seek forward + Sök framåt + + + + Seek backward + Sök bakåt + + + + ListModel + + + Searching... + Söker... + + + + Show %1 More + Visa %1 Fler + + + + No videos + Inga videos + + + + No more videos + Inga fler videos + + + + LoadingWidget + + + Error + Fel + + + + MainWindow + + + &Stop + &Stop + + + + Stop playback and go back to the search view + Stoppa uppspelningen och gå tillbaka till Sök vyn + + + + S&kip + H&oppa + + + + Skip to the next video + Hoppa till nästa video + + + + + &Pause + &Pausa + + + + + Pause playback + Pausa uppspelning + + + + + &Full Screen + &Helskärm + + + + Go full screen + Använd helskärm + + + + &Compact mode + &Kompakt läge + + + + Hide the playlist and the toolbar + Dölj spellistan och verktygsfältet + + + + Open the &YouTube page + Öppna &YouTube-sidan + + + + Go to the YouTube video page and pause playback + Gå till YouTube-video-sidan och pausa uppspelning + + + + Copy the YouTube &link + Kopiera YouTube &länken + + + + Copy the current video YouTube link to the clipboard + Kopiera den aktuella YouTube-video-länken till urklipp + + + + Copy the video stream &URL + Kopiera videoströmmens &URL + + + + Copy the current video stream URL to the clipboard + Kopiera den nuvarande videoströmmen URL till urklipp + + + + &Remove + &Ta bort + + + + Remove the selected videos from the playlist + Ta bort markerade videoklippen från spellistan + + + + Move &Up + Flytta &upp + + + + Move up the selected videos in the playlist + Flytta upp de markerade videoklippen i spellistan + + + + Move &Down + Flytta &nedåt + + + + Move down the selected videos in the playlist + Flytta ner markerade videoklippen i spellistan + + + + &Clear recent searches + &Rensa senaste sökningar + + + + Clear the search history. Cannot be undone. + Rensa sökhistorik. Kan inte ångras. + + + + &Quit + &Avsluta + + + + Ctrl+Q + Ctrl+Q + + + + Bye + Hej då + + + + &Website + &Webbsida + + + + %1 on the Web + %1 på webben + + + + Make a &donation + Gör en &donation + + + + Please support the continued development of %1 + Vänligen stöd den fortsatta utvecklingen av %1 + + + + &About + &Om + + + + Info about %1 + Info om %1 + + + + Search + Sök + + + + Mute volume + Mute volym + + + + Ctrl+M + Ctrl + M + + + + + &Downloads + &Nedladdningar + + + + Show details about video downloads + Visa detaljer om video nedladdningar + + + + &Download + &Ladda ner + + + + Download the current video + Ladda ner den aktuella videon + + + + &Application + &Applikation + + + + &Playlist + &Spellista + + + + &Video + &Video + + + + &Help + &Hjälp + + + + Press %1 to raise the volume, %2 to lower it + Tryck på %1 för att öka volymen, %2 för att sänka den + + + + + Opening %1 + Öppnar %1 + + + + Do you want to exit %1 with a download in progress? + Vill du avsluta %1 med en nedladdning igång? + + + + If you close %1 now, this download will be cancelled. + Om du stänger %1 nu, avbryts nedladdningen. + + + + Close and cancel download + Stäng och avbryt nedladdning + + + + Wait for download to finish + Vänta på att nedladdning blir klar + + + + Fatal error: %1 + Ödesdigert fel: %1 + + + + Error: %1 + Fel: %1 + + + + &Play + &Spela + + + + Resume playback + Återuppta uppspelning + + + + Exit &Full Screen + Stäng &Helskärm + + + + Remaining time: %1 + Återstående tid: %1 + + + + Volume at %1% + Volym %1% + + + + Volume is muted + Ljudet är avstängt + + + + Volume is unmuted + Volymen är på + + + + Maximum video definition set to %1 + Högsta video upplösning är satt till %1 + + + + Your privacy is now safe + Din integritet är nu säker + + + + Downloads complete + Nedladdningar klar + + + + MediaView + + + Most relevant + Mest relevanta + + + + Most recent + Senaste + + + + Most viewed + Mest sedda + + + + You can now paste the YouTube link into another application + Nu kan du klistra in YouTube-länken i ett annat program + + + + You can now paste the video stream URL into another application + Du kan nu klistra in videoströmmens webbadress i ett annat program + + + + The link will be valid only for a limited time. + Länken kommer att gälla endast under en begränsad tid. + + + + This is just the demo version of %1. + Detta är bara en demo version av %1. + + + + It allows you to test the application and see if it works for you. + Det tillåter dig att testa programmet och se om det fungerar för dig. + + + + Continue + Fortsätt + + + + Get the full version + Skaffa den fullständiga versionen + + + + Downloading %1 + Hämtar %1 + + + + NetworkAccess + + + Network error: %1 + Nätverks fel:%1 + + + + PrettyItemDelegate + + + %1 views + %1 visningar + + + + %1 of %2 (%3) — %4 + %1 av %2 (%3) -%4 + + + + Preparing + Förbereder + + + + Failed + Misslyckades + + + + Completed + + + + + Stopped + + + + + Stop downloading + + + + + Show in %1 + + + + + Open parent folder + + + + + Restart downloading + + + + + SearchLineEdit + + + Search + + + + + SearchView + + + Welcome to <a href='%1'>%2</a>, + + + + + Get the full version + + + + + Enter + "Enter", as in "type". The whole frase says: "Enter a keyword to start watching videos" + + + + + a keyword + + + + + a channel + + + + + to start watching videos. + + + + + Watch + + + + + Recent keywords + + + + + Recent channels + + + + + A new version of %1 is available. Please <a href='%2'>update to version %3</a> + + + + + Make yourself comfortable + + + + + Video + + + Cannot get video stream for %1 + + + + + Network error: %1 for %2 + + + + \ No newline at end of file diff --git a/locale/uk_UA.ts b/locale/uk_UA.ts new file mode 100644 index 0000000..1a5f720 --- /dev/null +++ b/locale/uk_UA.ts @@ -0,0 +1,803 @@ + +UTF-8 + + AboutView + + + There's life outside the browser! + За межами браузеру існує життя! + + + + Version %1 + Версія %1 + + + + %1 is Free Software but its development takes precious time. + %1 — це вільне програмне забезпечення, але його розробка займає дорогоцінний час. + + + + Please <a href='%1'>donate</a> to support the continued development of %2. + Будь ласка, <a href='%1'>внесіть пожертву</a>, щоб підтримати подальший розвиток %2. + + + + Report bugs and send in your ideas to %1 + Повідомляйте про помилки та пропонуйте свої ідеї на %1 + + + + Icon designed by %1. + Піктограму намалював %1. + + + + Compact mode contributed by %1. + Компактний режим розробив %1. + + + + HTTP proxy support contributed by %1. + Підтримку HTTP-проксі розробив %1. + + + + Translated by %1 + Перекладали %1 + + + + Released under the <a href='%1'>GNU General Public License</a> + Ліцензовано <a href='%1'>Загальною громадською ліцензією GNU</a> + + + + &Close + &Закрити + + + + About + Про програму + + + + What you always wanted to know about %1 and never dared to ask + Все те, про %1, що ви завжди хотіли дізнатись, але не наважувалися спитати + + + + ClearButton + + + Clear + Очистити + + + + DownloadItem + + + bytes + байт + + + + KB + КБ + + + + MB + МБ + + + + bytes/sec + байт/сек + + + + KB/sec + КБ/сек + + + + MB/sec + МБ/сек + + + + seconds + секунд + + + + minutes + хвилин + + + + %4 %5 remaining + залишилось %4 %5 + + + + DownloadManager + + + This is just the demo version of %1. + Це всього лише демо-версія %1. + + + + It can only download videos shorter than %1 minutes so you can test the download functionality. + З метою тестування можливо завантажувати відео лише з тривалістю до %1 хв. + + + + Continue + Продовжити + + + + Get the full version + Отримати повнофункціональну версію + + + + %n Download(s) + %n Завантаження%n Завантаження%n Завантажень + + + + DownloadSettings + + + Change location... + Змінити теку… + + + + Choose the download location + Оберіть теку для завантаження + + + + Download location changed. + Теку завантаження змінено. + + + + Current downloads will still go in the previous location. + Поточні завантаження все ще будуть збережені у попередньому місці. + + + + Downloading to: %1 + Завантажуеться в %1 + + + + DownloadView + + + + Downloads + Завантаження + + + + GlobalShortcuts + + + Play + Грати + + + + Pause + Пауза + + + + Play/Pause + Грати/Пауза + + + + Stop + Зупинити + + + + Stop playing after current track + Зупинити програвання по завершенні треку + + + + Next track + Наступний трек + + + + Previous track + Попередній трек + + + + Increase volume + Збільшити гучність + + + + Decrease volume + Зменшити гучність + + + + Mute + Приглушити + + + + Seek forward + Шукати наступне + + + + Seek backward + Шукати попереднє + + + + ListModel + + + Searching... + Йде пошук… + + + + Show %1 More + Показати ще %1 + + + + No videos + Нема відео + + + + No more videos + Більше немає відео + + + + LoadingWidget + + + Error + Помилка + + + + MainWindow + + + &Stop + &Зупинити + + + + Stop playback and go back to the search view + Зупинити відтворення та повернутися до вікна пошуку + + + + S&kip + П&ропустити + + + + Skip to the next video + Перейти до наступного відео + + + + + &Pause + &Пауза + + + + + Pause playback + Призупинити відтворення + + + + + &Full Screen + Н&а весь екран + + + + Go full screen + Переключити на повноекранний режим + + + + &Compact mode + &Компактний режим + + + + Hide the playlist and the toolbar + Сховати плейлист і панель інструментів + + + + Open the &YouTube page + Відкрити сторінку на &YouTube + + + + Go to the YouTube video page and pause playback + Відкрити сторінку на YouTube та призупинити відтворення + + + + Copy the YouTube &link + Скопіювати YouTube-по&силання + + + + Copy the current video YouTube link to the clipboard + Скопіювати YouTube-посилання поточного відео в буфер + + + + Copy the video stream &URL + Скопіювати URL ві&деопотоку + + + + Copy the current video stream URL to the clipboard + Скопіювати URL поточного відеопотоку в буфер + + + + &Remove + &Вилучити + + + + Remove the selected videos from the playlist + Вилучити вибрані відео з плейлисту + + + + Move &Up + Зсув в&гору + + + + Move up the selected videos in the playlist + Зсунути вибрані в плейлисті відео вгору + + + + Move &Down + Зсунути вни&з + + + + Move down the selected videos in the playlist + Зсунути вибрані в плейлисті відео вниз + + + + &Clear recent searches + &Очистити історію недавніх пошуків + + + + Clear the search history. Cannot be undone. + Очистити історію пошуку. Зміни необоротні. + + + + &Quit + Ви&хід + + + + Ctrl+Q + Ctrl+Q + + + + Bye + До побачення + + + + &Website + Са&йт + + + + %1 on the Web + %1 в вебі + + + + Make a &donation + Підтримати про&ект + + + + Please support the continued development of %1 + Будь ласка, підтримайте подальший розвиток %1 + + + + &About + &Про програму + + + + Info about %1 + Інформація про %1 + + + + Search + Пошук + + + + Mute volume + Приглушити гучність + + + + Ctrl+M + Ctrl+M + + + + + &Downloads + &Завантаження + + + + Show details about video downloads + Показати подробиці про завантажувані відео + + + + &Download + &Завантажити + + + + Download the current video + Завантажити поточне відео + + + + &Application + &Програма + + + + &Playlist + &Плейлист + + + + &Video + В&ідео + + + + &Help + &Довідка + + + + Press %1 to raise the volume, %2 to lower it + Натисніть %1, щоб збільшити гучність, а %2 — щоб знизити + + + + + Opening %1 + Відкриття %1 + + + + Do you want to exit %1 with a download in progress? + Триває завантаження відео. Ви бажаєте закрити %1? + + + + If you close %1 now, this download will be cancelled. + Якщо ви закриєте %1 прямо зараз, ці завантаження будуть скасовані. + + + + Close and cancel download + Закрити та скасувати завантаження + + + + Wait for download to finish + Дочекатися завершення завантаження + + + + Fatal error: %1 + Невиправна помилка: %1 + + + + Error: %1 + Помилка: %1 + + + + &Play + Гр&ати + + + + Resume playback + Відновити відтворення + + + + Exit &Full Screen + Вийти з поноекр&анного режиму + + + + Remaining time: %1 + Залишилось часу: %1 + + + + Volume at %1% + Гучність %1% + + + + Volume is muted + Гучність приглушено + + + + Volume is unmuted + Гучність відновлено + + + + Maximum video definition set to %1 + Максимальна чіткість відео встановлена на %1 + + + + Your privacy is now safe + Ваша конфіденційність зараз у безпеці + + + + Downloads complete + Завантаження завершено + + + + MediaView + + + Most relevant + Подібні + + + + Most recent + Недавні + + + + Most viewed + Популярні + + + + You can now paste the YouTube link into another application + Тепер ви можете вставити це посилання до іншої програми + + + + You can now paste the video stream URL into another application + Тепер ви можете вставити URL відеопотоку до іншої програми + + + + The link will be valid only for a limited time. + Посилання буде дійсне тільки протягом обмеженого часу. + + + + This is just the demo version of %1. + Це всього лише демо-версія %1. + + + + It allows you to test the application and see if it works for you. + Ви маете змогу протеступати програму та перевірити її працездатність. + + + + Continue + Продовжити + + + + Get the full version + Отримати повнофункціональну версію + + + + Downloading %1 + Завантаження %1 + + + + NetworkAccess + + + Network error: %1 + Помилка мережі: %1 + + + + PrettyItemDelegate + + + %1 views + %1 переглядів + + + + %1 of %2 (%3) — %4 + %1 з %2 (%3) — %4 + + + + Preparing + Готується + + + + Failed + Не вдалося + + + + Completed + Завершено + + + + Stopped + Зупинено + + + + Stop downloading + Зупинити завантаження + + + + Show in %1 + Показати у %1 + + + + Open parent folder + Перейти до теки з відео + + + + Restart downloading + Завантажити заново + + + + SearchLineEdit + + + Search + Пошук + + + + SearchView + + + Welcome to <a href='%1'>%2</a>, + Ласкаво просимо до <a href='%1'>%2</a>, + + + + Get the full version + Отримати повнофункціональну версію + + + + Enter + "Enter", as in "type". The whole frase says: "Enter a keyword to start watching videos" + Введіть + + + + a keyword + ключове слово + + + + a channel + канал + + + + to start watching videos. + , щоб почати дивитися відео. + + + + Watch + Перегляд + + + + Recent keywords + Останні ключові слова + + + + Recent channels + Останні канали + + + + A new version of %1 is available. Please <a href='%2'>update to version %3</a> + Доступна нова версія %1. Будь ласка, <a href='%2'>оновіться до версії %3</a> + + + + Make yourself comfortable + Влаштовуйтеся зручніше + + + + Video + + + Cannot get video stream for %1 + Неможливо отримати відеопоток для %1 + + + + Network error: %1 for %2 + Помилка мережі: %1 для %2 + + + \ No newline at end of file diff --git a/minitube.pro b/minitube.pro index d6d17dc..3717fe6 100644 --- a/minitube.pro +++ b/minitube.pro @@ -1,6 +1,6 @@ CONFIG += release TEMPLATE = app -VERSION = 1.4.2 +VERSION = 1.4.3 DEFINES += APP_VERSION="$$VERSION" INCLUDEPATH += /usr/include/phonon diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 23cb1a6..a8c1461 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -710,6 +710,7 @@ void MainWindow::fullscreen() { // workaround: prevent focus on the search bar // it steals the Space key needed for Play/Pause + toolbarSearch->setVisible(m_fullscreen); toolbarSearch->setEnabled(m_fullscreen); // Hide anything but the video @@ -903,7 +904,7 @@ void MainWindow::volumeChanged(qreal newVolume) { // automatically unmute when volume changes if (volumeSlider->audioOutput()->isMuted()) volumeSlider->audioOutput()->setMuted(false); - statusBar()->showMessage(tr("Volume at %1%").arg(newVolume*100)); + statusBar()->showMessage(tr("Volume at %1%").arg((int)(newVolume*100))); } void MainWindow::volumeMutedChanged(bool muted) { @@ -942,6 +943,8 @@ void MainWindow::toggleDefinitionMode() { void MainWindow::showFullscreenToolbar(bool show) { if (!m_fullscreen) return; mainToolBar->setVisible(show); + toolbarSearch->setVisible(show); + toolbarSearch->setEnabled(show); } void MainWindow::showFullscreenPlaylist(bool show) { diff --git a/src/MediaView.cpp b/src/MediaView.cpp index c9ae47f..66fc5ec 100644 --- a/src/MediaView.cpp +++ b/src/MediaView.cpp @@ -124,7 +124,6 @@ MediaView::MediaView(QWidget *parent) : QWidget(parent) { #ifdef APP_DEMO demoTimer = new QTimer(this); demoTimer->setSingleShot(true); - demoTimer->setInterval(30000); connect(demoTimer, SIGNAL(timeout()), SLOT(demoMessage())); #endif @@ -196,15 +195,17 @@ void MediaView::disappear() { } void MediaView::handleError(QString message) { - if (message.indexOf("movie atom") != -1 || message.indexOf("Could not open") != -1) { + // if (message.indexOf("movie atom") != -1 || message.indexOf("Could not open") != -1) { QTimer::singleShot(1000, this, SLOT(startPlaying())); return; - } + // } + /* videoAreaWidget->showError(message); skippedVideo = listModel->activeVideo(); // recover from errors by skipping to the next video errorTimer->start(2000); + */ } void MediaView::stateChanged(Phonon::State newState, Phonon::State /*oldState*/) @@ -413,6 +414,10 @@ void MediaView::downloadStatusChanged() { void MediaView::startPlaying() { if (reallyStopped) return; + if (!downloadItem) { + skip(); + return; + } // go! qDebug() << "Playing" << downloadItem->currentFilename(); @@ -599,11 +604,13 @@ void MediaView::demoMessage() { if (mediaObject->state() != Phonon::PlayingState) return; mediaObject->pause(); - QMessageBox msgBox; + QMessageBox msgBox(this); msgBox.setIconPixmap(QPixmap(":/images/app.png").scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation)); msgBox.setText(tr("This is just the demo version of %1.").arg(Constants::APP_NAME)); msgBox.setInformativeText(tr("It allows you to test the application and see if it works for you.")); msgBox.setModal(true); + // make it a "sheet" on the Mac + msgBox.setWindowModality(Qt::WindowModal); QPushButton *quitButton = msgBox.addButton(tr("Continue"), QMessageBox::RejectRole); QPushButton *buyButton = msgBox.addButton(tr("Get the full version"), QMessageBox::ActionRole); diff --git a/src/SearchView.cpp b/src/SearchView.cpp index 809537e..bdb20e1 100644 --- a/src/SearchView.cpp +++ b/src/SearchView.cpp @@ -134,6 +134,7 @@ SearchView::SearchView(QWidget *parent) : QWidget(parent) { QHBoxLayout *otherLayout = new QHBoxLayout(); otherLayout->setMargin(0); + otherLayout->setSpacing(10); recentKeywordsLayout = new QVBoxLayout(); recentKeywordsLayout->setSpacing(5); diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index 5363d1e..d71185b 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -6,7 +6,7 @@ static DownloadManager *downloadManagerInstance = 0; -DownloadManager::DownloadManager(QObject *parent) : +DownloadManager::DownloadManager(QWidget *parent) : QObject(parent), downloadModel(new DownloadModel(this, this)) { } @@ -42,13 +42,15 @@ void DownloadManager::addItem(Video *video) { #ifdef APP_DEMO if (video->duration() >= 60*4) { - QMessageBox msgBox; + QMessageBox msgBox(dynamic_cast(parent())->window()); msgBox.setIconPixmap(QPixmap(":/images/app.png").scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation)); msgBox.setText(tr("This is just the demo version of %1.").arg(Constants::APP_NAME)); msgBox.setInformativeText( tr("It can only download videos shorter than %1 minutes so you can test the download functionality.") .arg(4)); msgBox.setModal(true); + // make it a "sheet" on the Mac + msgBox.setWindowModality(Qt::WindowModal); QPushButton *quitButton = msgBox.addButton(tr("Continue"), QMessageBox::RejectRole); QPushButton *buyButton = msgBox.addButton(tr("Get the full version"), QMessageBox::ActionRole); @@ -143,6 +145,12 @@ QString DownloadManager::defaultDownloadFolder() { if (!moviesDir.exists()) { // fallback to Desktop path = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation); + + QDir desktopDir(path); + if (!desktopDir.exists()) { + // fallback to Home + path = QDesktopServices::storageLocation(QDesktopServices::HomeLocation); + } } return path; } diff --git a/src/downloadmanager.h b/src/downloadmanager.h index 15baa7f..789ee03 100644 --- a/src/downloadmanager.h +++ b/src/downloadmanager.h @@ -32,7 +32,7 @@ private slots: void gotStreamUrl(QUrl url); private: - DownloadManager(QObject *parent = 0); + DownloadManager(QWidget *parent = 0); QList items; DownloadModel *downloadModel; diff --git a/src/video.cpp b/src/video.cpp index df2c9fe..545c298 100644 --- a/src/video.cpp +++ b/src/video.cpp @@ -169,6 +169,7 @@ void Video::gotVideoInfo(QByteArray data) { int previousIndex = 0; while (currentIndex >= 0) { previousIndex = currentIndex - 1; + if (previousIndex < 0) previousIndex = 0; int definitionCode = definitionCodes.at(previousIndex); if (urlMap.contains(definitionCode)) { qDebug() << "Found format" << definitionCode; diff --git a/src/videoareawidget.cpp b/src/videoareawidget.cpp index 3cc5bd6..1381b0e 100644 --- a/src/videoareawidget.cpp +++ b/src/videoareawidget.cpp @@ -122,3 +122,17 @@ void VideoAreaWidget::mouseMoveEvent(QMouseEvent *event) { ret = QMetaObject::invokeMethod(mainWindow, "showFullscreenPlaylist", Qt::DirectConnection, Q_ARG(bool, visible)); if (!ret) qDebug() << "showFullscreenPlaylist invokeMethod failed"; } + +void VideoAreaWidget::leaveEvent(QMouseEvent *event) { + QWidget::leaveEvent(event); + + QWidget* mainWindow = window(); + if (!mainWindow->isFullScreen()) return; + + bool visible = false; + bool ret = QMetaObject::invokeMethod(mainWindow, "showFullscreenToolbar", Qt::DirectConnection, Q_ARG(bool, visible)); + if (!ret) qDebug() << "showFullscreenToolbar invokeMethod failed"; + + ret = QMetaObject::invokeMethod(mainWindow, "showFullscreenPlaylist", Qt::DirectConnection, Q_ARG(bool, visible)); + if (!ret) qDebug() << "showFullscreenPlaylist invokeMethod failed"; +} diff --git a/src/videoareawidget.h b/src/videoareawidget.h index e1f7cea..60112f5 100644 --- a/src/videoareawidget.h +++ b/src/videoareawidget.h @@ -32,6 +32,7 @@ protected: void dragEnterEvent(QDragEnterEvent *event); void dropEvent(QDropEvent *event); void mouseMoveEvent(QMouseEvent *event); + void leaveEvent(QMouseEvent *event); private: QStackedLayout *stackedLayout; -- 2.39.5