Merged changes from branch "sput" r50:55 back into trunk.

[quassel.git] / gui / ui / bufferwidget.ui

diff --git a/gui/ui/bufferwidget.ui b/gui/ui/bufferwidget.ui
index b3bab0d..854d491 100644 (file)
--- a/gui/ui/bufferwidget.ui
+++ b/gui/ui/bufferwidget.ui
@@ -31,7 +31,7 @@
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
-    <number>1</number>
+    <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
@@ -79,43 +79,18 @@
    </item>
    <item>
     <widget class="QSplitter" name="splitter" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>5</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="lineWidth" >
-      <number>1</number>
-     </property>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="QTextBrowser" name="chatWidget" >
+     <widget class="ChatWidget" native="1" name="chatWidget" >
       <property name="sizePolicy" >
        <sizepolicy>
-        <hsizetype>7</hsizetype>
+        <hsizetype>5</hsizetype>
         <vsizetype>5</vsizetype>
-        <horstretch>4</horstretch>
+        <horstretch>6</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <property name="font" >
-       <font>
-        <family>Bitstream Vera Sans Mono</family>
-        <pointsize>8</pointsize>
-        <weight>50</weight>
-        <bold>false</bold>
-       </font>
-      </property>
-      <property name="html" >
-       <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Bitstream Vera Sans Mono'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Mono L';">&lt;/p>&lt;/body>&lt;/html></string>
-      </property>
      </widget>
      <widget class="QTreeWidget" name="nickTree" >
       <property name="sizePolicy" >
@@ -252,6 +227,11 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ChatWidget</class>
+   <extends>QWidget</extends>
+   <header>chatwidget.h</header>
+  </customwidget>
   <customwidget>
    <class>ChannelWidgetInput</class>
    <extends>QLineEdit</extends>
@@ -264,7 +244,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>nickTree</tabstop>
   <tabstop>topicEdit</tabstop>
   <tabstop>chanSettingsButton</tabstop>
-  <tabstop>chatWidget</tabstop>
  </tabstops>
  <resources/>
  <connections/>