From e990840b71a0d122627125a6223f576816d8ecda Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 18 May 2009 10:24:57 +0200
Subject: 1st commit on cookie branch. Refactoring Ui classes

---
 src/cookiesexceptions.ui | 171 +++++++++++++++++++++++------------------------
 1 file changed, 83 insertions(+), 88 deletions(-)

(limited to 'src/cookiesexceptions.ui')

diff --git a/src/cookiesexceptions.ui b/src/cookiesexceptions.ui
index de59eee0..ef8d0705 100644
--- a/src/cookiesexceptions.ui
+++ b/src/cookiesexceptions.ui
@@ -1,46 +1,47 @@
-<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="Form">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>466</width>
-    <height>446</height>
+    <width>457</width>
+    <height>495</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">
    <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"/>
         </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 +50,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,50 +85,50 @@
     </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>
+     <layout class="QGridLayout" name="_4">
+      <item row="1" column="0" colspan="5">
+       <widget class="EditTableView" name="exceptionTable"/>
       </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" >
+      <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" >
+      <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="2" >
+      <item row="2" column="2" colspan="3">
        <spacer>
-        <property name="orientation" >
+        <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="sizeHint" stdset="0" >
+        <property name="sizeType">
+         <enum>QSizePolicy::Minimum</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
@@ -135,22 +136,33 @@
         </property>
        </spacer>
       </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>
+      <item row="0" column="4">
+       <widget class="KLineEdit" name="search"/>
+      </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>
@@ -158,22 +170,5 @@
   </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>
-- 
cgit v1.2.1


From 9169bb7a80bb9e3e443b6baaeb6e18794d287fa5 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 18 May 2009 12:03:25 +0200
Subject: (hopefully) last Ui fixes

---
 src/cookiesexceptions.ui | 146 ++++++++++++++++++++++++++---------------------
 1 file changed, 81 insertions(+), 65 deletions(-)

(limited to 'src/cookiesexceptions.ui')

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>
-- 
cgit v1.2.1


From 67ac2452917657a4035d93c9a19cc02bdd2333d3 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 19 May 2009 12:42:42 +0200
Subject: Fixing Compilation. Going to feature improvements

---
 src/cookiesexceptions.ui | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'src/cookiesexceptions.ui')

diff --git a/src/cookiesexceptions.ui b/src/cookiesexceptions.ui
index b4ce54a0..0a756f56 100644
--- a/src/cookiesexceptions.ui
+++ b/src/cookiesexceptions.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>377</width>
-    <height>405</height>
+    <width>635</width>
+    <height>416</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -96,22 +96,6 @@
      <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">
-- 
cgit v1.2.1


From de173857a95933a3de8ef446bde8a1a004d21d65 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 19 May 2009 17:26:02 +0200
Subject: Fixing Ui cookies dim

---
 src/cookiesexceptions.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/cookiesexceptions.ui')

diff --git a/src/cookiesexceptions.ui b/src/cookiesexceptions.ui
index 0a756f56..3e28b42a 100644
--- a/src/cookiesexceptions.ui
+++ b/src/cookiesexceptions.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>635</width>
-    <height>416</height>
+    <width>1000</width>
+    <height>400</height>
    </rect>
   </property>
   <property name="windowTitle">
-- 
cgit v1.2.1