summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_s60.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-031-1/+3
|\
| * Move the S60/Avkon framework initialization into QtGui.axis2009-09-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we avoid having a lot of code in a static (and unmaintainable) library. The s60main static library now currently has only one task: to call main(). To move the initialization into QtGui also meant a change in how the S60 framework is created, because we can no longer use the trick where we create and start the the S60 event loop and then have the framework call us back to start main(). The initialization now follows the creation and destruction of QApplication, which is a lot more in line with how other platforms do it. Since S60 doesn't support creating the environment, and *then* starting it (both are executed by the same call), we had to open up the S60 framework construction classes and just mirror what they do. This means that after QApplication construction is done, the S60 framework is initialized, but nothing will run yet and control will return to main(), where the user can start the event loop himself. One of the quirks of this approach is that the construction of the S60 framework makes a new cleanup stack. This means that any active traps will not be active anymore, and leaving without setting a new trap will most likely panic. This shouldn't be a problem for us, since Qt is never supposed to leave, but it means that if anyone uses the cleanup stack without setting a new trap, they will receive a panic. It was considered to add a trap mark in QApplication construction and then removing it on destruction, but it was dropped because leaving from main() is still undefined (even if the old cleanup stack would be restored in the destructor, we wouldn't be able to stop the exception from unwinding the stack, and the cleanup stack would then be unbalanced). RevBy: Jason Barron RevBy: Janne Anttila AutoTest: QWidget passed with same failure count
* | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
|/ | | | Reviewed-by: Trust Me
* Changed names and URLs to reflect name change.axis2009-08-191-1/+1
| | | | RevBy: Trust me
* Changing names of Symbian leave <-> qt throw translation functionsmread2009-08-131-1/+1
| | | | due to http://qt-reviews.europe.nokia.com/r/67/
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-071-4/+4
|\ | | | | | | | | Conflicts fixed: src/corelib/io/qdiriterator.cpp
| * Update license headers according to commit 858c70f768e.axis2009-08-061-3/+3
| | | | | | | | RevBy: Trust me
| * Replaced $MODULE$ with hardcoded module names.axis2009-08-061-1/+1
| | | | | | | | RevBy: Trust me
* | Leaves -> exceptionsmread2009-08-061-5/+6
|/
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-051-27/+27
|\
| * Trailing whitespace and tab/space fixes for src/guiJanne Anttila2009-08-041-28/+28
| |
* | protecting against leak in QSymbianControl when QWidget construction failsmread2009-08-051-18/+26
|/
* fixed qt_pixmapToNativeBitmap name merge problemmread2009-08-031-4/+4
|
* Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-16/+18
| | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* Restored window title after another top-level window was closed.Janne Anttila2009-07-311-3/+9
| | | | | | | | | | | | | Task: 249995 The window title in S60 is global entity, i.e. is located in application status pane. When top level window, for example mesage box is closed, the window title has to be restored for window which is getting the focus. This way we don't leave title from destroyed window to title bar. It is also into question, whether the non-maximized dialogs should set title to statuspane at all. For now they will, but things may change if we switch to use native dialogs.
* Swicthed back to original way of using AddToStackL and RemoveFromStackJanne Anttila2009-07-301-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | Task: 258504 This commit fixes the problem that background widgets do not get orientation change events, and thus will not be correctly layouted after the foreground windget is closed. See also: c17c1c101cbe09d4c6149ef8e76a9bb792222456 At the time when commit c17c1c101cbe09d4c6149ef8e76a9bb792222456 was created there were no SetFocus calls in hide_sys and show_sys. I think that has been the root cause why focus change event has not been generated. I.e. hiding a CCoeControl in Symbian (MakeVisible) does not generate focus event but setFocus(false/true) generates. I tried this code with Drilldown example. In city detaisl view the combobox was working fine with keypad navigation. The change had no effects to qcombobox autotest results and qwidget autotest resutls were better on some run and a bit worse on some run. There was variation in 2-4 qwidget autotest results on each run. Note also that screensaver seems to affect to test results.
* Implemented setWindowIcon for S60 devices without context pane.Janne Anttila2009-07-231-0/+36
| | | | | | | | | Task: 258582 All S60 versions does not have context pane in status bar area, that's why the window icon was not shown on those devices. Fortunately there was another API (CAknTitlePane::SetSmallPicture) whicch can be used to put graphics next to title.
* Make S60 integration optional.Jason Barron2009-07-151-24/+46
| | | | | | | | | | | | | | This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than anything else. One of the side effects of this work was that it was relatively little work to get QtGui compiling when Q_WS_S60 is not defined. Based on this we introduce two new configure options that control S60 integration. Currently the -no-s60 option will not work entirely because the 's60main' module has not yet been refactored and still has a dependancy on the S60 libraries. Reviewed-by: axis <qt-info@nokia.com>
* Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-091-10/+32
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * Switched to asynchronous focus handling on Symbian.axis2009-07-091-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | This was done in order to be more in line with what other platforms (at least X11) do. In addition, it prevents show() from entering event handlers in Qt. That should only happen in processEvents(). This required the introduction of a new event, SymbianDeferredFocusChanged, which we post whenever there is a focus change. RevBy: Jason Barron AutoTest: Passed
| * Silenced warnings from RVCT.axis2009-07-061-1/+1
| |
| * Removed pointless variables to silence warnings from RVCT.axis2009-07-061-5/+1
| |
| * Fix warnings because of unused variables.axis2009-06-291-4/+4
| |
* | Manually fix bad merges and make sure everything compiles with 4.6.Harald Fernengel2009-06-291-1/+1
|/
* Improve softkey implementation and add a default 'Exit' button to RSK.Jason Barron2009-06-171-16/+49
| | | | | | | | | | | | | | | The previous implementation had some problems where the actual position of the softkey was determined by it's position in the list. This is suboptimal since the position should be tied to the role. Actions that have "negative" conotation should be located on the right soft key (RSK) while "positive" actions go on the left soft key (LSK). This is according to the S60 User Interface Guide. It is also standard practice in S60 to have an 'Exit' button on the RSK so we add one of those if there is not already a key present there. Task-number: 256365 Reviewed-by: Markku Luukkainen
* Changed to use proper conversion from qstring to hbufMarkku Luukkainen2009-06-101-1/+1
|
* Merge branch 'softkeys_without_stack'Markku Luukkainen2009-06-101-1/+52
|\
| * Call DrawDeferred() after setting softkeysAlessandro Portale2009-06-101-0/+1
| | | | | | | | | | | | SDK 3.1 and maybe also 3.2 need an extra invitation. RevvBy: maluukka
| * Fixes from code reviewMarkku Luukkainen2009-06-091-41/+0
| |
| * Fixes from code reviewMarkku Luukkainen2009-06-081-4/+3
| |
| * Removed QSoftkeySet as it wasn't used anymoreMarkku Luukkainen2009-06-081-3/+1
| |
| * Added support for setting softkeys dynamicallyMarkku Luukkainen2009-06-061-1/+2
| |
| * Fixes to make gui compile after clean configure. RemovalMarkku Luukkainen2009-06-061-3/+0
| | | | | | | | of QSoftKeyStack broke compilation on clean environment...
| * Replaced usage of QSoftKeyActions with QActions+SoftKeyRolesMarkku Luukkainen2009-06-061-14/+19
| |
| * Initial version of softkey implementation that doesn't useMarkku Luukkainen2009-06-051-0/+91
| | | | | | | | softkeystack but instead softkeys are stored in QWidgets.
* | Avoid unnecessary calls to FocusChanged in Symbian.Janne Anttila2009-06-081-3/+6
|/ | | | | | | Called setFocus only when the widget does not already have the focus. This should remove unncessary calls to FocusChanged since CCoeControl always calls FocusChanged when SetFocus is called, even there was no changes in focus.
* Fixed incorrect headers.axis2009-06-031-1/+31
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-111-6/+39
|\ | | | | | | | | Conflicts: src/gui/widgets/qmenu_symbian.cpp
| * Some code cleanups after review.Jason Barron2009-04-291-3/+3
| | | | | | | | | | Change these lines of code to either make it more consistent or more readable after review.
| * Undo implementation of setWindowOpacity_sys().Jason Barron2009-04-291-4/+2
| | | | | | | | | | | | | | | | This function was implemented using API from Symbian that will be deprecated. It was never actually suitable anyway since this function cannot be called after the window has been shown and this needs to be a runtime decision for Qt. The solution is to use SetTransparencyAlphaChannel(), but that will come later.
| * Fixes crash when setting geometry on an obscured window.Jason Barron2009-04-291-1/+1
| | | | | | | | | | | | | | Since Qt on Symbian now destroys the backing store when it gets hidden or obscured we need to be careful not to use functions like moveRect() when we don't have a backing store since this function is really a backing store optimization and therefore assumes one exists.
| * More work on translucent windows.Jason Barron2009-04-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | One step closer to semi-transparent windows, but not there yet. This gets the transparent contents into the window, but the previous contents are not cleared so it keeps drawing the backing store on top of itself each time a Draw() is done. SetBackgroundColor() indicates to WSERV that our window is semi-transparent. We also make sure not to use 'EDrawModeWriteAlpha' when the widget is non-opaque since this actually changes the alpha channel on the frame buffer (not the window) so the gives undesired results. It's a faster draw mode though so we should use it where we can.
| * Fixes: Add support for translucent windows in Symbian.Jason Barron2009-04-281-1/+33
| | | | | | | | | | | | | | | | | | | | | | Warning, this is completely untested! Details: This should (in theory) get translucent windows working but this hasn't been tested yet. The emulator environment seems to return only 16ColorMU display modes which implies the window is opague so Qt ignores the translucent flag. HW seems to create 16ColorMA windows, but it hasn't been tested there yet either (no time).
| * Enable dynamic [de|con]struction of window surfaces based on visibilityJason Barron2009-04-281-3/+4
| | | | | | | | | | | | | | | | | | When a window becomes completely obscured either because it has been hidden or another window is completely covering it, the backing store should be deallocated to save memory and then re-allocated when the window is later made visible again. Reviewed-by: Iain <qt-info@nokia.com>
* | Fixed namespace issues, now works on Symbian under namespaceJanne Koskinen2009-05-111-0/+2
|/
* Long live Qt for S60!axis2009-04-241-0/+942