| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
tests/auto/qlocalsocket/tst_qlocalsocket.cpp
|
| | |
| |
| |
| |
| |
| | |
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.
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
|
| | |
| |
| |
| |
| | |
Task-number: 254549
Reviewed-by: TrustMe
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| |
| | |
The problem was that we don't clear the selection model if the previous
selection was valid.
Task-number:251341
Reviewed-by:jasplin
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
|
| | |\ |
|
| | | |
| | |
| | |
| | | |
Task-number: 252565
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/network-settings.h
tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
|
| | |/
| |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
|
| | |
| |
| |
| |
| |
| | |
Need the proper types.
Reviewed-by: Andy
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/widgets/qmenu_symbian.cpp
|
| | |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tests/auto/qtemporaryfile/qtemporaryfile.pro
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
It basically says that on KDE and GNOME the native dialogs are called.
It fix a mistake about a regular instantiation on QFileDialog object
on Windows.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
On small screens use the whole screen width when adjusting the size of
the messagebox.
Task-number: 251925
Reviewed-by: Brad
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem was located in _q_enterDirectory, this method take a
QModelIndex that can be a model index from the treeview/listview (so
it comes from the proxy that is applied) and from the side bar where
there is always no proxy applied. Previously we were trying to convert
from a proxy index to a source index the value that come from the sidebar
which is already a source model index. Now, we just check if the model
index is coming from the proxy and in that case we convert it otherwise
this model index come from the source.
Task-number: 252068
Reviewed-by: jasplin
Reviewed-by: ogoffart
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
documentation.
getOpenFileNames() and getExistingDirectory() mentioned that the dir
parameter was ignored. This is no longer the case. This bit was reviewed
by nrc, the other fixes were just cleanups.
Task-number: 252223
Reviewed-by: nrc
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It seems that running the font dialog modal means that the "fontChanged"
action is not fired. Which means our font is never changed. Thankfully,
since it's an app modal case, we can re-sync when the OK button is
clicked.
Task-number: 252000
Reviewed-by: Morten Sørvig
|
| | | | |
|
| | | | |
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Configure.exe recompiled with MSVC6.
Conflicts:
configure.exe
examples/network/network.pro
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qfilesystemmodel_p.h
src/gui/kernel/qapplication.cpp
tests/auto/_Categories/qmake.txt
tests/auto/qfile/test/test.pro
tests/auto/qfile/tst_qfile.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qline/tst_qline.cpp
tests/auto/qstyle/tst_qstyle.cpp
tests/auto/qtextstream/tst_qtextstream.cpp
tests/auto/qtranslator/qtranslator.pro
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
translations/qt_ja_JP.ts
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem is QUrl == operator is case sensitive. On Windows we don't
want double entries for C:\dev or c:\dev so i convert the url in lower
case and compare them (on Windows only) to avoid duplicate entries.
Task-number:226483
Reviewed-by:jasplin
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Setting a QPrinter to print to e.g. a PDF file and then passing the
QPrinter object to a QPrintDialog didn't update the printer combobox
and filename lineedit states correctly.
Task-number: 224728
Reviewed-by: Samuel
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We can't remove an item in the sidebar if the bookmark is not valid
(i.e. link to a non existing directory). ItemViews doesn't allow you
to have disabled items and to select them at the same time, so i have
implemented a delegate that paint in gray if the bookmark is invalid.
So you can click on it and delete it.
Task-number: 251341
Reviewed-by: jasplin
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If the bookmark in the sidebar has an hidden parent and the QFileDialog
is set up to not show hidden files, then clicking on the bookmark move
the current dir to root (like if the bookmark was invalid) instead of
entering in the dir. The fix was to fetch the parent dir and the
bookmark dir when the user select it in the sidebar.
Task-number: 251321
Reviewed-by: jasplin
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We were calling the provider with invalid path, with the default one it
fallback to all standard icons but with a custom one we call a public
method with an invalid QFileInfo. It was happening on windows only
for the My Drives view because in that case the parent path is null, my
Drives is a logical view.
Task-number: 251295
Reviewed-by: jasplin
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Add Copyright message as requested by Legal, and update .ts files again.
Reviewed-by: Trust Me
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Update the text of the About Qt dialog, as directed by Legal. Note that
this change breaks string freeze as the text is translatable, however
Legal has decided that shipping legally correct text has priority over
shipping complete translations. This change includes updated .ts files
to correct the source strings, but no updated translations.
This change also removes out-of-date licensing text from the About
dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer.
Those particular changes should not break translations as they only
remove translatable strings and do not modify any others.
Task-number: 247608
Reviewed-by: Trust Me
.....review will be conducted after submission.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Cocoa's font manager uses "first responder" which is a great idea, but
breaks as soon as we change windows. Thankfully we can just set the
target and we are OK. An upshot is that we don't need the delegate, but
I'm not going to push my luck on that.
Reviewed-by: Richard Moe Gustavsen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
marked getInt() as since Qt 4.5 and finally modified the StandardDialogs
example to reflect the fact that getInteger() is deprecated.
Task-number: 251288
Reviewed-by: nrc <qt-info@nokia.com>
BT: Yes
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
dialog don't appear on Windows.
The problem is with the directory that you can specify when calling the
static functions. It can include a file in that path which means that
the file will be selected by default when the dialog appears. But if you
give an invalid file as a selection to the Windows API, then it simply
don't display the dialog. The patch is basically checking the dir we get
when we are called. workingDirectory tested it already and fallback
to the current directory if the argument is invalid. I just check now if
workingDirectory changed the path (that means the parameter value was
incorrect) and select nothing in that case. Using this trick avoid stating
again the complete path to check if the selection exist. (i.e. path()
on QFileInfo don't call stat()).
Task-number: 250120
Reviewed-by: jan-arve
Reviewed-by: jasplin
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The fix is basically remove the whitespaces at the end otherwise the
reg exp will be wrong.
Task-number: 240789
Reviewed-by: jasplin
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Mac OS X - cocoa
The filename as NSString that we get from Cocoa does not have
the correct file system encoding. This means that certain characters are
implemented differently than what e.g. QFile::encoded returns. This fix
normalizes the string from cocoa before using it.
Task-number: 249928
Reviewed-by: Trenton Schulz
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
QFileSystemModel::filter().
Task-number: 250285
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The main problem is that enterDirectory received a QModelIndex that can
be a proxy index and not a source index if there is a proxy set on the
QFileDialog. This fix basically discover some other crashes in the
completer. The problem was that we didn't apply the proxy to the
completer too. So we basically messed up source and proxy indexes.
Both have a proxy set now and convert the model indexes if needed.
Task-number:250194
Reviewed-by:jasplin
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
QMessageBox, but provided by the style.
Task-number: 249946
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Reported by a former Doc Manager.
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This patch basically ensure that we share the same QFileinfo all over
the place for each nodes (then we benefit of the cache). It fix also an
extra stat due of a bugfix that was not optimal.
Task-number: 247645
Reviewed-by: jasplin
|
| | | |
|
