[meego-commits] 23472: Changes to MeeGo:1.2:oss/meego-app-photos

[Prajwal Mohan]

Hi,
I have made the following changes to meego-app-photos in project MeeGo:1.2:oss. Please review and accept ASAP.

Thank You,
Prajwal Mohan

[This message was auto-generated]

---

Request #23472:

  submit:   MeeGo:1.2:oss:Testing/meego-app-photos(r2) -> MeeGo:1.2:oss/meego-app-photos


Message:
    Promoting to MeeGo:1.2:oss

State:   new          2011-08-01T11:10:59 praj
Comment: None



changes files:
--------------
--- meego-app-photos.changes
+++ meego-app-photos.changes
@@ -0,0 +1,4 @@
+* Fri Jul 29 2011 Ossama Othman <ossama.othman at intel.com> - 0.2.13 - patched
+- Fix BMC 21697 - sharing UI save/restore not working
+- Fix BMC 21231 - photo changes during orientation change
+

new:
----
  0005-Fix-BMC-21231-photo-changes-during-orientation-chang.patch
  0006-Fix-BMC-21697-sharing-UI-save-restore-not-working.patch

spec files:
-----------
--- meego-app-photos.spec
+++ meego-app-photos.spec
@@ -19,6 +19,8 @@
 Patch1:     0002-Increased-maximum-scale-factor-BMC-20229.patch
 Patch2:     0003-Fixed-bug-17887.patch
 Patch3:     0004-Fixed-regression-that-prevented-xdg-open-of-photo-fr.patch
+Patch4:     0005-Fix-BMC-21231-photo-changes-during-orientation-chang.patch
+Patch5:     0006-Fix-BMC-21697-sharing-UI-save-restore-not-working.patch
 Requires:   meego-ux-media >= 0.2.24
 Requires:   meegolabs-ux-components >= 0.2.8
 Requires:   meego-ux-components
@@ -51,6 +53,12 @@
 # 0004-Fixed-regression-that-prevented-xdg-open-of-photo-fr.patch
 %patch3 -p1
 
+# 0005-Fix-BMC-21231-photo-changes-during-orientation-chang.patch
+%patch4 -p1
+
+# 0006-Fix-BMC-21697-sharing-UI-save-restore-not-working.patch
+%patch5 -p1
+
 # >> setup
 # << setup
 

other changes:
--------------

