[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:15:07 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=2455ee8
The following commit has been merged in the master branch:
commit 2455ee8806cea40177e86d4d24a8da61f6854c3d
Author: Sven Brauch <svenbrauch at googlemail.com>
Date: Fri May 3 16:05:43 2013 +0200
Revamp the settings user interface
For discussion and reasoning of the changes done,
please refer to review request #110276.
REVIEW:110276
---
config/telepathy-kded-config.cpp | 1 -
config/telepathy-kded-config.ui | 609 ++++++++++++++++++---------------------
2 files changed, 273 insertions(+), 337 deletions(-)
diff --git a/config/telepathy-kded-config.cpp b/config/telepathy-kded-config.cpp
index 50c176d..5a7e91d 100644
--- a/config/telepathy-kded-config.cpp
+++ b/config/telepathy-kded-config.cpp
@@ -72,7 +72,6 @@ TelepathyKDEDConfig::TelepathyKDEDConfig(QWidget *parent, const QVariantList& ar
resizer->addWidgetsFromLayout(ui->autoOfflineGroupBox->layout(), 0);
//TODO enable this when it is supported by the approver
- ui->m_autoAcceptLabel->setHidden(true);
ui->m_autoAcceptCheckBox->setHidden(true);
//FIXME: figure out how to use i18ncp without argument for suffix
diff --git a/config/telepathy-kded-config.ui b/config/telepathy-kded-config.ui
index 54ebc54..74ce51e 100644
--- a/config/telepathy-kded-config.ui
+++ b/config/telepathy-kded-config.ui
@@ -6,57 +6,24 @@
<rect>
<x>0</x>
<y>0</y>
- <width>703</width>
- <height>649</height>
+ <width>497</width>
+ <height>584</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QGroupBox" name="incomingFilesGroupBox">
+ <widget class="QGroupBox" name="autoConnectGroupBox">
<property name="title">
- <string>Incoming files</string>
+ <string>Auto connect</string>
</property>
<property name="flat">
- <bool>true</bool>
+ <bool>false</bool>
</property>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="m_downloadUrlLabel">
- <property name="text">
- <string>Download Folder:</string>
- </property>
- <property name="buddy">
- <cstring>m_downloadUrlRequester</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="KUrlRequester" name="m_downloadUrlRequester">
- <property name="toolTip">
- <string>This is the folder where received files will be saved.</string>
- </property>
- <property name="whatsThis">
- <string>This is the folder where received files will be saved.</string>
- </property>
- <property name="mode">
- <set>KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly</set>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="m_autoAcceptLabel">
- <property name="text">
- <string>Auto-accept file transfers:</string>
- </property>
- <property name="buddy">
- <cstring>m_autoAcceptCheckBox</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QCheckBox" name="m_autoAcceptCheckBox">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QCheckBox" name="m_autoConnectCheckBox">
<property name="text">
- <string>Enabled</string>
+ <string>Restore last presence on login</string>
</property>
</widget>
</item>
@@ -64,306 +31,275 @@
</widget>
</item>
<item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
<widget class="QGroupBox" name="autoAwayGroupBox">
<property name="title">
<string>Auto away</string>
</property>
<property name="flat">
- <bool>true</bool>
+ <bool>false</bool>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="2" column="0">
- <widget class="QLabel" name="m_awayMinsLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>After:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>m_awayMins</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QSpinBox" name="m_awayMins">
- <property name="suffix">
- <string/>
- </property>
- <property name="value">
- <number>5</number>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QLabel" name="label_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>of inactivity</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="m_awayMessageLabel">
- <property name="text">
- <string>With message:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="3" column="2" colspan="4">
- <widget class="KLineEdit" name="m_awayMessage"/>
- </item>
- <item row="4" column="0" colspan="6">
- <widget class="Line" name="line">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="6" column="2">
- <widget class="QSpinBox" name="m_xaMins">
- <property name="suffix">
- <string/>
- </property>
- <property name="value">
- <number>15</number>
- </property>
- </widget>
- </item>
- <item row="6" column="3">
- <widget class="QLabel" name="label_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>of inactivity</string>
- </property>
- </widget>
- </item>
- <item row="7" column="0">
- <widget class="QLabel" name="m_xaMessageLabel">
- <property name="text">
- <string>With message:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="7" column="2" colspan="4">
- <widget class="KLineEdit" name="m_xaMessage"/>
- </item>
- <item row="2" column="5">
- <spacer name="horizontalSpacer">
- <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="6" column="4" colspan="2">
- <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="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
<widget class="QLabel" name="label">
<property name="text">
<string>Set my status to:</string>
</property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="m_xaMinsLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>After:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>m_xaMins</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QCheckBox" name="m_awayCheckBox">
- <property name="text">
- <string>Away</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
</widget>
</item>
- <item row="5" column="2">
- <widget class="QCheckBox" name="m_xaCheckBox">
- <property name="text">
- <string>Not available</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="autoExclusive">
- <bool>false</bool>
- </property>
- </widget>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="away_check_layout">
+ <item>
+ <widget class="QCheckBox" name="m_awayCheckBox">
+ <property name="text">
+ <string>Away</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="away_spaces">
+ <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>
+ <widget class="QLabel" name="m_awayMinsLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>After:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>m_awayMins</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="m_awayMins">
+ <property name="suffix">
+ <string/>
+ </property>
+ <property name="value">
+ <number>5</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>of inactivity</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="away_message_layout">
+ <item>
+ <widget class="QLabel" name="m_awayMessageLabel">
+ <property name="text">
+ <string>With &message:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>m_awayMessage</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KLineEdit" name="m_awayMessage"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="not_available_check_layout">
+ <item>
+ <widget class="QCheckBox" name="m_xaCheckBox">
+ <property name="text">
+ <string>Not available</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="autoExclusive">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="not_available_spacer">
+ <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>
+ <widget class="QLabel" name="m_xaMinsLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Aft&er:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>m_xaMins</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="m_xaMins">
+ <property name="suffix">
+ <string/>
+ </property>
+ <property name="value">
+ <number>15</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>of inactivity</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="not_available_message_layout">
+ <item>
+ <widget class="QLabel" name="m_xaMessageLabel">
+ <property name="text">
+ <string>With messa&ge:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>m_xaMessage</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KLineEdit" name="m_xaMessage"/>
+ </item>
+ </layout>
+ </item>
+ </layout>
</item>
</layout>
</widget>
</item>
<item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QGroupBox" name="nowPlayingGroupBox">
+ <widget class="QGroupBox" name="autoOfflineGroupBox">
<property name="title">
- <string>Now playing</string>
+ <string>Auto Offline</string>
</property>
<property name="flat">
- <bool>true</bool>
+ <bool>false</bool>
</property>
- <layout class="QFormLayout" name="formLayout_2">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="m_nowPlayingLabel">
- <property name="text">
- <string>'Now playing...' presence:</string>
- </property>
- <property name="buddy">
- <cstring>m_nowPlayingCheckBox</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="m_nowPlayingCheckBox">
- <property name="text">
- <string>Enabled</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="NowPlayingLineEdit" name="m_nowPlayingText">
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <widget class="QCheckBox" name="m_autoOfflineCheckBox">
<property name="text">
- <string/>
+ <string>Go offline when closing the contact list</string>
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="NowPlayingListWidget" name="m_tagListWidget"/>
- </item>
</layout>
</widget>
</item>
<item>
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QGroupBox" name="autoConnectGroupBox">
+ <widget class="QGroupBox" name="incomingFilesGroupBox">
<property name="title">
- <string>Auto connect</string>
+ <string>Incoming files</string>
</property>
<property name="flat">
- <bool>true</bool>
+ <bool>false</bool>
</property>
- <layout class="QFormLayout" name="formLayout_3">
- <item row="0" column="0">
- <widget class="QLabel" name="m_autoConnectLabel">
- <property name="text">
- <string>Restore last presence on login:</string>
- </property>
- </widget>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <layout class="QHBoxLayout" name="download_folder_layout">
+ <item>
+ <widget class="QLabel" name="m_downloadUrlLabel">
+ <property name="text">
+ <string>Download Folder:</string>
+ </property>
+ <property name="buddy">
+ <cstring>m_downloadUrlRequester</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KUrlRequester" name="m_downloadUrlRequester">
+ <property name="toolTip">
+ <string>This is the folder where received files will be saved.</string>
+ </property>
+ <property name="whatsThis">
+ <string>This is the folder where received files will be saved.</string>
+ </property>
+ <property name="mode">
+ <set>KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="m_autoConnectCheckBox">
+ <item>
+ <widget class="QCheckBox" name="m_autoAcceptCheckBox">
<property name="text">
- <string>Enabled</string>
+ <string>Automatically accept file transfers</string>
</property>
</widget>
</item>
@@ -371,44 +307,45 @@
</widget>
</item>
<item>
- <spacer name="verticalSpacer_4">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QGroupBox" name="autoOfflineGroupBox">
+ <widget class="QGroupBox" name="nowPlayingGroupBox">
<property name="title">
- <string>Auto Offline</string>
+ <string>Now playing</string>
</property>
<property name="flat">
- <bool>true</bool>
+ <bool>false</bool>
</property>
- <layout class="QFormLayout" name="formLayout_5">
- <item row="0" column="0">
- <widget class="QLabel" name="m_autoOfflineLabel">
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QCheckBox" name="m_nowPlayingCheckBox">
<property name="text">
- <string>Go offline when closing the contact list:</string>
+ <string>Enable "Now playing..." presence</string>
</property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="m_autoOfflineCheckBox">
- <property name="text">
- <string>Enabled</string>
+ <property name="checked">
+ <bool>true</bool>
</property>
</widget>
</item>
+ <item>
+ <layout class="QFormLayout" name="nowPlayingMessageFormatLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="message_format_label">
+ <property name="text">
+ <string>Message format:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="NowPlayingLineEdit" name="m_nowPlayingText">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="NowPlayingListWidget" name="m_tagListWidget"/>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
</item>
--
ktp-kded-integration-module packaging
More information about the pkg-kde-commits
mailing list