summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmenu_symbian.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Cleaned up the API of the Symbian event hooks.axis2009-10-211-1/+7
| | | | | | | | | | | | | | | The two major points were: - Replacing "s60" with "symbian" in all event handling functions, since there is nothing S60-specific about them. - Replace the Symbian event types with the encapsulating QSymbianEvent container. This allows us to cope with more types of events in the future without having to add new virtual functions. AutoTest: QWidget passed Task: QT-1156 RevBy: Jason Barron RevBy: Shane Kearns RevBy: Sami Merila
* Fix: Lazy instantiation of a static QActionAlessandro Portale2009-10-071-3/+4
| | | | | | | | | | | | | | | | | | We should not create a QAction instance at program startup, that is before QApplication was initialized. One reason not to do that is that internal fonts are prematurely initialized without QApplication::qt_is_gui_used set to true, which leads to wrong font Dpis in qt_defaultDpiX(). This issue was detected due to the failure in tst_QTextLayout, cases: testDefaultTabs, testTabs, testMultilineTab, testRightTab, testTabsInAlignedParag, testCenteredTab, testDelimiterTab, testMultiTab and tabsForRtl. Fix: create a Q_GLOBAL_STATIC_WITH_ARGS for that QAction instance. Reviewed-by: Liang QI
* Fixed a crash in menus on Symbian.axis2009-10-051-5/+7
| | | | | | | | | | | | | | | | | | | | The reason for the crash was the following: When we make menu entries in Qt, we assign each item an arbitrary command ID. This is because Symbian usually puts the items in a resource file and refers to them by ID, but we need to be dynamic. These command IDs are also assigned to cascading menu items (sub menus). When we then get a callback in RestoreMenuL with one of submenu IDs, we used to ask Symbian to construct the menu items for them, but Symbian doesn't know about them. Fixed by avoiding call into S60 code if the ID belongs to Qt. Also put a cap on the number of menu items. It's very unlikely that anyone will reach it, but it's better to have an actual check. Task: QT-646 AutoTest: Manual testing went fine RevBy: mread
* Added some comments.axis2009-10-051-1/+1
|
* Fixed indentation.axis2009-10-051-3/+3
|
* Prevented export of some internal functions.axis2009-09-221-2/+2
| | | | | | These should not be exported anymore after commit c13b97f2. RevBy: Jason Barron
* Remove key accelerators from Softkeys and Menus in S60.Sami Merilä2009-09-221-21/+3
| | | | | | | | | In S60 softkeys and menu items do not support key accelerators (i.e. CTRL+X). Therefore, removing the accelerator characters from both softkey and menu item texts. Related to task QT-1505 "Make Qt dialogs look native" Reviewed by Jason Barron
* Fixed all but one of the failures in the headers autotest.Martin Smith2009-09-091-1/+1
| | | | The resource compiler still generates files that don't have the LPGL header.
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Update license headersJason McDonald2009-09-041-0/+1
| | | | Reviewed-by: Trust Me
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
| | | | Reviewed-by: Trust Me
* Fix build error when Q_WS_S60 is undefinedIain2009-08-201-0/+2
| | | | Reviewed-by: Jason Barron
* Changed names and URLs to reflect name change.axis2009-08-191-1/+1
| | | | RevBy: Trust me
* Update license headers according to commit 858c70f768e.axis2009-08-061-3/+3
| | | | RevBy: Trust me
* Trailing whitespace and tab/space fixes for src/guiJanne Anttila2009-08-041-5/+5
|
* Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-2/+2
| | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* Make S60 integration optional.Jason Barron2009-07-151-4/+8
| | | | | | | | | | | | | | 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>
* Translate "Actions" textAlessandro Portale2009-06-121-4/+3
|
* Crash fix for task #255989Alessandro Portale2009-06-121-2/+2
| | | | | | | | | | | Hold a QPointer to the widget with the context menu. After the menu pops up, the focussed widget looses focus and may be deleted (like it happens in this case with the item editor). Testing for isNull() instead of crashing. It would be great to not even add the "Action" entry to the system menu but in that moment we don't know that the current focuswidget will soon disappear. That's still a Todo.
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicMarkku Luukkainen2009-06-101-4/+3
|\
| * Make Qt exception safer.Robert Griebl2009-06-101-4/+3
| | | | | | | | | | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* | Fixes from code reviewMarkku Luukkainen2009-06-081-7/+4
| |
* | Implemented context sensitive menu itemMarkku Luukkainen2009-06-081-17/+15
| |
* | Removed QSoftKeyStack and replaced places using it with theMarkku Luukkainen2009-06-061-2/+0
| | | | | | | | new improved softkey interface in QWidget
* | Disabled context sensitive menu because it would cause compilationMarkku Luukkainen2009-06-061-2/+2
| | | | | | | | | | failure. Context menu will be enabled again once the QAction SoftKeyRole implementation is in state where context menu can be properly supported
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-031-30/+36
|\ \ | |/ | | | | | | | | | | softkeys Conflicts: src/gui/kernel/qapplication_s60.cpp
| * Merge branch 'imSelections'axis2009-06-031-1/+31
| |\
| | * Fixed incorrect headers.axis2009-06-031-1/+31
| | |
| * | Since now, S60 commands are handled by QApplication::s60HandleCommandLAlessandro Portale2009-06-021-29/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | inside QtGui, we do not need to export those QMenu[Bar]::symbianCommands through our public API, anymore. This commit moved the code of QMenuBar::symbianCommands to QMenuBarPrivate::symbianCommands and made that one static. QMenu[Private]::symbianCommands was apparently unused -> deleted. RevBy: Jason Barron RevvBy: Markku Luukkainen
* | Changed menu adaptation to handle case where no softkeystackMarkku Luukkainen2009-05-271-1/+1
| | | | | | | | is instantiated better
* | Added handling for a case when menu is being rebuilt and menuMarkku Luukkainen2009-05-271-13/+15
| | | | | | | | is not inside a QMainWindow.
* | Fixed crash when building menu while softkeystack is emptyMarkku Luukkainen2009-05-261-13/+14
| |
* | First hacky approach to context menus. This was commited so stuffMarkku Luukkainen2009-05-191-7/+23
| | | | | | | | | | relied on context menus can be implemented concurrently while making the internals of context menu implementation cleaner.
* | Initial implementation for context menusMarkku Luukkainen2009-05-181-10/+35
| |
* | Removed setting native softkeys from menu implementation as fromMarkku Luukkainen2009-05-121-13/+0
| | | | | | | | now on the menu softkey will be set by the brand new softkey stack.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-05-121-4/+5
|\ \ | |/ | | | | | | | | | | softkeys Conflicts: src/gui/widgets/qmenu_symbian.cpp
| * Fix for disappearing options menu button when starting some ofMarkku Luukkainen2009-05-111-1/+1
| | | | | | | | the example applications
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicMarkku Luukkainen2009-05-111-0/+2
| |\
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-111-21/+38
| | |\
| | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-111-10/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/widgets/qmenu_symbian.cpp
| | * | | Fixed namespace issues, now works on Symbian under namespaceJanne Koskinen2009-05-111-0/+3
| | | | |
| * | | | Changed implementation to use QMultiHash instead of QHash.Markku Luukkainen2009-05-111-2/+2
| | |_|/ | |/| | | | | | | | | | Fixes a bug when setting a new menubar to QMainWindow
| * | | Refactored implementation so that it works with multiple QMainWindowsMarkku Luukkainen2009-05-111-21/+38
| | |/ | |/|
* | | Refactored implementation so that it works with multiple QMainWindowsMarkku Luukkainen2009-05-111-21/+38
|/ /
* | Removed setting the unnecessary parent for menu structuresMarkku Luukkainen2009-04-281-1/+0
| |
* | Fixed wrong menu showing up on S60 while launching a dialog.Markku Luukkainen2009-04-281-10/+14
|/
* Long live Qt for S60!axis2009-04-241-0/+370