Merge into trunk : fix-1207774 : Code : address-book-app

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-10-01
Gustavo Pichorim Boiko (community)			Approve on 2013-09-30
Bill Filler (community)		2013-09-24	Needs Fixing on 2013-09-25
Review via email: mp+187131@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-24:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/172/rebuild

review: Approve (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2013-09-25:

#

wasn't sure if this was ready for review yet, but I tried it. wasn't working. the gallery comes up and I choose a picture but when it goes back to address-book there is no picture. I see this error in the log. I was using address-book-service MR for support for avatar

file:///usr/share/address-book-app/imports/ContactEdit/ContactEditor.qml:31: Unable to assign null to QString
file:///usr/share/address-book-app/imports/ContactEdit/ContactDetailAvatarEditor.qml:85: ReferenceError: activeTransfer is not defined
file:///usr/share/address-book-app/imports/ContactEdit/ContactEditor.qml:32: Unable to assign null to QString

ShaderEffect: Property 'source' is not assigned a valid texture provider (QQuickImage*).
ShaderEffect: Property 'source' is not assigned a valid texture provider (QQuickImage*).
QObject* qml_content_hub(QQmlEngine*, QJSEngine*)
QmlImportExportHandler::QmlImportExportHandler(QObject*)
virtual void com::ubuntu::content::Hub::register_import_export_handler(com::ubuntu::content::ImportExportHandler*)
QString {anonymous}::sanitize_id(const QString&)
virtual void com::ubuntu::content::Hub::register_import_export_handler(com::ubuntu::content::ImportExportHandler*) BUS_NAME: "com.ubuntu.content.handler.address_2dbook_2dapp"
com::ubuntu::content::detail::Handler::Private::Private(QDBusConnection, const QString&, QObject*)
com::ubuntu::content::detail::Handler::Handler(QDBusConnection, const QString&, com::ubuntu::content::ImportExportHandler*)
ContentPeer* ContentHub::defaultSourceForType(int)
static const com::ubuntu::content::Type& ContentType::contentType2HubType(int) 2
ContentPeer::ContentPeer(QObject*)
ContentTransfer* ContentHub::importContent(int, ContentPeer*) 2 ContentPeer(0x1530160)
static const com::ubuntu::content::Type& ContentType::contentType2HubType(int) 2
ContentTransfer::ContentTransfer(QObject*)
void ContentTransfer::setTransfer(com::ubuntu::content::Transfer*, ContentTransfer::Direction)
void ContentTransfer::updateSelectionType()
void ContentTransfer::updateStore()
void ContentTransfer::updateState()
bool ContentTransfer::start()
QDBusConnection: name 'com.ubuntu.content.dbus.Service' had owner '' but we thought it was ':1.34'
void com::ubuntu::content::detail::Handler::HandleImport(const QDBusObjectPath&)
void com::ubuntu::content::detail::Handler::HandleImport(const QDBusObjectPath&) State: 1
void ContentTransfer::updateStore()
void ContentTransfer::updateState()
QObject::connect: Cannot connect QQuickShaderEffectSource:: to ShapeItem::onImagePropertiesChanged()
QObject::connect: Cannot connect QQuickShaderEffectSource:: to ShapeItem::onImagePropertiesChanged()
QObject::connect: Cannot connect QQuickShaderEffectSource:: to ShapeItem::onImagePropertiesChanged()
void ContentTransfer::updateState()
void ContentTransfer::updateState()
file:///usr/share/unity8/Components/CrossFadeImage.qml:39: Unable to assign QSize to QSizeF
Detectable autorepeat not supported.

wasn't sure if this was ready for review yet, but I tried it. wasn't working. the gallery comes up and I choose a picture but when it goes back to address-book there is no picture. I see this error in the log. I was using address-book-service MR for support for avatar

file:///usr/share/address-book-app/imports/ContactEdit/ContactEditor.qml:31: Unable to assign null to QString
file:///usr/share/address-book-app/imports/ContactEdit/ContactDetailAvatarEditor.qml:85: ReferenceError: activeTransfer is not defined
file:///usr/share/address-book-app/imports/ContactEdit/ContactEditor.qml:32: Unable to assign null to QString

ShaderEffect: Property 'source' is not assigned a valid texture provider (QQuickImage*).
ShaderEffect: Property 'source' is not assigned a valid texture provider (QQuickImage*).
QObject* qml_content_hub(QQmlEngine*, QJSEngine*) 
QmlImportExportHandler::QmlImportExportHandler(QObject*) 
virtual void com::ubuntu::content::Hub::register_import_export_handler(com::ubuntu::content::ImportExportHandler*) 
QString {anonymous}::sanitize_id(const QString&) 
virtual void com::ubuntu::content::Hub::register_import_export_handler(com::ubuntu::content::ImportExportHandler*) BUS_NAME: "com.ubuntu.content.handler.address_2dbook_2dapp" 
com::ubuntu::content::detail::Handler::Private::Private(QDBusConnection, const QString&, QObject*) 
com::ubuntu::content::detail::Handler::Handler(QDBusConnection, const QString&, com::ubuntu::content::ImportExportHandler*) 
ContentPeer* ContentHub::defaultSourceForType(int) 
static const com::ubuntu::content::Type& ContentType::contentType2HubType(int) 2 
ContentPeer::ContentPeer(QObject*) 
ContentTransfer* ContentHub::importContent(int, ContentPeer*) 2 ContentPeer(0x1530160) 
static const com::ubuntu::content::Type& ContentType::contentType2HubType(int) 2 
ContentTransfer::ContentTransfer(QObject*) 
void ContentTransfer::setTransfer(com::ubuntu::content::Transfer*, ContentTransfer::Direction) 
void ContentTransfer::updateSelectionType() 
void ContentTransfer::updateStore() 
void ContentTransfer::updateState() 
bool ContentTransfer::start() 
QDBusConnection: name 'com.ubuntu.content.dbus.Service' had owner '' but we thought it was ':1.34'
void com::ubuntu::content::detail::Handler::HandleImport(const QDBusObjectPath&) 
void com::ubuntu::content::detail::Handler::HandleImport(const QDBusObjectPath&) State: 1 
void ContentTransfer::updateStore() 
void ContentTransfer::updateState() 
QObject::connect: Cannot connect QQuickShaderEffectSource:: to ShapeItem::onImagePropertiesChanged()
QObject::connect: Cannot connect QQuickShaderEffectSource:: to ShapeItem::onImagePropertiesChanged()
QObject::connect: Cannot connect QQuickShaderEffectSource:: to ShapeItem::onImagePropertiesChanged()
void ContentTransfer::updateState() 
void ContentTransfer::updateState() 
file:///usr/share/unity8/Components/CrossFadeImage.qml:39: Unable to assign QSize to QSizeF
Detectable autorepeat not supported.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-25:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/177/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-26:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/178/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-27:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/186/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-28:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/187/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-29:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/188/rebuild

review: Approve (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-09-30:

#

Looks good and works as expected!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-01:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-10-01:

#

review: Approve (continuous-integration)

 === modified file 'src/app/addressbookapp.cpp'
 --- src/app/addressbookapp.cpp	2013-09-23 13:48:33 +0000
 +++ src/app/addressbookapp.cpp	2013-09-29 21:37:42 +0000
@@ -32,6 +32,7 @@
  #include <QDBusConnectionInterface>
  #include <QLibrary>
  #include <QIcon>
++#include <QTemporaryFile>
  #include <QQmlEngine>
@@ -76,7 +77,7 @@
  static void installIconPath()
+ {
      QByteArray iconTheme = qgetenv("ADDRESS_BOOK_APP_ICON_THEME");
--    if (!iconTheme.isEmpty()) {
++    if (!iconTheme.isEmpty()) {
          QIcon::setThemeName(iconTheme);
+     }
+ }
@@ -353,3 +354,19 @@
          m_view->requestActivate();
+     }
+ }
++
++QUrl AddressBookApp::copyImage(QObject *contact, const QUrl &imageUrl)
++{
++    QFile img(imageUrl.toLocalFile());
++    if (img.exists() && img.open(QFile::ReadOnly)) {
++        QTemporaryFile *tmp = new QTemporaryFile(contact);
++        if (tmp->open()) {
++            tmp->close();
++            QImage tmpAvatar = QImage(img.fileName());
++            QImage scaledAvatar = tmpAvatar.scaledToHeight(720, Qt::SmoothTransformation);
++            scaledAvatar.save(tmp->fileName(), "png", 9);
++            return QUrl(tmp->fileName());
++        }
++    }
++    return QUrl();
++}
 === modified file 'src/app/addressbookapp.h'
 --- src/app/addressbookapp.h	2013-09-17 22:19:02 +0000
 +++ src/app/addressbookapp.h	2013-09-29 21:37:42 +0000
@@ -35,6 +35,7 @@
  public Q_SLOTS:
      void activateWindow();
++    QUrl copyImage(QObject *contact, const QUrl &imageUrl);
  private:
      void parseArgument(const QString &arg);
 === modified file 'src/imports/ContactEdit/ContactDetailAvatarEditor.qml'
 --- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2013-08-07 18:57:30 +0000
 +++ src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2013-09-29 21:37:42 +0000
@@ -17,6 +17,8 @@
  import QtQuick 2.0
  import Ubuntu.Components 0.1
  import QtContacts 5.0
++import Ubuntu.Content 0.1
++import Ubuntu.Components.Popups 0.1 as Popups
  import "../Common"
@@ -24,7 +26,11 @@
      id: root
      function save() {
--        //TODO: not implemented
++        if (root.detail.imageUrl != avatarImage.source) {
++            console.debug("Save new image:" + avatarImage.source)
++            root.detail.imageUrl = avatarImage.source
++            return true
++        }
          return false
+     }
@@ -32,14 +38,37 @@
      implicitHeight: units.gu(17)
      Image {
++        id: avatarImage
++
          anchors.fill: parent
          source: root.detail && root.detail.imageUrl != "" ? root.detail.imageUrl : "artwork:/avatar-default.svg"
          asynchronous: true
          fillMode: Image.PreserveAspectCrop
++        Component {
++            id: loadingDialog
++
++            Popups.Dialog {
++                id: dialogue
++
++                title: i18n.tr("Loading")
++
++                ActivityIndicator {
++                    id: activity
++
++                    anchors.centerIn: parent
++                    running: true
++                    visible: running
++                }
++            }
++        }
++
          AbstractButton {
              id: changeButton
++            property var activeTransfer
++            property var loadingDialog: null
++
              anchors {
                  right: parent.right
                  bottom: parent.bottom
@@ -54,6 +83,32 @@
                  source: "artwork:/import-image.svg"
                  fillMode: Image.PreserveAspectFit
+             }
++
++            onClicked: {
++                if (!changeButton.loadingDialog) {
++                    changeButton.loadingDialog = PopupUtils.open(loadingDialog, null)
++                    changeButton.activeTransfer = ContentHub.importContent(ContentType.Pictures,
++                                                                           ContentHub.defaultSourceForType(ContentType.Pictures));
++                    changeButton.activeTransfer.start();
++                }
++            }
++
++            Connections {
++                target: changeButton.activeTransfer != null ? changeButton.activeTransfer : null
++                onStateChanged: {
++                    if (changeButton.activeTransfer.state === ContentTransfer.Charged) {
++                        if (changeButton.activeTransfer.items.length > 0) {
++                            avatarImage.source = application.copyImage(root.contact, changeButton.activeTransfer.items[0].url);
++                            //avatarImage.source = changeButton.activeTransfer.items[0].url
++                        }
++                    }
++                    if ((changeButton.activeTransfer.state === ContentTransfer.Charged) ||
++                        (changeButton.activeTransfer.state === ContentTransfer.Aborted)) {
++                        PopupUtils.close(changeButton.loadingDialog)
++                        changeButton.loadingDialog = null
++                    }
++                }
++            }
+         }
+     }
+ }

address-book-app

Merge lp:~renatofilho/address-book-app/fix-1207774 into lp:address-book-app

Commit message

Description of the change

Preview Diff

Subscribers