summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master'Jason Barron2009-08-0417-51/+68
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * Trailing whitespace and tab/space fixes for src/guiJanne Anttila2009-08-043-6/+6
| |
| * CFbsBitmap::DataSize() seems to be a private Api function.Alessandro Portale2009-08-031-1/+1
| | | | | | | | | | | | | | But CFbsBitmap::Header().iBitmapSize seems to do the same job, and it works wit hthe public SDK. Thanks to jbarron for finding that public pendant.
| * Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-0317-45/+62
| | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* | Merge commit 'qt/master-stable'Jason Barron2009-08-041-5/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Reviewed-by: Thomas H.Gunnar Sletta2009-07-301-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit fcf7e8cab339d0cf9f3f2a9756d7754c54c4d934 Author: Gunnar Sletta <gunnar@trolltech.com> Date: Thu Jul 30 13:15:13 2009 +0200 note in the changes file... commit 2c9c3880215988e6609c290a8e738b228736e601 Author: Gunnar Sletta <gunnar@trolltech.com> Date: Thu Jul 30 12:51:42 2009 +0200 Don't leak native window HRGN handles commit 6bb30d2075dd1d71a8a600d25f413a38af7f2f2c Author: Gunnar Sletta <gunnar@trolltech.com> Date: Thu Jul 30 11:09:22 2009 +0200 Moved qregion_wince.cpp -> qregion_win.cpp, platforms are identical now commit 173fcc5baec73a198167985c6f777987e6015a71 Author: Gunnar Sletta <gunnar@trolltech.com> Date: Thu Jul 30 09:42:06 2009 +0200 win32 calls on QRegion.handle() is no longer supported, use from HRGN commit d7ddcce4ba29b70ed81f85274208b388a2bb9d4d Author: Gunnar Sletta <gunnar@trolltech.com> Date: Thu Jul 30 09:41:37 2009 +0200 Added convenience function to convert from HRGN to QRegion commit 2fc53ac3d59a9c42bb4154fff7557610092b7946 Author: Gunnar Sletta <gunnar@trolltech.com> Date: Wed Jul 29 09:28:10 2009 +0200 Kill qregion_win.cpp and use the unix code instead
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-302-10/+17
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| * | Doc: Some final QMatrix cleanups.Volker Hilsheimer2009-07-281-9/+16
| | |
| * | Doc: typo.Volker Hilsheimer2009-07-281-1/+1
| | |
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-292-4/+5
|\ \ \ | |/ /
| * | Don't animate widgets on first show in VistaJens Bache-Wiig2009-07-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checkboxes would animate when first shown if they were checked. This is unintentional and looks a bit odd in wizard for instance. To fix this we simply check if the old state was set. Note that this is safe because we will at least require the enabled state flag to be set. Task-number:253075 Reviewed-by: ogoffart
| * | Fixed SC_ComboBoxArrow returning inverted subControlRect on vistaJens Bache-Wiig2009-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The arrow was reported to be on the wrong side of the control. Technically the arrow part seems to cover the whole rect on Vista and Gtk+ but due to compatibility it is probably safer to keep the old rects for now. Task-number: 252857 Reviewed-by: ogoffart
| * | Doc - fixed a typo [describles->describes]Kavindra Devi Palaraja2009-07-271-2/+2
| | | | | | | | | | | | | | | | | | Task: 258573 Reviewed-By: TrustMe
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-283-27/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| * | Doc: Replace more links to obsolete APIs.Volker Hilsheimer2009-07-252-27/+9
| | |
| * | Fix incorrect button positioning on tabsJens Bache-Wiig2009-07-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | For tabs with RoundedWest or TriangularWest the button offset was reversed on tab selection. This was very visible on windows where they could actually move outside the tab border. Task-number: 255139 Reviewed-by: paul
* | | Compile fixes after latest merge of 4.6.Jason Barron2009-07-281-4/+2
| | | | | | | | | | | | | | | The ususal suspects like QScopedPointer fixes, but also some changes since the introduction of qcore_unix.*
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-2716-361/+404
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Compile on embeddedOlivier Goffart2009-07-222-2/+2
| |
| * Support for very large range in QProgressBarOlivier Goffart2009-07-223-7/+6
| | | | | | | | | | | | Regression since my last commit. Task-number: 152227
| * Simplify the computation of the QProgressBar progress.Olivier Goffart2009-07-222-6/+5
| | | | | | | | | | | | | | This is also a work around for a bug in gcc on powerpc (embedded-linux) Task-number: 258358 Reviewed-by: jbache
| * Return selectedFilter in QGtkStyle file dialogsLukáš Lalinský2009-07-202-5/+27
| | | | | | | | | | | | | | | | | | | | | | Function setupGtkFileChooser is modified to optionally build a map of GtkFileFilters. File dialog methods then use gtk_file_chooser_get_filename to get the current GtkFileFilter and look it up in the map produced by setupGtkFileChooser. This value is then saved in the selectedFilter pointer. Merge-request: 846 Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
| * Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-201-2/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| | * Fixed a potential memory leak on XPJens Bache-Wiig2009-07-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Calling OpenThemeData directly causes a leak when changing the style as we do not call the corresponding CloseThemeData. Task-number:257916 Reviewed-by:prasanth
| * | optimize painting of dithered disabled textOswald Buddenhagen2009-07-171-2/+3
| | | | | | | | | | | | | | | | | | no need to calculate the bounding rect twice Reviewed-by: jbache
| * | Add priority property to QActionJens Bache-Wiig2009-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Move QMacStyle icon handling down to the common style.Norwegian Rock Cat2009-07-172-124/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more follow the cue of what is done on X11, mainly, if you are creating things like messageboxes or file views, you want them to follow the desktop (yes, you do). If you disable desktop settings aware, you get the old look. This also meant shifting around some functions into qt_cocoa_helpers_mac to make them more readily available instead of living in differnt files. People who use standard pixmap get the old values, but I think that's fine. If you haven't moved onto standardIcon (introduced in 4.1), you don't get the latest bling. Review-by: Jens Bache-Wiig
| * | Handle Jens' new variable.Norwegian Rock Cat2009-07-171-0/+3
| | | | | | | | | | | | | | | In theory, the new "follow style" value will never be hit, let's make that explicit in the code.
| * | Fixes: ItemView text editor is not visible with empty text and iconsOlivier Goffart2009-07-171-3/+11
| | | | | | | | | | | | | | | | | | | | | It was not visible wicause its height was 0 Task-number: 257481 Reviewed-by: mbm
| * | Allow picking up tool button style from the systemJens Bache-Wiig2009-07-166-3/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | fix build on linuxThierry Bastian2009-07-151-11/+1
| | |
| * | Compile fix.Denis Dzyubenko2009-07-151-0/+1
| | | | | | | | | | | | Include the qstylehelper header file since the macro uses it.
| * | Fix warnings for mingwThierry Bastian2009-07-156-43/+40
| | | | | | | | | | | | | | | did a small refactor and used QStyleHelper::uniqueName in plastique and windows styles
| * | Bad drawing of styled viewports within QAbstractScrollAreaOlivier Goffart2009-07-151-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch includes lots of refactoring, but the real problem was that in QWidgetPrivate::paintBackground we call drawPrimitive(PE_Widget) with a potentialy translated painter, but the opt.rect is not translated. When having a scroll area the calling function used to translated the painter and then pass the offset around to rectify. but drawPrimitive cannot rectify it. The solution is not to translate the painter but use other way to rectify the brush Task-number: 257517 Reviewed-by: bnilsen
| * | Fix painting of the background of QAbstractItemView, QTextEdit and coOlivier Goffart2009-07-151-1/+1
| | | | | | | | | | | | when only setting a border with the stylesheet
| * | Fix font propagation issues with QComboBox and the popup menu.Norwegian Rock Cat2009-07-132-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | src/gui: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-013-87/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also - Make winPeekMessage() & winPostMessage() obsolete - FlashWindowEx, IsValidLanguageGroup functions no longer resolved dynamically (available on >= Windows 2000) - LoadIcon/LoadCursor -> LoadImage w/LR_SHARED for system icons/cursors - qsystemtrayicon_win: use Shell_NotifyIconGetRect if available (Windows 7) Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * | doc: Fixed several qdoc error reports.Martin Smith2009-07-011-66/+61
| | | | | | | | | | | | | | | Also changed qdoc not to warn about undocumented parameters if the function is marked with the \reimp command.
| * | Merge branch '4.5'Marius Storm-Olsen2009-06-301-2/+1
| |\ \ | | |/
* | | Removed few compiler warnings when using NokiaX86 compiler.Janne Anttila2009-07-221-1/+1
| | |
* | | Make S60 integration optional.Jason Barron2009-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-093-37/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * | | Removed unused static data from Qt.axis2009-07-061-1/+2
| | | | | | | | | | | | | | | | This saves memory and prevents warnings from RVCT.
| * | | Removed pointless variables to silence warnings from RVCT.axis2009-07-061-4/+0
| | | |
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2950-112/+108
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| | * | Fix coverity warningJens Bache-Wiig2009-06-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coverity was complaining because we were not checking the return value of find() but instead using the pixmap handle to check the result. This makes the call more consistent Reviewed-by: mgoetz
| * | | S60Style: Use scrollbar extent to initialize rect size on x dimension ↵Sami Merilä2009-06-261-7/+2
| | | | | | | | | | | | | | | | (instead of making it first square)
| * | | S60Style: Slightly less complex way of drawing the QHeaderView in style.Sami Merilä2009-06-261-23/+11
| | | |
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3055-2083/+561
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | | Fix some coverity warningsThierry Bastian2009-06-291-1/+2
| | | |
generated by cgit v0.12 at 2025-09-23 00:04:14 (GMT)