diff --git a/mainwidget.cpp b/mainwidget.cpp index 17f940c..08d68e7 100644 --- a/mainwidget.cpp +++ b/mainwidget.cpp @@ -129,7 +129,11 @@ void MainWidget::createTrayIcon() trayIcon = new QSystemTrayIcon(this); trayIcon->setContextMenu(trayIconMenu); +#ifndef Q_OS_WIN32 trayIcon->setIcon(QIcon(":/main/resources/psv_icon.png")); +#else + trayIcon->setIcon(QIcon(":/main/resources/psv_icon_16.png")); +#endif trayIcon->show(); // try to avoid the iconTray Qt bug Sleeper::sleep(1); diff --git a/qcma.pro b/qcma.pro index 4c9ec1f..31aab85 100644 --- a/qcma.pro +++ b/qcma.pro @@ -67,7 +67,8 @@ OTHER_FILES += \ resources/psp2-updatelist.xml \ resources/psv_icon.png \ README.md \ - qcma.desktop + qcma.desktop \ + qcma.rc FORMS += \ configwidget.ui \ @@ -96,3 +97,5 @@ unix { target.path = $$BINDIR INSTALLS += target desktop icon64 } + +win32:RC_FILE = qcma.rc diff --git a/qcma.rc b/qcma.rc new file mode 100644 index 0000000..0a048b1 --- /dev/null +++ b/qcma.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "resources/qcma.ico" diff --git a/qcmares.qrc b/qcmares.qrc index d49c186..2475b76 100644 --- a/qcmares.qrc +++ b/qcmares.qrc @@ -3,5 +3,6 @@ resources/psp2-updatelist.xml resources/psv_icon.png resources/translations/qcma.es.qm + resources/psv_icon_16.png diff --git a/resources/psv_icon_16.png b/resources/psv_icon_16.png new file mode 100644 index 0000000..1784d0a Binary files /dev/null and b/resources/psv_icon_16.png differ diff --git a/utils.cpp b/utils.cpp index db134a4..6647340 100644 --- a/utils.cpp +++ b/utils.cpp @@ -35,7 +35,7 @@ bool getDiskSpace(const QString &dir, quint64 *free, quint64 *total) { #ifdef Q_OS_WIN32 - if(GetDiskFreeSpaceExW(dir.toStdWString().c_str(), free, total, NULL) != 0) { + if(GetDiskFreeSpaceEx(dir.toStdWString().c_str(), (ULARGE_INTEGER *)free, (ULARGE_INTEGER *)total, NULL) != 0) { return true; }