refactoring, moved some files

resources/desktop/com.github.rssguard.appdata.xml

@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.9.0" date="2021-04-13"/>
+    <release version="3.9.0" date="2021-04-14"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>

resources/scripts/7za

@@ -1 +1 @@
-Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749
+Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9

src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h

@@ -16,7 +16,7 @@ class DynamicShortcutsWidget : public QWidget {
   public:
 
     // Constructors and destructors.
-    explicit DynamicShortcutsWidget(QWidget* parent = 0);
+    explicit DynamicShortcutsWidget(QWidget* parent = nullptr);
     virtual ~DynamicShortcutsWidget();
 
     // Updates shortcuts of all actions according to changes.
@@ -40,7 +40,6 @@ class DynamicShortcutsWidget : public QWidget {
 
   private:
     QGridLayout* m_layout;
-
     QList<ActionBinding> m_actionBindings;
 };
 

src/librssguard/dynamic-shortcuts/shortcutcatcher.cpp

@@ -2,7 +2,7 @@
 
 #include "dynamic-shortcuts/shortcutcatcher.h"
 
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 #include "miscellaneous/iconfactory.h"
 
 #include <QHBoxLayout>

src/librssguard/dynamic-shortcuts/shortcutcatcher.h

@@ -5,8 +5,8 @@
 
 #include <QWidget>
 
-class QHBoxLayout;
 class PlainToolButton;
+class QHBoxLayout;
 class QKeySequenceEdit;
 
 class ShortcutCatcher : public QWidget {

src/librssguard/gui/dialogs/formaddaccount.h

@@ -14,7 +14,7 @@ class FormAddAccount : public QDialog {
   Q_OBJECT
 
   public:
-    explicit FormAddAccount(const QList<ServiceEntryPoint*>& entry_points, FeedsModel* model, QWidget* parent = 0);
+    explicit FormAddAccount(const QList<ServiceEntryPoint*>& entry_points, FeedsModel* model, QWidget* parent = nullptr);
     virtual ~FormAddAccount();
 
   private slots:

src/librssguard/gui/dialogs/formbackupdatabasesettings.h

@@ -11,9 +11,7 @@ class FormBackupDatabaseSettings : public QDialog {
   Q_OBJECT
 
   public:
-
+    explicit FormBackupDatabaseSettings(QWidget* parent = nullptr);
-    // Constructors and destructors
-    explicit FormBackupDatabaseSettings(QWidget* parent = 0);
     virtual ~FormBackupDatabaseSettings();
 
   private slots:

src/librssguard/gui/dialogs/formmain.cpp

@@ -16,7 +16,7 @@
 #include "gui/messagebox.h"
 #include "gui/messagepreviewer.h"
 #include "gui/messagesview.h"
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 #include "gui/systemtrayicon.h"
 #include "gui/tabbar.h"
 #include "gui/toolbars/feedstoolbar.h"

src/librssguard/gui/feedsview.cpp

@@ -7,7 +7,7 @@
 #include "definitions/definitions.h"
 #include "gui/dialogs/formmain.h"
 #include "gui/messagebox.h"
-#include "gui/styleditemdelegatewithoutfocus.h"
+#include "gui/reusable/styleditemdelegatewithoutfocus.h"
 #include "gui/systemtrayicon.h"
 #include "miscellaneous/feedreader.h"
 #include "miscellaneous/mutex.h"

src/librssguard/gui/messagepreviewer.cpp

@@ -5,8 +5,8 @@
 #include "database/databasequeries.h"
 #include "gui/dialogs/formmain.h"
 #include "gui/messagebox.h"
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
-#include "gui/searchtextwidget.h"
+#include "gui/reusable/searchtextwidget.h"
 #include "miscellaneous/application.h"
 #include "network-web/webfactory.h"
 #include "services/abstract/label.h"

src/librssguard/gui/messagesview.cpp

@@ -6,10 +6,10 @@
 #include "core/messagesmodel.h"
 #include "core/messagesproxymodel.h"
 #include "gui/dialogs/formmain.h"
-#include "gui/labelsmenu.h"
 #include "gui/messagebox.h"
-#include "gui/styleditemdelegatewithoutfocus.h"
+#include "gui/reusable/labelsmenu.h"
-#include "gui/treeviewcolumnsmenu.h"
+#include "gui/reusable/styleditemdelegatewithoutfocus.h"
+#include "gui/reusable/treeviewcolumnsmenu.h"
 #include "miscellaneous/externaltool.h"
 #include "miscellaneous/feedreader.h"
 #include "miscellaneous/settings.h"

src/librssguard/gui/reusable/baselineedit.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/baselineedit.h"
+#include "gui/reusable/baselineedit.h"
 
 #include <QKeyEvent>
 

src/librssguard/gui/reusable/colortoolbutton.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/colortoolbutton.h"
+#include "gui/reusable/colortoolbutton.h"
 
 #include <QColorDialog>
 #include <QPainter>

src/librssguard/gui/reusable/comboboxwithstatus.cpp

@@ -1,8 +1,8 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/comboboxwithstatus.h"
+#include "gui/reusable/comboboxwithstatus.h"
 
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 
 #include <QHBoxLayout>
 

src/librssguard/gui/reusable/comboboxwithstatus.h

@@ -3,7 +3,7 @@
 #ifndef COMBOBOXWITHSTATUS_H
 #define COMBOBOXWITHSTATUS_H
 
-#include "gui/widgetwithstatus.h"
+#include "gui/reusable/widgetwithstatus.h"
 
 #include <QComboBox>
 

src/librssguard/gui/reusable/discoverfeedsbutton.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/discoverfeedsbutton.h"
+#include "gui/reusable/discoverfeedsbutton.h"
 
 #include "core/feedsmodel.h"
 #include "gui/dialogs/formmain.h"

src/librssguard/gui/reusable/discoverfeedsbutton.h

@@ -9,18 +9,13 @@ class DiscoverFeedsButton : public QToolButton {
   Q_OBJECT
 
   public:
-
+    explicit DiscoverFeedsButton(QWidget* parent = nullptr);
-    // Constructors.
-    explicit DiscoverFeedsButton(QWidget* parent = 0);
     virtual ~DiscoverFeedsButton();
 
-    // Feed addresses manipulators.
     void clearFeedAddresses();
     void setFeedAddresses(const QStringList& addresses);
 
   private slots:
-
-    // User chose any of addresses.
     void linkTriggered(QAction* action);
     void fillMenu();
 

src/librssguard/gui/reusable/edittableview.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/edittableview.h"
+#include "gui/reusable/edittableview.h"
 
 #include <QKeyEvent>
 

src/librssguard/gui/reusable/edittableview.h

@@ -9,7 +9,7 @@ class EditTableView : public QTableView {
   Q_OBJECT
 
   public:
-    explicit EditTableView(QWidget* parent = 0);
+    explicit EditTableView(QWidget* parent = nullptr);
 
   public slots:
     void removeSelected();

src/librssguard/gui/reusable/labelsmenu.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/labelsmenu.h"
+#include "gui/reusable/labelsmenu.h"
 
 #include "3rd-party/boolinq/boolinq.h"
 #include "database/databasequeries.h"

src/librssguard/gui/reusable/labelsmenu.h

@@ -3,7 +3,7 @@
 #ifndef LABELSMENU_H
 #define LABELSMENU_H
 
-#include "gui/nonclosablemenu.h"
+#include "gui/reusable/nonclosablemenu.h"
 
 #include "services/abstract/label.h"
 

src/librssguard/gui/reusable/labelwithstatus.cpp

@@ -1,8 +1,8 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/labelwithstatus.h"
+#include "gui/reusable/labelwithstatus.h"
 
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 
 #include <QHBoxLayout>
 

src/librssguard/gui/reusable/labelwithstatus.h

@@ -3,7 +3,7 @@
 #ifndef LABELWITHSTATUS_H
 #define LABELWITHSTATUS_H
 
-#include "gui/widgetwithstatus.h"
+#include "gui/reusable/widgetwithstatus.h"
 
 #include <QLabel>
 

src/librssguard/gui/reusable/lineeditwithstatus.cpp

@@ -1,9 +1,9 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/lineeditwithstatus.h"
+#include "gui/reusable/lineeditwithstatus.h"
 
-#include "gui/baselineedit.h"
+#include "gui/reusable/baselineedit.h"
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 
 #include <QHBoxLayout>
 

src/librssguard/gui/reusable/lineeditwithstatus.h

@@ -3,9 +3,9 @@
 #ifndef LINEEDITWITHSTATUS_H
 #define LINEEDITWITHSTATUS_H
 
-#include "gui/widgetwithstatus.h"
+#include "gui/reusable/widgetwithstatus.h"
 
-#include "gui/baselineedit.h"
+#include "gui/reusable/baselineedit.h"
 
 #include <QPlainTextEdit>
 

src/librssguard/gui/reusable/locationlineedit.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/locationlineedit.h"
+#include "gui/reusable/locationlineedit.h"
 
 #include "network-web/googlesuggest.h"
 

src/librssguard/gui/reusable/locationlineedit.h

@@ -3,7 +3,7 @@
 #ifndef LOCATIONLINEEDIT_H
 #define LOCATIONLINEEDIT_H
 
-#include "gui/baselineedit.h"
+#include "gui/reusable/baselineedit.h"
 
 class WebBrowser;
 class GoogleSuggest;
@@ -14,7 +14,7 @@ class LocationLineEdit : public BaseLineEdit {
   public:
 
     // Constructors and destructors.
-    explicit LocationLineEdit(QWidget* parent = 0);
+    explicit LocationLineEdit(QWidget* parent = nullptr);
     virtual ~LocationLineEdit();
 
   protected:

src/librssguard/gui/reusable/messagecountspinbox.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/messagecountspinbox.h"
+#include "gui/reusable/messagecountspinbox.h"
 
 #include "definitions/definitions.h"
 

src/librssguard/gui/reusable/networkproxydetails.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/networkproxydetails.h"
+#include "gui/reusable/networkproxydetails.h"
 
 #include "gui/guiutilities.h"
 

src/librssguard/gui/reusable/nonclosablemenu.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/nonclosablemenu.h"
+#include "gui/reusable/nonclosablemenu.h"
 
 #include <QKeyEvent>
 

src/librssguard/gui/reusable/plaintoolbutton.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 
 #include <QAction>
 #include <QPainter>

src/librssguard/gui/reusable/searchtextwidget.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/searchtextwidget.h"
+#include "gui/reusable/searchtextwidget.h"
 
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"

src/librssguard/gui/reusable/squeezelabel.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/squeezelabel.h"
+#include "gui/reusable/squeezelabel.h"
 
 SqueezeLabel::SqueezeLabel(QWidget* parent) : QLabel(parent) {}
 

src/librssguard/gui/reusable/styleditemdelegatewithoutfocus.cpp

@@ -1,10 +1,11 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/styleditemdelegatewithoutfocus.h"
+#include "gui/reusable/styleditemdelegatewithoutfocus.h"
 
 StyledItemDelegateWithoutFocus::StyledItemDelegateWithoutFocus(QObject* parent) : QStyledItemDelegate(parent) {}
 
-void StyledItemDelegateWithoutFocus::paint(QPainter* painter, const QStyleOptionViewItem& option,
+void StyledItemDelegateWithoutFocus::paint(QPainter* painter,
+                                           const QStyleOptionViewItem& option,
                                            const QModelIndex& index) const {
   QStyleOptionViewItem itemOption(option);
 

src/librssguard/gui/reusable/styleditemdelegatewithoutfocus.h

@@ -0,0 +1,23 @@
+// For license of this file, see <project-root-folder>/LICENSE.md.
+
+#ifndef STYLEDITEMDELEGATEWITHOUTFOCUS_H
+#define STYLEDITEMDELEGATEWITHOUTFOCUS_H
+
+#include <QStyledItemDelegate>
+
+#if QT_VERSION_MAJOR <= 5
+#include <QStyleOptionViewItemV4>
+#else
+#include <QStyleOptionViewItem>
+#endif
+
+class StyledItemDelegateWithoutFocus : public QStyledItemDelegate {
+  Q_OBJECT
+
+  public:
+    explicit StyledItemDelegateWithoutFocus(QObject* parent = nullptr);
+
+    virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+};
+
+#endif // STYLEDITEMDELEGATEWITHOUTFOCUS_H

src/librssguard/gui/reusable/timespinbox.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/timespinbox.h"
+#include "gui/reusable/timespinbox.h"
 
 #include <QStringList>
 

src/librssguard/gui/reusable/treeviewcolumnsmenu.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/treeviewcolumnsmenu.h"
+#include "gui/reusable/treeviewcolumnsmenu.h"
 
 #include <QHeaderView>
 

src/librssguard/gui/reusable/treeviewcolumnsmenu.h

@@ -3,7 +3,7 @@
 #ifndef TREEVIEWCOLUMNSMENU_H
 #define TREEVIEWCOLUMNSMENU_H
 
-#include "gui/nonclosablemenu.h"
+#include "gui/reusable/nonclosablemenu.h"
 
 class QHeaderView;
 

src/librssguard/gui/reusable/treewidget.cpp

@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
 
-#include "gui/treewidget.h"
+#include "gui/reusable/treewidget.h"
 
 #include <QMouseEvent>
 

src/librssguard/gui/reusable/treewidget.h

@@ -26,21 +26,15 @@ class TreeWidget : public QTreeWidget {
   Q_OBJECT
 
   public:
-    explicit TreeWidget(QWidget* parent = 0);
+    explicit TreeWidget(QWidget* parent = nullptr);
 
     enum class ItemShowMode {
       ItemsCollapsed = 0,
       ItemsExpanded = 1
     };
 
-    ItemShowMode defaultItemShowMode() {
+    ItemShowMode defaultItemShowMode();
-      return m_showMode;
+    void setDefaultItemShowMode(ItemShowMode mode);
-    }
-
-    void setDefaultItemShowMode(ItemShowMode mode) {
-      m_showMode = mode;
-    }
-
     QList<QTreeWidgetItem*> allItems();
 
     bool appendToParentItem(const QString& parentText, QTreeWidgetItem* item);
@@ -67,8 +61,10 @@ class TreeWidget : public QTreeWidget {
   private slots:
     void sheduleRefresh();
 
-  private:
+  protected:
     void mousePressEvent(QMouseEvent* event);
+
+  private:
     void iterateAllItems(QTreeWidgetItem* parent);
 
     bool m_refreshAllItemsNeeded;
@@ -76,4 +72,12 @@ class TreeWidget : public QTreeWidget {
     ItemShowMode m_showMode;
 };
 
+inline TreeWidget::ItemShowMode TreeWidget::defaultItemShowMode() {
+  return m_showMode;
+}
+
+inline void TreeWidget::setDefaultItemShowMode(TreeWidget::ItemShowMode mode) {
+  m_showMode = mode;
+}
+
 #endif // BOOKMARKSTREEWIDGET_H

src/librssguard/gui/reusable/widgetwithstatus.cpp

@@ -1,8 +1,8 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/widgetwithstatus.h"
+#include "gui/reusable/widgetwithstatus.h"
 
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 #include "miscellaneous/iconfactory.h"
 
 #include <QHBoxLayout>

src/librssguard/gui/settings/settingsbrowsermail.cpp

@@ -4,7 +4,7 @@
 
 #include "exceptions/applicationexception.h"
 #include "gui/guiutilities.h"
-#include "gui/networkproxydetails.h"
+#include "gui/reusable/networkproxydetails.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/externaltool.h"
 #include "miscellaneous/iconfactory.h"

src/librssguard/gui/settings/settingsbrowsermail.h

@@ -18,9 +18,9 @@ class SettingsBrowserMail : public SettingsPanel {
     explicit SettingsBrowserMail(Settings* settings, QWidget* parent = nullptr);
     virtual ~SettingsBrowserMail();
 
-    QString title() const;
+    virtual QString title() const;
-    void loadSettings();
+    virtual void loadSettings();
-    void saveSettings();
+    virtual void saveSettings();
 
   private slots:
     void addExternalTool();

src/librssguard/gui/settings/settingsdatabase.h

@@ -11,16 +11,12 @@ class SettingsDatabase : public SettingsPanel {
   Q_OBJECT
 
   public:
-    explicit SettingsDatabase(Settings* settings, QWidget* parent = 0);
+    explicit SettingsDatabase(Settings* settings, QWidget* parent = nullptr);
     virtual ~SettingsDatabase();
 
-    inline QString title() const {
+    virtual QString title() const;
-      return tr("Data storage");
+    virtual void loadSettings();
-    }
+    virtual void saveSettings();
-
-    void loadSettings();
-
-    void saveSettings();
 
   private:
     void mysqlTestConnection();
@@ -34,4 +30,8 @@ class SettingsDatabase : public SettingsPanel {
     Ui::SettingsDatabase* m_ui;
 };
 
+inline QString SettingsDatabase::title() const {
+  return tr("Data storage");
+}
+
 #endif // SETTINGSDATABASE_H

src/librssguard/gui/settings/settingsdownloads.h

@@ -11,16 +11,12 @@ class SettingsDownloads : public SettingsPanel {
   Q_OBJECT
 
   public:
-    explicit SettingsDownloads(Settings* settings, QWidget* parent = 0);
+    explicit SettingsDownloads(Settings* settings, QWidget* parent = nullptr);
     virtual ~SettingsDownloads();
 
-    inline QString title() const {
+    virtual QString title() const;
-      return tr("Downloads");
+    virtual void loadSettings();
-    }
+    virtual void saveSettings();
-
-    void loadSettings();
-
-    void saveSettings();
 
   private slots:
     void selectDownloadsDirectory();
@@ -29,4 +25,8 @@ class SettingsDownloads : public SettingsPanel {
     Ui::SettingsDownloads* m_ui;
 };
 
+inline QString SettingsDownloads::title() const {
+  return tr("Downloads");
+}
+
 #endif // SETTINGSDOWNLOADS_H

src/librssguard/gui/settings/settingsfeedsmessages.cpp

@@ -8,7 +8,7 @@
 #include "gui/feedsview.h"
 #include "gui/guiutilities.h"
 #include "gui/messagesview.h"
-#include "gui/timespinbox.h"
+#include "gui/reusable/timespinbox.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/feedreader.h"
 

src/librssguard/gui/settings/settingsfeedsmessages.h

@@ -11,16 +11,12 @@ class SettingsFeedsMessages : public SettingsPanel {
   Q_OBJECT
 
   public:
-    explicit SettingsFeedsMessages(Settings* settings, QWidget* parent = 0);
+    explicit SettingsFeedsMessages(Settings* settings, QWidget* parent = nullptr);
     virtual ~SettingsFeedsMessages();
 
-    inline QString title() const {
+    virtual QString title() const;
-      return tr("Feeds & messages");
+    virtual void loadSettings();
-    }
+    virtual void saveSettings();
-
-    void loadSettings();
-
-    void saveSettings();
 
   private:
     void changeFont(QLabel& lbl);
@@ -31,4 +27,8 @@ class SettingsFeedsMessages : public SettingsPanel {
     Ui::SettingsFeedsMessages* m_ui;
 };
 
+inline QString SettingsFeedsMessages::title() const {
+  return tr("Feeds & messages");
+}
+
 #endif // SETTINGSFEEDSMESSAGES_H

src/librssguard/gui/settings/settingsgeneral.h

@@ -11,19 +11,19 @@ class SettingsGeneral : public SettingsPanel {
   Q_OBJECT
 
   public:
-    explicit SettingsGeneral(Settings* settings, QWidget* parent = 0);
+    explicit SettingsGeneral(Settings* settings, QWidget* parent = nullptr);
     virtual ~SettingsGeneral();
 
-    inline QString title() const {
+    virtual QString title() const;
-      return tr("General");
+    virtual void loadSettings();
-    }
+    virtual void saveSettings();
-
-    void loadSettings();
-
-    void saveSettings();
 
   private:
     Ui::SettingsGeneral* m_ui;
 };
 
+inline QString SettingsGeneral::title() const {
+  return tr("General");
+}
+
 #endif // SETTINGSGENERAL_H

src/librssguard/gui/settings/settingsgui.h

@@ -11,16 +11,12 @@ class SettingsGui : public SettingsPanel {
   Q_OBJECT
 
   public:
-    explicit SettingsGui(Settings* settings, QWidget* parent = 0);
+    explicit SettingsGui(Settings* settings, QWidget* parent = nullptr);
     virtual ~SettingsGui();
 
-    inline QString title() const {
+    virtual QString title() const;
-      return tr("User interface");
+    virtual void loadSettings();
-    }
+    virtual void saveSettings();
-
-    void loadSettings();
-
-    void saveSettings();
 
   protected:
 
@@ -31,4 +27,8 @@ class SettingsGui : public SettingsPanel {
     Ui::SettingsGui* m_ui;
 };
 
+inline QString SettingsGui::title() const {
+  return tr("User interface");
+}
+
 #endif // SETTINGSGUI_H

src/librssguard/gui/settings/settingslocalization.h

@@ -11,19 +11,19 @@ class SettingsLocalization : public SettingsPanel {
   Q_OBJECT
 
   public:
-    explicit SettingsLocalization(Settings* settings, QWidget* parent = 0);
+    explicit SettingsLocalization(Settings* settings, QWidget* parent = nullptr);
     virtual ~SettingsLocalization();
 
-    inline QString title() const {
+    virtual QString title() const;
-      return tr("Language");
+    virtual void loadSettings();
-    }
+    virtual void saveSettings();
-
-    void loadSettings();
-
-    void saveSettings();
 
   private:
     Ui::SettingsLocalization* m_ui;
 };
 
+inline QString SettingsLocalization::title() const {
+  return tr("Localization");
+}
+
 #endif // SETTINGSLOCALIZATION_H

src/librssguard/gui/settings/settingspanel.h

@@ -33,11 +33,7 @@ class SettingsPanel : public QWidget {
     Settings* settings() const;
 
   protected slots:
-
-    // Sets this settings panel as dirty (some settings are changed) and emits the signal.
-    // NOTE: This will be probably called by subclasses when user changes some stuff.
     void dirtifySettings();
-
     void requireRestart();
 
   signals:

src/librssguard/gui/settings/settingsshortcuts.h

@@ -11,19 +11,19 @@ class SettingsShortcuts : public SettingsPanel {
   Q_OBJECT
 
   public:
-    explicit SettingsShortcuts(Settings* settings, QWidget* parent = 0);
+    explicit SettingsShortcuts(Settings* settings, QWidget* parent = nullptr);
     virtual ~SettingsShortcuts();
 
-    inline QString title() const {
+    virtual QString title() const;
-      return tr("Keyboard shortcuts");
+    virtual void loadSettings();
-    }
+    virtual void saveSettings();
-
-    void loadSettings();
-
-    void saveSettings();
 
   private:
     Ui::SettingsShortcuts* m_ui;
 };
 
+inline QString SettingsShortcuts::title() const {
+  return tr("Keyboard shortcuts");
+}
+
 #endif // SETTINGSSHORTCUTS_H

src/librssguard/gui/styleditemdelegatewithoutfocus.h

@@ -1,38 +0,0 @@
-// For license of this file, see <project-root-folder>/LICENSE.md.
-
-#ifndef STYLEDITEMDELEGATEWITHOUTFOCUS_H
-#define STYLEDITEMDELEGATEWITHOUTFOCUS_H
-
-#include <QStyledItemDelegate>
-
-#if QT_VERSION_MAJOR <= 5
-#include <QStyleOptionViewItemV4>
-#else
-#include <QStyleOptionViewItem>
-#endif
-
-class StyledItemDelegateWithoutFocus : public QStyledItemDelegate {
-  Q_OBJECT
-
-  public:
-    explicit StyledItemDelegateWithoutFocus(QObject* parent = nullptr);
-
-    QSize sizeHint ( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
-
-};
-
-inline QSize StyledItemDelegateWithoutFocus::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const {
-  QSize siz = QStyledItemDelegate::sizeHint(option, index);
-
-  /*   QStyleOptionViewItem opt = option;
-
-         initStyleOption(&opt, index);
-         QStyle* style = widget ? widget->style() : QApplication::style();
-
-         return style->sizeFromContents(QStyle::CT_ItemViewItem, &opt, QSize(), widget);*/
-
-  return siz;
-}
-
-#endif // STYLEDITEMDELEGATEWITHOUTFOCUS_H

src/librssguard/gui/tabbar.cpp

@@ -3,7 +3,7 @@
 #include "gui/tabbar.h"
 
 #include "definitions/definitions.h"
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 #include "miscellaneous/settings.h"
 #include "miscellaneous/templates.h"
 

src/librssguard/gui/tabwidget.cpp

@@ -8,7 +8,7 @@
 #include "gui/feedsview.h"
 #include "gui/messagesview.h"
 #include "gui/newspaperpreviewer.h"
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 #include "gui/tabbar.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"

src/librssguard/gui/toolbars/feedstoolbar.cpp

@@ -2,7 +2,7 @@
 
 #include "gui/toolbars/feedstoolbar.h"
 
-#include "gui/baselineedit.h"
+#include "gui/reusable/baselineedit.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/settings.h"

src/librssguard/gui/toolbars/messagestoolbar.cpp

@@ -3,7 +3,7 @@
 #include "gui/toolbars/messagestoolbar.h"
 
 #include "definitions/definitions.h"
-#include "gui/baselineedit.h"
+#include "gui/reusable/baselineedit.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/settings.h"
 

src/librssguard/gui/toolbars/statusbar.cpp

@@ -3,7 +3,7 @@
 #include "gui/toolbars/statusbar.h"
 
 #include "gui/dialogs/formmain.h"
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 #include "gui/tabwidget.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/mutex.h"

src/librssguard/gui/webbrowser.cpp

@@ -3,10 +3,10 @@
 #include "gui/webbrowser.h"
 
 #include "database/databasequeries.h"
-#include "gui/discoverfeedsbutton.h"
-#include "gui/locationlineedit.h"
 #include "gui/messagebox.h"
-#include "gui/searchtextwidget.h"
+#include "gui/reusable/discoverfeedsbutton.h"
+#include "gui/reusable/locationlineedit.h"
+#include "gui/reusable/searchtextwidget.h"
 #include "gui/webviewer.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"

src/librssguard/librssguard.pro

@@ -60,10 +60,10 @@ HEADERS += core/feeddownloader.h \
            exceptions/ioexception.h \
            exceptions/networkexception.h \
            exceptions/scriptexception.h \
-           gui/baselineedit.h \
+           gui/reusable/baselineedit.h \
            gui/toolbars/basetoolbar.h \
-           gui/colortoolbutton.h \
+           gui/reusable/comboboxwithstatus.h \
-           gui/comboboxwithstatus.h \
+           gui/reusable/colortoolbutton.h \
            gui/dialogs/formabout.h \
            gui/dialogs/formaddaccount.h \
            gui/dialogs/formaddeditlabel.h \
@@ -74,24 +74,24 @@ HEADERS += core/feeddownloader.h \
            gui/dialogs/formrestoredatabasesettings.h \
            gui/dialogs/formsettings.h \
            gui/dialogs/formupdate.h \
-           gui/edittableview.h \
+           gui/reusable/edittableview.h \
            gui/feedmessageviewer.h \
            gui/toolbars/feedstoolbar.h \
            gui/feedsview.h \
            gui/guiutilities.h \
-           gui/labelsmenu.h \
+           gui/reusable/labelsmenu.h \
-           gui/labelwithstatus.h \
+           gui/reusable/labelwithstatus.h \
-           gui/lineeditwithstatus.h \
+           gui/reusable/lineeditwithstatus.h \
            gui/messagebox.h \
-           gui/messagecountspinbox.h \
+           gui/reusable/messagecountspinbox.h \
            gui/messagepreviewer.h \
            gui/toolbars/messagestoolbar.h \
            gui/messagesview.h \
-           gui/networkproxydetails.h \
+           gui/reusable/networkproxydetails.h \
            gui/newspaperpreviewer.h \
-           gui/nonclosablemenu.h \
+           gui/reusable/nonclosablemenu.h \
-           gui/plaintoolbutton.h \
+           gui/reusable/plaintoolbutton.h \
-           gui/searchtextwidget.h \
+           gui/reusable/searchtextwidget.h \
            gui/settings/settingsbrowsermail.h \
            gui/settings/settingsdatabase.h \
            gui/settings/settingsdownloads.h \
@@ -101,17 +101,17 @@ HEADERS += core/feeddownloader.h \
            gui/settings/settingslocalization.h \
            gui/settings/settingspanel.h \
            gui/settings/settingsshortcuts.h \
-           gui/squeezelabel.h \
+           gui/reusable/squeezelabel.h \
            gui/toolbars/statusbar.h \
-           gui/styleditemdelegatewithoutfocus.h \
+           gui/reusable/styleditemdelegatewithoutfocus.h \
            gui/systemtrayicon.h \
            gui/tabbar.h \
            gui/tabcontent.h \
            gui/tabwidget.h \
-           gui/timespinbox.h \
+           gui/reusable/timespinbox.h \
            gui/toolbars/toolbareditor.h \
-           gui/treeviewcolumnsmenu.h \
+           gui/reusable/treeviewcolumnsmenu.h \
-           gui/widgetwithstatus.h \
+           gui/reusable/widgetwithstatus.h \
            miscellaneous/application.h \
            miscellaneous/autosaver.h \
            miscellaneous/externaltool.h \
@@ -238,10 +238,10 @@ SOURCES += core/feeddownloader.cpp \
            exceptions/ioexception.cpp \
            exceptions/networkexception.cpp \
            exceptions/scriptexception.cpp \
-           gui/baselineedit.cpp \
+           gui/reusable/baselineedit.cpp \
            gui/toolbars/basetoolbar.cpp \
-           gui/colortoolbutton.cpp \
+           gui/reusable/comboboxwithstatus.cpp \
-           gui/comboboxwithstatus.cpp \
+           gui/reusable/colortoolbutton.cpp \
            gui/dialogs/formabout.cpp \
            gui/dialogs/formaddaccount.cpp \
            gui/dialogs/formaddeditlabel.cpp \
@@ -252,24 +252,24 @@ SOURCES += core/feeddownloader.cpp \
            gui/dialogs/formrestoredatabasesettings.cpp \
            gui/dialogs/formsettings.cpp \
            gui/dialogs/formupdate.cpp \
-           gui/edittableview.cpp \
+           gui/reusable/edittableview.cpp \
            gui/feedmessageviewer.cpp \
            gui/toolbars/feedstoolbar.cpp \
            gui/feedsview.cpp \
            gui/guiutilities.cpp \
-           gui/labelsmenu.cpp \
+           gui/reusable/labelsmenu.cpp \
-           gui/labelwithstatus.cpp \
+           gui/reusable/labelwithstatus.cpp \
-           gui/lineeditwithstatus.cpp \
+           gui/reusable/lineeditwithstatus.cpp \
            gui/messagebox.cpp \
-           gui/messagecountspinbox.cpp \
+           gui/reusable/messagecountspinbox.cpp \
            gui/messagepreviewer.cpp \
            gui/toolbars/messagestoolbar.cpp \
            gui/messagesview.cpp \
-           gui/networkproxydetails.cpp \
+           gui/reusable/networkproxydetails.cpp \
            gui/newspaperpreviewer.cpp \
-           gui/nonclosablemenu.cpp \
+           gui/reusable/nonclosablemenu.cpp \
-           gui/plaintoolbutton.cpp \
+           gui/reusable/plaintoolbutton.cpp \
-           gui/searchtextwidget.cpp \
+           gui/reusable/searchtextwidget.cpp \
            gui/settings/settingsbrowsermail.cpp \
            gui/settings/settingsdatabase.cpp \
            gui/settings/settingsdownloads.cpp \
@@ -279,17 +279,17 @@ SOURCES += core/feeddownloader.cpp \
            gui/settings/settingslocalization.cpp \
            gui/settings/settingspanel.cpp \
            gui/settings/settingsshortcuts.cpp \
-           gui/squeezelabel.cpp \
+           gui/reusable/squeezelabel.cpp \
            gui/toolbars/statusbar.cpp \
-           gui/styleditemdelegatewithoutfocus.cpp \
+           gui/reusable/styleditemdelegatewithoutfocus.cpp \
            gui/systemtrayicon.cpp \
            gui/tabbar.cpp \
            gui/tabcontent.cpp \
            gui/tabwidget.cpp \
-           gui/timespinbox.cpp \
+           gui/reusable/timespinbox.cpp \
            gui/toolbars/toolbareditor.cpp \
-           gui/treeviewcolumnsmenu.cpp \
+           gui/reusable/treeviewcolumnsmenu.cpp \
-           gui/widgetwithstatus.cpp \
+           gui/reusable/widgetwithstatus.cpp \
            miscellaneous/application.cpp \
            miscellaneous/autosaver.cpp \
            miscellaneous/externaltool.cpp \
@@ -394,9 +394,9 @@ FORMS += gui/dialogs/formabout.ui \
          gui/dialogs/formrestoredatabasesettings.ui \
          gui/dialogs/formsettings.ui \
          gui/dialogs/formupdate.ui \
-         gui/networkproxydetails.ui \
+         gui/reusable/networkproxydetails.ui \
          gui/newspaperpreviewer.ui \
-         gui/searchtextwidget.ui \
+         gui/reusable/searchtextwidget.ui \
          gui/settings/settingsbrowsermail.ui \
          gui/settings/settingsdatabase.ui \
          gui/settings/settingsdownloads.ui \
@@ -426,17 +426,17 @@ FORMS += gui/dialogs/formabout.ui \
 
 
 equals(USE_WEBENGINE, true) {
-  HEADERS += gui/locationlineedit.h \
+  HEADERS += gui/reusable/locationlineedit.h \
              gui/webviewer.h \
              gui/webbrowser.h \
-             gui/discoverfeedsbutton.h \
+             gui/reusable/discoverfeedsbutton.h \
              network-web/googlesuggest.h \
              network-web/webpage.h
 
-  SOURCES += gui/locationlineedit.cpp \
+  SOURCES += gui/reusable/locationlineedit.cpp \
              gui/webviewer.cpp \
              gui/webbrowser.cpp \
-             gui/discoverfeedsbutton.cpp \
+             gui/reusable/discoverfeedsbutton.cpp \
              network-web/googlesuggest.cpp \
              network-web/webpage.cpp
 
@@ -454,7 +454,7 @@ equals(USE_WEBENGINE, true) {
              network-web/adblock/adblockrequestinfo.h \
              network-web/urlinterceptor.h \
              network-web/networkurlinterceptor.h \
-             gui/treewidget.h
+             gui/reusable/treewidget.h
 
   SOURCES += network-web/adblock/adblockaddsubscriptiondialog.cpp \
              network-web/adblock/adblockdialog.cpp \
@@ -468,7 +468,7 @@ equals(USE_WEBENGINE, true) {
              network-web/adblock/adblockurlinterceptor.cpp \
              network-web/adblock/adblockrequestinfo.cpp \
              network-web/networkurlinterceptor.cpp \
-             gui/treewidget.cpp
+             gui/reusable/treewidget.cpp
 
   FORMS += network-web/adblock/adblockaddsubscriptiondialog.ui \
            network-web/adblock/adblockdialog.ui
@@ -502,6 +502,7 @@ HEADERS  += $$files(3rd-party/sc/*.h, false)
 INCLUDEPATH +=  $$PWD/. \
                 $$PWD/gui \
                 $$PWD/gui/dialogs \
+                $$PWD/gui/reusable \
                 $$PWD/gui/toolbars \
                 $$PWD/dynamic-shortcuts
 

src/librssguard/network-web/adblock/adblocksubscription.h

@@ -115,7 +115,7 @@ class AdBlockCustomList : public AdBlockSubscription {
   Q_OBJECT
 
   public:
-    explicit AdBlockCustomList(QObject* parent = 0);
+    explicit AdBlockCustomList(QObject* parent = nullptr);
 
     void loadSubscription(const QStringList& disabledRules);
     void saveSubscription();

src/librssguard/network-web/adblock/adblocktreewidget.h

@@ -20,7 +20,7 @@
 #ifndef ADBLOCKTREEWIDGET_H
 #define ADBLOCKTREEWIDGET_H
 
-#include "gui/treewidget.h"
+#include "gui/reusable/treewidget.h"
 
 class AdBlockSubscription;
 class AdBlockRule;
@@ -29,7 +29,7 @@ class AdBlockTreeWidget : public TreeWidget {
   Q_OBJECT
 
   public:
-    explicit AdBlockTreeWidget(AdBlockSubscription* subscription, QWidget* parent = 0);
+    explicit AdBlockTreeWidget(AdBlockSubscription* subscription, QWidget* parent = nullptr);
 
     AdBlockSubscription* subscription() const;
 

src/librssguard/network-web/googlesuggest.cpp

@@ -31,7 +31,7 @@
 #include "network-web/googlesuggest.h"
 
 #include "definitions/definitions.h"
-#include "gui/locationlineedit.h"
+#include "gui/reusable/locationlineedit.h"
 #include "network-web/downloader.h"
 
 #include <QDomDocument>

src/librssguard/services/abstract/gui/formaccountdetails.h

@@ -7,10 +7,10 @@
 
 #include "ui_formaccountdetails.h"
 
-#include "gui/networkproxydetails.h"
-#include "miscellaneous/application.h"
 #include "database/databasefactory.h"
 #include "database/databasequeries.h"
+#include "gui/reusable/networkproxydetails.h"
+#include "miscellaneous/application.h"
 
 class ServiceRoot;
 

src/librssguard/services/abstract/gui/formcategorydetails.cpp

@@ -6,9 +6,9 @@
 #include "database/databasequeries.h"
 #include "definitions/definitions.h"
 #include "exceptions/applicationexception.h"
-#include "gui/baselineedit.h"
 #include "gui/feedsview.h"
 #include "gui/messagebox.h"
+#include "gui/reusable/baselineedit.h"
 #include "gui/systemtrayicon.h"
 #include "miscellaneous/iconfactory.h"
 #include "services/abstract/category.h"

src/librssguard/services/abstract/gui/formfeeddetails.cpp

@@ -6,9 +6,9 @@
 #include "database/databasequeries.h"
 #include "definitions/definitions.h"
 #include "exceptions/applicationexception.h"
-#include "gui/baselineedit.h"
 #include "gui/guiutilities.h"
 #include "gui/messagebox.h"
+#include "gui/reusable/baselineedit.h"
 #include "gui/systemtrayicon.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/textfactory.h"

src/librssguard/services/gmail/gui/emailrecipientcontrol.cpp

@@ -2,7 +2,7 @@
 
 #include "services/gmail/gui/emailrecipientcontrol.h"
 
-#include "gui/plaintoolbutton.h"
+#include "gui/reusable/plaintoolbutton.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"
 #include "services/gmail/definitions.h"

src/librssguard/services/standard/gui/formstandardimportexport.h

@@ -24,8 +24,7 @@ class FormStandardImportExport : public QDialog {
       TxtUrlPerLine = 1
     };
 
-    // Constructors.
+    explicit FormStandardImportExport(StandardServiceRoot* service_root, QWidget* parent = nullptr);
-    explicit FormStandardImportExport(StandardServiceRoot* service_root, QWidget* parent = 0);
     virtual ~FormStandardImportExport();
 
     void setMode(const FeedsImportExportModel::Mode& mode);

src/rssguard/rssguard.pro

@@ -38,6 +38,7 @@ DEFINES *= RSSGUARD_DLLSPEC=Q_DECL_IMPORT
 SOURCES += main.cpp
 INCLUDEPATH +=  $$PWD/../librssguard \
                 $$PWD/../librssguard/gui \
+                $$PWD/../librssguard/gui/reusable \
                 $$OUT_PWD/../librssguard \
                 $$OUT_PWD/../librssguard/ui