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/7338 Thank You, vesuri [This message was auto-generated] --- Request # 7338: Messages from BOSS: State: review at 2012-11-07T17:29:21 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:vesuri:branches:CE:UX:MTF / meegotouch-systemui -> CE:UX:MTF / meegotouch-systemui changes files: -------------- --- meegotouch-systemui.changes +++ meegotouch-systemui.changes @@ -0,0 +1,3 @@ +* Wed Nov 07 2012 Vesa Halttunen <[email protected]> - 1.4.2 +- Use Lipstick's notification system category definitions + old: ---- meegotouch-systemui-1.4.1.tar.bz2 new: ---- meegotouch-systemui-1.4.2.tar.bz2 spec files: ----------- --- meegotouch-systemui.spec +++ meegotouch-systemui.spec @@ -9,7 +9,7 @@ # << macros Summary: System UI daemon -Version: 1.4.1 +Version: 1.4.2 Release: 2 Group: System/Desktop License: LGPLv2.1 @@ -158,7 +158,7 @@ %{_bindir}/sysuid %{_datadir}/applications/lock.desktop %{_datadir}/l10n/meegotouch/systemui.qm -%{_datadir}/meegotouch/notifications/eventtypes/*.conf +%{_datadir}/lipstick/notificationcategories/*.conf %{_datadir}/themes/base/meegotouch/sysuid/*.conf %{_datadir}/themes/base/meegotouch/sysuid/feedbacks %{_datadir}/themes/base/meegotouch/sysuid/style/*.css other changes: -------------- ++++++ meegotouch-systemui-1.4.1.tar.bz2 -> meegotouch-systemui-1.4.2.tar.bz2 --- configure +++ configure @@ -28,7 +28,7 @@ fi fi -VERSION=1.4.1 +VERSION=1.4.2 echo VERSION = ${VERSION} >> ${FILENAME} echo Configured system-ui as follows: --- src/systemui/batterybusinesslogic.cpp +++ src/systemui/batterybusinesslogic.cpp @@ -78,13 +78,13 @@ // The low battery notifications should not be sent when the battery is charging stopLowBatteryNotifier(); - removeNotification(QStringList() << "x-nokia.battery.removecharger" << "x-nokia.battery.chargingcomplete" << "x-nokia.battery.lowbattery"); + removeNotification(QStringList() << "x-nemo.battery.removecharger" << "x-nemo.battery.chargingcomplete" << "x-nemo.battery.lowbattery"); sendNotification(NotificationCharging); } break; case MeeGo::QmBattery::StateNotCharging: - removeNotification(QStringList() << "x-nokia.battery"); + removeNotification(QStringList() << "x-nemo.battery"); utiliseLED(false, QString("PatternBatteryCharging")); break; @@ -99,7 +99,7 @@ switch(state) { case MeeGo::QmBattery::StateFull: stopLowBatteryNotifier(); - removeNotification(QStringList() << "x-nokia.battery"); + removeNotification(QStringList() << "x-nemo.battery"); sendNotification(NotificationChargingComplete); break; @@ -135,7 +135,7 @@ * charging the device. */ if (chargerType == MeeGo::QmBattery::Wall) { - removeNotification(QStringList() << "x-nokia.battery" << "x-nokia.battery.chargingcomplete"); + removeNotification(QStringList() << "x-nemo.battery" << "x-nemo.battery.chargingcomplete"); sendNotification(NotificationRemoveCharger); } @@ -190,57 +190,57 @@ switch(id) { case NotificationCharging: utiliseLED(true, QString("PatternBatteryCharging")); - sendNotification("x-nokia.battery", + sendNotification("x-nemo.battery", //% "Charging" qtTrId("qtn_ener_charging"), chargingImageId()); break; case NotificationChargingComplete: utiliseLED(true, QString("PatternBatteryFull")); - sendNotification("x-nokia.battery.chargingcomplete", + sendNotification("x-nemo.battery.chargingcomplete", //% "Charging complete" qtTrId("qtn_ener_charcomp")); break; case NotificationRemoveCharger: - sendNotification("x-nokia.battery.removecharger", + sendNotification("x-nemo.battery.removecharger", //% "Disconnect charger from power supply to save energy" qtTrId("qtn_ener_remcha")); break; case NotificationChargingNotStarted: utiliseLED(false, QString("PatternBatteryCharging")); - sendNotification("x-nokia.battery.chargingnotstarted", + sendNotification("x-nemo.battery.chargingnotstarted", //% "Charging not started. Replace charger." qtTrId("qtn_ener_repcharger")); break; case NotificationRechargeBattery: - sendNotification("x-nokia.battery.recharge", + sendNotification("x-nemo.battery.recharge", //% "Recharge battery" qtTrId("qtn_ener_rebatt")); break; case NotificationEnteringPSM: - sendNotification("x-nokia.battery.enterpsm", + sendNotification("x-nemo.battery.enterpsm", //% "Entering power save mode" qtTrId("qtn_ener_ent_psnote"), chargingImageId()); break; case NotificationExitingPSM: - sendNotification("x-nokia.battery.exitpsm", + sendNotification("x-nemo.battery.exitpsm", //% "Exiting power save mode" qtTrId("qtn_ener_exit_psnote"), chargingImageId()); break; case NotificationLowBattery: - sendNotification("x-nokia.battery.lowbattery", + sendNotification("x-nemo.battery.lowbattery", //% "Low battery" qtTrId("qtn_ener_lowbatt")); break; case NotificationNoEnoughPower: - sendNotification("x-nokia.battery.notenoughpower", + sendNotification("x-nemo.battery.notenoughpower", //% "Not enough power to charge" qtTrId("qtn_ener_nopowcharge"), "icon-m-energy-management-insufficient-power"); break; --- src/systemui/diskspacenotifier.cpp +++ src/systemui/diskspacenotifier.cpp @@ -28,7 +28,7 @@ // Destroy any previous disk space notifications foreach (MNotification *notification, MNotification::notifications()) { - if (notification->eventType() == "x-nokia.system-memusage") { + if (notification->eventType() == "x-nemo.system-memusage") { notification->remove(); } delete notification; @@ -69,7 +69,7 @@ // Show a notification //% "Getting low with storage. Please check." - notification = new MNotification("x-nokia.system-memusage", "", qtTrId("qtn_memu_memlow_notification_src")); + notification = new MNotification("x-nemo.system-memusage", "", qtTrId("qtn_memu_memlow_notification_src")); notification->setAction(MRemoteAction("com.nokia.DuiControlPanel", "/", "com.nokia.DuiControlPanelIf", "appletPage", QList<QVariant>() << "Mass Storage Usage")); notification->publish(); } --- src/systemui/notifications/categories +++ src/systemui/notifications/categories +(directory) --- src/systemui/notifications/categories/categories.pri +++ src/systemui/notifications/categories/categories.pri @@ -0,0 +1,5 @@ +categories.files = $$SYSTEMUI_SOURCE_DIR/notifications/categories/*.conf +categories.path = /usr/share/lipstick/notificationcategories + +INSTALLS += categories + --- src/systemui/notifications/categories/device.added.conf +++ src/systemui/notifications/categories/device.added.conf @@ -0,0 +1,3 @@ +x-nemo-icon=icon-m-common-usb +urgency=3 +feedbackId=accessory_connected --- src/systemui/notifications/categories/device.conf +++ src/systemui/notifications/categories/device.conf @@ -0,0 +1,2 @@ +x-nemo-icon=icon-m-bluetooth-devices +urgency=3 --- src/systemui/notifications/categories/device.error.conf +++ src/systemui/notifications/categories/device.error.conf @@ -0,0 +1,3 @@ +x-nemo-icon=icon-m-common-usb +urgency=3 +feedbackId=warning_snd --- src/systemui/notifications/categories/device.removed.conf +++ src/systemui/notifications/categories/device.removed.conf @@ -0,0 +1,2 @@ +x-nemo-icon=icon-m-common-usb +urgency=3 --- src/systemui/notifications/categories/x-nemo.battery.chargingcomplete.conf +++ src/systemui/notifications/categories/x-nemo.battery.chargingcomplete.conf @@ -0,0 +1,2 @@ +x-nemo-icon=icon-m-energy-management-remove-charger +urgency=3 --- src/systemui/notifications/categories/x-nemo.battery.chargingnotstarted.conf +++ src/systemui/notifications/categories/x-nemo.battery.chargingnotstarted.conf @@ -0,0 +1,3 @@ +x-nemo-icon=icon-m-energy-management-insufficient-power +urgency=3 +feedbackId=wrong_charger --- src/systemui/notifications/categories/x-nemo.battery.conf +++ src/systemui/notifications/categories/x-nemo.battery.conf @@ -0,0 +1,3 @@ +x-nemo-icon=icon-m-energy-management-charging8 +urgency=3 +feedbackId=charging_started --- src/systemui/notifications/categories/x-nemo.battery.enterpsm.conf +++ src/systemui/notifications/categories/x-nemo.battery.enterpsm.conf @@ -0,0 +1,3 @@ +x-nemo-icon=icon-m-energy-management-battery-verylow +urgency=3 +feedbackId=battery_low --- src/systemui/notifications/categories/x-nemo.battery.exitpsm.conf +++ src/systemui/notifications/categories/x-nemo.battery.exitpsm.conf @@ -0,0 +1,2 @@ +x-nemo-icon=icon-m-energy-management-battery-verylow +urgency=3 --- src/systemui/notifications/categories/x-nemo.battery.lowbattery.conf +++ src/systemui/notifications/categories/x-nemo.battery.lowbattery.conf @@ -0,0 +1,3 @@ +x-nemo-icon=icon-m-energy-management-battery-verylow +urgency=3 +feedbackId=battery_low --- src/systemui/notifications/categories/x-nemo.battery.notenoughpower.conf +++ src/systemui/notifications/categories/x-nemo.battery.notenoughpower.conf @@ -0,0 +1,2 @@ +x-nemo-icon=icon-m-energy-management-insufficient-power +urgency=3 --- src/systemui/notifications/categories/x-nemo.battery.recharge.conf +++ src/systemui/notifications/categories/x-nemo.battery.recharge.conf @@ -0,0 +1,3 @@ +x-nemo-icon=icon-m-energy-management-battery-verylow +urgency=3 +feedbackId=recharge_battery --- src/systemui/notifications/categories/x-nemo.battery.removecharger.conf +++ src/systemui/notifications/categories/x-nemo.battery.removecharger.conf @@ -0,0 +1,2 @@ +x-nemo-icon=icon-m-energy-management-remove-charger +urgency=3 --- src/systemui/notifications/categories/x-nemo.battery.shutdown.conf +++ src/systemui/notifications/categories/x-nemo.battery.shutdown.conf @@ -0,0 +1,3 @@ +x-nemo-icon=icon-m-energy-management-battery-verylow +urgency=3 +feedbackId=recharge_battery --- src/systemui/notifications/categories/x-nemo.battery.temperature.conf +++ src/systemui/notifications/categories/x-nemo.battery.temperature.conf @@ -0,0 +1,3 @@ +x-nemo-icon=icon-m-notification-temperature +urgency=3 +feedbackId=warning_strong --- src/systemui/notifications/categories/x-nemo.system-memusage.conf +++ src/systemui/notifications/categories/x-nemo.system-memusage.conf @@ -0,0 +1,3 @@ +x-nemo-icon=icon-m-notification-low-memory +genericTextId=qtn_memu_memlow_notification_priv +genericTextCatalogue=memory-usage --- src/systemui/notifications/eventtypes +++ src/systemui/notifications/eventtypes -(directory) --- src/systemui/notifications/eventtypes/device.added.conf +++ src/systemui/notifications/eventtypes/device.added.conf @@ -1,3 +0,0 @@ -iconId=icon-m-common-usb -class=system -feedbackId=accessory_connected --- src/systemui/notifications/eventtypes/device.conf +++ src/systemui/notifications/eventtypes/device.conf @@ -1,2 +0,0 @@ -iconId=icon-m-bluetooth-devices -class=system --- src/systemui/notifications/eventtypes/device.error.conf +++ src/systemui/notifications/eventtypes/device.error.conf @@ -1,3 +0,0 @@ -iconId=icon-m-common-usb -class=system -feedbackId=warning_snd --- src/systemui/notifications/eventtypes/device.removed.conf +++ src/systemui/notifications/eventtypes/device.removed.conf @@ -1,2 +0,0 @@ -iconId=icon-m-common-usb -class=system --- src/systemui/notifications/eventtypes/eventtypes.pri +++ src/systemui/notifications/eventtypes/eventtypes.pri @@ -1,5 +0,0 @@ -eventtypes.files = $$SYSTEMUI_SOURCE_DIR/notifications/eventtypes/*.conf -eventtypes.path = $$M_NOTIFICATIONS_EVENT_TYPES_DIR - -INSTALLS += eventtypes - --- src/systemui/notifications/eventtypes/x-nokia.battery.chargingcomplete.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.chargingcomplete.conf @@ -1,2 +0,0 @@ -iconId=icon-m-energy-management-remove-charger -class=system --- src/systemui/notifications/eventtypes/x-nokia.battery.chargingnotstarted.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.chargingnotstarted.conf @@ -1,3 +0,0 @@ -iconId=icon-m-energy-management-insufficient-power -class=system -feedbackId=wrong_charger --- src/systemui/notifications/eventtypes/x-nokia.battery.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.conf @@ -1,3 +0,0 @@ -iconId=icon-m-energy-management-charging8 -class=system -feedbackId=charging_started --- src/systemui/notifications/eventtypes/x-nokia.battery.enterpsm.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.enterpsm.conf @@ -1,3 +0,0 @@ -iconId=icon-m-energy-management-battery-verylow -class=system -feedbackId=battery_low --- src/systemui/notifications/eventtypes/x-nokia.battery.exitpsm.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.exitpsm.conf @@ -1,2 +0,0 @@ -iconId=icon-m-energy-management-battery-verylow -class=system --- src/systemui/notifications/eventtypes/x-nokia.battery.lowbattery.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.lowbattery.conf @@ -1,3 +0,0 @@ -iconId=icon-m-energy-management-battery-verylow -class=system -feedbackId=battery_low --- src/systemui/notifications/eventtypes/x-nokia.battery.notenoughpower.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.notenoughpower.conf @@ -1,2 +0,0 @@ -iconId=icon-m-energy-management-insufficient-power -class=system --- src/systemui/notifications/eventtypes/x-nokia.battery.recharge.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.recharge.conf @@ -1,3 +0,0 @@ -iconId=icon-m-energy-management-battery-verylow -class=system -feedbackId=recharge_battery --- src/systemui/notifications/eventtypes/x-nokia.battery.removecharger.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.removecharger.conf @@ -1,2 +0,0 @@ -iconId=icon-m-energy-management-remove-charger -class=system --- src/systemui/notifications/eventtypes/x-nokia.battery.shutdown.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.shutdown.conf @@ -1,3 +0,0 @@ -iconId=icon-m-energy-management-battery-verylow -class=system -feedbackId=recharge_battery --- src/systemui/notifications/eventtypes/x-nokia.battery.temperature.conf +++ src/systemui/notifications/eventtypes/x-nokia.battery.temperature.conf @@ -1,3 +0,0 @@ -iconId=icon-m-notification-temperature -class=system -feedbackId=warning_strong --- src/systemui/notifications/eventtypes/x-nokia.system-memusage.conf +++ src/systemui/notifications/eventtypes/x-nokia.system-memusage.conf @@ -1,3 +0,0 @@ -iconId=icon-m-notification-low-memory -genericTextId=qtn_memu_memlow_notification_priv -genericTextCatalogue=memory-usage --- src/systemui/notifications/notifications.pri +++ src/systemui/notifications/notifications.pri @@ -1,5 +1,4 @@ -# Input -include(eventtypes/eventtypes.pri) +include(categories/categories.pri) system(qdbusxml2cpp ../../libnotificationsystem/notificationsink.xml -p dbusinterfacenotificationsinkproxy -c DBusInterfaceNotificationSinkProxy -i metatypedeclarations.h) system(qdbusxml2cpp dbusinterfacenotificationsink.xml -a dbusinterfacenotificationsinkadaptor -c DBusInterfaceNotificationSinkAdaptor -l DBusInterfaceNotificationSink -i dbusinterfacenotificationsink.h -i metatypedeclarations.h) --- src/systemui/shutdownbusinesslogic.cpp +++ src/systemui/shutdownbusinesslogic.cpp @@ -92,13 +92,13 @@ void ShutdownBusinessLogic::thermalShutdown() { //% "Temperature too high. Device shutting down." - createAndPublishNotification("x-nokia.battery.temperature","", qtTrId("qtn_shut_high_temp")); + createAndPublishNotification("x-nemo.battery.temperature","", qtTrId("qtn_shut_high_temp")); } void ShutdownBusinessLogic::batteryShutdown() { //% "Battery empty. Device shutting down." - createAndPublishNotification("x-nokia.battery.shutdown", "", qtTrId("qtn_shut_batt_empty")); + createAndPublishNotification("x-nemo.battery.shutdown", "", qtTrId("qtn_shut_batt_empty")); } void ShutdownBusinessLogic::shutdownDeniedUSB() --- stub_middleware/unlockscreen_notifications.sh +++ stub_middleware/unlockscreen_notifications.sh @@ -41,11 +41,11 @@ sleep $SLEEPTIME; # wait for a while echo "******************************************* Test call from 'John Doe'" -dbus-send --print-reply --dest=com.meego.core.MNotificationManager /notificationmanager com.meego.core.MNotificationManager.addNotification uint32:1000 uint32:0 string:'x-nokia.call' string:'John Doe' string:'Incoming call' string:'' string:'' uint32:0 +dbus-send --print-reply --dest=com.meego.core.MNotificationManager /notificationmanager com.meego.core.MNotificationManager.addNotification uint32:1000 uint32:0 string:'x-nemo.call' string:'John Doe' string:'Incoming call' string:'' string:'' uint32:0 sleep $SLEEPTIME; # wait for a while echo "******************************************* Test SMS from 'Santa Claus'" -dbus-send --print-reply --dest=com.meego.core.MNotificationManager /notificationmanager com.meego.core.MNotificationManager.addNotification uint32:1000 uint32:0 string:'x-nokia.message.arrived' string:'Santa Claus' string:'Happy christmas!' string:'' string:'' uint32:0 +dbus-send --print-reply --dest=com.meego.core.MNotificationManager /notificationmanager com.meego.core.MNotificationManager.addNotification uint32:1000 uint32:0 string:'x-nemo.message.arrived' string:'Santa Claus' string:'Happy christmas!' string:'' string:'' uint32:0 sleep $SLEEPTIME; # wait for a while echo "******************************************* Test instant message from 'Bill Gates'" --- tests/ut_batterybusinesslogic/ut_batterybusinesslogic.cpp +++ tests/ut_batterybusinesslogic/ut_batterybusinesslogic.cpp @@ -108,7 +108,7 @@ m_logic->lowBatteryAlert(); QCOMPARE(mNotificationEventTypes.count(), 1); - QCOMPARE(mNotificationEventTypes.at(0), QString("x-nokia.battery.lowbattery")); + QCOMPARE(mNotificationEventTypes.at(0), QString("x-nemo.battery.lowbattery")); QCOMPARE(mNotificationBodies.at(0), qtTrId("qtn_ener_lowbatt")); QCOMPARE(mNotificationSummaries.at(0), QString()); QCOMPARE(mNotificationImages.at(0), QString()); @@ -127,7 +127,7 @@ m_logic->batteryStateChanged(MeeGo::QmBattery::StateFull); QCOMPARE(mNotificationEventTypes.count(), 1); - QCOMPARE(mNotificationEventTypes.at(0), QString("x-nokia.battery.chargingcomplete")); + QCOMPARE(mNotificationEventTypes.at(0), QString("x-nemo.battery.chargingcomplete")); QCOMPARE(mNotificationBodies.at(0), qtTrId("qtn_ener_charcomp")); QCOMPARE(mNotificationSummaries.at(0), QString()); QCOMPARE(mNotificationImages.at(0), QString()); @@ -143,7 +143,7 @@ m_logic->batteryStateChanged(MeeGo::QmBattery::StateEmpty); QCOMPARE(mNotificationEventTypes.count(), 2); - QCOMPARE(mNotificationEventTypes.at(1), QString("x-nokia.battery.recharge")); + QCOMPARE(mNotificationEventTypes.at(1), QString("x-nemo.battery.recharge")); QCOMPARE(mNotificationBodies.at(1), qtTrId("qtn_ener_rebatt")); QCOMPARE(mNotificationSummaries.at(1), QString()); QCOMPARE(mNotificationImages.at(1), QString()); @@ -188,7 +188,7 @@ m_logic->chargingStateChanged(MeeGo::QmBattery::StateCharging); QCOMPARE(mNotificationEventTypes.count(), 1); - QCOMPARE(mNotificationEventTypes.at(0), QString("x-nokia.battery")); + QCOMPARE(mNotificationEventTypes.at(0), QString("x-nemo.battery")); QCOMPARE(mNotificationBodies.at(0), qtTrId("qtn_ener_charging")); QCOMPARE(mNotificationSummaries.at(0), QString()); QCOMPARE(mNotificationImages.at(0), m_logic->chargingImageId()); @@ -210,7 +210,7 @@ m_logic->chargingStateChanged(MeeGo::QmBattery::StateChargingFailed); QCOMPARE(mNotificationEventTypes.count(), 1); - QCOMPARE(mNotificationEventTypes.at(0), QString("x-nokia.battery.chargingnotstarted")); + QCOMPARE(mNotificationEventTypes.at(0), QString("x-nemo.battery.chargingnotstarted")); QCOMPARE(mNotificationBodies.at(0), qtTrId("qtn_ener_repcharger")); QCOMPARE(mNotificationSummaries.at(0), QString()); QCOMPARE(mNotificationImages.at(0), QString()); @@ -220,7 +220,7 @@ m_logic->chargingStateChanged(MeeGo::QmBattery::StateCharging); QCOMPARE(mNotificationEventTypes.count(), 2); - QCOMPARE(mNotificationEventTypes.at(1), QString("x-nokia.battery.notenoughpower")); + QCOMPARE(mNotificationEventTypes.at(1), QString("x-nemo.battery.notenoughpower")); QCOMPARE(mNotificationBodies.at(1), qtTrId("qtn_ener_nopowcharge")); QCOMPARE(mNotificationSummaries.at(1), QString()); QCOMPARE(mNotificationImages.at(1), QString("icon-m-energy-management-insufficient-power")); @@ -242,7 +242,7 @@ /* Look for the notification: "Disconnect the charger from..." */ QCOMPARE(mNotificationEventTypes.count(), 1); - QCOMPARE(mNotificationEventTypes.at(0), QString("x-nokia.battery.removecharger")); + QCOMPARE(mNotificationEventTypes.at(0), QString("x-nemo.battery.removecharger")); QCOMPARE(mNotificationBodies.at(0), qtTrId("qtn_ener_remcha")); QCOMPARE(mNotificationSummaries.at(0), QString()); QCOMPARE(mNotificationImages.at(0), QString()); @@ -270,7 +270,7 @@ m_logic->devicePSMStateChanged(MeeGo::QmDeviceMode::PSMStateOn); QCOMPARE(mNotificationEventTypes.count(), 1); - QCOMPARE(mNotificationEventTypes.at(0), QString("x-nokia.battery.enterpsm")); + QCOMPARE(mNotificationEventTypes.at(0), QString("x-nemo.battery.enterpsm")); QCOMPARE(mNotificationBodies.at(0), qtTrId("qtn_ener_ent_psnote")); QCOMPARE(mNotificationSummaries.at(0), QString()); QCOMPARE(mNotificationImages.at(0), m_logic->chargingImageId()); @@ -279,7 +279,7 @@ m_logic->devicePSMStateChanged(MeeGo::QmDeviceMode::PSMStateOff); QCOMPARE(mNotificationEventTypes.count(), 2); - QCOMPARE(mNotificationEventTypes.at(1), QString("x-nokia.battery.exitpsm")); + QCOMPARE(mNotificationEventTypes.at(1), QString("x-nemo.battery.exitpsm")); QCOMPARE(mNotificationBodies.at(1), qtTrId("qtn_ener_exit_psnote")); QCOMPARE(mNotificationSummaries.at(1), QString()); QCOMPARE(mNotificationImages.at(1), m_logic->chargingImageId()); @@ -332,14 +332,14 @@ #ifdef HAVE_QMSYSTEM m_logic->chargingStateChanged(MeeGo::QmBattery::StateCharging); QCOMPARE(mNotificationEventTypes.count(), 1); - QCOMPARE(mNotificationEventTypes.at(0), QString("x-nokia.battery")); + QCOMPARE(mNotificationEventTypes.at(0), QString("x-nemo.battery")); QCOMPARE(mNotificationBodies.at(0), qtTrId("qtn_ener_charging")); QCOMPARE(mNotificationSummaries.at(0), QString()); QCOMPARE(mNotificationImages.at(0), m_logic->chargingImageId()); m_logic->chargingStateChanged(MeeGo::QmBattery::StateNotCharging); QVERIFY(gMNotificationRemoveEventType.count() > 0); - QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nokia.battery")); + QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nemo.battery")); QCOMPARE(m_logic->notificationTimer.isActive(), false); #endif } @@ -351,14 +351,14 @@ m_logic->chargingStateChanged(MeeGo::QmBattery::StateCharging); m_logic->batteryChargerEvent(MeeGo::QmBattery::None); QVERIFY(gMNotificationRemoveEventType.count() > 0); - QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nokia.battery")); + QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nemo.battery")); m_logic->batteryChargerEvent(MeeGo::QmBattery::Wall); m_logic->chargingStateChanged(MeeGo::QmBattery::StateCharging); m_logic->batteryStateChanged(MeeGo::QmBattery::StateFull); m_logic->batteryChargerEvent(MeeGo::QmBattery::None); QVERIFY(gMNotificationRemoveEventType.count() > 0); - QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nokia.battery.chargingcomplete")); + QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nemo.battery.chargingcomplete")); #endif } @@ -380,7 +380,7 @@ m_logic->batteryChargerEvent(MeeGo::QmBattery::None); m_logic->chargingStateChanged(MeeGo::QmBattery::StateCharging); QVERIFY(gMNotificationRemoveEventType.count() > 0); - QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nokia.battery.removecharger")); + QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nemo.battery.removecharger")); #endif } @@ -401,7 +401,7 @@ m_logic->batteryChargerEvent(MeeGo::QmBattery::Wall); m_logic->chargingStateChanged(MeeGo::QmBattery::StateCharging); QVERIFY(gMNotificationRemoveEventType.count() > 0); - QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nokia.battery.lowbattery")); + QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nemo.battery.lowbattery")); #endif } @@ -412,7 +412,7 @@ m_logic->chargingStateChanged(MeeGo::QmBattery::StateCharging); m_logic->batteryStateChanged(MeeGo::QmBattery::StateFull); QVERIFY(gMNotificationRemoveEventType.count() > 0); - QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nokia.battery")); + QCOMPARE(gMNotificationRemoveEventType.last(), QString("x-nemo.battery")); #endif } --- tests/ut_diskspacenotifier/ut_diskspacenotifier.cpp +++ tests/ut_diskspacenotifier/ut_diskspacenotifier.cpp @@ -159,7 +159,7 @@ { delete m_subject; - // Check that the constructor destroys only any previous notifications of type x-nokia.system-memusage + // Check that the constructor destroys only any previous notifications of type x-nemo.system-memusage mNotificationNotificationsCount = 5; m_subject = new DiskSpaceNotifier(); QCOMPARE(mNotificationsCreated, mNotificationNotificationsCount); @@ -169,7 +169,7 @@ mNotificationsCreated = 0; mNotificationsDestroyed = 0; - mNotificationEventType = "x-nokia.system-memusage"; + mNotificationEventType = "x-nemo.system-memusage"; m_subject = new DiskSpaceNotifier(); QCOMPARE(mNotificationsCreated, mNotificationNotificationsCount); QCOMPARE(mNotificationsRemoved, mNotificationNotificationsCount); ++++++ meegotouch-systemui.yaml --- meegotouch-systemui.yaml +++ meegotouch-systemui.yaml @@ -1,6 +1,6 @@ Name: meegotouch-systemui Summary: System UI daemon -Version: 1.4.1 +Version: 1.4.2 Release: 2 Group: System/Desktop License: LGPLv2.1 @@ -54,7 +54,7 @@ - "%{_bindir}/sysuid" - "%{_datadir}/applications/lock.desktop" - "%{_datadir}/l10n/meegotouch/systemui.qm" - - "%{_datadir}/meegotouch/notifications/eventtypes/*.conf" + - "%{_datadir}/lipstick/notificationcategories/*.conf" - "%{_datadir}/themes/base/meegotouch/sysuid/*.conf" - "%{_datadir}/themes/base/meegotouch/sysuid/feedbacks" - "%{_datadir}/themes/base/meegotouch/sysuid/style/*.css"
