[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [konversation] src/config: Clean up layout of behavior/chatwindow config
From: Peter Simonsson <peter.simonsson () gmail ! com>
Date: 2016-09-09 20:21:06
Message-ID: E1biSIM-00077s-MZ () code ! kde ! org
[Download RAW message or body]
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/chatwindowbehaviour_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="QVBoxLayout" name="verticalLayout_2">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -19,8 +28,8 @@
<property name="title">
<string>General</string>
</property>
- <layout class="QGridLayout">
- <item row="0" column="0" colspan="3">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0" colspan="4">
<widget class="QCheckBox" name="kcfg_Beep">
<property name="whatsThis">
<string>Sounds the system bell when you receive an ASCII BEL (0x07) control \
character</string> @@ -37,7 +46,82 @@
</property>
</widget>
</item>
- <item row="3" column="0" colspan="3">
+ <item row="2" column="0">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>16</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="1" colspan="3">
+ <widget class="QCheckBox" name="kcfg_HideUnimportantEventsExcludeActive">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="whatsThis">
+ <string>If checked, only events concerning active and watched nicks will be \
displayed.</string> + </property>
+ <property name="text">
+ <string>Except for watched nicks and nicks active within the</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="4">
+ <widget class="KComboBox" \
name="kcfg_HideUnimportantEventsExcludeActiveThreshold"> + <property \
name="enabled"> + <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <item>
+ <property name="text">
+ <string comment="Is prefaced with: Except for watched nicks and nicks \
active within the">last 10 min</string> + </property>
+ </item>
+ <item>
+ <property name="text">
+ <string comment="Is prefaced with: Except for watched nicks and nicks \
active within the">last hour</string> + </property>
+ </item>
+ <item>
+ <property name="text">
+ <string comment="Is prefaced with: Except for watched nicks and nicks \
active within the">last day</string> + </property>
+ </item>
+ <item>
+ <property name="text">
+ <string comment="Is prefaced with: Except for watched nicks and nicks \
active within the">last week</string> + </property>
+ </item>
+ </widget>
+ </item>
+ <item row="2" column="5">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="3" column="0" colspan="4">
<widget class="QCheckBox" name="kcfg_DisableExpansion">
<property name="whatsThis">
<string>Do not expand variables when sending text to the server. A variable \
starts with '%'; for example, %B will expand to the characters needed to make a text \
bold.</string> @@ -47,7 +131,24 @@
</property>
</widget>
</item>
- <item row="6" column="0" colspan="3">
+ <item row="4" column="0" colspan="4">
+ <widget class="QCheckBox" name="kcfg_RedirectServerAndAppMsgToStatusPane">
+ <property name="text">
+ <string>&Redirect status messages to the server status window</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" colspan="5">
+ <widget class="QCheckBox" name="kcfg_UseLiteralModes">
+ <property name="whatsThis">
+ <string>Keep channel mode string as a combination of characters instead of \
translating them into human readable words. E.g. '*** Channel modes: no messages from \
outside' will become '*** Channel modes: n'</string> + </property>
+ <property name="text">
+ <string>Show raw mode characters (e.g. +o) instead of descriptions</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" colspan="5">
<spacer name="spacer1_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -63,13 +164,13 @@
</property>
</spacer>
</item>
- <item row="7" column="0">
+ <item row="7" column="0" colspan="2">
<widget class="QLabel" name="textLabel1">
<property name="whatsThis">
<string>How many lines to keep in buffers, 0 = unlimited</string>
</property>
<property name="text">
- <string>Scroll&back limit:</string>
+ <string>Scrollbac&k limit:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
@@ -79,24 +180,7 @@
</property>
</widget>
</item>
- <item row="4" column="0" colspan="3">
- <widget class="QCheckBox" name="kcfg_RedirectServerAndAppMsgToStatusPane">
- <property name="text">
- <string>&Redirect status messages to the server status window</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0" colspan="3">
- <widget class="QCheckBox" name="kcfg_UseLiteralModes">
- <property name="whatsThis">
- <string>Keep channel mode string as a combination of characters instead of \
translating them into human readable words. E.g. '*** Channel modes: no messages from \
outside' will become '*** Channel modes: n'</string>
- </property>
- <property name="text">
- <string>Show raw mode characters (e.g. +o) instead of descriptions</string>
- </property>
- </widget>
- </item>
- <item row="7" column="1">
+ <item row="7" column="2">
<widget class="KPluralHandlingSpinBox" name="kcfg_ScrollbackMax">
<property name="minimumSize">
<size>
@@ -115,7 +199,7 @@
</property>
</widget>
</item>
- <item row="7" column="2">
+ <item row="7" column="3" colspan="2">
<spacer name="spacer1">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -131,85 +215,6 @@
</property>
</spacer>
</item>
- <item row="2" column="0" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>16</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QCheckBox" name="kcfg_HideUnimportantEventsExcludeActive">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="whatsThis">
- <string>If checked, only events concerning active and watched nicks will \
be displayed.</string>
- </property>
- <property name="text">
- <string>Except for watched nicks and nicks active within the</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KComboBox" \
name="kcfg_HideUnimportantEventsExcludeActiveThreshold">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <item>
- <property name="text">
- <string comment="Is prefaced with: Except for watched nicks and nicks \
active within the">last 10 min</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string comment="Is prefaced with: Except for watched nicks and nicks \
active within the">last hour</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string comment="Is prefaced with: Except for watched nicks and nicks \
active within the">last day</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string comment="Is prefaced with: Except for watched nicks and nicks \
active within the">last week</string>
- </property>
- </item>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
</layout>
</widget>
</item>
@@ -218,8 +223,8 @@
<property name="title">
<string>Marker Lines</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="kcfg_AutomaticRememberLine">
<property name="whatsThis">
<string>Inserts a remember line into the chat window when you switch to \
another chat window or minimize the application.</string> @@ -232,37 +237,33 @@
</property>
</widget>
</item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <spacer name="spacer9">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>16</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QCheckBox" \
name="kcfg_AutomaticRememberLineOnlyOnTextChange">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Move the line only when new text is about to be shown</string>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="1" column="0">
+ <spacer name="spacer9">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>16</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="kcfg_AutomaticRememberLineOnlyOnTextChange">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Move the line only when new text is about to be shown</string>
+ </property>
+ </widget>
</item>
- <item>
+ <item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="kcfg_MarkerLineInAllViews">
<property name="text">
<string>Show manually inserted lines in all chat windows</string>
@@ -283,43 +284,11 @@
<property name="checked">
<bool>false</bool>
</property>
- <layout class="QGridLayout">
- <item row="2" column="2">
- <spacer name="spacer3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>170</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="2" rowspan="2">
- <spacer name="spacer2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>190</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
+ <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="textLabel2">
<property name="text">
- <string>Max. number of users in a channel:</string>
+ <string>&Max. number of users in a channel:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
@@ -329,7 +298,7 @@
</property>
</widget>
</item>
- <item row="0" column="1" rowspan="2">
+ <item row="0" column="1">
<widget class="KPluralHandlingSpinBox" name="kcfg_AutoWhoNicksLimit">
<property name="minimumSize">
<size>
@@ -348,7 +317,36 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="0" column="2">
+ <spacer name="spacer2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>190</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="whoIntervalLbl">
+ <property name="text">
+ <string>Update inter&val:</string>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ <property name="buddy">
+ <cstring>kcfg_AutoWhoContinuousInterval</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
<widget class="KPluralHandlingSpinBox" name="kcfg_AutoWhoContinuousInterval">
<property name="enabled">
<bool>false</bool>
@@ -370,18 +368,21 @@
</property>
</widget>
</item>
- <item row="1" column="0" rowspan="2">
- <widget class="QLabel" name="whoIntervalLbl">
- <property name="text">
- <string>Update interval:</string>
+ <item row="1" column="2">
+ <spacer name="spacer3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="wordWrap">
- <bool>false</bool>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
</property>
- <property name="buddy">
- <cstring>kcfg_AutoWhoContinuousInterval</cstring>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>170</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
</layout>
</widget>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic