summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* BT: Namespace compile fixes for Cocoa.Norwegian Rock Cat2009-04-151-0/+6
| | | | | It worked in 4.5.0, so it should work in 4.5.1 too. (cherry picked from commit d7e8586e6ab009a6da1eb63aa6798d7c6a34c30d)
* The submenu of a multicolumn menu have an incorrect positionThierry Bastian2009-04-151-2/+2
| | | | | | | | | The submenu would always appear to the side of the menu instead of its right. Task-number: 250673 Reviewed-by: ogoffart (cherry picked from commit 8f223e03effba1aef6be5e50caf7482af1d7dd8a)
* fix potential crashMaurice Kalinowski2009-04-151-1/+1
| | | | | | | | Reviewed-by: Thomas Hartmann need to check for valid menuBar, otherwise dereferencing will horribly fail. (cherry picked from commit f0ceef57b178d4ed71e61a6ce2681f3d401d69fe)
* BT: Fix up comments in new Cocoa files.Jason McDonald2009-04-084-34/+78
| | | | | | | | | | | | | | | | | | It seems that Vim or Xcode or whatever I was using to paste these in messed up and added an extra space. Now we should be consistent with the .cpp files and I found a file that we missed too. (cherry picked from commit be3b8acbd311b9cbeaa7c87b4f34b2e33b4a7fa3) Conflicts: src/gui/kernel/qcocoaapplication_mac.mm src/gui/kernel/qcocoaapplicationdelegate_mac.mm src/gui/kernel/qcocoamenuloader_mac.mm src/gui/kernel/qcocoawindow_mac.mm src/gui/kernel/qcocoawindowdelegate_mac.mm src/gui/widgets/qcocoamenu_mac.mm src/gui/widgets/qmaccocoaviewcontainer_mac.mm src/gui/widgets/qmacnativewidget_mac.mm
* BT: Fix infinite recursion potential from change acff913a6287ad50b0ac782Norwegian Rock Cat2009-04-081-4/+5
| | | | | | | | | It seems there is a potential for recursion because calling keyDown: can bubble up to the window which will start the process all over again. keyDown: will actually call qt_dispatchKeyEvent(), we may as well short it out here. All the previous cases I tried continue to work and we don't crash Creator if you are really impatient hitting keys. (cherry picked from commit c131208e59f5b2dd517b00c4539458760b8fd8aa)
* Revert "Bt: Fix regression in the Embedded dialogs example"Andreas Aardal Hanssen2009-04-081-13/+11
| | | | | | | | | | | | | | | | | | This reverts commit 35c26d696cbff269d551c012a212c09692dd6f6b. The change to QComboBox introduces a behavior change; whereas before the view container would always get its palette set as a response to QEvent::PaletteChange, it would now miss this event and rely on regular palette propagation to get the right contens. The difference in behavior is that QWidget::setPalette() also resolves the palette mask, and after 35c26d69 this would no longer happen. The bug in the embedded dialogs demo is caused by the embedded dialogs demo. See upcoming commit. Reviewed-by: Alexis Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com> (cherry picked from commit 3f3d09cf1511dde99797671a7bc848cdabc8d7fa)
* Replace license headers with 'release' versionsJason McDonald2009-04-08151-780/+780
| | | | | | This change was performed by a script that was written by the previous release manager and reviewed by me. Thus Reviewed-by: Trust Me
* Bt: Fix regression in the Embedded dialogs exampleJens Bache-Wiig2009-04-081-11/+13
| | | | | | | | | | | We had to revert an earlier fix since it obviously did not work correctly. However since we do not really need to propagate the palette on the viewContainer _before_ it is created, we can simply avoid the issue alltogether as it would happen because we implicitly added a child widget during the polish of the combo box. Reviewed-by: nrc (cherry picked from commit 35c26d696cbff269d551c012a212c09692dd6f6b)
* fix tap-and-hold checkbox problem for Windows CEJoerg Bornemann2009-04-083-12/+11
| | | | | | | | | | | | | | | Symptom: checkboxes didn't get checked if you press, hold for some seconds and then release the mouse or stylus. In QAbstractButton we reacted on the contextMenuEvent that gets sent if the system recognizes the context menu gesture (tap and hold) and did call setDown(false). This change has been done because buttons in tool bars stayed in the down state when displaying the context menu with this gesture. I've now moved the handling of this to qtoolbar.cpp. Task-number: 246619 Reviewed-by: thartman (cherry picked from commit de007bd2a20a141aefe901408512c806879a2387)
* BT: Send the keyevent after we send the shortcutoverride in menuNorwegian Rock Cat2009-04-081-0/+1
| | | | | | | | | | | | | | | | | | In our Cocoa menu we check if we need to send the key event to the qwidget before the menu has a chance at it, because logically in Qt, the key event should go to the widget and not the menubar first (a bit different than what happens on the mac). The way to determine this is to send a shortcut override event and see if it accepts it. If it does, that means we should just send it the key event. Previously we were sending the shortcut override, but not following through on the key event because we thought (however foolishly). That returning "YES" but not setting an action would somehow forward the event (it doesn't). There still seems to be some problems if you have a Dvorak-QWERTY+CWD layout, but this probably needs to be dealt with at the key mapper level. Reviewed-by: Prasanth Ullattil (cherry picked from commit acff913a6287ad50b0ac782d817d51072ccb479c)
* Adjust commentsNorwegian Rock Cat2009-04-081-33/+34
| | | | | Someone messed up the whitespace on this comment. (cherry picked from commit a6ab4f638a63755a601b61141fa7730d5ac6e793)
* Doc - Clarified that button style on X11 platforms may depend on theKavindra Devi Palaraja2009-04-071-1/+2
| | | | | | | | desktop environment. Task-number: 250338 Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com> (cherry picked from commit 38b5bff2fab59e965aba59b4f121a7c8945e4d75)
* QGtkStyle: Fix styling and palette issues related to combo boxJens Bache-Wiig2009-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | Well actually this change is a bit bigger than just that. *We no longer override the palette you provide in polish so it should be a bit more frienly toward custom application changes. * Another issue was that we would generate the palette information when we got the style callback from gtkButton but then the line edits might not yet have been polished. Hence we now return from the callback and instead post the update for later. * We had to modify the PE_Frame entry to draw a raised menu when the custom combo box delegate was used. * We now simply ignore custom qtconfig palette entries when using GtkStyle since they only cause trouble with it. Task-number: 250142 Reviewed-by: nrc
* Improved stylesheet support for setting background and foreground rolesJens Bache-Wiig2009-04-021-1/+1
| | | | | | | | | | This makes sure that style sheets set both ButtonText and WindowText roles for all widgets. This fixes among other things the fact that you could not configure text colors for combo box popups on Mac, Gtk and CleanLooks or set the background for the whole scrollbar. Task-number: 160713 Reviewed-by: ogoffart
* Squashed commit of the following:David Boddie2009-03-261-1/+6
| | | | | | | | | | | | | | | | | | commit 20864878d046b2ce6bf5fc54868be8df346ce0c8 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:30:32 2009 +0100 Doc: Fixed qdoc warning by adding more descriptive text. Reviewed-by: TrustMe commit 3b620a0a4d1b02105c9761384a5abc4ecf11e9d2 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:29:56 2009 +0100 Doc: Added macros for future use. Reviewed-by: TrustMe
* Fix layout problem in QMainWindowThierry Bastian2009-03-251-4/+8
| | | | | | | | | QDockWidget's minimum title width was not computed correctly and was thus provoking some strange layout issues. We need to ask for the widget's sizeHint for the close and float buttons. Task-number: 241577 Reviewed-by: ogoffart
* Fixed the gap that was not appearing on a QMainWindowThierry Bastian2009-03-251-1/+1
| | | | | | | | The default size of a docka area invalid and thus the gap had an invalid size. Task-number: 248069 Reviewed-by: ogoffart
* Fix a possible crash in QMainWindow when dragging a dock widget.Thierry Bastian2009-03-251-1/+2
| | | | | | | | | Even when not animated, we need to set the plugging widget when plugging. This avoids a hover to be triggered in the middle of the operation. Task-number: 248069 Reviewed-by: ogoffart
* Fix scrollbar appearing on QComboBoxOlivier Goffart2009-03-251-6/+18
| | | | | | | aefadefae655972287b196e6c0f0563c4fb4666c was not good enough Task-number: 248094 Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
* Squashed commit of the following:David Boddie2009-03-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 57ce15b2984cb7ccc4ab0b5dc03812d525d52620 Author: David Boddie <dboddie@trolltech.com> Date: Tue Mar 24 16:55:41 2009 +0100 Removed internal, hidden documentation. Also fixed the language used, slightly. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> commit 0a81cc2a6dfc98087de92e53d493bed56826642f Merge: 4bd3eca... dd7b1f1... Author: David Boddie <dboddie@trolltech.com> Date: Tue Mar 24 15:24:32 2009 +0100 Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 commit 4bd3eca8855bb2564e146be4d0a3bba836d20122 Merge: dc789e3... 1d1c52c... Author: David Boddie <dboddie@trolltech.com> Date: Mon Mar 23 19:20:05 2009 +0100 Merge branch 'qt/4.5' of ../qt-45-documentation into 4.5 commit 1d1c52c60995058b61ee35e3970fecc1de3b85b6 Merge: 6c5de23... 381b6cc... Author: David Boddie <dboddie@trolltech.com> Date: Mon Mar 23 19:17:37 2009 +0100 Merge branch 'qt/4.5' of git://scm.dev.nokia.troll.no/qt/qt-45 into qt/4.5 commit 6c5de23611baef3c6be59b94ebd29d901056c2fc Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 18:26:11 2009 +0100 Fixes: Doc: Fixed typo. Reviewed-by: David Boddie <dboddie@trolltech.com> commit 5d710cc183699513b1582507dcb4cddefb91c8ad Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 18:24:31 2009 +0100 Fixes: Doc: Made it clearer what qDebug() actually does. Reviewed-by: David Boddie <dboddie@trolltech.com> commit 1fae0b3b34bf066e2356671a5c6187485b2b587d Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 17:53:09 2009 +0100 Fixes: Doc: Added a note about not modifying the text document in a paint event handler. Task-number: 246550 Reviewed-by: David Boddie <dboddie@trolltech.com> commit 29662d44de9b42d811e60a1b57d871335888373a Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 17:04:07 2009 +0100 Fixes: Doc: Fixed styling of code in this tutorial. Task-number: 247053 Reviewed-by: David Boddie <dboddie@trolltech.com> commit 630c11d6f9f20d5f99bc964efaf4b39daaeb32c4 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 15:19:24 2009 +0100 Fixes: Doc: Note the use of just the name of a method rather than a complete signature. Task-number: 247857 Reviewed-by: David Boddie <dboddie@trolltech.com>
* Compile in Snow LeopardTrenton Schulz2009-03-241-0/+4
| | | | | | GCC 4.2 needs to have this extern (and likely every compiler != gcc 4. Reviewed-by: Trust Me
* Long live Qt 4.5!Lars Knoll2009-03-23154-0/+97712