X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fui%2Ftopicwidget.ui;h=528fc214ec3d959d0e9b84a864912789d3e3056e;hp=9d3edb1ded4e2f077cdf143d121433941e67ef71;hb=858c7dbcbfa84deda9a71b4f4d25b1555bae3cc1;hpb=9fd4619e9aca7d53d7c5df156a0b25956a1bf682

diff --git a/src/qtui/ui/topicwidget.ui b/src/qtui/ui/topicwidget.ui
index 9d3edb1d..528fc214 100644
--- a/src/qtui/ui/topicwidget.ui
+++ b/src/qtui/ui/topicwidget.ui
@@ -5,12 +5,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>568</width>
-    <height>25</height>
+    <width>515</width>
+    <height>44</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -32,29 +32,66 @@
   </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" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="text" >
       <string>...</string>
      </property>
+     <property name="icon" >
+      <iconset/>
+     </property>
+     <property name="iconSize" >
+      <size>
+       <width>16</width>
+       <height>16</height>
+      </size>
+     </property>
     </widget>
    </item>
   </layout>
  </widget>
- <resources/>
+ <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>
  <connections/>
 </ui>