[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phoneblocker] frontends/blackberry/ui: Merge the call and sms lists in the gui, too
From:       Laszlo Papp <lpapp () kde ! org>
Date:       2015-01-19 22:44:09
Message-ID: E1YDL3J-00073m-4p () scm ! kde ! org
[Download RAW message or body]

Git commit dc3aa864cfd9e710c13aedd1a01417a25737770b by Laszlo Papp.
Committed on 19/01/2015 at 22:40.
Pushed by lpapp into branch 'master'.

Merge the call and sms lists in the gui, too

M  +14   -27   frontends/blackberry/ui/mainwindow.cpp
M  +6    -7    frontends/blackberry/ui/mainwindow.h

http://commits.kde.org/phoneblocker/dc3aa864cfd9e710c13aedd1a01417a25737770b

diff --git a/frontends/blackberry/ui/mainwindow.cpp \
b/frontends/blackberry/ui/mainwindow.cpp index 9cdc5aa..23640c6 100644
--- a/frontends/blackberry/ui/mainwindow.cpp
+++ b/frontends/blackberry/ui/mainwindow.cpp
@@ -47,14 +47,11 @@ void MainWindow::createBlockedListPage()
     blockedListContainer->setHorizontalAlignment(HorizontalAlignment::Fill);
 
     createBlockedListView();
-    m_blockedCallListView.setScrollRole(ScrollRole::Main);
-    m_blockedCallListView.setHorizontalAlignment(HorizontalAlignment::Fill);
-    m_blockedSmsListView.setScrollRole(ScrollRole::Main);
-    m_blockedSmsListView.setHorizontalAlignment(HorizontalAlignment::Fill);
+    m_blockedListView.setScrollRole(ScrollRole::Main);
+    m_blockedListView.setHorizontalAlignment(HorizontalAlignment::Fill);
 
     blockedListContainer->add(backgroundImage);
-    blockedListContainer->add(&m_blockedCallListView);
-    blockedListContainer->add(&m_blockedSmsListView);
+    blockedListContainer->add(&m_blockedListView);
 
     m_blockedListPage.setContent(blockedListContainer);
 
@@ -162,26 +159,18 @@ void MainWindow::createBlockedListView()
     m_blockOutsideContactsSmsNumbers = \
settings.value(m_blockOutsideContactsSmsNumbersKey, false).toBool();  
     QVariantMap callMap = QVariantMap();
-    QStringList blockedCallNumbers = settings.value(m_blockedCallNumbersKey, \
                QStringList()).toStringList();
-    foreach (const QString &blockedCallNumber, blockedCallNumbers) {
-        callMap["phoneNumber"] = blockedCallNumber;
-        m_blockedCallListModel << callMap;
+    BlockedNumbers blockedNumbers = \
settings.value(m_blockedNumbersKey).value<BlockedNumbers>(); +    for (auto \
phoneNumber : blockedNumbers.keys()) { +        callMap["phoneNumber"] = phoneNumber;
+        callMap["call"] = blockedNumbers.value(phoneNumber).first;
+        callMap["sms"] = blockedNumbers.value(phoneNumber).second;
+        m_blockedListModel << callMap;
     }
 
-    QVariantMap smsMap = QVariantMap();
-    QStringList blockedSmsNumbers = settings.value(m_blockedSmsNumbersKey, \
                QStringList()).toStringList();
-    foreach (const QString &blockedSmsNumber, blockedSmsNumbers) {
-        smsMap["phoneNumber"] = blockedSmsNumber;
-        m_blockedSmsListModel << smsMap;
-    }
-
-    m_blockedCallListView.setDataModel(&m_blockedCallListModel);
-    // m_blockedCallListView.setListItemProvider(blockedCallItemManager);
-    m_blockedSmsListView.setDataModel(&m_blockedSmsListModel);
-    // m_blockedSmsListView.setListItemProvider(blockedSmsItemManager);
+    m_blockedListView.setDataModel(&m_blockedListModel);
+    // m_blockedListView.setListItemProvider(blockedItemManager);
 
-    connect(&m_blockedCallListView, SIGNAL(triggered(const QVariantList)), \
                SLOT(handleBlockedCallListTriggered(const QVariantList)));
-    connect(&m_blockedSmsListView, SIGNAL(triggered(const QVariantList)), \
SLOT(handleBlockedSmsListTriggered(const QVariantList))); +    \
connect(&m_blockedListView, SIGNAL(triggered(const QVariantList)), \
SLOT(handleBlockedListTriggered(const QVariantList)));  }
 
 void MainWindow::handleBlockedCallListTriggered(const QVariantList)
@@ -209,10 +198,8 @@ void MainWindow::handleBlockButtonClicked()
 
 void MainWindow::handleTopChanged(bb::cascades::Page* page)
 {
-    if (page != &m_addBlockedItemPage) {
-        m_blockedCallListView.clearSelection();
-        m_blockedSmsListView.clearSelection();
-    }
+    if (page != &m_addBlockedItemPage)
+        m_blockedListView.clearSelection();
 }
 
 void MainWindow::handlePopTransitionEnded(bb::cascades::Page *page)
diff --git a/frontends/blackberry/ui/mainwindow.h \
b/frontends/blackberry/ui/mainwindow.h index 0954072..c988d57 100644
--- a/frontends/blackberry/ui/mainwindow.h
+++ b/frontends/blackberry/ui/mainwindow.h
@@ -34,6 +34,8 @@
 
 #include <QStringList>
 
+typedef QMap<QString, QPair<bool, bool>> BlockedNumbers;
+
 class MainWindow : public QObject
 {
     Q_OBJECT
@@ -60,11 +62,8 @@ private:
     bb::cascades::Page m_blockedListPage;
     bb::cascades::Page m_addBlockedItemPage;
 
-    bb::cascades::ListView m_blockedCallListView;
-    bb::cascades::ListView m_blockedSmsListView;
-
-    bb::cascades::QVariantListDataModel m_blockedCallListModel;
-    bb::cascades::QVariantListDataModel m_blockedSmsListModel;
+    bb::cascades::ListView m_blockedListView;
+    bb::cascades::QVariantListDataModel m_blockedListModel;
 
     bool m_blockAllSmsNumbers{false};
     bool m_blockOutsideContactsSmsNumbers{false};
@@ -73,8 +72,7 @@ private:
     bool m_blockAllCallNumbers{false};
     bool m_blockOutsideContactsCallNumbers{false};
 
-    const QString m_blockedCallNumbersKey{"blockedCallNumbers"};
-    const QString m_blockedSmsNumbersKey{"blockedSmsNumbers"};
+    const QString m_blockedNumbersKey{"blockedNumbers"};
     const QString m_blockAllCallNumbersKey{"blockAllCallNumbers"};
     const QString m_blockAllSmsNumbersKey{"blockAllSmsNumbers"};
     const QString m_blockOutsideContactsCallNumbersKey{"blockOutsideContactsCallNumbers"};
 @@ -95,5 +93,6 @@ private:
 
     SocketWriter m_socketWriter;
 };
+Q_DECLARE_METATYPE(BlockedNumbers)
 
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]