diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index 3c5f3060..95ed1c8e 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -1089,6 +1089,10 @@ Import Cue Sheet + + Disable Slow Startup Notifications + + Adding file(s), please wait... @@ -1485,6 +1489,22 @@ The WMA Decoder notifications have been re-enabled. + + Slow Startup Notifications + + + + Do you really want to disable the slow startup notifications? + + + + The slow startup notifications have been disabled. + + + + The slow startup notifications have been re-enabled. + + Open Cue Sheet diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index 73a7c3c4..06acdd39 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -756,7 +756,7 @@ Disable WMA Decoder Notifications - WMA-Dekodierermeldungen deaktivieren + WMA-Dekodierer-Meldungen deaktivieren Show DropBox @@ -956,15 +956,15 @@ Do you really want to disable all WMA Decoder notifications? - Sind Sie sicher, dass Sie alle WMA-Dekodierermeldungen deaktivieren möchten? + Sind Sie sicher, dass Sie alle WMA-Dekodierer-Meldungen deaktivieren möchten? All WMA Decoder notifications have been disabled. - Alle WMA-Dekodierermeldungen wurden deaktiviert. + Alle WMA-Dekodierer-Meldungen wurden deaktiviert. The WMA Decoder notifications have been re-enabled. - Die WMA-Dekodierermeldungen wurden wieder aktiviert. + Die WMA-Dekodierer-Meldungen wurden wieder aktiviert. Do you want to download and install the WMA File Decoder component now? @@ -1606,6 +1606,26 @@ Slow Startup Langsamer Programmstart + + Disable Slow Startup Notifications + Langsamer Programmstart Meldungen deaktivieren + + + Slow Startup Notifications + Langsamer Programmstart Meldungen + + + Do you really want to disable the slow startup notifications? + Sind Sie sicher, dass Sie alle langsamer Programmstart Meldungen deaktivieren möchten? + + + The slow startup notifications have been disabled. + Die langsamer Programmstart Meldungen wurden deaktiviert. + + + The slow startup notifications have been re-enabled. + Die langsamer Programmstart Meldungen wurden wieder aktiviert. + MetaInfo diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index 6c4dbc67..87dd3c91 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -1605,6 +1605,26 @@ Slow Startup + + Disable Slow Startup Notifications + + + + Slow Startup Notifications + + + + Do you really want to disable the slow startup notifications? + + + + The slow startup notifications have been disabled. + + + + The slow startup notifications have been re-enabled. + + MetaInfo diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index 37c44f72..7404b4af 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -1615,6 +1615,26 @@ Ouvrir le dossier récursivement... Slow Startup + + Disable Slow Startup Notifications + + + + Slow Startup Notifications + + + + Do you really want to disable the slow startup notifications? + + + + The slow startup notifications have been disabled. + + + + The slow startup notifications have been re-enabled. + + MetaInfo diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index 23438425..2fd58af1 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -1606,6 +1606,26 @@ Slow Startup + + Disable Slow Startup Notifications + + + + Slow Startup Notifications + + + + Do you really want to disable the slow startup notifications? + + + + The slow startup notifications have been disabled. + + + + The slow startup notifications have been re-enabled. + + MetaInfo diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index 1709f947..a3a5aa11 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -1605,6 +1605,26 @@ Slow Startup + + Disable Slow Startup Notifications + + + + Slow Startup Notifications + + + + Do you really want to disable the slow startup notifications? + + + + The slow startup notifications have been disabled. + + + + The slow startup notifications have been re-enabled. + + MetaInfo diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index 60c0b815..b0b6119b 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -1611,6 +1611,26 @@ Slow Startup + + Disable Slow Startup Notifications + + + + Slow Startup Notifications + + + + Do you really want to disable the slow startup notifications? + + + + The slow startup notifications have been disabled. + + + + The slow startup notifications have been re-enabled. + + MetaInfo diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index c866f815..99b3c2df 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -1605,6 +1605,26 @@ Slow Startup + + Disable Slow Startup Notifications + + + + Slow Startup Notifications + + + + Do you really want to disable the slow startup notifications? + + + + The slow startup notifications have been disabled. + + + + The slow startup notifications have been re-enabled. + + MetaInfo diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index 300a8f8e..57608f0f 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -1067,8 +1067,8 @@ 0 0 - 604 - 1244 + 602 + 1241 @@ -3073,6 +3073,7 @@ + @@ -3387,6 +3388,14 @@ Import Cue Sheet + + + true + + + Disable Slow Startup Notifications + + @@ -3467,6 +3476,7 @@ + diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index 72b91ad5..fca20983 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 e6d8f4b2..85a48adc 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 584 +#define VER_LAMEXP_BUILD 586 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index a3c8b844..caf13471 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -332,6 +332,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S actionDisableSounds->setChecked(!m_settings->soundsEnabled()); actionDisableNeroAacNotifications->setChecked(!m_settings->neroAacNotificationsEnabled()); actionDisableWmaDecoderNotifications->setChecked(!m_settings->wmaDecoderNotificationsEnabled()); + actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled()); actionDisableShellIntegration->setChecked(!m_settings->shellIntegrationEnabled()); actionDisableShellIntegration->setDisabled(lamexp_portable_mode() && actionDisableShellIntegration->isChecked()); actionCheckForBetaUpdates->setChecked(m_settings->autoUpdateCheckBeta() || lamexp_version_demo()); @@ -341,6 +342,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S connect(actionInstallWMADecoder, SIGNAL(triggered(bool)), this, SLOT(installWMADecoderActionTriggered(bool))); connect(actionDisableNeroAacNotifications, SIGNAL(triggered(bool)), this, SLOT(disableNeroAacNotificationsActionTriggered(bool))); connect(actionDisableWmaDecoderNotifications, SIGNAL(triggered(bool)), this, SLOT(disableWmaDecoderNotificationsActionTriggered(bool))); + connect(actionDisableSlowStartupNotifications, SIGNAL(triggered(bool)), this, SLOT(disableSlowStartupNotificationsActionTriggered(bool))); connect(actionDisableShellIntegration, SIGNAL(triggered(bool)), this, SLOT(disableShellIntegrationActionTriggered(bool))); connect(actionShowDropBoxWidget, SIGNAL(triggered(bool)), this, SLOT(showDropBoxWidgetActionTriggered(bool))); connect(actionCheckForBetaUpdates, SIGNAL(triggered(bool)), this, SLOT(checkForBetaUpdatesActionTriggered(bool))); @@ -929,11 +931,12 @@ void MainWindow::windowShown(void) if(m_settings->slowStartup() && m_settings->antivirNotificationsEnabled()) { QString message; - message += QString("%1
").arg(tr("It seems that a bogus anti-virus software is slowing down the startup of LameXP.")); - message += QString("%1
").arg(tr("Please refer to the %1 document for details and solutions!").arg("F.A.Q.")); + message += QString("%1
").arg(tr("It seems that a bogus anti-virus software is slowing down the startup of LameXP.").replace("-", "−")); + message += QString("%1
").arg(tr("Please refer to the %1 document for details and solutions!").replace("-", "−").arg("F.A.Q.")); if(QMessageBox::warning(this, tr("Slow Startup"), message, tr("Discard"), tr("Don't Show Again")) == 1) { m_settings->antivirNotificationsEnabled(false); + actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled()); } } @@ -1487,6 +1490,32 @@ void MainWindow::disableWmaDecoderNotificationsActionTriggered(bool checked) actionDisableWmaDecoderNotifications->setChecked(!m_settings->wmaDecoderNotificationsEnabled()); } +/* + * Disable slow startup action + */ +void MainWindow::disableSlowStartupNotificationsActionTriggered(bool checked) +{ + if(checked) + { + if(0 == QMessageBox::question(this, tr("Slow Startup Notifications"), tr("Do you really want to disable the slow startup notifications?"), tr("Yes"), tr("No"), QString(), 1)) + { + QMessageBox::information(this, tr("Slow Startup Notifications"), tr("The slow startup notifications have been disabled.")); + m_settings->antivirNotificationsEnabled(false); + } + else + { + m_settings->antivirNotificationsEnabled(true); + } + } + else + { + QMessageBox::information(this, tr("Slow Startup Notifications"), tr("The slow startup notifications have been re-enabled.")); + m_settings->antivirNotificationsEnabled(true); + } + + actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled()); +} + /* * Download and install WMA Decoder component */ diff --git a/src/Dialog_MainWindow.h b/src/Dialog_MainWindow.h index f25f5bc4..a3374773 100644 --- a/src/Dialog_MainWindow.h +++ b/src/Dialog_MainWindow.h @@ -71,6 +71,7 @@ private slots: void customTempFolderChanged(const QString &text); void disableNeroAacNotificationsActionTriggered(bool checked); void disableShellIntegrationActionTriggered(bool); + void disableSlowStartupNotificationsActionTriggered(bool checked); void disableSoundsActionTriggered(bool checked); void disableUpdateReminderActionTriggered(bool checked); void disableWmaDecoderNotificationsActionTriggered(bool checked);