From 581dd4e0b81bdb284980a257a2d727a2704b247c Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Tue, 18 Sep 2012 01:41:00 +0200 Subject: [PATCH] Some more improvements to "About" dialog. Also added "Special Thanks" section to "Contributors" tab. --- etc/Translation/Blank.ts | 209 +++++++++++++++++++++------------- etc/Translation/LameXP_DE.ts | 36 ++++++ etc/Translation/LameXP_ES.ts | 36 ++++++ etc/Translation/LameXP_FR.ts | 36 ++++++ etc/Translation/LameXP_IT.ts | 36 ++++++ etc/Translation/LameXP_KR.ts | 36 ++++++ etc/Translation/LameXP_PL.ts | 167 +++++++++++++++++---------- etc/Translation/LameXP_RU.ts | 36 ++++++ etc/Translation/LameXP_SV.ts | 167 +++++++++++++++++---------- etc/Translation/LameXP_TW.ts | 36 ++++++ etc/Translation/LameXP_UK.ts | 36 ++++++ etc/Translation/LameXP_ZH.ts | 36 ++++++ res/localization/LameXP_DE.qm | Bin 80318 -> 80846 bytes src/Config.h | 2 +- src/Dialog_About.cpp | 111 +++++++++++------- src/Dialog_About.h | 2 + 16 files changed, 737 insertions(+), 245 deletions(-) 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 22bf22d32996f267e674b7bf04f259417a7e443a..98cafaed0146a3fe8938d6f0c2dcc14131653a48 100644 GIT binary patch delta 5365 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 delta 5061 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 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];