summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Fix more compile breakages after merging qt/master-stable.Jason Barron2009-08-044-22/+20
| | | | | | A lot of the logic was factored out of QLineEdit(Private) and into a private class called QLineControl, however the changes did not compile when keypad navigation is enabled so fix them.
* Merge commit 'qt/master-stable'Jason Barron2009-08-0411-1857/+2975
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * Fixed "Hightlighted menu items not always selected" bug.Gabriel de Dietrich2009-08-031-1/+1
| | | | | | | | | | | | | | | | Menu paintEvent was not called when the mouse cursor lied between the menu item area and the menu frame border. Task-number: 258920 Reviewed-by: olivier
| * Doc - Fixed a broken link to the Apple Human Interface Guidelines documentKavindra Devi Palaraja2009-07-301-1/+1
| | | | | | | | | | | | Task: 254724 Reviewed-By: TrustMe
| * Use correct license header.Volker Hilsheimer2009-07-291-2/+2
| |
| * Move QLineEdit logic into QLineControlAlan Alpert2009-07-299-1824/+2974
| | | | | | | | | | | | | | | | | | | | | | | | Manually merged from the kinetic repository, where it has been used for a while. Like QTextControl, there is no auto test for the control, just for the widgets built with it. The purpose of this change is so that we can build stuff like QLineEdit in other places (like kinetic). Also included is a trivial change to QValidator, needed to use it with QLineControl in QML. Reviewed-by: mbm
* | Merge commit 'qt/master-stable'Jason Barron2009-07-301-4/+3
|\ \ | |/ | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| * Fix menubar item size incorrect with iconJens Bache-Wiig2009-07-281-4/+3
| | | | | | | | | | | | | | | | | | When you have an icon set we do not show the text label, but the previous code would still use the text for the size hint calculation. Task-number: 218836 Reviewed-by: ogoffart
* | Merge commit 'qt/master-stable'Jason Barron2009-07-291-3/+7
|\ \ | |/
| * Mac/Cocoa: Remove separator line for "unified document tabs"Morten Sørvig2009-07-271-3/+7
| | | | | | | | | | | | | | | | Call [NSToolbar setShowsBaselineSeparator] on the (unified) toolbar if the window contains tabs in document mode. Task-number: 252660 Reviewed-by: Richard Moe Gustavsen
* | Merge commit 'qt/master-stable'Jason Barron2009-07-288-63/+56
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| * Fix missing mnemonics when triggering menus by shortcutJens Bache-Wiig2009-07-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | When opening a menu by shortcut on Windows, we would loose the keyboard mnemonic when navigating around. This is incorrect compared to native applications and somewhat inconvenient. The fix is basically to enable the keyboard mode when shortcuts are triggered, not only when the alt-key is pressed. Task-number: 254496 Reviewed-by: denis
| * Specify widget when calling QToolTip::showText() to make sure the tool tip ↵Thomas Sondergaard2009-07-241-3/+3
| | | | | | | | | | | | | | ends up on the right X11 screen. Merge-request: 987 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * qdoc: Fixed all references to obsolete QHttp classes.Martin Smith2009-07-241-4/+5
| |
| * Get collapsible menus working correctly.Norwegian Rock Cat2009-07-244-54/+44
| | | | | | | | | | | | | | | | | | | | There was an attempt to do this earlier, but it was a bit more complex than it needed to be. We now do the update on show in Cocoa. Carbon actually does it all for us, we just need to flip the bit. We may do the updates to often, but it's better than not enough. Task-Id: 195445 Reviewed-by: Denis
| * Reverted commits that changed the behavior of the keypresses with modifiers.Denis Dzyubenko2009-07-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Apparently it changes the behavior of Qt too much and also breaks the text input in some keyboard layouts (for example in German layout you need to be able to use Ctrl and Alt or AltGr modifiers to type text). Revert "Don't insert text into a text widget when a modifier is pressed." This reverts commit 099a32d121cbc80a1a234c3146f4be9b5237e7e8. Revert "Fixed the qlineedit autotest." This reverts commit 9210e8cdc83b6812d10f5f5847d05703ef2e5f7c.
* | Merge commit 'qt/master-stable'Jason Barron2009-07-2741-616/+685
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * "Emacs" style keyboard shortcuts don't work on Carbon.Prasanth Ullattil2009-07-231-2/+2
| | | | | | | | | | | | | | | | | | Set the native key equivalent for menu items only for single key shortcuts. Qt's shortcut mechanism will take care of sending the multiple key shortcut events. Task-number: 258438 Reviewed-by: Norwegian Rock Cat
| * "Emacs" style keyboard shortcuts don't work on Cocoa.Prasanth Ullattil2009-07-231-2/+4
| | | | | | | | | | | | | | | | | | Mac supports only single key shortcuts as key equivalent for menu items. So if a multiple key QKeySequence is set, use Qt's shortcut mechanism instead of the native menu shortcut mechanism. Task-number: 258438 Reviewed-by: Norwegian Rock Cat
| * Ensure all the standard shorcuts are used for the Close Action in MDIAndy Shaw2009-07-231-1/+1
| | | | | | | | | | | | | | | | Since there is more than one standard shorcut for closing a MDI window, then ensure that all of them can be used. Task-number: 161999 Reviewed-by: Simon Hausmann
| * Show text even if maximum == 0Olivier Goffart2009-07-221-1/+1
| |
| * Support for very large range in QProgressBarOlivier Goffart2009-07-221-2/+2
| | | | | | | | | | | | Regression since my last commit. Task-number: 152227
| * Simplify the computation of the QProgressBar progress.Olivier Goffart2009-07-221-2/+2
| | | | | | | | | | | | | | This is also a work around for a bug in gcc on powerpc (embedded-linux) Task-number: 258358 Reviewed-by: jbache
| * Doc: small improvementsVolker Hilsheimer2009-07-201-1/+1
| |
| * doc: Changed several \reimp to \internalMartin Smith2009-07-201-4/+0
| | | | | | | | The base function was \internal pr private.
| * Doc: Document QAction::Priority and Qt::ToolButtonFollowStyle.Volker Hilsheimer2009-07-181-3/+2
| |
| * Add priority property to QActionJens Bache-Wiig2009-07-171-2/+8
| | | | | | | | | | | | | | | | | | | | | | We need this to support the behavior in Gtk+ where, when Qt::ToolButtonTextBesideIcon is used, only text labels for important actions are shown. It will also enable us to prioritize actions in the future when for instance collapsing a toolbar. Task-number: 258290 Reviewed-by: thierry
| * Allow picking up tool button style from the systemJens Bache-Wiig2009-07-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | KDE and GNOME has the concept of a default tool button style that can be set system-wide. Qt currently allways default to IconOnly. I have added an optional Qt::ToolButtonSystemDefault value so you can opt-in to respect the system setting. We did not change the default because a lot of apps will look odd when for instance text is beside icons and the descriptive text is too long. Task-number: 237864 Reviewed-by: ogoffart
| * Fixed warnings on mingwThierry Bastian2009-07-161-2/+2
| |
| * Use the correct font metrics function.Olivier Goffart2009-07-142-8/+2
| | | | | | | | | | | | | | | | Qt::TextShowMnemonic removes the '&' for us. This is required if we want the multi-lenght-variant strings working. Reviewed-by: Thierry
| * Remove this foundItem boolean.Norwegian Rock Cat2009-07-141-4/+1
| | | | | | | | | | | | | | Found while documenting this internally. I guess I had a reason for it at one point, but it seems that I'm more concerned about what index. So just get rid of this.
| * use qt_mac_QStringToNString & qt_mac_NSStringToQStringNorwegian Rock Cat2009-07-141-2/+3
| | | | | | | | | | | | These functions hide all this horrible casting and we've had them for a while. When I see them, I try to replace them as it keeps the code much more readable.
| * Build fix for mingwThierry Bastian2009-07-141-0/+1
| | | | | | | | | | we should include qt_windows.h and not windows.h because we have to define WINVER to 0x500.
| * Fix font propagation issues with QComboBox and the popup menu.Norwegian Rock Cat2009-07-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has always been a bit bumpy, the problem is that the popup normally has its own styling from the desktop, plus it's its own top-level and that is normally a boundary for propagation. Of course, people are surprised by this (especially when it works for editable). So, we need to be a bit better propagating the info. Also the QStyleOptionMenuItem has the correct font, but if it's set on a window, by the time it reaches the popup, its resolve mask is very weak, so it will fail to resolve at all. Setting the point size allows the font to have a bit of strength. Task-number: 257486 Reviewed-by: Jens Bache-Wiig
| * Fix crash after "Remove QT_WA and non-Unicode code paths, dropping Win9x and ↵Bjoern Erik Nilsen2009-07-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | NT support" tst_QGraphicsProxyWidget crashed because the QAlphaWidget tried to access a deleted widget. Before we had the if check, but that was removed with this commit: 55137901. Completely wrong, we must check the widget pointer before using it. Reviewed-by: jbache
| * Fixed linking of QtSvg with MSVC.Rohan McGovern2009-07-131-1/+1
| |
| * QMainWindow: it is useless to apply the stte after a call to plugThierry Bastian2009-07-101-5/+0
| | | | | | | | The layoutState is already current (ie. already applied).
| * QDoubleSpinBox: make sure people can't choose too many decimalsThierry Bastian2009-07-101-3/+4
| | | | | | | | | | | | Maximum number of decimals is DBL_MAX_10_EXP + DBL_DIG Task-number: 257291
| * Ensure that when we hide QToolBar in unified, unified follows.Norwegian Rock Cat2009-07-095-24/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically if you would hide a toolbar in the unified toolbar, you would still see a little bit of area at the top instead of having everything flush with the titlebar. This change basically unsures that the unified toolbar makes a decision to hide itself if all the toolbars inside it are hidden. It makes the behavior of clicking on the toolbar button behave more or less correctly since we are going to show the unified toolbar whether we want to or not. This all will get the toolbar button switch event to be dispatched in Cocoa as well. Also add an optimization for checking if we need to change the geometry. If we don't have any items the other toolbar areas, we can skip the set geometry call, which wrecks havoc with things in Cocoa. We still don't solve the case of someone who has hidden the items with the toolbar button then goes full-screen, then goes back out. I'm not motivated to solve it as is because we need to keep track of the hides we do on the button press vs. other hides from the user and still people can workaround it easy enough by handling window state change and doing what is recommended in the docs. Task-number: 208439 Rev-by: Denis
| * Add the complex control SC_SpinBoxEditField to style optionNils Christian Roscher-Nielsen2009-07-091-1/+1
| | | | | | | | Reviewed-by: Thierry
| * QTabBar: now uses QVariantAnimation over QTimeLineThierry Bastian2009-07-094-73/+65
| | | | | | | | QTimeLine is now no more used in private APIs
| * Remove unneeded assert.Friedemann Kleint2009-07-091-1/+0
| | | | | | | | | | Triggered on Designer startup on Linux. Acked-by: Thierry Bastian <thierry.bastian@nokia.com>
| * Make compileBill King2009-07-081-0/+1
| |
| * Merge commit 'origin/4.5'Bill King2009-07-081-5/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| | * Update QGroupBox on focusBenjamin Poulain2009-07-081-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | We cannot assume the position of the decorations when a QGroupBox get the focus. Task-number: 257660 Reviewed-by: Thierry
| * | Fix possible crash in QDockAreasThierry Bastian2009-07-081-1/+1
| | |
| * | QMainWindow: fix the use of animation and improve code qualityThierry Bastian2009-07-083-52/+38
| | |
| * | QMenuBar: the extension could be visible when it shouldn'tThierry Bastian2009-07-081-2/+2
| | | | | | | | | | | | | | | If you had invisible actions in the menubar, it would always show the extension button
| * | Animations: fix compilation with QT_NO_ANIMATIONThierry Bastian2009-07-082-1/+24
| | |
| * | QMainWindow: compile fix when defining QT_NO_DOCKWIDGETThierry Bastian2009-07-081-2/+1
| | |