From b687666ac9682214dee17ec97386b38fc80ff741 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Mon, 29 Aug 2011 15:57:17 +0200 Subject: [PATCH] Temporarily hide the "disque" widget in About dialog while showing one of the sub-dialogs. --- src/Config.h | 2 +- src/Dialog_About.cpp | 416 ++++++++++++++++++++------------------ src/Dialog_MainWindow.cpp | 4 +- src/Model_Settings.cpp | 2 +- 4 files changed, 218 insertions(+), 206 deletions(-) diff --git a/src/Config.h b/src/Config.h index e02cf3c1..794d708f 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 678 +#define VER_LAMEXP_BUILD 680 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp index 6d4b1245..18cf93d5 100644 --- a/src/Dialog_About.cpp +++ b/src/Dialog_About.cpp @@ -63,7 +63,7 @@ g_lamexp_contributors[] = {"es", L"Español", L"Rub3nCT", "Rub3nCT@gmail.com" }, {"fr", L"Française", L"Dodich Informatique", "Dodich@live.fr" }, {"it", L"Italiano", L"Roberto", "Gulliver_69@libero.it"}, - {"kr", L"한국어", L"JaeHyung Lee", "Kolanp@gmail.com" }, + {"kr", L"한국어", L"JaeHyung Lee", "Kolanp@gmail.com" }, {"ru", L"Русский", L"Neonailol", "Neonailol@gmail.com" }, {"uk", L"Українська", L"Arestarh", "Arestarh@ukr.net" }, {NULL, NULL, NULL, NULL} @@ -267,6 +267,9 @@ int AboutDialog::exec() // Slots //////////////////////////////////////////////////////////// +#define TEMP_HIDE_DISQUE(CMD) \ +if(m_disque) { bool _tmp = m_disque->isVisible(); if(_tmp) m_disque->hide(); {CMD}; if(_tmp) { m_disque->show(); m_disque->setWindowOpacity(0.01); } } else {CMD} + void AboutDialog::enableButtons(void) { const QList buttonList = buttons(); @@ -286,228 +289,237 @@ void AboutDialog::openLicenseText(void) void AboutDialog::showAboutQt(void) { - QMessageBox::aboutQt(this); + TEMP_HIDE_DISQUE + ( + QMessageBox::aboutQt(this); + ); } void AboutDialog::showAboutContributors(void) { - QString contributorsAboutText; + TEMP_HIDE_DISQUE + ( + QString contributorsAboutText; - contributorsAboutText += QString("

%1

").arg(tr("The following people have contributed to LameXP:")); - contributorsAboutText += QString("%1").arg(tr("Translators:")); - contributorsAboutText += ""; - for(int i = 0; g_lamexp_contributors[i].pcName; i++) - { - QString flagIcon = (strlen(g_lamexp_contributors[i].pcFlag) > 0) ? QString("").arg(g_lamexp_contributors[i].pcFlag) : QString(); - contributorsAboutText += QString("").arg(flagIcon); - contributorsAboutText += QString("").arg(WCHAR2QSTR(g_lamexp_contributors[i].pcLanguage)); - contributorsAboutText += QString("").arg(WCHAR2QSTR(g_lamexp_contributors[i].pcName), g_lamexp_contributors[i].pcMail); - } - contributorsAboutText += "
%1  %2  %3  <%4>
"; - contributorsAboutText += "

"; - contributorsAboutText += QString("%1
").arg(tr("If you are willing to contribute a LameXP translation, feel free to contact us!")); + contributorsAboutText += QString("

%1

").arg(tr("The following people have contributed to LameXP:")); + contributorsAboutText += QString("%1").arg(tr("Translators:")); + contributorsAboutText += ""; + for(int i = 0; g_lamexp_contributors[i].pcName; i++) + { + QString flagIcon = (strlen(g_lamexp_contributors[i].pcFlag) > 0) ? QString("").arg(g_lamexp_contributors[i].pcFlag) : QString(); + contributorsAboutText += QString("").arg(flagIcon); + contributorsAboutText += QString("").arg(WCHAR2QSTR(g_lamexp_contributors[i].pcLanguage)); + contributorsAboutText += QString("").arg(WCHAR2QSTR(g_lamexp_contributors[i].pcName), g_lamexp_contributors[i].pcMail); + } + contributorsAboutText += "
%1  %2  %3  <%4>
"; + contributorsAboutText += "

