[meego-commits] 23477: Changes to MeeGo:1.2:oss/meego-ux-panels

Prajwal Mohan no_reply at build.meego.com
Mon Aug 1 18:11:35 UTC 2011 

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

Thank You,
Prajwal Mohan

[This message was auto-generated]

---

Request #23477:

  submit:   MeeGo:1.2:oss:Testing/meego-ux-panels(r2) -> MeeGo:1.2:oss/meego-ux-panels


Message:
    Promoting to MeeGo:1.2:oss

State:   new          2011-08-01T11:11:20 praj
Comment: None



changes files:
--------------
--- meego-ux-panels.changes
+++ meego-ux-panels.changes
@@ -0,0 +1,5 @@
+* Thu Jul 28 2011 James Ausmus <james.ausmus at intel.com> - 0.3.12.1
+- Fix BMC#21430 - Move Panels to overlayItem
+- Fix BMC#21640 - Incorrect Russian translation in web.panel
+- Fix BMC#21645 - Incorrect SVE translation in mytablet.panel
+

new:
----
  0004-Fix-BMC-21430-Move-Panels-to-overlayItem.patch
  0005-Fix-BMC-21640-Incorrect-Russian-translation-in-web.p.patch
  0006-Fix-BMC-21645-Incorrect-SVE-translation-in-mytablet..patch

spec files:
-----------
--- meego-ux-panels.spec
+++ meego-ux-panels.spec
@@ -8,7 +8,7 @@
 Name:       meego-ux-panels
 Summary:    MeeGo UX Panels Interface
 Version:    0.3.12.1
-Release:    3
+Release:    4
 Group:      System/Desktop
 License:    Apache 2.0
 URL:        http://www.meego.com
@@ -17,6 +17,9 @@
 Patch0:     0001-Fix-BMC-19848-Web-panel-clear-history-button-fail-to.patch
 Patch1:     0002-BMC-Bug-20072-Music-panel-playlist-section-is-not-di.patch
 Patch2:     0003-Bug-19469-Music-panel-when-play-the-last-track-in-pl.patch
+Patch3:     0004-Fix-BMC-21430-Move-Panels-to-overlayItem.patch
+Patch4:     0005-Fix-BMC-21640-Incorrect-Russian-translation-in-web.p.patch
+Patch5:     0006-Fix-BMC-21645-Incorrect-SVE-translation-in-mytablet..patch
 Requires:   %{name} >= %{version}
 Requires:   meegolabs-ux-components >= 0.2.8.1
 Requires:   meego-ux-components >= 0.2.8.11
@@ -117,6 +120,12 @@
 %patch1 -p1
 # 0003-Bug-19469-Music-panel-when-play-the-last-track-in-pl.patch
 %patch2 -p1
+# 0004-Fix-BMC-21430-Move-Panels-to-overlayItem.patch
+%patch3 -p1
+# 0005-Fix-BMC-21640-Incorrect-Russian-translation-in-web.p.patch
+%patch4 -p1
+# 0006-Fix-BMC-21645-Incorrect-SVE-translation-in-mytablet..patch
+%patch5 -p1
 # >> setup
 # << setup
 

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

++++++ 0004-Fix-BMC-21430-Move-Panels-to-overlayItem.patch (new)
--- 0004-Fix-BMC-21430-Move-Panels-to-overlayItem.patch
+++ 0004-Fix-BMC-21430-Move-Panels-to-overlayItem.patch
+From 6542ca1b27e6da9b191d2e401987af30df2af746 Mon Sep 17 00:00:00 2001
+From: James Ausmus <james.ausmus at intel.com>
+Date: Thu, 28 Jul 2011 15:44:52 -0700
+Subject: [PATCH 4/6] Fix BMC#21430 - Move Panels to overlayItem
+
+Signed-off-by: James Ausmus <james.ausmus at intel.com>
+---
+ main.qml |   17 ++++++++++-------
+ 1 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/main.qml b/main.qml
+index 0992622..7aaf95b 100644
+--- a/main.qml
++++ b/main.qml
+@@ -22,12 +22,12 @@ Window {
+     fullContent: true
+     fullScreen: true
+ 
+-    bookMenuModel: ["MainPage"]
+-    bookMenuPayload: [mainPage]
++//    bookMenuModel: ["MainPage"]
++//    bookMenuPayload: [mainPage]
+ 
+-    Component.onCompleted: {
+-        switchBook(mainPage)
+-    }
++//    Component.onCompleted: {
++//        switchBook(mainPage)
++//    }
+ 
+     Translator {
+         catalog: "meego-ux-panels"
+@@ -287,6 +287,7 @@ Window {
+     overlayItem: Item {
+         id: deviceScreen
+         anchors.fill: parent
++        objectName: "appPage"
+ 
+         clip: true
+ 
+@@ -317,12 +318,14 @@ Window {
+             }
+         }
+ 
+-    }
++/*    }
+     Component {
+         id: mainPage
+         AppPage {
+             fullContent: true
+             fullScreen: true
++            objectName: "appPage"*/
++
+             Item {
+                 id: background
+                 anchors.fill: parent
+@@ -450,7 +453,7 @@ Window {
+                     } //Delegate - panel nloader
+                 }
+             }
+-        }
++//        }
+     }
+ }
+ 
+-- 
+1.7.2.2
+

