(hopefully) last Ui fixes

3 files changed, 89 insertions, 69 deletions

diff --git a/src/cookiedialogs.cpp b/src/cookiedialogs.cpp
index b4e043aa..3b918c8b 100644
--- a/src/cookiedialogs.cpp
+++ b/src/cookiedialogs.cpp
@@ -127,8 +127,8 @@ CookiesExceptionsDialog::CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *
 
     m_exceptionsWidget->exceptionTable->setModel(m_proxyModel);
 
-    CookieModel *cookieModel = new CookieModel(cookieJar, this);
-    m_exceptionsWidget->domainLineEdit->setCompleter(new QCompleter(cookieModel, m_exceptionsWidget->domainLineEdit));
+//     CookieModel *cookieModel = new CookieModel(cookieJar, this);
+//     m_exceptionsWidget->domainLineEdit->setCompleter(new QCompleter(cookieModel, m_exceptionsWidget->domainLineEdit));
 
     connect(m_exceptionsWidget->domainLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &)));
     connect(m_exceptionsWidget->blockButton, SIGNAL(clicked()), this, SLOT(block()));
diff --git a/src/cookies.ui b/src/cookies.ui
index 8c9abc55..16e0f4ea 100644
--- a/src/cookies.ui
+++ b/src/cookies.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CookiesWidget</class>
- <widget class="QWidget" name="Cookies">
+ <widget class="QWidget" name="CookiesWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -46,7 +46,11 @@
       </widget>
      </item>
      <item>
-      <widget class="KLineEdit" name="search"/>
+      <widget class="KLineEdit" name="search">
+       <property name="showClearButton" stdset="0">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
diff --git a/src/cookiesexceptions.ui b/src/cookiesexceptions.ui
index ef8d0705..b4ce54a0 100644
--- a/src/cookiesexceptions.ui
+++ b/src/cookiesexceptions.ui
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CookiesExceptionsWidget</class>
- <widget class="QWidget" name="Form">
+ <widget class="QWidget" name="CookiesExceptionsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>457</width>
-    <height>495</height>
+    <width>377</width>
+    <height>405</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QGroupBox" name="CookiesExceptionWidget">
      <property name="title">
@@ -30,7 +30,11 @@
          </widget>
         </item>
         <item>
-         <widget class="KLineEdit" name="domainLineEdit"/>
+         <widget class="KLineEdit" name="domainLineEdit">
+          <property name="showClearButton" stdset="0">
+           <bool>true</bool>
+          </property>
+         </widget>
         </item>
        </layout>
       </item>
@@ -89,68 +93,80 @@
      <property name="title">
       <string>Exceptions</string>
      </property>
-     <layout class="QGridLayout" name="_4">
-      <item row="1" column="0" colspan="5">
-       <widget class="EditTableView" name="exceptionTable"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QPushButton" name="removeButton">
-        <property name="text">
-         <string>&amp;Remove</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="removeAllButton">
-        <property name="text">
-         <string>Remove &amp;All</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" colspan="3">
-       <spacer>
-        <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="0" column="0">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Minimum</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Minimum</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Search:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="KLineEdit" name="search">
+          <property name="showClearButton" stdset="0">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="label_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Search:</string>
-        </property>
-       </widget>
+      <item>
+       <widget class="EditTableView" name="exceptionTable"/>
       </item>
-      <item row="0" column="4">
-       <widget class="KLineEdit" name="search"/>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QPushButton" name="removeButton">
+          <property name="text">
+           <string>&amp;Remove</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="removeAllButton">
+          <property name="text">
+           <string>Remove &amp;All</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>