From kde-commits  Fri Sep 09 20:21:06 2016
From: Peter Simonsson <peter.simonsson () gmail ! com>
Date: Fri, 09 Sep 2016 20:21:06 +0000
To: kde-commits
Subject: [konversation] src/config: Clean up layout of behavior/chatwindow config
Message-Id: <E1biSIM-00077s-MZ () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=147345248204440

Git commit 5d4d07671c7ee8e7bf6636c4d79c5a2259b3b5b7 by Peter Simonsson.
Committed on 09/09/2016 at 20:20.
Pushed by psn into branch 'master'.

Clean up layout of behavior/chatwindow config

BUG:357772

M  +185  -184  src/config/chatwindowbehaviour_config.ui

http://commits.kde.org/konversation/5d4d07671c7ee8e7bf6636c4d79c5a2259b3b5b7

diff --git a/src/config/chatwindowbehaviour_config.ui b/src/config/chatwind=
owbehaviour_config.ui
index 748f51e..b80e892 100644
--- a/src/config/chatwindowbehaviour_config.ui
+++ b/src/config/chatwindowbehaviour_config.ui
@@ -6,12 +6,21 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>479</width>
-    <height>461</height>
+    <width>489</width>
+    <height>534</height>
    </rect>
   </property>
   <layout class=3D"QVBoxLayout" name=3D"verticalLayout_2">
-   <property name=3D"margin">
+   <property name=3D"leftMargin">
+    <number>0</number>
+   </property>
+   <property name=3D"topMargin">
+    <number>0</number>
+   </property>
+   <property name=3D"rightMargin">
+    <number>0</number>
+   </property>
+   <property name=3D"bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -19,8 +28,8 @@
      <property name=3D"title">
       <string>General</string>
      </property>
-     <layout class=3D"QGridLayout">
-      <item row=3D"0" column=3D"0" colspan=3D"3">
+     <layout class=3D"QGridLayout" name=3D"gridLayout_3">
+      <item row=3D"0" column=3D"0" colspan=3D"4">
        <widget class=3D"QCheckBox" name=3D"kcfg_Beep">
         <property name=3D"whatsThis">
          <string>Sounds the system bell when you receive an ASCII BEL (0x0=
7) control character</string>
@@ -37,7 +46,82 @@
         </property>
        </widget>
       </item>
-      <item row=3D"3" column=3D"0" colspan=3D"3">
+      <item row=3D"2" column=3D"0">
+       <spacer name=3D"horizontalSpacer">
+        <property name=3D"orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name=3D"sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name=3D"sizeHint" stdset=3D"0">
+         <size>
+          <width>16</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row=3D"2" column=3D"1" colspan=3D"3">
+       <widget class=3D"QCheckBox" name=3D"kcfg_HideUnimportantEventsExclu=
deActive">
+        <property name=3D"enabled">
+         <bool>false</bool>
+        </property>
+        <property name=3D"whatsThis">
+         <string>If checked, only events concerning active and watched nic=
ks will be displayed.</string>
+        </property>
+        <property name=3D"text">
+         <string>Except for watched nicks and nicks active within the</str=
ing>
+        </property>
+       </widget>
+      </item>
+      <item row=3D"2" column=3D"4">
+       <widget class=3D"KComboBox" name=3D"kcfg_HideUnimportantEventsExclu=
deActiveThreshold">
+        <property name=3D"enabled">
+         <bool>false</bool>
+        </property>
+        <property name=3D"sizePolicy">
+         <sizepolicy hsizetype=3D"Minimum" vsizetype=3D"Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <item>
+         <property name=3D"text">
+          <string comment=3D"Is prefaced with: Except for watched nicks an=
d nicks active within the">last 10 min</string>
+         </property>
+        </item>
+        <item>
+         <property name=3D"text">
+          <string comment=3D"Is prefaced with: Except for watched nicks an=
d nicks active within the">last hour</string>
+         </property>
+        </item>
+        <item>
+         <property name=3D"text">
+          <string comment=3D"Is prefaced with: Except for watched nicks an=
d nicks active within the">last day</string>
+         </property>
+        </item>
+        <item>
+         <property name=3D"text">
+          <string comment=3D"Is prefaced with: Except for watched nicks an=
d nicks active within the">last week</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row=3D"2" column=3D"5">
+       <spacer name=3D"horizontalSpacer_2">
+        <property name=3D"orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name=3D"sizeHint" stdset=3D"0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row=3D"3" column=3D"0" colspan=3D"4">
        <widget class=3D"QCheckBox" name=3D"kcfg_DisableExpansion">
         <property name=3D"whatsThis">
          <string>Do not expand variables when sending text to the server. =
