easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed wrong build info define names

Browse Source 
Tray popup delay is now only applied the first time
This commit is contained in:
Xian Nox
2013-12-18 21:21:19 +01:00
parent 3f9e82ebf8
commit 8e92fcda21
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mainwidget.cpp
View File

@@ -36,6 +36,8 @@
const QStringList MainWidget::path_list = QStringList() << "photoPath" << "musicPath" << "videoPath" << "appsPath" << "urlPath"; const QStringList MainWidget::path_list = QStringList() << "photoPath" << "musicPath" << "videoPath" << "appsPath" << "urlPath";
bool sleptOnce = false;
MainWidget::MainWidget(QWidget *parent) : MainWidget::MainWidget(QWidget *parent) :
QWidget(parent) QWidget(parent)
{ {
@@ -137,7 +139,7 @@ void MainWidget::showAboutDialog()
#ifndef QCMA_BUILD_HASH #ifndef QCMA_BUILD_HASH
about.setInformativeText(tr("Copyright (C) 2013 Codestation") + "\n"); about.setInformativeText(tr("Copyright (C) 2013 Codestation") + "\n");
#else #else
about.setInformativeText(tr("Copyright (C) 2013 Codestation\n\nbuild hash: %1\nbuild branch: %2").arg(BUILD_HASH).arg(BUILD_BRANCH)); about.setInformativeText(tr("Copyright (C) 2013 Codestation\n\nbuild hash: %1\nbuild branch: %2").arg(QCMA_BUILD_HASH).arg(QCMA_BUILD_BRANCH));
#endif #endif
about.setStandardButtons(QMessageBox::Ok); about.setStandardButtons(QMessageBox::Ok);
about.setIconPixmap(QPixmap(":/main/resources/images/qcma.png")); about.setIconPixmap(QPixmap(":/main/resources/images/qcma.png"));
@@ -199,7 +201,11 @@ void MainWidget::receiveMessage(QString message)
{ {
// a timeout is added before the popups are displayed to prevent them from // a timeout is added before the popups are displayed to prevent them from
// appearing in the wrong location // appearing in the wrong location
Sleeper::msleep(500); if(!sleptOnce) {
Sleeper::sleep(1);
sleptOnce = true;
}
if(trayIcon->isVisible()) { if(trayIcon->isVisible()) {
trayIcon->showMessage(tr("Information"), message); trayIcon->showMessage(tr("Information"), message);
} }