s/Buffer/Chat/g

This removes the mention of "Buffer" from the UI, as it was confuzzling users and making our Usability Queen
unhappy. It has been replaced by "Chat", which might not always be as precise, but should make more sense for users.
A "Buffer View" is now a "Chat List", and in some cases, "Window" has been used (e.g. the "Status Buffer" is now
a "Status Window" - which, again, isn't really the correct term, but probably makes more sense to people not used
to cli-based chat clients.

Obviously, within the code and the DB everything is still a Buffer (and it'll stay that way).

diff --git a/src/client/client.cpp b/src/client/client.cpp
index c25f193..e6f7f05 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -359,7 +359,7 @@ void Client::requestInitialBacklog() {
 void Client::createDefaultBufferView() {
   if(bufferViewManager()->bufferViewConfigs().isEmpty()) {
     BufferViewConfig config(-1);
-    config.setBufferViewName(tr("All Buffers"));
+    config.setBufferViewName(tr("All Chats"));
     config.initSetBufferList(networkModel()->allBufferIdsSorted());
     bufferViewManager()->requestCreateBufferView(config.toVariantMap());
   }

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 87801d4..fbf84c4 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -827,7 +827,7 @@ NetworkModel::NetworkModel(QObject *parent)
 
 QList<QVariant >NetworkModel::defaultHeader() {
   QList<QVariant> data;
-  data << tr("Buffer") << tr("Topic") << tr("Nick Count");
+  data << tr("Chat") << tr("Topic") << tr("Nick Count");
   return data;
 }
 

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index ea94561..59ad97f 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -287,7 +287,7 @@ void MainWin::setupActions() {
                                       this, SLOT(quit()), tr("Ctrl+Q")));
 
   // View
-  coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Buffer Views..."), coll,
+  coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Chat Lists..."), coll,
                                              this, SLOT(on_actionConfigureViews_triggered())));
 
   QAction *lockAct = coll->addAction("LockLayout", new Action(tr("&Lock Layout"), coll));
@@ -324,7 +324,7 @@ void MainWin::setupActions() {
                                        QtUi::style(), SLOT(reload()), QKeySequence::Refresh));
 
   // Navigation
-  coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot buffer"), coll,
+  coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot chat"), coll,
                                               this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A)));
 }
 
