diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index b603f65c..3aa9eb87 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -54,268 +54,313 @@ - + LameXP - Audio Encoder Front-end - + Please visit %1 for news and updates! - - + + 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 !!! - + The following people have contributed to LameXP: - + Programmers: - + Project Leader - + Translators: - - If you are willing to contribute a LameXP translation, feel free to contact us! + + Special thanks to: - - The following third-party software is used in LameXP: + + Doom9's Forum - - 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. + + Gleitz | German Doom9 - Nero AAC Reference MPEG-4 Encoder + Hydrogenaudio Forums - Freeware state-of-the-art HE-AAC encoder with 2-Pass support. + RareWares - Available from vendor web-site as free download: + GitHub + + + + + SourceForge - Aften - A/52 audio encoder + Qt Developer Network - - FLAC - Free Lossless Audio Codec + + Marius Hudea - - Open and patent-free lossless audio compression technology. - - - - - Opus Audio Codec + + If you are willing to contribute a LameXP translation, feel free to contact us! - Totally open, royalty-free, highly versatile audio codec. + The following third-party software is used in LameXP: - mpg123 - Fast Console MPEG Audio Player/Decoder + LAME - OpenSource mp3 Encoder + + + + + + + + + + + + + + + Released under the terms of the GNU Lesser General Public License. - FAAD - OpenSource MPEG-4 and MPEG-2 AAC Decoder + OggEnc - Ogg Vorbis Encoder - Released under the terms of the GNU General Public License. + 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. + + + + + Opus Audio Codec + + + + + Totally open, royalty-free, highly versatile audio codec. + + + + + 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 - + Silk Icons - Over 700 icons in PNG format - + By Mark James, released under the Creative Commons 'by' License. - + The copyright of LameXP as a whole belongs to LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. - + n/a diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index 7818a261..dd955cb6 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -247,6 +247,42 @@ About Qt... Über Qt... + + Special thanks to: + Besonderen Dank an: + + + Doom9's Forum + + + + Gleitz | German Doom9 + + + + Hydrogenaudio Forums + + + + RareWares + + + + GitHub + + + + SourceForge + + + + Qt Developer Network + + + + Marius Hudea + + AudioFileModel diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index acca366a..cd496066 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -247,6 +247,42 @@ About Qt... Acerca de Qt... + + Special thanks to: + + + + Doom9's Forum + + + + Gleitz | German Doom9 + + + + Hydrogenaudio Forums + + + + RareWares + + + + GitHub + + + + SourceForge + + + + Qt Developer Network + + + + Marius Hudea + + AudioFileModel diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index 4a4502ca..91a7a345 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -251,6 +251,42 @@ About Qt... A propos de Qt... + + Special thanks to: + + + + Doom9's Forum + + + + Gleitz | German Doom9 + + + + Hydrogenaudio Forums + + + + RareWares + + + + GitHub + + + + SourceForge + + + + Qt Developer Network + + + + Marius Hudea + + AudioFileModel diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index 07577c2e..5e9c4f53 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -247,6 +247,42 @@ About Qt... Riguardo Qt... + + Special thanks to: + + + + Doom9's Forum + + + + Gleitz | German Doom9 + + + + Hydrogenaudio Forums + + + + RareWares + + + + GitHub + + + + SourceForge + + + + Qt Developer Network + + + + Marius Hudea + + AudioFileModel diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index d336d35d..8d7f7637 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -247,6 +247,42 @@ About Qt... Qt에 대해 + + Special thanks to: + + + + Doom9's Forum + + + + Gleitz | German Doom9 + + + + Hydrogenaudio Forums + + + + RareWares + + + + GitHub + + + + SourceForge + + + + Qt Developer Network + + + + Marius Hudea + + AudioFileModel diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index 62d36efa..3ed34779 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -4,23 +4,23 @@ AboutDialog - + LameXP - Audio Encoder Front-end LameXP - Program do kompresji dźwięku - + Please visit %1 for news and updates! 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!!! @@ -75,247 +75,292 @@ Zamknij - + The following people have contributed to LameXP: LameXP wspomogli: - + Programmers: - + Project Leader - + Translators: Tłumacze: - + + Special thanks to: + + + + + Doom9's Forum + + + + + Gleitz | German Doom9 + + + + + Hydrogenaudio Forums + + + + + RareWares + + + + + GitHub + + + + + SourceForge + + + + + Qt Developer Network + + + + + Marius Hudea + + + + 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! - + 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. - + Opus Audio Codec - + Totally open, royalty-free, highly versatile audio codec. - + 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 - + Silk Icons - Over 700 icons in PNG format - + By Mark James, released under the Creative Commons 'by' License. - + The copyright of LameXP as a whole belongs to 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. - + n/a n/d diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index d18a9c06..ce40e1fe 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -247,6 +247,42 @@ About Qt... О Qt + + Special thanks to: + + + + Doom9's Forum + + + + Gleitz | German Doom9 + + + + Hydrogenaudio Forums + + + + RareWares + + + + GitHub + + + + SourceForge + + + + Qt Developer Network + + + + Marius Hudea + + AudioFileModel diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts index df623db0..628e26ac 100644 --- a/etc/Translation/LameXP_SV.ts +++ b/etc/Translation/LameXP_SV.ts @@ -4,23 +4,23 @@ AboutDialog - + LameXP - Audio Encoder Front-end LameXP - Ljudkonvertering - + Please visit %1 for news and updates! Besök %1 för nyheter och uppdateringar! - - + + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. OBS! Denna testversion av LameXP kommer att upphöra %1. %2 dagar kvar. - + 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 !!! OBS! LameXP är gratis mjukvara. Betala <b>inte</b> för att ladda ner eller använda LameXP! Om någon webbsida försöker ta betalt för LameXP, bör du lämna sidan <b>utan</b> att ladda ner något! @@ -75,247 +75,292 @@ Stäng - + The following people have contributed to LameXP: Följande har medverkat i LameXP: - + Programmers: - + Project Leader - + Translators: Översättare: - + + Special thanks to: + + + + + Doom9's Forum + + + + + Gleitz | German Doom9 + + + + + Hydrogenaudio Forums + + + + + RareWares + + + + + GitHub + + + + + SourceForge + + + + + Qt Developer Network + + + + + Marius Hudea + + + + If you are willing to contribute a LameXP translation, feel free to contact us! Kontakta oss gärna om du vill medverka il LameXP, med en översättning! - + The following third-party software is used in LameXP: Följande 3:e-parts mjukvara används i LameXP: - + LAME - OpenSource mp3 Encoder LAME - OpenSource mp3 Encoder - - - - - - - - - - + + + + + + + + + + Released under the terms of the GNU Lesser General Public License. Släppt under Gnu Lesser General Public License. - + OggEnc - Ogg Vorbis Encoder OggEnc - Ogg Vorbis Encoder - + Completely open and patent-free audio encoding technology. Helt öppen och patentfri ljudkodningsteknologi. - + Nero AAC Reference MPEG-4 Encoder Nero AAC Reference MPEG-4 Encoder - + Freeware state-of-the-art HE-AAC encoder with 2-Pass support. Freeware state-of-the-art HE-AAC-kodare med stöd för 2-Pass. - + Available from vendor web-site as free download: Tillgänglig som gratis nedladdning, från utvecklarens webbsida: - + Aften - A/52 audio encoder Aften - A/52 audio encoder - + FLAC - Free Lossless Audio Codec FLAC - Free Lossless Audio Codec - + Open and patent-free lossless audio compression technology. Öppen och patentfri, förlustfri ljudkomprimeringsteknik. - + Opus Audio Codec - + Totally open, royalty-free, highly versatile audio codec. - + mpg123 - Fast Console MPEG Audio Player/Decoder mpg123 - Fast Console MPEG Audio Player/Decoder - + FAAD - OpenSource MPEG-4 and MPEG-2 AAC Decoder FAAD - OpenSource MPEG-4 and MPEG-2 AAC Decoder - + Released under the terms of the GNU General Public License. Släppt under GNU Generel Public License (GPL). - + AC3Filter Tools - AC3/DTS Decoder AC3Filter Tools - AC3/DTS Decoder - + WavPack - Hybrid Lossless Compression WavPack - Hybrid Lossless Compression - + Completely open audio compression format. Helt öppet ljudkomprimeringsformat. - + Musepack - Living Audio Compression Musepack - Living Audio Compression - + Monkey's Audio - Lossless Audio Compressor Monkey's Audio - Lossless Audio Compressor - + Freely available source code, simple SDK and non-restrictive licensing. Fritt tillgänglig källkod, enkel SDK och icke-restriktiv licensiering. - + Shorten - Lossless Audio Compressor Shorten - Lossless Audio Compressor - + Speex - Free Codec For Free Speech Speex - Free Codec For Free Speech - + Open Source patent-free audio format designed for speech. Öppen källkod, patentfritt ljudformat designat för tal. - + The True Audio - Lossless Audio Codec The True Audio - Lossless Audio Codec - + ALAC Decoder ALAC Decoder - + Copyright (c) 2004 David Hammerton. Contributions by Cody Brocious. Copyright (c) 2004 David Hammerton. Contributions by Cody Brocious. - + wma2wav - Dump WMA files to Wave Audio wma2wav - Dump WMA files to Wave Audio - + Copyright (c) 2011 LoRd_MuldeR <mulder2@gmx.de>. Some rights reserved. Copyright (c) 2011 LoRd_MuldeR <mulder2@gmx.de>. Some rights reserved. - + avs2wav - Avisynth to Wave Audio converter avs2wav - Avisynth to Wave Audio converter - + By Jory Stone <jcsston@toughguy.net> and LoRd_MuldeR <mulder2@gmx.de>. By Jory Stone <jcsston@toughguy.net> and LoRd_MuldeR <mulder2@gmx.de>. - + dcaenc dcaenc - + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. - + MediaInfo - Media File Analysis Tool MediaInfo - Analysverktyg för mediafiler - + SoX - Sound eXchange SoX - Sound eXchange - + GnuPG - The GNU Privacy Guard GnuPG - The GNU Privacy Guard - + GNU Wget - Software for retrieving files using HTTP GNU Wget - Mjukvara för att ta emot filer via HTTP - + Silk Icons - Over 700 icons in PNG format - + By Mark James, released under the Creative Commons 'by' License. - + The copyright of LameXP as a whole belongs to LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. The copyright of LameXP as a whole belongs to LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. - + n/a n/a diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts index 0f88fb5d..1e244bc9 100644 --- a/etc/Translation/LameXP_TW.ts +++ b/etc/Translation/LameXP_TW.ts @@ -247,6 +247,42 @@ About Qt... 關于 Qt + + Special thanks to: + + + + Doom9's Forum + + + + Gleitz | German Doom9 + + + + Hydrogenaudio Forums + + + + RareWares + + + + GitHub + + + + SourceForge + + + + Qt Developer Network + + + + Marius Hudea + + AudioFileModel diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index 04f9c884..d3df13e5 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -248,6 +248,42 @@ About Qt... Про Qt + + Special thanks to: + + + + Doom9's Forum + + + + Gleitz | German Doom9 + + + + Hydrogenaudio Forums + + + + RareWares + + + + GitHub + + + + SourceForge + + + + Qt Developer Network + + + + Marius Hudea + + AudioFileModel diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts index 1f38c5eb..2394765e 100644 --- a/etc/Translation/LameXP_ZH.ts +++ b/etc/Translation/LameXP_ZH.ts @@ -247,6 +247,42 @@ About Qt... 关于 Qt + + Special thanks to: + + + + Doom9's Forum + + + + Gleitz | German Doom9 + + + + Hydrogenaudio Forums + + + + RareWares + + + + GitHub + + + + SourceForge + + + + Qt Developer Network + + + + Marius Hudea + + AudioFileModel diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index 22bf22d3..98cafaed 100644 Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ diff --git a/src/Config.h b/src/Config.h index 448b4d79..51e080b4 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 5 #define VER_LAMEXP_TYPE Final #define VER_LAMEXP_PATCH 2 -#define VER_LAMEXP_BUILD 1113 +#define VER_LAMEXP_BUILD 1117 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp index e890b599..2ef33e60 100644 --- a/src/Dialog_About.cpp +++ b/src/Dialog_About.cpp @@ -40,6 +40,8 @@ #include #include #include +#include +#include #include #include @@ -48,6 +50,8 @@ //Helper macros #define LINK(URL) QString("%2").arg(URL).arg(QString(URL).replace("-", "−")) #define TRIM_RIGHT(STR) do { while(STR.endsWith(QChar(' ')) || STR.endsWith(QChar('\t')) || STR.endsWith(QChar('\r')) || STR.endsWith(QChar('\n'))) STR.chop(1); } while(0) +#define MAKE_TRANSPARENT(WIDGET) do { QPalette _p = (WIDGET)->palette(); _p.setColor(QPalette::Background, Qt::transparent); (WIDGET)->setPalette(_p); } while(0) + //Constants const char *AboutDialog::neroAacUrl = "http://www.nero.com/eng/technologies-aac-codec.html"; @@ -92,14 +96,14 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta m_disque(NULL), m_disqueTimer(NULL), m_rotateNext(false), - m_disqueDelay(_I64_MAX) + m_disqueDelay(_I64_MAX), + m_lastTab(0) { //Init the dialog, from the .ui file setupUi(this); setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); resize(this->minimumSize()); - tabWidget->setCurrentIndex(tabWidget->indexOf(infoTab)); - + //Disable "X" button if(firstStart) { @@ -118,6 +122,16 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta //Init tab widget connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); + //Make transparent + QStyle *style = qApp->style(); + if((dynamic_cast(style)) || (dynamic_cast(style))) + { + MAKE_TRANSPARENT(infoScrollArea); + MAKE_TRANSPARENT(contributorsScrollArea); + MAKE_TRANSPARENT(softwareScrollArea); + MAKE_TRANSPARENT(licenseScrollArea); + } + //Show about dialog for the first time? if(!firstStart) { @@ -229,25 +243,25 @@ void AboutDialog::tabChanged(int index) { qApp->setOverrideCursor(QCursor(Qt::WaitCursor)); - switch(index) + if(QWidget *tab = tabWidget->widget(index)) { - case 0: - initInformationTab(); - break; - case 1: - initContributorsTab(); - break; - case 2: - initSoftwareTab(); - break; - case 3: - initLicenseTab(); - break; - default: - qWarning("Unknown tab index: %d !!!", index); - } + bool ok = false; - m_initFlags->insert(tabWidget->widget(index), true); + if(tab == infoTab) { initInformationTab(); ok = true; } + if(tab == contributorsTab) { initContributorsTab(); ok = true; } + if(tab == softwareTab) { initSoftwareTab(); ok = true; } + if(tab == licenseTab) { initLicenseTab(); ok = true; } + + if(ok) + { + m_initFlags->insert(tab, true); + } + else + { + qWarning("Unknown tab %p encountered, cannot initialize !!!", tab); + } + + } tabWidget->widget(index)->update(); qApp->processEvents(); @@ -255,25 +269,17 @@ void AboutDialog::tabChanged(int index) } //Scroll to the top - switch(index) + if(QWidget *tab = tabWidget->widget(index)) { - case 0: - infoScrollArea->verticalScrollBar()->setSliderPosition(0); - break; - case 1: - contributorsScrollArea->verticalScrollBar()->setSliderPosition(0); - break; - case 2: - softwareScrollArea->verticalScrollBar()->setSliderPosition(0); - break; - case 3: - licenseScrollArea->verticalScrollBar()->setSliderPosition(0); - break; - default: - qWarning("Unknown tab index: %d !!!", index); + if(tab == infoTab) infoScrollArea->verticalScrollBar()->setSliderPosition(0); + if(tab == contributorsTab) contributorsScrollArea->verticalScrollBar()->setSliderPosition(0); + if(tab == softwareTab) softwareScrollArea->verticalScrollBar()->setSliderPosition(0); + if(tab == licenseTab) licenseScrollArea->verticalScrollBar()->setSliderPosition(0); } + //Update license button showLicenseButton->setChecked(tabWidget->widget(index) == licenseTab); + if(tabWidget->widget(index) != licenseTab) m_lastTab = index; } void AboutDialog::enableButtons(void) @@ -301,7 +307,7 @@ void AboutDialog::showAboutQt(void) void AboutDialog::gotoLicenseTab(void) { - tabWidget->setCurrentIndex(tabWidget->indexOf(showLicenseButton->isChecked() ? licenseTab : infoTab)); + tabWidget->setCurrentIndex(tabWidget->indexOf(showLicenseButton->isChecked() ? licenseTab : tabWidget->widget(m_lastTab))); } void AboutDialog::moveDisque(void) @@ -386,7 +392,10 @@ void AboutDialog::moveDisque(void) void AboutDialog::showEvent(QShowEvent *e) { QDialog::showEvent(e); - tabChanged(tabWidget->currentIndex()); + + tabWidget->setCurrentIndex(tabWidget->indexOf(infoTab)); + tabChanged(m_lastTab = tabWidget->currentIndex()); + if(m_firstShow) { acceptButton->setEnabled(false); @@ -506,7 +515,7 @@ void AboutDialog::initContributorsTab(void) QString contributorsAboutText; contributorsAboutText += QString("

%1

").arg(NOBR(tr("The following people have contributed to LameXP:"))); - contributorsAboutText += ""; + contributorsAboutText += "
"; contributorsAboutText += QString("").arg(tr("Programmers:"), extraVSpace); QString icon = QString("").arg("user_gray"); @@ -524,8 +533,29 @@ void AboutDialog::initContributorsTab(void) contributorsAboutText += QString("").arg(WCHAR2QSTR(g_lamexp_translators[i].pcName), spaces, g_lamexp_translators[i].pcMail); } - contributorsAboutText += "
%1%2
%1%2<%3>


"; - contributorsAboutText += QString("%1").arg(NOBR(tr("If you are willing to contribute a LameXP translation, feel free to contact us!"))); + contributorsAboutText += QString(" "); + contributorsAboutText += QString("%1%2").arg(tr("Special thanks to:"), extraVSpace); + + QString webIcon = QString("").arg("world"); + contributorsAboutText += QString("%1%2").arg(webIcon, spaces); + contributorsAboutText += QString("%1%2%3").arg(tr("Doom9's Forum"), spaces, "http://forum.doom9.org/"); + contributorsAboutText += QString("%1%2").arg(webIcon, spaces); + contributorsAboutText += QString("%1%2%3").arg(tr("Gleitz | German Doom9"), spaces, "http://forum.gleitz.info/"); + contributorsAboutText += QString("%1%2").arg(webIcon, spaces); + contributorsAboutText += QString("%1%2%3").arg(tr("Hydrogenaudio Forums"), spaces, "http://www.hydrogenaudio.org/"); + contributorsAboutText += QString("%1%2").arg(webIcon, spaces); + contributorsAboutText += QString("%1%2%3").arg(tr("RareWares"), spaces, "http://www.rarewares.org/"); + contributorsAboutText += QString("%1%2").arg(webIcon, spaces); + contributorsAboutText += QString("%1%2%3").arg(tr("GitHub"), spaces, "http://github.com/"); + contributorsAboutText += QString("%1%2").arg(webIcon, spaces); + contributorsAboutText += QString("%1%2%3").arg(tr("SourceForge"), spaces, "http://sourceforge.net/"); + contributorsAboutText += QString("%1%2").arg(webIcon, spaces); + contributorsAboutText += QString("%1%2%3").arg(tr("Qt Developer Network"), spaces, "http://qt-project.org/"); + contributorsAboutText += QString("%1%2").arg(webIcon, spaces); + contributorsAboutText += QString("%1%2%3").arg(tr("Marius Hudea"), spaces, "http://savedonthe.net/"); + + contributorsAboutText += "


"; + contributorsAboutText += QString("%1
").arg(NOBR(tr("If you are willing to contribute a LameXP translation, feel free to contact us!"))); contributorsLabel->setText(contributorsAboutText); contributorsIcon->setPixmap(QIcon(":/images/Logo_Contributors.png").pixmap(QSize(72,84))); @@ -750,6 +780,7 @@ void AboutDialog::initLicenseTab(void) if(!bIsBlank) counter++; } + licenseText += QString("

%1").arg(LINK("http://www.gnu.org/licenses/gpl-2.0.html")); stream.device()->close(); } else diff --git a/src/Dialog_About.h b/src/Dialog_About.h index 020b2e05..e5a20bf7 100644 --- a/src/Dialog_About.h +++ b/src/Dialog_About.h @@ -53,6 +53,8 @@ private: bool m_firstShow; SettingsModel *m_settings; QMap *m_initFlags; + int m_lastTab; + QLabel *m_disque; QTimer * m_disqueTimer; bool m_disqueFlags[2];