Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Added an option to disable to icon in the notification area.

Browse Source
This commit is contained in:
LoRd_MuldeR 2023-12-17 16:11:28 +01:00
parent af2981d576
commit 0cb22559ca
26 changed files with 4732 additions and 4374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Changelog.html
View File

File diff suppressed because one or more lines are too long

1
doc/Changelog.md
View File

@ -16,6 +16,7 @@ subtitle: "Audio-Encoder Front-End – Changelog"
* Updated mpg123 decoder to v1.32.3 (2023-10-02), compiled with GCC 13.2.0 * Updated mpg123 decoder to v1.32.3 (2023-10-02), compiled with GCC 13.2.0
* Updated MediaInfo to v23.11 (2023-11-30), compiled with ICL 2023.2 and MSVC 16.11 * Updated MediaInfo to v23.11 (2023-11-30), compiled with ICL 2023.2 and MSVC 16.11
* Updated cURL to v8.5.0 (2023-12-06), with libcurl v8.5.0 and OpenSSL v1.1.1w * Updated cURL to v8.5.0 (2023-12-06), with libcurl v8.5.0 and OpenSSL v1.1.1w
* Added an option to disable the icon in the notification area (now disabled by default)
## LameXP v4.20 [2023-03-07] ## {-} ## LameXP v4.20 [2023-03-07] ## {-}
* Updated FLAC encoder/decoder to v1.4.1 (2022-09-22), compiled with ICL 2022.2 and MSVC 15.9 * Updated FLAC encoder/decoder to v1.4.1 (2022-09-22), compiled with ICL 2022.2 and MSVC 15.9

599
etc/Translation/Blank.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_BG.ts
View File

File diff suppressed because it is too large Load Diff

603
etc/Translation/LameXP_DE.ts
View File

File diff suppressed because it is too large Load Diff

34
etc/Translation/LameXP_EN.ts
View File

