Merge branch 'master' into local-svn

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@976901 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 99 insertions, 104 deletions

diff --git a/src/cookiesexceptions.ui b/src/cookiesexceptions.ui
index de59eee0..3e28b42a 100644
--- a/src/cookiesexceptions.ui
+++ b/src/cookiesexceptions.ui
@@ -1,46 +1,51 @@
-<ui version="4.0" >
- <class>CookiesExceptionsDialog</class>
- <widget class="QDialog" name="CookiesExceptionsDialog" >
-  <property name="geometry" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CookiesExceptionsWidget</class>
+ <widget class="QWidget" name="CookiesExceptionsWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>466</width>
-    <height>446</height>
+    <width>1000</width>
+    <height>400</height>
    </rect>
   </property>
-  <property name="windowTitle" >
-   <string>Cookie Exceptions</string>
+  <property name="windowTitle">
+   <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="QGroupBox" name="newExceptionGroupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="CookiesExceptionWidget">
+     <property name="title">
       <string>New Exception</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <layout class="QHBoxLayout" >
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <layout class="QHBoxLayout" name="_2">
         <item>
-         <widget class="QLabel" name="label" >
-          <property name="text" >
+         <widget class="QLabel" name="label">
+          <property name="text">
            <string>Domain:</string>
           </property>
          </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>
-      <item row="1" column="0" >
-       <layout class="QHBoxLayout" >
+      <item row="1" column="0">
+       <layout class="QHBoxLayout" name="_3">
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>81</width>
             <height>25</height>
@@ -49,31 +54,31 @@
          </spacer>
         </item>
         <item>
-         <widget class="QPushButton" name="blockButton" >
-          <property name="enabled" >
+         <widget class="QPushButton" name="blockButton">
+          <property name="enabled">
            <bool>false</bool>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>Block</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="allowForSessionButton" >
-          <property name="enabled" >
+         <widget class="QPushButton" name="allowForSessionButton">
+          <property name="enabled">
            <bool>false</bool>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>Allow For Session</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="allowButton" >
-          <property name="enabled" >
+         <widget class="QPushButton" name="allowButton">
+          <property name="enabled">
            <bool>false</bool>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>Allow</string>
           </property>
          </widget>
@@ -84,96 +89,86 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="ExceptionsGroupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="ExceptionsGroupBox">
+     <property name="title">
       <string>Exceptions</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" colspan="3" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>252</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="3" >
-       <widget class="KLineEdit" name="search" />
-      </item>
-      <item row="1" column="0" colspan="4" >
-       <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>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <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="2" column="1" >
-       <widget class="QPushButton" name="removeAllButton" >
-        <property name="text" >
-         <string>Remove &amp;All</string>
-        </property>
-       </widget>
+      <item>
+       <widget class="EditTableView" name="exceptionTable"/>
       </item>
-      <item row="2" column="2" colspan="2" >
-       <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 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>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
+   <class>KLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>klineedit.h</header>
+  </customwidget>
+  <customwidget>
    <class>EditTableView</class>
    <extends>QTableView</extends>
    <header>edittableview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>CookiesExceptionsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>381</x>
-     <y>428</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>336</x>
-     <y>443</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>