X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=6aa5c51a28c3eaf9c5aa443cd92667a5aa31a17c;hp=5605cdf3760f10c07455192b78c77bce7ef77431;hb=2facce32fb6d97b52a7dc148044cae4b36a65d4c;hpb=ad39882c17bfd7d96cbcfd3873d4dd332722e84f

diff --git a/src/main.cpp b/src/main.cpp
index 5605cdf..6aa5c51 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,14 +18,17 @@
  */
 
 // Application headers.
-#include "mainwindow.h"
+#include "helpers/DomainsDatabaseHelper.h"
+#include "windows/BrowserWindow.h"
 
 // KDE Frameworks headers.
 #include <KAboutData>
 #include <KCrash>
+#include <KLocalizedString>
 #include <KDBusService>
 
 // Qt headers.
+#include <QApplication>
 #include <QCommandLineParser>
 #include <QFile>
 
@@ -40,10 +43,10 @@ int main(int argc, char *argv[])
     // Initialize KCrash.
     KCrash::initialize();
 
-    // Instantiate about data.
+    // Instantiate about data, setting the component name, the display name, and the version.
     KAboutData aboutData(QStringLiteral("privacybrowser"), i18n("Privacy Browser"), QStringLiteral("0.1"));
 
-    // Add the author information.
+    // Add the author name, job description, email address, and website.
     aboutData.addAuthor(i18n("Soren Stoutner"),i18n("Principal developer"), QStringLiteral("soren@stoutner.com"), QStringLiteral("https://www.stoutner.com/"));
 
     // Populate additional about data info.
@@ -51,7 +54,8 @@ int main(int argc, char *argv[])
     aboutData.setCopyrightStatement(i18n("Copyright © 2016-2017,2021-2022 Soren Stoutner <soren@stoutner.com>"));
     aboutData.setDesktopFileName(QStringLiteral("com.stoutner.privacybrowser"));
     aboutData.setHomepage(QStringLiteral("https://www.stoutner.com/privacy-browser-pc/"));
-    aboutData.setLicenseTextFile(":/licenses/GPLv3+.txt");
+    //aboutData.setLicense(KAboutLicense::GPL_V3, KAboutLicense::OrLaterVersions);  <https://redmine.stoutner.com/issues/822>
+    aboutData.setLicenseTextFile(QStringLiteral(":/licenses/GPLv3+.txt"));
     aboutData.setOrganizationDomain("stoutner.com");
     aboutData.setShortDescription(i18n("A web browser that respects your privacy."));
 
@@ -59,7 +63,7 @@ int main(int argc, char *argv[])
     KAboutData::setApplicationData(aboutData);
 
     // Set the window icon.
-    application.setWindowIcon(QIcon::fromTheme(QStringLiteral("privacybrowser"), QIcon(":/icons/privacy_browser.svg")));
+    application.setWindowIcon(QIcon::fromTheme(QStringLiteral("privacy-browser"), QIcon(":/icons/sc-apps-privacy-browser.svg")));
 
     // Create a command line parser.
     QCommandLineParser commandLineParser;
@@ -76,11 +80,14 @@ int main(int argc, char *argv[])
     // Register with D-Bus, allowing multiple instances and allowing the program to run if for some reason the registration fails.
     KDBusService appDBusService(KDBusService::Multiple | KDBusService::NoExitOnFailure);
 
+    // Add the domains database.
+    DomainsDatabaseHelper::addDatabase();
+
     // Create the main window.
-    MainWindow *mainWindowPointer = new MainWindow;
+    BrowserWindow *browserWindowPointer = new BrowserWindow();
 
     // Show the main window.
-    mainWindowPointer->show();
+    browserWindowPointer->show();
 
     // Return the application.
     return application.exec();