@ -31,7 +31,7 @@
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_MainWindow.cpp" line="859"/> <location filename="../../src/Dialog_MainWindow.cpp" line="861"/>
<source>%n file(s) have been rejected, because read access was not granted!</source> <source>%n file(s) have been rejected, because read access was not granted!</source>
<translation> <translation>
<numerusform>%n file have been rejected, because read access was not granted!</numerusform> <numerusform>%n file have been rejected, because read access was not granted!</numerusform>
@ -39,7 +39,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_MainWindow.cpp" line="863"/> <location filename="../../src/Dialog_MainWindow.cpp" line="865"/>
<source>%n file(s) have been rejected, because they are dummy CDDA files!</source> <source>%n file(s) have been rejected, because they are dummy CDDA files!</source>
<translation> <translation>
<numerusform>%n file have been rejected, because they are dummy CDDA files!</numerusform> <numerusform>%n file have been rejected, because they are dummy CDDA files!</numerusform>
@ -47,7 +47,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_MainWindow.cpp" line="867"/> <location filename="../../src/Dialog_MainWindow.cpp" line="869"/>
<source>%n file(s) have been rejected, because they appear to be Cue Sheet images!</source> <source>%n file(s) have been rejected, because they appear to be Cue Sheet images!</source>
<translation> <translation>
<numerusform>%n file have been rejected, because they appear to be Cue Sheet images!</numerusform> <numerusform>%n file have been rejected, because they appear to be Cue Sheet images!</numerusform>
@ -55,7 +55,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_MainWindow.cpp" line="871"/> <location filename="../../src/Dialog_MainWindow.cpp" line="873"/>
<source>%n file(s) have been rejected, because the file format could not be recognized!</source> <source>%n file(s) have been rejected, because the file format could not be recognized!</source>
<translation> <translation>
<numerusform>%n file have been rejected, because the file format could not be recognized!</numerusform> <numerusform>%n file have been rejected, because the file format could not be recognized!</numerusform>
@ -63,7 +63,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_MainWindow.cpp" line="4251"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4267"/>
<source>%n Instance(s)</source> <source>%n Instance(s)</source>
<translation> <translation>
<numerusform>%n Instance</numerusform> <numerusform>%n Instance</numerusform>
@ -74,7 +74,7 @@
<context> <context>
<name>ProcessingDialog</name> <name>ProcessingDialog</name>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_Processing.cpp" line="676"/> <location filename="../../src/Dialog_Processing.cpp" line="692"/>
<source>Encoding: %n file(s) of %1 completed so far, please wait...</source> <source>Encoding: %n file(s) of %1 completed so far, please wait...</source>
<translation> <translation>
<numerusform>Encoding: %n file of %1 completed so far, please wait...</numerusform> <numerusform>Encoding: %n file of %1 completed so far, please wait...</numerusform>
@ -82,7 +82,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_Processing.cpp" line="708"/> <location filename="../../src/Dialog_Processing.cpp" line="724"/>
<source>Process was aborted by the user after %n file(s)!</source> <source>Process was aborted by the user after %n file(s)!</source>
<translation> <translation>
<numerusform>Process was aborted by the user after %n file!</numerusform> <numerusform>Process was aborted by the user after %n file!</numerusform>
@ -90,7 +90,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_Processing.cpp" line="729"/> <location filename="../../src/Dialog_Processing.cpp" line="744"/>
<source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source> <source>Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!</source>
<translation> <translation>
<numerusform>Error: %1 of %n file failed (%2). Double-click failed items for detailed information!</numerusform> <numerusform>Error: %1 of %n file failed (%2). Double-click failed items for detailed information!</numerusform>
@ -98,7 +98,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_Processing.cpp" line="729"/> <location filename="../../src/Dialog_Processing.cpp" line="744"/>
<source>%n file(s) skipped</source> <source>%n file(s) skipped</source>
<translation> <translation>
<numerusform>%n file skipped</numerusform> <numerusform>%n file skipped</numerusform>
@ -106,7 +106,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_Processing.cpp" line="733"/> <location filename="../../src/Dialog_Processing.cpp" line="748"/>
<source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source> <source>Error: %1 of %n file(s) failed. Double-click failed items for detailed information!</source>
<translation> <translation>
<numerusform>Error: %1 of %n file failed. Double-click failed items for detailed information!</numerusform> <numerusform>Error: %1 of %n file failed. Double-click failed items for detailed information!</numerusform>
@ -114,7 +114,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_Processing.cpp" line="747"/> <location filename="../../src/Dialog_Processing.cpp" line="761"/>
<source>All files completed successfully. Skipped %n file(s).</source> <source>All files completed successfully. Skipped %n file(s).</source>
<translation> <translation>
<numerusform>All files completed successfully. Skipped %n file.</numerusform> <numerusform>All files completed successfully. Skipped %n file.</numerusform>
@ -122,7 +122,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_Processing.cpp" line="1215"/> <location filename="../../src/Dialog_Processing.cpp" line="1228"/>
<source>%n hour(s)</source> <source>%n hour(s)</source>
<translation> <translation>
<numerusform>%n hour</numerusform> <numerusform>%n hour</numerusform>
@ -130,8 +130,8 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_Processing.cpp" line="1216"/> <location filename="../../src/Dialog_Processing.cpp" line="1229"/>
<location filename="../../src/Dialog_Processing.cpp" line="1220"/> <location filename="../../src/Dialog_Processing.cpp" line="1233"/>
<source>%n minute(s)</source> <source>%n minute(s)</source>
<translation> <translation>
<numerusform>%n minute</numerusform> <numerusform>%n minute</numerusform>
@ -139,8 +139,8 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_Processing.cpp" line="1221"/> <location filename="../../src/Dialog_Processing.cpp" line="1234"/>
<location filename="../../src/Dialog_Processing.cpp" line="1225"/> <location filename="../../src/Dialog_Processing.cpp" line="1238"/>
<source>%n second(s)</source> <source>%n second(s)</source>
<translation> <translation>
<numerusform>%n second</numerusform> <numerusform>%n second</numerusform>
@ -148,7 +148,7 @@
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../../src/Dialog_Processing.cpp" line="1226"/> <location filename="../../src/Dialog_Processing.cpp" line="1239"/>
<source>%n millisecond(s)</source> <source>%n millisecond(s)</source>
<translation> <translation>
<numerusform>%n millisecond</numerusform> <numerusform>%n millisecond</numerusform>

