summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
Commit message (Collapse)AuthorAgeFilesLines
* More culling of Panther Code.Norwegian Rock Cat2009-06-231-76/+7
| | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
* Clean up the font hash and palette hash stuff.Norwegian Rock Cat2009-06-231-2/+1
| | | | | | | | | These are used enough (at least on the mac) to justify them being accessible in a private header. As a bonus it "hides" the actual container being used, so we could potentially sway it out with something different. Reviewed by: Jens Bache-Wiig
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-232-4/+12
|\ | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| * Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-232-4/+12
| | | | | | | | | | | | | | | | | | | | After discussing with some of the Objective-C people I have finally got a fair number of the warnings to disappear in both 10.5 and 10.6. I also took the opportunity to remove a bunch of other warnings. Reviewed by: Morten Sørvig
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-232-0/+26
|\ \ | |/ | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| * Prevented QWizard from crashing upon removing a page after deleting a field ↵jasplin2009-06-222-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | object. QWizard crashed when removing a page after deleting an object that was already registered as a field for the page. This patch prevents such a crash by doing the necessary cleanup immediately when the object is deleted. QWizard::removePage() will then see a consistent state in this case. Reviewed-by: janarve Task-number: 255350
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-3/+3
|\ \ | |/ | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| * Made QInputDialog::getText() return null QString when rejectedStian Sandvik Thomassen2009-06-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts a behavior change introduced with Qt 4.5.0 where QInputDialog::getText() returned the line edit's text when the dialog was rejected. However, the behavior since Qt 4.0 has been to return a null QString when the dialog is rejected. Task-number: 256299 Reviewed-by: Andy Shaw
* | QFontDialog: fixed the current font not being updatedThierry Bastian2009-06-181-11/+0
| | | | | | | | | | | | | | | | This could happen when the list of styles depending on the font is different from the font you selected before. It then is not updated and the style of the font returned by the QFontDialog is wrong. Task-number: 256466
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-1658-115/+115
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1658-115/+115
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-122-1/+4
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * Compilefix for QT_NO_TABLETEVENT and QT_NO_COMPLETERThomas Hartmann2009-06-101-0/+3
| | | | | | | | | | Task-number: 253086 Reviewed-by: Joerg
| * Change order of functions in QInputDialog::getDouble()Markus Goetz2009-06-081-1/+1
| | | | | | | | | | | | | | Fixes issue with decimals in the spinbox used for the double Task-number: 255502 Reviewed-by: mbm
* | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-1110-17/+17
| |
* | remove q->layout() and q->parentWidget() code where unnecessaryThierry Bastian2009-06-111-8/+6
| |
* | Merge commit 'origin/4.5'Olivier Goffart2009-06-044-6/+15
|\ \ | |/
| * Document the proper signals that the ::open() convenience connects to.Norwegian Rock Cat2009-06-044-6/+15
| | | | | | | | | | | | We were saying that it connected to accepted it all these cases, but it actually is doing some nice magic that makes sense assuming you document it.
* | missing opening paragraph tagFrederik Schwarzer2009-06-031-1/+1
| | | | | | | | | | Merge-request: 578 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-023-3/+21
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * Doc - marked QFileDialog::setOption() with the since 4.5 tag.Kavindra Devi Palaraja2009-05-291-2/+3
| | | | | | | | | | Task-number: 254549 Reviewed-by: TrustMe
| * Fix wrong sorting when using the QFileSystemModel with QTreeViewAlexis Menard2009-05-283-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An optimization was made to the sorting of QFileDialog to sort only the current root (meaning what the user see). This avoided slowness when the model was big with lots of leafs. The problem here is for the treeview, the root is always the same, we expands only nodes. In that case, a recursive sorting is needed to ensure that all expanded nodes are correctly sorted (and filtered). This will be slower that's why i use an hidden flag in the d pointer to deactivate the recursive sort for the QFileDialog. Task-number:254701 Reviewed-by:olivier BT:yes
* | Polished aboutQt dialog a little bit.Denis Dzyubenko2009-05-281-5/+8
| | | | | | | | | | | | | | Splitted text in the AboutQt dialog into several chunks to make use of advanced qmessagebox text fields Reviewed-By: Trenton Schulz
* | Merge branch '4.5'Tom Cooksey2009-05-281-1/+1
|\ \ | |/ | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| * BT: aboutQt dialog is too big.Denis Dzyubenko2009-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | Make use of setInformativeText in qmessagebox for aboutQt dialog for now. Proper fix might be to add scrollable widget to the dialog, or split the about info into several pieces, though it cannot be done in a patch release. Task-number: 254464 Reviewed-by: Trenton Schulz
* | improved string operations all over the placeThierry Bastian2009-05-282-6/+6
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Use Qt::UniqueConnection instead of disconnect/connectOlivier Goffart2009-05-281-2/+1
| | | | | | | | | | | | | | Also fix an issue in QTreeView where a signal could be connected several times Reviewed-by: Thierry
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-273-13/+46
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * QFileDialog selection bug when calling it multiple times.Alexis Menard2009-05-261-5/+6
| | | | | | | | | | | | | | | | The problem was that we don't clear the selection model if the previous selection was valid. Task-number:251341 Reviewed-by:jasplin
| * Carbon, QFontDialog::getFont() ignore the "initial" parameterRichard Moe Gustavsen2009-05-261-8/+31
| | | | | | | | | | | | | | | | | | | | Seems like no code was written to handle other font engines than CoreText. Unfortunatly the engine on Carbon is ATSUI. This patch adds general code for converting a QFont to an NSFont so the dialog can support other engines than CoreText Task-number: 251957 Reviewed-by: Trenton Schulz
| * fix double slash prepending causing troubles on WinCEMaurice Kalinowski2009-05-261-6/+12
| | | | | | | | | | | | | | | | | | Before adding a / to the path one should check if it doesn't end with one already. Otherwise one might get paths like //My Documents on WinCE causing the native call to crash the filesystem service on that system. Reviewed-by: alexis
| * BT: Mac: Crash when using QFontDialogRichard Moe Gustavsen2009-05-252-0/+9
| | | | | | | | | | | | | | | | | | | | If creating a native QFontDialog and delete it, the native dialog will still show. And worse, it will call the deleted QDialog counterpart. This fix will clean up (and close the native dialog) when the QDialog is deleted. Task-number: 254397 Reviewed-by: Trenton Schulz
* | Compile fixThierry Bastian2009-05-251-1/+1
| |
* | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-255-18/+18
| | | | | | | | | | | | | | Wherever I found that we were using a string instead of a single char I fixed the code. Reviewed-by: olivier
* | Added a "Qt 5 FIXME" comment to qmessagebox.h.jasplin2009-05-251-0/+2
| | | | | | | | | | | | | | | | | | | | QMessageBox::question() has the wrong default value for one of its arguments, but fixing it may break existing code, and the workaround is trivial (just specify an explicit value for the default argument). Reviewed-by: TrustMe Task-number: 254131
* | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-203-12/+10
|\ \ | |/
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-201-9/+4
| |\
| | * Remove bad documentation about window modality and QMessageBox.Norwegian Rock Cat2009-05-201-9/+4
| | | | | | | | | | | | | | | | | | QMessageBox is like QDialog. It doesn't have any extra magic with window modality on creation, so don't advertise that it does. The note about using message boxes as sheets is also updated.
| * | qdoc: Moved a qdoc comment to a file that is in all packages.Martin Smith2009-05-202-3/+6
| |/ | | | | | | Task-number: 252565
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-183-3/+8
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * Fixed crash in QWizard running on old Windows systems.jasplin2009-05-183-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | When compiling the QWizard on a Windows system where QT_NO_STYLE_WINDOWSVISTA is not set and running the app on an old system that has no Vista support, the app would crash in the paint event of the Vista Back button. In this scenario, the Vista Back button is not needed (i.e. the regular Back button next to the Next button is used), so the fix is simply to avoid instanciating it altogether. Reviewed-by: janarve Task-number: 252662
* | Fixed regression introduced by fix for Task 177022.jasplin2009-05-181-3/+7
| | | | | | | | | | | | | | The fix for Task 177022 broke the fix for Task 163334. This commit fixes the regression. Reviewed-by: janarve
* | Merge branch '4.5'Thiago Macieira2009-05-141-2/+2
|\ \ | |/ | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * Compile.Norwegian Rock Cat2009-05-141-1/+1
| | | | | | | | | | | | Need the proper types. Reviewed-by: Andy
| * Prevent duplicate entries in the sidebar when the paths are the sameAndy2009-05-141-2/+2
| | | | | | | | | | | | | | | | | | If two urls were added to the sidebar that only differed in how they referenced the added url (i.e. /foo/bar/. and /foo/bar) then only one entry should appear. Task-number: 253532 Reviewed-by: Alexis
* | Work around a limitation in QFormLayout - 0 width content marginsTrond Kjernaasen2009-05-121-4/+9
| | | | | | | | | | aren't really supported. Also set the default focus to be the preview widget itself.
* | Make the QPrintPreviewDialog use a QMainWindow with a proper QToolBar forTrond Kjernaasen2009-05-121-79/+56
| | | | | | | | its buttons.
* | Add support for CMYK colors for the native QColorDialog on Mac OS X.Benjamin Poulain2009-05-112-12/+29
| | | | | | | | | | | | | | The native color picker on Mac supports CMYK colors but this was not available with QColorDialog because the colors were systematically converted to RGB. The color are now initialized with QColor and the result from the color panel is converted to the right format. Task-number: 253272 Reviewed-by: nrc
* | Merge branch '4.5'Thiago Macieira2009-05-112-2/+1
|\ \ | |/
| * Fixes a crash in QPrinterDialog with relative filenamesJoão Abecasis2009-05-082-2/+1
| | | | | | | | | | | | | | | | | | | | | | It's better to set the sourceModel in the constructor for QFSCompletor, as requiring that it be set separately is error prone. Surprisingly, the printer dialog crash only appears to happen when using relative filenames. Task-number: 253135 Reviewed-by: alexis