I have made the following changes intended for : CE:UX:MTF / lipstick 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/7706 Thank You, vesuri [This message was auto-generated] --- Request # 7706: Messages from BOSS: State: review at 2013-01-23T09:57:46 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 / lipstick -> CE:UX:MTF / lipstick changes files: -------------- --- lipstick.changes +++ lipstick.changes @@ -0,0 +1,7 @@ +* Wed Jan 23 2013 Vesa Halttunen <[email protected]> - 0.6.5 +- Notification and volume improvements (from Vesa) + +* Tue Jan 22 2013 Robin Burchell <[email protected]> - 0.6.4 +- Make the orientation of the lipstick window known (from Vesa) +- Fix a bug with LauncherModel doing funky things on changes (from Robin) + old: ---- lipstick-0.6.3.tar.bz2 new: ---- lipstick-0.6.5.tar.bz2 spec files: ----------- --- lipstick.spec +++ lipstick.spec @@ -9,7 +9,7 @@ # << macros Summary: QML toolkit for homescreen creation -Version: 0.6.3 +Version: 0.6.5 Release: 1 Group: System/Libraries License: LGPLv2.1 other changes: -------------- ++++++ lipstick-0.6.3.tar.bz2 -> lipstick-0.6.5.tar.bz2 --- .gitignore +++ .gitignore @@ -0,0 +1,18 @@ +Makefile +*.o +*gen_*.h +*gen_*.cpp +*gen_*.o +*moc_*.h +*moc_*.cpp +*moc_*.o +*~ +*.log +*.log.xml +*.gcno +*.gcda +*.pro.user +configure-stamp +build-stamp +.project +.cproject --- doc/.gitignore +++ doc/.gitignore @@ -0,0 +1,2 @@ +*.log +html --- plugin/.gitignore +++ plugin/.gitignore @@ -0,0 +1 @@ +liblipstickplugin.so --- src/.gitignore +++ src/.gitignore @@ -0,0 +1,2 @@ +liblipstick.* +pkgconfig --- src/components/launchermodel.cpp +++ src/components/launchermodel.cpp @@ -57,11 +57,16 @@ if (!item->filePath().startsWith(changedPath)) continue; - if (fileInfoList.end() == std::find_if( - fileInfoList.begin(), - fileInfoList.end(), - [item](QFileInfo fileInfo) -> bool { return item->filePath() == fileInfo.fileName(); })) + bool foundOnDisk = false; + foreach (const QFileInfo &fileInfo, fileInfoList) { + if (fileInfo.absoluteFilePath() == item->filePath()) + foundOnDisk = true; + } + + if (!foundOnDisk) { + LAUNCHER_DEBUG(item->filePath() << " removed from disk"); removeItem(item); + } } QMap<int, LauncherItem *> itemsWithPositions; @@ -74,15 +79,20 @@ if (!fileInfo.fileName().endsWith(".desktop")) continue; - if (currentLauncherList->end() == std::find_if( - currentLauncherList->begin(), - currentLauncherList->end(), - [fileInfo](LauncherItem* item) -> bool { return item->filePath() == fileInfo.fileName(); })) { + bool foundInModel = false; + foreach (LauncherItem *item, *currentLauncherList) { + if (fileInfo.absoluteFilePath() == item->filePath()) { + foundInModel = true; + break; + } + } + if (!foundInModel) { LAUNCHER_DEBUG("Creating LauncherItem for desktop entry" << fileInfo.absoluteFilePath()); LauncherItem *item = new LauncherItem(fileInfo.absoluteFilePath(), this); if (!item->isValid()) { + LAUNCHER_DEBUG("Item " << fileInfo.absoluteFilePath() << " is not valid"); delete item; continue; } --- src/homeapplication.cpp +++ src/homeapplication.cpp @@ -38,6 +38,7 @@ #include "xtools/xatomcache.h" #include "xtools/xwindowmanager.h" #include "xtools/homewindowmonitor.h" +#include "xtools/x11wrapper.h" #include "components/windowmanager.h" #include "components/windowinfo.h" #include "volume/volumecontrol.h" @@ -179,5 +180,11 @@ if (!_qmlPath.isEmpty()) _mainWindowInstance->setSource(_qmlPath); + // Make the orientation angle known + int angle = 270; + Display *display = QX11Info::display(); + Atom orientationAngleAtom = X11Wrapper::XInternAtom(display, "_MEEGOTOUCH_ORIENTATION_ANGLE", False); + X11Wrapper::XChangeProperty(display, _mainWindowInstance->winId(), orientationAngleAtom, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)&angle, 1); + return _mainWindowInstance; } --- src/notifications/.gitignore +++ src/notifications/.gitignore @@ -0,0 +1 @@ +notificationmanageradaptor.* --- src/notifications/notification.cpp +++ src/notifications/notification.cpp @@ -123,6 +123,7 @@ QString oldPreviewIcon = previewIcon(); QString oldPreviewSummary = previewSummary(); QString oldPreviewBody = previewBody(); + int oldUrgency = urgency(); hints_ = hints; @@ -145,6 +146,10 @@ if (oldPreviewBody != previewBody()) { emit previewBodyChanged(); } + + if (oldUrgency != urgency()) { + emit urgencyChanged(); + } } int Notification::expireTimeout() const @@ -187,6 +192,11 @@ return hints_.value(NotificationManager::HINT_PREVIEW_BODY).toString(); } +int Notification::urgency() const +{ + return hints_.value(NotificationManager::HINT_URGENCY).toInt(); +} + QDBusArgument &operator<<(QDBusArgument &argument, const Notification ¬ification) { argument.beginStructure(); --- src/notifications/notification.h +++ src/notifications/notification.h @@ -42,6 +42,7 @@ Q_PROPERTY(QString previewIcon READ previewIcon NOTIFY previewIconChanged) Q_PROPERTY(QString previewSummary READ previewSummary NOTIFY previewSummaryChanged) Q_PROPERTY(QString previewBody READ previewBody NOTIFY previewBodyChanged) + Q_PROPERTY(int urgency READ urgency NOTIFY urgencyChanged) public: /*! @@ -129,6 +130,9 @@ //! Returns the body text for the preview of the notification QString previewBody() const; + //! Returns the urgency of the notification + int urgency() const; + //! \internal /*! * Creates a copy of an existing representation of a notification. @@ -172,6 +176,9 @@ //! Sent when the preview body has been modified void previewBodyChanged(); + //! Sent when the urgency has been modified + void urgencyChanged(); + private: //! Name of the application sending the notification QString appName_; --- src/screenlock/.gitignore +++ src/screenlock/.gitignore @@ -0,0 +1,2 @@ +screenlockadaptor.cpp +screenlockadaptor.h --- src/src.pro +++ src/src.pro @@ -3,7 +3,7 @@ TEMPLATE = lib TARGET = lipstick -VERSION = 0.6.3 +VERSION = 0.6.5 DEFINES += LIPSTICK_BUILD_LIBRARY VERSION=\\\"$$VERSION\\\" --- src/volume/volumecontrol.cpp +++ src/volume/volumecontrol.cpp @@ -47,7 +47,7 @@ keyReleaseTimer.setInterval(100); keyRepeatDelayTimer.setSingleShot(true); keyRepeatDelayTimer.setInterval(600); - keyRepeatTimer.setInterval(150); + keyRepeatTimer.setInterval(75); connect(&keyReleaseTimer, SIGNAL(timeout()), this, SLOT(stopKeyRepeat())); connect(&keyRepeatDelayTimer, SIGNAL(timeout()), &keyRepeatTimer, SLOT(start())); connect(&keyRepeatTimer, SIGNAL(timeout()), this, SLOT(changeVolume())); --- tests/.gitignore +++ tests/.gitignore @@ -0,0 +1 @@ +tests.xml --- tests/ut_categorydefinitionstore/.gitignore +++ tests/ut_categorydefinitionstore/.gitignore @@ -0,0 +1 @@ +ut_categorydefinitionstore --- tests/ut_closeeventeater/.gitignore +++ tests/ut_closeeventeater/.gitignore @@ -0,0 +1 @@ +ut_closeeventeater --- tests/ut_eventeater/.gitignore +++ tests/ut_eventeater/.gitignore @@ -0,0 +1 @@ +ut_eventeater --- tests/ut_lipsticksettings/.gitignore +++ tests/ut_lipsticksettings/.gitignore @@ -0,0 +1 @@ +ut_lipsticksettings --- tests/ut_notification/.gitignore +++ tests/ut_notification/.gitignore @@ -0,0 +1 @@ +ut_notification --- tests/ut_notification/ut_notification.cpp +++ tests/ut_notification/ut_notification.cpp @@ -29,6 +29,7 @@ QString previewIcon = "previewIcon1"; QString previewSummary = "previewSummary1"; QString previewBody = "previewBody1"; + int urgency = 1; QStringList actions = QStringList() << "action1a" << "action1b"; QDateTime timestamp = QDateTime::currentDateTime(); QVariantHash hints; @@ -36,6 +37,7 @@ hints.insert(NotificationManager::HINT_PREVIEW_ICON, previewIcon); hints.insert(NotificationManager::HINT_PREVIEW_SUMMARY, previewSummary); hints.insert(NotificationManager::HINT_PREVIEW_BODY, previewBody); + hints.insert(NotificationManager::HINT_URGENCY, urgency); int expireTimeout = 1; // Ensure that the constructor puts things in place @@ -52,6 +54,7 @@ QCOMPARE(notification.previewIcon(), previewIcon); QCOMPARE(notification.previewSummary(), previewSummary); QCOMPARE(notification.previewBody(), previewBody); + QCOMPARE(notification.urgency(), urgency); appName = "appName2"; appIcon = "appIcon2"; @@ -60,12 +63,14 @@ previewIcon = "previewIcon2"; previewSummary = "previewSummary2"; previewBody = "previewBody2"; + urgency = 2; actions = QStringList() << "action2a" << "action2b" << "action2c"; timestamp = QDateTime::currentDateTime(); hints.insert(NotificationManager::HINT_TIMESTAMP, timestamp); hints.insert(NotificationManager::HINT_PREVIEW_ICON, previewIcon); hints.insert(NotificationManager::HINT_PREVIEW_SUMMARY, previewSummary); hints.insert(NotificationManager::HINT_PREVIEW_BODY, previewBody); + hints.insert(NotificationManager::HINT_URGENCY, urgency); expireTimeout = 2; notification.setAppName(appName); notification.setAppIcon(appIcon); @@ -85,6 +90,7 @@ QCOMPARE(notification.previewIcon(), previewIcon); QCOMPARE(notification.previewSummary(), previewSummary); QCOMPARE(notification.previewBody(), previewBody); + QCOMPARE(notification.urgency(), urgency); } void Ut_Notification::testIcon_data() --- tests/ut_notificationfeedbackplayer/.gitignore +++ tests/ut_notificationfeedbackplayer/.gitignore @@ -0,0 +1 @@ +ut_notificationfeedbackplayer --- tests/ut_notificationlistmodel/.gitignore +++ tests/ut_notificationlistmodel/.gitignore @@ -0,0 +1 @@ +ut_notificationlistmodel --- tests/ut_notificationmanager/.gitignore +++ tests/ut_notificationmanager/.gitignore @@ -0,0 +1 @@ +ut_notificationmanager --- tests/ut_notificationpreviewpresenter/.gitignore +++ tests/ut_notificationpreviewpresenter/.gitignore @@ -0,0 +1 @@ +ut_notificationpreviewpresenter --- tests/ut_screenlock/.gitignore +++ tests/ut_screenlock/.gitignore @@ -0,0 +1 @@ +ut_screenlock --- tests/ut_volumecontrol/.gitignore +++ tests/ut_volumecontrol/.gitignore @@ -0,0 +1 @@ +ut_volumecontrol --- tests/ut_volumecontrol/ut_volumecontrol.cpp +++ tests/ut_volumecontrol/ut_volumecontrol.cpp @@ -143,7 +143,7 @@ QCOMPARE(volumeControl->keyReleaseTimer.isSingleShot(), true); QCOMPARE(volumeControl->keyRepeatDelayTimer.interval(), 600); QCOMPARE(volumeControl->keyRepeatDelayTimer.isSingleShot(), true); - QCOMPARE(volumeControl->keyRepeatTimer.interval(), 150); + QCOMPARE(volumeControl->keyRepeatTimer.interval(), 75); QCOMPARE(disconnect(&volumeControl->keyReleaseTimer, SIGNAL(timeout()), volumeControl, SLOT(stopKeyRepeat())), true); QCOMPARE(disconnect(&volumeControl->keyRepeatDelayTimer, SIGNAL(timeout()), &volumeControl->keyRepeatTimer, SLOT(start())), true); QCOMPARE(disconnect(&volumeControl->keyRepeatTimer, SIGNAL(timeout()), volumeControl, SLOT(changeVolume())), true); --- tools/notificationtool/.gitignore +++ tools/notificationtool/.gitignore @@ -0,0 +1,2 @@ +notificationmanagerproxy.* +notificationtool ++++++ lipstick.yaml --- lipstick.yaml +++ lipstick.yaml @@ -1,6 +1,6 @@ Name: lipstick Summary: QML toolkit for homescreen creation -Version: 0.6.3 +Version: 0.6.5 Release: 1 Group: System/Libraries License: LGPLv2.1
