[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=74462bd

The following commit has been merged in the master branch:
commit 74462bda49065fcd9c36aed26a42a82fb905b93d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed May 7 23:23:41 2014 +0200

    Group presence handling options in KCM
    
    REVIEW: 114660
---
 config/telepathy-kded-config.ui | 48 +++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/config/telepathy-kded-config.ui b/config/telepathy-kded-config.ui
index 18f06f3..913bb5b 100644
--- a/config/telepathy-kded-config.ui
+++ b/config/telepathy-kded-config.ui
@@ -24,27 +24,34 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>489</width>
-        <height>717</height>
+        <width>479</width>
+        <height>707</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <widget class="QGroupBox" name="autoConnectGroupBox">
-         <property name="title">
-          <string>Auto connect</string>
+        <widget class="QFrame" name="frame">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
          </property>
-         <property name="flat">
-          <bool>false</bool>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
          </property>
-         <layout class="QGridLayout" name="gridLayout_4">
-          <item row="0" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
            <widget class="QCheckBox" name="m_autoConnectCheckBox">
             <property name="text">
              <string>Restore last presence on login</string>
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="m_autoOfflineCheckBox">
+            <property name="text">
+             <string>Go offline when closing the contact list</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -318,25 +325,6 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="autoOfflineGroupBox">
-         <property name="title">
-          <string>Auto Offline</string>
-         </property>
-         <property name="flat">
-          <bool>false</bool>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="m_autoOfflineCheckBox">
-            <property name="text">
-             <string>Go offline when closing the contact list</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
         <widget class="QGroupBox" name="incomingFilesGroupBox">
          <property name="title">
           <string>Incoming files</string>
@@ -375,9 +363,6 @@
               <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>
@@ -467,6 +452,7 @@
    <class>KUrlRequester</class>
    <extends>QFrame</extends>
    <header>kurlrequester.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>NowPlayingLineEdit</class>

-- 
ktp-kded-integration-module packaging