Changeset 56:e63ceb8090cd in SMSSender

Timestamp:

Feb 2, 2010 9:53:45 AM (9 years ago)

Author:

Sämy Zehnder <saemy.zehnder@…>

Branch:

3.0

Convert:

svn:3639001d-8e34-449c-bb86-3782b86c4877/branches/3.0@55

Message:

• Renamed accountmodel to accounttreemodel
• Implemented creation of new contact if number is unknown in vcmain
• Areacode is now in its own field in vceditcontact
• Accountlist in vcmain is now controlled by a model (Needs filtering of only active ones)
• Settingspath is dynamic and user-based now

Files:

• gateways/SwisscomXtraZone/src/business/BCGateway.cpp (modified) (1 diff)
• gateways/SwisscomXtraZone/src/business/BCGateway.h (modified) (1 diff)
• lib/libdatatypes/src/business/BCContact.cpp (modified) (1 diff)
• lib/libdatatypes/src/snumber.cpp (modified) (7 diffs)
• lib/libdatatypes/src/snumber.h (modified) (2 diffs)
• lib/libinterfaces/src/business/igateway.h (modified) (3 diffs)
• smssender.pro (modified) (4 diffs)
• src/business/BCContactManager.cpp (modified) (2 diffs)
• src/business/BCContactManager.h (modified) (4 diffs)
• src/business/BCSettings.cpp (modified) (3 diffs)
• src/ui/VCAccountList/vcaccountlist.cpp (modified) (2 diffs)
• src/ui/VCAccountList/vcaccountlist.h (modified) (2 diffs)
• src/ui/VCAddressBook/vcaddressbook.ui (modified) (1 diff)
• src/ui/VCEditContact/vceditcontact.cpp (modified) (6 diffs)
• src/ui/VCEditContact/vceditcontact.h (modified) (3 diffs)
• src/ui/VCEditContact/vceditcontact.ui (modified) (5 diffs)
• src/ui/VCMain/vcmain.cpp (modified) (11 diffs)
• src/ui/VCMain/vcmain.h (modified) (4 diffs)
• src/ui/models/accounttreemodel.cpp (moved) (moved from src/ui/models/accountmodel.cpp) (7 diffs)
• src/ui/models/accounttreemodel.h (moved) (moved from src/ui/models/accountmodel.h) (4 diffs)

gateways/SwisscomXtraZone/src/business/BCGateway.cpp

@@ -25 +25 @@
 QImage BCGateway::icon() const {
     return QImage(":/images/SwisscomXtraZone.ico");
+}
+
+QSet<int> BCGateway::validRecipientCountryCodes() const {
+    QSet<int> result;
+    result.insert(41); // CH
+    return result;
 }
 

gateways/SwisscomXtraZone/src/business/BCGateway.h

@@ -26 +26 @@
 
     /* IGateway */
-    virtual QString        name() const;
-    virtual QImage         icon() const;
+    QString        name() const;
+    QImage         icon() const;
+    QSet<int>      validRecipientCountryCodes() const;
 
-    virtual IAccount*      createAccountInstance(IStorage* storage) const;
+    IAccount*      createAccountInstance(IStorage* storage) const;
 
-    virtual QList<QString> splitTextToLongSMS(const QString& text) const;
-    virtual QList<QString> splitTextToShortSMS(const QString& text) const;
+    QList<QString> splitTextToLongSMS(const QString& text) const;
+    QList<QString> splitTextToShortSMS(const QString& text) const;
 
-    virtual IAccountSettingsWidget* getAccountSettingsWidget(QWidget* parent = 0) const;
+    IAccountSettingsWidget* getAccountSettingsWidget(QWidget* parent = 0) const;
 
 
-    virtual QString        addonText() const;
-    virtual void           setAddonText(const QString& addonText);
+    QString        addonText() const;
+    void           setAddonText(const QString& addonText);
 
-    virtual int            longSMSLength() const;
-    virtual void           setLongSMSLength(int longSMSLength);
+    int            longSMSLength() const;
+    void           setLongSMSLength(int longSMSLength);
 
 protected:

lib/libdatatypes/src/business/BCContact.cpp

@@ -66 +66 @@
 void BCContact::setImage(const QImage& image){
     SET_IF_DIFFERENT(image_, image);
+    image_ = image_.scaledToWidth(50, Qt::SmoothTransformation);
     emit contactEvents()->dataChanged();
 }

lib/libdatatypes/src/snumber.cpp

@@ -25 +25 @@
  *  aa      area code (2-digits)
  *  aaa     area code (3-digits)
- *
  *  AAA     area code trim zeros
  *
@@ -34 +33 @@
 const QString SNumber::IsoFormat      = "'+'cc' 'aaa' 'u"; // +41 079 1234567
 const QString SNumber::IsoFormatShort = "'+'CC' 'AAA' 'u"; // +41 79 1234567
+const QString SNumber::GuessFormat    = "%%guess%%";
 
 SNumber::SNumber() {
     clear();
 }