++++++ 0005-Fix-BMC-21640-Incorrect-Russian-translation-in-web.p.patch (new)
--- 0005-Fix-BMC-21640-Incorrect-Russian-translation-in-web.p.patch
+++ 0005-Fix-BMC-21640-Incorrect-Russian-translation-in-web.p.patch
+From 44f86cf2777f76a0095a14f860ea71f74ddd1c8b Mon Sep 17 00:00:00 2001
+From: James Ausmus <james.ausmus at intel.com>
+Date: Thu, 28 Jul 2011 14:43:40 -0700
+Subject: [PATCH 5/6] Fix BMC#21640 - Incorrect Russian translation in web.panel
+
+Signed-off-by: James Ausmus <james.ausmus at intel.com>
+---
+ panelsrc/web/desktop/web.panel |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/panelsrc/web/desktop/web.panel b/panelsrc/web/desktop/web.panel
+index b37f1b9..de94dce 100644
+--- a/panelsrc/web/desktop/web.panel
++++ b/panelsrc/web/desktop/web.panel
+@@ -4,7 +4,7 @@ DisplayName[zh_TW]=網頁
+ DisplayName[zh_CN]=Web
+ DisplayName[tr]=Web
+ DisplayName[sv]=Webben
+-DisplayName[ru]=Интернет
++DisplayName[ru]=Веб-страницы
+ DisplayName[pt_PT]=Web
+ DisplayName[pt_BR]=Web
+ DisplayName[pl]=Sieć Web
+-- 
+1.7.2.2
+

++++++ 0006-Fix-BMC-21645-Incorrect-SVE-translation-in-mytablet..patch (new)
--- 0006-Fix-BMC-21645-Incorrect-SVE-translation-in-mytablet..patch
+++ 0006-Fix-BMC-21645-Incorrect-SVE-translation-in-mytablet..patch
+From 61df084c292e231d7683419b7a3ee371c805f3d2 Mon Sep 17 00:00:00 2001
+From: James Ausmus <james.ausmus at intel.com>
+Date: Thu, 28 Jul 2011 14:44:40 -0700
+Subject: [PATCH 6/6] Fix BMC#21645 - Incorrect SVE translation in mytablet.panel
+
+Signed-off-by: James Ausmus <james.ausmus at intel.com>
+---
+ panelsrc/mytablet/desktop/mytablet.panel |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/panelsrc/mytablet/desktop/mytablet.panel b/panelsrc/mytablet/desktop/mytablet.panel
+index ce12853..eb39ed5 100644
+--- a/panelsrc/mytablet/desktop/mytablet.panel
++++ b/panelsrc/mytablet/desktop/mytablet.panel
+@@ -3,7 +3,7 @@ DisplayName=My Tablet
+ DisplayName[zh_TW]=我的平板電腦
+ DisplayName[zh_CN]=我的平板电脑
+ DisplayName[tr]=Tabletim
+-DisplayName[sv]=Min pekdator
++DisplayName[sv]=Min surfplatta
+ DisplayName[ru]=Мой планшетный ПК
+ DisplayName[pt_PT]=O Meu Tablet
+ DisplayName[pt_BR]=Meu Tablet
+-- 
+1.7.2.2
+

++++++ meego-ux-panels.yaml
--- meego-ux-panels.yaml
+++ meego-ux-panels.yaml
@@ -1,7 +1,7 @@
 Name: meego-ux-panels
 Summary: MeeGo UX Panels Interface
 Version: 0.3.12.1
-Release: 3
+Release: 4
 Group: System/Desktop
 License: Apache 2.0
 URL: http://www.meego.com
@@ -12,6 +12,9 @@
     - 0001-Fix-BMC-19848-Web-panel-clear-history-button-fail-to.patch
     - 0002-BMC-Bug-20072-Music-panel-playlist-section-is-not-di.patch
     - 0003-Bug-19469-Music-panel-when-play-the-last-track-in-pl.patch
+    - 0004-Fix-BMC-21430-Move-Panels-to-overlayItem.patch
+    - 0005-Fix-BMC-21640-Incorrect-Russian-translation-in-web.p.patch
+    - 0006-Fix-BMC-21645-Incorrect-SVE-translation-in-mytablet..patch
 
 Description: |
      Panel core infrastructure for the MeeGo UX

More information about the MeeGo-commits mailing list