X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fui%2Ftopicwidget.ui;h=3eae92e6baed4251313b86ff493b447021ec0040;hb=c00b7e45809b6f3d6d02abbc1285728fe01af374;hp=4993bf886551ddddf88380d5b337559402510e06;hpb=87828aeae2510b29619aa79a3bd76885e2c1ebd4;p=quassel.git

diff --git a/src/qtui/ui/topicwidget.ui b/src/qtui/ui/topicwidget.ui
index 4993bf88..3eae92e6 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>515</width>
-    <height>44</height>
+    <width>611</width>
+    <height>36</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -32,39 +32,34 @@
   </property>
   <layout class="QHBoxLayout" >
    <property name="margin" >
-    <number>2</number>
+    <number>4</number>
    </property>
    <item>
-    <widget class="QLineEdit" name="topicLineEdit" />
+    <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="TopicButton" native="1" name="topicButton" >
+    <widget class="ClearableLineEdit" name="topicLineEdit" />
+   </item>
+   <item>
+    <widget class="ClickableLabel" name="topicEditButton" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
        <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>
+      <string/>
      </property>
-     <property name="icon" >
-      <iconset>
-       <normaloff/>
-      </iconset>
-     </property>
-     <property name="iconSize" >
-      <size>
-       <width>16</width>
-       <height>16</height>
-      </size>
+     <property name="pixmap" >
+      <pixmap resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/edit-clear.png</pixmap>
      </property>
     </widget>
    </item>
@@ -72,9 +67,19 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>TopicButton</class>
-   <extends>QWidget</extends>
-   <header location="global" >topicbutton.h</header>
+   <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>