FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress in implementing auto-start on Windows, Linux remains.

Browse Source
This commit is contained in:
Martin Rotter 2013-06-24 18:40:13 +02:00
parent 3cf6a90d50
commit 9e5b205caa
2 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/core/systemfactory.cpp
View File

@ -1,6 +1,11 @@
#include <QString> #include <QString>
#include <QFile> #include <QFile>
#if defined(Q_OS_WIN)
#include <QSettings>
#include "qtsingleapplication/qtsingleapplication.h"
#endif
#include "core/systemfactory.h" #include "core/systemfactory.h"
#include "core/defs.h" #include "core/defs.h"
@ -11,9 +16,12 @@ SystemFactory::SystemFactory() {
SystemFactory::AutoStartStatus SystemFactory::getAutoStartStatus() { SystemFactory::AutoStartStatus SystemFactory::getAutoStartStatus() {
// User registry way to auto-start the application on Windows. // User registry way to auto-start the application on Windows.
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
QSettings sett("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat); QSettings registr_key("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run",
bool autostart_enabled = sett.value(APP_LOW_NAME, QSettings::NativeFormat);
"").toString().replace('\\', '/') == QApplication::applicationFilePath(); bool autostart_enabled = registr_key.value(APP_LOW_NAME,
"").toString().replace('\\',
'/') ==
QtSingleApplication::applicationFilePath();
if (autostart_enabled) { if (autostart_enabled) {
return SystemFactory::Enabled; return SystemFactory::Enabled;
@ -65,30 +73,36 @@ SystemFactory::AutoStartStatus SystemFactory::getAutoStartStatus() {
bool SystemFactory::setAutoStartStatus(const AutoStartStatus &new_status) { bool SystemFactory::setAutoStartStatus(const AutoStartStatus &new_status) {
SystemFactory::AutoStartStatus current_status = SystemFactory::getAutoStartStatus(); SystemFactory::AutoStartStatus current_status = SystemFactory::getAutoStartStatus();
// Auto-start feature is not even available, exit.
if (current_status == SystemFactory::Unavailable) { if (current_status == SystemFactory::Unavailable) {
return false; return false;
} }
#if defined(Q_OS_WIN)
QSettings registy_key("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run",
QSettings::NativeFormat);
switch (new_status) { switch (new_status) {
case SystemFactory::Enabled: case SystemFactory::Enabled:
#if defined(Q_OS_WIN) registy_key.setValue(APP_LOW_NAME,
QtSingleApplication::applicationFilePath().replace('/', '\\'));
return true;
case SystemFactory::Disabled:
registy_key.remove(APP_LOW_NAME);
return true;
default:
return false;
}
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX)
switch (new_status) {
case SystemFactory::Enabled:
#else
#endif
break; break;
case SystemFactory::Disabled: case SystemFactory::Disabled:
#if defined(Q_OS_WIN)
#elif defined(Q_OS_LINUX)
#else
#endif
break; break;
default: default:
return false; return false;
} }
#else
return false;
#endif
} }

16
src/gui/formsettings.cpp
View File

@ -53,20 +53,16 @@ void FormSettings::loadGeneral() {
} }
void FormSettings::saveGeneral() { void FormSettings::saveGeneral() {
// Save auto-start on Windows. // If auto-start feature is available and user wants
#if defined(Q_OS_WIN) // to turn it on, then turn it on.
QSettings sett("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat); if (SystemFactory::getAutoStartStatus() != SystemFactory::Unavailable) {
if (m_ui->m_checkAutostart->isChecked()) { if (m_ui->m_checkAutostart->isChecked()) {
sett.setValue(APP_LOW_NAME, QApplication::applicationFilePath().replace('/', '\\')); SystemFactory::setAutoStartStatus(SystemFactory::Enabled);
} }
else { else {
sett.remove(APP_LOW_NAME); SystemFactory::setAutoStartStatus(SystemFactory::Disabled);
}
} }
// Save auto-start on Linux.
#elif defined(Q_OS_LINUX)
#endif
} }
void FormSettings::loadInterface() { void FormSettings::loadInterface() {