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/7704 Thank You, Robin Burchell [This message was auto-generated] --- Request # 7704: Messages from BOSS: State: review at 2013-01-22T10:48:06 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:w00t:branches:CE:UX:MTF / lipstick -> CE:UX:MTF / lipstick changes files: -------------- --- lipstick.changes +++ lipstick.changes @@ -0,0 +1,4 @@ +* 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.4.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.4 Release: 1 Group: System/Libraries License: LGPLv2.1 other changes: -------------- ++++++ lipstick-0.6.3.tar.bz2 -> lipstick-0.6.4.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/screenlock/.gitignore +++ src/screenlock/.gitignore @@ -0,0 +1,2 @@ +screenlockadaptor.cpp +screenlockadaptor.h --- 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_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 --- 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.4 Release: 1 Group: System/Libraries License: LGPLv2.1