A variable starts with '%'; for example, %B will expand to the characters n=
eeded to make a text bold.</string>
@@ -47,7 +131,24 @@
         </property>
        </widget>
       </item>
-      <item row=3D"6" column=3D"0" colspan=3D"3">
+      <item row=3D"4" column=3D"0" colspan=3D"4">
+       <widget class=3D"QCheckBox" name=3D"kcfg_RedirectServerAndAppMsgToS=
tatusPane">
+        <property name=3D"text">
+         <string>&amp;Redirect status messages to the server status window=
</string>
+        </property>
+       </widget>
+      </item>
+      <item row=3D"5" column=3D"0" colspan=3D"5">
+       <widget class=3D"QCheckBox" name=3D"kcfg_UseLiteralModes">
+        <property name=3D"whatsThis">
+         <string>Keep channel mode string as a combination of characters i=
nstead of translating them into human readable words. E.g. '*** Channel mod=
es: no messages from outside' will become '*** Channel modes: n'</string>
+        </property>
+        <property name=3D"text">
+         <string>Show raw mode characters (e.g. +o) instead of description=
s</string>
+        </property>
+       </widget>
+      </item>
+      <item row=3D"6" column=3D"0" colspan=3D"5">
        <spacer name=3D"spacer1_2">
         <property name=3D"orientation">
          <enum>Qt::Horizontal</enum>
@@ -63,13 +164,13 @@
         </property>
        </spacer>
       </item>
-      <item row=3D"7" column=3D"0">
+      <item row=3D"7" column=3D"0" colspan=3D"2">
        <widget class=3D"QLabel" name=3D"textLabel1">
         <property name=3D"whatsThis">
          <string>How many lines to keep in buffers, 0 =3D unlimited</strin=
g>
         </property>
         <property name=3D"text">
-         <string>Scroll&amp;back limit:</string>
+         <string>Scrollbac&amp;k limit:</string>
         </property>
         <property name=3D"wordWrap">
          <bool>false</bool>
@@ -79,24 +180,7 @@
         </property>
        </widget>
       </item>
-      <item row=3D"4" column=3D"0" colspan=3D"3">
-       <widget class=3D"QCheckBox" name=3D"kcfg_RedirectServerAndAppMsgToS=
tatusPane">
-        <property name=3D"text">
-         <string>&amp;Redirect status messages to the server status window=
</string>
-        </property>
-       </widget>
-      </item>
-      <item row=3D"5" column=3D"0" colspan=3D"3">
-       <widget class=3D"QCheckBox" name=3D"kcfg_UseLiteralModes">
-        <property name=3D"whatsThis">
-         <string>Keep channel mode string as a combination of characters i=
nstead of translating them into human readable words. E.g. '*** Channel mod=
es: no messages from outside' will become '*** Channel modes: n'</string>
-        </property>
-        <property name=3D"text">
-         <string>Show raw mode characters (e.g. +o) instead of description=
s</string>
-        </property>
-       </widget>
-      </item>
-      <item row=3D"7" column=3D"1">
+      <item row=3D"7" column=3D"2">
        <widget class=3D"KPluralHandlingSpinBox" name=3D"kcfg_ScrollbackMax=
