NEW:

- Saving window state and state of sidebar.
- Custom error pages.

FIXED:
- Crash when entering non-URL string into address bar.

WildFox-Mimic.pro

@@ -22,7 +22,8 @@ SOURCES += main.cpp\
     json.cpp \
     bookmarks.cpp \
     chrome/chromejsinterface.cpp \
-    chrome/chromebookmarks.cpp
+    chrome/chromebookmarks.cpp \
+    wfwebpage.cpp
 
 HEADERS  += mainwindow.h \
     wfwebview.h \
@@ -36,7 +37,8 @@ HEADERS  += mainwindow.h \
     types.h \
     bookmarks.h \
     chrome/chromejsinterface.h \
-    chrome/chromebookmarks.h
+    chrome/chromebookmarks.h \
+    wfwebpage.h
 
 FORMS    += mainwindow.ui \
     optionsdialog.ui \

chrome/chromebookmarks.h

@@ -18,7 +18,7 @@
 #include <QtWebKit>
 
 //class Bookmarks;
-#include "bookmarks.h"
+#include "../bookmarks.h"
 
 
 class ChromeBookmarks : public QObject {

mainwindow.cpp

@@ -140,6 +140,11 @@ MainWindow::MainWindow(QWidget *parent) :
         }
     }
 
+    // Restore application state
+    restoreGeometry(settings->value("geometry").toByteArray());
+    restoreState(settings->value("windowState").toByteArray());
+    bookmarksTree->setVisible(settings->value("bookmarkSidebar", false).toBool());
+
     // pass extension filter data to the network access manager
     //nam->setFilters(extFilters);
 
@@ -226,6 +231,7 @@ void MainWindow::gotoURL(QString url) {
     url.toLower();
     qDebug() << "Lower-case URL: " << url;
 
+    // TODO: perform more advanced URL validation.
     if (url.size() < 1) {
         QMessageBox::critical(this, "Error", "No URL provided: " + url);
         return;
@@ -551,3 +557,13 @@ void MainWindow::gotoAddressBar() {
     addressBar->setFocus(Qt::ShortcutFocusReason);
     addressBar->selectAll();
 }
+
+
+// --- CLOSE EVENT ---
+// Reeimplements the close event function of QWidget to save state.
+void MainWindow::closeEvent(QCloseEvent* event)  {
+     settings->setValue("geometry", saveGeometry());
+     settings->setValue("windowState", saveState());
+     settings->setValue("bookmarkSidebar", bookmarksTree->isVisible());
+     QMainWindow::closeEvent(event);
+ }

mainwindow.h

@@ -78,6 +78,9 @@ public slots:
                      const QString &textContent);
 
     void gotoAddressBar();
+
+protected:
+    void closeEvent(QCloseEvent* event);
 
 private:
     void setStopButton();

mainwindow.ui

@@ -148,6 +148,19 @@ height: 25px;
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QLineEdit" name="searchBar">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Search query</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </item>
     <item>
@@ -231,7 +244,7 @@ height: 25px;
      <x>0</x>
      <y>0</y>
      <width>741</width>
-     <height>25</height>
+     <height>18</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

tldutil.cpp

@@ -70,7 +70,7 @@ bool isEffectiveTLD(const QString &domain) {
 // Return it and the first public section preceding it.
 QString getPublicDomain(const QString &domain) {
     QStringList sections = domain.toLower().split(QLatin1Char('.'), QString::SkipEmptyParts);
-    if (sections.isEmpty())
+    if (sections.isEmpty() || sections.size() <= 1)
         return QString();
 
     QString tld = "";