FCL/sf/mw/qt: comparison src/gui/dialogs/qfiledialog.cpp

equal deleted inserted replaced

-:41300fa6a67c
+:f7bc934e204c
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 of QFileDialog that contains the Q_OBJECT macro.
 \value ReadOnly Indicates that the model is readonly.
 \value HideNameFilterDetails Indicates if the is hidden or not.
-This value is obsolete and does nothing since Qt 4.5:
 \value DontUseSheet In previous versions of Qt, the static
 functions would create a sheet by default if the static function
-was given a parent. This is no longer supported in Qt 4.5, The
+was given a parent. This is no longer supported and does nothing in Qt 4.5, The
 static functions will always be an application modal dialog. If
 you want to use sheets, use QFileDialog::open() instead.
 */
 d->renameAction->setEnabled(!ro);
 d->deleteAction->setEnabled(!ro);
 }
 if (changed & HideNameFilterDetails)
 setNameFilters(d->nameFilters);
+if (changed & ShowDirsOnly)
+setFilter((options & ShowDirsOnly) ? filter() & ~QDir::Files : filter() | QDir::Files);
 }
 QFileDialog::Options QFileDialog::options() const
 {
 Q_D(const QFileDialog);
 {
 return !testOption(HideNameFilterDetails);
 }
+/*
+Strip the filters by removing the details, e.g. (*.*).
+*/
+QStringList qt_strip_filters(const QStringList &filters)
+{
+QStringList strippedFilters;
+QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp));
+for (int i = 0; i < filters.count(); ++i) {
+QString filterName;
+int index = r.indexIn(filters[i]);
+if (index >= 0)
+filterName = r.cap(1);
+strippedFilters.append(filterName.simplified());
+}
+return strippedFilters;
+}
 /*!
 \since 4.4
 Sets the \a filters used in the file dialog.
 d->qFileDialogUi->fileTypeCombo->clear();
 if (cleanedFilters.isEmpty())
 return;
-if (testOption(HideNameFilterDetails)) {
+if (testOption(HideNameFilterDetails))
-QStringList strippedFilters;
+d->qFileDialogUi->fileTypeCombo->addItems(qt_strip_filters(cleanedFilters));
-QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp));
+else
-for (int i = 0; i < cleanedFilters.count(); ++i) {
-QString filterName;
-int index = r.indexIn(cleanedFilters[i]);
-if (index >= 0)
-filterName = r.cap(1);
-strippedFilters.append(filterName.simplified());
-}
-d->qFileDialogUi->fileTypeCombo->addItems(strippedFilters);
-} else {
 d->qFileDialogUi->fileTypeCombo->addItems(cleanedFilters);
-}
 d->_q_useNameFilter(0);
 }
 /*!
 \obsolete
 Q_D(QFileDialog);
 if (d->nativeDialogInUse) {
 d->selectNameFilter_sys(filter);
 return;
 }
+int i;
-int i = d->qFileDialogUi->fileTypeCombo->findText(filter);
+if (testOption(HideNameFilterDetails)) {
+i = d->qFileDialogUi->fileTypeCombo->findText(qt_strip_filters(qt_make_filter_list(filter)).first());
+} else {
+i = d->qFileDialogUi->fileTypeCombo->findText(filter);
+}
 if (i >= 0) {
 d->qFileDialogUi->fileTypeCombo->setCurrentIndex(i);
 d->_q_useNameFilter(d->qFileDialogUi->fileTypeCombo->currentIndex());
 }
 }
 \sa FileMode
 */
 void QFileDialog::setFileMode(QFileDialog::FileMode mode)
 {
 Q_D(QFileDialog);
-if (d->nativeDialogInUse){
-d->model->setFilter(d->filterForMode(filter()));
-d->setFilter_sys();
-return;
-}
 d->fileMode = mode;
 d->retranslateWindowTitle();
 // keep ShowDirsOnly option in sync with fileMode (BTW, DirectoryOnly is obsolete)
 setOption(ShowDirsOnly, mode == DirectoryOnly);
 setLabelText(FileName, tr("File &name:"));
 d->fileNameLabelExplicitlySat = false;
 }
 }
 setLabelText(Accept, buttonText);
+if (d->nativeDialogInUse){
+d->setFilter_sys();
+return;
+}
 d->qFileDialogUi->fileTypeCombo->setEnabled(!testOption(ShowDirsOnly));
 d->_q_updateOkButton();
 }
 QFileDialog::FileMode QFileDialog::fileMode() const
 setLabelText(Accept, (mode == AcceptOpen ? tr("&Open") : tr("&Save")));
 if (mode == AcceptSave) {
 d->qFileDialogUi->lookInCombo->setEditable(false);
 }
 d->retranslateWindowTitle();
+#if defined(Q_WS_MAC)
+d->deleteNativeDialog_sys();
+setAttribute(Qt::WA_DontShowOnScreen, false);
+#endif
 }
 /*
 Returns the file system model index that is the root index in the
 views
 else
 dirModel = sourceModel;
 QString currentLocation = dirModel->rootPath();
 QString path = index.data(QFileSystemModel::FilePathRole).toString();
 if (!currentLocation.isEmpty() && path.startsWith(currentLocation)) {
+#if defined(Q_OS_UNIX) || defined(Q_OS_WINCE)
+if (currentLocation == QDir::separator())
+return path.mid(currentLocation.length());
+#endif
 return path.mid(currentLocation.length() + 1);
 }
 return index.data(QFileSystemModel::FilePathRole).toString();
 }
 if (proxyModel)
 dirModel = qobject_cast<const QFileSystemModel *>(proxyModel->sourceModel());
 else
 dirModel = sourceModel;
 QString currentLocation = QDir::toNativeSeparators(dirModel->rootPath());
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+if (currentLocation.endsWith(QLatin1Char(':')))
+currentLocation.append(sep);
+#endif
 if (currentLocation.contains(sep) && path != currentLocation) {
 QStringList currentLocationList = splitPath(currentLocation);
 while (!currentLocationList.isEmpty()
 && parts.count() > 0
 && parts.at(0) == QLatin1String("..")) {

changeset 7	f7bc934e204c
parent 3	41300fa6a67c
child 30	5dc02b23752f