diff --git a/doc/Changelog.html b/doc/Changelog.html index feb05b97..d53b17f3 100644 --- a/doc/Changelog.html +++ b/doc/Changelog.html @@ -22,7 +22,7 @@ a:visited { color: #0000EE; }
  • Added experimental support for dcaenc, created by Alexander E. Patrakov <patrakov@gmail.com>
  • Added CSV export/import for Meta tags (see context-menu on the "Source Files" tab)
  • Added a button to modify the current output folder path in an edit box -
  • Updated Qt runtime libraries to v4.8.0 (2011-12-15), compiled with MSVC 10.0 +
  • Updated Qt runtime libraries to v4.8.1 (2012-03-14), compiled with MSVC 10.0
  • Updated LAME encoder to v3.99.5 Final (2012-02-28), compiled with ICL 12.1.7 and MSVC 10.0 (details)
  • Updated MediaInfo to v0.7.56 (2012-04-08), compiled with ICL 12.1.7 and MSVC 10.0
  • Updated SoX to to v14.4.0 (2012-03-04), compiled with ICL 12.1.7 and MSVC 10.0 diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index 090f6d77..25489874 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -14,284 +14,290 @@ - + + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. - + Note: LameXP is free software. Do <b>not</b> pay money to obtain or use LameXP! If some third-party website tries to make you pay for downloading LameXP, you should <b>not</b> respond to the offer !!! - + Special thanks go out to "John33" from %1 for his continuous support. - + About LameXP - + Show License Text - + Accept License - + Decline License - + 3rd Party S/W - + Contributors - + About Qt4 - - - + + About Qt5 + + + + + + Discard - + The following people have contributed to LameXP: - + Translators: - + If you are willing to contribute a LameXP translation, feel free to contact us! - + About Contributors - + The following third-party software is used in LameXP: - + LAME - OpenSource mp3 Encoder - - + - + - - + + + Released under the terms of the GNU Lesser General Public License. - + OggEnc - Ogg Vorbis Encoder - + Completely open and patent-free audio encoding technology. - + Nero AAC Reference MPEG-4 Encoder - + Freeware state-of-the-art HE-AAC encoder with 2-Pass support. - + Available from vendor web-site as free download: - + Aften - A/52 audio encoder - + FLAC - Free Lossless Audio Codec - + Open and patent-free lossless audio compression technology. - + mpg123 - Fast Console MPEG Audio Player/Decoder - + FAAD - OpenSource MPEG-4 and MPEG-2 AAC Decoder - + Released under the terms of the GNU General Public License. - + AC3Filter Tools - AC3/DTS Decoder - + WavPack - Hybrid Lossless Compression - + Completely open audio compression format. - + Musepack - Living Audio Compression - + Monkey's Audio - Lossless Audio Compressor - + Freely available source code, simple SDK and non-restrictive licensing. - + Shorten - Lossless Audio Compressor - + Speex - Free Codec For Free Speech - + Open Source patent-free audio format designed for speech. - + The True Audio - Lossless Audio Codec - + ALAC Decoder - + Copyright (c) 2004 David Hammerton. Contributions by Cody Brocious. - + wma2wav - Dump WMA files to Wave Audio - + Copyright (c) 2011 LoRd_MuldeR <mulder2@gmx.de>. Some rights reserved. - + avs2wav - Avisynth to Wave Audio converter - + By Jory Stone <jcsston@toughguy.net> and LoRd_MuldeR <mulder2@gmx.de>. - + dcaenc - + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. - + MediaInfo - Media File Analysis Tool - + SoX - Sound eXchange - + GnuPG - The GNU Privacy Guard - + GNU Wget - Software for retrieving files using HTTP - + LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. - + About Third-party Software - + n/a @@ -730,12 +736,12 @@ - + Log File - + The log file shows detailed information about the selected job. @@ -2850,141 +2856,141 @@ - + Show details for selected job - + Browse Output File Location - + 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: %1 files of %2 completed so far, please wait... - + Creating the playlist file, please wait... - + Process was aborted by the user after %1 file(s)! - + Process was aborted prematurely by the user! - + LameXP - Aborted - + Process was aborted by the user. - + Process finished after %1. - + Error: %1 of %2 files failed. Double-click failed items for detailed information! - + LameXP - Error - + At least one file has failed! - - + + All files completed successfully. - + LameXP - Done - + Playlist creation failed - + The playlist file could not be created: - + Warning: Computer will shutdown in %1 seconds... - - + + Cancel Shutdown - + hour(s) - - + + minute(s) - - + + second(s) - + millisecond(s) @@ -3005,22 +3011,22 @@ QApplication - + Executable '%1' doesn't support Windows compatibility mode. - + Executable '%1' requires Qt v%2, but found Qt v%3. - + Executable '%1' was built for Qt '%2', but found Qt '%3'. - + Executable '%1' requires Windows 2000 or later. @@ -3089,105 +3095,105 @@ - - + + Build - + Unknown - + Testing your internet connection, please wait... - - + + It appears that the computer currently is offline! - - + + Please make sure your computer is connected to the internet and try again. - + Network connectivity test has failed! - + Please make sure your internet connection is working properly and try again. - + Checking for new updates online, please wait... - + Failed to fetch update information from server! - + Sorry, the update server might be busy at this time. Plase try again later. - + More information available at: - + A new version of LameXP is available! - + We highly recommend all users to install this update as soon as possible. - + No new updates available at this time. - + Your version of LameXP is still up-to-date. Please check for updates regularly! - + Your version appears to be newer than the latest release. - + This usually indicates your are currently using a pre-release version of LameXP. - + Update is being downloaded, please be patient... - + Update ready to install. Applicaion will quit... - + Update failed. Please try again or download manually! diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index 88a66fc5..c7fec219 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -227,6 +227,10 @@ Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + About Qt5 + Über Qt5 + AudioFileModel diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index bedb3d38..8ddc597e 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -227,6 +227,10 @@ Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + About Qt5 + Acerca de Qt5 + AudioFileModel diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index a21fe830..b95a1ddc 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -231,6 +231,10 @@ Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + About Qt5 + A propos de Qt5 + AudioFileModel diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index 50724384..2d65d7a7 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -227,6 +227,10 @@ Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + About Qt5 + Riguardo Qt5 + AudioFileModel diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index ea671839..3522a1f1 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -227,6 +227,10 @@ Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + About Qt5 + + AudioFileModel diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index 0008cd61..65978af7 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -14,284 +14,290 @@ Odwiedź %1 aby zobaczyć nowości i aktualizacje! - + + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. Uwaga: To jest wersja demo (próbna) LameXP, która wygaśnie %1. Pozostało jeszcze %2 dni. - + Note: LameXP is free software. Do <b>not</b> pay money to obtain or use LameXP! If some third-party website tries to make you pay for downloading LameXP, you should <b>not</b> respond to the offer !!! Uwaga: LameXP jest darmowym oprogramowaniem. <b>Nie</b> płać nikomu za ten program! Jeśli ktoś oferuje Ci LameXP za pieniądze <b>nie</b> kupuj od niego!!! - + Special thanks go out to "John33" from %1 for his continuous support. Specjalne podziękowania dla John33 z %1 za jego ciągłe wsparcie. - + About LameXP Informacje o LameXP - + Show License Text Pokaż tekst licencji - + Accept License Akceptuj licencję - + Decline License Odrzuć licencję - + 3rd Party S/W Programy firm trzecich - + Contributors Tłumacze - + About Qt4 Info o Qt4 - - - + + About Qt5 + + + + + + Discard Zamknij - + The following people have contributed to LameXP: LameXP wspomogli: - + Translators: Tłumacze: - + If you are willing to contribute a LameXP translation, feel free to contact us! Jeśli chcesz wspomóc LameXP w obsłudze większej ilości języków, nie wahaj skontaktować się z nami! - + About Contributors Informacje o tłumaczach - + The following third-party software is used in LameXP: Następujące programy firm trzecich zostały użyte w LameXP: - + LAME - OpenSource mp3 Encoder LAME - Otwartoźródłowy koder mp3 - - + - + - - + + + Released under the terms of the GNU Lesser General Public License. Wydane na warunkach licencji GNU Lesser General Public License. - + OggEnc - Ogg Vorbis Encoder OggEnc - Koder Ogg Vorbis - + Completely open and patent-free audio encoding technology. Całkowicie otwarta i wolna od patentów technologia kompresji dźwięku. - + Nero AAC Reference MPEG-4 Encoder Nero AAC Reference MPEG-4 Encoder - + Freeware state-of-the-art HE-AAC encoder with 2-Pass support. Darmowy, jedyny w swoim rodzaju koder HE-AAC z wsparciem dla dwóch przebiegów. - + Available from vendor web-site as free download: Darmowy pakiet dostępny ze strony wydawcy: - + Aften - A/52 audio encoder Aften - Koder dźwięku A/52 - + FLAC - Free Lossless Audio Codec FLAC - Darmowy i bezstartny kodek dźwięku - + Open and patent-free lossless audio compression technology. Otwarta i wolna od patentów technologia bezstratnej kompresji dźwięku. - + mpg123 - Fast Console MPEG Audio Player/Decoder mpg123 - Szybki dekoder/odtwarzacz MPEG Audio - + FAAD - OpenSource MPEG-4 and MPEG-2 AAC Decoder FAAD - Otwartoźródłowy dekoder MPEG-4 oraz MPEG-2 AAC - + Released under the terms of the GNU General Public License. Wydane na warunkach licencji GNU General Public License. - + AC3Filter Tools - AC3/DTS Decoder AC3Filter Tools - Dekoder AC3/DTS - + WavPack - Hybrid Lossless Compression Wavpack - Bezstratny hybrydowy kodek dźwięku - + Completely open audio compression format. Całkowicie otwarty format kompresji dźwięku. - + Musepack - Living Audio Compression Musepack - Koder dźwięku - + Monkey's Audio - Lossless Audio Compressor Monkey's Audio - Koder bezstratnego formatu dźwięku - + Freely available source code, simple SDK and non-restrictive licensing. Szeroko dostępny kod źródłowy, prosty SDK i bezrestrykcyjna licencja. - + Shorten - Lossless Audio Compressor Shorten - Bezstratny kodek dźwięku - + Speex - Free Codec For Free Speech Speex - Darmowy kodek dla mowy ludzkiej - + Open Source patent-free audio format designed for speech. Otwartoźródłowy, wolny od patentów format dźwięku przeznaczony dla mowy ludzkiej. - + The True Audio - Lossless Audio Codec The True Audio - Bezstratny kodek dźwięku - + ALAC Decoder Dekoder ALAC - + Copyright (c) 2004 David Hammerton. Contributions by Cody Brocious. Prawa autorskie: 2004 David Hammerton. Kodu użyczył Cody Brocious. - + wma2wav - Dump WMA files to Wave Audio wma2wav - Dekoder plików WMA do Wave - + Copyright (c) 2011 LoRd_MuldeR <mulder2@gmx.de>. Some rights reserved. Prawa autorskie: 2011 LoRd_MuldeR <mulder2@gmx.de>. Pewne prawa zastrzeżone. - + avs2wav - Avisynth to Wave Audio converter avs2wav - Konwerter dźwięku z Avisynth do Wave - + By Jory Stone <jcsston@toughguy.net> and LoRd_MuldeR <mulder2@gmx.de>. Autorami programu są Jory Stone <jcsston@toughguy.net> i LoRd_MuldeR <mulder2@gmx.de>. - + dcaenc dcaenc - + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. Prawa autorskie: 2008-2011 Alexander E. Patrakov. Rozpowszechniane na licencji LGPL. - + MediaInfo - Media File Analysis Tool MediaInfo - Narzędzie do analizy plików multimedialnych - + SoX - Sound eXchange SoX - Sound eXchange - + GnuPG - The GNU Privacy Guard GnuPG - GNU Privacy Guard - + GNU Wget - Software for retrieving files using HTTP GNU Wget - Oprogramowanie służące do pobierania plików za pomocą protokołu HTTP - + LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. Do programu LameXP jako całości, prawa autorskie posiada LoRd_MuldeR. Prawa autorskie oprogramowania firm trzecich należą do autorów poszczególnych programów. - + About Third-party Software Informacje o programach firm trzecich - + n/a n/d @@ -730,12 +736,12 @@ Kopiuj do schowka - + Log File Plik dziennika zdarzeń - + The log file shows detailed information about the selected job. Plik dziennika zdarzeń pokazuje szczegółowe informacje na temat wybranego zadania. @@ -2850,141 +2856,141 @@ Powrót - + Show details for selected job Pokaż szczegóły wybranego zadania - + Browse Output File Location Wybierz lokalizację dla plików wyjściowych - + 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: %1 files of %2 completed so far, please wait... Kompresja: Prosze czekać, jak dotąd wykonano %1 z %2 plików... - + Creating the playlist file, please wait... Tworzenie pliku playlisty, prosze czekać... - + Process was aborted by the user after %1 file(s)! Proces został przerwany przez użytkownika po wykonaniu %1 plików! - + Process was aborted prematurely by the user! Proces został przedwcześnie zakończony przez użytkownika! - + 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 %2 files failed. Double-click failed items for detailed information! Błąd: %1 z %2 plików nie zostało skompresowanych. Kliknij dwukrotnie na plik aby zobaczyć szczegóły! - + 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 - + 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 - + hour(s) godzinie/ach - - + + minute(s) minutach - - + + second(s) sekundach - + millisecond(s) milisekundach @@ -3005,22 +3011,22 @@ QApplication - + Executable '%1' doesn't support Windows compatibility mode. Plik wykonywalny '%1' nie działa w trybie kompatybilności z Windows. - + Executable '%1' requires Qt v%2, but found Qt v%3. Plik wykonywalny '%1' wymaga Qt v%2, znaleziono jednak Qt v%3. - + Executable '%1' was built for Qt '%2', but found Qt '%3'. Plik wykonywalny "%1" został skompilowany dla Qt "%2", znaleziono "%3". - + Executable '%1' requires Windows 2000 or later. Plik wykonywalny '%1' wymaga do uruchomienia Windows 2000 lub nowszego. @@ -3089,105 +3095,105 @@ Zamknij - - + + Build Build - + Unknown Nieznana - + Testing your internet connection, please wait... Testowanie połączenia internetowego, prosze czekać... - - + + It appears that the computer currently is offline! LameXP wykrył brak dostępu do internetu! - - + + Please make sure your computer is connected to the internet and try again. Upewnij się że komputer jest podłączony do internetu i spróbuj ponownie. - + Network connectivity test has failed! Test połączenia internetowego zakończony niepowodzeniem! - + Please make sure your internet connection is working properly and try again. Upewnij się że połączenie internetowe działa prawidłowo i spróbuj ponownie. - + Checking for new updates online, please wait... Sprawdzanie aktualizacji online, prosze czekać... - + Failed to fetch update information from server! Pobieranie informacji z serwera zakończone niepowodzeniem! - + Sorry, the update server might be busy at this time. Plase try again later. Serwer aktualizacji wydaje się nie odpowiadać w tej chwili. Prosze spróbować później. - + More information available at: Więcej informacji tutaj: - + A new version of LameXP is available! Dostępna nowa wersja LameXP! - + We highly recommend all users to install this update as soon as possible. Jest wysoce zalecane aby zainstalować tę aktualizację jak najszybciej. - + No new updates available at this time. Nie ma nowych aktualizacji w tej chwili. - + Your version of LameXP is still up-to-date. Please check for updates regularly! Posiadasz najnowszą wersję LameXP. Sprawdzaj aktualizacje regularnie! - + Your version appears to be newer than the latest release. Posiadasz nowszą wersję LameXP niż ostatnie wydanie. - + This usually indicates your are currently using a pre-release version of LameXP. To wskazuje na to, że posiadasz wersję alfa LameXP. - + Update is being downloaded, please be patient... Pobieranie aktualizacji w toku, prosze czekać... - + Update ready to install. Applicaion will quit... Aktualizacja gotowa do instalacji. Teraz program zostanie zamknięty... - + Update failed. Please try again or download manually! Aktualizacja zakończona niepowodzeniem. Prosze spróbować ponownie lub zainstalować ręcznie! diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index 3426e99a..5cc4c71c 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -227,6 +227,10 @@ Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + About Qt5 + О Qt5 + AudioFileModel diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts index 9085e99c..89ae6410 100644 --- a/etc/Translation/LameXP_TW.ts +++ b/etc/Translation/LameXP_TW.ts @@ -227,6 +227,10 @@ Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + About Qt5 + 關于 Qt5 + AudioFileModel diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index fe0c413e..67656693 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -228,6 +228,10 @@ Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. Всі права належать 2008-2011 Alexander E. Patrakov. Розповсюджується під ліцензією LGPL. + + About Qt5 + Про Qt5 + AudioFileModel diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts index a30520a4..fbd54dc5 100644 --- a/etc/Translation/LameXP_ZH.ts +++ b/etc/Translation/LameXP_ZH.ts @@ -227,6 +227,10 @@ Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + About Qt5 + 关于 Qt5 + AudioFileModel diff --git a/res/Icons.qrc b/res/Icons.qrc index d8320fef..0352793a 100644 --- a/res/Icons.qrc +++ b/res/Icons.qrc @@ -88,6 +88,7 @@ icons/play.png icons/power_off.png icons/power_on.png + icons/qt.png icons/report.png icons/resultset_next.png icons/script.png diff --git a/res/icons/qt.png b/res/icons/qt.png new file mode 100644 index 00000000..3a1fc4d7 Binary files /dev/null and b/res/icons/qt.png differ diff --git a/res/icons/user_cd.png b/res/icons/user_cd.png new file mode 100644 index 00000000..f06dcf6d Binary files /dev/null and b/res/icons/user_cd.png differ diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index 7cec73c0..4fc5361a 100644 Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ diff --git a/res/localization/LameXP_ES.qm b/res/localization/LameXP_ES.qm index 1bce12ea..54f28831 100644 Binary files a/res/localization/LameXP_ES.qm and b/res/localization/LameXP_ES.qm differ diff --git a/res/localization/LameXP_FR.qm b/res/localization/LameXP_FR.qm index 3ceff8c9..06166e16 100644 Binary files a/res/localization/LameXP_FR.qm and b/res/localization/LameXP_FR.qm differ diff --git a/res/localization/LameXP_IT.qm b/res/localization/LameXP_IT.qm index b9023133..99941a8d 100644 Binary files a/res/localization/LameXP_IT.qm and b/res/localization/LameXP_IT.qm differ diff --git a/res/localization/LameXP_RU.qm b/res/localization/LameXP_RU.qm index f510fb03..53019e81 100644 Binary files a/res/localization/LameXP_RU.qm and b/res/localization/LameXP_RU.qm differ diff --git a/res/localization/LameXP_TW.qm b/res/localization/LameXP_TW.qm index f24e6c7c..58704e13 100644 Binary files a/res/localization/LameXP_TW.qm and b/res/localization/LameXP_TW.qm differ diff --git a/res/localization/LameXP_UK.qm b/res/localization/LameXP_UK.qm index fd600465..4f5037e7 100644 Binary files a/res/localization/LameXP_UK.qm and b/res/localization/LameXP_UK.qm differ diff --git a/res/localization/LameXP_ZH.qm b/res/localization/LameXP_ZH.qm index ec2a44bb..b3277d26 100644 Binary files a/res/localization/LameXP_ZH.qm and b/res/localization/LameXP_ZH.qm differ diff --git a/src/Config.h b/src/Config.h index 70197398..da17832c 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 15 -#define VER_LAMEXP_BUILD 970 +#define VER_LAMEXP_BUILD 972 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp index 307ae704..d541eeab 100644 --- a/src/Dialog_About.cpp +++ b/src/Dialog_About.cpp @@ -192,14 +192,15 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta connect(firstButton, SIGNAL(clicked()), this, SLOT(showMoreAbout())); QPushButton *secondButton = addButton(tr("Contributors"), QMessageBox::AcceptRole); - secondButton->setIcon(QIcon(":icons/user_suit.png")); + secondButton->setIcon(QIcon(":/icons/user_suit.png")); secondButton->setIconSize(QSize(16, 16)); secondButton->setMinimumWidth(120); secondButton->disconnect(); connect(secondButton, SIGNAL(clicked()), this, SLOT(showAboutContributors())); - QPushButton *thirdButton = addButton(tr("About Qt4"), QMessageBox::AcceptRole); - thirdButton->setIcon(QIcon(":/images/Qt.svg")); + static const bool isQt5 = (QT_VERSION >= QT_VERSION_CHECK(5,0,0)); + QPushButton *thirdButton = addButton(isQt5 ? tr("About Qt5") : tr("About Qt4"), QMessageBox::AcceptRole); + thirdButton->setIcon(QIcon(":/icons/qt.png")); thirdButton->setIconSize(QSize(16, 16)); thirdButton->setMinimumWidth(120); thirdButton->disconnect(); diff --git a/src/Global.cpp b/src/Global.cpp index 722e196a..cb9aa691 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -243,11 +243,7 @@ g_lamexp_ipc_ptr = }; //Image formats -#if QT_VERSION < QT_VERSION_CHECK(5,0,0) -static const char *g_lamexp_imageformats[] = {"png", "jpg", "gif", "ico", "svg", NULL}; -#else -static const char *g_lamexp_imageformats[] = {"png", "jpg", "gif", "ico", NULL}; -#endif +static const char *g_lamexp_imageformats[] = {"bmp", "png", "jpg", "gif", "ico", "xpm", NULL}; //"svg" //Global locks static QMutex g_lamexp_message_mutex; @@ -1116,13 +1112,6 @@ bool lamexp_init_qt(int argc, char* argv[]) application->setWindowIcon(lamexp_app_icon()); application->setEventFilter(lamexp_event_filter); - //Set text Codec for locale - // QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); - - //Load plugins from application directory - // QCoreApplication::setLibraryPaths(QStringList() << QApplication::applicationDirPath()); - // qDebug("Library Path:\n%s\n", QApplication::libraryPaths().first().toUtf8().constData()); - //Check for supported image formats QList supportedFormats = QImageReader::supportedImageFormats(); for(int i = 0; g_lamexp_imageformats[i]; i++) @@ -1133,7 +1122,7 @@ bool lamexp_init_qt(int argc, char* argv[]) return false; } } - + //Add default translations g_lamexp_translation.files.insert(LAMEXP_DEFAULT_LANGID, ""); g_lamexp_translation.names.insert(LAMEXP_DEFAULT_LANGID, "English");