">
         <property name=3D"minimumSize">
          <size>
@@ -115,7 +199,7 @@
         </property>
        </widget>
       </item>
-      <item row=3D"7" column=3D"2">
+      <item row=3D"7" column=3D"3" colspan=3D"2">
        <spacer name=3D"spacer1">
         <property name=3D"orientation">
          <enum>Qt::Horizontal</enum>
@@ -131,85 +215,6 @@
         </property>
        </spacer>
       </item>
-      <item row=3D"2" column=3D"0" colspan=3D"3">
-       <layout class=3D"QHBoxLayout" name=3D"horizontalLayout_3">
-        <item>
-         <spacer name=3D"horizontalSpacer">
-          <property name=3D"orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name=3D"sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name=3D"sizeHint" stdset=3D"0">
-           <size>
-            <width>16</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class=3D"QCheckBox" name=3D"kcfg_HideUnimportantEventsExc=
ludeActive">
-          <property name=3D"enabled">
-           <bool>false</bool>
-          </property>
-          <property name=3D"whatsThis">
-           <string>If checked, only events concerning active and watched n=
icks will be displayed.</string>
-          </property>
-          <property name=3D"text">
-           <string>Except for watched nicks and nicks active within the</s=
tring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class=3D"KComboBox" name=3D"kcfg_HideUnimportantEventsExc=
ludeActiveThreshold">
-          <property name=3D"enabled">
-           <bool>false</bool>
-          </property>
-          <property name=3D"sizePolicy">
-           <sizepolicy hsizetype=3D"Minimum" vsizetype=3D"Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <item>
-           <property name=3D"text">
-            <string comment=3D"Is prefaced with: Except for watched nicks =
and nicks active within the">last 10 min</string>
-           </property>
-          </item>
-          <item>
-           <property name=3D"text">
-            <string comment=3D"Is prefaced with: Except for watched nicks =
and nicks active within the">last hour</string>
-           </property>
-          </item>
-          <item>
-           <property name=3D"text">
-            <string comment=3D"Is prefaced with: Except for watched nicks =
and nicks active within the">last day</string>
-           </property>
-          </item>
-          <item>
-           <property name=3D"text">
-            <string comment=3D"Is prefaced with: Except for watched nicks =
and nicks active within the">last week</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item>
-         <spacer name=3D"horizontalSpacer_2">
-          <property name=3D"orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name=3D"sizeHint" stdset=3D"0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
      </layout>
     </widget>
    </item>
@@ -218,8 +223,8 @@
      <property name=3D"title">
       <string>Marker Lines</string>
      </property>
-     <layout class=3D"QVBoxLayout" name=3D"verticalLayout">
-      <item>
+     <layout class=3D"QGridLayout" name=3D"gridLayout_2">
+      <item row=3D"0" column=3D"0" colspan=3D"2">
        <widget class=3D"QCheckBox" name=3D"kcfg_AutomaticRememberLine">
         <property name=3D"whatsThis">
          <string>Inserts a remember line into the chat window when you swi=
tch to another chat window or minimize the application.</string>
@@ -232,37 +237,33 @@
         </property>
        </widget>
       </item>
-      <item>
-       <layout class=3D"QHBoxLayout" name=3D"horizontalLayout">
-        <item>
-         <spacer name=3D"spacer9">
-          <property name=3D"orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name=3D"sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name=3D"sizeHint" stdset=3D"0">
-           <size>
-            <width>16</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class=3D"QCheckBox" name=3D"kcfg_AutomaticRememberLineOnl=
yOnTextChange">
-          <property name=3D"enabled">
-           <bool>false</bool>
-          </property>
-          <property name=3D"text">
-           <string>Move the line only when new text is about to be shown</=
string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+      <item row=3D"1" column=3D"0">
+       <spacer name=3D"spacer9">
+        <property name=3D"orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name=3D"sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name=3D"sizeHint" stdset=3D"0">
+         <size>
+          <width>16</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row=3D"1" column=3D"1">
+       <widget class=3D"QCheckBox" name=3D"kcfg_AutomaticRememberLineOnlyO=
nTextChange">
+        <property name=3D"enabled">
+         <bool>false</bool>
+        </property>
+        <property name=3D"text">
+         <string>Move the line only when new text is about to be shown</st=
ring>
+        </property>
+       </widget>
       </item>
