|
|
@ -107,10 +107,6 @@ |
|
|
|
#include "programupdater.h" |
|
|
|
#include "programupdater.h" |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
#ifdef Q_OS_MAC |
|
|
|
|
|
|
|
void qt_mac_set_dock_menu(QMenu *menu); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define TIME_TRAY_BALLOON 5000 |
|
|
|
#define TIME_TRAY_BALLOON 5000 |
|
|
|
#define PREVENT_SUSPEND_INTERVAL 60000 |
|
|
|
#define PREVENT_SUSPEND_INTERVAL 60000 |
|
|
|
|
|
|
|
|
|
|
@ -469,7 +465,7 @@ MainWindow::MainWindow(QWidget *parent) |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
#ifdef Q_OS_MAC |
|
|
|
#ifdef Q_OS_MAC |
|
|
|
setupDockClickHandler(); |
|
|
|
setupDockClickHandler(); |
|
|
|
qt_mac_set_dock_menu(trayIconMenu()); |
|
|
|
trayIconMenu()->setAsDockMenu(); |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1815,7 +1811,6 @@ void MainWindow::on_actionDownloadFromURL_triggered() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#if defined(Q_OS_WIN) || defined(Q_OS_MAC) |
|
|
|
#if defined(Q_OS_WIN) || defined(Q_OS_MAC) |
|
|
|
|
|
|
|
|
|
|
|
void MainWindow::handleUpdateCheckFinished(bool updateAvailable, QString newVersion, bool invokedByUser) |
|
|
|
void MainWindow::handleUpdateCheckFinished(bool updateAvailable, QString newVersion, bool invokedByUser) |
|
|
|
{ |
|
|
|
{ |
|
|
|
QMessageBox::StandardButton answer = QMessageBox::Yes; |
|
|
|
QMessageBox::StandardButton answer = QMessageBox::Yes; |
|
|
|