diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index ef895871..7cec77a9 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -882,7 +882,7 @@ - + Show Details @@ -1625,9 +1625,9 @@ - - - + + + Check for Updates @@ -1668,13 +1668,13 @@ - + Disable Update Reminder - + Disable Sound Effects @@ -1759,840 +1759,840 @@ - + Adding file(s), please wait... - - + + Access Denied - + %n file(s) have been rejected, because read access was not granted! - + This usually means the file is locked by another process. - + CDDA Files - + %n file(s) have been rejected, because they are dummy CDDA files! - + Sorry, LameXP cannot extract audio tracks from an Audio-CD at present. - + We recommend using %1 for that purpose. - + Cue Sheet - + %n file(s) have been rejected, because they appear to be Cue Sheet images! - + Please use LameXP's Cue Sheet wizard for importing Cue Sheet files. - + Files Rejected - + %n file(s) have been rejected, because the file format could not be recognized! - + This usually means the file is damaged or the file format is not supported. - + Scanning folder(s) for files, please wait... - + DEMO VERSION - + Initializing directory outline, please be patient... - + You can drop in audio files here! - + Open File in External Application - + Browse File Location - + Browse Selected Folder - + Refresh Directory Outline - + Go To Parent Directory - + Bookmark Current Output Folder - + Export Meta Tags to CSV File - + Import Meta Tags from CSV File - + License Declined - + You have declined the license. Consequently the application will exit now! - + Goodbye! - + LameXP - Expired - + This demo (pre-release) version of LameXP has expired at %1. - + LameXP is free software and release versions won't expire. - - + + Exit Program - + It seems that a bogus anti-virus software is slowing down the startup of LameXP. - + Please refer to the %1 document for details and solutions! - + Slow Startup - - - - - + + + + + Discard - - + + Don't Show Again - + Urgent Update - + Your version of LameXP is more than a year old. Time for an update! - - + + Ignore - + Skipping update check this time, please be patient... - - - + + + Update Reminder - + Your last update check was more than 14 days ago. Check for updates now? - + Your did not check for LameXP updates yet. Check for updates now? - + Postpone - + LameXP detected that your version of the Nero AAC encoder is outdated! - + The current version available is %1 (or later), but you still have version %2 installed. - + n/a - + You can download the latest version of the Nero AAC encoder from the Nero website at: - + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) - + AAC Encoder Outdated - + The Nero AAC encoder could not be found. AAC encoding support will be disabled. - + Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory! - + Your LameXP directory is located here: - + You can download the Nero AAC encoder for free from the official Nero website at: - + AAC Support Disabled - - - + + + LameXP - + You must add at least one file to the list before proceeding! - + Not Found - + Your currently selected TEMP folder does not exist anymore: - + Restore Default - + Cancel - + There are less than %1 GB of free diskspace available on your system's TEMP folder. - + It is highly recommend to free up more diskspace before proceeding with the encode! - + Your TEMP folder is located at: - + Low Diskspace Warning - + Abort Encoding Process - + Clean Disk Now - + Low Diskspace - + You are proceeding with low diskspace. Problems might occur! - + Sorry, an unsupported encoder has been chosen! - + Cannot write to the selected output directory. - + Please choose a different directory! - + Load Translation - + Translation Files - + Do you really want to disable the update reminder? - - - - - - - + + + + + + + Yes - - - - - - - + + + + + + + No - + The update reminder has been disabled. - + Please remember to check for updates at regular intervals! - + The update reminder has been re-enabled. - + Do you really want to disable all sound effects? - - + + Sound Effects - + All sound effects have been disabled. - + The sound effects have been re-enabled. - - - + + + Nero AAC Notifications - + Do you really want to disable all Nero AAC Encoder notifications? - + All Nero AAC Encoder notifications have been disabled. - + The Nero AAC Encoder notifications have been re-enabled. - - - + + + Slow Startup Notifications - + Do you really want to disable the slow startup notifications? - + The slow startup notifications have been disabled. - + The slow startup notifications have been re-enabled. - - + + Open Cue Sheet - - + + Cue Sheet File - - - + + + Beta Updates - + Do you really want LameXP to check for Beta (pre-release) updates? - + LameXP will check for Beta (pre-release) updates from now on. - + Check Now - + LameXP will <i>not</i> check for Beta (pre-release) updates from now on. - - - + + + Hibernate Computer - + Do you really want the computer to be hibernated on shutdown? - + LameXP will hibernate the computer on shutdown from now on. - + LameXP will <i>not</i> hibernate the computer on shutdown from now on. - - - + + + Shell Integration - + Do you really want to disable the LameXP shell integration? - + The LameXP shell integration has been disabled. - + The LameXP shell integration has been re-enabled. - - + + Add file(s) - - + + Add Folder - - + + Save CSV file - - - - + + + + CSV File - - - - + + + + CSV Export - + Sorry, there are no meta tags that can be exported! - + Sorry, failed to open CSV file for writing! - + Sorry, failed to write to the CSV file! - + The CSV files was created successfully! - - + + Open CSV file - - - - - + + + + + CSV Import - + Sorry, failed to open CSV file for reading! - + Sorry, failed to read from the CSV file! - + Sorry, the CSV file does not contain any known fields! - + CSV file is incomplete. Not all files were updated! - + The CSV files was imported successfully! - - + + New Folder - + Enter the name of the new folder: - + Failed to create folder - + The new folder could not be created: - + Drive is read-only or insufficient access rights! - + Current Encoder: %1 - - + + Quality Level %1 - + Compression %1 - + Uncompressed - + Best Quality (Slow) - + High Quality (Recommended) - + Acceptable Quality (Fast) - + Poor Quality (Very Fast) - + File name without extension - + Track number with leading zero - + Track title - + Artist name - + Album name - + Year with (at least) four digits - + Comment - + Characters forbidden in file names: - + Rename Macros - + %n Instance(s) - + Cannot write to the selected directory. Please choose another directory! - + Overwrite Mode - + Warning: This mode may overwrite existing files with no way to revert! - + Continue - + Revert - + Already Running - + LameXP is already running, please use the running instance! @@ -3075,209 +3075,209 @@ - + Show details for selected job - + Browse Output File Location - + Filter Log Items - + Show Running Only - + Show Succeeded Only - + Show Failed Only - + Show Skipped Only - + Show All Items - + Encoding Files - + Your files are being encoded, please be patient... - + Encoding files, please wait... - + Multi-threading enabled: Running %1 instances in parallel! - + Aborted! Waiting for running jobs to terminate... - + Encoding: %n file(s) of %1 completed so far, please wait... - + Creating the playlist file, please wait... - + Process was aborted by the user after %n file(s)! - + Process was aborted prematurely by the user! - + LameXP - Aborted - + Process was aborted by the user. - + Process finished after %1. - + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! - + %n file(s) skipped - + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! - + LameXP - Error - + At least one file has failed! - + All files completed successfully. Skipped %n file(s). - - + + All files completed successfully. - + LameXP - Done - + None of the items matches the current filtering rules - + Playlist creation failed - + The playlist file could not be created: - + Warning: Computer will shutdown in %1 seconds... - - + + Cancel Shutdown - + %n hour(s) - - + + %n minute(s) - - + + %n second(s) - + %n millisecond(s) diff --git a/etc/Translation/LameXP_EN.ts b/etc/Translation/LameXP_EN.ts index fcd2ec69..41747c45 100644 --- a/etc/Translation/LameXP_EN.ts +++ b/etc/Translation/LameXP_EN.ts @@ -31,7 +31,7 @@ MainWindow - + %n file(s) have been rejected, because read access was not granted! %n file have been rejected, because read access was not granted! @@ -39,7 +39,7 @@ - + %n file(s) have been rejected, because they are dummy CDDA files! %n file have been rejected, because they are dummy CDDA files! @@ -47,7 +47,7 @@ - + %n file(s) have been rejected, because they appear to be Cue Sheet images! %n file have been rejected, because they appear to be Cue Sheet images! @@ -55,7 +55,7 @@ - + %n file(s) have been rejected, because the file format could not be recognized! %n file have been rejected, because the file format could not be recognized! @@ -63,7 +63,7 @@ - + %n Instance(s) %n Instance @@ -74,7 +74,7 @@ ProcessingDialog - + Encoding: %n file(s) of %1 completed so far, please wait... Encoding: %n file of %1 completed so far, please wait... @@ -82,7 +82,7 @@ - + Process was aborted by the user after %n file(s)! Process was aborted by the user after %n file! @@ -90,7 +90,7 @@ - + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! Error: %1 of %n file failed (%2). Double-click failed items for detailed information! @@ -98,7 +98,7 @@ - + %n file(s) skipped %n file skipped @@ -106,7 +106,7 @@ - + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! Error: %1 of %n file failed. Double-click failed items for detailed information! @@ -114,7 +114,7 @@ - + All files completed successfully. Skipped %n file(s). All files completed successfully. Skipped %n file. @@ -122,7 +122,7 @@ - + %n hour(s) %n hour @@ -130,8 +130,8 @@ - - + + %n minute(s) %n minute @@ -139,8 +139,8 @@ - - + + %n second(s) %n second @@ -148,7 +148,7 @@ - + %n millisecond(s) %n millisecond diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index 9b661b55..db3d1463 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -888,7 +888,7 @@ - + Show Details Pokaż szczegóły @@ -1632,9 +1632,9 @@ - - - + + + Check for Updates Sprawdź aktualizacje @@ -1675,13 +1675,13 @@ - + Disable Update Reminder Wyłącz przypominanie o aktualizacji - + Disable Sound Effects Wyłącz efekty dźwiękowe @@ -1766,314 +1766,314 @@ Otwartoźródłowe projekty MuldeR'a - + Adding file(s), please wait... Dodawanie plików, prosze czekać... - - + + Access Denied Dostęp zablokowany - + This usually means the file is locked by another process. To przeważnie oznacza, że plik jest zablokowany przez inny proces. - + CDDA Files Pliki CDDA - + Sorry, LameXP cannot extract audio tracks from an Audio-CD at present. LameXP nie może teraz wyekstrachować ścieżki z płyty Audio-CD. - + We recommend using %1 for that purpose. Zaleca się użycie w tym celu %1. - + Cue Sheet Cue Sheet - + Please use LameXP's Cue Sheet wizard for importing Cue Sheet files. Prosze użyć przewodnika Cue Sheet w LameXP w celu importowania tych plików. - + Files Rejected Pliki odrzucone - + This usually means the file is damaged or the file format is not supported. To przeważnie oznacza że plik jest uszkodzony lub format pliku nie jest wspierany. - + Scanning folder(s) for files, please wait... Skanowanie folderu/ów, prosze czekać... - + You can drop in audio files here! Tutaj możesz upuścić pliki dźwiękowe! - + Open File in External Application Otwórz plik w zewnętrznym programie - + Browse File Location Otwórz lokalizację pliku - + Browse Selected Folder Otwórz wybrany folder - + Bookmark Current Output Folder Zapamiętaj wybrany folder - + License Declined Licencja odrzucona - + You have declined the license. Consequently the application will exit now! Odrzuciłeś licencję. W takim razie program zostanie teraz zamknięty! - + Goodbye! Naraska! - + LameXP - Expired LameXP - Termin wygasł - + This demo (pre-release) version of LameXP has expired at %1. Ta wersja próbna LameXP wygasła %1. - + LameXP is free software and release versions won't expire. LameXP jest darmowym oprogramowaniem i pełna wersja nie wygasa. - - + + Exit Program Wyjdź z programu - + It seems that a bogus anti-virus software is slowing down the startup of LameXP. Najwyraźniej twoje oprogramowanie antywirusowe spowalnia uruchamianie się LameXP. - + Please refer to the %1 document for details and solutions! Prosze sprawdzić dokument %1 w celu dalszych szcegółów i rozwiązań! - + Slow Startup Powolny start - - - - - + + + + + Discard Zamknij - - + + Don't Show Again Nie pokazuj ponownie - + Urgent Update Ważna aktualizacja - + Your version of LameXP is more than a year old. Time for an update! Twoja wersja LameXP jest starsza niż rok! Czas na aktualizację! - - - + + + Update Reminder Powiadomienie aktualizacji - + Your last update check was more than 14 days ago. Check for updates now? Ostatnie sprawdzenie aktualizacji było ponad 14 dni temu. Sprawdzić teraz aktualizacje? - + Your did not check for LameXP updates yet. Check for updates now? Nie sprawdzałeś jeszcze aktualizacji LameXP. Sprawdzić teraz aktualizacje? - + Postpone Przełóż - + LameXP detected that your version of the Nero AAC encoder is outdated! LameXP wykrył że Twoja wersja kodera Nero AAC jest nieaktualna! - + The current version available is %1 (or later), but you still have version %2 installed. Wersją dostępną obecnie jest %1, Twoja wersja to %2. - + n/a b/d - + You can download the latest version of the Nero AAC encoder from the Nero website at: Możesz pobrać najnowszą wersję kodera Nero AAC ze strony Nero: - + AAC Encoder Outdated Koder AAC jest nieaktualny - + The Nero AAC encoder could not be found. AAC encoding support will be disabled. Nie można odnaleźć kodera Nero AAC. Kompresja formatu AAC zostanie wyłączona. - + Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory! Prosze skopiować 'neroAacEnc.exe', 'neroAacDec.exe', oraz 'neroAacTag.exe' do folderu LameXP! - + Your LameXP directory is located here: Folder aplikacji LameXP znajduje się tutaj: - + You can download the Nero AAC encoder for free from the official Nero website at: Możesz pobrać koder Nero AAC za darmo z oficjalnej strony Nero: - + AAC Support Disabled Wsparcie dla AAC wyłączone - - - + + + LameXP LameXP - + You must add at least one file to the list before proceeding! Powinienieś dodać przynajmniej jeden plik do listy aby zacząć działać! - + Not Found Nie znaleziono - + Your currently selected TEMP folder does not exist anymore: Wybrany przez Ciebie folder tymczasowy TEMP już nie istnieje: - + Restore Default Przywróć domyślne - + Cancel Anuluj - + Low Diskspace Warning Ostrzeżenie o małej ilości miejsca na dysku - + There are less than %1 GB of free diskspace available on your system's TEMP folder. Jest mniej niż %1 GB dostępnego miejsca w systemowym folderze TEMP. - + DEMO VERSION WERSJA PRÓBNA - + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) (Podpowiedź: Zignoruj nazwę pobranego pliku ZIP, w zamian sprawdż załączony w archiwum plik "changelog.txt"!) - + It is highly recommend to free up more diskspace before proceeding with the encode! Jest wysoce zalecane zwolnić miejsce na dysku zanim zaczniesz kompresję! - + Your TEMP folder is located at: Twój folder TEMP znajduję się: - + Abort Encoding Process Przerwij proces kompresji - + Clean Disk Now Wykonaj oczyszczanie dysku - - + + Ignore Ignoruj - + %n file(s) have been rejected, because read access was not granted! %n plik został odrzucony, ponieważ nie dano praw odczytu! @@ -2082,7 +2082,7 @@ - + %n file(s) have been rejected, because they are dummy CDDA files! %n plik został odrzucony, ponieważ jest to plik CDDA! @@ -2091,7 +2091,7 @@ - + %n file(s) have been rejected, because they appear to be Cue Sheet images! %n plik został odrzucony, ponieważ jest to plik Cue! @@ -2100,7 +2100,7 @@ - + %n file(s) have been rejected, because the file format could not be recognized! %n plik został odrzucony, ponieważ jego format nie został rozpoznany! @@ -2109,468 +2109,468 @@ - + Initializing directory outline, please be patient... Ładowanie zestawu folderów, prosze czekać... - + Refresh Directory Outline Odśwież foldery - + Go To Parent Directory Idź do głównego folderu - + Export Meta Tags to CSV File Eksportuj Tagi do pliku CVS - + Import Meta Tags from CSV File Importuj Tagi do pliku CVS - + Skipping update check this time, please be patient... Pomijanie sprawdzania aktualizacji, prosze czekać... - + Low Diskspace Mało miejsca na dysku - + You are proceeding with low diskspace. Problems might occur! Chcesz zacząć działać z małą ilością miejsca na dysku. Mogą wystąpić problemy! - + Sorry, an unsupported encoder has been chosen! Został wybrany koder, który nie jest wspierany! - + Cannot write to the selected output directory. Nie można zapisać do wybranej lokalizacji. - + Please choose a different directory! Prosze wybrać inną lokalizację! - + Load Translation Zaladuj plik językowy - + Translation Files Pliki językowe - + Do you really want to disable the update reminder? Czy na pewno chcesz wyłączyć przypominanie o aktualizacjach? - - - - - - - + + + + + + + Yes Tak - - - - - - - + + + + + + + No Nie - + The update reminder has been disabled. Przypominanie o aktualizacjach wyłączone. - + Please remember to check for updates at regular intervals! Prosze pamiętać o okresowym sprawdzaniu aktualizacji! - + The update reminder has been re-enabled. Przypominanie o aktualizacjach ponownie włączone. - + Do you really want to disable all sound effects? Czy na pewno chcesz wyłączyć wszystkie dźwiękowe? - - + + Sound Effects Efekty dźwiękowe - + All sound effects have been disabled. Wszystkie efekty dźwiękowe zostały wyłączone. - + The sound effects have been re-enabled. Efekty dźwiękowe zostały ponownie włączone. - - - + + + Nero AAC Notifications Powiadomienia Nero AAC - + Do you really want to disable all Nero AAC Encoder notifications? Czy na pewno chcesz wyłączyć wszystkie powiadomienia Nero AAC? - + All Nero AAC Encoder notifications have been disabled. Wszystkie powiadomienia kodera Nero AAC zostały wyłączone. - + The Nero AAC Encoder notifications have been re-enabled. Powiadomienia Nero AAC zostały ponownie włączone. - - - + + + Slow Startup Notifications Powiadomienia o powolnym starcie - + Do you really want to disable the slow startup notifications? Czy na pewno chcesz wyłączyć powiadomienia o powolnym starcie? - + The slow startup notifications have been disabled. Powiadomienia o powolnym starcie zostały wyłączone. - + The slow startup notifications have been re-enabled. Powiadomienia o powolnym starcie zostały ponownie włączone. - - + + Open Cue Sheet Otwórz plik Cue Sheet - - + + Cue Sheet File Plik Cue Sheet - - - + + + Beta Updates Aktualizacje Beta - + Do you really want LameXP to check for Beta (pre-release) updates? Czy na pewno chcesz aby LameXP sprawdzał aktualizacje Beta? - + LameXP will check for Beta (pre-release) updates from now on. Od teraz LameXP będzie sprawdzał aktualizacje Beta. - + Check Now Sprawdź teraz - + LameXP will <i>not</i> check for Beta (pre-release) updates from now on. LameXP od teraz <i>nie będzie</i> sprawdzał aktualizacji Beta. - - - + + + Hibernate Computer Hibernuj komputer - + Do you really want the computer to be hibernated on shutdown? Czy na pewno chcesz aby komputer był hibernowany zamiast zamykany? - + LameXP will hibernate the computer on shutdown from now on. Od teraz LameXP będzie hibernował komputer zamiast zamykać. - + LameXP will <i>not</i> hibernate the computer on shutdown from now on. LameXP od teraz <i>nie</i> będzie hibernował komputera tylko zamykał. - - - + + + Shell Integration Integracja z systemem - + Do you really want to disable the LameXP shell integration? Czy na pewno chcesz wyłączyć integrację LameXP z systemem? - + The LameXP shell integration has been disabled. Integracja LameXP z systemem zostałą wyłączona. - + The LameXP shell integration has been re-enabled. Integracja LameXP z systemem została ponownie włączona. - - + + Add file(s) Dodaj plik(i) - - + + Add Folder Dodaj folder - - + + Save CSV file Zapisz plik CSV - - - - + + + + CSV File Plik CSV - - - - + + + + CSV Export Eksportowanie CSV - + Sorry, there are no meta tags that can be exported! Nie ma żadnych tagów, które można eksportować! - + Sorry, failed to open CSV file for writing! Nie można otworzyć pliku CSV aby go zapisać! - + Sorry, failed to write to the CSV file! Nie można zapisać do pliku CSV! - + The CSV files was created successfully! Pliki CSV utworzone pomyślnie! - - + + Open CSV file Otwórz plik CSV - + Sorry, failed to open CSV file for reading! Nie można otworzyć pliku CSV aby go wczytać! - - - - - + + + + + CSV Import Importowanie CSV - + Sorry, failed to read from the CSV file! Próba odczytania pliku CSV zakończona niepowodzeniem! - + Sorry, the CSV file does not contain any known fields! Plik CSV nie zawiera żadnych znanych pól! - + CSV file is incomplete. Not all files were updated! Plik CSV nie jest kompletny. Nie wszystkie pliki zostały zaktualizowane! - + The CSV files was imported successfully! Pliki CSV zaimportowano pomyślnie! - - + + New Folder Nowy folder - + Enter the name of the new folder: Wprowadź nazwę nowego folderu: - + Failed to create folder Utworzenie folderu zakończone niepowodzeniem - + The new folder could not be created: Nowy folder nie mógł zostać stworzony: - + Drive is read-only or insufficient access rights! Dysk tylko do odczytu lub brak praw dostępu! - - + + Quality Level %1 Poziom jakości %1 - + Compression %1 Kompresja %1 - + Uncompressed Nieskompresowany - + Best Quality (Slow) Najlepsza jakość (Powoli) - + Acceptable Quality (Fast) Akceptowalna jakość (Szybko) - + High Quality (Recommended) Wysoka jakość (Zalecane) - + Current Encoder: %1 - + Poor Quality (Very Fast) Najniższa jakość (Bardzo szybko) - + File name without extension Nazwa pliku bez rozszerzenia - + Track number with leading zero Numer ścieżki z zerem na początku - + Track title Nazwa ścieżki - + Artist name Nazwa Artysty - + Album name Nazwa Albumu - + Year with (at least) four digits Rok z (przynajmniej) czterema cyframi - + Comment Komentarz - + Characters forbidden in file names: Zabronione znaki w nazwach plików: - + Rename Macros Zmień nazwy makr - + %n Instance(s) %n wątek @@ -2579,37 +2579,37 @@ - + Cannot write to the selected directory. Please choose another directory! Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację! - + Overwrite Mode Tryb nadpisywania - + Warning: This mode may overwrite existing files with no way to revert! Ostrzeżenie: W tym trybie istniejące pliki będą nadpisywane bez możliwości ich odzyskania! - + Continue Kontynuuj - + Revert Cofnij - + Already Running Już działa - + LameXP is already running, please use the running instance! LameXP już działa, przejdź do działającego procesu! @@ -3092,72 +3092,72 @@ Powrót - + Show details for selected job Pokaż szczegóły wybranego zadania - + Browse Output File Location Wybierz lokalizację dla plików wyjściowych - + Filter Log Items Filtruj długie pozycje - + Show Running Only Pokaż tylko trwające - + Show Succeeded Only Pokaż tylko zakończone pomyślnie - + Show Failed Only Pokaż tylko zakończone niepowodzeniem - + Show Skipped Only Pokaż tylko pominięte - + Show All Items Pokaż wszystkie pozycje - + Encoding Files Kompresowanie plików - + Your files are being encoded, please be patient... Twoje pliki są właśnie kompresowane, prosze być cierpliwy... - + Encoding files, please wait... Kompresowanie plików, prosze czekać... - + Multi-threading enabled: Running %1 instances in parallel! Wielowątkowosć włączona: Równolegle wykonywanych jest %1 kodowań! - + Aborted! Waiting for running jobs to terminate... Przerwano! Czekanie na wyłączenie procesu... - + Encoding: %n file(s) of %1 completed so far, please wait... Kompresowanie: %n plik z %1 został do tej pory zakończony, prosze czekać... @@ -3166,17 +3166,17 @@ - + Creating the playlist file, please wait... Tworzenie pliku playlisty, prosze czekać... - + Process was aborted prematurely by the user! Proces został przedwcześnie zakończony przez użytkownika! - + Process was aborted by the user after %n file(s)! Proces został zakończony przez użytkownika po zakończeniu %n pliku! @@ -3185,22 +3185,22 @@ - + LameXP - Aborted LameXP - Przerwano - + Process was aborted by the user. Proces został przerwany przez użytkownika. - + Process finished after %1. Proces został zakończony po %1. - + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! Błąd: %1 z %n pliku zakończono niepowodzeniem (%2). Kliknij dwukrotnie aby uzyskać więcej informacji! @@ -3209,7 +3209,7 @@ - + %n file(s) skipped pominięto %n plik @@ -3218,7 +3218,7 @@ - + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! Błąd: %1 z %n pliku zakończono niepowodzeniem. Kliknij dwukrotnie aby uzyskać więcej informacji! @@ -3227,7 +3227,7 @@ - + All files completed successfully. Skipped %n file(s). Wszystkie zadania wykonano pomyślnie. Pominięto %n plik. @@ -3236,54 +3236,54 @@ - + LameXP - Error LameXP - Błąd - + At least one file has failed! Przynajmniej jeden plik nie został skompresowany! - - + + All files completed successfully. Kompresja wszystkich plików zakończona powodzeniem. - + LameXP - Done LameXP - Zrobione - + None of the items matches the current filtering rules Żadna z pozycji nie spełnia reguł filtra - + Playlist creation failed Tworzenie playlisty zakończone niepowodzeniem - + The playlist file could not be created: Playlista nie mogła zostać utworzona: - + Warning: Computer will shutdown in %1 seconds... Ostrzeżenie: Komputer zostanie zamknięty za %1 sekund/y... - - + + Cancel Shutdown Anuluj wyłączenie komputera - + %n hour(s) %n godzina @@ -3292,8 +3292,8 @@ - - + + %n minute(s) %n minuta @@ -3302,8 +3302,8 @@ - - + + %n second(s) %n sekunda @@ -3312,7 +3312,7 @@ - + %n millisecond(s) %n milisekunda diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts index 2c87ce7a..867da1ae 100644 --- a/etc/Translation/LameXP_SV.ts +++ b/etc/Translation/LameXP_SV.ts @@ -886,7 +886,7 @@ - + Show Details Visa detaljer @@ -1629,9 +1629,9 @@ - - - + + + Check for Updates Sök efter uppdateringar @@ -1672,13 +1672,13 @@ - + Disable Update Reminder Inaktivera uppdateringsmeddelande - + Disable Sound Effects Inaktivera ljudeffekter @@ -1763,23 +1763,23 @@ MuldeRs Öppen källkodsprojekt - + Adding file(s), please wait... Lägger till fil(er), vänta... - - + + Access Denied Åtkomst nekad - + This usually means the file is locked by another process. Det innebär oftast att filen är låst av någon annan process. - + %n file(s) have been rejected, because read access was not granted! %n fil har avvisats, eftersom läsbehörighet saknas! @@ -1787,22 +1787,22 @@ - + CDDA Files CDDA-filer - + Sorry, LameXP cannot extract audio tracks from an Audio-CD at present. LameXP kan för närvarande inte extrahera ljudspår från en ljud-CD. - + We recommend using %1 for that purpose. Vi rekommenderar att du använder %1 för det ändamålet. - + %n file(s) have been rejected, because they are dummy CDDA files! %n fil har avvisats, eftersom det är en CDDA attrappfil (dummy)! @@ -1810,17 +1810,17 @@ - + Cue Sheet Cue-fil - + Please use LameXP's Cue Sheet wizard for importing Cue Sheet files. Använd LameXPs cue-guide för att importera cue-filer. - + %n file(s) have been rejected, because they appear to be Cue Sheet images! %n fil har avvisats, eftersom det verkar vara en cue-avbildning! @@ -1828,17 +1828,17 @@ - + Files Rejected Undantagna filer - + This usually means the file is damaged or the file format is not supported. Det innebär oftast att filen är skadad eller att filformatet inte stöds. - + %n file(s) have been rejected, because the file format could not be recognized! %n fil har avvisats, eftersom filformatet inte känns igen! @@ -1846,724 +1846,724 @@ - + Scanning folder(s) for files, please wait... Genomsöker mapp(ar) efter fil(er), vänta... - + DEMO VERSION DEMOVERSION - + You can drop in audio files here! Du kan dra och släppa filer här! - + Initializing directory outline, please be patient... Initierar mappdisposition, vänta... - + Open File in External Application Öppna fil i externt program - + Browse File Location Öppna målmappen - + Browse Selected Folder Öppna markerad mapp - + Refresh Directory Outline Uppdatera mappdisposition - + Go To Parent Directory Gå till överordnad mapp - + Bookmark Current Output Folder Lägg till aktuell utdatamapp i favoriter - + Export Meta Tags to CSV File Exportera metadata till CSV-fil - + Import Meta Tags from CSV File Importera metadata från CSV-fil - + License Declined Licensavtal avvisat - + You have declined the license. Consequently the application will exit now! Du har nekat att godkänna licensavtalet. Programmet kommer nu att avslutas! - + Goodbye! Hej då! - + LameXP - Expired LameXP - Upphört - + This demo (pre-release) version of LameXP has expired at %1. Denna demoversion av LameXP har upphört att gälla från %1. - + LameXP is free software and release versions won't expire. LameXP är kostnadsfritt och release-versionerna upphör inte att gälla. - - + + Exit Program Avsluta programmet - + It seems that a bogus anti-virus software is slowing down the startup of LameXP. Det verkar som ett antivirusprogram orsakar långsammare uppstart av LameXP. - + Please refer to the %1 document for details and solutions! Läs gärna %1 för detaljer och lösningar! - + Slow Startup Långsam uppstart - - - - - + + + + + Discard Stäng - - + + Don't Show Again Visa inte igen - + Urgent Update Viktig uppdatering - + Your version of LameXP is more than a year old. Time for an update! Din version av LameXP är mer än ett år gammal. Dags att uppdatera! - - + + Ignore Ignorera - + Skipping update check this time, please be patient... Hoppar över uppdateringskontrollen den här gången, vänta... - - - + + + Update Reminder Uppdateringspåminnelse - + Your last update check was more than 14 days ago. Check for updates now? Din senaste uppdateringskontroll var för mer än 14 dagar sedan. Vill du söka efter uppdateringar nu? - + Your did not check for LameXP updates yet. Check for updates now? Du har inte genomfört uppdateringskontroll ännu. Vill du söka efter uppdateringar nu? - + Postpone Skjut upp - + LameXP detected that your version of the Nero AAC encoder is outdated! LameXP har uptäckt att din version av Nero AAC-kodare är utdaterad! - + The current version available is %1 (or later), but you still have version %2 installed. Aktuell version är %1 (eller senare), men du har fortfarande version %2. - + n/a n/a - + You can download the latest version of the Nero AAC encoder from the Nero website at: Du kan ladda ner senaste versionen av Nero AAC-kodare från Neros webbsida: - + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) (Tips: Bortse från den nedladde zipfilens namn, och kontrollera istället den inkluderade textfilen 'changelog.txt'!) - + AAC Encoder Outdated AAC-kodare utdaterad - + The Nero AAC encoder could not be found. AAC encoding support will be disabled. Neros AAC-kodare kan inte hittas. Stödet för AAC-kodning kommer att inaktiveras. - + Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory! Placera 'neroAacEnc.exe', 'neroAacDec.exe' och 'neroAacTag.exe' i LameXPs programmmapp! - + Your LameXP directory is located here: Din LameXP programmapp finns här: - + You can download the Nero AAC encoder for free from the official Nero website at: Du kan ladda ner Nero AAC-kodare gratis från den officiella webbsidan: - + AAC Support Disabled AAC-stödet är inaktiverat - - - + + + LameXP LameXP - + You must add at least one file to the list before proceeding! Du måste lägga till minst en fil till listan innan du fortsätter! - + Not Found Kan inte hittas - + Your currently selected TEMP folder does not exist anymore: Din aktuella TEMP-mapp finns inte längre: - + Restore Default Återställ standard - + Cancel Avbryt - + There are less than %1 GB of free diskspace available on your system's TEMP folder. Det finns mindre än %1 GB ledigt diskutrymme i systemets temp-mapp. - + It is highly recommend to free up more diskspace before proceeding with the encode! Du behöver frigöra mer diskutrymme innan du fortsätter med omkodningen! - + Your TEMP folder is located at: Temp-mappens placering: - + Low Diskspace Warning Varning för dåligt diskutrymme - + Abort Encoding Process Avbryt omkodningsprocessen - + Clean Disk Now Rensa disken nu - + Low Diskspace Dåligt diskutrymme - + You are proceeding with low diskspace. Problems might occur! Du fortsätter med dåligt diskutrymme. Problem kan uppstå! - + Sorry, an unsupported encoder has been chosen! En kodare som saknar stöd har valts! - + Cannot write to the selected output directory. Kan inte skriva till den valda utdatamappen. - + Please choose a different directory! Välj en annan målmapp! - + Load Translation Läs in översättning - + Translation Files Översättningsfiler - + Do you really want to disable the update reminder? Vill du verkligen inaktivera uppdateringspåminnelsen? - - - - - - - + + + + + + + Yes Ja - - - - - - - + + + + + + + No Nej - + The update reminder has been disabled. Uppdateringspåminnelsen har inaktiverats. - + Please remember to check for updates at regular intervals! Glöm inte att söka efter uppdateringar med jämna mellanrum! - + The update reminder has been re-enabled. Uppdateringspåminnelsen har återaktiverats. - + Do you really want to disable all sound effects? Vill du verkligen inaktivera alla ljudeffekter? - - + + Sound Effects Ljudeffekter - + All sound effects have been disabled. Alla ljudeffekter har inaktiverats. - + The sound effects have been re-enabled. Ljudeffekterna har återaktiverats. - - - + + + Nero AAC Notifications Nero AAC-meddelanden - + Do you really want to disable all Nero AAC Encoder notifications? Vill du verkligen inaktivera alla Nero AAC-meddelanden? - + All Nero AAC Encoder notifications have been disabled. Alla Nero AAC-meddelanden har inaktiverats. - + The Nero AAC Encoder notifications have been re-enabled. Nero AAC-meddelanden har återaktiverats. - - - + + + Slow Startup Notifications Meddelande om långsam uppstart - + Do you really want to disable the slow startup notifications? Vill du verkligen inaktivera meddelanden om långsam uppstart? - + The slow startup notifications have been disabled. Meddelanden om långsam uppstart har inaktiverats. - + The slow startup notifications have been re-enabled. Meddelanden om långsam uppstart har återaktiverats. - - + + Open Cue Sheet Öppna cue-fil - - + + Cue Sheet File Cue-fil - - - + + + Beta Updates Beta-uppdateringar - + Do you really want LameXP to check for Beta (pre-release) updates? Vill du verkligen att LameXP skall söka efter beta-uppdateringar? - + LameXP will check for Beta (pre-release) updates from now on. LameXP kommer i fortsättningen att söka efter beta-uppdatyeringar. - + Check Now Sök nu - + LameXP will <i>not</i> check for Beta (pre-release) updates from now on. LameXP kommer i fortsättningen <i>inte</i> att söka efter beta-uppdateringar. - - - + + + Hibernate Computer Viloläge - + Do you really want the computer to be hibernated on shutdown? Vill du verkligen att datorn skall försättas i viloläge vid avslut? - + LameXP will hibernate the computer on shutdown from now on. LameXP kommer i fortsättningen att försätta datorn i viloläge vid avslut. - + LameXP will <i>not</i> hibernate the computer on shutdown from now on. LameXP kommer i fortsättningen <i>inte</i> att försätta datorn i viloläge vid avslut. - - - + + + Shell Integration Utforskarintegrering - + Do you really want to disable the LameXP shell integration? Vill du verkligen inaktivera LameXPs utforskarintegration? - + The LameXP shell integration has been disabled. LameXPs utforskarintegration har inaktiverats. - + The LameXP shell integration has been re-enabled. LameXPs utforskarintegration har återaktiverats. - - + + Add file(s) Lägg till fil(er) - - + + Add Folder Lägg till mapp - - + + Save CSV file Spara CSV-fil - - - - + + + + CSV File CSV-fil - - - - + + + + CSV Export CSV-export - + Sorry, there are no meta tags that can be exported! Det finns ingen meta-data som kan exporteras! - + Sorry, failed to open CSV file for writing! Kunde inte öppna CSV-filen för skrivning! - + Sorry, failed to write to the CSV file! Kunde inte skriva till CSV-filen! - + The CSV files was created successfully! CSV-filen skapades korrekt! - - + + Open CSV file Öppna CSV-fil - - - - - + + + + + CSV Import CSV-import - + Sorry, failed to open CSV file for reading! Kunde inte öppna CSV-filen för läsning! - + Sorry, failed to read from the CSV file! Kunde inte läsa från CSV-filen! - + Sorry, the CSV file does not contain any known fields! CSV-filen innehåller inga kända fält! - + CSV file is incomplete. Not all files were updated! CSV-filen är inte komplett. Alla filer uppdaterades inte! - + The CSV files was imported successfully! CSV-filen importerades korrekt! - - + + New Folder Ny mapp - + Enter the name of the new folder: Namn på den nya mappen: - + Failed to create folder Kunde inte skapa någon mapp - + The new folder could not be created: Den nya mappen kunde inte skapas: - + Drive is read-only or insufficient access rights! Diskenheten är skrivskyddad eller åtkomsträttigheter saknas! - - + + Quality Level %1 Kvallitetsnivå %1 - + Compression %1 Kompression %1 - + Uncompressed Okomprimerad - + Best Quality (Slow) Bäst kvalitet (Långsam) - + Acceptable Quality (Fast) Acceptabel kvalitet (Snabb) - + High Quality (Recommended) Hög kvallitet (rekommenderas) - + Current Encoder: %1 - + Poor Quality (Very Fast) Dålig kvallitet (mycket snabb) - + File name without extension Filnamn utan filtillägg - + Track number with leading zero Spårnummer med inledande nolla - + Track title Spårtitel - + Artist name Artistnamn - + Album name Albumnamn - + Year with (at least) four digits Årtal med (minst) fyra siffror - + Comment Kommentar - + Characters forbidden in file names: Förbjudna tecken i filnamn: - + Rename Macros Namnändra macron - + %n Instance(s) %n instans @@ -2571,37 +2571,37 @@ - + Cannot write to the selected directory. Please choose another directory! Kan inte skriva till den specificerade mappen. Välj en annan destination! - + Overwrite Mode Överskrivningsläge - + Warning: This mode may overwrite existing files with no way to revert! Varning! Det här läget kan skriva över befintliga filer, utan möjlighet att återskapa! - + Continue Fortsätt - + Revert Återställ - + Already Running Körs redan - + LameXP is already running, please use the running instance! LameXP körs redan, använd den redan startade instansen! @@ -3085,72 +3085,72 @@ Stäng - + Show details for selected job Visa detaljerad info för markerad åtgärd - + Browse Output File Location Öppna utdatamnappen - + Filter Log Items Filtrera loggobjekt - + Show Running Only Visa endast aktiva - + Show Succeeded Only Visa endast klara - + Show Failed Only Visa endast misslyckade - + Show Skipped Only Visa endast överhoppade - + Show All Items Visa alla - + Encoding Files Kodar om filer - + Your files are being encoded, please be patient... Dina filer kodas om, vänta... - + Encoding files, please wait... Kodar om filer, vänta... - + Multi-threading enabled: Running %1 instances in parallel! Flertrådskörning aktiverad: Kör %1 parallella instanser! - + Aborted! Waiting for running jobs to terminate... Avbrutet! Väntar på att aktiva processer skall avslutas... - + Encoding: %n file(s) of %1 completed so far, please wait... Kodar! %n fil av%1 slutförd. vänta... @@ -3158,17 +3158,17 @@ - + Creating the playlist file, please wait... Skapar spelningslista, vänta... - + Process was aborted prematurely by the user! Åtgärden avbröts i förtid av användaren! - + Process was aborted by the user after %n file(s)! Åtgärden avbröts av användaren efter %n fil! @@ -3176,22 +3176,22 @@ - + LameXP - Aborted LameXP - Avbrutet - + Process was aborted by the user. Åtgärden avbröts av användaren. - + Process finished after %1. Åtgärden slutförd efter %1. - + Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information! Fel! %1 av %n filer misslyckades (%2). Dubbelklicka på misslyckat objekt för info! @@ -3199,7 +3199,7 @@ - + %n file(s) skipped %n fil hoppades över @@ -3207,7 +3207,7 @@ - + Error: %1 of %n file(s) failed. Double-click failed items for detailed information! Fel! %1 av %n filer misslyckades. Dubbelklicka på misslyckat objekt för info! @@ -3215,7 +3215,7 @@ - + All files completed successfully. Skipped %n file(s). Alla filer korrekt slutförda. %n fil hoppades över. @@ -3223,54 +3223,54 @@ - + LameXP - Error LameXP - Fel - + At least one file has failed! Minst en fil har misslyckats! - - + + All files completed successfully. Alla filer korrekt omkodade. - + LameXP - Done LameXP - Klar - + None of the items matches the current filtering rules Inga objekt matchar aktuell filtrering - + Playlist creation failed Kunde inte skapa spelningslista - + The playlist file could not be created: Spelningslistan kunde inte skapas: - + Warning: Computer will shutdown in %1 seconds... Varning! Datorn kommer att stängas av om %1 sekunder... - - + + Cancel Shutdown Avbryt avstängning - + %n hour(s) %n timma @@ -3278,8 +3278,8 @@ - - + + %n minute(s) %n minut @@ -3287,8 +3287,8 @@ - - + + %n second(s) %n sekund @@ -3296,7 +3296,7 @@ - + %n millisecond(s) %n millisekund diff --git a/gui/UpdateDialog.ui b/gui/UpdateDialog.ui index 2dbd4762..7f18514b 100644 --- a/gui/UpdateDialog.ui +++ b/gui/UpdateDialog.ui @@ -261,7 +261,7 @@ - 9 + 12 20 diff --git a/gui/WorkingBanner.ui b/gui/WorkingBanner.ui index 997d930a..ff420885 100644 --- a/gui/WorkingBanner.ui +++ b/gui/WorkingBanner.ui @@ -138,10 +138,7 @@ QFrame::StyledPanel - QFrame::Plain - - - 0 + QFrame::Sunken $(Status) diff --git a/src/Config.h b/src/Config.h index b56666ef..ed320e36 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 9 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 8 -#define VER_LAMEXP_BUILD 1477 +#define VER_LAMEXP_BUILD 1481 #define VER_LAMEXP_CONFG 1348 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index 3f92df84..6b2f681e 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -77,9 +77,20 @@ // Helper macros //////////////////////////////////////////////////////////// +#define BANNER_VISIBLE ((m_banner != NULL) && m_banner->isVisible()) + +#define INIT_BANNER() do \ +{ \ + if(m_banner == NULL) \ + { \ + m_banner = new WorkingBanner(this); \ + } \ +} \ +while(0) + #define ABORT_IF_BUSY do \ { \ - if(m_banner->isVisible() || m_delayedFileTimer->isActive()) \ + if(BANNER_VISIBLE || m_delayedFileTimer->isActive()) \ { \ lamexp_beep(lamexp_beep_warning); \ return; \ @@ -158,9 +169,10 @@ while(0) #define LINK(URL) QString("%2").arg(URL).arg(QString(URL).replace("-", "−")) #define FSLINK(PATH) QString("%2").arg(PATH).arg(QString(PATH).replace("-", "−")) -//#define USE_NATIVE_FILE_DIALOG (lamexp_themes_enabled() || ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) < QSysInfo::WV_XP)) #define CENTER_CURRENT_OUTPUT_FOLDER_DELAYED QTimer::singleShot(125, this, SLOT(centerOutputFolderModel())) +//#define USE_NATIVE_FILE_DIALOG (lamexp_themes_enabled() || ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) < QSysInfo::WV_XP)) + static const unsigned int IDM_ABOUTBOX = 0xEFF0; //////////////////////////////////////////////////////////// @@ -174,7 +186,9 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me m_fileListModel(fileListModel), m_metaData(metaInfo), m_settings(settingsModel), + m_windowIcon(NULL), m_fileSystemModel(NULL), + m_banner(NULL), m_accepted(false), m_firstTimeShown(true), m_outputFolderViewCentering(false), @@ -183,7 +197,10 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me //Init the dialog, from the .ui file ui->setupUi(this); setWindowFlags(windowFlags() ^ Qt::WindowMaximizeButtonHint); - + + //Create window icon + m_windowIcon = lamexp_set_window_icon(this, lamexp_app_icon(), true); + //Register meta types qRegisterMetaType("AudioFileModel"); @@ -591,9 +608,6 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me move((desktopRect.width() - thisRect.width()) / 2, (desktopRect.height() - thisRect.height()) / 2); setMinimumSize(thisRect.width(), thisRect.height()); - //Create banner - m_banner = new WorkingBanner(this); - //Create DropBox widget m_dropBox = new DropBox(this, m_fileListModel, m_settings); connect(m_fileListModel, SIGNAL(modelReset()), m_dropBox, SLOT(modelChanged())); @@ -669,6 +683,13 @@ MainWindow::~MainWindow(void) LAMEXP_DELETE(m_evenFilterOutputFolderView); LAMEXP_DELETE(m_evenFilterCompressionTab); + //Free window icon + if(m_windowIcon) + { + lamexp_free_window_icon(m_windowIcon); + m_windowIcon = NULL; + } + //Un-initialize the dialog LAMEXP_DELETE(ui); } @@ -689,7 +710,9 @@ void MainWindow::addFiles(const QStringList &files) ui->tabWidget->setCurrentIndex(0); + INIT_BANNER(); FileAnalyzer *analyzer = new FileAnalyzer(files); + connect(analyzer, SIGNAL(fileSelected(QString)), m_banner, SLOT(setText(QString)), Qt::QueuedConnection); connect(analyzer, SIGNAL(progressValChanged(unsigned int)), m_banner, SLOT(setProgressVal(unsigned int)), Qt::QueuedConnection); connect(analyzer, SIGNAL(progressMaxChanged(unsigned int)), m_banner, SLOT(setProgressMax(unsigned int)), Qt::QueuedConnection); @@ -740,6 +763,8 @@ void MainWindow::addFiles(const QStringList &files) */ void MainWindow::addFolder(const QString &path, bool recursive, bool delayed) { + INIT_BANNER(); + QFileInfoList folderInfoList; folderInfoList << QFileInfo(path); QStringList fileList; @@ -928,7 +953,6 @@ void MainWindow::showEvent(QShowEvent *event) if(m_firstTimeShown) { m_firstTimeShown = false; - lamexp_set_window_icon(this, lamexp_app_icon(), true); QTimer::singleShot(0, this, SLOT(windowShown())); } else @@ -1092,7 +1116,7 @@ void MainWindow::dropEvent(QDropEvent *event) */ void MainWindow::closeEvent(QCloseEvent *event) { - if(m_banner->isVisible() || m_delayedFileTimer->isActive()) + if(BANNER_VISIBLE || m_delayedFileTimer->isActive()) { lamexp_beep(lamexp_beep_warning); event->ignore(); @@ -1178,7 +1202,7 @@ bool MainWindow::event(QEvent *e) { case lamexp_event_queryendsession: qWarning("System is shutting down, main window prepares to close..."); - if(m_banner->isVisible()) m_banner->close(); + if(BANNER_VISIBLE) m_banner->close(); if(m_delayedFileTimer->isActive()) m_delayedFileTimer->stop(); return true; case lamexp_event_endsession: @@ -1327,7 +1351,7 @@ void MainWindow::windowShown(void) return; default: QEventLoop loop; QTimer::singleShot(7000, &loop, SLOT(quit())); - lamexp_play_sound(IDR_WAVE_WAITING, true); + INIT_BANNER(); lamexp_play_sound(IDR_WAVE_WAITING, true); m_banner->show(tr("Skipping update check this time, please be patient..."), &loop); break; } @@ -2432,7 +2456,7 @@ void MainWindow::handleDelayedFiles(void) return; } - if(m_banner->isVisible()) + if(BANNER_VISIBLE) { m_delayedFileTimer->start(5000); return; @@ -3999,7 +4023,7 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void) */ void MainWindow::notifyOtherInstance(void) { - if(!m_banner->isVisible()) + if(!(BANNER_VISIBLE)) { QMessageBox msgBox(QMessageBox::Warning, tr("Already Running"), tr("LameXP is already running, please use the running instance!"), QMessageBox::NoButton, this, Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowStaysOnTopHint); msgBox.exec(); @@ -4049,7 +4073,7 @@ void MainWindow::addFilesDelayed(const QStringList &filePaths, bool tryASAP) */ void MainWindow::addFolderDelayed(const QString &folderPath, bool recursive) { - if(!m_banner->isVisible()) + if(!(BANNER_VISIBLE)) { addFolder(folderPath, recursive, true); } diff --git a/src/Dialog_MainWindow.h b/src/Dialog_MainWindow.h index 52880ba8..66a571f1 100644 --- a/src/Dialog_MainWindow.h +++ b/src/Dialog_MainWindow.h @@ -41,6 +41,7 @@ class QMenu; class QModelIndex; class SettingsModel; class WorkingBanner; +class lamexp_icon_t; //UIC forward declartion namespace Ui { @@ -193,6 +194,7 @@ private: bool m_firstTimeShown; uint m_outputFolderViewInitCounter; bool m_outputFolderViewCentering; + lamexp_icon_t *m_windowIcon; WorkingBanner *m_banner; QStringList *m_delayedFileList; diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp index b9298120..3f24e499 100644 --- a/src/Dialog_Processing.cpp +++ b/src/Dialog_Processing.cpp @@ -136,6 +136,7 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, const AudioFile : QDialog(parent), ui(new Ui::ProcessingDialog), + m_windowIcon(NULL), m_systemTray(new QSystemTrayIcon(QIcon(":/icons/cd_go.png"), this)), m_settings(settings), m_metaInfo(metaInfo), @@ -152,6 +153,9 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, const AudioFile ui->setupUi(this); setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint); + //Update the window icon + m_windowIcon = lamexp_set_window_icon(this, lamexp_app_icon(), true); + //Update header icon ui->label_headerIcon->setPixmap(lamexp_app_icon().pixmap(ui->label_headerIcon->size())); @@ -298,6 +302,7 @@ ProcessingDialog::~ProcessingDialog(void) m_diskObserver->wait(); } } + if(m_cpuObserver) { m_cpuObserver->stop(); @@ -307,6 +312,7 @@ ProcessingDialog::~ProcessingDialog(void) m_cpuObserver->wait(); } } + if(m_ramObserver) { m_ramObserver->stop(); @@ -341,6 +347,12 @@ ProcessingDialog::~ProcessingDialog(void) WinSevenTaskbar::setOverlayIcon(this, NULL); WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarNoState); + if(m_windowIcon) + { + lamexp_free_window_icon(m_windowIcon); + m_windowIcon = NULL; + } + LAMEXP_DELETE(ui); } @@ -355,9 +367,6 @@ void ProcessingDialog::showEvent(QShowEvent *event) if(m_firstShow) { static const char *NA = " N/A"; - - //Update the window icon - lamexp_set_window_icon(this, lamexp_app_icon(), true); lamexp_enable_close_button(this, false); ui->button_closeDialog->setEnabled(false); diff --git a/src/Dialog_Processing.h b/src/Dialog_Processing.h index b92ec455..7d9de94f 100644 --- a/src/Dialog_Processing.h +++ b/src/Dialog_Processing.h @@ -43,6 +43,7 @@ class QMovie; class RAMObserverThread; class SettingsModel; class QThreadPool; +class lamexp_icon_t; enum shutdownFlag_t { @@ -106,6 +107,7 @@ private: bool shutdownComputer(void); QString time2text(const double timeVal) const; + lamexp_icon_t *m_windowIcon; QThreadPool *m_threadPool; QList m_pendingJobs; SettingsModel *m_settings; diff --git a/src/Dialog_WorkingBanner.cpp b/src/Dialog_WorkingBanner.cpp index 849ea90b..7cf13297 100644 --- a/src/Dialog_WorkingBanner.cpp +++ b/src/Dialog_WorkingBanner.cpp @@ -31,6 +31,8 @@ #include #include #include +#include +#include #define EPS (1.0E-5) @@ -76,7 +78,7 @@ static inline void UPDATE_MARGINS(QWidget *control, int l = 0, int r = 0, int t WorkingBanner::WorkingBanner(QWidget *parent) : QDialog(parent, Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint), - ui(new Ui::WorkingBanner()), m_metrics(NULL), m_working(NULL) + ui(new Ui::WorkingBanner()), m_metrics(NULL), m_working(NULL), m_style(NULL) { //Init the dialog, from the .ui file ui->setupUi(this); @@ -85,18 +87,20 @@ WorkingBanner::WorkingBanner(QWidget *parent) //Enable the "sheet of glass" effect if(lamexp_sheet_of_glass(this)) { - SET_TEXT_COLOR(ui->labelStatus, lamexp_system_color(lamexp_syscolor_caption)); + m_style = new QWindowsVistaStyle(); + ui->labelStatus->setStyle(m_style); + ui->progressBar->setStyle(m_style); + ui->labelStatus->setStyleSheet("background-color: rgb(255, 255, 255);"); } else { UPDATE_MARGINS(this, 5); m_working = new QMovie(":/images/Busy.gif"); - m_working->setSpeed(75); m_working->setCacheMode(QMovie::CacheAll); ui->labelWorking->setMovie(m_working); m_working->start(); } - + //Set Opacity this->setWindowOpacity(0.9); @@ -119,6 +123,7 @@ WorkingBanner::~WorkingBanner(void) LAMEXP_DELETE(m_working); } + LAMEXP_DELETE(m_style); LAMEXP_DELETE(m_metrics); delete ui; } @@ -244,10 +249,20 @@ bool WorkingBanner::winEvent(MSG *message, long *result) return WinSevenTaskbar::handleWinEvent(message, result); } +void WorkingBanner::showEvent(QShowEvent *event) +{ + QTimer::singleShot(125, this, SLOT(windowShown())); +} + //////////////////////////////////////////////////////////// // SLOTS //////////////////////////////////////////////////////////// +void WorkingBanner::windowShown(void) +{ + lamexp_bring_to_front(this); +} + void WorkingBanner::setText(const QString &text) { if(!m_metrics) @@ -255,14 +270,14 @@ void WorkingBanner::setText(const QString &text) m_metrics = new QFontMetrics(ui->labelStatus->font()); } - if(m_metrics->width(text) <= ui->labelStatus->width() - 8) + if(m_metrics->width(text) <= ui->labelStatus->width() - 16) { ui->labelStatus->setText(text); } else { QString choppedText = text.simplified().append("..."); - while((m_metrics->width(choppedText) > ui->labelStatus->width() - 8) && (choppedText.length() > 8)) + while((m_metrics->width(choppedText) > ui->labelStatus->width() - 16) && (choppedText.length() > 8)) { choppedText.chop(4); choppedText = choppedText.trimmed(); diff --git a/src/Dialog_WorkingBanner.h b/src/Dialog_WorkingBanner.h index de0100c4..197abe00 100644 --- a/src/Dialog_WorkingBanner.h +++ b/src/Dialog_WorkingBanner.h @@ -54,6 +54,7 @@ private: bool m_canClose; public slots: + void windowShown(void); void setText(const QString &text); void setProgressMax(unsigned int max); void setProgressVal(unsigned int val); @@ -63,10 +64,12 @@ signals: void userAbort(void); protected: - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); - void closeEvent(QCloseEvent *event); - bool winEvent(MSG *message, long *result); + virtual void keyPressEvent(QKeyEvent *event); + virtual void keyReleaseEvent(QKeyEvent *event); + virtual void closeEvent(QCloseEvent *event); + virtual bool winEvent(MSG *message, long *result); + virtual void showEvent(QShowEvent *event); QFontMetrics *m_metrics; + QStyle *m_style; };