diff options
| author | Felix (xq) Queißner <git@mq32.de> | 2020-06-22 21:10:04 +0200 |
|---|---|---|
| committer | Felix (xq) Queißner <git@mq32.de> | 2020-06-22 21:10:04 +0200 |
| commit | 75ec461eeaa851cb5c53f4cfffc434e3e529ed1d (patch) | |
| tree | 3944737340718ca3675381aa06636045d397e780 | |
| parent | 8dbfb0890560fd1cd698d06fa05ac868c4db8576 (diff) | |
Restructures the project source and cleans up a bit
| -rw-r--r-- | lib/cmark/cmark.pri | 2 | ||||
| -rw-r--r-- | lib/cmark/src/cmark_export.h | 41 | ||||
| -rw-r--r-- | lib/cmark/src/cmark_version.h | 7 | ||||
| -rw-r--r-- | src/browsertab.cpp | 22 | ||||
| -rw-r--r-- | src/browsertab.hpp | 2 | ||||
| -rw-r--r-- | src/browsertab.ui | 16 | ||||
| -rw-r--r-- | src/dialogs/certificateiodialog.cpp (renamed from src/certificateiodialog.cpp) | 0 | ||||
| -rw-r--r-- | src/dialogs/certificateiodialog.hpp (renamed from src/certificateiodialog.hpp) | 0 | ||||
| -rw-r--r-- | src/dialogs/certificateiodialog.ui (renamed from src/certificateiodialog.ui) | 0 | ||||
| -rw-r--r-- | src/dialogs/certificatemanagementdialog.cpp (renamed from src/certificatemanagementdialog.cpp) | 0 | ||||
| -rw-r--r-- | src/dialogs/certificatemanagementdialog.hpp (renamed from src/certificatemanagementdialog.hpp) | 0 | ||||
| -rw-r--r-- | src/dialogs/certificatemanagementdialog.ui (renamed from src/certificatemanagementdialog.ui) | 0 | ||||
| -rw-r--r-- | src/dialogs/certificateselectiondialog.cpp (renamed from src/certificateselectiondialog.cpp) | 0 | ||||
| -rw-r--r-- | src/dialogs/certificateselectiondialog.hpp (renamed from src/certificateselectiondialog.hpp) | 0 | ||||
| -rw-r--r-- | src/dialogs/certificateselectiondialog.ui (renamed from src/certificateselectiondialog.ui) | 0 | ||||
| -rw-r--r-- | src/dialogs/newidentitiydialog.cpp (renamed from src/newidentitiydialog.cpp) | 0 | ||||
| -rw-r--r-- | src/dialogs/newidentitiydialog.hpp (renamed from src/newidentitiydialog.hpp) | 0 | ||||
| -rw-r--r-- | src/dialogs/newidentitiydialog.ui (renamed from src/newidentitiydialog.ui) | 0 | ||||
| -rw-r--r-- | src/dialogs/settingsdialog.cpp (renamed from src/settingsdialog.cpp) | 0 | ||||
| -rw-r--r-- | src/dialogs/settingsdialog.hpp (renamed from src/settingsdialog.hpp) | 2 | ||||
| -rw-r--r-- | src/dialogs/settingsdialog.ui (renamed from src/settingsdialog.ui) | 79 | ||||
| -rw-r--r-- | src/kristall.pro | 90 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | src/mainwindow.hpp | 4 | ||||
| -rw-r--r-- | src/protocols/abouthandler.cpp (renamed from src/abouthandler.cpp) | 0 | ||||
| -rw-r--r-- | src/protocols/abouthandler.hpp (renamed from src/abouthandler.hpp) | 0 | ||||
| -rw-r--r-- | src/protocols/filehandler.cpp (renamed from src/filehandler.cpp) | 0 | ||||
| -rw-r--r-- | src/protocols/filehandler.hpp (renamed from src/filehandler.hpp) | 0 | ||||
| -rw-r--r-- | src/protocols/fingerclient.cpp (renamed from src/fingerclient.cpp) | 0 | ||||
| -rw-r--r-- | src/protocols/fingerclient.hpp (renamed from src/fingerclient.hpp) | 0 | ||||
| -rw-r--r-- | src/protocols/geminiclient.cpp (renamed from src/geminiclient.cpp) | 0 | ||||
| -rw-r--r-- | src/protocols/geminiclient.hpp (renamed from src/geminiclient.hpp) | 0 | ||||
| -rw-r--r-- | src/protocols/gopherclient.cpp (renamed from src/gopherclient.cpp) | 0 | ||||
| -rw-r--r-- | src/protocols/gopherclient.hpp (renamed from src/gopherclient.hpp) | 0 | ||||
| -rw-r--r-- | src/protocols/webclient.cpp (renamed from src/webclient.cpp) | 0 | ||||
| -rw-r--r-- | src/protocols/webclient.hpp (renamed from src/webclient.hpp) | 0 | ||||
| -rw-r--r-- | src/renderers/geminirenderer.cpp (renamed from src/geminirenderer.cpp) | 0 | ||||
| -rw-r--r-- | src/renderers/geminirenderer.hpp (renamed from src/geminirenderer.hpp) | 0 | ||||
| -rw-r--r-- | src/renderers/gophermaprenderer.cpp (renamed from src/gophermaprenderer.cpp) | 0 | ||||
| -rw-r--r-- | src/renderers/gophermaprenderer.hpp (renamed from src/gophermaprenderer.hpp) | 0 | ||||
| -rw-r--r-- | src/renderers/plaintextrenderer.cpp (renamed from src/plaintextrenderer.cpp) | 0 | ||||
| -rw-r--r-- | src/renderers/plaintextrenderer.hpp (renamed from src/plaintextrenderer.hpp) | 0 | ||||
| -rw-r--r-- | src/widgets/elidelabel.cpp (renamed from src/elidelabel.cpp) | 0 | ||||
| -rw-r--r-- | src/widgets/elidelabel.hpp (renamed from src/elidelabel.hpp) | 0 | ||||
| -rw-r--r-- | src/widgets/mediaplayer.cpp (renamed from src/mediaplayer.cpp) | 0 | ||||
| -rw-r--r-- | src/widgets/mediaplayer.hpp (renamed from src/mediaplayer.hpp) | 0 | ||||
| -rw-r--r-- | src/widgets/mediaplayer.ui (renamed from src/mediaplayer.ui) | 0 | ||||
| -rw-r--r-- | src/widgets/searchbar.cpp (renamed from src/searchbar.cpp) | 0 | ||||
| -rw-r--r-- | src/widgets/searchbar.hpp (renamed from src/searchbar.hpp) | 0 | ||||
| -rw-r--r-- | src/widgets/ssltrusteditor.cpp (renamed from src/ssltrusteditor.cpp) | 0 | ||||
| -rw-r--r-- | src/widgets/ssltrusteditor.hpp (renamed from src/ssltrusteditor.hpp) | 0 | ||||
| -rw-r--r-- | src/widgets/ssltrusteditor.ui (renamed from src/ssltrusteditor.ui) | 0 |
52 files changed, 174 insertions, 95 deletions
diff --git a/lib/cmark/cmark.pri b/lib/cmark/cmark.pri index 01aadfb..403e19e 100644 --- a/lib/cmark/cmark.pri +++ b/lib/cmark/cmark.pri @@ -3,6 +3,8 @@ HEADERS += \ $$PWD/src/buffer.h \ $$PWD/src/chunk.h \ $$PWD/src/cmark.h \ + $$PWD/src/cmark_export.h \ + $$PWD/src/cmark_version.h \ $$PWD/src/config.h \ $$PWD/src/cmark_ctype.h \ $$PWD/src/config.h \ diff --git a/lib/cmark/src/cmark_export.h b/lib/cmark/src/cmark_export.h new file mode 100644 index 0000000..835e550 --- /dev/null +++ b/lib/cmark/src/cmark_export.h @@ -0,0 +1,41 @@ +#ifndef CMARK_EXPORT_H +#define CMARK_EXPORT_H + +#ifdef CMARK_STATIC_DEFINE +# define CMARK_EXPORT +# define CMARK_NO_EXPORT +#else +# ifndef CMARK_EXPORT +# ifdef libcmark_EXPORTS + /* We are building this library */ +# define CMARK_EXPORT __attribute__((visibility("default"))) +# else + /* We are using this library */ +# define CMARK_EXPORT __attribute__((visibility("default"))) +# endif +# endif + +# ifndef CMARK_NO_EXPORT +# define CMARK_NO_EXPORT __attribute__((visibility("hidden"))) +# endif +#endif + +#ifndef CMARK_DEPRECATED +# define CMARK_DEPRECATED __attribute__ ((__deprecated__)) +#endif + +#ifndef CMARK_DEPRECATED_EXPORT +# define CMARK_DEPRECATED_EXPORT CMARK_EXPORT CMARK_DEPRECATED +#endif + +#ifndef CMARK_DEPRECATED_NO_EXPORT +# define CMARK_DEPRECATED_NO_EXPORT CMARK_NO_EXPORT CMARK_DEPRECATED +#endif + +#if 0 /* DEFINE_NO_DEPRECATED */ +# ifndef CMARK_NO_DEPRECATED +# define CMARK_NO_DEPRECATED +# endif +#endif + +#endif /* CMARK_EXPORT_H */ diff --git a/lib/cmark/src/cmark_version.h b/lib/cmark/src/cmark_version.h new file mode 100644 index 0000000..21de71a --- /dev/null +++ b/lib/cmark/src/cmark_version.h @@ -0,0 +1,7 @@ +#ifndef CMARK_VERSION_H +#define CMARK_VERSION_H + +#define CMARK_VERSION ((0 << 16) | (29 << 8) | 0) +#define CMARK_VERSION_STRING "0.29.0" + +#endif // CMARK_VERSION_H diff --git a/src/browsertab.cpp b/src/browsertab.cpp index 4a149de..f73ac4b 100644 --- a/src/browsertab.cpp +++ b/src/browsertab.cpp @@ -1,22 +1,22 @@ #include "browsertab.hpp" #include "ui_browsertab.h" #include "mainwindow.hpp" -#include "settingsdialog.hpp" -#include "gophermaprenderer.hpp" -#include "geminirenderer.hpp" -#include "plaintextrenderer.hpp" +#include "renderers/gophermaprenderer.hpp" +#include "renderers/geminirenderer.hpp" +#include "renderers/plaintextrenderer.hpp" #include "mimeparser.hpp" -#include "certificateselectiondialog.hpp" +#include "dialogs/settingsdialog.hpp" +#include "dialogs/certificateselectiondialog.hpp" -#include "geminiclient.hpp" -#include "webclient.hpp" -#include "gopherclient.hpp" -#include "fingerclient.hpp" -#include "abouthandler.hpp" -#include "filehandler.hpp" +#include "protocols/geminiclient.hpp" +#include "protocols/webclient.hpp" +#include "protocols/gopherclient.hpp" +#include "protocols/fingerclient.hpp" +#include "protocols/abouthandler.hpp" +#include "protocols/filehandler.hpp" #include "ioutil.hpp" #include "kristall.hpp" diff --git a/src/browsertab.hpp b/src/browsertab.hpp index d4f5817..12cbc77 100644 --- a/src/browsertab.hpp +++ b/src/browsertab.hpp @@ -12,7 +12,7 @@ #include "documentoutlinemodel.hpp" #include "tabbrowsinghistory.hpp" -#include "geminirenderer.hpp" +#include "renderers/geminirenderer.hpp" #include "cryptoidentity.hpp" diff --git a/src/browsertab.ui b/src/browsertab.ui index 63bd9ec..f96db06 100644 --- a/src/browsertab.ui +++ b/src/browsertab.ui @@ -43,7 +43,8 @@ <string>Back</string> </property> <property name="icon"> - <iconset theme="navigate-back"/> + <iconset theme="navigate-back"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -59,7 +60,8 @@ <string>Forward</string> </property> <property name="icon"> - <iconset theme="navigate-forward"/> + <iconset theme="navigate-forward"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -75,7 +77,8 @@ <string>Stop</string> </property> <property name="icon"> - <iconset theme="close"/> + <iconset theme="close"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -91,7 +94,8 @@ <string>Reload</string> </property> <property name="icon"> - <iconset theme="refresh"/> + <iconset theme="refresh"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -201,7 +205,7 @@ p, li { white-space: pre-wrap; } <customwidget> <class>MediaPlayer</class> <extends>QWidget</extends> - <header>mediaplayer.hpp</header> + <header>widgets/mediaplayer.hpp</header> <container>1</container> </customwidget> <customwidget> @@ -212,7 +216,7 @@ p, li { white-space: pre-wrap; } <customwidget> <class>SearchBar</class> <extends>QLineEdit</extends> - <header>searchbar.hpp</header> + <header>widgets/searchbar.hpp</header> </customwidget> </customwidgets> <resources> diff --git a/src/certificateiodialog.cpp b/src/dialogs/certificateiodialog.cpp index 8c9fcd5..8c9fcd5 100644 --- a/src/certificateiodialog.cpp +++ b/src/dialogs/certificateiodialog.cpp diff --git a/src/certificateiodialog.hpp b/src/dialogs/certificateiodialog.hpp index 590b282..590b282 100644 --- a/src/certificateiodialog.hpp +++ b/src/dialogs/certificateiodialog.hpp diff --git a/src/certificateiodialog.ui b/src/dialogs/certificateiodialog.ui index 074df28..074df28 100644 --- a/src/certificateiodialog.ui +++ b/src/dialogs/certificateiodialog.ui diff --git a/src/certificatemanagementdialog.cpp b/src/dialogs/certificatemanagementdialog.cpp index 5141b30..5141b30 100644 --- a/src/certificatemanagementdialog.cpp +++ b/src/dialogs/certificatemanagementdialog.cpp diff --git a/src/certificatemanagementdialog.hpp b/src/dialogs/certificatemanagementdialog.hpp index 0d7178a..0d7178a 100644 --- a/src/certificatemanagementdialog.hpp +++ b/src/dialogs/certificatemanagementdialog.hpp diff --git a/src/certificatemanagementdialog.ui b/src/dialogs/certificatemanagementdialog.ui index 82dd788..82dd788 100644 --- a/src/certificatemanagementdialog.ui +++ b/src/dialogs/certificatemanagementdialog.ui diff --git a/src/certificateselectiondialog.cpp b/src/dialogs/certificateselectiondialog.cpp index f4dab38..f4dab38 100644 --- a/src/certificateselectiondialog.cpp +++ b/src/dialogs/certificateselectiondialog.cpp diff --git a/src/certificateselectiondialog.hpp b/src/dialogs/certificateselectiondialog.hpp index e628f5c..e628f5c 100644 --- a/src/certificateselectiondialog.hpp +++ b/src/dialogs/certificateselectiondialog.hpp diff --git a/src/certificateselectiondialog.ui b/src/dialogs/certificateselectiondialog.ui index d6128f9..d6128f9 100644 --- a/src/certificateselectiondialog.ui +++ b/src/dialogs/certificateselectiondialog.ui diff --git a/src/newidentitiydialog.cpp b/src/dialogs/newidentitiydialog.cpp index af2a97e..af2a97e 100644 --- a/src/newidentitiydialog.cpp +++ b/src/dialogs/newidentitiydialog.cpp diff --git a/src/newidentitiydialog.hpp b/src/dialogs/newidentitiydialog.hpp index 83d740b..83d740b 100644 --- a/src/newidentitiydialog.hpp +++ b/src/dialogs/newidentitiydialog.hpp diff --git a/src/newidentitiydialog.ui b/src/dialogs/newidentitiydialog.ui index 556ac93..556ac93 100644 --- a/src/newidentitiydialog.ui +++ b/src/dialogs/newidentitiydialog.ui diff --git a/src/settingsdialog.cpp b/src/dialogs/settingsdialog.cpp index ebd1664..ebd1664 100644 --- a/src/settingsdialog.cpp +++ b/src/dialogs/settingsdialog.cpp diff --git a/src/settingsdialog.hpp b/src/dialogs/settingsdialog.hpp index 0256f95..045b861 100644 --- a/src/settingsdialog.hpp +++ b/src/dialogs/settingsdialog.hpp @@ -3,7 +3,7 @@ #include <QDialog> -#include "geminirenderer.hpp" +#include "renderers/geminirenderer.hpp" #include "protocolsetup.hpp" #include "documentstyle.hpp" #include "ssltrust.hpp" diff --git a/src/settingsdialog.ui b/src/dialogs/settingsdialog.ui index 401e36b..9acbca6 100644 --- a/src/settingsdialog.ui +++ b/src/dialogs/settingsdialog.ui @@ -14,17 +14,19 @@ <string>Settings</string> </property> <property name="windowIcon"> - <iconset theme="settings"/> + <iconset theme="settings"> + <normaloff>.</normaloff>.</iconset> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> - <number>0</number> + <number>2</number> </property> <widget class="QWidget" name="generic"> <attribute name="icon"> - <iconset theme="settings"/> + <iconset theme="settings"> + <normaloff>.</normaloff>.</iconset> </attribute> <attribute name="title"> <string>Generic</string> @@ -287,7 +289,8 @@ </widget> <widget class="QWidget" name="style_tab"> <attribute name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </attribute> <attribute name="title"> <string>Style</string> @@ -316,7 +319,8 @@ <string/> </property> <property name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -354,7 +358,8 @@ <string/> </property> <property name="icon"> - <iconset theme="font"/> + <iconset theme="font"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -364,7 +369,8 @@ <string/> </property> <property name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -395,7 +401,8 @@ <string/> </property> <property name="icon"> - <iconset theme="font"/> + <iconset theme="font"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -405,7 +412,8 @@ <string/> </property> <property name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -436,7 +444,8 @@ <string/> </property> <property name="icon"> - <iconset theme="font"/> + <iconset theme="font"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -446,7 +455,8 @@ <string/> </property> <property name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -477,7 +487,8 @@ <string/> </property> <property name="icon"> - <iconset theme="font"/> + <iconset theme="font"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -487,7 +498,8 @@ <string/> </property> <property name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -524,7 +536,8 @@ <string/> </property> <property name="icon"> - <iconset theme="font"/> + <iconset theme="font"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -534,7 +547,8 @@ <string/> </property> <property name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -607,7 +621,8 @@ <string/> </property> <property name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -631,7 +646,8 @@ <string/> </property> <property name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -655,7 +671,8 @@ <string/> </property> <property name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -705,7 +722,8 @@ <string>...</string> </property> <property name="icon"> - <iconset theme="create-new"/> + <iconset theme="create-new"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -718,7 +736,8 @@ <string>...</string> </property> <property name="icon"> - <iconset theme="save"/> + <iconset theme="save"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -731,7 +750,8 @@ <string>...</string> </property> <property name="icon"> - <iconset theme="folder"/> + <iconset theme="folder"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -747,7 +767,8 @@ <string>...</string> </property> <property name="icon"> - <iconset theme="save-import"/> + <iconset theme="save-import"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -760,7 +781,8 @@ <string>...</string> </property> <property name="icon"> - <iconset theme="save-export"/> + <iconset theme="save-export"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -795,7 +817,8 @@ <string>...</string> </property> <property name="icon"> - <iconset theme="palette"/> + <iconset theme="palette"> + <normaloff>.</normaloff>.</iconset> </property> </widget> </item> @@ -825,7 +848,8 @@ </widget> <widget class="QWidget" name="gem_trust_page"> <attribute name="icon"> - <iconset theme="certificate"/> + <iconset theme="certificate"> + <normaloff>.</normaloff>.</iconset> </attribute> <attribute name="title"> <string>Gemini TLS</string> @@ -838,7 +862,8 @@ </widget> <widget class="QWidget" name="https_trust"> <attribute name="icon"> - <iconset theme="certificate"/> + <iconset theme="certificate"> + <normaloff>.</normaloff>.</iconset> </attribute> <attribute name="title"> <string>HTTPS TLS</string> @@ -867,7 +892,7 @@ <customwidget> <class>SslTrustEditor</class> <extends>QWidget</extends> - <header>ssltrusteditor.hpp</header> + <header>widgets/ssltrusteditor.hpp</header> <container>1</container> </customwidget> </customwidgets> diff --git a/src/kristall.pro b/src/kristall.pro index 73b3778..c5a29f5 100644 --- a/src/kristall.pro +++ b/src/kristall.pro @@ -52,90 +52,90 @@ DEPENDPATH += $$PWD/../lib/luis-l-gist/ SOURCES += \ ../lib/luis-l-gist/interactiveview.cpp \ - abouthandler.cpp \ browsertab.cpp \ certificatehelper.cpp \ - certificateiodialog.cpp \ - certificatemanagementdialog.cpp \ - certificateselectiondialog.cpp \ cryptoidentity.cpp \ + dialogs/certificateiodialog.cpp \ + dialogs/certificatemanagementdialog.cpp \ + dialogs/certificateselectiondialog.cpp \ + dialogs/newidentitiydialog.cpp \ + dialogs/settingsdialog.cpp \ documentoutlinemodel.cpp \ documentstyle.cpp \ - elidelabel.cpp \ favouritecollection.cpp \ - filehandler.cpp \ - fingerclient.cpp \ - geminiclient.cpp \ - geminirenderer.cpp \ - gopherclient.cpp \ - gophermaprenderer.cpp \ identitycollection.cpp \ ioutil.cpp \ main.cpp \ mainwindow.cpp \ - mediaplayer.cpp \ + widgets/mediaplayer.cpp \ mimeparser.cpp \ - newidentitiydialog.cpp \ - plaintextrenderer.cpp \ protocolhandler.cpp \ + protocols/abouthandler.cpp \ + protocols/filehandler.cpp \ + protocols/fingerclient.cpp \ + protocols/geminiclient.cpp \ + protocols/gopherclient.cpp \ + protocols/webclient.cpp \ protocolsetup.cpp \ - searchbar.cpp \ - settingsdialog.cpp \ + renderers/geminirenderer.cpp \ + renderers/gophermaprenderer.cpp \ + renderers/plaintextrenderer.cpp \ ssltrust.cpp \ - ssltrusteditor.cpp \ tabbrowsinghistory.cpp \ trustedhost.cpp \ trustedhostcollection.cpp \ - webclient.cpp + widgets/elidelabel.cpp \ + widgets/searchbar.cpp \ + widgets/ssltrusteditor.cpp HEADERS += \ ../lib/luis-l-gist/interactiveview.hpp \ - abouthandler.hpp \ browsertab.hpp \ certificatehelper.hpp \ - certificateiodialog.hpp \ - certificatemanagementdialog.hpp \ - certificateselectiondialog.hpp \ cryptoidentity.hpp \ + dialogs/certificateiodialog.hpp \ + dialogs/certificatemanagementdialog.hpp \ + dialogs/certificateselectiondialog.hpp \ + dialogs/newidentitiydialog.hpp \ + dialogs/settingsdialog.hpp \ documentoutlinemodel.hpp \ documentstyle.hpp \ - elidelabel.hpp \ favouritecollection.hpp \ - filehandler.hpp \ - fingerclient.hpp \ - geminiclient.hpp \ - geminirenderer.hpp \ - gopherclient.hpp \ - gophermaprenderer.hpp \ identitycollection.hpp \ ioutil.hpp \ kristall.hpp \ mainwindow.hpp \ - mediaplayer.hpp \ + widgets/mediaplayer.hpp \ mimeparser.hpp \ - newidentitiydialog.hpp \ - plaintextrenderer.hpp \ protocolhandler.hpp \ + protocols/abouthandler.hpp \ + protocols/filehandler.hpp \ + protocols/fingerclient.hpp \ + protocols/geminiclient.hpp \ + protocols/gopherclient.hpp \ + protocols/webclient.hpp \ protocolsetup.hpp \ - searchbar.hpp \ - settingsdialog.hpp \ + renderers/geminirenderer.hpp \ + renderers/gophermaprenderer.hpp \ + renderers/plaintextrenderer.hpp \ ssltrust.hpp \ - ssltrusteditor.hpp \ tabbrowsinghistory.hpp \ trustedhost.hpp \ trustedhostcollection.hpp \ - webclient.hpp + widgets/elidelabel.hpp \ + widgets/searchbar.hpp \ + widgets/ssltrusteditor.hpp FORMS += \ - browsertab.ui \ - certificateiodialog.ui \ - certificatemanagementdialog.ui \ - certificateselectiondialog.ui \ - mainwindow.ui \ - mediaplayer.ui \ - newidentitiydialog.ui \ - settingsdialog.ui \ - ssltrusteditor.ui + browsertab.ui \ + dialogs/certificateiodialog.ui \ + dialogs/certificatemanagementdialog.ui \ + dialogs/certificateselectiondialog.ui \ + dialogs/newidentitiydialog.ui \ + dialogs/settingsdialog.ui \ + mainwindow.ui \ + widgets/mediaplayer.ui \ + widgets/ssltrusteditor.ui TRANSLATIONS += \ kristall_en_US.ts diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 9711cfa..625fc3a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1,7 +1,7 @@ #include "mainwindow.hpp" #include "ui_mainwindow.h" #include "browsertab.hpp" -#include "settingsdialog.hpp" +#include "dialogs/settingsdialog.hpp" #include <cassert> #include <QMessageBox> #include <memory> @@ -13,7 +13,7 @@ #include "ioutil.hpp" #include "kristall.hpp" -#include "certificatemanagementdialog.hpp" +#include "dialogs/certificatemanagementdialog.hpp" MainWindow::MainWindow(QApplication * app, QWidget *parent) : QMainWindow(parent), diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp index dfa7ebc..85b9d59 100644 --- a/src/mainwindow.hpp +++ b/src/mainwindow.hpp @@ -7,10 +7,10 @@ #include "favouritecollection.hpp" -#include "geminirenderer.hpp" +#include "renderers/geminirenderer.hpp" #include "protocolsetup.hpp" -#include "elidelabel.hpp" +#include "widgets/elidelabel.hpp" #include "browsertab.hpp" diff --git a/src/abouthandler.cpp b/src/protocols/abouthandler.cpp index 01eefff..01eefff 100644 --- a/src/abouthandler.cpp +++ b/src/protocols/abouthandler.cpp diff --git a/src/abouthandler.hpp b/src/protocols/abouthandler.hpp index 86b9180..86b9180 100644 --- a/src/abouthandler.hpp +++ b/src/protocols/abouthandler.hpp diff --git a/src/filehandler.cpp b/src/protocols/filehandler.cpp index d26cd57..d26cd57 100644 --- a/src/filehandler.cpp +++ b/src/protocols/filehandler.cpp diff --git a/src/filehandler.hpp b/src/protocols/filehandler.hpp index 55ac248..55ac248 100644 --- a/src/filehandler.hpp +++ b/src/protocols/filehandler.hpp diff --git a/src/fingerclient.cpp b/src/protocols/fingerclient.cpp index 1c9a6a3..1c9a6a3 100644 --- a/src/fingerclient.cpp +++ b/src/protocols/fingerclient.cpp diff --git a/src/fingerclient.hpp b/src/protocols/fingerclient.hpp index 63d04fd..63d04fd 100644 --- a/src/fingerclient.hpp +++ b/src/protocols/fingerclient.hpp diff --git a/src/geminiclient.cpp b/src/protocols/geminiclient.cpp index 6986250..6986250 100644 --- a/src/geminiclient.cpp +++ b/src/protocols/geminiclient.cpp diff --git a/src/geminiclient.hpp b/src/protocols/geminiclient.hpp index 85c4f76..85c4f76 100644 --- a/src/geminiclient.hpp +++ b/src/protocols/geminiclient.hpp diff --git a/src/gopherclient.cpp b/src/protocols/gopherclient.cpp index 63c35ca..63c35ca 100644 --- a/src/gopherclient.cpp +++ b/src/protocols/gopherclient.cpp diff --git a/src/gopherclient.hpp b/src/protocols/gopherclient.hpp index 888ebd8..888ebd8 100644 --- a/src/gopherclient.hpp +++ b/src/protocols/gopherclient.hpp diff --git a/src/webclient.cpp b/src/protocols/webclient.cpp index ed87694..ed87694 100644 --- a/src/webclient.cpp +++ b/src/protocols/webclient.cpp diff --git a/src/webclient.hpp b/src/protocols/webclient.hpp index 58ae029..58ae029 100644 --- a/src/webclient.hpp +++ b/src/protocols/webclient.hpp diff --git a/src/geminirenderer.cpp b/src/renderers/geminirenderer.cpp index ec00869..ec00869 100644 --- a/src/geminirenderer.cpp +++ b/src/renderers/geminirenderer.cpp diff --git a/src/geminirenderer.hpp b/src/renderers/geminirenderer.hpp index 7173d50..7173d50 100644 --- a/src/geminirenderer.hpp +++ b/src/renderers/geminirenderer.hpp diff --git a/src/gophermaprenderer.cpp b/src/renderers/gophermaprenderer.cpp index 6779a9a..6779a9a 100644 --- a/src/gophermaprenderer.cpp +++ b/src/renderers/gophermaprenderer.cpp diff --git a/src/gophermaprenderer.hpp b/src/renderers/gophermaprenderer.hpp index 3835cec..3835cec 100644 --- a/src/gophermaprenderer.hpp +++ b/src/renderers/gophermaprenderer.hpp diff --git a/src/plaintextrenderer.cpp b/src/renderers/plaintextrenderer.cpp index 37801a4..37801a4 100644 --- a/src/plaintextrenderer.cpp +++ b/src/renderers/plaintextrenderer.cpp diff --git a/src/plaintextrenderer.hpp b/src/renderers/plaintextrenderer.hpp index cfa2ccb..cfa2ccb 100644 --- a/src/plaintextrenderer.hpp +++ b/src/renderers/plaintextrenderer.hpp diff --git a/src/elidelabel.cpp b/src/widgets/elidelabel.cpp index dc0a6b2..dc0a6b2 100644 --- a/src/elidelabel.cpp +++ b/src/widgets/elidelabel.cpp diff --git a/src/elidelabel.hpp b/src/widgets/elidelabel.hpp index 9eae69d..9eae69d 100644 --- a/src/elidelabel.hpp +++ b/src/widgets/elidelabel.hpp diff --git a/src/mediaplayer.cpp b/src/widgets/mediaplayer.cpp index e510d21..e510d21 100644 --- a/src/mediaplayer.cpp +++ b/src/widgets/mediaplayer.cpp diff --git a/src/mediaplayer.hpp b/src/widgets/mediaplayer.hpp index c39a800..c39a800 100644 --- a/src/mediaplayer.hpp +++ b/src/widgets/mediaplayer.hpp diff --git a/src/mediaplayer.ui b/src/widgets/mediaplayer.ui index 39fb570..39fb570 100644 --- a/src/mediaplayer.ui +++ b/src/widgets/mediaplayer.ui diff --git a/src/searchbar.cpp b/src/widgets/searchbar.cpp index 4d8ea3a..4d8ea3a 100644 --- a/src/searchbar.cpp +++ b/src/widgets/searchbar.cpp diff --git a/src/searchbar.hpp b/src/widgets/searchbar.hpp index e03331f..e03331f 100644 --- a/src/searchbar.hpp +++ b/src/widgets/searchbar.hpp diff --git a/src/ssltrusteditor.cpp b/src/widgets/ssltrusteditor.cpp index af10a72..af10a72 100644 --- a/src/ssltrusteditor.cpp +++ b/src/widgets/ssltrusteditor.cpp diff --git a/src/ssltrusteditor.hpp b/src/widgets/ssltrusteditor.hpp index 841ba64..841ba64 100644 --- a/src/ssltrusteditor.hpp +++ b/src/widgets/ssltrusteditor.hpp diff --git a/src/ssltrusteditor.ui b/src/widgets/ssltrusteditor.ui index 068c065..068c065 100644 --- a/src/ssltrusteditor.ui +++ b/src/widgets/ssltrusteditor.ui |
