chore: cleanup + addition

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

1 files changed, 39 insertions, 68 deletions

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>