summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Implemented aspect ratio and scale mode handling in Phonon MMF backendGareth Stockwell2009-11-1318-340/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replaced VolumeObserver and VideoOutputObserver interfaces with signals. - Added signals for propagating changes in aspect ratio and scale mode from VideoOutput to VideoPlayer. - Removed VideoPlayer::getNativeWindowSystemHandles. Interaction with window system is moved into VideoOutput, so that VideoPlayer is better focussed on its main task: interacting with CVideoPlayerUtility. - WId changes, resize and move events received by the VideoOutput widget cause it to emit a videoWindowChanged signal. This is received by the VideoPlayer, which triggers a call to updateVideoRect. The main task of this function is to calculate the scale factors which are provided to the MMF via CVideoPlayerUtility::SetScaleFactorL. Note that: i) This function must be called both before and after the call to SetDisplayWindowL. For changes in aspect ratio or scale mode, setting the scale mode after updating the display window is sufficient. However, testing showed that, when switching in or out of full-screen mode, two calls were necessary in order to preserve the correct aspect ratio. ii) The screen rectangle passed to the MMF is still the full window extent; it is not the region in which video will actually be rendered. The post-processor will fill in the remainder of the window with a background colour (typically black). If, on the other hand, we passed in the actual video display rectangle, we would need to do this background painting in the widget. This in turn would require a change to QtGui: at present, we can only disable blitting on a per-widget basis (by setting QWExtra::disableBlit). If we needed to paint the borders of the video window, disableBlit would need to contain the actual DSA region, rather than just a single boolean flag. Task-number: QTBUG-5585 Reviewed-by: Frans Englich
* Pause playback on small screens when popping up dialogs.Frans Englich2009-11-122-0/+21
| | | | | | | Only done for small screens. Patch simplified by Gareth. Task-number: QTBUG-5307 Reviewed-by: Gareth Stockwell
* Mediaplayer now pauses playback before displaying error dialogGareth Stockwell2009-11-091-1/+1
| | | | | | | | This change improves the user experience - previously, video playback would continue in the background, while the user read the dialog. Then, when the dialog was dismissed, video playback would pause. Reviewed-by: Frans Englich
* Allowed execution of pause command when backend is in error stateGareth Stockwell2009-11-091-1/+1
| | | | | | | | | When qmediaplayer receives a stateChanged(ErrorState) signal, it first displays a dialog, and then calls pause() on the media object. This change allows that pause command to be executed on the underlying MMF client API. Reviewed-by: Frans Englich
* Removed infinite recursion from Phonon::MMF::MediaObject::errorTypeGareth Stockwell2009-11-091-1/+1
| | | | Reviewed-by: Frans Englich
* Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Gareth Stockwell2009-11-0911-167/+109
|\ | | | | | | mmfphonon
| * Replace mmfphonondebug.lib with #ifndef QT_NO_DEBUG.Frans Englich2009-11-0911-167/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The debug{} directive in src/plugins/phonon/mmf/plugin/plugin.pro does not have any effect - this can be seen by looking at the generated MMP file, which has a STATICLIBRARY directive which is applied in both UDEB and UREL builds. This is the general problem that .pro files cannot tell distinction between the different targets that one makespec covers. Also remove objectdumpstub; objectdump was originally prepared for QtGui inclusion, but since that never happened, no other platforms than Symbian needs to be covered. Task-number: QTBUG-5466 Reviewed-by: Gareth Stockwell
* | Fixed compiler warning for RVCT 2.2Gareth Stockwell2009-11-091-23/+24
|/ | | | Reviewed-by: trustme
* Removed logging from Phonon MMF backendGareth Stockwell2009-11-051-8/+0
| | | | | | | | | | | | | | | This statement calls a function (RWindowBase::ClientHandle) which was introduced in S60 3.2. Although there is a runtime check, a build made against 3.2 or above will fail on a 3.1 device. This manifests itself by the plugin failing to load. The log statement is not really necessary anyway, because, for window-owning controls, the window handle is the same value as the CCoeControl* pointer. This means that logging RWindowBase::ClientHandle is redundant information. Task-number: QTBUG-5406 Reviewed-by: trustme
* tst_qwidget widgetAt now does not leave widget lowered if test failsGareth Stockwell2009-11-041-2/+3
| | | | | Task-number: QTBUG-5396 Reviewed-by: axis
* Fix for link error when building QtSvgGareth Stockwell2009-11-042-1/+6
| | | | | | | | | | | | | | | | | Building QtSvg for Symbian (ARMV5 build) fails due to the following linker error: QGraphicsEffectSourcePrivate::invalidateCache(bool) const (referred from qsvgwidget.o). This function is called from the inline destructor of QGraphicsEffectSourcePrivate. Making this destructor non-inline fixes the problem. It is not clear why QtSvg is instantiating this destructor, however, as neither QGraphicsEffectSourcePrivate nor any of its derived classes are referred to from QtSvg source. This problem seems to have been triggered by 85e41590. Reviewed-by: Shane Kearns
* QS60Style: QToolButton indicator will not fit into toolbutton areaSami Merilä2009-11-041-5/+8
| | | | | | | | | QToolButton rect does not include reserved area for menu indicator, so drawing the indicator makes the rest of the toolbutton area smaller. Fixed by including the menu indicator area into tool button. Task-number: QTBUG-5266 Reviewed-by: Alessandro Portale
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-044-111/+149
|\
| * Unexported a class that doesn't need to be exported.axis2009-11-043-108/+108
| | | | | | | | RevBy: Iain
| * Fixed input panel detection on post-5.0 S60 SDKs.axis2009-11-042-3/+41
| | | | | | | | | | Task: QT-2418 RevBy: Shane Kearns
* | Make button margins bigger in QS60StyleSami Merilä2009-11-041-0/+7
|/ | | | | | | | | | | Currenly QS60Style relies on QCommonStyle to calculate correct button content size. Unfortunately, common style does not understand frames, so it is possible that the frame-border of theme graphic gets under button content. This change makes both QPushButton and QToolButton bigger. Task-number: None Reviewed-by: Alessandro Portale
* Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-04747-8997/+20543
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-04704-8768/+19538
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-04225-3869/+5024
| | |\
| | | * Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-0455-806/+1161
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | | | * Compile fix after the last gesture api changeDenis Dzyubenko2009-11-037-58/+50
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * Cocoa: fix q3filedialog autotestRichard Moe Gustavsen2009-11-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q3FileDialog does not exist in the cocoa port. Do ifdef this test out on cocoa Rev-by: prasanth
| | | | * Toolbar Icons are clipped on Leopard in Cocoa port.Prasanth Ullattil2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scale the pixmap to correct size (16,16) before setting as the image for the Document Icon button. Reviewed-by: Denis
| | | | * Gesture api review.Denis Dzyubenko2009-11-0335-446/+441
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette
| | | | * Modified gesture events propagation.Denis Dzyubenko2009-11-036-37/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default if the gesture is ignored, only gestures in the started state are propagated, and accepting a gesture in the started state adds an implicit grab meaning all the following events in the gesture sequence will be delivered to that widget. This is similar to the way QTouchEvent is propagated. Also added a hint, which specifies if gestures in any state can be propagated to the widget which has enabled the hint. Reviewed-by: Thomas Zander
| | | | * Made native Pan gesture work on Windows.Denis Dzyubenko2009-11-038-72/+90
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-039-102/+130
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * Fixed the imagegestures project file.Denis Dzyubenko2009-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * Improved gesture scrollarea manualtest.Denis Dzyubenko2009-11-032-11/+33
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * Added QGraphicsObject::ungrabGesture()Denis Dzyubenko2009-11-033-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops, apparently we forgot to add a function for unsubscribing a graphics object from a gesture. Fixing it now. Reviewed-by: trustme
| | | | * Documentation fixes related to gestures doc.Denis Dzyubenko2009-11-033-5/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | | * Cocoa: fix double emit bug from file dialogRichard Moe Gustavsen2009-11-031-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, Cocoa tells us twize whenever a selection change occurs in the native file dialog. This patch inserts a check that the selection actually changed before emitting any signals Rev-By: Prasanth
| | | | * Titlebar icon (for e.g. Assistant) not visible in Cocoa.Prasanth Ullattil2009-11-023-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standardWindowButton:NSWindowDocumentIconButton will not return a valid NSButton unless you call setRepresentedURL or setRepresentedFilename for the NSWindow. This patch makes sure that setWindowIcon_sys() sets the icon using a valid NSButton. Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Morten Johan Sørvig2009-10-307-49/+182
| | | | |\
| | | | | * Make GestureCancelPolicy work for graphicsviewThomas Zander2009-10-305-22/+109
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Denis
| | | | | * Fix unit test and add autoCancel test for graphicsviewThomas Zander2009-10-301-26/+72
| | | | | |
| | | | | * Removed the margin in assistant on Mac.Denis Dzyubenko2009-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 9551b8c349ce4e15a57c24a2408ee1b73c2b7510 enabled documentMode on the tabbar in Assistant. To make it look more native we also remove the margin around the tabwidget. Reviewed-by: Prasanth
| | | | * | Fix QDesktopServices::DataLocation on Mac.Morten Johan Sørvig2009-10-303-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DataLocation now behaves as on the other platforms, QCoreApplication::organizationName() and applicationName() is included in the returned path.
| | | | * | Fix indentation.Morten Johan Sørvig2009-10-301-89/+89
| | | | | |
| | | | * | Fix issue with wrong QMessagebox icons on Mac.Morten Johan Sørvig2009-10-301-2/+3
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-4988 68c0e6a8ba1e92bf0152adcaa86eebb83dcfd1d8 introduced a regression preventing the mac-spesific standardIcon code form being called. Call the Mac code if desktopSettingsAware is set. (QIcon::themeName() is only set on X11)
| | | * | Fix compiler error.Aleksandar Sasha Babic2009-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | Changelog 4.6.0: Designer/uic/uic3.Friedemann Kleint2009-11-041-0/+23
| | | | |
| | | * | Merge branch '4.6-s60' into 4.6axis2009-11-0441-186/+365
| | | |\ \
| | | * | | WebKit line ending fix in AccessibilityAllInOne.cpp.Jocelyn Turcotte2009-11-041-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | QVideoFrame API review changes.Andrew den Exter2009-11-045-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename equivalentImageFormat() to imageFormatFromPixelFormat(). Rename equivalentPixelFormat() to pixelFormatFromImageFormat(). Rename numBytes() to mappedBytes(). Reviewed-by: Justin McPherson
| | | * | | QVideoSurfaceFormat API review changes.Andrew den Exter2009-11-043-102/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename YuvColorSpace enum and related functions to YCbCrColorSpace. Remove ViewportMode enum and make setFrameSize() always reset the viewport to fill the frame. Reviewed-by: Justin McPherson
| | | * | | QAbstractVideoSurface API review changes.Andrew den Exter2009-11-048-45/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename isStarted() and startedChanged() to is active() and activeChanged(). Remove the the similar format argument from isFormatSupported() and add a new nearestFormat() function which provides the same functionality. Reviewed-by: Justin McPherson
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-04556-6515/+16435
| | | |\ \ \
| | | | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Warwick Allison2009-11-045-9/+20
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-11-041-5/+16
| | | | | |\ \ \
generated by cgit v0.12 at 2025-01-15 13:07:14 (GMT)