Architecture changed to allow easier addition of new phone books. Norwegian phonebook...

[jenirok] / src / gui / detailwindow.cpp

diff --git a/src/gui/detailwindow.cpp b/src/gui/detailwindow.cpp
index 8dc4349..1e5b6c4 100644 (file)
--- a/src/gui/detailwindow.cpp
+++ b/src/gui/detailwindow.cpp
@@ -16,23 +16,23 @@
  *
  */
 
+#include <QtCore/QDebug>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusMessage>
 #include <QtGui/QMessageBox>
 #include <QtGui/QLabel>
 #include <QtGui/QClipboard>
 #include <QtGui/QDialogButtonBox>
+#include <QtGui/QApplication>
 #include <QMaemo5ValueButton>
 #include <QMaemo5InformationBox>
-#include <QApplication>
-#include <QDebug>
 #include "detailwindow.h"
 #include "contactmanager.h"
 
 DetailWindow::DetailWindow(QWidget* parent): QMainWindow(parent), addDialog_(0)
 {
     setAttribute(Qt::WA_Maemo5StackedWindow);
-    area_ = new QScrollArea(this);
+    area_ = new QWidget(this);
     layout_ = new QVBoxLayout;
     QHBoxLayout* top = new QHBoxLayout;
     QHBoxLayout* bottom = new QHBoxLayout;
@@ -74,14 +74,13 @@ DetailWindow::DetailWindow(QWidget* parent): QMainWindow(parent), addDialog_(0)
     setCentralWidget(area_);
 }
 
-void DetailWindow::loadData(Eniro::Result const& details)
+void DetailWindow::loadData(Source::Result const& details)
 {
     setWindowTitle(details.name);
     nameButton_->setValueText(details.name);
     streetButton_->setValueText(details.street);
     cityButton_->setValueText(details.city);
     numberButton_->setValueText(details.number);
-    layout_->update();
     show();
 }
 
@@ -143,6 +142,8 @@ void DetailWindow::showAddToContactsDialog()
 
 void DetailWindow::addToContacts()
 {
+    setAttribute(Qt::WA_Maemo5ShowProgressIndicator, true);
+
     ContactManager cm;
     ContactManager::Contact contact;
     contact.name = addContactInput_->text();
@@ -159,6 +160,8 @@ void DetailWindow::addToContacts()
         QMessageBox::critical(this, tr("Error"), tr("Unable to add contact."));
     }
 
+    setAttribute(Qt::WA_Maemo5ShowProgressIndicator, false);
+
 }
 
 void DetailWindow::copyToClipboard()