@@ -351,7 +351,7 @@ void MainWin::setupMenus() {
   _fileMenu->addAction(coll->action("Quit"));
 
   _viewMenu = menuBar()->addMenu(tr("&View"));
-  _bufferViewsMenu = _viewMenu->addMenu(tr("&Buffer Views"));
+  _bufferViewsMenu = _viewMenu->addMenu(tr("&Chat Lists"));
   _bufferViewsMenu->addAction(coll->action("ConfigureBufferViews"));
   _toolbarMenu = _viewMenu->addMenu(tr("&Toolbars"));
   _viewMenu->addSeparator();

diff --git a/src/qtui/settingspages/backlogsettingspage.ui b/src/qtui/settingspages/backlogsettingspage.ui
index f50e6c5..56e9cc2 100644 (file)
--- a/src/qtui/settingspages/backlogsettingspage.ui
+++ b/src/qtui/settingspages/backlogsettingspage.ui
@@ -72,7 +72,7 @@
      <item>
       <widget class="QLabel" name="label_3">
        <property name="text">
-        <string>Backlog Request Method:</string>
+        <string>Backlog request method:</string>
        </property>
       </widget>
      </item>
@@ -80,17 +80,17 @@
       <widget class="QComboBox" name="requesterType">
        <item>
         <property name="text">
-         <string>Fixed Amount per Buffer</string>
+         <string>Fixed amount per chat</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Unread Messages per Buffer</string>
+         <string>Unread messages per chat</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Global Unread Messages</string>
+         <string>Globally unread messages</string>
         </property>
        </item>
       </widget>
@@ -120,7 +120,7 @@
        <item>
         <widget class="QLabel" name="label_9">
          <property name="text">
-          <string>The simplest Requester. It fetches a fixed amount of lines for each buffer from the Backlog.</string>
+          <string>The simplest requester. It fetches a fixed amount of lines for each chat window from the backlog.</string>
          </property>
          <property name="textFormat">
           <enum>Qt::PlainText</enum>
@@ -196,7 +196,7 @@
        <item>
         <widget class="QLabel" name="label_10">
          <property name="text">
-          <string>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
+          <string>This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat.
 
 You can also choose to fetch additional older chatlines to provide a better context.</string>
          </property>
@@ -309,12 +309,12 @@ You can also choose to fetch additional older chatlines to provide a better cont
        <item>
         <widget class="QLabel" name="label_15">
          <property name="text">
-          <string>This requester fetches all messages newer than the oldest unread message for all buffers.
+          <string>This requester fetches all messages newer than the oldest unread message for all chats.
 
-Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
+Note: This requester is not recommended if you use hidden chat windows or have inactive chats (i.e.: no stale queries or channels).
 It is useful to limit the total amount of the backlog and is probably the fastest.
 
-You can also chose to fetch additional older chatlines to provide a better context similar.</string>
+You can also chose to fetch additional older chatlines to provide a better context.</string>
          </property>
          <property name="textFormat">
           <enum>Qt::PlainText</enum>

diff --git a/src/qtui/settingspages/buffervieweditdlg.ui b/src/qtui/settingspages/buffervieweditdlg.ui
index 3237df8..5f610a8 100644 (file)
--- a/src/qtui/settingspages/buffervieweditdlg.ui
+++ b/src/qtui/settingspages/buffervieweditdlg.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>BufferViewEditDlg</class>
- <widget class="QDialog" name="BufferViewEditDlg" >
-  <property name="geometry" >
+ <widget class="QDialog" name="BufferViewEditDlg">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,28 +10,28 @@
     <height>131</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <layout class="QVBoxLayout" >
+    <layout class="QVBoxLayout">
      <item>
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Please enter a name for the buffer view:</string>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Please enter a name for the chat list:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="bufferViewEdit" />
+      <widget class="QLineEdit" name="bufferViewEdit"/>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>40</height>
@@ -39,12 +40,12 @@
       </spacer>
      </item>
      <item>
-      <widget class="QDialogButtonBox" name="buttonBox" >
-       <property name="orientation" >
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="standardButtons" >
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
@@ -60,11 +61,11 @@
    <receiver>BufferViewEditDlg</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -76,11 +77,11 @@
    <receiver>BufferViewEditDlg</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>

diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp
index c23e6af..7c32403 100644 (file)
--- a/src/qtui/settingspages/bufferviewsettingspage.cpp
+++ b/src/qtui/settingspages/bufferviewsettingspage.cpp
@@ -33,7 +33,7 @@
 #include "util.h"
 
 BufferViewSettingsPage::BufferViewSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Appearance"), tr("Buffer Views"), parent),
+  : SettingsPage(tr("Misc"), tr("Custom Chat Lists"), parent),
     _ignoreWidgetChanges(false),
     _useBufferViewHint(false),
     _bufferViewHint(0)
@@ -339,8 +339,8 @@ void BufferViewSettingsPage::on_deleteBufferView_clicked() {
   QListWidgetItem *currentItem = ui.bufferViewList->item(ui.bufferViewList->currentRow());
   QString viewName = currentItem->text();
   int viewId = bufferView(ui.bufferViewList->currentRow())->bufferViewId();
-  int ret = QMessageBox::question(this, tr("Delete Buffer View?"),
-                                    tr("Do you really want to delete the buffer view \"%1\"?").arg(viewName),
+  int ret = QMessageBox::question(this, tr("Delete Chat List?"),
+                                    tr("Do you really want to delete the chat list \"%1\"?").arg(viewName),
                                     QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
 
   if(ret == QMessageBox::Yes) {
@@ -517,7 +517,7 @@ BufferViewEditDlg::BufferViewEditDlg(const QString &old, const QStringList &exis
 
   if(old.isEmpty()) {
     // new buffer
-    setWindowTitle(tr("Add Buffer View"));
+    setWindowTitle(tr("Add Chat List"));
     on_bufferViewEdit_textChanged(""); // disable ok button
   } else {
     ui.bufferViewEdit->setText(old);

diff --git a/src/qtui/settingspages/bufferviewsettingspage.ui b/src/qtui/settingspages/bufferviewsettingspage.ui
index a7e5d3d..8ad2bee 100644 (file)
--- a/src/qtui/settingspages/bufferviewsettingspage.ui
+++ b/src/qtui/settingspages/bufferviewsettingspage.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>BufferViewSettingsPage</class>
- <widget class="QWidget" name="BufferViewSettingsPage" >
-  <property name="geometry" >
+ <widget class="QWidget" name="BufferViewSettingsPage">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,48 +10,48 @@
     <height>529</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" >
+  <layout class="QHBoxLayout">
    <item>
-    <layout class="QVBoxLayout" >
+    <layout class="QVBoxLayout">
      <item>
-      <widget class="QListWidget" name="bufferViewList" />
+      <widget class="QListWidget" name="bufferViewList"/>
      </item>
      <item>
-      <widget class="QPushButton" name="renameBufferView" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+      <widget class="QPushButton" name="renameBufferView">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Re&amp;name...</string>
        </property>
-       <property name="icon" >
+       <property name="icon">
         <iconset>
          <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="addBufferView" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+      <widget class="QPushButton" name="addBufferView">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>&amp;Add...</string>
        </property>
-       <property name="icon" >
+       <property name="icon">
         <iconset>
          <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
        </property>
-       <property name="iconSize" >
+       <property name="iconSize">
         <size>
          <width>16</width>
          <height>16</height>
@@ -59,17 +60,17 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="deleteBufferView" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+      <widget class="QPushButton" name="deleteBufferView">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>De&amp;lete</string>
        </property>
-       <property name="icon" >
+       <property name="icon">
         <iconset>
          <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
        </property>
@@ -78,24 +79,24 @@
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="settingsGroupBox" >
-     <property name="title" >
-      <string>Buffer View  Settings</string>
+    <widget class="QGroupBox" name="settingsGroupBox">
+     <property name="title">
+      <string>Chat List Settings</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <layout class="QHBoxLayout" >
+       <layout class="QHBoxLayout">
         <item>
-         <widget class="QLabel" name="label" >
-          <property name="text" >
+         <widget class="QLabel" name="label">
+          <property name="text">
            <string>Network:</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="networkSelector" >
+         <widget class="QComboBox" name="networkSelector">
           <item>
-           <property name="text" >
+           <property name="text">
             <string>All</string>
            </property>
           </item>
@@ -104,86 +105,77 @@
        </layout>
       </item>
       <item>
-       <widget class="QGroupBox" name="groupBox_2" >
-        <property name="title" >
-         <string>Restrict Buffers to:</string>
-        </property>
-        <layout class="QVBoxLayout" >
-         <item>
-          <widget class="QCheckBox" name="onlyStatusBuffers" >
-           <property name="toolTip" >
-            <string>This option is not available when all Networks are visible.
+       <widget class="QCheckBox" name="onlyStatusBuffers">
+        <property name="toolTip">
+         <string>This option is not available when all Networks are visible.
 In this mode no separate status buffer is displayed.</string>
-           </property>
-           <property name="text" >
-            <string>Status Buffers</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="onlyChannelBuffers" >
-           <property name="text" >
-            <string>Channel Buffers</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="onlyQueryBuffers" >
-           <property name="text" >
-            <string>Query Buffers</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        </property>
+        <property name="text">
+         <string>Show status window</string>
+        </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="hideInactiveBuffers" >
-        <property name="text" >
-         <string>Hide inactive Buffers</string>
+       <widget class="QCheckBox" name="onlyChannelBuffers">
+        <property name="text">
+         <string>Show channels</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="addNewBuffersAutomatically" >
-        <property name="text" >
-         <string>Add new Buffers automatically</string>
+       <widget class="QCheckBox" name="onlyQueryBuffers">
+        <property name="text">
+         <string>Show queries</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="sortAlphabetically" >
-        <property name="text" >
+       <widget class="QCheckBox" name="hideInactiveBuffers">
+        <property name="text">
+         <string>Hide inactive chats</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="addNewBuffersAutomatically">
+        <property name="text">
+         <string>Add new chats automatically</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="sortAlphabetically">
+        <property name="text">
          <string>Sort alphabetically</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
+       <widget class="QLabel" name="label_3">
+        <property name="text">
          <string>Minimum Activity:</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QComboBox" name="minimumActivitySelector" >
+       <widget class="QComboBox" name="minimumActivitySelector">
         <item>
-         <property name="text" >
+         <property name="text">
           <string>No Activity</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Other Activity</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>New Message</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Highlight</string>
          </property>
         </item>
@@ -191,10 +183,10 @@ In this mode no separate status buffer is displayed.</string>
       </item>
       <item>
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>40</height>
@@ -206,16 +198,20 @@ In this mode no separate status buffer is displayed.</string>
     </widget>
    </item>
    <item>
-    <layout class="QVBoxLayout" >
+    <layout class="QVBoxLayout">
      <item>
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
+      <widget class="QLabel" name="label_2">
+       <property name="text">
         <string>Preview:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="PreviewBufferView" name="bufferViewPreview" />
+      <widget class="PreviewBufferView" name="bufferViewPreview">
+       <property name="headerHidden">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>

diff --git a/src/qtui/settingspages/chatmonitorsettingspage.ui b/src/qtui/settingspages/chatmonitorsettingspage.ui
index bd89270..cec8794 100644 (file)
--- a/src/qtui/settingspages/chatmonitorsettingspage.ui
+++ b/src/qtui/settingspages/chatmonitorsettingspage.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ChatMonitorSettingsPage</class>
- <widget class="QWidget" name="ChatMonitorSettingsPage" >
-  <property name="geometry" >
+ <widget class="QWidget" name="ChatMonitorSettingsPage">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,38 +10,38 @@
     <height>444</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4" >
+  <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2" >
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QLabel" name="label" >
-       <property name="text" >
+      <widget class="QLabel" name="label">
+       <property name="text">
         <string>Operation Mode:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="operationMode" >
-       <property name="toolTip" >
-        <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+      <widget class="QComboBox" name="operationMode">
+       <property name="toolTip">
+        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Operation modes:&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;">&lt;span style=" font-weight:400; text-decoration: underline;">Opt-In:&lt;/span> &lt;span style=" font-weight:400;">Only buffers on the right side are shown in chatmonitor&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" text-decoration: underline;">Opt-Out:&lt;/span> Buffers on the right side will be ignored in chatmonitor&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Operation modes:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;&quot;&gt;&lt;span style=&quot; font-weight:400; text-decoration: underline;&quot;&gt;Opt-In:&lt;/span&gt; &lt;span style=&quot; font-weight:400;&quot;&gt;Only buffers on the right side are shown in chatmonitor&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Opt-Out:&lt;/span&gt; Buffers on the right side will be ignored in chatmonitor&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
       </widget>
      </item>
      <item>
-      <spacer name="horizontalSpacer" >
-       <property name="orientation" >
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -51,29 +52,29 @@ p, li { white-space: pre-wrap; }
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" >
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_3" >
+      <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
-        <widget class="QLabel" name="labelAvailableBuffers" >
-         <property name="text" >
-          <string>Available Buffers:</string>
+        <widget class="QLabel" name="labelAvailableBuffers">
+         <property name="text">
+          <string>Available:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="BufferView" name="availableBuffers" />
+        <widget class="BufferView" name="availableBuffers"/>
        </item>
       </layout>
      </item>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout" >
+      <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <spacer name="verticalSpacer" >
-         <property name="orientation" >
+        <spacer name="verticalSpacer">
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
@@ -82,39 +83,39 @@ p, li { white-space: pre-wrap; }
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="deactivateBuffer" >
-         <property name="toolTip" >
+        <widget class="QPushButton" name="deactivateBuffer">
+         <property name="toolTip">
           <string>Move selected buffers to the left</string>
          </property>
-         <property name="text" >
+         <property name="text">
           <string/>
          </property>
-         <property name="icon" >
+         <property name="icon">
           <iconset>
            <normaloff>:/16x16/actions/oxygen/16x16/actions/go-previous.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-previous.png</iconset>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="activateBuffer" >
-         <property name="toolTip" >
+        <widget class="QPushButton" name="activateBuffer">
+         <property name="toolTip">
           <string>Move selected buffers to the right</string>
          </property>
-         <property name="text" >
+         <property name="text">
           <string/>
          </property>
-         <property name="icon" >
+         <property name="icon">
           <iconset>
            <normaloff>:/16x16/actions/oxygen/16x16/actions/go-next.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-next.png</iconset>
          </property>
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_2" >
-         <property name="orientation" >
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
@@ -125,34 +126,34 @@ p, li { white-space: pre-wrap; }
       </layout>
      </item>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2" >
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="QLabel" name="labelActiveBuffers" >
-         <property name="text" >
+        <widget class="QLabel" name="labelActiveBuffers">
+         <property name="text">
           <string>Show:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="BufferView" name="activeBuffers" />
+        <widget class="BufferView" name="activeBuffers"/>
        </item>
       </layout>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QCheckBox" name="showHighlights" >
-     <property name="toolTip" >
+    <widget class="QCheckBox" name="showHighlights">
+     <property name="toolTip">
       <string>Show highlights in chatmonitor even if the originating buffer is ignored</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Always show highlighted messages</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="showOwnMessages" >
-     <property name="text" >
+    <widget class="QCheckBox" name="showOwnMessages">
+     <property name="text">
       <string>Show own messages</string>
      </property>
     </widget>

diff --git a/src/qtui/settingspages/generalsettingspage.ui b/src/qtui/settingspages/generalsettingspage.ui
index 41931dc..cca69d4 100644 (file)
--- a/src/qtui/settingspages/generalsettingspage.ui
+++ b/src/qtui/settingspages/generalsettingspage.ui
@@ -125,14 +125,14 @@
       <item row="0" column="2">
        <widget class="QLabel" name="label_6">
         <property name="text">
-         <string>Status Buffer</string>
+         <string>Status Window</string>
         </property>
        </widget>
       </item>
       <item row="0" column="3">
        <widget class="QLabel" name="label_7">
         <property name="text">
-         <string>Current Buffer</string>
+         <string>Current Chat</string>
         </property>
        </widget>
       </item>

diff --git a/src/qtui/ui/bufferviewwidget.ui b/src/qtui/ui/bufferviewwidget.ui
index c1efab7..db6a062 100644 (file)
--- a/src/qtui/ui/bufferviewwidget.ui
+++ b/src/qtui/ui/bufferviewwidget.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>BufferViewWidget</class>
- <widget class="QWidget" name="BufferViewWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="BufferViewWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,33 +10,34 @@
     <height>183</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>5</hsizetype>
-    <vsizetype>5</vsizetype>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize" >
+  <property name="minimumSize">
    <size>
     <width>100</width>
     <height>100</height>
    </size>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>BufferView</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>4</number>
-   </property>
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>0</number>
    </property>
+   <property name="margin">
+    <number>4</number>
+   </property>
    <item>
-    <widget class="BufferView" name="treeView" >
-     <property name="rootIsDecorated" >
+    <widget class="BufferView" name="treeView">
+     <property name="rootIsDecorated">
+      <bool>true</bool>
+     </property>
+     <property name="headerHidden">
       <bool>true</bool>
      </property>
     </widget>