599
etc/Translation/LameXP_ES.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_FR.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_HU.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_IT.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_JA.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_KR.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_PL.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_RU.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_SV.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_TW.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_UK.ts
View File

File diff suppressed because it is too large Load Diff

599
etc/Translation/LameXP_ZH.ts
View File

File diff suppressed because it is too large Load Diff

9
gui/MainWindow.ui
View File

@ -4804,6 +4804,7 @@
<addaction name="actionDisableNeroAacNotifications"/> <addaction name="actionDisableNeroAacNotifications"/>
<addaction name="actionDisableSlowStartupNotifications"/> <addaction name="actionDisableSlowStartupNotifications"/>
<addaction name="actionDisableShellIntegration"/> <addaction name="actionDisableShellIntegration"/>
<addaction name="actionDisableTrayIcon"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionHibernateComputer"/> <addaction name="actionHibernateComputer"/>
<addaction name="actionCheckForBetaUpdates"/> <addaction name="actionCheckForBetaUpdates"/>
@ -5155,6 +5156,14 @@
<string>Hydrogenaudio Knowledgebase</string> <string>Hydrogenaudio Knowledgebase</string>
</property> </property>
</action> </action>
<action name="actionDisableTrayIcon">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Disable Icon in Notification Area</string>
</property>
</action>
</widget> </widget>
<resources> <resources>
<include location="../res/Icons.qrc"/> <include location="../res/Icons.qrc"/>

BIN
res/localization/LameXP_DE.qm
View File

Binary file not shown.

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 1 #define VER_LAMEXP_MINOR_LO 1
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 5 #define VER_LAMEXP_PATCH 5
#define VER_LAMEXP_BUILD 2368 #define VER_LAMEXP_BUILD 2369
#define VER_LAMEXP_CONFG 2188 #define VER_LAMEXP_CONFG 2188
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

32
src/Dialog_MainWindow.cpp
View File

