[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=995c6e1

The following commit has been merged in the master branch:
commit 995c6e104d81967503632aced0375088f9490421
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Jun 24 12:10:48 2013 +0200

    Add "Always Ask" option for filetransfer destination directory
    
    REVIEW: 111092
    BUG: 295937
    FIXED-IN: 0.7.0
---
 config/telepathy-kded-config.cpp | 11 +++++++++++
 config/telepathy-kded-config.h   |  1 +
 config/telepathy-kded-config.ui  | 18 ++++++++++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/config/telepathy-kded-config.cpp b/config/telepathy-kded-config.cpp
index 780a882..d237707 100644
--- a/config/telepathy-kded-config.cpp
+++ b/config/telepathy-kded-config.cpp
@@ -118,6 +118,8 @@ TelepathyKDEDConfig::TelepathyKDEDConfig(QWidget *parent, const QVariantList& ar
             this, SLOT(settingsHasChanged()));
     connect(ui->m_screenSaverAwayMessage, SIGNAL(textChanged(QString)),
             this, SLOT(settingsHasChanged()));
+    connect(ui->m_downloadUrlCheckBox, SIGNAL(clicked(bool)),
+            this, SLOT(downloadUrlCheckBoxChanged(bool)));
 
     connect(ui->m_awayCheckBox, SIGNAL(clicked(bool)),
             this, SLOT(autoAwayChecked(bool)));
@@ -147,6 +149,8 @@ void TelepathyKDEDConfig::load()
     QString downloadDirectory = filetransferConfig.readPathEntry(QLatin1String("downloadDirectory"),
                     QDir::homePath() + QLatin1String("/") + i18nc("This is the download directory in user's home", "Downloads"));
     ui->m_downloadUrlRequester->setUrl(KUrl(downloadDirectory));
+    ui->m_downloadUrlCheckBox->setChecked(filetransferConfig.readEntry(QLatin1String("alwaysAsk"), false));
+    ui->m_downloadUrlRequester->setEnabled(!ui->m_downloadUrlCheckBox->isChecked());
 
     // check if auto-accept file transfers is enabled
     bool autoAcceptEnabled = filetransferConfig.readEntry(QLatin1String("autoAccept"), false);
@@ -258,6 +262,7 @@ void TelepathyKDEDConfig::save()
 
     filetransferConfig.writeEntry(QLatin1String("downloadDirectory"), ui->m_downloadUrlRequester->url().toLocalFile());
     filetransferConfig.writeEntry(QLatin1String("autoAccept"), ui->m_autoAcceptCheckBox->isChecked());
+    filetransferConfig.writeEntry(QLatin1String("alwaysAsk"), ui->m_downloadUrlCheckBox->isChecked());
     filetransferConfig.sync();
 
 // KDED module config
@@ -372,3 +377,9 @@ void TelepathyKDEDConfig::autoOfflineChecked(bool checked)
 
     ui->m_autoOfflineCheckBox->setTristate(false);
 }
+
+void TelepathyKDEDConfig::downloadUrlCheckBoxChanged(bool checked)
+{
+    ui->m_downloadUrlRequester->setEnabled(!checked);
+    Q_EMIT changed(true);
+}
diff --git a/config/telepathy-kded-config.h b/config/telepathy-kded-config.h
index b674ae7..166338f 100644
--- a/config/telepathy-kded-config.h
+++ b/config/telepathy-kded-config.h
@@ -47,6 +47,7 @@ private Q_SLOTS:
     void nowPlayingChecked(bool checked);
     void autoOfflineChecked(bool checked);
     void screenSaverAwayChecked(bool checked);
+    void downloadUrlCheckBoxChanged(bool checked);
 
 private:
     void enableAwayWidgets(bool enable);
diff --git a/config/telepathy-kded-config.ui b/config/telepathy-kded-config.ui
index aff6a7e..6c72ff3 100644
--- a/config/telepathy-kded-config.ui
+++ b/config/telepathy-kded-config.ui
@@ -326,20 +326,30 @@
      <property name="flat">
       <bool>false</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout_6">
       <item row="0" column="0">
-       <layout class="QHBoxLayout" name="download_folder_layout">
-        <item>
+       <layout class="QGridLayout" name="downloadFolderLayout">
+        <item row="0" column="0">
          <widget class="QLabel" name="m_downloadUrlLabel">
           <property name="text">
            <string>Download folder:</string>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          </property>
           <property name="buddy">
            <cstring>m_downloadUrlRequester</cstring>
           </property>
          </widget>
         </item>
-        <item>
+        <item row="0" column="1">
+         <widget class="QCheckBox" name="m_downloadUrlCheckBox">
+          <property name="text">
+           <string>Always Ask</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
          <widget class="KUrlRequester" name="m_downloadUrlRequester">
           <property name="toolTip">
            <string>This is the folder where received files will be saved.</string>

-- 
ktp-kded-integration-module packaging