Mercurial Repositories > eric / file diff

--- a/Helpviewer/AdBlock/AdBlockDialog.ui	Mon Jul 30 19:19:29 2012 +0200
+++ b/Helpviewer/AdBlock/AdBlockDialog.ui	Sat Aug 04 13:30:04 2012 +0200
@@ -29,29 +29,22 @@
       <item>
        <layout class="QGridLayout" name="gridLayout">
         <property name="horizontalSpacing">
-         <number>0</number>
+         <number>20</number>
         </property>
         <item row="0" column="0" rowspan="2">
          <widget class="QLabel" name="iconLabel">
+          <property name="minimumSize">
+           <size>
+            <width>48</width>
+            <height>48</height>
+           </size>
+          </property>
           <property name="text">
            <string notr="true">Icon</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="1" colspan="3">
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>158</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="1" column="1">
+        <item row="0" column="1">
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -64,40 +57,18 @@
           </property>
          </spacer>
         </item>
-        <item row="1" column="2">
-         <widget class="QLineEdit" name="searchEdit">
+        <item row="1" column="1">
+         <widget class="E5LineEdit" name="searchEdit">
           <property name="toolTip">
            <string>Enter search term for subscriptions and rules</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="3">
-         <widget class="QToolButton" name="clearButton">
-          <property name="toolTip">
-           <string>Press to clear the search edit</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
        </layout>
       </item>
       <item>
-       <widget class="E5TreeView" name="subscriptionsTree">
-        <property name="dragDropMode">
-         <enum>QAbstractItemView::InternalMove</enum>
-        </property>
-        <property name="alternatingRowColors">
-         <bool>true</bool>
-        </property>
-        <property name="selectionMode">
-         <enum>QAbstractItemView::ExtendedSelection</enum>
-        </property>
-        <property name="textElideMode">
-         <enum>Qt::ElideMiddle</enum>
-        </property>
-        <property name="uniformRowHeights">
+       <widget class="QTabWidget" name="subscriptionsTabWidget">
+        <property name="documentMode">
          <bool>true</bool>
         </property>
        </widget>
@@ -172,16 +143,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5TreeView</class>
-   <extends>QTreeView</extends>
-   <header>E5Gui/E5TreeView</header>
+   <class>E5LineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>E5Gui/E5LineEdit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>adBlockGroup</tabstop>
   <tabstop>searchEdit</tabstop>
-  <tabstop>clearButton</tabstop>
-  <tabstop>subscriptionsTree</tabstop>
+  <tabstop>subscriptionsTabWidget</tabstop>
   <tabstop>actionButton</tabstop>
   <tabstop>updateSpinBox</tabstop>
   <tabstop>buttonBox</tabstop>
@@ -220,21 +190,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>clearButton</sender>
-   <signal>clicked()</signal>
-   <receiver>searchEdit</receiver>
-   <slot>clear()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>728</x>
-     <y>21</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>706</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>