++++++ 0005-Fix-BMC-21231-photo-changes-during-orientation-chang.patch (new)
--- 0005-Fix-BMC-21231-photo-changes-during-orientation-chang.patch
+++ 0005-Fix-BMC-21231-photo-changes-during-orientation-chang.patch
+From daff7f61e09a78e3808e8e69bb3ce0ddc1d4270d Mon Sep 17 00:00:00 2001
+From: Steven Denis <sdenis at ics.com>
+Date: Fri, 29 Jul 2011 02:47:05 -0700
+Subject: [PATCH 5/6] Fix BMC 21231 - photo changes during orientation change
+
+Signed-off-by: Ossama Othman <ossama.othman at intel.com>
+---
+ PhotoDetailsView.qml |    2 ++
+ PhotoViewer.qml      |   16 ++++++++++++++++
+ main.qml             |   16 ++++++++++++++++
+ 3 files changed, 34 insertions(+), 0 deletions(-)
+
+diff --git a/PhotoDetailsView.qml b/PhotoDetailsView.qml
+index 043e73c..dbdc589 100644
+--- a/PhotoDetailsView.qml
++++ b/PhotoDetailsView.qml
+@@ -29,6 +29,8 @@ Item {
+     property alias count: photoViewer.count
+     property alias toolbar: toolbar
+ 
++    property alias orientationNotification: photoViewer.orientationNotification
++
+     signal currentItemChanged()
+     signal pressAndHoldOnPhoto(variant mouse, variant instance)
+ 
+diff --git a/PhotoViewer.qml b/PhotoViewer.qml
+index fa0d7e3..f79cf73 100644
+--- a/PhotoViewer.qml
++++ b/PhotoViewer.qml
+@@ -24,6 +24,9 @@ Rectangle {
+     property alias currentIndex: photoListView.currentIndex
+     property alias count: photoListView.count
+ 
++    property alias orientationNotification: photoListView.orientationNotification
++
++
+     property bool fullscreen: false
+     property variant slideshow
+ 
+@@ -81,8 +84,21 @@ Rectangle {
+         property int rotateDuration: 0
+         property int initialIndex: 0
+ 
++        property string orientationNotification: ""
++
+         signal startingSlideshow()
+ 
++        onOrientationNotificationChanged: {
++            if (orientationNotification == "started") {
++                snapMode = ListView.NoSnap
++            }
++            else if (orientationNotification == "finished") {
++                showPhotoAtIndex(currentIndex)
++                snapMode = ListView.SnapOneItem
++            }
++            orientationNotification = ""
++        }
++
+         delegate: Flickable {
+             id: dinstance
+             width: photoViewer.width
+diff --git a/main.qml b/main.qml
+index 59ae11c..a889af6 100644
+--- a/main.qml
++++ b/main.qml
+@@ -39,6 +39,19 @@ Window {
+     property bool allVirtualAlbumsFilterMenuActive: true
+     property bool allPhotosFilterMenuActive: true
+ 
++
++    onOrientationChangeStarted: {
++        if (pageStack.currentPage && pageStack.currentPage.objectName == "photoDetailPage") {
++            pageStack.currentPage.orientationNotification = "started"
++        }
++    }
++
++    onOrientationChangeFinished: {
++        if (pageStack.currentPage && pageStack.currentPage.objectName == "photoDetailPage") {
++            pageStack.currentPage.orientationNotification = "finished"
++        }
++    }
++
+     Component.onCompleted: {
+         //check for restore
+         if (windowState.restoreRequired) {
+@@ -1463,6 +1476,9 @@ Window {
+             disableSearch: true
+             pageUsingFullScreen: true
+ 
++            property alias orientationNotification: photodtview.orientationNotification
++
++
+             property int modelCount: window.detailModelCount
+             onModelCountChanged: {
+                 restorePhotoAtIndex(detailViewIndex)
+-- 
+1.7.4.1
+

++++++ 0006-Fix-BMC-21697-sharing-UI-save-restore-not-working.patch (new)
--- 0006-Fix-BMC-21697-sharing-UI-save-restore-not-working.patch
+++ 0006-Fix-BMC-21697-sharing-UI-save-restore-not-working.patch
+From 31a834501b91ab64b6a8652a73e13f9ab3d5084a Mon Sep 17 00:00:00 2001
+From: Ossama Othman <ossama.othman at intel.com>
+Date: Fri, 29 Jul 2011 03:02:37 -0700
+Subject: [PATCH 6/6] Fix BMC 21697 - sharing UI save/restore not working
+
+Signed-off-by: Ossama Othman <ossama.othman at intel.com>
+---
+ PhotoToolbar.qml |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/PhotoToolbar.qml b/PhotoToolbar.qml
+index 4f1a365..4871fa4 100644
+--- a/PhotoToolbar.qml
++++ b/PhotoToolbar.qml
+@@ -37,6 +37,7 @@ Item {
+ 
+     ShareObj {
+         id: shareObj
++        snrPrefix: "PhotoToolbarShareObj"
+     }
+ 
+     // block all gestures from falling through
+-- 
+1.7.4.1
+

++++++ meego-app-photos.yaml
--- meego-app-photos.yaml
+++ meego-app-photos.yaml
@@ -16,6 +16,8 @@
     - 0002-Increased-maximum-scale-factor-BMC-20229.patch
     - 0003-Fixed-bug-17887.patch
     - 0004-Fixed-regression-that-prevented-xdg-open-of-photo-fr.patch
+    - 0005-Fix-BMC-21231-photo-changes-during-orientation-chang.patch
+    - 0006-Fix-BMC-21697-sharing-UI-save-restore-not-working.patch
 
 PkgConfigBR:
     - QtCore >= 4.7.2