Changeset 846 for trunk/src/gui/dialogs/qfiledialog.cpp
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/gui/dialogs/qfiledialog.cpp
r769 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 229 229 \value ReadOnly Indicates that the model is readonly. 230 230 231 \value HideNameFilterDetails Indicates if the is hidden or not. 231 \value HideNameFilterDetails Indicates if the file name filter details are 232 hidden or not. 232 233 233 234 \value DontUseSheet In previous versions of Qt, the static … … 302 303 #include <qshortcut.h> 303 304 #ifdef Q_WS_MAC 304 #include <private/qunicodetables_p.h>305 305 #include <qmacstyle_mac.h> 306 306 #endif … … 723 723 // updates the state correctly, but skips showing the non-native version: 724 724 setAttribute(Qt::WA_DontShowOnScreen); 725 #ifndef QT_NO_FSCOMPLETER 726 //So the completer don't try to complete and therefore to show a popup 727 d->completer->setModel(0); 728 #endif 725 729 } else { 726 730 d->nativeDialogInUse = false; 727 731 setAttribute(Qt::WA_DontShowOnScreen, false); 732 #ifndef QT_NO_FSCOMPLETER 733 if (d->proxyModel != 0) 734 d->completer->setModel(d->proxyModel); 735 else 736 d->completer->setModel(d->model); 737 #endif 728 738 } 729 739 } … … 1607 1617 #endif 1608 1618 1619 /* 1620 For Symbian file dialogs 1621 */ 1622 #if defined(Q_WS_S60) 1623 extern QString qtSymbianGetOpenFileName(const QString &caption, 1624 const QString &dir, 1625 const QString &filter); 1626 1627 extern QStringList qtSymbianGetOpenFileNames(const QString &caption, 1628 const QString &dir, 1629 const QString &filter); 1630 1631 extern QString qtSymbianGetSaveFileName(const QString &caption, 1632 const QString &dir); 1633 1634 extern QString qtSymbianGetExistingDirectory(const QString &caption, 1635 const QString &dir); 1636 #endif 1637 1609 1638 /*! 1610 1639 This is a convenience static function that returns an existing file … … 1635 1664 then a default caption will be used. 1636 1665 1637 On Windows and Mac OS X, this static function will use the native file1638 dialog and not a QFileDialog.1666 On Windows, Mac OS X and Symbian^3, this static function will use the 1667 native file dialog and not a QFileDialog. 1639 1668 1640 1669 On Windows the dialog will spin a blocking modal event loop that will not … … 1647 1676 \a options includes DontResolveSymlinks, the file dialog will treat 1648 1677 symlinks as regular directories. 1678 1679 On Symbian^3 the parameter \a selectedFilter has no meaning and the 1680 \a options parameter is only used to define if the native file dialog is 1681 used. 1649 1682 1650 1683 \warning Do not delete \a parent during the execution of the dialog. If you … … 1663 1696 if (qt_filedialog_open_filename_hook && !(options & DontUseNativeDialog)) 1664 1697 return qt_filedialog_open_filename_hook(parent, caption, dir, filter, selectedFilter, options); 1698 #if defined(Q_WS_S60) 1699 if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 && !(options & DontUseNativeDialog)) 1700 return qtSymbianGetOpenFileName(caption, dir, filter); 1701 #endif 1665 1702 QFileDialogArgs args; 1666 1703 args.parent = parent; … … 1713 1750 then a default caption will be used. 1714 1751 1715 On Windows and Mac OS X, this static function will use the native file1716 dialog and not a QFileDialog.1752 On Windows, Mac OS X and Symbian^3, this static function will use the 1753 native file dialog and not a QFileDialog. 1717 1754 1718 1755 On Windows the dialog will spin a blocking modal event loop that will not … … 1732 1769 \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 10 1733 1770 1771 On Symbian^3 the parameter \a selectedFilter has no meaning and the 1772 \a options parameter is only used to define if the native file dialog is 1773 used. On Symbian^3, this function can only return a single filename. 1774 1734 1775 \warning Do not delete \a parent during the execution of the dialog. If you 1735 1776 want to do this, you should create the dialog yourself using one of the … … 1747 1788 if (qt_filedialog_open_filenames_hook && !(options & DontUseNativeDialog)) 1748 1789 return qt_filedialog_open_filenames_hook(parent, caption, dir, filter, selectedFilter, options); 1790 #if defined(Q_WS_S60) 1791 if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 && !(options & DontUseNativeDialog)) 1792 return qtSymbianGetOpenFileNames(caption, dir, filter); 1793 #endif 1749 1794 QFileDialogArgs args; 1750 1795 args.parent = parent; … … 1804 1849 a default caption will be used. 1805 1850 1806 On Windows and Mac OS X, this static function will use the native file1807 dialog and not a QFileDialog.1851 On Windows, Mac OS X and Symbian^3, this static function will use the 1852 native file dialog and not a QFileDialog. 1808 1853 1809 1854 On Windows the dialog will spin a blocking modal event loop that will not … … 1817 1862 \a options includes DontResolveSymlinks the file dialog will treat symlinks 1818 1863 as regular directories. 1864 1865 On Symbian^3 the parameters \a filter and \a selectedFilter have no 1866 meaning. The \a options parameter is only used to define if the native file 1867 dialog is used. 1819 1868 1820 1869 \warning Do not delete \a parent during the execution of the dialog. If you … … 1833 1882 if (qt_filedialog_save_filename_hook && !(options & DontUseNativeDialog)) 1834 1883 return qt_filedialog_save_filename_hook(parent, caption, dir, filter, selectedFilter, options); 1884 #if defined(Q_WS_S60) 1885 if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 && !(options & DontUseNativeDialog)) 1886 return qtSymbianGetSaveFileName(caption, dir); 1887 #endif 1835 1888 QFileDialogArgs args; 1836 1889 args.parent = parent; … … 1881 1934 be set. 1882 1935 1883 On Windows and Mac OS X, this static function will use the native file1884 dialog and not a QFileDialog. On Windows CE, if the device has no native1885 file dialog, a QFileDialog will be used.1936 On Windows, Mac OS X and Symbian^3, this static function will use the 1937 native file dialog and not a QFileDialog. On Windows CE, if the device has 1938 no native file dialog, a QFileDialog will be used. 1886 1939 1887 1940 On Unix/X11, the normal behavior of the file dialog is to resolve and … … 1895 1948 dialog just below the parent's title bar. 1896 1949 1950 On Symbian^3 the \a options parameter is only used to define if the native 1951 file dialog is used. 1952 1897 1953 \warning Do not delete \a parent during the execution of the dialog. If you 1898 1954 want to do this, you should create the dialog yourself using one of the … … 1908 1964 if (qt_filedialog_existing_directory_hook && !(options & DontUseNativeDialog)) 1909 1965 return qt_filedialog_existing_directory_hook(parent, caption, dir, options); 1966 #if defined(Q_WS_S60) 1967 if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 && !(options & DontUseNativeDialog)) 1968 return qtSymbianGetExistingDirectory(caption, dir); 1969 #endif 1910 1970 QFileDialogArgs args; 1911 1971 args.parent = parent;
Note:
See TracChangeset
for help on using the changeset viewer.