X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fui%2Ftopicwidget.ui;h=528fc214ec3d959d0e9b84a864912789d3e3056e;hb=c8f0fad36b10552494f8ec3c3a45b52a3f0d2663;hp=5307a83606147a776df45be3a498563c64d5908b;hpb=c85f07cd06593a778046d30809480c9db49c4802;p=quassel.git

diff --git a/src/qtui/ui/topicwidget.ui b/src/qtui/ui/topicwidget.ui
index 5307a836..528fc214 100644
--- a/src/qtui/ui/topicwidget.ui
+++ b/src/qtui/ui/topicwidget.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>558</width>
-    <height>29</height>
+    <width>515</width>
+    <height>44</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -32,19 +32,29 @@
   </property>
   <layout class="QHBoxLayout" >
    <property name="leftMargin" >
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="topMargin" >
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="rightMargin" >
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="bottomMargin" >
-    <number>0</number>
+    <number>2</number>
    </property>
    <item>
-    <widget class="QLineEdit" name="topicLineEdit" />
+    <widget class="ClearableLineEdit" name="topicLineEdit" />
+   </item>
+   <item>
+    <widget class="TopicButton" native="1" name="topicButton" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
    </item>
    <item>
     <widget class="QToolButton" name="topicEditButton" >
@@ -55,7 +65,7 @@
       <string>...</string>
      </property>
      <property name="icon" >
-      <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/configure.png</iconset>
+      <iconset/>
      </property>
      <property name="iconSize" >
       <size>
@@ -67,6 +77,19 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>TopicButton</class>
+   <extends>QWidget</extends>
+   <header location="global" >topicbutton.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>ClearableLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global" >clearablelineedit.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../../icons/icons.qrc" />
  </resources>