summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Warwick Allison2009-05-154-14/+6
|\ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsscene.cpp
| * Merge branch '4.5'Thiago Macieira2009-05-141-1/+1
| |\ | | | | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| | * Fix broken wince build.Jason McDonald2009-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | The WinCE build was failing due to a spelling error in an #ifdef directive. Reviewed-by: Trust Me
| | * fix WinCE buildMaurice Kalinowski2009-05-131-0/+2
| | | | | | | | | | | | Reviewed-by: thartman
| * | Fix missing update of edit geometry on QSpinBoxJens Bache-Wiig2009-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When showing or hiding spinbox buttons we did not update the child line edit geometry. This would on windows basically mean that the buttons would not show up as they were completely covered by the edit. Task-number: 235747 Reviewed-by: ogoffart
| * | Ensure style option for drawing blank area in scrollarea is initialized.Norwegian Rock Cat2009-05-141-3/+4
| | | | | | | | | | | | | | | | | | | | | Then you can actually influence it's palette. Task-number: 253495 Reviewed-by: Jens Bache-Wiig
| * | Remove snapback/maximum drag distance from QSliderJens Bache-Wiig2009-05-141-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature was only intended for QScrollBar and was incorrectly inherited by QSlider. The only supported platform that use this feature seems to be Windows so instead of doing a nasty qobject cast in the styling it makes more sense to remove the functionality from QSlider entirely. Task-number: 245681 Reviewed-by: ogoffart
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Alexis Menard2009-05-1210-112/+99
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | Draw the shadow before the page background to avoid antialiasing overlapsTrond Kjernaasen2009-05-121-22/+22
| | | | | | | | | | | | when the paper is drawn.
| * | Add a AA_MacDontSwapCtrlAndMeta application attribute.Norwegian Rock Cat2009-05-111-60/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help undo the some magic that is in the Qt/Mac port. Qt automatically flips the Meta and Control keys on Mac. This is a "feature" that makes porting older programs that don't use standard shortcuts easier as Ctrl and Command usually map to the same shortcuts in the application. The upshot of this is that I need to strip the text() out of key events if they contain the Control or Meta modifier. This causes much headache for anyone writing a terminal emulator. Though they would still have to write special code because the keys are swapped anyway. This allows people to write the terminal emulator where hitting the Control key will really send a Control key modifier. We've also done the extra work to ensure that standard shortcuts work correctly regardless of what the value of the attribute is. That is, if you specify QKeySequence::Cut for a shortcut you can always hit Command+X and things will work.
| * | Almost 200 symbols that didn't need to be exported.Thierry Bastian2009-05-113-3/+3
| | |
| * | fix build on windowsMaurice Kalinowski2009-05-111-1/+1
| | | | | | | | | | | | | | | | | | - partly revert f0243e70e05a3368582fd0478d840096d6b60c3f as it broke the build due to widgets accessible plugins using QDockWidgetLayout Reviewed-by: Rhys Weatherley
| * | QToolBarLayout and QDockWidgetLayout, which are private classes, areThierry Bastian2009-05-084-26/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no more exported designer was using QToolBarLayout members. We fixed that by using styles. Reviewed-by: Friedemann Kleint Reviewed-by: ogoffart
| * | Stop a crash in QMenuBar on Designer after my changes.Norwegian Rock Cat2009-05-081-0/+2
| | | | | | | | | | | | | | | | | | In the past, we checked on the existence of the pointer, but now that this is controlled by the property, we need to also check the pointer in the action event.
| * | Improved scrolling performance with invisible blocksmae2009-05-081-2/+12
| | | | | | | | | | | | Reviewed-by: Thorbjørn
| * | fix WinCE buildMaurice Kalinowski2009-05-081-0/+2
| | | | | | | | | | | | Reviewed-by: thartman
* | | qdoc: Fixed some qdoc errors.Martin Smith2009-05-121-6/+7
|/ /
* | Merge branch '4.5'Thiago Macieira2009-05-071-1/+15
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| * handle the back soft key on Windows mobile SmartPhonesJoerg Bornemann2009-05-071-1/+15
| | | | | | | | | | | | | | | | | | We must tell the system that we want to intercept the back key on Windows mobile. Each toplevel widget that needs correct back key behaviour needs to have a menu bar. Why? Ask Microsoft... Task-number: 248846 Reviewed-by: thartman
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-063-5/+3
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * Fixed bug in QTabBar::setTabButton() for a scrolled tab bar.jasplin2009-05-061-1/+2
| | | | | | | | | | | | | | | | This fix ensures that the current tab is visible after calling setTabButton() on a scrolled tab bar. Reviewed-by: bnilsen Task-number: 252472
| * Fixing task 252319Thomas Hartmann2009-05-061-3/+0
| | | | | | | | | | | | | | This is still not a perfect solution since it breaks 245347 again Task-number: 252319 Reviewed-by: Maurice
| * Fixed scrolling performance issue related to hidden blocksmae2009-05-061-1/+1
| | | | | | | | | | | | | | Due to a wrong lookup (confusing line and block number) the scroll optimization was broken, causing the entire view to be updated. Reviewed-by: Thorbjørn Lindeijer
* | Show text in tabs of a QTabBar while compileing with QT_NO_TABWIDGETOlivier Goffart2009-05-051-2/+1
| | | | | | | | | | | | Spotted by looking at the code Reviewed-by: bnilsen
* | Fix behavior of QButtonGroup::addButton(QAbstractButton, int).Daniel Molkentin2009-05-052-8/+25
| | | | | | | | | | | | | | | | | | The method did not adhere to the documented behavior nor according to its precedessor in Qt 3 times. Now, when being passed -1 as argument, it will automatically assign ids. They will all be negative, starting from -2. Reviewed-by: mae <qt-info@nokia.com>
* | Deprecate qt_mac_set_show_menubar for a public cross-platform API.Norwegian Rock Cat2009-05-044-45/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm tired of these "hidden" functions. We have an AA_MacPluginApplication, but sometimes you may have a legitimate reason for setting this outside of "plugin applications." In the footsteps of the menu icon attribute, the attribute is the main leader, but menubars can disable/enable this locally the new QMenuBar::setNativeMenuBar() property. Otherwise, the menubars take their que from the application attribute. This also works for Windows CE. So, there is a bit on convergence as well. Task-number: 236757
* | introduce Q_WS_WINCEMaurice Kalinowski2009-04-2911-32/+32
| | | | | | | | | | | | | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
* | Fixed tabbar position reset on palette changeJens Bache-Wiig2009-04-281-1/+3
| | | | | | | | | | | | | | | | | | We do not need to relayout on all changeEvents. The only events that should change the layout of tabs are StyleChange and FontChange. LayoutDirectionChange is separately by layouts. Task-number: 188389 Reviewed-by: ogoffart
* | Repair damage done by 8af3500125a03a54dddb8c46ee709b7b8d257f27Rhys Weatherley2009-04-281-1/+2
| | | | | | | | Reviewed-by: Sarah Smith
* | Fixes QLabel:hover{color:...} for simple textOlivier Goffart2009-04-272-14/+11
| | | | | | | | | | | | | | | | (This was only working if the QLabel had a QTextControl) Also rename the QStyleSheetStyle::focusPalette to ...::styleSheetPalette Reviewed-by: Jens Bache-Wiig
* | Work on getting unified toolbars to look more native.Norwegian Rock Cat2009-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | Basically we try to get the toggled look correct and we've shrunk the size of the toolbar by a good 10 pixels. We still look a bit "off" for toggled on Tiger, but frankely that look is a bit odd. We are a bit taller than the pure Cocoa toolbar (2 px), but given that we are embedding our QToolbar, that's probably the best we can do. All-in-all, it looks much better.
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-3/+3
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| * Possible assert when hiding tabbed QDockWidgetThierry Bastian2009-04-171-3/+3
| | | | | | | | | | | | | | | | | | The problem is in QTabBar which emits the currentChanged signal before accessing its own internal data. As we react to that signal by possibly removing/adding tabs, it can cause a assertion failure. Task-number: 251184 Reviewed-by: ogoffart
| * Fixed painting issues with draggable tabsJens Bache-Wiig2009-04-152-72/+51
| | | | | | | | | | | | | | | | | | | | | | This fixes a few of the remaining glitches tabbar animations have: * We no longer grab tabs but paint them through QStyle. This makes tabs work and animate correctly when they are outside the visible region. * Buttons now correctly follow tabs when dropped * Gtkstyle recieved some polish to make it look more native. Task-number: 247694, 251166 Reviewed-by: nrc
| * 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.
| * 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
* | Fixed painting issues with draggable tabsJens Bache-Wiig2009-04-152-72/+51
| | | | | | | | | | | | | | | | | | | | | | This fixes a few of the remaining glitches tabbar animations have: * We no longer grab tabs but paint them through QStyle. This makes tabs work and animate correctly when they are outside the visible region. * Buttons now correctly follow tabs when dropped * Gtkstyle recieved some polish to make it look more native. Task-number: 247694, 251166 Reviewed-by: nrc
* | 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.
* | 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
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-158-51/+97
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * fix potential crashMaurice Kalinowski2009-04-141-1/+1
| | | | | | | | | | | | | | Reviewed-by: Thomas Hartmann need to check for valid menuBar, otherwise dereferencing will horribly fail.
| * BT: Fix up comments in new Cocoa files.Norwegian Rock Cat2009-04-084-64/+108
| | | | | | | | | | | | 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.
| * 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.
| * 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>
| * Bt: Fix regression in the Embedded dialogs exampleJens Bache-Wiig2009-04-071-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
| * fix tap-and-hold checkbox problem for Windows CEJoerg Bornemann2009-04-073-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
| * BT: Send the keyevent after we send the shortcutoverride in menuNorwegian Rock Cat2009-04-071-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
| * Adjust commentsNorwegian Rock Cat2009-04-071-33/+34
| | | | | | | | Someone messed up the whitespace on this comment.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtmae2009-04-092-14/+24
|\ \
| * | Refactor the palette and opacity change into a separate function.Norwegian Rock Cat2009-04-082-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | We can save on some creation and only show the container when we really need to. It does mean that we need to ensure that everything is correct on construction as well. It's now factored into another file. Reviewed-by: Jens Bache-Wiig