chore: cleanup + addition

- remove clear cache option
- provide single app data cleanup option
- close settings with esc button

3 files changed, 54 insertions, 98 deletions

diff --git a/src/settingswidget.cpp b/src/settingswidget.cpp
index 1322e17..4bd213d 100644
--- a/src/settingswidget.cpp
+++ b/src/settingswidget.cpp
@@ -243,7 +243,6 @@ void SettingsWidget::refresh() {
   ui->themeComboBox->setCurrentText(
       utils::toCamelCase(settings.value("windowTheme", "light").toString()));
 
-  ui->cacheSize->setText(utils::refreshCacheSize(cachePath()));
   ui->cookieSize->setText(utils::refreshCacheSize(persistentStoragePath()));
 
   // update dict settings at runtime
@@ -279,43 +278,21 @@ QString SettingsWidget::persistentStoragePath() {
   return enginePersistentStoragePath;
 }
 
-void SettingsWidget::on_deleteCache_clicked() {
-  QMessageBox msgBox;
-  msgBox.setText("This will delete the cache! Cache makes "
-                 "application load faster.");
-  msgBox.setIconPixmap(
-      QPixmap(":/icons/information-line.png")
-          .scaled(42, 42, Qt::KeepAspectRatio, Qt::SmoothTransformation));
-
-  msgBox.setInformativeText("Delete cache?");
-  msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-  msgBox.setDefaultButton(QMessageBox::No);
-  int ret = msgBox.exec();
-  switch (ret) {
-  case QMessageBox::Yes: {
-    utils::delete_cache(this->cachePath());
-    refresh();
-    break;
-  }
-  case QMessageBox::No:
-    break;
-  }
-}
-
 void SettingsWidget::on_deletePersistentData_clicked() {
   QMessageBox msgBox;
   msgBox.setText("This will delete Persistent Data ! Persistent data includes "
-                 "persistent cookies, HTML5 local storage, and visited links.");
+                 "persistent cookies and Cache, and Quit the application.");
   msgBox.setIconPixmap(
       QPixmap(":/icons/information-line.png")
           .scaled(42, 42, Qt::KeepAspectRatio, Qt::SmoothTransformation));
-  msgBox.setInformativeText("Delete Cookies?");
+  msgBox.setInformativeText("Delete Cookies and Quit Application?");
   msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
   msgBox.setDefaultButton(QMessageBox::No);
   int ret = msgBox.exec();
   switch (ret) {
   case QMessageBox::Yes: {
     clearAllData();
+    qApp->quit();
     break;
   }
   case QMessageBox::No:
@@ -773,3 +750,11 @@ void SettingsWidget::on_fullWidthViewCheckbox_toggled(bool checked) {
   settings.setValue("fullWidthView", checked);
   emit updateFullWidthView(checked);
 }
+
+void SettingsWidget::keyPressEvent(QKeyEvent *e)
+{
+   if (e->key() == Qt::Key_Escape)
+      this->close();
+
+   QWidget::keyPressEvent(e);
+}
diff --git a/src/settingswidget.h b/src/settingswidget.h
index 8e8eab8..d533343 100644
--- a/src/settingswidget.h
+++ b/src/settingswidget.h
@@ -32,7 +32,7 @@ signals:
   void updateFullWidthView(bool checked);
 
 public:
-  explicit SettingsWidget(QWidget *parent = nullptr,int screenNumber = 0,
+  explicit SettingsWidget(QWidget *parent = nullptr, int screenNumber = 0,
                           QString engineCachePath = "",
                           QString enginePersistentStoragePath = "");
   ~SettingsWidget();
@@ -51,7 +51,7 @@ public slots:
 protected slots:
   bool eventFilter(QObject *obj, QEvent *event);
   void closeEvent(QCloseEvent *event);
-
+  void keyPressEvent(QKeyEvent *e);
 private slots:
   QString cachePath();
   QString persistentStoragePath();
@@ -67,8 +67,6 @@ private slots:
   void on_chnageCurrentPasswordPushButton_clicked();
   void on_closeButtonActionComboBox_currentIndexChanged(int index);
   void on_defaultUserAgentButton_clicked();
-  void on_deleteCache_clicked();
-  void on_deletePersistentData_clicked();
   void on_dictComboBox_currentIndexChanged(const QString &arg1);
   void on_enableSpellCheck_toggled(bool checked);
   void on_minimizeOnTrayIconClick_toggled(bool checked);
@@ -99,6 +97,8 @@ private slots:
 
   void on_fullWidthViewCheckbox_toggled(bool checked);
 
+  void on_deletePersistentData_clicked();
+
 private:
   Ui::SettingsWidget *ui;
   QString engineCachePath, enginePersistentStoragePath;
diff --git a/src/settingswidget.ui b/src/settingswidget.ui
index 1b259a8..295d91f 100644
--- a/src/settingswidget.ui
+++ b/src/settingswidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>693</width>
-    <height>867</height>
+    <width>651</width>
+    <height>841</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -38,8 +38,7 @@
       </sizepolicy>
      </property>
      <property name="styleSheet">
-      <string notr="true">
-</string>
+      <string notr="true"/>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_7">
       <item>
@@ -96,8 +95,8 @@ background:transparent;
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>677</width>
-        <height>791</height>
+        <width>635</width>
+        <height>760</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -917,15 +916,34 @@ background:transparent;
        <item>
         <widget class="QGroupBox" name="groupBox_7">
          <property name="title">
-          <string>Storage and Other Settings</string>
+          <string>Storage </string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <layout class="QGridLayout" name="gridLayout_2">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_11">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="font">
+               <font>
+                <pointsize>10</pointsize>
+                <italic>false</italic>
+               </font>
+              </property>
+              <property name="text">
+               <string>Property</string>
+              </property>
+             </widget>
+            </item>
             <item row="1" column="2">
-             <widget class="QPushButton" name="deleteCache">
+             <widget class="QPushButton" name="deletePersistentData">
               <property name="text">
-               <string>  Clear</string>
+               <string>  Clear (requires restart)</string>
               </property>
               <property name="icon">
                <iconset resource="icons.qrc">
@@ -934,14 +952,17 @@ background:transparent;
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QLabel" name="label_3">
+             <widget class="QLabel" name="label_5">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Persistent data includes persistent cookies, HTML5 local storage, and visited links.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
               <property name="text">
-               <string>Cache</string>
+               <string>Persistent data</string>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
-             <widget class="QLabel" name="cacheSize">
+             <widget class="QLabel" name="cookieSize">
               <property name="text">
                <string>-</string>
               </property>
@@ -950,27 +971,8 @@ background:transparent;
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_11">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="font">
-               <font>
-                <pointsize>10</pointsize>
-                <italic>false</italic>
-               </font>
-              </property>
-              <property name="text">
-               <string>Property</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="2">
-             <widget class="QLabel" name="label_13">
+            <item row="0" column="1">
+             <widget class="QLabel" name="label_12">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
                 <horstretch>0</horstretch>
@@ -984,15 +986,15 @@ background:transparent;
                </font>
               </property>
               <property name="text">
-               <string>Action</string>
+               <string>Size</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="QLabel" name="label_12">
+            <item row="0" column="2">
+             <widget class="QLabel" name="label_13">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
                 <horstretch>0</horstretch>
@@ -1006,44 +1008,13 @@ background:transparent;
                </font>
               </property>
               <property name="text">
-               <string>Size</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_5">
-              <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Persistent data includes persistent cookies, HTML5 local storage, and visited links.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-              </property>
-              <property name="text">
-               <string>Persistent data</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QLabel" name="cookieSize">
-              <property name="text">
-               <string>-</string>
+               <string>Action</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
               </property>
              </widget>
             </item>
-            <item row="2" column="2">
-             <widget class="QPushButton" name="deletePersistentData">
-              <property name="text">
-               <string>  Clear</string>
-              </property>
-              <property name="icon">
-               <iconset resource="icons.qrc">
-                <normaloff>:/icons/delete-bin-3-line.png</normaloff>:/icons/delete-bin-3-line.png</iconset>
-              </property>
-             </widget>
-            </item>
            </layout>
           </item>
          </layout>