"; + contributorsAboutText += QString("%1
").arg(tr("If you are willing to contribute a LameXP translation, feel free to contact us!")); - QMessageBox *contributorsAboutBox = new QMessageBox(this); - contributorsAboutBox->setText(contributorsAboutText); - contributorsAboutBox->setIconPixmap(dynamic_cast(QApplication::instance())->windowIcon().pixmap(QSize(64,64))); + QMessageBox *contributorsAboutBox = new QMessageBox(this); + contributorsAboutBox->setText(contributorsAboutText); + contributorsAboutBox->setIconPixmap(dynamic_cast(QApplication::instance())->windowIcon().pixmap(QSize(64,64))); - QPushButton *closeButton = contributorsAboutBox->addButton(tr("Discard"), QMessageBox::AcceptRole); - closeButton->setIcon(QIcon(":/icons/cross.png")); - closeButton->setMinimumWidth(90); + QPushButton *closeButton = contributorsAboutBox->addButton(tr("Discard"), QMessageBox::AcceptRole); + closeButton->setIcon(QIcon(":/icons/cross.png")); + closeButton->setMinimumWidth(90); - contributorsAboutBox->setWindowTitle(tr("About Contributors")); - contributorsAboutBox->setIconPixmap(QIcon(":/images/Logo_Contributors.png").pixmap(QSize(64,74))); - contributorsAboutBox->setWindowIcon(QIcon(":/icons/user_suit.png")); - contributorsAboutBox->exec(); + contributorsAboutBox->setWindowTitle(tr("About Contributors")); + contributorsAboutBox->setIconPixmap(QIcon(":/images/Logo_Contributors.png").pixmap(QSize(64,74))); + contributorsAboutBox->setWindowIcon(QIcon(":/icons/user_suit.png")); + contributorsAboutBox->exec(); - LAMEXP_DELETE(contributorsAboutBox); + LAMEXP_DELETE(contributorsAboutBox); + ); } void AboutDialog::showMoreAbout(void) { - QString moreAboutText; + TEMP_HIDE_DISQUE + ( + QString moreAboutText; - moreAboutText += QString("

%1

