OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

LameXP: Commit

LameXP development repository


Commit MetaInfo

Revision2864478b001688d3563ade9fe27e7af5834afca3 (tree)
Zeit2021-12-24 03:14:25
AutorLoRd_MuldeR <mulder2@gmx....>
CommiterLoRd_MuldeR

Log Message

Improved loading of icon files.

Ändern Zusammenfassung

Diff

--- a/src/Dialog_Processing.cpp
+++ b/src/Dialog_Processing.cpp
@@ -193,6 +193,12 @@ ProcessingDialog::ProcessingDialog(FileListModel *const fileListModel, const Aud
193193 ui->label_headerWorking->setMovie(m_progressIndicator.data());
194194 ui->progressBar->setValue(0);
195195
196+ //Load overlay icons
197+ m_iconRunning.reset(new QIcon(":/icons/control_play_blue.png"));
198+ m_iconError.reset (new QIcon(":/icons/error.png"));
199+ m_iconWarning.reset(new QIcon(":/icons/exclamation.png"));
200+ m_iconSuccess.reset(new QIcon(":/icons/accept.png"));
201+
196202 //Init progress model
197203 m_progressModel.reset(new ProgressModel());
198204 ui->view_log->setModel(m_progressModel.data());
@@ -491,10 +497,9 @@ void ProcessingDialog::initEncoding(void)
491497 ui->checkBox_shutdownComputer->setEnabled(true);
492498 ui->checkBox_shutdownComputer->setChecked(false);
493499
494- QIcon defaultIcon(":/icons/control_play_blue.png");
495500 m_taskbar->setTaskbarState(MUtils::Taskbar7::TASKBAR_STATE_NORMAL);
496501 m_taskbar->setTaskbarProgress(0, m_pendingJobs.count());
497- m_taskbar->setOverlayIcon(&defaultIcon);
502+ m_taskbar->setOverlayIcon(m_iconRunning.data());
498503
499504 if(!m_diskObserver)
500505 {
@@ -693,10 +698,9 @@ void ProcessingDialog::doneEncoding(void)
693698
694699 if(m_userAborted)
695700 {
696- QIcon errorIcon(":/icons/error.png");
697701 CHANGE_BACKGROUND_COLOR(ui->frame_header, QColor("#FFFFE0"));
698702 m_taskbar->setTaskbarState(MUtils::Taskbar7::TASKBAR_STATE_ERROR);
699- m_taskbar->setOverlayIcon(&errorIcon);
703+ m_taskbar->setOverlayIcon(m_iconError.data());
700704 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!"));
701705 m_systemTray->showMessage(tr("LameXP - Aborted"), tr("Process was aborted by the user."), QSystemTrayIcon::Warning);
702706 m_systemTray->setIcon(QIcon(":/icons/cd_delete.png"));
@@ -713,10 +717,9 @@ void ProcessingDialog::doneEncoding(void)
713717
714718 if(m_failedJobs.count() > 0)
715719 {
716- QIcon warningIcon(":/icons/exclamation.png");
717720 CHANGE_BACKGROUND_COLOR(ui->frame_header, QColor("#FFF0F0"));
718721 m_taskbar->setTaskbarState(MUtils::Taskbar7::TASKBAR_STATE_ERROR);
719- m_taskbar->setOverlayIcon(&warningIcon);
722+ m_taskbar->setOverlayIcon(m_iconWarning.data());
720723 if(m_skippedJobs.count() > 0)
721724 {
722725 SET_PROGRESS_TEXT(tr("Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!", "", m_failedJobs.count() + m_succeededJobs.count() + m_skippedJobs.count()).arg(QString::number(m_failedJobs.count()), tr("%n file(s) skipped", "", m_skippedJobs.count())));
@@ -732,10 +735,9 @@ void ProcessingDialog::doneEncoding(void)
732735 }
733736 else
734737 {
735- QIcon successIcon(":/icons/accept.png");
736738 CHANGE_BACKGROUND_COLOR(ui->frame_header, QColor("#F0FFF0"));
737739 m_taskbar->setTaskbarState(MUtils::Taskbar7::TASKBAR_STATE_NORMAL);
738- m_taskbar->setOverlayIcon(&successIcon);
740+ m_taskbar->setOverlayIcon(m_iconSuccess.data());
739741 if(m_skippedJobs.count() > 0)
740742 {
741743 SET_PROGRESS_TEXT(tr("All files completed successfully. Skipped %n file(s).", "", m_skippedJobs.count()));
--- a/src/Dialog_Processing.h
+++ b/src/Dialog_Processing.h
@@ -146,6 +146,10 @@ private:
146146 QScopedPointer<QColor> m_defaultColor;
147147 QScopedPointer<FileExtsModel> m_fileExts;
148148 QScopedPointer<MUtils::Taskbar7> m_taskbar;
149+ QScopedPointer<QIcon> m_iconRunning;
150+ QScopedPointer<QIcon> m_iconError;
151+ QScopedPointer<QIcon> m_iconWarning;
152+ QScopedPointer<QIcon> m_iconSuccess;
149153
150154 static bool isFastSeekingDevice(const QString &path);
151155 static quint32 cores2instances(const quint32 &cores);
--- a/src/Dialog_Update.cpp
+++ b/src/Dialog_Update.cpp
@@ -55,7 +55,7 @@
5555 #define SHOW_HINT(TEXT, ICON) do \
5656 { \
5757 ui->hintLabel->setText((TEXT)); \
58- ui->hintIcon->setPixmap(QIcon((ICON)).pixmap(16,16)); \
58+ ui->hintIcon->setPixmap((ICON)->pixmap(16,16)); \
5959 ui->hintIcon->show(); \
6060 ui->hintLabel->show(); \
6161 } \
@@ -63,9 +63,8 @@ while(0)
6363
6464 #define UPDATE_TASKBAR(STATE, ICON) do \
6565 { \
66- QIcon _icon((ICON)); \
6766 m_taskbar->setTaskbarState((STATE)); \
68- m_taskbar->setOverlayIcon(&_icon); \
67+ m_taskbar->setOverlayIcon((ICON).data()); \
6968 } \
7069 while(0)
7170
@@ -100,6 +99,16 @@ UpdateDialog::UpdateDialog(const SettingsModel *const settings, QWidget *parent)
10099 //Disable "X" button
101100 MUtils::GUI::enable_close_button(this, false);
102101
102+ //Load the icons
103+ m_iconTransmitting.reset (new QIcon(":/icons/transmit_blue.png"));
104+ m_iconFailure.reset (new QIcon(":/icons/exclamation.png"));
105+ m_iconUpdateAvailable.reset(new QIcon(":/icons/shield_exclamation.png"));
106+ m_iconNoUpdates.reset (new QIcon(":/icons/shield_green.png"));
107+ m_iconNewVersionOlder.reset(new QIcon(":/icons/shield_blue.png"));
108+ m_iconVersionError.reset (new QIcon(":/icons/shield_error.png"));
109+ m_iconNetworkError.reset (new QIcon(":/icons/network_error.png"));
110+ m_iconServerError.reset (new QIcon(":/icons/server_error.png"));
111+
103112 //Init animation
104113 m_animator.reset(new QMovie(":/images/Loading3.gif"));
105114 ui->labelAnimationCenter->setMovie(m_animator.data());
@@ -259,9 +268,8 @@ void UpdateDialog::checkForUpdates(void)
259268 }
260269 }
261270
262- QIcon defaultIcon(":/icons/transmit_blue.png");
263271 m_taskbar->setTaskbarState(MUtils::Taskbar7::TASKBAR_STATE_NORMAL);
264- m_taskbar->setOverlayIcon(&defaultIcon);
272+ m_taskbar->setOverlayIcon(m_iconTransmitting.data());
265273
266274 ui->progressBar->setValue(0);
267275 ui->installButton->setEnabled(false);
@@ -296,38 +304,38 @@ void UpdateDialog::threadStatusChanged(const int status)
296304 break;
297305 case MUtils::UpdateChecker::UpdateStatus_CompletedUpdateAvailable:
298306 ui->statusLabel->setText(tr("A new version of LameXP is available!"));
299- SHOW_HINT(tr("We highly recommend all users to install this update as soon as possible."), ":/icons/shield_exclamation.png");
300- UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, ":/icons/shield_exclamation.png");
307+ SHOW_HINT(tr("We highly recommend all users to install this update as soon as possible."), m_iconUpdateAvailable);
308+ UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, m_iconUpdateAvailable);
301309 break;
302310 case MUtils::UpdateChecker::UpdateStatus_CompletedNoUpdates:
303311 ui->statusLabel->setText(tr("No new updates available at this time."));
304- SHOW_HINT(tr("Your version of LameXP is still up-to-date. Please check for updates regularly!"), ":/icons/shield_green.png");
305- UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, ":/icons/shield_green.png");
312+ SHOW_HINT(tr("Your version of LameXP is still up-to-date. Please check for updates regularly!"), m_iconNoUpdates);
313+ UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, m_iconNoUpdates);
306314 break;
307315 case MUtils::UpdateChecker::UpdateStatus_CompletedNewVersionOlder:
308316 ui->statusLabel->setText(tr("Your version appears to be newer than the latest release."));
309- SHOW_HINT(tr("This usually indicates your are currently using a pre-release version of LameXP."), ":/icons/shield_blue.png");
310- UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, ":/icons/shield_error.png");
317+ SHOW_HINT(tr("This usually indicates your are currently using a pre-release version of LameXP."), m_iconNewVersionOlder);
318+ UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, m_iconVersionError);
311319 break;
312320 case MUtils::UpdateChecker::UpdateStatus_ErrorNoConnection:
313321 ui->statusLabel->setText(tr("It appears that the computer currently is offline!"));
314- SHOW_HINT(tr("Please make sure your computer is connected to the internet and try again."), ":/icons/network_error.png");
315- UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, ":/icons/exclamation.png");
322+ SHOW_HINT(tr("Please make sure your computer is connected to the internet and try again."), m_iconNetworkError);
323+ UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, m_iconFailure);
316324 break;
317325 case MUtils::UpdateChecker::UpdateStatus_ErrorConnectionTestFailed:
318326 ui->statusLabel->setText(tr("Network connectivity test has failed!"));
319- SHOW_HINT(tr("Please make sure your computer is connected to the internet and try again."), ":/icons/network_error.png");
320- UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, ":/icons/exclamation.png");
327+ SHOW_HINT(tr("Please make sure your computer is connected to the internet and try again."), m_iconNetworkError);
328+ UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, m_iconFailure);
321329 break;
322330 case MUtils::UpdateChecker::UpdateStatus_ErrorFetchUpdateInfo:
323331 ui->statusLabel->setText(tr("Failed to fetch update information from server!"));
324- SHOW_HINT(tr("Sorry, the update server might be busy at this time. Plase try again later."), ":/icons/server_error.png");
325- UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, ":/icons/exclamation.png");
332+ SHOW_HINT(tr("Sorry, the update server might be busy at this time. Plase try again later."), m_iconNetworkError);
333+ UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, m_iconFailure);
326334 break;
327335 case MUtils::UpdateChecker::UpdateStatus_CancelledByUser:
328336 ui->statusLabel->setText(tr("Update check has been cancelled!"));
329- SHOW_HINT(tr("The update check has been cancelled by the user. Please try again later."), ":/icons/server_error.png");
330- UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, ":/icons/exclamation.png");
337+ SHOW_HINT(tr("The update check has been cancelled by the user. Please try again later."), m_iconServerError);
338+ UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_NORMAL, m_iconFailure);
331339 break;
332340 default:
333341 qWarning("Unknown status %d !!!", int(status));
@@ -422,7 +430,7 @@ void UpdateDialog::applyUpdate(void)
422430 args << QString("/AppTitle=LameXP (Build #%1)").arg(QString::number(updateInfo->getBuildNo()));
423431
424432 QApplication::setOverrideCursor(Qt::WaitCursor);
425- UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_INTERMEDIATE, ":/icons/transmit_blue.png");
433+ UPDATE_TASKBAR(MUtils::Taskbar7::TASKBAR_STATE_INTERMEDIATE, m_iconTransmitting);
426434
427435 process.start(m_binaryUpdater, args);
428436 bool updateStarted = process.waitForStarted();
@@ -451,10 +459,9 @@ void UpdateDialog::applyUpdate(void)
451459 }
452460 else
453461 {
454- QIcon warningIcon(":/icons/exclamation.png");
455462 ui->statusLabel->setText(tr("Update failed. Please try again or download manually!"));
456463 m_taskbar->setTaskbarState(MUtils::Taskbar7::TASKBAR_STATE_ERROR);
457- m_taskbar->setOverlayIcon(&warningIcon);
464+ m_taskbar->setOverlayIcon(m_iconFailure.data());
458465 m_taskbar->setTaskbarProgress(100, 100);
459466 }
460467 }
--- a/src/Dialog_Update.h
+++ b/src/Dialog_Update.h
@@ -87,6 +87,15 @@ private:
8787 QScopedPointer<QStringList> m_logFile;
8888 QScopedPointer<QMovie> m_animator;
8989
90+ QScopedPointer<QIcon> m_iconTransmitting;
91+ QScopedPointer<QIcon> m_iconFailure;
92+ QScopedPointer<QIcon> m_iconUpdateAvailable;
93+ QScopedPointer<QIcon> m_iconNoUpdates;
94+ QScopedPointer<QIcon> m_iconNewVersionOlder;
95+ QScopedPointer<QIcon> m_iconVersionError;
96+ QScopedPointer<QIcon> m_iconNetworkError;
97+ QScopedPointer<QIcon> m_iconServerError;
98+
9099 unsigned long m_updaterProcess;
91100
92101 bool m_success;
--- a/src/Dialog_WorkingBanner.cpp
+++ b/src/Dialog_WorkingBanner.cpp
@@ -85,6 +85,7 @@ WorkingBanner::WorkingBanner(QWidget *parent)
8585 :
8686 QDialog(parent, Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint),
8787 ui(new Ui::WorkingBanner()),
88+ m_iconHourglass(new QIcon(":/icons/hourglass.png")),
8889 m_taskbar(new MUtils::Taskbar7(parent)),
8990 m_metrics(NULL), m_working(NULL), m_style(NULL)
9091 {
@@ -162,8 +163,7 @@ void WorkingBanner::show(const QString &text, QThread *thread)
162163 connect(thread, SIGNAL(terminated()), loop, SLOT(quit()));
163164
164165 //Set taskbar state
165- QIcon waitingIcon(":/icons/hourglass.png");
166- m_taskbar->setOverlayIcon(&waitingIcon);
166+ m_taskbar->setOverlayIcon(m_iconHourglass.data());
167167 m_taskbar->setTaskbarState(MUtils::Taskbar7::TASKBAR_STATE_INTERMEDIATE);
168168
169169 //Start the thread
@@ -198,8 +198,7 @@ void WorkingBanner::show(const QString &text, QEventLoop *loop)
198198 this->show(text);
199199
200200 //Set taskbar state
201- QIcon waitingIcon(":/icons/hourglass.png");
202- m_taskbar->setOverlayIcon(&waitingIcon);
201+ m_taskbar->setOverlayIcon(m_iconHourglass.data());
203202 m_taskbar->setTaskbarState(MUtils::Taskbar7::TASKBAR_STATE_INTERMEDIATE);
204203
205204 //Update cursor
--- a/src/Dialog_WorkingBanner.h
+++ b/src/Dialog_WorkingBanner.h
@@ -79,4 +79,5 @@ protected:
7979
8080 QScopedPointer<QFontMetrics> m_metrics;
8181 QScopedPointer<QStyle> m_style;
82+ QScopedPointer<QIcon> m_iconHourglass;
8283 };
Show on old repository browser