-SNumber::SNumber(const QString& numberStr, const QString& format /* = SNumber::IsoFormat */) {
+SNumber::SNumber(const QString& numberStr, const QString& format) {
     setNumber(numberStr, format);
 }
@@ -72 +72 @@
 
 /* CC & AAA are not applicable here! */
-bool SNumber::setNumber(const QString& numberStr, const QString& format /* = SNumber::IsoFormat */){
+bool SNumber::setNumber(const QString& numberStr, const QString& format){
+    if (format == SNumber::GuessFormat) {
+        QStringList formats;
+        formats.append("'+'cc' 'aaa' 'u");// +41 079 1234567
+        formats.append("'+'cc' 'aa' 'u"); // +41 79 1234567
+        formats.append("'+'cc' 'a' 'u");  // +41 7 1234567
+        formats.append("'+'c' 'aaa' 'u"); // +1 079 1234567
+        formats.append("'+'c' 'aa' 'u");  // +1 79 1234567
+        formats.append("'+'c' 'a' 'u");   // +1 7 1234567
+        formats.append("'+'cc' 'aaau");   // +41 0791234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+        formats.append("'+'cc' 'aau");    // +41 791234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+        formats.append("'+'cc' 'au");     // +41 71234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+        formats.append("'+'c' 'aaau");    // +1 0791234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+        formats.append("'+'c' 'aau");     // +1 791234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+        formats.append("'+'c' 'au");      // +1 71234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+
+        foreach(QString format_, formats) {
+            if (setNumber(numberStr, format_)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     clear();
 
-    qDebug() << numberStr;
-    qDebug() << format;
+    qDebug() << "Checking " + format + " on " + numberStr;
 
     const QLatin1Char quote('\'');
@@ -85 +107 @@
     int  j = 0;
     for (int i = 0; i < format.count(); i++) {
+        if (numberStr.count() <= j) {
+            clear();
+            break;
+        }
+
         if (format.at(i) == quote) {
             inQuote = !inQuote;
@@ -129 +156 @@
             j++;
         } else {
+            if (format.mid(i, 2) == "CC") {
+                qWarning() << "CC not supported here!";
+            } else if (format.mid(i, 3) == "AAA") {
+                qWarning() << "AAA not supported here!";
+            }
             clear();
             break;
@@ -168 +200 @@
 }
 
-QString SNumber::toString(const QString& format /* = SNumber::IsoFormat */) const {
+QString SNumber::toString(const QString& format) const {
     if (!isValid()) {
         return "";
@@ -219 +251 @@
 }
 
-void SNumber::fromString(const QString& string, const QString& format /* = SNumber::IsoFormat */) {
-    setNumber(string, format);
+bool SNumber::readFromString(const QString& string, const QString& format) {
+    return setNumber(string, format);
+}
+SNumber SNumber::fromString(const QString& string, const QString& format) {
+    return SNumber(string, format);
 }
 

lib/libdatatypes/src/snumber.h

@@ -17 +17 @@
     static const QString IsoFormat;
     static const QString IsoFormatShort;
+    static const QString GuessFormat;
 
 public:
@@ -34 +35 @@
 
     QString toString(const QString& format = SNumber::IsoFormat) const;
-    void    fromString(const QString& string, const QString& format = SNumber::IsoFormat);
+    bool    readFromString(const QString& string, const QString& format = SNumber::IsoFormat);
 
     bool        operator==(const SNumber& n) const;
     inline bool operator!=(const SNumber& n) const { return !(*this == n); }
 
+    static SNumber fromString(const QString& string, const QString& format = SNumber::IsoFormat);
 protected:
     void setCountryCode(short countryCode);

lib/libinterfaces/src/business/igateway.h

@@ -12 +12 @@
 #include <QString>
 #include <QList>
+#include <QSet>
 #include <QWidget>
 #include <QImage>
@@ -28 +29 @@
     virtual QString        name() const =0;
     virtual QImage         icon() const =0;
+    virtual QSet<int>      validRecipientCountryCodes() const =0;
 
     virtual IAccount*      createAccountInstance() const =0;
@@ -34 +36 @@
     virtual IStorage*      defaultStorage() const =0;
     virtual void           setDefaultStorage(IStorage* storage) =0;
-
 
     virtual QList<QString> splitTextToLongSMS(const QString& text) const =0;

smssender.pro

@@ -21 +21 @@
     lib/libutils/src \
     include
-HEADERS += src/ui/models/grouptablemodel.h \
+HEADERS += src/ui/models/accounttreemodel.h \
+    src/ui/models/loadedaccountmodel.h \
+    src/ui/models/grouptablemodel.h \
     src/ui/models/contacttablemodel.h \
     src/persistence/storage/DAAccountListManager.h \
@@ -28 +30 @@
     src/ui/models/aliascompletionmodel.h \
     src/ui/completers/bettercompleter.h \
-    src/ui/models/accountmodel.h \
     src/ui/delegates/aligndelegate.h \
     src/ui/components/clearbutton.h \
@@ -57 +58 @@
     src/ui/VCMain/vcmain.h \
     src/ui/VCSettings/vcsettings.h
-SOURCES += src/ui/models/grouptablemodel.cpp \
+SOURCES += src/ui/models/accounttreemodel.cpp \
+    src/ui/models/loadedaccountmodel.cpp \
+    src/ui/models/grouptablemodel.cpp \
     src/ui/models/contacttablemodel.cpp \
     src/persistence/storage/DAAccountListManager.cpp \
@@ -64 +67 @@
     src/ui/models/aliascompletionmodel.cpp \
     src/ui/completers/bettercompleter.cpp \
-    src/ui/models/accountmodel.cpp \
     src/ui/delegates/aligndelegate.cpp \
     src/ui/components/clearbutton.cpp \

src/business/BCContactManager.cpp

@@ -59 +59 @@
 }
 
-IContact* BCContactManager::getContact(int contactId){
+IContact* BCContactManager::getContact(int contactId) const {
     return contactList_.value(contactId);
 }
 
-QSet<IContact*> BCContactManager::getContactList(){
+QSet<IContact*> BCContactManager::getContactList() const {
     return contactList_.values().toSet();
 }
@@ -83 +83 @@
 }
 
+IContact* BCContactManager::getContactByNumber(const SNumber number) const {
+    foreach (IContact* contact, getContactList()) {
+        if (number == contact->number()) {
+            return contact;
+        }
+    }
+    return NULL;
+}
+
+
 void BCContactManager::contactIdChanged(int oldId, int newId) {
     IContact* contact = contactList_.take(oldId);

src/business/BCContactManager.h

@@ -6 +6 @@
  */
 
-#ifndef CONTACTMANAGER_H_
-#define CONTACTMANAGER_H_
+#ifndef BC_CONTACTMANAGER_H_
+#define BC_CONTACTMANAGER_H_
 
 #include <QObject>
@@ -14 +14 @@
 
 #include <icontact.h>
+#include <snumber.h>
 
 class BCContactManager: public QObject {
@@ -21 +22 @@
     static BCContactManager* instance();
 
-    virtual IContact*        getContact(int contactId);
-    virtual QSet<IContact*>  getContactList();
-    virtual void             saveContact(IContact* contact);
-    virtual void             removeContact(int contactId);
+    IContact*        getContact(int contactId) const;
+    QSet<IContact*>  getContactList() const;
+    void             saveContact(IContact* contact);
+    void             removeContact(int contactId);
+
+    IContact*        getContactByNumber(const SNumber number) const;
 
 signals:
-    void                     contactAdded(IContact* contact);
-    void                     contactUpdated(IContact* contact);
-    void                     contactRemoved(IContact* contact);
+    void             contactAdded(IContact* contact);
+    void             contactUpdated(IContact* contact);
+    void             contactRemoved(IContact* contact);
 
 protected:
@@ -35 +38 @@
     virtual ~BCContactManager(){};
 
-    virtual void             readContactsFromStorage();
+    virtual void     readContactsFromStorage();
 
 protected slots:
-    void                     contactIdChanged(int oldId, int newId);
-    void                     contactDataChanged();
+    void             contactIdChanged(int oldId, int newId);
+    void             contactDataChanged();
 
 private:

src/business/BCSettings.cpp

@@ -10 +10 @@
 #include <QDirIterator>
 #include <QFileInfo>
+#include <QCoreApplication>
+#include <QDesktopServices>
 
 #include "../persistence/PersistenceFactory.h"
@@ -24 +26 @@
 }
 
+QString BCSettings::getSettingsPath(){
+    if (QFile::exists(qApp->applicationDirPath() + "/data.db")) {
+        return qApp->applicationDirPath() + "/";
+    } else {
+        return QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/gorrion/SMSSender/";
+    }
+}
 
 const QString BCSettings::getLocalePath(){
-    return "locale/";
+    return qApp->applicationDirPath() + "/locale/";
 }
 
@@ -117 +126 @@
 
 
-QString BCSettings::getSettingsPath(){
-    return "./";
-}
-
-
 void BCSettings::setLocale(const QLocale& locale){
     return getSettings()->setLocale(locale);

src/ui/VCAccountList/vcaccountlist.cpp

@@ -22 +22 @@
         ui.setupUi(this);
 
-    model_      = new AccountModel(this);
+    model_      = new AccountTreeModel(this);
     proxyModel_ = new BetterCompletionModel(this);
     proxyModel_->setFilterKeyColumn(-1);
@@ -32 +32 @@
     ui.tblViewAccounts->resizeRowsToContents();
     ui.tblViewAccounts->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
-    ui.tblViewAccounts->horizontalHeader()->setResizeMode(AccountModel::ColName, QHeaderView::Stretch);
-    ui.tblViewAccounts->sortByColumn(AccountModel::ColName, Qt::AscendingOrder);
+    ui.tblViewAccounts->horizontalHeader()->setResizeMode(AccountTreeModel::ColName, QHeaderView::Stretch);
+    ui.tblViewAccounts->sortByColumn(AccountTreeModel::ColName, Qt::AscendingOrder);
     ui.tblViewAccounts->resizeColumnsToContents();
     ui.tblViewAccounts->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);

src/ui/VCAccountList/vcaccountlist.h

@@ -11 +11 @@
 #include <iaccount.h>
 
-#include "../models/accountmodel.h"
+#include "../models/accounttreemodel.h"
 
 class VCAccountList: public QDialog {
@@ -23 +23 @@
     Ui::VCAccountListClass ui;
 
-    AccountModel*          model_;
+    AccountTreeModel*      model_;
     QSortFilterProxyModel* proxyModel_;
 

src/ui/VCAddressBook/vcaddressbook.ui

@@ -199 +199 @@
           <size>
            <width>50</width>
-           <height>64</height>
+           <height>0</height>
           </size>
          </property>

src/ui/VCEditContact/vceditcontact.cpp

@@ -6 +6 @@
 #include <QtGui/QFileDialog>
 #include <QtGui/QMessageBox>
-
+#include <QDebug>
 #include <QStringList>
+#include <QSortFilterProxyModel>
 
 #include "../UIHelper.h"
@@ -25 +26 @@
 
         ui.edtName->setText(contact->name());
-        ui.edtNumber->setText(contact->number().toString(SNumber::IsoFormatShort));
+        if (!contact->number().isValid()) {
+            ui.edtCountryCode->setText("+41");
+            ui.edtNumber->setText("");
+        } else {
+        ui.edtCountryCode->setText(contact->number().toString("'+'CC"));
+        ui.edtNumber->setText(contact->number().toString("AAA' 'u"));
+        }
 
         // Load aliases
-    QStringList aliases = contact->aliases();
-    for (int x = 0; x < aliases.size(); ++x){
-        QString alias = aliases.at(x);
-        ui.lstAliases->addItem(alias);
-    }
-    ui.lstAliases->sortItems();
+        foreach (QString alias, contact->aliases()) {
+            addAliasItem(alias);
+        }
+        QSortFilterProxyModel* model = new QSortFilterProxyModel(this);
+        model->setSourceModel(ui.lstAliases->model());
+        model->setDynamicSortFilter(true);
+        model->setSortCaseSensitivity(Qt::CaseInsensitive);
+        model->sort(0, Qt::AscendingOrder);
+//    ui.lstAliases->sortItems();
 
     setIcon(contact->image());
@@ -40 +50 @@
     // First "signal" to initialize some slots
     on_lstAliases_itemSelectionChanged();
+}
+VCEditContact::~VCEditContact() {
+
 }
 
@@ -118 +131 @@
 // Aliases
 
-QString VCEditContact::editAlias(const QString& alias){
+QListWidgetItem* VCEditContact::addAliasItem(const QString& alias) {
+    QListWidgetItem* item = new QListWidgetItem(alias);
+    item->setFlags(item->flags() | Qt::ItemIsEditable);
+    ui.lstAliases->addItem(item);
+}
+/*
+void VCEditContact::editAlias(const QString& alias){
     bool ok;
-    QString text = QInputDialog::getText(this, tr("SMSSender"),
+    QString newAlias = QInputDialog::getText(this, tr("SMSSender"),
                                          tr("Enter an alias for that contact:"),
                                          QLineEdit::Normal,
                                          alias, &ok);
     if (ok){
-        text = text.trimmed();
+        if ((alias != "") && (newAlias.trimmed() == "")){
+            if (QMessageBox::Yes ==  QMessageBox::information(this, tr("SMSSender"),
+                                                              tr("You entered a empty value. Do you want to delete this alias?"),
+                                                              QMessageBox::Yes,
+                                                              QMessageBox::No | QMessageBox::Default | QMessageBox::Escape)) {
+                foreach (QListWidgetItem* item, ui.lstAliases->findItems(alias, Qt::MatchFixedString)) {
+                    ui.lstAliases->takeItem(ui.lstAliases->indexFromItem(item)->row());
+                }
+            }
+        }
+
+        if (ui.lstAliases->findItems(alias, Qt::MatchFixedString).count() > 0){ // Is it already in the list?
+            QMessageBox::information(this, tr("SMSSender"),
+                                     tr("This contact is already known under this alias."),
+                                     QMessageBox::Ok | QMessageBox::Default | QMessageBox::Escape);
+        }
+
+        newAliases = newAlias.split(",");
+        foreach (QString newAlias, newAliases) {
+            newAlias = newAlias.trimmed();
+
+            if (ui.lstAliases->findItems(alias, Qt::MatchFixedString).count() == 0){ // Is it already in the list?
+                ui.lstAliases->insertItem(ui.lstAliases->count(), alias);
+            }
+        }
+
+
+
         return text;
     }else{
         return alias;
     }
-}
+}*/
 
 void VCEditContact::on_lstAliases_itemSelectionChanged(){
     ui.btnRemoveAlias->setEnabled(ui.lstAliases->selectedItems().count() > 0);
+    ui.btnEditAlias->setEnabled(ui.lstAliases->selectedItems().count() > 0);
 }
 
 void VCEditContact::on_btnAddAlias_clicked(){
-    QString alias = editAlias(QString());
-
-    if (alias != ""){ // If empty, then do not add it
-        if (ui.lstAliases->findItems(alias, Qt::MatchFixedString).count() == 0){ // Is it already in the list?
-            ui.lstAliases->insertItem(ui.lstAliases->count(), alias);
-        }else{
-            QMessageBox::information(this, tr("SMSSender"),
-                                     tr("This contact is already known under this alias."),
-                                     QMessageBox::Ok | QMessageBox::Default | QMessageBox::Escape);
-        }
-    }
-}
-
-void VCEditContact::on_lstAliases_itemDoubleClicked(QListWidgetItem* item){
+    QList<QListWidgetItem*> emptyItems = ui.lstAliases->findItems("", Qt::MatchFixedString);
+    if (emptyItems.isEmpty()) {
+        emptyItems.append(addAliasItem(""));
+    }
+    ui.lstAliases->setFocus();
+    emptyItems.first()->setSelected(true);
+    on_btnEditAlias_clicked();
+}
+void VCEditContact::on_btnEditAlias_clicked() {
+    QList<QListWidgetItem*> selectedItems = ui.lstAliases->selectedItems();
+    if (!selectedItems.isEmpty()) {
+        ui.lstAliases->setFocus();
+        ui.lstAliases->editItem(selectedItems.first());
+    }
+}
+
+
+void VCEditContact::on_lstAliases_itemChanged(QListWidgetItem* item) {
+    QString alias = item->text().trimmed();
+
+    QList<QListWidgetItem*> items = ui.lstAliases->findItems(alias, Qt::MatchFixedString);
+    items.removeAll(item);
+    if (items.count() > 0){ // Is it already in the list?
+        QMessageBox::information(this, tr("SMSSender"),
+                                 tr("This contact is already known under this alias."),
+                                 QMessageBox::Ok | QMessageBox::Default | QMessageBox::Escape);
+        ui.lstAliases->editItem(item);
+        return;
+    }
+
+    ui.lstAliases->takeItem(ui.lstAliases->row(item));
+    foreach (QString newAlias, alias.split(",", QString::SkipEmptyParts)) {
+        newAlias = newAlias.trimmed();
+
+        if (ui.lstAliases->findItems(newAlias, Qt::MatchFixedString).count() == 0){ // Is it already in the list?
+            addAliasItem(newAlias);
+        }
+    }
+//    ui.lstAliases->sortItems();
+}
+
+/*void VCEditContact::on_lstAliases_itemDoubleClicked(QListWidgetItem* item){
     QString alias = editAlias(item->text());
 
-    if (alias == ""){
-        if (QMessageBox::Yes ==  QMessageBox::information(this, tr("SMSSender"),
-                                                          tr("You entered a empty value. Do you want to delete this alias?"),
-                                                          QMessageBox::Yes,
-                                                          QMessageBox::No | QMessageBox::Default | QMessageBox::Escape)) {
-            ui.lstAliases->takeItem(ui.lstAliases->row(item));
-        }
-    }else{
-        item->setText(alias);
-    }
-}
+}*/
 
 void VCEditContact::on_btnRemoveAlias_clicked(){
@@ -170 +235 @@
     }
 
-    if (QMessageBox::Yes == QMessageBox::warning(this, tr("SMSSender"),
-                                                 tr("Do you really want to remove this alias?"),
-                                                 QMessageBox::Yes,
-                                                 QMessageBox::No | QMessageBox::Default | QMessageBox::Escape)){
+    if ((ui.lstAliases->selectedItems().first()->text().trimmed() == "") ||
+        (QMessageBox::Yes == QMessageBox::warning(this, tr("SMSSender"),
+                                                  tr("Do you really want to remove this alias?"),
+                                                  QMessageBox::Yes,
+                                                  QMessageBox::No | QMessageBox::Default | QMessageBox::Escape))){
         // Remove it from the list
         ui.lstAliases->takeItem(ui.lstAliases->row(ui.lstAliases->selectedItems().first()));
@@ -199 +265 @@
 
         contact_->setName(ui.edtName->text());
-        // TODO: test some different formats
-        contact_->setNumber(SNumber(ui.edtNumber->text()));
-
+        contact_->setNumber(SNumber(ui.edtCountryCode->text() + " " + ui.edtNumber->text(), SNumber::GuessFormat));
         QStringList aliases;
         for (int x = 0; x < ui.lstAliases->count(); x++){
-            aliases.append(ui.lstAliases->item(x)->text());
+            QString alias = ui.lstAliases->item(x)->text().trimmed();
+            if (alias != "") {
+                aliases.append(alias);
+            }
         }
         contact_->setAliases(aliases);
 
-        contactImage_ = contactImage_.scaledToHeight(72, Qt::SmoothTransformation);
         contact_->setImage(contactImage_);
 

src/ui/VCEditContact/vceditcontact.h

@@ -13 +13 @@
 public:
     VCEditContact(IContact* contact, QWidget *parent = 0);
-    ~VCEditContact(){};
+    ~VCEditContact();
 
 private:
@@ -21 +21 @@
     QImage  contactImage_;
 
-    QString editAlias(const QString& alias);
+    //QString editAlias(const QString& alias);
+    QListWidgetItem* addAliasItem(const QString& alias);
 
     void    addBtnIconMenu();
@@ -36 +37 @@
 
     void on_btnAddAlias_clicked();
+    void on_btnEditAlias_clicked();
     void on_btnRemoveAlias_clicked();
-    void on_lstAliases_itemDoubleClicked(QListWidgetItem* item);
+//    void on_lstAliases_itemDoubleClicked(QListWidgetItem* item);
+    void on_lstAliases_itemChanged(QListWidgetItem* item);
     void on_lstAliases_itemSelectionChanged();
 

src/ui/VCEditContact/vceditcontact.ui

@@ -30 +30 @@
       <string>Contact information</string>
      </property>
-     <layout class="QFormLayout" name="formLayout">
+     <layout class="QGridLayout" name="gridLayout_3">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
@@ -38 +38 @@
        </widget>
       </item>
-      <item row="0" column="1">
+      <item row="0" column="1" colspan="2">
        <widget class="QLineEdit" name="edtName"/>
       </item>
@@ -49 +49 @@
       </item>
       <item row="1" column="1">
+       <widget class="QLineEdit" name="edtCountryCode">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>41</width>
+          <height>16777215</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
        <widget class="QLineEdit" name="edtNumber"/>
       </item>
@@ -141 +157 @@
       </item>
       <item row="0" column="2">
+       <widget class="QPushButton" name="btnEditAlias">
+        <property name="minimumSize">
+         <size>
+          <width>34</width>
+          <height>34</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>34</width>
+          <height>34</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Edit account</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../lib/resource.qrc">
+          <normaloff>:/ico/edit.png</normaloff>:/ico/edit.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
        <spacer name="horizontalSpacer">
         <property name="orientation">
@@ -153 +195 @@
        </spacer>
       </item>
-      <item row="1" column="0" colspan="3">
+      <item row="1" column="0" colspan="4">
        <widget class="QListWidget" name="lstAliases">
+        <property name="editTriggers">
+         <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
+        </property>
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
         <property name="sortingEnabled">
          <bool>true</bool>

src/ui/VCMain/vcmain.cpp

@@ -9 +9 @@
 #include <algorithm>
 
+#include <snumber.h>
+#include <typeconvert.h>
+
+#include <icontact.h>
+
+#include "../../business/BusinessFactory.h"
 #include "../../business/BCAccountManager.h"
 #include "../../business/BCContactManager.h"
 #include "../../business/BCGroupManager.h"
 
-#include <typeconvert.h>
-
 #include "../UIHelper.h"
 
 #include "../VCAccountList/vcaccountlist.h"
 #include "../VCAddressBook/vcaddressbook.h"
+#include "../VCEditContact/vceditcontact.h"
 #include "../VCSettings/vcsettings.h"
 
@@ -30 +35 @@
         ui.setupUi(this);
 
-        //contactListModel = new QStringListModel;
-        //contactListModel = new AliasModel;
-
+        /* Accounts */
+        accountModel_       = new AccountTreeModel(this);
+        accountFilterModel_ = new QSortFilterProxyModel(this);
+        accountFilterModel_->setSourceModel(accountModel_);
+        accountFilterModel_->setSortCaseSensitivity(Qt::CaseInsensitive);
+        accountFilterModel_->setDynamicSortFilter(true);
+        accountFilterModel_->setFilterKeyColumn(AccountTreeModel::ColEnabled);
+        accountFilterModel_->setFilterRole(Qt::CheckStateRole);
+        accountFilterModel_->setFilterFixedString("1"); // Get only enabled ones
+        accountFilterModel_->sort(AccountTreeModel::ColName, Qt::AscendingOrder);
+        ui.lstAccounts->setModel(accountFilterModel_);
+
+        /* Contact / Groups */
         contactGroupListModel_ = new ContactGroupListModel(this);
-        QSortFilterProxyModel* sortModel = new QSortFilterProxyModel(this);
-    sortModel->setSourceModel(contactGroupListModel_);
-    ui.lstContacts->setModel(sortModel);
+        contactGroupSortModel_ = new QSortFilterProxyModel(this);
+        contactGroupSortModel_->setSourceModel(contactGroupListModel_);
+        contactGroupSortModel_->setDynamicSortFilter(true);
+        contactGroupSortModel_->setSortCaseSensitivity(Qt::CaseInsensitive);
+        contactGroupSortModel_->sort(0, Qt::AscendingOrder);
+    ui.lstContacts->setModel(contactGroupSortModel_);
 
         QSortFilterProxyModel* completionModel = new AliasCompletionModel(this);
@@ -46 +64 @@
     ui.lstContacts->setCompleter(aliasCompleter);
     ui.lstContacts->completer()->popup()->setIconSize(QSize(24, 24));
-    //ui.lstContacts->setEditable(true);
-
-    /*connect(ui.lstContacts->lineEdit(), SIGNAL(textChanged()),
-            aliasCompleter, SLOT());*/
+
     connect(ui.lstContacts->lineEdit(), SIGNAL(returnPressed()),
             this, SLOT(on_btnAddRecipient_clicked()));
@@ -55 +70 @@
     connect(aliasCompleter, SIGNAL(highlighted(const QString&)),
             this, SLOT(on_lstContacts_completer_changed(const QString&)));
+
 
     connect(BCAccountLoadManager::instance(), SIGNAL(accountLoadStateChanged(IAccount*, AccountLoadState)),
@@ -64 +80 @@
 
 
-        init();
-
-        ui.lstContacts->setCurrentIndex(-1);
-}
-
-void VCMain::init(){
-    //refillAccountList();
-    refillContactList();
-
     // First "signal" to initialize some slots
     on_treeRecipients_itemSelectionChanged();
-}
-
+
+        ui.lstContacts->setCurrentIndex(-1);
+}
 
 /* Contacts & Recipients... */
-
-void VCMain::refillContactList(){
-    // TODO: Make usage of aliases...
-/*
-    contactListModel->removeRows(0, contactListModel->rowCount());
-    //ui.lstContacts->clear();
-    contactStrToContact.clear();
-    groupStrToGroup.clear();
-
-    QPixmap blankIcon = QPixmap(":/ico/blank.png");
-
-    foreach (IContact* contact, BCContactManager::instance()->getContactList()) {
-        QPixmap icon = QPixmap::fromImage(contact->image());
-        if (icon.isNull()){
-            icon = blankIcon;
-        }
-        QString contactStr = contact->name();
-        QString aliasStr;
-        QStringListIterator i(contact->aliases());
-        while (i.hasNext()) {
-            aliasStr += i.next() + ", ";
-        }
-        aliasStr.remove(QRegExp(", $"));
-        if (aliasStr != "") {
-            contactStr += " (" + aliasStr + ")";
-        }
-
-        contactListModel->insertRow(contactListModel->rowCount());
-        contactListModel->setData(contactListModel->index(contactListModel->rowCount() - 1, 0), QIcon(icon), Qt::DecorationRole);
-        contactListModel->setData(contactListModel->index(contactListModel->rowCount() - 1, 0), contactStr, Qt::DisplayRole);
-
-        //ui.lstContacts->addItem(QIcon(icon), contactStr);
-        contactStrToContact.insert(contactStr, contact);
-    }
-
-    foreach (IGroup* group, BCGroupManager::instance()->getGroupList()) {
-        QPixmap icon = QPixmap::fromImage(group->image());
-        if (icon.isNull()){
-            icon = blankIcon;
-        }
-
-        QString groupStr = "<" + group->name() + ">";
-
-        contactListModel->insertRow(contactListModel->rowCount());
-        contactListModel->setData(contactListModel->index(contactListModel->rowCount() - 1, 0), QIcon(icon), Qt::DecorationRole);
-        contactListModel->setData(contactListModel->index(contactListModel->rowCount() - 1, 0), groupStr, Qt::DisplayRole);
-//        ui.lstContacts->addItem(QIcon(icon), "<" + group->name() + ">");
-        groupStrToGroup.insert(groupStr, group);
-    }
-    ui.lstContacts->model()->sort(0);
-
-    //ui.lstContacts->insertItem(0, blankIcon, ""); // Empty item at first position to prevent default recipient selection
-    ui.lstContacts->setCurrentIndex(-1); */
-}
-
-
 bool VCMain::isContactNode(const QTreeWidgetItem* node){
     return nodeToContact.contains(const_cast<QTreeWidgetItem*>(node));
@@ -218 +170 @@
     }
 
+    // TODO: Check if the given recipient/number is a valid recipient for the selected gateway
+
     contactGroupListModel_->addFilteredContact(contact);
 
@@ -281 +235 @@
 
 void VCMain::reloadAccountList() {
-    accountStrToAccount.clear();
+/*    accountStrToAccount.clear();
     QComboBox* accLst = ui.lstAccounts;
 
@@ -294 +248 @@
     int index = accLst->findText(selectedAccount);
     index = std::max(index, 0);
-    accLst->setCurrentIndex(index);
+    accLst->setCurrentIndex(index);*/
 }
 
@@ -311 +265 @@
 
 void VCMain::sendMessage() {
-    IAccount* account          = accountStrToAccount[ui.lstAccounts->currentText()];
+    QModelIndex idx            = accountFilterModel_->mapToSource(accountFilterModel_->index(ui.lstAccounts->currentIndex(), 0));
+    IAccount* account          = accountModel_->dataObject(idx);
     QString message            = ui.txtMessage->toPlainText().trimmed();
     QSet<IContact*> recipients = getRecipientContacts(true);
 
-    account->sendSMS(message, recipients);
-    QMessageBox::information(this, tr("SMS sent"), tr("Your sms has successfully been sent."), QMessageBox::Ok, QMessageBox::Ok);
+    if (account != NULL) {
+        account->sendSMS(message, recipients);
+        QMessageBox::information(this, tr("SMS sent"), tr("Your sms has successfully been sent."), QMessageBox::Ok, QMessageBox::Ok);
+    }
 }
 
@@ -337 +294 @@
 
 void VCMain:: on_btnAddRecipient_clicked(){
-    QModelIndex idx = contactGroupListModel_->index(ui.lstContacts->currentIndex());
+    QModelIndex idx = contactGroupSortModel_->mapToSource(contactGroupSortModel_->index(ui.lstContacts->currentIndex(), 0));
     if (idx.isValid()) {
         IInterface* recipient = contactGroupListModel_->dataObject(idx);
@@ -343 +300 @@
         addRecipient(dynamic_cast<IGroup*>(recipient));
     } else {
-        // TODO: Add new numbers to the address book
+        SNumber number = SNumber::fromString(ui.lstContacts->lineEdit()->text().trimmed(), SNumber::GuessFormat);
+        if (!number.isValid()) {
+            number = SNumber::fromString("+41 " + ui.lstContacts->lineEdit()->text().trimmed(), SNumber::GuessFormat);
+        }
+        if (number.isValid()) {
+            IContact* recipient = BCContactManager::instance()->getContactByNumber(number);
+
+            if (recipient != NULL) {
+                addRecipient(recipient);
+            } else {
+                IContact* recipient = BusinessFactory::instance()->getContactInstance();
+                recipient->setNumber(number);
+
+                if (QMessageBox::Yes == QMessageBox::question(this, tr("SMSSender"),
+                                                              tr("This number is not yet in your address book. Do you want to add it?"),
+                                                              QMessageBox::Yes,
+                                                              QMessageBox::No | QMessageBox::Default | QMessageBox::Escape)){
+                    VCEditContact* ec = new VCEditContact(recipient, this);
+                    if (ec->exec() == QDialog::Accepted){ // Wait for return
+                        BCContactManager::instance()->saveContact(recipient);
+                    }
+                }
+                if (recipient->name() == "") {
+                    recipient->setName(number.toString(SNumber::IsoFormatShort));
+                }
+                addRecipient(recipient);
+            }
+        }
     }
     ui.lstContacts->setCurrentIndex(-1);

src/ui/VCMain/vcmain.h

@@ -2 +2 @@
 #define VCMAIN_H
 
+#include "ui_vcmain.h"
+
 #include <QStringListModel>
 #include <QMap>
-#include <QtGui/QMainWindow>
-#include <QtGui/QTreeWidgetItem>
+#include <QMainWindow>
+#include <QTreeWidgetItem>
+#include <QSortFilterProxyModel>
 
 #include <icontact.h>
@@ -12 +15 @@
 #include "../../business/BCAccountLoadManager.h"
 
-#include "ui_vcmain.h"
-
+#include "../models/accounttreemodel.h"
 #include "../models/contactgroupmodel.h"
 
@@ -26 +28 @@
     Ui::VCMainClass ui;
 
+    AccountTreeModel*                 accountModel_;
+    QSortFilterProxyModel*            accountFilterModel_;
+
     ContactGroupListModel*            contactGroupListModel_;
-    //    QStringListModel*                 contactListModel;
+    QSortFilterProxyModel*            contactGroupSortModel_;
 
     QMap<QString, IAccount*>          accountStrToAccount;
-    /*QMap<QString, IContact*>          contactStrToContact;
-    QMap<QString, IGroup*>            groupStrToGroup;*/
 
     QMap<QTreeWidgetItem*, IContact*> nodeToContact;
     QMap<QTreeWidgetItem*, IGroup*>   nodeToGroup;
 
-    void init();
-    void refillContactList();
-
     /* Recipient list */
-    bool isContactNode(const QTreeWidgetItem* node);
-    bool isGroupNode(const QTreeWidgetItem* node);
-    IContact* getContactOfNode(const QTreeWidgetItem* node);
-    IGroup*   getGroupOfNode(const QTreeWidgetItem* node);
-    bool isNodeContactOrHasContact(const QTreeWidgetItem* node, IContact* contact);
-    bool isContactAlreadyRecipient(IContact* contact);
-    bool isGroupAlreadyRecipient(IGroup* group);
+    bool            isContactNode(const QTreeWidgetItem* node);
+    bool            isGroupNode(const QTreeWidgetItem* node);
+    IContact*       getContactOfNode(const QTreeWidgetItem* node);
+    IGroup*         getGroupOfNode(const QTreeWidgetItem* node);
+    bool            isNodeContactOrHasContact(const QTreeWidgetItem* node, IContact* contact);
+    bool            isContactAlreadyRecipient(IContact* contact);
+    bool            isGroupAlreadyRecipient(IGroup* group);
 
     void            addRecipient(IContact* contact, QTreeWidgetItem* parent = NULL);
@@ -56 +56 @@
     QSet<IGroup*>   getRecipientGroups();
 
+    /* Account */
     void reloadAccountList();
+
     void enableSendBtnIfAllFilled();
 

src/ui/models/accounttreemodel.cpp

@@ -1 @@
-#include "accountmodel.h"
+#include "accounttreemodel.h"
 
 #include <QDebug>
 
-AccountModel::AccountModel(QObject* parent)
+AccountTreeModel::AccountTreeModel(QObject* parent)
     : QAbstractTableModel(parent)
 {
     connect(BCAccountManager::instance(), SIGNAL(accountAdded(IAccount*)),
             this, SLOT(accountUpdated(IAccount*)));
-    connect(BCAccountManager::instance(), SIGNAL(accountDataChanged(IAccount*)),
+    connect(BCAccountManager::instance(), SIGNAL(accountUpdated(IAccount*)),
             this, SLOT(accountUpdated(IAccount*)));
     connect(BCAccountManager::instance(), SIGNAL(accountRemoved(IAccount*)),
             this, SLOT(accountUpdated(IAccount*)));
 }
-AccountModel::~AccountModel() {
+AccountTreeModel::~AccountTreeModel() {
     disconnect(BCAccountManager::instance(), SIGNAL(accountAdded(IAccount*)),
                this, SLOT(accountUpdated(IAccount*)));
-    disconnect(BCAccountManager::instance(), SIGNAL(accountDataChanged(IAccount*)),
+    disconnect(BCAccountManager::instance(), SIGNAL(accountUpdated(IAccount*)),
                this, SLOT(accountUpdated(IAccount*)));
     disconnect(BCAccountManager::instance(), SIGNAL(accountRemoved(IAccount*)),
@@ -22 +22 @@
 }
 
-void AccountModel::accountUpdated(IAccount* account) {
+void AccountTreeModel::accountUpdated(IAccount* account) {
     int row = BCAccountManager::instance()->getAccountList().values().indexOf(account);
 
@@ -35 +35 @@
 }
 
-QVariant AccountModel::headerData(int section, Qt::Orientation orientation, int role) const {
+QVariant AccountTreeModel::headerData(int section, Qt::Orientation orientation, int role) const {
     if (orientation == Qt::Horizontal) {
         if (role == Qt::DisplayRole) {
@@ -51 +51 @@
 }
 
-IAccount* AccountModel::dataObject(const QModelIndex& index) const {
+IAccount* AccountTreeModel::dataObject(const QModelIndex& index) const {
     return BCAccountManager::instance()->getAccountList().values().at(index.row());
 }
 
-QVariant AccountModel::data(const QModelIndex& index, int role) const {
+QVariant AccountTreeModel::data(const QModelIndex& index, int role) const {
     QList<IAccount*> accounts = BCAccountManager::instance()->getAccountList().values();
     if (!index.isValid() || index.row() < 0 || index.row() >= accounts.size())
@@ -96 +96 @@
 }
 
-Qt::ItemFlags AccountModel::flags(const QModelIndex& index) const {
+Qt::ItemFlags AccountTreeModel::flags(const QModelIndex& index) const {
     if (!index.isValid())
         return Qt::ItemIsEnabled;
@@ -106 +106 @@
 }
 
-bool AccountModel::setData(const QModelIndex& index, const QVariant& value, int role /* = Qt::EditRole */) {
+bool AccountTreeModel::setData(const QModelIndex& index, const QVariant& value, int role /* = Qt::EditRole */) {
     if (!index.isValid()) {
         return false;
@@ -127 +127 @@
 }
 
-int AccountModel::columnCount(const QModelIndex& parent) const {
+int AccountTreeModel::columnCount(const QModelIndex& parent) const {
     return (parent.isValid()) ? 0 : MaxCol+1;
 }
 
-int AccountModel::rowCount(const QModelIndex& parent) const {
+int AccountTreeModel::rowCount(const QModelIndex& parent) const {
     return (parent.isValid()) ? 0 : BCAccountManager::instance()->getAccountList().count();
 }
 
-bool AccountModel::removeRows(int row, int count, const QModelIndex& parent) {
+bool AccountTreeModel::removeRows(int row, int count, const QModelIndex& parent) {
     if (parent.isValid())
         return false;

src/ui/models/accounttreemodel.h

@@ -1 @@
-#ifndef UI_ACCOUNTMODEL_H
-#define UI_ACCOUNTMODEL_H
+#ifndef UI_ACCOUNTTREEMODEL_H
+#define UI_ACCOUNTTREEMODEL_H
 
 #include <QObject>
@@ -8 +8 @@
 #include "../../business/BCAccountManager.h"
 
-class AccountModel: public QAbstractTableModel {
+class AccountTreeModel: public QAbstractTableModel {
     Q_OBJECT
 
@@ -15 +15 @@
 
 public:
-    AccountModel(QObject* parent = 0);
-    ~AccountModel();
+    AccountTreeModel(QObject* parent = 0);
+    ~AccountTreeModel();
 
     enum Columns {
@@ -38 +38 @@
 
 
-#endif // UI_ACCOUNTMODEL_H
+#endif // UI_ACCOUNTTREEMODEL_H