@ -712,6 +712,7 @@ MainWindow::MainWindow(MUtils::IPCChannel *const ipcChannel, FileListModel *cons
ui->actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled()); ui->actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled());
ui->actionDisableShellIntegration->setChecked(!m_settings->shellIntegrationEnabled()); ui->actionDisableShellIntegration->setChecked(!m_settings->shellIntegrationEnabled());
ui->actionDisableShellIntegration->setDisabled(lamexp_version_portable() && ui->actionDisableShellIntegration->isChecked()); ui->actionDisableShellIntegration->setDisabled(lamexp_version_portable() && ui->actionDisableShellIntegration->isChecked());
ui->actionDisableTrayIcon->setChecked(m_settings->disableTrayIcon());
ui->actionCheckForBetaUpdates->setChecked(m_settings->autoUpdateCheckBeta() || lamexp_version_test()); ui->actionCheckForBetaUpdates->setChecked(m_settings->autoUpdateCheckBeta() || lamexp_version_test());
ui->actionCheckForBetaUpdates->setEnabled(!lamexp_version_test()); ui->actionCheckForBetaUpdates->setEnabled(!lamexp_version_test());
ui->actionHibernateComputer->setChecked(m_settings->hibernateComputer()); ui->actionHibernateComputer->setChecked(m_settings->hibernateComputer());
@ -721,6 +722,7 @@ MainWindow::MainWindow(MUtils::IPCChannel *const ipcChannel, FileListModel *cons
connect(ui->actionDisableNeroAacNotifications, SIGNAL(triggered(bool)), this, SLOT(disableNeroAacNotificationsActionTriggered(bool))); connect(ui->actionDisableNeroAacNotifications, SIGNAL(triggered(bool)), this, SLOT(disableNeroAacNotificationsActionTriggered(bool)));
connect(ui->actionDisableSlowStartupNotifications, SIGNAL(triggered(bool)), this, SLOT(disableSlowStartupNotificationsActionTriggered(bool))); connect(ui->actionDisableSlowStartupNotifications, SIGNAL(triggered(bool)), this, SLOT(disableSlowStartupNotificationsActionTriggered(bool)));
connect(ui->actionDisableShellIntegration, SIGNAL(triggered(bool)), this, SLOT(disableShellIntegrationActionTriggered(bool))); connect(ui->actionDisableShellIntegration, SIGNAL(triggered(bool)), this, SLOT(disableShellIntegrationActionTriggered(bool)));
connect(ui->actionDisableTrayIcon, SIGNAL(triggered(bool)), this, SLOT(disableTrayIconActionTriggered(bool)));
connect(ui->actionShowDropBoxWidget, SIGNAL(triggered(bool)), this, SLOT(showDropBoxWidgetActionTriggered(bool))); connect(ui->actionShowDropBoxWidget, SIGNAL(triggered(bool)), this, SLOT(showDropBoxWidgetActionTriggered(bool)));
connect(ui->actionHibernateComputer, SIGNAL(triggered(bool)), this, SLOT(hibernateComputerActionTriggered(bool))); connect(ui->actionHibernateComputer, SIGNAL(triggered(bool)), this, SLOT(hibernateComputerActionTriggered(bool)));
connect(ui->actionCheckForBetaUpdates, SIGNAL(triggered(bool)), this, SLOT(checkForBetaUpdatesActionTriggered(bool))); connect(ui->actionCheckForBetaUpdates, SIGNAL(triggered(bool)), this, SLOT(checkForBetaUpdatesActionTriggered(bool)));
@ -1961,7 +1963,7 @@ void MainWindow::cornerWidgetEventOccurred(QWidget* /*sender*/, QEvent *const ev
/* /*
* Style action triggered * Style action triggered
*/ */
void MainWindow::styleActionActivated(QAction *action) void MainWindow::styleActionActivated(QAction *const action)
{ {
//Change style setting //Change style setting
if(action && action->data().isValid()) if(action && action->data().isValid())
@ -2084,7 +2086,7 @@ void MainWindow::languageFromFileActionActivated(bool /*checked*/)
/* /*
* Disable update reminder action * Disable update reminder action
*/ */
void MainWindow::disableUpdateReminderActionTriggered(bool checked) void MainWindow::disableUpdateReminderActionTriggered(const bool checked)
{ {
if(checked) if(checked)
{ {
@ -2110,7 +2112,7 @@ void MainWindow::disableUpdateReminderActionTriggered(bool checked)
/* /*
* Disable sound effects action * Disable sound effects action
*/ */
void MainWindow::disableSoundsActionTriggered(bool checked) void MainWindow::disableSoundsActionTriggered(const bool checked)
{ {
if(checked) if(checked)
{ {
@ -2136,7 +2138,7 @@ void MainWindow::disableSoundsActionTriggered(bool checked)
/* /*
* Disable Nero AAC encoder action * Disable Nero AAC encoder action
*/ */
void MainWindow::disableNeroAacNotificationsActionTriggered(bool checked) void MainWindow::disableNeroAacNotificationsActionTriggered(const bool checked)
{ {
if(checked) if(checked)
{ {
@ -2162,7 +2164,7 @@ void MainWindow::disableNeroAacNotificationsActionTriggered(bool checked)
/* /*
* Disable slow startup action * Disable slow startup action
*/ */
void MainWindow::disableSlowStartupNotificationsActionTriggered(bool checked) void MainWindow::disableSlowStartupNotificationsActionTriggered(const bool checked)
{ {
if(checked) if(checked)
{ {
@ -2253,7 +2255,7 @@ void MainWindow::showDropBoxWidgetActionTriggered(bool /*checked*/)
/* /*
* Check for beta (pre-release) updates * Check for beta (pre-release) updates
*/ */
void MainWindow::checkForBetaUpdatesActionTriggered(bool checked) void MainWindow::checkForBetaUpdatesActionTriggered(const bool checked)
{ {
bool checkUpdatesNow = false; bool checkUpdatesNow = false;
@ -2292,7 +2294,7 @@ void MainWindow::checkForBetaUpdatesActionTriggered(bool checked)
/* /*
* Hibernate computer action * Hibernate computer action
*/ */
void MainWindow::hibernateComputerActionTriggered(bool checked) void MainWindow::hibernateComputerActionTriggered(const bool checked)
{ {
if(checked) if(checked)
{ {
@ -2318,7 +2320,7 @@ void MainWindow::hibernateComputerActionTriggered(bool checked)
/* /*
* Disable shell integration action * Disable shell integration action
*/ */
void MainWindow::disableShellIntegrationActionTriggered(bool checked) void MainWindow::disableShellIntegrationActionTriggered(const bool checked)
{ {
if(checked) if(checked)
{ {
@ -2348,6 +2350,20 @@ void MainWindow::disableShellIntegrationActionTriggered(bool checked)
} }
} }
void MainWindow::disableTrayIconActionTriggered(const bool checked)
{
if (checked)
{
QMessageBox::information(this, tr("Notification Icon"), NOBREAK(tr("The notification icon has been disabled.")));
}
else
{
QMessageBox::information(this, tr("Notification Icon"), NOBREAK(tr("The notification icon has been re-enabled.")));
}
m_settings->disableTrayIcon(checked);
}
// ========================================================= // =========================================================
// Help menu slots // Help menu slots
// ========================================================= // =========================================================

1
src/Dialog_MainWindow.h
View File

@ -98,6 +98,7 @@ private slots:
void customTempFolderChanged(const QString &text); void customTempFolderChanged(const QString &text);
void disableNeroAacNotificationsActionTriggered(bool checked); void disableNeroAacNotificationsActionTriggered(bool checked);
void disableShellIntegrationActionTriggered(bool); void disableShellIntegrationActionTriggered(bool);
void disableTrayIconActionTriggered(bool);
void disableSlowStartupNotificationsActionTriggered(bool checked); void disableSlowStartupNotificationsActionTriggered(bool checked);
void disableSoundsActionTriggered(bool checked); void disableSoundsActionTriggered(bool checked);
void disableUpdateReminderActionTriggered(bool checked); void disableUpdateReminderActionTriggered(bool checked);

29
src/Dialog_Processing.cpp
View File

@ -101,6 +101,16 @@ while(0)
} \ } \
while(0) while(0)
#define SET_PROGRESS_MESG(TITLE, MESSAGE, TYPE, ICON) do \
{ \
if (!m_systemTray.isNull()) \
{ \
m_systemTray->showMessage(TITLE, MESSAGE, TYPE); \
m_systemTray->setIcon(ICON); \
} \
} \
while(0)
#define SET_FONT_BOLD(WIDGET,BOLD) do \ #define SET_FONT_BOLD(WIDGET,BOLD) do \
{ \ { \
QFont _font = WIDGET->font(); \ QFont _font = WIDGET->font(); \
@ -152,7 +162,7 @@ ProcessingDialog::ProcessingDialog(FileListModel *const fileListModel, const Aud
: :
QDialog(parent), QDialog(parent),
ui(new Ui::ProcessingDialog), ui(new Ui::ProcessingDialog),
m_systemTray(new QSystemTrayIcon(QIcon(":/icons/cd_go.png"), this)), m_systemTray((!settings->disableTrayIcon()) ? new QSystemTrayIcon(QIcon(":/icons/cd_go.png"), this) : NULL),
m_taskbar(new MUtils::Taskbar7(this)), m_taskbar(new MUtils::Taskbar7(this)),
m_settings(settings), m_settings(settings),
m_metaInfo(metaInfo), m_metaInfo(metaInfo),
@ -287,8 +297,11 @@ ProcessingDialog::ProcessingDialog(FileListModel *const fileListModel, const Aud
//Translate //Translate
ui->label_headerStatus->setText(QString("<b>%1</b><br>%2").arg(tr("Encoding Files"), tr("Your files are being encoded, please be patient..."))); ui->label_headerStatus->setText(QString("<b>%1</b><br>%2").arg(tr("Encoding Files"), tr("Your files are being encoded, please be patient...")));
//Enable system tray icon //Enable system tray icon, if enabled
if (!m_systemTray.isNull())
{
connect(m_systemTray.data(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(systemTrayActivated(QSystemTrayIcon::ActivationReason))); connect(m_systemTray.data(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(systemTrayActivated(QSystemTrayIcon::ActivationReason)));
}
//Init other vars //Init other vars
m_runningThreads = 0; m_runningThreads = 0;
@ -394,10 +407,13 @@ void ProcessingDialog::closeEvent(QCloseEvent *event)
event->ignore(); event->ignore();
} }
else else
{
if (!m_systemTray.isNull())
{ {
m_systemTray->setVisible(false); m_systemTray->setVisible(false);
} }
} }
}
bool ProcessingDialog::eventFilter(QObject *obj, QEvent *event) bool ProcessingDialog::eventFilter(QObject *obj, QEvent *event)
{ {
@ -706,8 +722,7 @@ void ProcessingDialog::doneEncoding(void)
m_taskbar->setTaskbarState(MUtils::Taskbar7::TASKBAR_STATE_ERROR); m_taskbar->setTaskbarState(MUtils::Taskbar7::TASKBAR_STATE_ERROR);
m_taskbar->setOverlayIcon(m_iconError.data()); m_taskbar->setOverlayIcon(m_iconError.data());
SET_PROGRESS_TEXT((m_succeededJobs.count() > 0) ? tr("Process was aborted by the user after %n file(s)!", "", m_succeededJobs.count()) : tr("Process was aborted prematurely by the user!")); SET_PROGRESS_TEXT((m_succeededJobs.count() > 0) ? tr("Process was aborted by the user after %n file(s)!", "", m_succeededJobs.count()) : tr("Process was aborted prematurely by the user!"));
m_systemTray->showMessage(tr("LameXP - Aborted"), tr("Process was aborted by the user."), QSystemTrayIcon::Warning); SET_PROGRESS_MESG(tr("LameXP - Aborted"), tr("Process was aborted by the user."), QSystemTrayIcon::Warning, QIcon(":/icons/cd_delete.png"));
m_systemTray->setIcon(QIcon(":/icons/cd_delete.png"));
qApp->processEvents(QEventLoop::ExcludeUserInputEvents); qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
if(!m_forcedAbort) PLAY_SOUND_OPTIONAL("aborted", false); if(!m_forcedAbort) PLAY_SOUND_OPTIONAL("aborted", false);
} }
@ -732,8 +747,7 @@ void ProcessingDialog::doneEncoding(void)
{ {
SET_PROGRESS_TEXT(tr("Error: %1 of %n file(s) failed. Double-click failed items for detailed information!", "", m_failedJobs.count() + m_succeededJobs.count()).arg(QString::number(m_failedJobs.count()))); SET_PROGRESS_TEXT(tr("Error: %1 of %n file(s) failed. Double-click failed items for detailed information!", "", m_failedJobs.count() + m_succeededJobs.count()).arg(QString::number(m_failedJobs.count())));
} }
m_systemTray->showMessage(tr("LameXP - Error"), tr("At least one file has failed!"), QSystemTrayIcon::Critical); SET_PROGRESS_MESG(tr("LameXP - Error"), tr("At least one file has failed!"), QSystemTrayIcon::Critical, QIcon(":/icons/cd_delete.png"));
m_systemTray->setIcon(QIcon(":/icons/cd_delete.png"));
qApp->processEvents(QEventLoop::ExcludeUserInputEvents); qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
PLAY_SOUND_OPTIONAL("error", false); PLAY_SOUND_OPTIONAL("error", false);
} }
@ -750,8 +764,7 @@ void ProcessingDialog::doneEncoding(void)
{ {
SET_PROGRESS_TEXT(tr("All files completed successfully.")); SET_PROGRESS_TEXT(tr("All files completed successfully."));
} }
m_systemTray->showMessage(tr("LameXP - Done"), tr("All files completed successfully."), QSystemTrayIcon::Information); SET_PROGRESS_MESG(tr("LameXP - Done"), tr("All files completed successfully."), QSystemTrayIcon::Information, QIcon(":/icons/cd_add.png"));
m_systemTray->setIcon(QIcon(":/icons/cd_add.png"));
qApp->processEvents(QEventLoop::ExcludeUserInputEvents); qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
PLAY_SOUND_OPTIONAL("success", false); PLAY_SOUND_OPTIONAL("success", false);
} }

2
src/Model_Settings.cpp
View File

@ -266,6 +266,7 @@ LAMEXP_MAKE_ID(customParametersOpusEnc, "AdvancedOptions/CustomParameters/O
LAMEXP_MAKE_ID(customParametersWave, "AdvancedOptions/CustomParameters/Wave"); LAMEXP_MAKE_ID(customParametersWave, "AdvancedOptions/CustomParameters/Wave");
LAMEXP_MAKE_ID(customTempPath, "AdvancedOptions/TempDirectory/CustomPath"); LAMEXP_MAKE_ID(customTempPath, "AdvancedOptions/TempDirectory/CustomPath");
LAMEXP_MAKE_ID(customTempPathEnabled, "AdvancedOptions/TempDirectory/UseCustomPath"); LAMEXP_MAKE_ID(customTempPathEnabled, "AdvancedOptions/TempDirectory/UseCustomPath");
LAMEXP_MAKE_ID(disableTrayIcon, "Flags/DisableTrayIcon");
LAMEXP_MAKE_ID(dropBoxWidgetEnabled, "DropBoxWidget/Enabled"); LAMEXP_MAKE_ID(dropBoxWidgetEnabled, "DropBoxWidget/Enabled");
LAMEXP_MAKE_ID(dropBoxWidgetPositionX, "DropBoxWidget/Position/X"); LAMEXP_MAKE_ID(dropBoxWidgetPositionX, "DropBoxWidget/Position/X");
LAMEXP_MAKE_ID(dropBoxWidgetPositionY, "DropBoxWidget/Position/Y"); LAMEXP_MAKE_ID(dropBoxWidgetPositionY, "DropBoxWidget/Position/Y");
@ -682,6 +683,7 @@ LAMEXP_MAKE_OPTION_S(customParametersOpusEnc, QString())
LAMEXP_MAKE_OPTION_S(customParametersWave, QString()) LAMEXP_MAKE_OPTION_S(customParametersWave, QString())
LAMEXP_MAKE_OPTION_S(customTempPath, QDesktopServices::storageLocation(QDesktopServices::TempLocation)) LAMEXP_MAKE_OPTION_S(customTempPath, QDesktopServices::storageLocation(QDesktopServices::TempLocation))
LAMEXP_MAKE_OPTION_B(customTempPathEnabled, false) LAMEXP_MAKE_OPTION_B(customTempPathEnabled, false)
LAMEXP_MAKE_OPTION_B(disableTrayIcon, true)
LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled, true) LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled, true)
LAMEXP_MAKE_OPTION_I(dropBoxWidgetPositionX, -1) LAMEXP_MAKE_OPTION_I(dropBoxWidgetPositionX, -1)
LAMEXP_MAKE_OPTION_I(dropBoxWidgetPositionY, -1) LAMEXP_MAKE_OPTION_I(dropBoxWidgetPositionY, -1)

1
src/Model_Settings.h
View File

@ -164,6 +164,7 @@ public:
LAMEXP_MAKE_OPTION_S(customParametersWave) LAMEXP_MAKE_OPTION_S(customParametersWave)
LAMEXP_MAKE_OPTION_S(customTempPath) LAMEXP_MAKE_OPTION_S(customTempPath)
LAMEXP_MAKE_OPTION_B(customTempPathEnabled) LAMEXP_MAKE_OPTION_B(customTempPathEnabled)
LAMEXP_MAKE_OPTION_B(disableTrayIcon)
LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled) LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled)
LAMEXP_MAKE_OPTION_I(dropBoxWidgetPositionX) LAMEXP_MAKE_OPTION_I(dropBoxWidgetPositionX)
LAMEXP_MAKE_OPTION_I(dropBoxWidgetPositionY) LAMEXP_MAKE_OPTION_I(dropBoxWidgetPositionY)