I have made the following changes intended for : CE:UX:MTF / meegotouch-systemui
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/3186 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3186: Messages from BOSS: WARNING check_package_is_complete_sources (meegotouch-systemui) failed: Extra files in package: Makefile. Could not notify CE-maintainers (no address found) State: review 2011-11-21T14:29:37 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by None Changes: submit: Project:MTF:UX / meegotouch-systemui -> CE:UX:MTF / meegotouch-systemui changes files: -------------- --- meegotouch-systemui.changes +++ meegotouch-systemui.changes @@ -0,0 +1,9 @@ +* Mon Nov 21 2011 Robin Burchell <[email protected]> - 1.2.18 +- Updated to latest upstream. +- Remove meegotouch-systemui-pulseaudio-client.patch, seems to be a dupe of + BMC_9319_pulseaudio-client.patch + +* Thu Nov 17 2011 Robin Burchell <[email protected]> - 1.2.17 +- Updated to latest upstream. +- Re-enable BMC_16893-MR_5.patch, applies perfectly on top of upstream. + old: ---- meegotouch-systemui-1.2.16.tar.bz2 meegotouch-systemui-pulseaudio-client.patch new: ---- meegotouch-systemui-1.2.18-1.tar.gz spec files: ----------- --- meegotouch-systemui.spec +++ meegotouch-systemui.spec @@ -7,12 +7,12 @@ Name: meegotouch-systemui Summary: System UI daemon -Version: 1.2.16 +Version: 1.2.18 Release: 1 Group: System/Desktop License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/meegotouch-systemui -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}-1.tar.gz Source1: boss.conf Source2: meegotouch-systemui.desktop Source3: lock.desktop @@ -28,6 +28,7 @@ Patch8: BMC_14815_statusbar_width_for_default_portrait.patch Patch9: BMC_21860_battery_charging_animation.patch Patch10: BMC_19366_System_top_bar_items_are_mis-aligned.patch +Patch11: BMC_16893-MR_5.patch Requires: %{name}-screenlock-padlock Requires: %{name}-volume-fullscreen BuildRequires: pkgconfig(libpulse) @@ -131,7 +132,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}-1 # Battery-ChargePercentage-for-battery-capacity.patch %patch0 -p1 @@ -155,6 +156,8 @@ %patch9 -p1 # BMC_19366_System_top_bar_items_are_mis-aligned.patch %patch10 -p1 +# BMC_16893-MR_5.patch +%patch11 -p1 # >> setup # << setup other changes: -------------- ++++++ BMC_16893-MR_5.patch --- BMC_16893-MR_5.patch +++ BMC_16893-MR_5.patch @@ -1,16 +1,27 @@ -diff -ruN --exclude='*~' meegotouch-systemui-1.2.16.orig/src/systemui/statusarea/statusindicator.cpp meegotouch-systemui-1.2.16/src/systemui/statusarea/statusindicator.cpp ---- meegotouch-systemui-1.2.16.orig/src/systemui/statusarea/statusindicator.cpp 2011-11-02 14:07:51.270586311 +0200 -+++ meegotouch-systemui-1.2.16/src/systemui/statusarea/statusindicator.cpp 2011-11-03 08:45:48.899714283 +0200 -@@ -155,7 +155,7 @@ - - void PhoneNetworkSignalStrengthStatusIndicator::setNetworkStatus() - { -- QString postFix; -+ QString postFix = ""; - - bool offlineMode = systemOfflineMode->value().toBool(); - QString status = cellularRegistrationStatus->value().toString(); // home roam no-sim offline forbidden no-service -@@ -184,6 +184,12 @@ +From 6655934e68e1f6392742573e349b750cca4ecf9b Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Thu, 17 Nov 2011 21:19:40 +0100 +Subject: [PATCH] Fix for BMC#16893. + +After creating 3G connection wrong icon appears to system UI. + +(1. Open settings. +2. Open Connections. +3. From there create a 3G connection. +4. Observe the icon that appeared in the system UI.) + +See also: +https://meego.gitorious.org/meegotouch/meegotouch-systemui/merge_requests/5 +--- + src/systemui/statusarea/statusindicator.cpp | 24 +++++++++++++++--------- + src/systemui/statusarea/statusindicator.h | 3 ++- + 2 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/src/systemui/statusarea/statusindicator.cpp b/src/systemui/statusarea/statusindicator.cpp +index c06f57e..b1385d7 100644 +--- a/src/systemui/statusarea/statusindicator.cpp ++++ b/src/systemui/statusarea/statusindicator.cpp +@@ -184,6 +184,12 @@ void PhoneNetworkSignalStrengthStatusIndicator::setNetworkStatus() PhoneNetworkTypeStatusIndicator::PhoneNetworkTypeStatusIndicator(ApplicationContext &context, QGraphicsItem *parent) : StatusIndicator(parent) { @@ -23,46 +34,16 @@ cellularDataTechnology = createContextItem(context, "Cellular.DataTechnology"); connect(cellularDataTechnology, SIGNAL(contentsChanged()), this, SLOT(setNetworkType())); -@@ -218,6 +224,9 @@ +@@ -218,6 +224,8 @@ void PhoneNetworkTypeStatusIndicator::setNetworkAvailability(bool available) void PhoneNetworkTypeStatusIndicator::setNetworkType() { -+ QString postFix = ""; + QString regStatus = cellularRegistrationStatus->value().toString(); + QString technology = cellularTechnology->value().toString(); //gsm umts lte QString dataTechnology = cellularDataTechnology->value().toString(); // gprs egprs umts hspa QString state = connectionState->value().toString(); // disconnected connecting connected QString connection = connectionType->value().toString(); // GPRS WLAN -@@ -237,19 +246,19 @@ - if ((connection == "WLAN") && (state != "disconnected") && wlanOn) { - postFix = "WLAN"; - } -- if (dataTechnology == "gprs") { -- postFixPacketData = "2G"; -- } else if (dataTechnology == "egprs") { -- postFixPacketData = "25G"; -- } else if (dataTechnology == "umts") { -- postFixPacketData = "3G"; -- } else if (dataTechnology == "hspa") { -- postFixPacketData = "35G"; -- } - - // if wlan connected and packet data active e.g. when sending mms - if (data) { - postFix += postFixPacketData; -+ if (dataTechnology == "gprs") { -+ postFixPacketData = "2G"; -+ } else if (dataTechnology == "egprs") { -+ postFixPacketData = "25G"; -+ } else if (dataTechnology == "umts") { -+ postFixPacketData = "3G"; -+ } else if (dataTechnology == "hspa") { -+ postFixPacketData = "35G"; -+ } - if (!postFix.isEmpty()) { - if (state == "connecting" && connection == "GPRS") { - // if gprs is connecting while packet data is active, connecting animation is shown -@@ -259,16 +268,14 @@ +@@ -259,16 +267,14 @@ void PhoneNetworkTypeStatusIndicator::setNetworkType() postFix += "Active"; } } @@ -86,10 +67,11 @@ } } if (!postFix.isEmpty()) { -diff -ruN --exclude='*~' meegotouch-systemui-1.2.16.orig/src/systemui/statusarea/statusindicator.h meegotouch-systemui-1.2.16/src/systemui/statusarea/statusindicator.h ---- meegotouch-systemui-1.2.16.orig/src/systemui/statusarea/statusindicator.h 2011-11-02 14:07:51.270586311 +0200 -+++ meegotouch-systemui-1.2.16/src/systemui/statusarea/statusindicator.h 2011-11-03 08:41:30.954178238 +0200 -@@ -206,7 +206,8 @@ +diff --git a/src/systemui/statusarea/statusindicator.h b/src/systemui/statusarea/statusindicator.h +index abbf8c3..7b562f3 100644 +--- a/src/systemui/statusarea/statusindicator.h ++++ b/src/systemui/statusarea/statusindicator.h +@@ -206,7 +206,8 @@ private slots: void setNetworkType(); private: @@ -99,648 +81,6 @@ ContextItem *cellularDataTechnology; ContextItem *connectionType; ContextItem *connectionState; -diff -ruN --exclude='*~' meegotouch-systemui-1.2.16.orig/src/systemui/statusarea/statusindicator.h.orig meegotouch-systemui-1.2.16/src/systemui/statusarea/statusindicator.h.orig ---- meegotouch-systemui-1.2.16.orig/src/systemui/statusarea/statusindicator.h.orig 1970-01-01 02:00:00.000000000 +0200 -+++ meegotouch-systemui-1.2.16/src/systemui/statusarea/statusindicator.h.orig 2011-11-03 08:41:17.754895141 +0200 -@@ -0,0 +1,641 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -+** All rights reserved. -+** Contact: Nokia Corporation ([email protected]) -+** -+** This file is part of systemui. -+** -+** If you have questions regarding the use of this file, please contact -+** Nokia at [email protected]. -+** -+** This library is free software; you can redistribute it and/or -+** modify it under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation -+** and appearing in the file LICENSE.LGPL included in the packaging -+** of this file. -+** -+****************************************************************************/ -+ -+#ifndef STATUSINDICATOR_H -+#define STATUSINDICATOR_H -+ -+#include <MWidgetController> -+#include <QDBusConnection> -+#include "statusindicatormodel.h" -+#include <QTimer> -+ -+#ifdef HAVE_QMSYSTEM -+#include <qmdevicemode.h> -+#endif -+ -+class ApplicationContext; -+class ContextItem; -+class MGConfItem; -+ -+/*! -+ * StatusIndicator is a widget for displaying either image or text based status -+ * indicators in the status indicator area of the home screen. -+ */ -+class StatusIndicator : public MWidgetController -+{ -+ Q_OBJECT -+ M_CONTROLLER(StatusIndicator) -+ -+ Q_PROPERTY(QVariant value READ value WRITE setValue) -+ -+public: -+ /*! -+ * Constructs a StatusIndicator. -+ * -+ * \param parent parent MWidget -+ */ -+ explicit StatusIndicator(QGraphicsItem *parent = NULL); -+ -+ /*! -+ * \brief Destructor -+ */ -+ virtual ~StatusIndicator(); -+ -+ //! \reimp -+ // Reimplemented here as public so that the view can call it -+ virtual void updateGeometry(); -+ //! \reimp_end -+ -+signals: -+ //! Emitted when a subscription to the context items has been made -+ void subscriptionMade(); -+ -+protected: -+ /*! -+ * Calls setStyleName(name) and update() for convenience. -+ * -+ * \param name the style name to set -+ */ -+ void setStyleNameAndUpdate(const QString &name = QString()); -+ -+ /*! -+ * Sets the value of the indicator. This will be used by the dynamic -+ * indicators to change their appearance based on some value. The type of the value -+ * is determined by the indicator type. For indicators that display -+ * an image from a list of images, the value is a float 0 to 1 which -+ * is used to determine the used image. For indicators that display text, -+ * the value is the string to display. -+ */ -+ void setValue(QVariant v); -+ (558 more lines skipped) ++++++ meegotouch-systemui-1.2.18-1.tar.gz (new) ++++++ meegotouch-systemui.yaml --- meegotouch-systemui.yaml +++ meegotouch-systemui.yaml @@ -1,12 +1,12 @@ Name: meegotouch-systemui Summary: System UI daemon -Version: 1.2.16 +Version: 1.2.18 Release: 1 Group: System/Desktop License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/meegotouch-systemui Sources: - - "%{name}-%{version}.tar.bz2" + - "%{name}-%{version}-1.tar.gz" - "boss.conf" ExtraSources: - meegotouch-systemui.desktop;%{_sysconfdir}/xdg/autostart @@ -23,8 +23,7 @@ - BMC_14815_statusbar_width_for_default_portrait.patch - BMC_21860_battery_charging_animation.patch - BMC_19366_System_top_bar_items_are_mis-aligned.patch - # TODO: check if these 2 patches should be rebased. - #- BMC_16893-MR_5.patch + - BMC_16893-MR_5.patch Description: | This package contains the system UI daemon. PkgBR: ++++++ deleted files: --- meegotouch-systemui-1.2.16.tar.bz2 --- meegotouch-systemui-pulseaudio-client.patch
