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

diff --git a/src/qtui/ui/topicwidget.ui b/src/qtui/ui/topicwidget.ui
index 9d3edb1d..cb00366b 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>634</width>
+    <height>36</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -31,30 +31,60 @@
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
+   <property name="margin" >
+    <number>4</number>
    </property>
    <item>
-    <widget class="QLineEdit" name="topicLineEdit" />
+    <widget class="ClickableLabel" name="topicEditButton" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="pixmap" >
+      <pixmap resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/edit-clear.png</pixmap>
+     </property>
+    </widget>
    </item>
    <item>
-    <widget class="QToolButton" name="topicEditButton" >
-     <property name="text" >
-      <string>...</string>
+    <widget class="TopicLabel" name="topicLabel" >
+     <property name="frameShape" >
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Raised</enum>
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="ClearableLineEdit" name="topicLineEdit" />
+   </item>
   </layout>
  </widget>
- <resources/>
+ <customwidgets>
+  <customwidget>
+   <class>ClearableLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global" >clearablelineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ClickableLabel</class>
+   <extends>QLabel</extends>
+   <header location="global" >clickablelabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>TopicLabel</class>
+   <extends>QFrame</extends>
+   <header location="global" >topiclabel.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../icons/icons.qrc" />
+ </resources>
  <connections/>
 </ui>