From ae30d71413595b3cb0550e047132ea07510d35a3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 18 Oct 2011 08:38:05 +0200 Subject: Widgets: Remove Symbian-specific code. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Samuel Rødal Change-Id: Ieee43d6650f5b1968fc7d77e618096701ffef941 Reviewed-by: Friedemann Kleint --- src/widgets/dialogs/dialogs.pri | 11 +- src/widgets/dialogs/qcolordialog_symbian.cpp | 107 -------------- src/widgets/dialogs/qfiledialog_symbian.cpp | 199 --------------------------- 3 files changed, 1 insertion(+), 316 deletions(-) delete mode 100644 src/widgets/dialogs/qcolordialog_symbian.cpp delete mode 100644 src/widgets/dialogs/qfiledialog_symbian.cpp (limited to 'src/widgets/dialogs') diff --git a/src/widgets/dialogs/dialogs.pri b/src/widgets/dialogs/dialogs.pri index 41d81b8afc..fbff8c742c 100644 --- a/src/widgets/dialogs/dialogs.pri +++ b/src/widgets/dialogs/dialogs.pri @@ -52,7 +52,7 @@ win32 { !win32-borland:!wince*: LIBS += -lshell32 # the filedialog needs this library } -wince*|symbian: FORMS += dialogs/qfiledialog_embedded.ui +wince*: FORMS += dialogs/qfiledialog_embedded.ui else: FORMS += dialogs/qfiledialog.ui INCLUDEPATH += $$PWD @@ -70,13 +70,4 @@ SOURCES += \ dialogs/qfileinfogatherer.cpp \ dialogs/qwizard.cpp \ -symbian:contains(QT_CONFIG, s60) { - LIBS += -lCommonDialogs - SOURCES += dialogs/qfiledialog_symbian.cpp \ - dialogs/qcolordialog_symbian.cpp -} - RESOURCES += dialogs/qmessagebox.qrc - -# Compensate for lack of platform defines in Symbian3 -symbian: DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_)) diff --git a/src/widgets/dialogs/qcolordialog_symbian.cpp b/src/widgets/dialogs/qcolordialog_symbian.cpp deleted file mode 100644 index eab35f5ac8..0000000000 --- a/src/widgets/dialogs/qcolordialog_symbian.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 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. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qcolordialog_p.h" - -#ifndef QT_NO_COLORDIALOG - - -#include "qcolor.h" -#include "private/qguiplatformplugin_p.h" - -#ifdef Q_WS_S60 -#include -#endif - -#include "private/qt_s60_p.h" - -QT_BEGIN_NAMESPACE - -QColor launchSymbianColorDialog(QColor initial) -{ - QColor currentColor = QColor::Invalid; -#ifdef Q_WS_S60 - QT_TRAP_THROWING( - CArrayFixFlat* array = new( ELeave ) CArrayFixFlat(17); - CleanupStack::PushL(array); - array->AppendL(KRgbBlack); - array->AppendL(KRgbDarkGray); - array->AppendL(KRgbDarkRed); - array->AppendL(KRgbDarkGreen); - array->AppendL(KRgbDarkYellow); - array->AppendL(KRgbDarkBlue); - array->AppendL(KRgbDarkMagenta); - array->AppendL(KRgbDarkCyan); - array->AppendL(KRgbRed); - array->AppendL(KRgbGreen); - array->AppendL(KRgbYellow); - array->AppendL(KRgbBlue); - array->AppendL(KRgbMagenta); - array->AppendL(KRgbCyan); - array->AppendL(KRgbGray); - array->AppendL(KRgbWhite); - - TRgb initialColour(initial.red(), initial.green(), initial.blue(), initial.alpha()); - - TBool noneChosen = EFalse; // If true shows the default colour button - CAknColourSelectionGrid* colourSelectionGrid = - CAknColourSelectionGrid::NewL(array, EFalse, noneChosen, initialColour); - CleanupStack::PushL(colourSelectionGrid); - - if (colourSelectionGrid->ExecuteLD()) { - currentColor.setRgb(initialColour.Red(), initialColour.Green(), - initialColour.Blue(), initialColour.Alpha()); - } - CleanupStack::Pop(colourSelectionGrid); - CleanupStack::PopAndDestroy(array); - ); -#endif - return currentColor; -} - -QColor qtSymbianGetColor(const QColor &initial) -{ - return launchSymbianColorDialog(initial); -} - -QT_END_NAMESPACE - -#endif // QT_NO_COLORDIALOG diff --git a/src/widgets/dialogs/qfiledialog_symbian.cpp b/src/widgets/dialogs/qfiledialog_symbian.cpp deleted file mode 100644 index a4a7a228ba..0000000000 --- a/src/widgets/dialogs/qfiledialog_symbian.cpp +++ /dev/null @@ -1,199 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 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. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qfiledialog.h" - -#ifndef QT_NO_FILEDIALOG - -#include -#if defined(Q_WS_S60) && defined(SYMBIAN_VERSION_SYMBIAN3) -#include -#include -#include -#include -#endif -#include "private/qcore_symbian_p.h" - -QT_BEGIN_NAMESPACE - -extern QStringList qt_make_filter_list(const QString &filter); // defined in qfiledialog.cpp -extern QStringList qt_clean_filter_list(const QString &filter); // defined in qfiledialog.cpp - -enum DialogMode { DialogOpen, DialogSave, DialogFolder }; -#if defined(Q_WS_S60) && defined(SYMBIAN_VERSION_SYMBIAN3) -class CExtensionFilter : public MAknFileFilter -{ -public: - void setFilter(const QString filter) - { - QStringList unparsedFiltersList = qt_make_filter_list(filter); - QStringList filterList; - filterRxList.clear(); - - foreach (QString unparsedFilter, unparsedFiltersList) { - filterList << qt_clean_filter_list(unparsedFilter); - } - foreach (QString currentFilter, filterList) { - QRegExp filterRx(currentFilter, Qt::CaseInsensitive, QRegExp::Wildcard); - filterRxList << filterRx; - } - } - - TBool Accept(const TDesC &/*aDriveAndPath*/, const TEntry &aEntry) const - { - //If no filter for files, all can be accepted - if (filterRxList.isEmpty()) - return ETrue; - - if (aEntry.IsDir()) - return ETrue; - - foreach (QRegExp rx, filterRxList) { - QString fileName = qt_TDesC2QString(aEntry.iName); - if (rx.exactMatch(fileName)) - return ETrue; - } - - return EFalse; - } - -private: - QList filterRxList; -}; -#endif - -static QString launchSymbianDialog(const QString dialogCaption, const QString startDirectory, - const QString filter, DialogMode dialogMode) -{ - QString selection; -#if defined(Q_WS_S60) && defined(SYMBIAN_VERSION_SYMBIAN3) - TFileName startFolder; - if (!startDirectory.isEmpty()) { - QString dir = QDir::toNativeSeparators(QFileDialogPrivate::workingDirectory(startDirectory)); - startFolder = qt_QString2TPtrC(dir); - } - TInt types = AknCommonDialogsDynMem::EMemoryTypeMMCExternal| - AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage| - AknCommonDialogsDynMem::EMemoryTypePhone; - - TPtrC titlePtr(qt_QString2TPtrC(dialogCaption)); - TFileName target; - bool select = false; - int tryCount = 2; - while (tryCount--) { - TInt err(KErrNone); - TRAP(err, - if (dialogMode == DialogOpen) { - CExtensionFilter* extensionFilter = new (ELeave) CExtensionFilter; - CleanupStack::PushL(extensionFilter); - extensionFilter->setFilter(filter); - select = AknCommonDialogsDynMem::RunSelectDlgLD(types, target, - startFolder, 0, 0, titlePtr, extensionFilter); - CleanupStack::Pop(extensionFilter); - } else if (dialogMode == DialogSave) { - QString defaultFileName = QFileDialogPrivate::initialSelection(startDirectory); - target = qt_QString2TPtrC(defaultFileName); - select = AknCommonDialogsDynMem::RunSaveDlgLD(types, target, - startFolder, 0, 0, titlePtr); - } else if (dialogMode == DialogFolder) { - select = AknCommonDialogsDynMem::RunFolderSelectDlgLD(types, target, startFolder, - 0, 0, titlePtr, NULL, NULL); - } - ); - - if (err == KErrNone) { - tryCount = 0; - } else { - // Symbian native file dialog doesn't allow accessing files outside C:/Data - // It will always leave in that case, so default into QDir::rootPath() in error cases. - QString dir = QDir::toNativeSeparators(QDir::rootPath()); - startFolder = qt_QString2TPtrC(dir); - } - } - if (select) { - QFileInfo fi(qt_TDesC2QString(target)); - selection = fi.absoluteFilePath(); - } -#endif - return selection; -} - -QString qtSymbianGetOpenFileName(const QString &caption, - const QString &dir, - const QString &filter) -{ - return launchSymbianDialog(caption, dir, filter, DialogOpen); -} - -QStringList qtSymbianGetOpenFileNames(const QString &caption, - const QString &dir, - const QString &filter) -{ - QString fileName; - fileName.append(launchSymbianDialog(caption, dir, filter, DialogOpen)); - QStringList fileList; - fileList << fileName; - - return fileList; -} - -QString qtSymbianGetSaveFileName(const QString &caption, - const QString &dir) -{ - return launchSymbianDialog(caption, dir, QString(), DialogSave); -} - -QString qtSymbianGetExistingDirectory(const QString &caption, - const QString &dir) -{ - QString folderCaption; - if (!caption.isEmpty()) { - folderCaption.append(caption); - } else { - // Title for folder selection dialog is mandatory - folderCaption.append(QFileDialog::tr("Find Directory")); - } - return launchSymbianDialog(folderCaption, dir, QString(), DialogFolder); -} - -QT_END_NAMESPACE - -#endif -- cgit v1.2.3