From 20f3b48898d32eb6838adffed1ab5b24c1a3c8c4 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Sat, 3 Aug 2013 22:57:50 +0200
Subject: [PATCH] Removed link for removing cookies from Adobe Flash Player

---
 src/lib/other/clearprivatedata.cpp |   6 --
 src/lib/other/clearprivatedata.h   |   1 -
 src/lib/other/clearprivatedata.ui  | 147 +++++++++++++----------------
 3 files changed, 65 insertions(+), 89 deletions(-)

diff --git a/src/lib/other/clearprivatedata.cpp b/src/lib/other/clearprivatedata.cpp
index be674d18b..50871791b 100644
--- a/src/lib/other/clearprivatedata.cpp
+++ b/src/lib/other/clearprivatedata.cpp
@@ -43,7 +43,6 @@ ClearPrivateData::ClearPrivateData(QupZilla* mainClass, QWidget* parent)
 {
     ui->setupUi(this);
     ui->buttonBox->setFocus();
-    connect(ui->clearAdobeCookies, SIGNAL(clicked(QPoint)), this, SLOT(clearFlash()));
     connect(ui->history, SIGNAL(clicked(bool)), this, SLOT(historyClicked(bool)));
     connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(dialogAccepted()));
 
@@ -90,11 +89,6 @@ void ClearPrivateData::clearIcons()
     qIconProvider->clearIconDatabase();
 }
 
-void ClearPrivateData::clearFlash()
-{
-    p_QupZilla->tabWidget()->addView(QUrl("http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager07.html"));
-}
-
 void ClearPrivateData::closeEvent(QCloseEvent* e)
 {
     Settings settings;
diff --git a/src/lib/other/clearprivatedata.h b/src/lib/other/clearprivatedata.h
index 1f94614d4..80d6a4290 100644
--- a/src/lib/other/clearprivatedata.h
+++ b/src/lib/other/clearprivatedata.h
@@ -42,7 +42,6 @@ public:
 private slots:
     void historyClicked(bool state);
     void dialogAccepted();
-    void clearFlash();
 
 private:
     void closeEvent(QCloseEvent* e);
diff --git a/src/lib/other/clearprivatedata.ui b/src/lib/other/clearprivatedata.ui
index d2ad07cd9..f9745d86e 100644
--- a/src/lib/other/clearprivatedata.ui
+++ b/src/lib/other/clearprivatedata.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>308</width>
-    <height>310</height>
+    <width>272</width>
+    <height>264</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,13 +21,10 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QCheckBox" name="history">
+   <item row="9" column="0" colspan="2">
+    <widget class="QCheckBox" name="icons">
      <property name="text">
-      <string>Clear history</string>
-     </property>
-     <property name="checked">
-      <bool>false</bool>
+      <string>Clear icons</string>
      </property>
     </widget>
    </item>
@@ -41,36 +38,16 @@
      </property>
     </widget>
    </item>
-   <item row="9" column="0" colspan="2">
-    <widget class="QCheckBox" name="icons">
+   <item row="5" column="0" colspan="2">
+    <widget class="QCheckBox" name="databases">
      <property name="text">
-      <string>Clear icons</string>
+      <string>Clear web databases</string>
      </property>
-    </widget>
-   </item>
-   <item row="11" column="1">
-    <widget class="ClickableLabel" name="clearAdobeCookies">
-     <property name="cursor">
-      <cursorShape>PointingHandCursor</cursorShape>
-     </property>
-     <property name="text">
-      <string>Clear cookies from Adobe Flash Player</string>
-     </property>
-     <property name="html-link-look" stdset="0">
+     <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="12" column="1" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0" colspan="2">
     <widget class="QLabel" name="label_3">
      <property name="text">
@@ -78,6 +55,16 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QCheckBox" name="history">
+     <property name="text">
+      <string>Clear history</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="2">
     <widget class="QLabel" name="icon">
      <property name="sizePolicy">
@@ -94,6 +81,52 @@
      </property>
     </widget>
    </item>
+   <item row="11" column="1" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QCheckBox" name="localStorage">
+     <property name="text">
+      <string>Clear local storage</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0" colspan="2">
+    <widget class="QCheckBox" name="cookies">
+     <property name="text">
+      <string>Clear cookies</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item row="3" column="1" colspan="2">
     <widget class="QComboBox" name="historyLength">
      <property name="enabled">
@@ -121,58 +154,8 @@
      </item>
     </widget>
    </item>
-   <item row="3" column="0">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="5" column="0" colspan="2">
-    <widget class="QCheckBox" name="databases">
-     <property name="text">
-      <string>Clear web databases</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0" colspan="2">
-    <widget class="QCheckBox" name="localStorage">
-     <property name="text">
-      <string>Clear local storage</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0" colspan="2">
-    <widget class="QCheckBox" name="cookies">
-     <property name="text">
-      <string>Clear cookies</string>
-     </property>
-     <property name="checked">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>ClickableLabel</class>
-   <extends>QLabel</extends>
-   <header>clickablelabel.h</header>
-  </customwidget>
- </customwidgets>
  <resources>
   <include location="../data/icons.qrc"/>
  </resources>