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

diff --git a/src/qtui/ui/topicwidget.ui b/src/qtui/ui/topicwidget.ui
index 4993bf88..b1c047a2 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>515</width>
-    <height>44</height>
+    <width>644</width>
+    <height>35</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+   <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -30,41 +30,67 @@
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout" name="horizontalLayout" >
+   <property name="sizeConstraint" >
+    <enum>QLayout::SetDefaultConstraint</enum>
+   </property>
+   <property name="leftMargin" >
+    <number>4</number>
+   </property>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>4</number>
+   </property>
+   <property name="bottomMargin" >
     <number>2</number>
    </property>
    <item>
-    <widget class="QLineEdit" name="topicLineEdit" />
+    <widget class="TopicLabel" name="topicLabel" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape" >
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Plain</enum>
+     </property>
+    </widget>
    </item>
    <item>
-    <widget class="TopicButton" native="1" name="topicButton" >
+    <widget class="ClearableLineEdit" name="topicLineEdit" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+      <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="frame" >
+      <bool>true</bool>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
     </widget>
    </item>
    <item>
-    <widget class="QToolButton" name="topicEditButton" >
-     <property name="enabled" >
-      <bool>false</bool>
+    <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>...</string>
-     </property>
-     <property name="icon" >
-      <iconset>
-       <normaloff/>
-      </iconset>
+      <string/>
      </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 +98,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>