summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Change to release licenses for 4.6.3.Jason McDonald2010-05-30156-2028/+2028
| | | | Reviewed-by: Trust Me
* Fixed an assert in QMenuThierry Bastian2010-05-211-11/+1
| | | | | | | | The code was changed and changed the behaviour. This is basically a kind of revert. Reviewed-By: gabi Task-Number: QTBUG-10735
* Fix for torn off menus that were way too bigThierry Bastian2010-05-101-4/+5
|
* Windows CE: fix multiple QAction::triggered() signalsJoerg Bornemann2010-05-074-16/+21
| | | | | | | | | Adding the same menu action object to n menu bars resulted in n QAction::triggered() signals. Now, we're comparing the active window with the parent HWND of the menu bar before triggering. Task-number: QTBUG-10402 Reviewed-by: thartman
* document that QMenuBar::setDefaultAction is only available on Win MobileJoerg Bornemann2010-05-051-1/+1
| | | | Task-number: QTBUG-8393
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-051-52/+82
|\ | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: WinCE: QMenuBar::triggered(QAction*) was emitted too often coding style changes in qmenu_wince.cpp
| * WinCE: QMenuBar::triggered(QAction*) was emitted too oftenJoerg Bornemann2010-05-051-4/+3
| | | | | | | | | | | | | | | | | | | | | | Calling QMenuPrivate::activateAction instead of QAction::activate makes use of the internal recursion guard and fixes this problem. Also emitting QMenuBar::triggered in the command-in-menu-bar case will QAction::activate do for us. Task-number: QTBUG-10358 Reviewed-by: thartman
| * coding style changes in qmenu_wince.cppJoerg Bornemann2010-05-051-48/+79
| |
* | Fix combobox backgroundrole not respected in some stylesJens Bache-Wiig2010-05-041-1/+4
|/ | | | | | | | | The issue was a regression in 4.5 since we introduced styling. We now set the background role as the menuoption palette when available. Reviewed-by: ogoffart Task-number: QTBUG-10403
* QS60Style: QComboBoxPrivateScroller draws holes into menu canvasSami Merila2010-05-031-0/+2
| | | | | | | | | | | | | | QComboBoxPrivateScroller calls eraserects for menu scroller areas, expecting the style to fill the gaps. Unfortunately, the QS60Style does not draw menu scrollers at all (but they are functional when interacted with). Therefore, these areas are now drawn as holes. As a fix, the eraseRect call from provate class QComboBoxPrivateScroller is removed when "s60 flag" is defined. Task-number: QTBUG-10371 Reviewed-by: Janne Koskinen
* QS60Style: QTabWidget Usability issue with capacitive screensSami Merila2010-05-031-0/+39
| | | | | | | | | | | | | | | | | | Normally Qt uses scrollbuttons together at right (for LeftToRight UI) side of the horizontal QTabBar; for vertical tab bar, scrollbuttons are displayed below/above the widget. Using QTabBar's scroll buttons with touch device that has capacitive screen, is somewhat hard as the touch area for either of the scroll buttons is somewhat smallish. So user is experiencing frequent wrong taps. Making the touch area larger, would make the tabbar tab shape area smaller, so it isn't a very good solution. Therefore, when QS60Style is in use, QTabWidget draws the scrollbuttons on either side of the QTabBar. Task-number: QT-3104 Reviewed-by: Alessandro Portale
* Fix long menu item texts causing crashMiikka Heikkinen2010-04-291-2/+6
| | | | | | | | | Symbian uses buffer of CEikMenuPaneItem::SData::ENominalTextLength characters for menu item texts, so truncate any text that is longer than that. Task-number: QTBUG-10207 Reviewed-by: Janne Anttila
* Fix regression: auto completion text cursor problem in Q3FileDialogOlivier Goffart2010-04-221-2/+8
| | | | | | | | | | | | | | This was another regression in QLineEdit introduced with the move to QLineControl setCursorPosition clear the selection, and setSelection move the cursor position. So the case where we want the position at the beginning of the selection need to be handled separately (by doing the selection reverse) This does not cover the case where the position is in the middle, or outside the selection, but it is not possible to do. Task-number: QTBUG-10019 Reviewed-by: jbache
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-191-1/+3
|\ | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMenu: Behavior regression Mac: Graphics View starving user events and sometimes crashes. Fixed a crash on Windows 7 systems with invalid PrinterPorts entries.
| * QMenu: Behavior regressionGabriel de Dietrich2010-04-161-1/+3
| | | | | | | | | | | | | | | | When opening a submenu, and then moving the mouse over the parent menu margins, the submenu would close, whereas it didn't in 4.5. Reviewed-by: Olivier Task-number: QTBUG-9785
* | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-151-1/+1
|/ | | | | | | | | | | | | RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: QtWebkit and QtScript are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron
* ComboBox popuplist is not correctly layouted in fullscreen modeSami Merila2010-04-151-7/+21
| | | | | | | | | | This is partial fix to issue 9913. Now combobox popup is correctly positioned with AVKON StaCon (Combined Status and Control Pane). Popup is centered onscreen in this case. Task-number: QTBUG-9913 Reviewed-by: Janne Anttila
* QAbstractScrollArea StyleSheet: fix drawing of border with ↵Olivier Goffart2010-04-141-1/+1
| | | | | | | | | | | | | | SH_ScrollView_FrameOnlyAroundContents - Since Qt 4.6.0, the frame is drawn by PE_Widget, but there we do not take in account the scrollbar for the case where SH_ScrollView_FrameOnlyAroundContents is true. - We also reserved too much space for the border, as we included the native border as well in the computation, so do not reserve additional space by setting PM_ScrollView_ScrollBarSpacing to 0 Task-number: QTBUG-9821 Reviewed-by: jbache
* QTBUG-4887 and other exception safety fixesmread2010-04-071-6/+8
| | | | | | | | | | | | | | | | | | | | This change includes a fix for QTBUG-4887 and other exception safety problems found while testing it. The QTBUG-4887 fix is to qimage.cpp. QImage doesn't throw exceptions on failure like a proper class should, instead it tries to fail "nice". What happens here is that setAlphaChannel would crash on OOM as after the convertToFormat call, d could be NULL. This new version checks the result of the conversion before using it. The other fixes are all cases where exceptions were thrown from destructors. I added code to the test app to help debug these cases, and I fixed all the problems I found. With these changes, tst_exceptionsafety_objects runs and passes on the Symbian emulator. Reviewed-by: Shane Kearns
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-242-3/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Compile fix Changed Symbian pkg files to deploy from under epoc32 Remove internal custom pixel metric enums Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01 Fixed S60 softkey implementation to use popup/modal dialog softkeys. Fixed 'fullsreen with softkeys' mode not to expand under softkey area. Fixed left softkey regression caused by 7829fe15 in Symbian. QS60Style: Housekeeping Custom pixel metric values cannot be inquired from outside the class Adding custom pixel metrics requires cleaning and rebuilding of QtGui
| * Fixed S60 softkey implementation to use popup/modal dialog softkeys.Janne Anttila2010-03-232-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously softkey implementation assumed that source for softkey actions is focused widget or activewindow if there is no focused widget. Since for example pop-up menu does not take focus immediately in touch enabled devices, the underlying widget softkeys were visible and usable when menu was open. This lead to problem that underlying widget could be interacted via softkeys when popup menu was open. For example as reported in QTBUG-8688, it was possible to close the underlying filedialog from which the currently active context menu was launched. It was also possible to open "Options" menu of underlying widget when context menu was open, leading to situation where several context menus could be launched via "Actions" item of "Options" menu. This was reported as an issue: QTBUG-6167 In addition when user started navigating in context menu via keypad, the menu got focus and softkeys changed to partially correct. Only partially correct, since context menu "Select" action and "Options" action had same priority and both associated to LSK. In addition the context menu action "Cancel" associated to RSK was set to invisible, meaning that it was also disabled and appeared in sofkeys as dimmed. All of these issues were fixed by making making the popup and modal dialogs highest priority softkey source. In case the focused widget is inside popup or modal dialog it is being used as an initial softkey source. In addition the softkeys created with QSoftKeyManager::createAction or QSoftKeyManager::createKeyedAction are now by default invisible i.e. not visible in context menu and have special property set to make them still normally enabled in softkeys. Task-number: QTBUG-6167 Task-number: QTBUG-8688 Task-number: QTBUG-9144 Reviewed-by: Sami Merila
* | Doc update for QSpinBox::textFromValueAnders Bakken2010-03-241-7/+8
|/ | | | | | We remove the group separator so the docs should reflect this. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Always redraw the complete control when an input event comes in.Robert Griebl2010-03-182-4/+4
| | | | | | | | | The problem here is that a pre-edit string won't be detected by updateDisplayText(), so the control thinks nothing has changed when a new pre-edit string is set. Reviewed-By: Simon Hausmann (cherry picked from commit 16f30906f6eea3e00351478555f153697a6e186d)
* Change QS60Style to use combobox popup menuSami Merila2010-03-172-0/+52
| | | | | | | | | | | | | | | | | | | | Instead of using traditional dropdown menus, use popup menu, like native side does. Related to https://qtrequirements.europe.nokia.com/browse/QT-2274 Popup is positioned according to S60 popup position rules: - in portrait at the bottom, with square popup (dimension is screen width minus border) - in landscape, centered on Y-axis, on X-axis to the right border (with LeftToRight UI direction) Background behind popup is dimmed. Popup has automatic scrollbar if content does not fit into the popup. Popup background graphic is S60 dialog graphic. Task-number: QT-2274 Reviewed-by: Alessandro Portale
* Moved softkey "Options" action handling from QMainWindow to QMenuBar.Janne Anttila2010-03-124-34/+55
| | | | | | | | | | | | | | This change is done to enable QMenuBar usage and related "Options" softkey also on other than QMainWindow objects. For example with this change it is possible to create menubar and set it to QLayout by using setMenuBar, and it will then be usable via "Options" softkey. This functionality makes it easy to use different menus for different views in QStackedWidget. Task-number: QT-2275 (Not yet finished, but related) Reviewed-by: Sami Merila Reviewed-by: Alessandro Portale
* fix menu handling on Windows CEJoerg Bornemann2010-03-102-7/+19
| | | | | | | | | | Don't recreate the menu handles on every rebuild. Now, we clear the menu before rebuilding. Also, we have to clear the menu before destroying the menu bar handle. Otherwise, DestroyWindow kills our menu handles. Task-number: QTBUG-8754 Reviewed-by: thartman
* Cursor would remain in a non-focused QLineEdit after clearing its selectionGabriel de Dietrich2010-03-091-1/+1
| | | | | | | | QLineEditPrivate::_q_selectionChanged() did not take into account whether the widget had focus. Reviewed-by: Olivier Task-number: QTBUG-8634
* remove unneeded function pointer in qmenu_wince.cppJoerg Bornemann2010-03-081-1/+0
| | | | Reviewed-by: mauricek
* Fix undocked widgets not being restored correctly as part of the layoutThierry Bastian2010-03-081-7/+10
| | | | | Task-number: QTBUG-7921 Reviewed-by: ogoffart
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-051-0/+8
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed crash in Symbian when having empty QMenu in menubar.
| * Fixed crash in Symbian when having empty QMenu in menubar.Janne Anttila2010-03-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typically cascade menus in Symbian/S60 are created from resources. When cascade menus are defined in resources the RestoreMenuL is responsible for instantiating the cascade menu item array and items. In Qt for Symbian the menus need to be created dynamically from QActions, that's why RestoreMenuL is reimplemeted in Qt for Symbian to dynamically init the menu pane content. Adding a first dynamic item to cascase menu pane creates the CEikMenuPane internal item array. In case where empty QMenu was added to QMenubar, the item array for cascade menupane was never constructed. Then later on CEikMenuPane code assumes that item array exist. To avoid access violation crash we now create the item array manually when building submenu. Task-number: QTBUG-4897 Reviewed-by: Jason Barron
* | showFullscreen() broken if UnifiedTitleAndToolBarOnMac is enabledCarlos Manuel Duclos Vergara2010-03-041-0/+2
|/ | | | | | | | | | | The problem here is caused by the fix to QTBUG-6200. For this fix we removed the lines that deleted the item because the iterator might be invalid at that point. However, we still need to delete the iterator. The solution is to not use the iterator and ask the hash to delete the item, since the remove function will not crash if the item is invalid. Task-number: QTBUG-8633 Reviewed-by: Prasanth
* Re-applied a fix which get lost during softkey refactoring.Janne Anttila2010-03-021-0/+1
| | | | | | | | See original commit (b461da1040c32d6690870290d6716a3b5cb7e9e9) for more information. Task-number: QTBUG-6220 Reviewed-By: TrustMe
* Improvements to itemview keypad navigation in S60.Janne Anttila2010-02-251-46/+7
| | | | | | | | | | | | | | The logic used in this commit is partially taken from sliders. This commit makes it possible to interact (change row or column) in itemview even itemview does not have editFocus. Interacting without editFocus is enabled when it is not possible to keypad navigate to reuqested direction. In addition if keypad navigation to any direction is not possible (i.e there is only one listwidget on screen), there is no sense to add "done" softkey to get out of edit focus. Task-number: QTBUG-4802 Reviewed-by: Alessandro Portale
* QLineEdit shows leftovers of edit cursor after clear()Prasanth Ullattil2010-02-231-1/+1
| | | | | | | | | The commit 0568fb9f428a84a344baaa5c53395db4b99f082c introduced this regression. Make sure that we have text in the lineedit before showing the cursor. Task-number: QTBUG-7826 Reviewed-by: Olivier Goffart
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-182-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Always use display() in QEglContext, so initialization can occur Fixed a regression in dockwidgets that would jump when toplevel resized Stabilize QGraphicsView benchmarks. Remove platform dependent code from QGraphicsView benchmark. Compiler warnings in QGraphicsView benchmark. Stabilize QGraphicsScene benchmarks. Compiler warning, unusable variable in tst_QGraphicsScene benchmark. Documented behavior of blur effect radius and drop shadow offset. Fixed autotest failure in tst_QPainter::drawEllipse on Maemo.
| * Fixed a regression in dockwidgets that would jump when toplevel resizedThierry Bastian2010-02-182-1/+2
| | | | | | | | | | | | | | | | This was reproducible when the main window doesn't contain a central widget. Task-number: QTBUG-8107 Reviewed-by: ogoffart
* | Fixed softkey localizaton to comile also on platforms without softkeys.Janne Anttila2010-02-181-0/+2
| | | | | | | | | | Task-number: QTBUG-6785 Reviewed-by: TrustMe
* | Support for dynamic localization in Symbian softkeys.Janne Anttila2010-02-173-3/+26
|/ | | | | | | | | | | This commit adds support for dynamic i.e. runtime localization of S60 softkeys. Note that translations are not provided yet with qt.sis (QTBUG-4919), meaning that localization does not actually happen unless application developer provides its own translation (including translation for softkeys). Task-number: QTBUG-6785 Reviewed-by: Jason Barron
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-105-1/+13
|\ | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the WebKit build Blinking cursors are 2 pixels wide on Mac OS X/Cocoa. Fixed compilation with QT_NO_WHEELEVENT Take into account the solaris-cc-64-stlport mkspec Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ffae5e11181a3961193fa21ea405851cad714d4b )
| * Fixed compilation with QT_NO_WHEELEVENTDenis Dzyubenko2010-02-105-1/+13
| | | | | | | | Reviewed-by: Prasanth
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-081-0/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make generate uid3 (symbian) work on 64 bit host platform. Updated the docs for QPainter::begin/endNativePainting() Compile fix for network benchmarks. Add a pixmap modification hook to blur pixmap filter cache Delete benchmark examples (qtestlib-simple and qtwidgets). Restructure tests/benchmarks directory. Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. QLineEdit: regression: read-only line edits would eat shortcuts. QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant.
| * QLineEdit: regression: read-only line edits would eat shortcuts.Olivier Goffart2010-02-081-0/+2
| | | | | | | | | | | | | | Restore Qt 4.5 behaviour. Task-number: QTBUG-7395 Reviewed-by: Thierry
* | Fixes qabstractslider autotestDenis Dzyubenko2010-02-081-2/+0
| | | | | | | | | | | | | | | | | | Fixed a bad merge in the QAbstractSlider::wheelEvent. Modified an autotest to follow a change in behavior - scrolling with a horizontal mouse wheel to the "right" means increasing the value. Reviewed-by: Richard Moe Gustavsen
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-064-27/+59
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| * Fixes scrolling horizontally with a mouse wheel over sliders.Denis Dzyubenko2010-02-053-27/+57
| | | | | | | | | | | | | | | | | | When scrolling horizontally over sliders the slider should go to the right, which means the value of the slider should increase. However in Qt scrolling with a mouse wheel horizontally means the delta value is negative, which is wrong. So changed the delta to be inversed. Reviewed-by: Richard Moe Gustavsen
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-02-055-12/+36
| |\
| * | Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.David Boddie2010-02-051-0/+2
| | | | | | | | | | | | | | | Reviewed-by: Trust Me Suggested-by: Robert Griebl
* | | Merge remote branch 'origin/4.6' into 4.6Paul Olav Tvete2010-02-051-2/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: dist/changes-4.6.2
| * | Doc: Removed promisse to fix a problemMorten Engvoldsen2010-02-041-2/+1
| | | | | | | | | | | | | | | | | | | | | The problem is out of scope and will not be fixed. Task-number:QTBUG-4377 Reviewed-by:Trust Me