Moved some classes.

CMakeLists.txt

@@ -331,10 +331,17 @@ set(APP_SOURCES
   src/qtsingleapplication/qtsingleapplication.cpp
 
   # GUI sources.
-  src/gui/formmain.cpp
+  src/gui/dialogs/formmain.cpp
+  src/gui/dialogs/formsettings.cpp
+  src/gui/dialogs/formabout.cpp
+  src/gui/dialogs/formcategorydetails.cpp
+  src/gui/dialogs/formfeeddetails.cpp
+  src/gui/dialogs/formupdate.cpp
+  src/gui/dialogs/formimportexport.cpp
+  src/gui/dialogs/formdatabasecleanup.cpp
+  src/gui/dialogs/formbackupdatabasesettings.cpp
+  src/gui/dialogs/formrestoredatabasesettings.cpp
   src/gui/systemtrayicon.cpp
-  src/gui/formsettings.cpp
-  src/gui/formabout.cpp
   src/gui/baselineedit.cpp
   src/gui/locationlineedit.cpp
   src/gui/tabwidget.cpp
@@ -344,27 +351,21 @@ set(APP_SOURCES
   src/gui/feedsview.cpp
   src/gui/messagesview.cpp
   src/gui/statusbar.cpp
-  src/gui/formcategorydetails.cpp
-  src/gui/formfeeddetails.cpp
   src/gui/plaintoolbutton.cpp
   src/gui/lineeditwithstatus.cpp
   src/gui/widgetwithstatus.cpp
   src/gui/labelwithstatus.cpp
   src/gui/messagebox.cpp
-  src/gui/formupdate.cpp
   src/gui/comboboxwithstatus.cpp
   src/gui/basetoolbar.cpp
   src/gui/messagestoolbar.cpp
   src/gui/feedstoolbar.cpp
   src/gui/toolbareditor.cpp
   src/gui/messagessearchlineedit.cpp
-  src/gui/formimportexport.cpp
   src/gui/styleditemdelegatewithoutfocus.cpp
-  src/gui/formbackupdatabasesettings.cpp
-  src/gui/formrestoredatabasesettings.cpp
   src/gui/edittableview.cpp
   src/gui/squeezelabel.cpp
-  src/gui/formdatabasecleanup.cpp
+  src/gui/discoverfeedsbutton.cpp
 
   # DYNAMIC-SHORTCUTS sources.
   src/dynamic-shortcuts/shortcutcatcher.cpp
@@ -416,7 +417,6 @@ set(APP_SOURCES
   src/network-web/webview.cpp
   src/network-web/downloader.cpp
   src/network-web/downloadmanager.cpp
-  src/network-web/discoverfeedsbutton.cpp
   src/network-web/googlesuggest.cpp
 
   src/network-web/adblock/adblockaddsubscriptiondialog.cpp
@@ -444,10 +444,17 @@ set(APP_HEADERS
   src/qtsingleapplication/qtsingleapplication.h
 
   # GUI headers.
-  src/gui/formmain.h
+  src/gui/dialogs/formmain.h
+  src/gui/dialogs/formsettings.h
+  src/gui/dialogs/formabout.h
+  src/gui/dialogs/formcategorydetails.h
+  src/gui/dialogs/formfeeddetails.h
+  src/gui/dialogs/formimportexport.h
+  src/gui/dialogs/formbackupdatabasesettings.h
+  src/gui/dialogs/formrestoredatabasesettings.h
+  src/gui/dialogs/formdatabasecleanup.h
+  src/gui/dialogs/formupdate.h
   src/gui/systemtrayicon.h
-  src/gui/formsettings.h
-  src/gui/formabout.h
   src/gui/baselineedit.h
   src/gui/locationlineedit.h
   src/gui/tabwidget.h
@@ -457,26 +464,20 @@ set(APP_HEADERS
   src/gui/feedsview.h
   src/gui/messagesview.h
   src/gui/statusbar.h
-  src/gui/formcategorydetails.h
-  src/gui/formfeeddetails.h
   src/gui/plaintoolbutton.h
   src/gui/lineeditwithstatus.h
   src/gui/widgetwithstatus.h
   src/gui/labelwithstatus.h
   src/gui/messagebox.h
-  src/gui/formupdate.h
   src/gui/comboboxwithstatus.h
   src/gui/basetoolbar.h
   src/gui/messagestoolbar.h
   src/gui/feedstoolbar.h
   src/gui/toolbareditor.h
   src/gui/messagessearchlineedit.h
-  src/gui/formimportexport.h
-  src/gui/formbackupdatabasesettings.h
-  src/gui/formrestoredatabasesettings.h
   src/gui/edittableview.h
   src/gui/squeezelabel.h
-  src/gui/formdatabasecleanup.h
+  src/gui/discoverfeedsbutton.h
 
   # DYNAMIC-SHORTCUTS headers.
   src/dynamic-shortcuts/dynamicshortcutswidget.h
@@ -513,7 +514,6 @@ set(APP_HEADERS
   src/network-web/webview.h
   src/network-web/downloader.h
   src/network-web/downloadmanager.h
-  src/network-web/discoverfeedsbutton.h
   src/network-web/googlesuggest.h
 
   src/network-web/adblock/adblockaddsubscriptiondialog.h
@@ -528,17 +528,17 @@ set(APP_HEADERS
 
 # APP form files.
 set(APP_FORMS
-  src/gui/formupdate.ui
-  src/gui/formmain.ui
-  src/gui/formsettings.ui
-  src/gui/formabout.ui
-  src/gui/formcategorydetails.ui
-  src/gui/formfeeddetails.ui
+  src/gui/dialogs/formupdate.ui
+  src/gui/dialogs/formmain.ui
+  src/gui/dialogs/formsettings.ui
+  src/gui/dialogs/formabout.ui
+  src/gui/dialogs/formcategorydetails.ui
+  src/gui/dialogs/formfeeddetails.ui
   src/gui/toolbareditor.ui
-  src/gui/formimportexport.ui
-  src/gui/formbackupdatabasesettings.ui
-  src/gui/formrestoredatabasesettings.ui
-  src/gui/formdatabasecleanup.ui
+  src/gui/dialogs/formimportexport.ui
+  src/gui/dialogs/formbackupdatabasesettings.ui
+  src/gui/dialogs/formrestoredatabasesettings.ui
+  src/gui/dialogs/formdatabasecleanup.ui
   src/network-web/downloadmanager.ui
   src/network-web/downloaditem.ui
 
@@ -699,6 +699,7 @@ endif(USE_QT_5)
 include_directories (
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_SOURCE_DIR}/src/gui
+  ${CMAKE_SOURCE_DIR}/src/gui/dialogs
   ${CMAKE_SOURCE_DIR}/src/network-web
   ${CMAKE_SOURCE_DIR}/src/network-web/adblock
   ${CMAKE_SOURCE_DIR}/src/dynamic-shortcuts

src/core/feedsmodelcategory.cpp

@@ -22,7 +22,7 @@
 #include "miscellaneous/textfactory.h"
 #include "miscellaneous/settings.h"
 #include "miscellaneous/iconfactory.h"
-#include "gui/formcategorydetails.h"
+#include "gui/dialogs/formcategorydetails.h"
 
 #include <QVariant>
 #include <QSqlQuery>

src/gui/basetoolbar.cpp

@@ -18,7 +18,7 @@
 #include "gui/basetoolbar.h"
 
 #include "definitions/definitions.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 #include "miscellaneous/settings.h"
 
 #include <QWidgetAction>

src/gui/dialogs/formabout.cpp

@@ -15,7 +15,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/formabout.h"
+#include "gui/dialogs/formabout.h"
 
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/textfactory.h"

src/gui/dialogs/formbackupdatabasesettings.cpp

@@ -15,7 +15,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/formbackupdatabasesettings.h"
+#include "gui/dialogs/formbackupdatabasesettings.h"
 
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"

src/gui/dialogs/formcategorydetails.cpp

@@ -15,7 +15,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/formcategorydetails.h"
+#include "gui/dialogs/formcategorydetails.h"
 
 #include "definitions/definitions.h"
 #include "core/feedsmodelrootitem.h"
@@ -26,7 +26,7 @@
 #include "gui/baselineedit.h"
 #include "gui/messagebox.h"
 #include "gui/systemtrayicon.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 
 #include <QLineEdit>
 #include <QTextEdit>

src/gui/dialogs/formdatabasecleanup.cpp

@@ -15,7 +15,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/formdatabasecleanup.h"
+#include "gui/dialogs/formdatabasecleanup.h"
 
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"

src/gui/dialogs/formfeeddetails.cpp

@@ -15,7 +15,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/formfeeddetails.h"
+#include "gui/dialogs/formfeeddetails.h"
 
 #include "definitions/definitions.h"
 #include "core/feedsmodel.h"

src/gui/dialogs/formimportexport.cpp

@@ -15,14 +15,14 @@
 // 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/formimportexport.h"
+#include "gui/dialogs/formimportexport.h"
 
 #include "core/feedsimportexportmodel.h"
 #include "core/feedsmodel.h"
 #include "miscellaneous/application.h"
 #include "gui/feedmessageviewer.h"
-#include "gui/formmain.h"
 #include "gui/feedsview.h"
+#include "gui/dialogs/formmain.h"
 
 #include <QFileDialog>
 #include <QTextStream>

src/gui/dialogs/formmain.cpp

@@ -15,7 +15,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/formmain.h"
+#include "gui/dialogs/formmain.h"
 
 #include "definitions/definitions.h"
 #include "miscellaneous/settings.h"
@@ -26,19 +26,19 @@
 #include "miscellaneous/iconfactory.h"
 #include "network-web/webfactory.h"
 #include "network-web/webbrowser.h"
-#include "gui/formabout.h"
-#include "gui/formsettings.h"
 #include "gui/feedsview.h"
 #include "gui/messagebox.h"
 #include "gui/systemtrayicon.h"
 #include "gui/tabbar.h"
 #include "gui/statusbar.h"
 #include "gui/feedmessageviewer.h"
-#include "gui/formupdate.h"
 #include "gui/plaintoolbutton.h"
-#include "gui/formimportexport.h"
-#include "gui/formbackupdatabasesettings.h"
-#include "gui/formrestoredatabasesettings.h"
+#include "gui/dialogs/formabout.h"
+#include "gui/dialogs/formsettings.h"
+#include "gui/dialogs/formupdate.h"
+#include "gui/dialogs/formimportexport.h"
+#include "gui/dialogs/formbackupdatabasesettings.h"
+#include "gui/dialogs/formrestoredatabasesettings.h"
 
 #include <QCloseEvent>
 #include <QSessionManager>

src/gui/dialogs/formrestoredatabasesettings.cpp

@@ -15,10 +15,10 @@
 // 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/formrestoredatabasesettings.h"
+#include "gui/dialogs/formrestoredatabasesettings.h"
 
 #include "gui/messagebox.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 #include "miscellaneous/iconfactory.h"
 #include "exceptions/applicationexception.h"
 

src/gui/dialogs/formsettings.cpp

@@ -15,7 +15,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/formsettings.h"
+#include "gui/dialogs/formsettings.h"
 
 #include "definitions/definitions.h"
 #include "core/feeddownloader.h"
@@ -36,11 +36,11 @@
 #include "gui/feedmessageviewer.h"
 #include "gui/feedsview.h"
 #include "gui/feedstoolbar.h"
-#include "gui/formmain.h"
 #include "gui/messagebox.h"
 #include "gui/basetoolbar.h"
 #include "gui/messagestoolbar.h"
 #include "gui/messagesview.h"
+#include "gui/dialogs/formmain.h"
 #include "dynamic-shortcuts/dynamicshortcuts.h"
 
 #include <QProcess>

src/gui/dialogs/formupdate.cpp

@@ -15,7 +15,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/formupdate.h"
+#include "gui/dialogs/formupdate.h"
 
 #include "definitions/definitions.h"
 #include "miscellaneous/systemfactory.h"

src/gui/discoverfeedsbutton.cpp

@@ -15,7 +15,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 "network-web/discoverfeedsbutton.h"
+#include "gui/discoverfeedsbutton.h"
 
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"

src/gui/feedmessageviewer.cpp

@@ -29,16 +29,16 @@
 #include "core/feedsselection.h"
 #include "core/feedsimportexportmodel.h"
 #include "network-web/webbrowser.h"
-#include "gui/formmain.h"
 #include "gui/messagesview.h"
 #include "gui/feedsview.h"
 #include "gui/statusbar.h"
 #include "gui/systemtrayicon.h"
 #include "gui/messagebox.h"
-#include "gui/formdatabasecleanup.h"
 #include "gui/messagestoolbar.h"
 #include "gui/feedstoolbar.h"
-#include <exceptions/applicationexception.h>
+#include "gui/dialogs/formdatabasecleanup.h"
+#include "gui/dialogs/formmain.h"
+#include "exceptions/applicationexception.h"
 
 #include <QVBoxLayout>
 #include <QSplitter>

src/gui/feedsview.cpp

@@ -27,12 +27,12 @@
 #include "core/feedsmodelfeed.h"
 #include "miscellaneous/systemfactory.h"
 #include "miscellaneous/mutex.h"
-#include "gui/formmain.h"
-#include "gui/formcategorydetails.h"
-#include "gui/formfeeddetails.h"
 #include "gui/systemtrayicon.h"
 #include "gui/messagebox.h"
 #include "gui/styleditemdelegatewithoutfocus.h"
+#include "gui/dialogs/formmain.h"
+#include "gui/dialogs/formcategorydetails.h"
+#include "gui/dialogs/formfeeddetails.h"
 
 #include <QMenu>
 #include <QHeaderView>

src/gui/messagestoolbar.cpp

@@ -19,8 +19,8 @@
 
 #include "definitions/definitions.h"
 #include "gui/baselineedit.h"
-#include "gui/formmain.h"
 #include "gui/messagessearchlineedit.h"
+#include "gui/dialogs/formmain.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/settings.h"
 

src/gui/messagesview.cpp

@@ -22,7 +22,7 @@
 #include "miscellaneous/settings.h"
 #include "network-web/networkfactory.h"
 #include "network-web/webfactory.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 #include "gui/messagebox.h"
 #include "gui/styleditemdelegatewithoutfocus.h"
 

src/gui/statusbar.cpp

@@ -17,7 +17,7 @@
 
 #include "gui/statusbar.h"
 
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 #include "gui/tabwidget.h"
 #include "gui/plaintoolbutton.h"
 #include "network-web/adblock/adblockicon.h"

src/gui/systemtrayicon.cpp

@@ -20,8 +20,8 @@
 #include "definitions/definitions.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/settings.h"
-#include "gui/formmain.h"
-#include "gui/formsettings.h"
+#include "gui/dialogs/formmain.h"
+#include "gui/dialogs/formsettings.h"
 
 #include <QPainter>
 #include <QTimer>

src/gui/tabwidget.cpp

@@ -24,9 +24,9 @@
 #include "miscellaneous/iconfactory.h"
 #include "network-web/webbrowser.h"
 #include "gui/tabbar.h"
-#include "gui/formmain.h"
 #include "gui/feedmessageviewer.h"
 #include "gui/plaintoolbutton.h"
+#include "gui/dialogs/formmain.h"
 
 #include <QMenu>
 #include <QToolButton>

src/gui/toolbareditor.cpp

@@ -18,7 +18,7 @@
 #include "gui/toolbareditor.h"
 
 #include "gui/basetoolbar.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 
 #include <QKeyEvent>
 

src/main.cpp

@@ -21,7 +21,7 @@
 #include "miscellaneous/debugging.h"
 #include "miscellaneous/iconfactory.h"
 #include "dynamic-shortcuts/dynamicshortcuts.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 #include "gui/feedmessageviewer.h"
 #include "gui/feedsview.h"
 #include "gui/messagebox.h"

src/miscellaneous/application.cpp

@@ -23,8 +23,8 @@
 #include "gui/feedsview.h"
 #include "gui/feedmessageviewer.h"
 #include "gui/messagebox.h"
-#include "gui/formmain.h"
 #include "gui/statusbar.h"
+#include "gui/dialogs/formmain.h"
 #include "exceptions/applicationexception.h"
 
 #include <QSessionManager>

src/miscellaneous/systemfactory.cpp

@@ -18,7 +18,7 @@
 #include "miscellaneous/systemfactory.h"
 
 #include "network-web/networkfactory.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/systemfactory.h"
 

src/network-web/adblock/adblockdialog.cpp

@@ -25,7 +25,7 @@
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"
 #include "gui/tabwidget.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 
 #include <QDesktopWidget>
 #include <QMenu>

src/network-web/adblock/adblockicon.cpp

@@ -25,8 +25,8 @@
 #include "network-web/webbrowser.h"
 #include "miscellaneous/application.h"
 #include "gui/plaintoolbutton.h"
-#include "gui/formmain.h"
 #include "gui/tabwidget.h"
+#include "gui/dialogs/formmain.h"
 
 #include <QMenu>
 #include <QMouseEvent>

src/network-web/adblock/adblockmanager.cpp

@@ -28,7 +28,7 @@
 #include "miscellaneous/application.h"
 #include "miscellaneous/settings.h"
 #include "definitions/definitions.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 
 #include <QDateTime>
 #include <QTextStream>

src/network-web/downloadmanager.cpp

@@ -20,7 +20,7 @@
 #include "miscellaneous/autosaver.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/settings.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 #include "gui/tabwidget.h"
 #include "gui/messagebox.h"
 #include "network-web/silentnetworkaccessmanager.h"

src/network-web/webbrowser.cpp

@@ -23,7 +23,7 @@
 #include "network-web/webview.h"
 #include "network-web/networkfactory.h"
 #include "miscellaneous/skinfactory.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 #include "gui/tabwidget.h"
 #include "gui/feedmessageviewer.h"
 #include "gui/feedsview.h"

src/network-web/webbrowser.h

@@ -23,7 +23,7 @@
 #include "core/messagesmodel.h"
 #include "network-web/webview.h"
 #include "gui/locationlineedit.h"
-#include "network-web/discoverfeedsbutton.h"
+#include "gui/discoverfeedsbutton.h"
 
 #include <QWidget>
 #include <QWidgetAction>

src/network-web/webview.cpp

@@ -24,7 +24,7 @@
 #include "network-web/webpage.h"
 #include "network-web/webfactory.h"
 #include "gui/messagebox.h"
-#include "gui/formmain.h"
+#include "gui/dialogs/formmain.h"
 
 #include <QStyleOptionFrameV3>
 #include <QAction>