").arg(tr("The following third-party software is used in LameXP:")); - moreAboutText += "
    "; + moreAboutText += QString("

    %1

    ").arg(tr("The following third-party software is used in LameXP:")); + moreAboutText += "
      "; - moreAboutText += makeToolText - ( - tr("LAME − OpenSource mp3 Encoder"), - "lame.exe", "v?.??, Beta-?", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://lame.sourceforge.net/" - ); - moreAboutText += makeToolText - ( - tr("OggEnc − Ogg Vorbis Encoder"), - "oggenc2.exe", "v?.??, aoTuV Beta-?.??", - tr("Completely open and patent-free audio encoding technology."), - "http://www.vorbis.com/" - ); - moreAboutText += makeToolText - ( - tr("Nero AAC Reference MPEG-4 Encoder"), - "neroAacEnc.exe", "v?.?.?.?", - tr("Freeware state-of-the-art HE-AAC encoder with 2-Pass support."), - neroAacUrl, - tr("Available from vendor web-site as free download:") - ); - moreAboutText += makeToolText - ( - tr("Aften − A/52 audio encoder"), - "aften.exe", "v?.?.?", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://aften.sourceforge.net/" - ); - moreAboutText += makeToolText - ( - tr("FLAC − Free Lossless Audio Codec"), - "flac.exe", "v?.?.?", - tr("Open and patent-free lossless audio compression technology."), - "http://flac.sourceforge.net/" - ); - moreAboutText += makeToolText - ( - tr("mpg123 − Fast Console MPEG Audio Player/Decoder"), - "mpg123.exe", "v?.??.?", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://www.mpg123.de/" - ); - moreAboutText += makeToolText - ( - tr("FAAD − OpenSource MPEG-4 and MPEG-2 AAC Decoder"), - "faad.exe", "v?.?", - tr("Released under the terms of the GNU General Public License."), - "http://www.audiocoding.com/" - ); - moreAboutText += makeToolText - ( - tr("AC3Filter Tools − AC3/DTS Decoder"), - "valdec.exe", "v?.??", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://www.ac3filter.net/projects/tools" - ); - moreAboutText += makeToolText + moreAboutText += makeToolText ( - tr("WavPack − Hybrid Lossless Compression"), - "wvunpack.exe", "v?.??.?", - tr("Completely open audio compression format."), - "http://www.wavpack.com/" - ); - moreAboutText += makeToolText + tr("LAME − OpenSource mp3 Encoder"), + "lame.exe", "v?.??, Beta-?", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://lame.sourceforge.net/" + ); + moreAboutText += makeToolText ( - tr("Musepack − Living Audio Compression"), - "mpcdec.exe", "r???", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://www.musepack.net/" - ); - moreAboutText += makeToolText - ( - tr("Monkey's Audio − Lossless Audio Compressor"), - "mac.exe", "v?.??", - tr("Freely available source code, simple SDK and non-restrictive licensing."), - "http://www.monkeysaudio.com/" - ); - moreAboutText += QString - ( - "
      " - ); - moreAboutText += makeToolText - ( - tr("Shorten − Lossless Audio Compressor"), - "shorten.exe", "v?.?.?", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://etree.org/shnutils/shorten/" - ); - moreAboutText += makeToolText - ( - tr("Speex − Free Codec For Free Speech"), - "speexdec.exe", "v?.?", - tr("Open Source patent-free audio format designed for speech."), - "http://www.speex.org/" - ); - moreAboutText += makeToolText - ( - tr("The True Audio − Lossless Audio Codec"), - "tta.exe", "v?.?", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://tta.sourceforge.net/" - ); - moreAboutText += makeToolText - ( - tr("ALAC Decoder"), - "alac.exe", "v?.?.?", - tr("Copyright (c) 2004 David Hammerton. Contributions by Cody Brocious."), - "http://craz.net/programs/itunes/alac.html" - ); - moreAboutText += makeToolText - ( - tr("wma2wav − Dump WMA files to Wave Audio"), - "wma2wav.exe", "????-??-??", - tr("Copyright (c) 2011 LoRd_MuldeR . Some rights reserved."), - "http://forum.doom9.org/showthread.php?t=140273" - ); - moreAboutText += makeToolText - ( - tr("avs2wav − Avisynth to Wave Audio converter"), - "avs2wav.exe", "v?.?", - tr("By Jory Stone and LoRd_MuldeR ."), - "http://forum.doom9.org/showthread.php?t=70882" - ); - moreAboutText += makeToolText - ( - tr("MediaInfo − Media File Analysis Tool"), - "mediainfo.exe", "v?.?.??", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://mediainfo.sourceforge.net/" - ); - moreAboutText += makeToolText - ( - tr("SoX − Sound eXchange"), - "sox.exe", "v??.?.?", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://sox.sourceforge.net/" - ); - moreAboutText += makeToolText - ( - tr("GnuPG − The GNU Privacy Guard"), - "gpgv.exe", "v?.?.??", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://www.gnupg.org/" - ); - moreAboutText += makeToolText - ( - tr("GNU Wget − Software for retrieving files using HTTP"), - "wget.exe", "v?.??.?", - tr("Released under the terms of the GNU Lesser General Public License."), - "http://www.gnu.org/software/wget/" - ); - moreAboutText += makeToolText - ( - tr("Silk Icons − Over 700 icons in PNG format"), - QString(), "v1.3", - tr("By Mark James, released under the Creative Commons 'by' License."), - "http://www.famfamfam.com/lab/icons/silk/" - ); - moreAboutText += QString("
    		 
    %1
    ").arg - ( - tr("LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of thrird-party software used in LameXP belongs to the individual authors.").replace("-", "−") - ); + tr("OggEnc − Ogg Vorbis Encoder"), + "oggenc2.exe", "v?.??, aoTuV Beta-?.??", + tr("Completely open and patent-free audio encoding technology."), + "http://www.vorbis.com/" + ); + moreAboutText += makeToolText + ( + tr("Nero AAC Reference MPEG-4 Encoder"), + "neroAacEnc.exe", "v?.?.?.?", + tr("Freeware state-of-the-art HE-AAC encoder with 2-Pass support."), + neroAacUrl, + tr("Available from vendor web-site as free download:") + ); + moreAboutText += makeToolText + ( + tr("Aften − A/52 audio encoder"), + "aften.exe", "v?.?.?", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://aften.sourceforge.net/" + ); + moreAboutText += makeToolText + ( + tr("FLAC − Free Lossless Audio Codec"), + "flac.exe", "v?.?.?", + tr("Open and patent-free lossless audio compression technology."), + "http://flac.sourceforge.net/" + ); + moreAboutText += makeToolText + ( + tr("mpg123 − Fast Console MPEG Audio Player/Decoder"), + "mpg123.exe", "v?.??.?", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://www.mpg123.de/" + ); + moreAboutText += makeToolText + ( + tr("FAAD − OpenSource MPEG-4 and MPEG-2 AAC Decoder"), + "faad.exe", "v?.?", + tr("Released under the terms of the GNU General Public License."), + "http://www.audiocoding.com/" + ); + moreAboutText += makeToolText + ( + tr("AC3Filter Tools − AC3/DTS Decoder"), + "valdec.exe", "v?.??", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://www.ac3filter.net/projects/tools" + ); + moreAboutText += makeToolText + ( + tr("WavPack − Hybrid Lossless Compression"), + "wvunpack.exe", "v?.??.?", + tr("Completely open audio compression format."), + "http://www.wavpack.com/" + ); + moreAboutText += makeToolText + ( + tr("Musepack − Living Audio Compression"), + "mpcdec.exe", "r???", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://www.musepack.net/" + ); + moreAboutText += makeToolText + ( + tr("Monkey's Audio − Lossless Audio Compressor"), + "mac.exe", "v?.??", + tr("Freely available source code, simple SDK and non-restrictive licensing."), + "http://www.monkeysaudio.com/" + ); + moreAboutText += QString + ( + "
    " + ); + moreAboutText += makeToolText + ( + tr("Shorten − Lossless Audio Compressor"), + "shorten.exe", "v?.?.?", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://etree.org/shnutils/shorten/" + ); + moreAboutText += makeToolText + ( + tr("Speex − Free Codec For Free Speech"), + "speexdec.exe", "v?.?", + tr("Open Source patent-free audio format designed for speech."), + "http://www.speex.org/" + ); + moreAboutText += makeToolText + ( + tr("The True Audio − Lossless Audio Codec"), + "tta.exe", "v?.?", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://tta.sourceforge.net/" + ); + moreAboutText += makeToolText + ( + tr("ALAC Decoder"), + "alac.exe", "v?.?.?", + tr("Copyright (c) 2004 David Hammerton. Contributions by Cody Brocious."), + "http://craz.net/programs/itunes/alac.html" + ); + moreAboutText += makeToolText + ( + tr("wma2wav − Dump WMA files to Wave Audio"), + "wma2wav.exe", "????-??-??", + tr("Copyright (c) 2011 LoRd_MuldeR . Some rights reserved."), + "http://forum.doom9.org/showthread.php?t=140273" + ); + moreAboutText += makeToolText + ( + tr("avs2wav − Avisynth to Wave Audio converter"), + "avs2wav.exe", "v?.?", + tr("By Jory Stone and LoRd_MuldeR ."), + "http://forum.doom9.org/showthread.php?t=70882" + ); + moreAboutText += makeToolText + ( + tr("MediaInfo − Media File Analysis Tool"), + "mediainfo.exe", "v?.?.??", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://mediainfo.sourceforge.net/" + ); + moreAboutText += makeToolText + ( + tr("SoX − Sound eXchange"), + "sox.exe", "v??.?.?", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://sox.sourceforge.net/" + ); + moreAboutText += makeToolText + ( + tr("GnuPG − The GNU Privacy Guard"), + "gpgv.exe", "v?.?.??", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://www.gnupg.org/" + ); + moreAboutText += makeToolText + ( + tr("GNU Wget − Software for retrieving files using HTTP"), + "wget.exe", "v?.??.?", + tr("Released under the terms of the GNU Lesser General Public License."), + "http://www.gnu.org/software/wget/" + ); + moreAboutText += makeToolText + ( + tr("Silk Icons − Over 700 icons in PNG format"), + QString(), "v1.3", + tr("By Mark James, released under the Creative Commons 'by' License."), + "http://www.famfamfam.com/lab/icons/silk/" + ); + moreAboutText += QString("
 
%1
").arg + ( + tr("LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of thrird-party software used in LameXP belongs to the individual authors.").replace("-", "−") + ); - QMessageBox *moreAboutBox = new QMessageBox(this); - moreAboutBox->setText(moreAboutText); - moreAboutBox->setIconPixmap(dynamic_cast(QApplication::instance())->windowIcon().pixmap(QSize(64,64))); + QMessageBox *moreAboutBox = new QMessageBox(this); + moreAboutBox->setText(moreAboutText); + moreAboutBox->setIconPixmap(dynamic_cast(QApplication::instance())->windowIcon().pixmap(QSize(64,64))); - QPushButton *closeButton = moreAboutBox->addButton(tr("Discard"), QMessageBox::AcceptRole); - closeButton->setIcon(QIcon(":/icons/cross.png")); - closeButton->setMinimumWidth(90); + QPushButton *closeButton = moreAboutBox->addButton(tr("Discard"), QMessageBox::AcceptRole); + closeButton->setIcon(QIcon(":/icons/cross.png")); + closeButton->setMinimumWidth(90); - moreAboutBox->setWindowTitle(tr("About Third-party Software")); - moreAboutBox->setIconPixmap(QIcon(":/images/Logo_Software.png").pixmap(QSize(64,71))); - moreAboutBox->setWindowIcon(QIcon(":/icons/page_white_cplusplus.png")); - moreAboutBox->exec(); + moreAboutBox->setWindowTitle(tr("About Third-party Software")); + moreAboutBox->setIconPixmap(QIcon(":/images/Logo_Software.png").pixmap(QSize(64,71))); + moreAboutBox->setWindowIcon(QIcon(":/icons/page_white_cplusplus.png")); + moreAboutBox->exec(); - LAMEXP_DELETE(moreAboutBox); + LAMEXP_DELETE(moreAboutBox); + ); } void AboutDialog::moveDisque(void) diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index eba4d1d6..5eb29915 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -947,7 +947,7 @@ void MainWindow::windowShown(void) if(QDate::currentDate() >= lamexp_version_date().addYears(1)) { qWarning("Binary is more than a year old, time to update!"); - if(QMessageBox::warning(this, tr("Urgent Update"), QString("%1").arg(tr("Your version of LameXP is more than a year old. Time for an update!")), tr("Check for Updates"), tr("Exit Program")) == 0) + if(QMessageBox::warning(this, tr("Urgent Update"), QString("%1").arg(tr("Your version of LameXP is more than a year old. Time for an update!")).replace("-", "−"), tr("Check for Updates"), tr("Exit Program")) == 0) { if(checkForUpdates()) { @@ -966,7 +966,7 @@ void MainWindow::windowShown(void) QDate lastUpdateCheck = QDate::fromString(m_settings->autoUpdateLastCheck(), Qt::ISODate); if(!lastUpdateCheck.isValid() || QDate::currentDate() >= lastUpdateCheck.addDays(14)) { - if(QMessageBox::information(this, tr("Update Reminder"), QString("%1").arg(lastUpdateCheck.isValid() ? tr("Your last update check was more than 14 days ago. Check for updates now?") : tr("Your did not check for LameXP updates yet. Check for updates now?")), tr("Check for Updates"), tr("Postpone")) == 0) + if(QMessageBox::information(this, tr("Update Reminder"), QString("%1").arg(lastUpdateCheck.isValid() ? tr("Your last update check was more than 14 days ago. Check for updates now?") : tr("Your did not check for LameXP updates yet. Check for updates now?")).replace("-", "−"), tr("Check for Updates"), tr("Postpone")) == 0) { if(checkForUpdates()) { diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp index c0692e33..bd15a519 100644 --- a/src/Model_Settings.cpp +++ b/src/Model_Settings.cpp @@ -243,7 +243,7 @@ void SettingsModel::validate(void) if(!lamexp_query_translations().contains(this->currentLanguage(), Qt::CaseInsensitive)) { qWarning("Current language \"%s\" is unknown, reverting to default language!", this->currentLanguage().toLatin1().constData()); - this->currentLanguage(defaultLanguage()); + this->currentLanguage(defaultLanguage()); } }