From 1dbd947bc1af8019da44c95a8ec7512f176f443d Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 7 Jul 2013 15:17:25 +0200 Subject: [PATCH] Added base network access manager class. --- CMakeLists.txt | 2 ++ src/core/basenetworkaccessmanager.cpp | 6 ++++++ src/core/basenetworkaccessmanager.h | 18 ++++++++++++++++++ src/core/defs.h.in | 1 + src/core/systemfactory.cpp | 1 - src/gui/formabout.cpp | 4 +++- src/gui/formmain.cpp | 4 +++- src/gui/formsettings.cpp | 15 +++++---------- src/main.cpp | 5 +---- 9 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 src/core/basenetworkaccessmanager.cpp create mode 100644 src/core/basenetworkaccessmanager.h diff --git a/CMakeLists.txt b/CMakeLists.txt index c0c99227f..ddc955420 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,6 +175,7 @@ set(APP_SOURCES src/core/datetime.cpp src/core/localization.cpp src/core/dynamicshortcuts.cpp + src/core/basenetworkaccessmanager.cpp # Basic application sources. src/main.cpp @@ -200,6 +201,7 @@ set(APP_HEADERS src/gui/dynamicshortcutswidget.h # CORE headers. + src/core/basenetworkaccessmanager.h ) # Add form files. diff --git a/src/core/basenetworkaccessmanager.cpp b/src/core/basenetworkaccessmanager.cpp new file mode 100644 index 000000000..e68f5e1d1 --- /dev/null +++ b/src/core/basenetworkaccessmanager.cpp @@ -0,0 +1,6 @@ +#include "core/basenetworkaccessmanager.h" + + +BaseNetworkAccessManager::BaseNetworkAccessManager(QObject *parent) + : QNetworkAccessManager(parent) { +} diff --git a/src/core/basenetworkaccessmanager.h b/src/core/basenetworkaccessmanager.h new file mode 100644 index 000000000..8780f6a1a --- /dev/null +++ b/src/core/basenetworkaccessmanager.h @@ -0,0 +1,18 @@ +#ifndef BASENETWORKACCESSMANAGER_H +#define BASENETWORKACCESSMANAGER_H + +#include + + +class BaseNetworkAccessManager : public QNetworkAccessManager { + Q_OBJECT + public: + explicit BaseNetworkAccessManager(QObject *parent = 0); + + signals: + + public slots: + +}; + +#endif // BASENETWORKACCESSMANAGER_H diff --git a/src/core/defs.h.in b/src/core/defs.h.in index 236bd415d..f3f0ec1ba 100644 --- a/src/core/defs.h.in +++ b/src/core/defs.h.in @@ -17,6 +17,7 @@ #define APP_CFG_PATH "data/config/config.ini" #define APP_CFG_GUI "gui" #define APP_CFG_GEN "main" +#define APP_CFG_PROXY "proxy" #define APP_CFG_CUTS "keyboard" #define APP_DB_PATH "data/storage/database.db" diff --git a/src/core/systemfactory.cpp b/src/core/systemfactory.cpp index eb3c7c414..736492399 100644 --- a/src/core/systemfactory.cpp +++ b/src/core/systemfactory.cpp @@ -80,7 +80,6 @@ QString SystemFactory::getAutostartDesktopFileLocation() { } #endif -// TODO: Finish implementation of SystemFactory auto-start methods. bool SystemFactory::setAutoStartStatus(const AutoStartStatus &new_status) { SystemFactory::AutoStartStatus current_status = SystemFactory::getAutoStartStatus(); diff --git a/src/gui/formabout.cpp b/src/gui/formabout.cpp index b89a988a1..48b1df420 100644 --- a/src/gui/formabout.cpp +++ b/src/gui/formabout.cpp @@ -3,6 +3,7 @@ #include "core/datetime.h" #include "gui/formabout.h" +#include "gui/themefactory.h" FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) { @@ -10,6 +11,7 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) // Set flags and attributes. setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog); + setWindowIcon(ThemeFactory::fromTheme("help-about")); m_ui->m_lblIcon->setPixmap(QPixmap(APP_ICON_PATH)); // Load information from embedded text files. @@ -74,7 +76,7 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) "" "You can obtain source code for Qonverter from its website." - "


Copyright 2011-%1 Martin Rotter").arg(QDateTime::currentDateTime().date().year())); + "


Copyright © 2011-%1 Martin Rotter").arg(QDateTime::currentDateTime().date().year())); } FormAbout::~FormAbout() { diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index c502977cf..f59e3065a 100644 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -67,7 +67,6 @@ void FormMain::prepareMenus() { } void FormMain::processExecutionMessage(const QString &message) { - // TODO: Implement proper reaction when application is launched more than once. qDebug("Received '%s' execution message from another application instance.", qPrintable(message)); display(); @@ -119,6 +118,9 @@ void FormMain::setupIcons() { // NOTE: Call QIcon::fromTheme for all needed widgets here. m_ui->m_actionSettings->setIcon(ThemeFactory::fromTheme("preferences-system")); m_ui->m_actionQuit->setIcon(ThemeFactory::fromTheme("application-exit")); + m_ui->m_actionAboutGuard->setIcon(ThemeFactory::fromTheme("help-about")); + m_ui->m_actionImport->setIcon(ThemeFactory::fromTheme("document-import")); + m_ui->m_actionExport->setIcon(ThemeFactory::fromTheme("document-export")); } void FormMain::createConnections() { diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index 794fdf0ff..208918cb2 100644 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -67,16 +67,11 @@ void FormSettings::onProxyTypeChanged(int index) { QNetworkProxy::ProxyType selected_type = static_cast(m_ui->m_cmbProxyType->itemData(index).toInt()); bool is_proxy_selected = selected_type != QNetworkProxy::NoProxy; - m_ui->m_txtProxyHost->setVisible(is_proxy_selected); - m_ui->m_txtProxyPassword->setVisible(is_proxy_selected); - m_ui->m_txtProxyUsername->setVisible(is_proxy_selected); - m_ui->m_spinProxyPort->setVisible(is_proxy_selected); - m_ui->m_lblProxyHost->setVisible(is_proxy_selected); - m_ui->m_lblProxyInfo->setVisible(is_proxy_selected); - m_ui->m_lblProxyPassword->setVisible(is_proxy_selected); - m_ui->m_lblProxyPort->setVisible(is_proxy_selected); - m_ui->m_lblProxyUsername->setVisible(is_proxy_selected); - m_ui->m_checkShowPassword->setVisible(is_proxy_selected); + m_ui->m_txtProxyHost->setEnabled(is_proxy_selected); + m_ui->m_txtProxyPassword->setEnabled(is_proxy_selected); + m_ui->m_txtProxyUsername->setEnabled(is_proxy_selected); + m_ui->m_spinProxyPort->setEnabled(is_proxy_selected); + m_ui->m_checkShowPassword->setEnabled(is_proxy_selected); } void FormSettings::loadProxy() { diff --git a/src/main.cpp b/src/main.cpp index 469e20840..5ef06bfd2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -43,10 +43,7 @@ int main(int argc, char *argv[]) { // Setup debug output system. qInstallMessageHandler(Debugging::debugHandler); - // TODO: Finish implementation of QtSingleApplication into RSS Guard. - // This primarily concerns slot in FormMain which reacts when application is launched - // repeatedly. See 'trivial' example from QtSingleApplication source code for more - // information. + // Instantiate base application object. QtSingleApplication application(argc, argv); qDebug("Instantiated QtSingleApplication class.");