[meego-packaging] 4856: Changes to Trunk:Handset/meegotouch-theme-meego
Shane Bryan
shane.bryan at linux.intel.com
Thu Jun 24 19:56:41 PDT 2010
Hi,
I have made the following changes to meegotouch-theme-meego in project Trunk:Handset. Please review and accept ASAP.
Thank You,
Shane Bryan
[This message was auto-generated]
---
Request #4856:
submit: devel:ux:handset/meegotouch-theme-meego(r5) -> Trunk:Handset/meegotouch-theme-meego
Message:
Fixes BMC#3465 and theme portion of BMC#3456
State: new 2010-06-24T14:53:50 sbryan
Comment: None
changes files:
--------------
--- meegotouch-theme-meego.changes
+++ meegotouch-theme-meego.changes
@@ -1,0 +2,5 @@
+Fri Jun 25 00:45:36 UTC 2010 - shane.bryan at linux.intel.com
+
+- Fixes for BMC#3456 and BMC#3465
+
+-------------------------------------------------------------------
new:
----
0001-re-add-placeholder-icon.patch
0002-Fixed-BMC-3456-Text-should-not-be-appearing-under.patch
spec files:
-----------
--- meegotouch-theme-meego.spec
+++ meegotouch-theme-meego.spec
@@ -15,6 +15,8 @@
URL: http://www.meego.com
Source0: %{name}-%{version}.tar.bz2
Source100: meegotouch-theme-meego.yaml
+Patch0: 0001-re-add-placeholder-icon.patch
+Patch1: 0002-Fixed-BMC-3456-Text-should-not-be-appearing-under.patch
Requires: libmeegotouch >= 0.20.15
Requires: meegotouch-theme >= 0.20.14
Requires(post): /bin/touch
@@ -37,6 +39,10 @@
%prep
%setup -q -n %{name}-%{version}
+# 0001-re-add-placeholder-icon.patch
+%patch0 -p1
+# 0002-Fixed-BMC-3456-Text-should-not-be-appearing-under.patch
+%patch1 -p1
# >> setup
# << setup
other changes:
--------------
++++++ 0001-re-add-placeholder-icon.patch (new)
--- 0001-re-add-placeholder-icon.patch
+++ 0001-re-add-placeholder-icon.patch
+From d5384b9e3b89350532273b583e05bb6a1f606807 Mon Sep 17 00:00:00 2001
+From: cyrene <cyrene.domogalla at intel.com>
+Date: Thu, 24 Jun 2010 16:57:14 -0700
+Subject: [PATCH 1/2] re-add placeholder icon
+
+---
+ .../icons/icon-m-content-avatar-placeholder.svg | 16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+ create mode 100644 meego/meegotouch/icons/icon-m-content-avatar-placeholder.svg
+
+diff --git a/meego/meegotouch/icons/icon-m-content-avatar-placeholder.svg b/meego/meegotouch/icons/icon-m-content-avatar-placeholder.svg
+new file mode 100644
+index 0000000..c9fd97f
+--- /dev/null
++++ b/meego/meegotouch/icons/icon-m-content-avatar-placeholder.svg
+@@ -0,0 +1,16 @@
++<?xml version="1.0" encoding="iso-8859-1"?>
++<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
++ width="48px" height="48px" viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
++<rect style="fill:#3F3F3F;" width="48" height="48"/>
++<g>
++ <path style="fill:#747474;" d="M48,14.25c0,0-21.481-7.603-23.142-8.179c-1.661-0.576-4.78-0.753-6.104,1.069
++ c0,0-12.769,15.322-13.97,16.824s0,3.755,1.051,4.957s4.205,4.208,5.558,6.911c0.666,1.33,1.955,1.383,4.983,0.917
++ c3.905-0.601,13.952-1.703,14.997-1.819C33,34.75,33.75,35.5,33.475,36.584c-0.433,1.704-1.317,3.927-2.104,5.258
++ c-0.684,1.158-1.447,1.56-3.605,1.201c-2.141-0.355-11.95-1.953-13.141-2.293c-1.75-0.5-2.879-0.028-3.625,1.25
++ c-0.438,0.75-1,1.438-2.208,3.292C7.875,45.209,6.68,47.535,6.5,48C21.875,48,48,48,48,48V14.25z"/>
++ <circle style="fill:#3C3C3C;" cx="33.926" cy="19.759" r="2.029"/>
++ <circle style="fill:#3C3C3C;" cx="25.063" cy="17.205" r="1.878"/>
++</g>
++</svg>
+--
+1.6.1.3
+
++++++ 0002-Fixed-BMC-3456-Text-should-not-be-appearing-under.patch (new)
--- 0002-Fixed-BMC-3456-Text-should-not-be-appearing-under.patch
+++ 0002-Fixed-BMC-3456-Text-should-not-be-appearing-under.patch
+From cf9bf6fe6aec18730091a748c21f4578819cf5bc Mon Sep 17 00:00:00 2001
+From: Shane Bryan <shane.bryan at linux.intel.com>
+Date: Thu, 24 Jun 2010 19:31:39 -0700
+Subject: [PATCH 2/2] Fixed: BMC#3456 Text should not be appearing under icons on task bar on home
+
+Signed-off-by: Shane Bryan <shane.bryan at linux.intel.com>
+---
+ meego/meegotouch/duihome/style/duihome.css | 57 +++++++++++++++++++++------
+ 1 files changed, 44 insertions(+), 13 deletions(-)
+
+diff --git a/meego/meegotouch/duihome/style/duihome.css b/meego/meegotouch/duihome/style/duihome.css
+index e5d7cb0..b8a5477 100644
+--- a/meego/meegotouch/duihome/style/duihome.css
++++ b/meego/meegotouch/duihome/style/duihome.css
+@@ -1,6 +1,16 @@
+ QuickLaunchBarStyle {
+ background-image: "meegotouch-quicklaunchbar-background" 2px 2px 2px 2px;
+ }
++QuickLaunchBarStyle.Landscape {
++ minimum-size: -1 12mm;
++ preferred-size: -1 12mm;
++ maximum-size: -1 12mm;
++}
++QuickLaunchBarStyle.Portrait {
++ minimum-size: -1 12mm;
++ preferred-size: -1 12mm;
++ maximum-size: -1 12mm;
++}
+
+ MButtonIconStyle#LauncherButton.Landscape {
+ font: $FONT_XXSMALL;
+@@ -11,24 +21,45 @@ MButtonIconStyle#LauncherButton.Portrait {
+ }
+
+ MButtonStyle#ToggleLauncherButton {
+- icon-align: top;
+- preferred-size: -1 $HEIGHT_NAVIGATIONBAR;
+- maximum-size: -1 $HEIGHT_NAVIGATIONBAR;
+- minimum-size: -1 $HEIGHT_NAVIGATIONBAR;
++ icon-size: 7.6mm 7.6mm;
++ icon-align: center;
++ margin-top: $MARGIN_LARGE;
++ margin-bottom: $MARGIN_LARGE;
++}
++
++MButtonStyle#ToggleLauncherButton.Landscape {
++ preferred-size: -1 -1;
++ maximum-size: -1 -1;
++ minimum-size: 8mm 8mm;
++ margin-left: $MARGIN_DEFAULT;
++ margin-right: $MARGIN_DEFAULT;
++}
++
++MButtonStyle#ToggleLauncherButton.Portrait {
++ preferred-size: -1 -1;
++ maximum-size: -1 -1;
++ minimum-size: 8mm 8mm;
++ margin-left: $MARGIN_DEFAULT;
++ margin-right: $MARGIN_XSMALL;
+ }
+
+ MButtonIconStyle#QuickLaunchBarButton {
+- font: $FONT_XXSMALL;
+- icon-size: $SIZE_ICON_DEFAULT $SIZE_ICON_DEFAULT;
+- margin-top: $MARGIN_XLARGE;
++ icon-size: 7.6mm 7.6mm;
++ icon-align: center;
++ margin-top: $MARGIN_LARGE;
++ margin-bottom: $MARGIN_LARGE;
+ }
+ MButtonIconStyle#QuickLaunchBarButton.Landscape {
+- preferred-size: -1 $HEIGHT_NAVIGATIONBAR;
+- maximum-size: -1 $HEIGHT_NAVIGATIONBAR;
+- minimum-size: -1 $HEIGHT_NAVIGATIONBAR;
++ preferred-size: -1 -1;
++ maximum-size: -1 -1;
++ minimum-size: 8mm 8mm;
++ margin-left: $MARGIN_DEFAULT;
++ margin-right: $MARGIN_DEFAULT;
+ }
+ MButtonIconStyle#QuickLaunchBarButton.Portrait {
+- preferred-size: -1 $HEIGHT_NAVIGATIONBAR;
+- maximum-size: -1 $HEIGHT_NAVIGATIONBAR;
+- minimum-size: -1 $HEIGHT_NAVIGATIONBAR;
++ preferred-size: -1 -1;
++ maximum-size: -1 -1;
++ minimum-size: 8mm 8mm;
++ margin-left: $MARGIN_DEFAULT;
++ margin-right: $MARGIN_XSMALL;
+ }
+--
+1.6.1.3
+
++++++ meegotouch-theme-meego.yaml
--- meegotouch-theme-meego.yaml
+++ meegotouch-theme-meego.yaml
@@ -7,6 +7,9 @@
URL: http://www.meego.com
Sources:
- "%{name}-%{version}.tar.bz2"
+Patches:
+ - 0001-re-add-placeholder-icon.patch
+ - 0002-Fixed-BMC-3456-Text-should-not-be-appearing-under.patch
Description: MeeGo branded MeeGoTouch Theme for Handset devices
Requires:
More information about the Meego-packaging
mailing list