I have made the following changes intended for : CE:MW:Shared / qt-components
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/6916 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6916: Messages from BOSS: State: review at 2012-10-04T17:14:17 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: Project:MTF:MW / qt-components -> CE:MW:Shared / qt-components changes files: -------------- --- qt-components.changes +++ qt-components.changes @@ -0,0 +1,12 @@ +* Thu Oct 4 2012 Robin Burchell <[email protected]> - 1.4.2 +- Remove an unnecessary Item in PageStackWindow (from John) +- Reduce MDeclarativeStatusBar's impact on startup time (from John) +- Change mthemedaemon socket path (from John) +- Enable remote theme support (from John/Robin) +- sectionscroller: work better with C++ models (from Robin) +- sectionscroller: don't allow mouse stealing (from Robin) +- sectionscroller: fix drag handle position (from Robin) +- sectionscroller: animate the opacity of the sidebar (from Robin) +- Make dialogs transparent again (from Robin) +- Remove meegotouch build option (from Robin) + old: ---- qt-components-1.4.1.tar.bz2 new: ---- qt-components-1.4.2.tar.bz2 spec files: ----------- --- qt-components.spec +++ qt-components.spec @@ -9,7 +9,7 @@ # << macros Summary: Qt Quick UX Components -Version: 1.4.1 +Version: 1.4.2 Release: 1 Group: System/Libraries License: BSD @@ -53,7 +53,7 @@ %build # >> build pre -./configure -meego -force-local-theme -nomake tests -xrandr -maliit -meegographicssystem +./configure -meego -nomake tests -xrandr -maliit -meegographicssystem # << build pre other changes: -------------- ++++++ qt-components-1.4.1.tar.bz2 -> qt-components-1.4.2.tar.bz2 --- configure +++ configure @@ -50,7 +50,6 @@ BUILD_EXAMPLES=yes BUILD_EXTRAS=yes BUILD_TESTS=yes -HAVE_MEEGOTOUCH=no HAVE_MALIIT=no HAVE_XDAMAGE=no HAVE_XRANDR=no @@ -85,7 +84,6 @@ # Test for pkg-config enabled dependencies which pkg-config > /dev/null if [ $? -eq 0 ]; then - pkg-config --exists meegotouch && HAVE_MEEGOTOUCH=yes pkg-config --exists maliit-1.0 && HAVE_MALIIT=yes pkg-config --atleast-version=0.5.25 contextsubscriber-1.0 && HAVE_CONTEXTSUBSCRIBER=yes pkg-config --exists xdamage && HAVE_XDAMAGE=yes @@ -107,7 +105,7 @@ VAL=no ;; #Qt style yes options - -meego|-symbian|-meegotouch|-maliit|-contextsubscriber|-xdamage|-xrandr|-meegographicssystem|-force-local-theme|-mobility) + -meego|-symbian|-maliit|-contextsubscriber|-xdamage|-xrandr|-meegographicssystem|-force-local-theme|-mobility) VAR=`echo $1 | sed 's,^-\(.*\),\1,'` VAL=yes ;; @@ -203,13 +201,6 @@ QMAKE_DEBUG="$QMAKE_DEBUG -d" ;; # autodetection overrides - meegotouch) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - HAVE_MEEGOTOUCH=$VAL - else - UNKNOWN_OPT=yes - fi - ;; maliit) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then HAVE_MALIIT=$VAL @@ -283,9 +274,6 @@ evaluation succeeds, the feature is included. Here is a short explanation of each option: - -no-meegotouch ........... Do not compile MeeGo Touch framework support - + -meegotouch .............. Compile MeeGo Touch framework support - -no-maliit ............... Do not complile Maliit framework support + -maliit .................. Compile Maliit framework support @@ -313,7 +301,6 @@ [ "$BUILD_EXTRAS" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG extras" [ "$BUILD_TESTS" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG tests" -[ "$HAVE_MEEGOTOUCH" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG meegotouch" [ "$HAVE_MALIIT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG maliit" [ "$HAVE_CONTEXTSUBSCRIBER" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG contextsubscriber" [ "$HAVE_MEEGOGRAPHICSSYSTEM" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG meegographicssystem" @@ -346,7 +333,6 @@ echo "Configuration ....................$QMAKE_CONFIG" echo "MeeGo Style ...................... $BUILD_MEEGO_STYLE" if [ "$BUILD_MEEGO_STYLE" = "yes" ]; then - echo " MeeGo Touch support ........... $HAVE_MEEGOTOUCH" echo " Maliit support ................. $HAVE_MALIIT" echo " ContextSubscriber support ..... $HAVE_CONTEXTSUBSCRIBER" echo " XDamage support ............... $HAVE_XDAMAGE" --- src/meego/Fader.qml +++ src/meego/Fader.qml @@ -167,14 +167,14 @@ //reparent fader whenever it is going to be visible SequentialAnimation { ScriptAction {script: __transformToHidden()} - PropertyAnimation {properties: "alpha"; from: 0.0; to: 1.0; duration: 350; easing.type: Easing.OutCubic; } + PropertyAnimation {properties: "alpha"; from: 0.0; to: dim; duration: 350; easing.type: Easing.OutCubic; } } }, Transition { from: "visible"; to: "hidden" SequentialAnimation { PauseAnimation { duration: fadeOutDelay } - PropertyAnimation {properties: "alpha"; from: 1.0; to: 0.0; duration: 350; easing.type: Easing.OutCubic; } + PropertyAnimation {properties: "alpha"; from: dim; to: 0.0; duration: 350; easing.type: Easing.OutCubic; } ScriptAction {script: faderBackground.parent = originalParent} } } --- src/meego/PageStackWindow.qml +++ src/meego/PageStackWindow.qml @@ -47,7 +47,7 @@ property bool showStatusBar: true property bool showToolBar: true property variant initialPage - property alias pageStack: stack + property alias pageStack: contentArea property Style platformStyle: PageStackWindowStyle{} property alias platformToolBarHeight: toolBar.height // read-only @@ -92,15 +92,11 @@ anchors.bottom: parent.bottom // content area - Item { + PageStack { id: contentArea anchors { top: parent.top; left: parent.left; right: parent.right; bottom: parent.bottom; } anchors.bottomMargin: toolBar.visible || (toolBar.opacity==1)? toolBar.height : 0 - PageStack { - id: stack - anchors.fill: parent - toolBar: toolBar - } + toolBar: toolBar } Item { --- src/meego/SectionScroller.js +++ src/meego/SectionScroller.js @@ -62,7 +62,7 @@ prop = list.section.property, item; - for (var i = 0, count = (typeof list.model.count === 'undefined' ? list.model.length : list.model.count); i < count; i++) { + for (var i = 0; i < list.count; i++) { item = list.model.get(i); if (item[prop] !== current) { current = item[prop]; --- src/meego/SectionScroller.qml +++ src/meego/SectionScroller.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** +** Copyright (C) 2012 Robin Burchell <[email protected]> ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation ([email protected]) ** ** This file is part of the Qt Components project. ** @@ -64,52 +63,59 @@ //Deprecated, TODO Remove this on w13 property alias style: root.platformStyle - Rectangle { + MouseArea { id: container - color: "transparent" width: 80 height: listView.height x: listView.x + listView.width - width property bool dragging: false + // we manage the drag in positionAtY ourselves, because we + // have some extra requirements about positioning + drag.minimumY: 0 + drag.maximumY: listView.height - tooltip.height + preventStealing: true - MouseArea { - id: dragArea - objectName: "dragArea" + Rectangle { + id: sidebar anchors.fill: parent - drag.target: tooltip - drag.axis: Drag.YAxis - drag.minimumY: listView.y - drag.maximumY: listView.y + listView.height - tooltip.height + color: Qt.rgba(1, 1, 1, 0.5) + opacity: 0 - onPressed: { - mouseDownTimer.start() - } - - onReleased: { - container.dragging = false; - mouseDownTimer.stop() - } - - onPositionChanged: { - internal.adjustContentPosition(dragArea.mouseY); - } - - Timer { - id: mouseDownTimer - interval: 150 - - onTriggered: { - container.dragging = true; - internal.adjustContentPosition(dragArea.mouseY); - tooltip.positionAtY(dragArea.mouseY); - } - } states: [ State { name: "dragging"; when: container.dragging - PropertyChanges { target: container; color: Qt.rgba(1, 1, 1, 0.5) } + PropertyChanges { target: sidebar; opacity: 1.0 } } ] + + Behavior on opacity { + NumberAnimation { duration: 100 } + } + } + + onPressed: { + mouseDownTimer.start() + } + + onReleased: { + container.dragging = false; + mouseDownTimer.stop() + } + + onPositionChanged: { + internal.adjustContentPosition(container.mouseY); + tooltip.positionAtY(container.mouseY); + } + + Timer { + id: mouseDownTimer + interval: 150 + + onTriggered: { + container.dragging = true; + internal.adjustContentPosition(container.mouseY); + tooltip.positionAtY(container.mouseY); + } } Item { id: tooltip @@ -120,7 +126,7 @@ height: childrenRect.height function positionAtY(yCoord) { - tooltip.y = Math.max(dragArea.drag.minimumY, Math.min(yCoord - tooltip.height/2, dragArea.drag.maximumY)); + tooltip.y = Math.max(container.drag.minimumY, Math.min(yCoord - tooltip.height/2, container.drag.maximumY)); } Rectangle { @@ -208,27 +214,21 @@ } } - if (listView.model.countChanged) - listView.model.countChanged.connect(dirtyObserver); - + // TODO: on model changing, these should also be disconnected. if (listView.model.itemsChanged) listView.model.itemsChanged.connect(dirtyObserver); - if (listView.model.itemsInserted) - listView.model.itemsInserted.connect(dirtyObserver); - if (listView.model.itemsMoved) listView.model.itemsMoved.connect(dirtyObserver); - if (listView.model.itemsRemoved) - listView.model.itemsRemoved.connect(dirtyObserver); + listView.countChanged.connect(dirtyObserver) } function adjustContentPosition(y) { - if (y < 0 || y > dragArea.height) return; + if (y < 0 || y > container.height) return; internal.down = (y > internal.oldY); - var sect = Sections.getClosestSection((y / dragArea.height), internal.down); + var sect = Sections.getClosestSection((y / container.height), internal.down); internal.oldY = y; if (internal.curSect != sect) { internal.curSect = sect; --- src/meego/extras/extras.pro +++ src/meego/extras/extras.pro @@ -9,10 +9,6 @@ CONFIG += qt plugin QT += declarative network -meegotouch { - DEFINES += HAVE_MEEGOTOUCH -} - HEADERS += mdatetimehelper.h SOURCES += plugin.cpp mdatetimehelper.cpp --- src/meego/mdeclarativestatusbar.cpp +++ src/meego/mdeclarativestatusbar.cpp @@ -56,7 +56,7 @@ #include "feedbackplayer.h" #ifdef HAVE_DBUS - #include <QDBusInterface> + #include <QDBusMessage> #include <QDBusServiceWatcher> #include <QDBusConnectionInterface> #endif @@ -146,13 +146,6 @@ } #ifdef HAVE_DBUS - if (QDBusConnection::sessionBus().interface()->isServiceRegistered(PIXMAP_PROVIDER_DBUS_SERVICE)) - isPixmapProviderOnline = true; - else -#endif - isPixmapProviderOnline = false; - -#ifdef HAVE_DBUS dbusWatcher = new QDBusServiceWatcher( PIXMAP_PROVIDER_DBUS_SERVICE , QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForRegistration|QDBusServiceWatcher::WatchForUnregistration, this ); @@ -242,12 +235,9 @@ void MDeclarativeStatusBar::updateSharedPixmap() { destroyXDamageForSharedPixmap(); - if ((!updatesEnabled)||(!isPixmapProviderOnline)) - return; - if (!sharedPixmap.isNull()) { + if (updatesEnabled && !sharedPixmap.isNull()) setupXDamageForSharedPixmap(); - } } void MDeclarativeStatusBar::setupXDamageForSharedPixmap() @@ -284,14 +274,15 @@ void MDeclarativeStatusBar::querySharedPixmapFromProvider() { - if (!updatesEnabled || !isPixmapProviderOnline) + if (!updatesEnabled) return; + #ifdef HAVE_DBUS - QDBusInterface interface(PIXMAP_PROVIDER_DBUS_SERVICE, PIXMAP_PROVIDER_DBUS_PATH, PIXMAP_PROVIDER_DBUS_INTERFACE, - QDBusConnection::sessionBus()); - QDBusPendingCall asyncCall = interface.asyncCall(PIXMAP_PROVIDER_DBUS_SHAREDPIXMAP_CALL); - QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(asyncCall, this); + QDBusMessage message = QDBusMessage::createMethodCall(PIXMAP_PROVIDER_DBUS_SERVICE, PIXMAP_PROVIDER_DBUS_PATH, + PIXMAP_PROVIDER_DBUS_INTERFACE, PIXMAP_PROVIDER_DBUS_SHAREDPIXMAP_CALL); + QDBusPendingCall asyncCall = QDBusConnection::sessionBus().asyncCall(message); + QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(asyncCall, this); connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(sharedPixmapHandleReceived(QDBusPendingCallWatcher*))); #endif @@ -328,13 +319,11 @@ void MDeclarativeStatusBar::handlePixmapProviderOnline() { - isPixmapProviderOnline = true; querySharedPixmapFromProvider(); } void MDeclarativeStatusBar::handlePixmapProviderOffline() { - isPixmapProviderOnline = false; destroyXDamageForSharedPixmap(); } @@ -390,8 +379,9 @@ void MDeclarativeStatusBar::showStatusIndicatorMenu() { #ifdef HAVE_DBUS - QDBusInterface interface(STATUS_INDICATOR_MENU_DBUS_SERVICE, STATUS_INDICATOR_MENU_DBUS_PATH, STATUS_INDICATOR_MENU_DBUS_INTERFACE, QDBusConnection::sessionBus()); - interface.call(QDBus::NoBlock, "open"); + QDBusMessage message = QDBusMessage::createMethodCall(STATUS_INDICATOR_MENU_DBUS_SERVICE, STATUS_INDICATOR_MENU_DBUS_PATH, + STATUS_INDICATOR_MENU_DBUS_INTERFACE, "open"); + QDBusConnection::sessionBus().asyncCall(message); #endif } --- src/meego/mdeclarativestatusbar.h +++ src/meego/mdeclarativestatusbar.h @@ -99,7 +99,6 @@ QPointF firstPos, lastPos; void updateSharedPixmap(); - bool isPixmapProviderOnline; QDBusServiceWatcher *dbusWatcher; void querySharedPixmapFromProvider(); void setupXDamageForSharedPixmap(); --- src/meego/meego.pro +++ src/meego/meego.pro @@ -24,10 +24,6 @@ warning("mlite is not available; theme detection won't work") } -meegotouch { - DEFINES += HAVE_MEEGOTOUCH -} - maliit { DEFINES += HAVE_MALIIT PKGCONFIG += maliit-1.0 --- src/meego/style/DialogStyle.qml +++ src/meego/style/DialogStyle.qml @@ -57,7 +57,7 @@ property int buttonsColumnSpacing: 10 // fader properties - property double dim: 1.0 + property double dim: 0.9 property int fadeInDuration: 350 // ms property int fadeOutDuration: 350 // ms --- src/meego/themedaemon/mthemedaemonprotocol.cpp +++ src/meego/themedaemon/mthemedaemonprotocol.cpp @@ -41,14 +41,11 @@ #include "mthemedaemonprotocol.h" #include <QHash> #include <QtEndian> +#include <QDir> using namespace M::MThemeDaemonProtocol; -#ifdef HAVE_THEMEDAEMON_PROTOCOL_V1 - const QString M::MThemeDaemonProtocol::ServerAddress = "/var/run/m.mthemedaemon"; -#else - const QString M::MThemeDaemonProtocol::ServerAddress = "m.mthemedaemon"; -#endif +const QString M::MThemeDaemonProtocol::ServerAddress = QDir::homePath() + "/.m.mthemedaemon"; static const int SOCKET_DELAY_MS = 15000; ++++++ qt-components.yaml --- qt-components.yaml +++ qt-components.yaml @@ -1,6 +1,6 @@ Name: qt-components Summary: Qt Quick UX Components -Version: 1.4.1 +Version: 1.4.2 Release: 1 Group: System/Libraries License: BSD