-      <item>
+      <item row=3D"2" column=3D"0" colspan=3D"2">
        <widget class=3D"QCheckBox" name=3D"kcfg_MarkerLineInAllViews">
         <property name=3D"text">
          <string>Show manually inserted lines in all chat windows</string>
@@ -283,43 +284,11 @@
      <property name=3D"checked">
       <bool>false</bool>
      </property>
-     <layout class=3D"QGridLayout">
-      <item row=3D"2" column=3D"2">
-       <spacer name=3D"spacer3">
-        <property name=3D"orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name=3D"sizeType">
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name=3D"sizeHint" stdset=3D"0">
-         <size>
-          <width>170</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row=3D"0" column=3D"2" rowspan=3D"2">
-       <spacer name=3D"spacer2">
-        <property name=3D"orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name=3D"sizeType">
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name=3D"sizeHint" stdset=3D"0">
-         <size>
-          <width>190</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
+     <layout class=3D"QGridLayout" name=3D"gridLayout">
       <item row=3D"0" column=3D"0">
        <widget class=3D"QLabel" name=3D"textLabel2">
         <property name=3D"text">
-         <string>Max. number of users in a channel:</string>
+         <string>&amp;Max. number of users in a channel:</string>
         </property>
         <property name=3D"wordWrap">
          <bool>false</bool>
@@ -329,7 +298,7 @@
         </property>
        </widget>
       </item>
-      <item row=3D"0" column=3D"1" rowspan=3D"2">
+      <item row=3D"0" column=3D"1">
        <widget class=3D"KPluralHandlingSpinBox" name=3D"kcfg_AutoWhoNicksL=
imit">
         <property name=3D"minimumSize">
          <size>
@@ -348,7 +317,36 @@
         </property>
        </widget>
       </item>
-      <item row=3D"2" column=3D"1">
+      <item row=3D"0" column=3D"2">
+       <spacer name=3D"spacer2">
+        <property name=3D"orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name=3D"sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name=3D"sizeHint" stdset=3D"0">
+         <size>
+          <width>190</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row=3D"1" column=3D"0">
+       <widget class=3D"QLabel" name=3D"whoIntervalLbl">
+        <property name=3D"text">
+         <string>Update inter&amp;val:</string>
+        </property>
+        <property name=3D"wordWrap">
+         <bool>false</bool>
+        </property>
+        <property name=3D"buddy">
+         <cstring>kcfg_AutoWhoContinuousInterval</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row=3D"1" column=3D"1">
        <widget class=3D"KPluralHandlingSpinBox" name=3D"kcfg_AutoWhoContin=
uousInterval">
         <property name=3D"enabled">
          <bool>false</bool>
@@ -370,18 +368,21 @@
         </property>
        </widget>
       </item>
-      <item row=3D"1" column=3D"0" rowspan=3D"2">
-       <widget class=3D"QLabel" name=3D"whoIntervalLbl">
-        <property name=3D"text">
-         <string>Update interval:</string>
+      <item row=3D"1" column=3D"2">
+       <spacer name=3D"spacer3">
+        <property name=3D"orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name=3D"wordWrap">
-         <bool>false</bool>
+        <property name=3D"sizeType">
+         <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name=3D"buddy">
-         <cstring>kcfg_AutoWhoContinuousInterval</cstring>
+        <property name=3D"sizeHint" stdset=3D"0">
+         <size>
+          <width>170</width>
+          <height>20</height>
+         </size>
         </property>
-       </widget>
+       </spacer>
       </item>
      </layout>
     </widget>