[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=d8a8f35

The following commit has been merged in the master branch:
commit d8a8f35b3c1de426496c13f9d86d1554d64dfcc8
Author: Anant Kamath <kamathanant at gmail.com>
Date:   Mon Sep 2 08:57:34 2013 +0530

    Added set function for simIdentifier
---
 plugins/pintxo/main-options-widget.cpp | 10 ----------
 plugins/pintxo/main-options-widget.h   |  1 -
 plugins/pintxo/modem-combobox.cpp      | 28 +++++++++++++++++++++++++---
 plugins/pintxo/modem-combobox.h        |  3 ++-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/plugins/pintxo/main-options-widget.cpp b/plugins/pintxo/main-options-widget.cpp
index 4b885cb..0752a30 100644
--- a/plugins/pintxo/main-options-widget.cpp
+++ b/plugins/pintxo/main-options-widget.cpp
@@ -47,16 +47,6 @@ MainOptionsWidget::~MainOptionsWidget()
     delete m_ui;
 }
 
-bool MainOptionsWidget::validateParameterValues()
-{
-    QString parameterNumber = parameterModel()->data(parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("number"))), ParameterEditModel::ValueRole).toString();
-    QString parameterSimIdentifier = parameterModel()->data(parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("simIdentifier"))), ParameterEditModel::ValueRole).toString();
-    if(parameterNumber.isEmpty() || parameterSimIdentifier.isEmpty()) {
-        return 0;
-    }
-    return 1;
-}
-
 QString MainOptionsWidget::defaultDisplayName() const
 {
     return parameterModel()->data(parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("number")))).toString();
diff --git a/plugins/pintxo/main-options-widget.h b/plugins/pintxo/main-options-widget.h
index 160eec1..70b747b 100644
--- a/plugins/pintxo/main-options-widget.h
+++ b/plugins/pintxo/main-options-widget.h
@@ -36,7 +36,6 @@ public:
                                QWidget *parent = 0);
     virtual ~MainOptionsWidget();
     virtual QString defaultDisplayName() const;
-    virtual bool validateParameterValues();
 private:
     Q_DISABLE_COPY(MainOptionsWidget);
     Ui::MainOptionsWidget *m_ui;
diff --git a/plugins/pintxo/modem-combobox.cpp b/plugins/pintxo/modem-combobox.cpp
index 722c0fc..1e064e5 100644
--- a/plugins/pintxo/modem-combobox.cpp
+++ b/plugins/pintxo/modem-combobox.cpp
@@ -46,11 +46,33 @@ ModemComboBox::~ModemComboBox()
 
 QString ModemComboBox::selectedSimIdentifier()
 {
-    ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modems.at(currentIndex())->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>();
-    if(!simCard.isNull()) {
-        return simCard->getSimIdentifier();
+    ModemManager::ModemInterface::Ptr modem = modems.at(currentIndex());
+    if(!modem.isNull()){
+        ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modems.at(currentIndex())->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>();
+        if(!simCard.isNull()) {
+            return simCard->getSimIdentifier();
+        }
     }
     return QString();
 }
 
+void ModemComboBox::setSelectedModem(const QString &selectedSimIdentifier)
+{
+    if(!modems.isEmpty()) {
+        int i = 0;
+        Q_FOREACH(ModemManager::ModemInterface::Ptr modem, modems) {
+            ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modem->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>();
+            if(!simCard.isNull()) {
+                QString simIdent = simCard->getSimIdentifier();
+                if (simIdent == selectedSimIdentifier) {
+                    setCurrentIndex(i);
+                    return;
+                }
+                ++i;
+            }
+        }
+    }
+}
+
+
 #include "modem-combobox.moc"
diff --git a/plugins/pintxo/modem-combobox.h b/plugins/pintxo/modem-combobox.h
index 6899b53..9c7bd0a 100644
--- a/plugins/pintxo/modem-combobox.h
+++ b/plugins/pintxo/modem-combobox.h
@@ -29,12 +29,13 @@
 class ModemComboBox : public QComboBox
 {
     Q_OBJECT
-    Q_PROPERTY(QString selectedSimIdentifier READ selectedSimIdentifier USER true)
+    Q_PROPERTY(QString selectedSimIdentifier READ selectedSimIdentifier WRITE setSelectedModem USER true)
 
 public:
     explicit ModemComboBox(QWidget *parent = 0);
     virtual ~ModemComboBox();
     QString selectedSimIdentifier();
+    void setSelectedModem(const QString &selectedSimIdentifier);
 private:
     ModemManager::ModemInterface::List modems;
 };

-- 
ktp-accounts-kcm packaging