diff --git a/shell/openprojectdialog.h b/shell/openprojectdialog.h --- a/shell/openprojectdialog.h +++ b/shell/openprojectdialog.h @@ -65,6 +65,7 @@ KPageWidgetItem* openPage; KPageWidgetItem* projectInfoPage; QStringList m_fileList; + QMap m_projectFilters; KDevelop::OpenProjectPage* openPageWidget; KDevelop::ProjectSourcePage* sourcePageWidget; diff --git a/shell/openprojectdialog.cpp b/shell/openprojectdialog.cpp --- a/shell/openprojectdialog.cpp +++ b/shell/openprojectdialog.cpp @@ -22,6 +22,7 @@ #include "core.h" #include "uicontroller.h" +#include "plugincontroller.h" #include "mainwindow.h" #include "shellextension.h" #include "projectsourcepage.h" @@ -38,6 +39,24 @@ { resize(QSize(700, 500)); + QStringList filters, allEntry; + allEntry << "*." + ShellExtension::getInstance()->projectFileExtension(); + filters << QStringLiteral("%1|%2 (%1)").arg("*." + ShellExtension::getInstance()->projectFileExtension(), ShellExtension::getInstance()->projectFileDescription()); + QVector plugins = ICore::self()->pluginController()->queryExtensionPlugins(QStringLiteral("org.kdevelop.IProjectFileManager")); + foreach(const KPluginMetaData& info, plugins) + { + QStringList filter = KPluginMetaData::readStringList(info.rawData(), QStringLiteral("X-KDevelop-ProjectFilesFilter")); + QString desc = info.value(QStringLiteral("X-KDevelop-ProjectFilesFilterDescription")); + + if (!filter.isEmpty() && !desc.isEmpty()) { + m_projectFilters.insert(info.name(), filter); + allEntry += filter; + filters << QStringLiteral("%1|%2 (%1)").arg(filter.join(QStringLiteral(" ")), desc); + } + } + + filters.prepend(i18n("%1|All Project Files (%1)", allEntry.join(QStringLiteral(" ")))); + QUrl start = startUrl.isValid() ? startUrl : Core::self()->projectController()->projectsBaseDirectory(); start = start.adjusted(QUrl::NormalizePathSegments); KPageWidgetItem* currentPage = 0; @@ -49,7 +68,7 @@ currentPage = sourcePage; } - openPageWidget = new OpenProjectPage( start, this ); + openPageWidget = new OpenProjectPage( start, filters, this ); connect( openPageWidget, &OpenProjectPage::urlSelected, this, &OpenProjectDialog::validateOpenUrl ); connect( openPageWidget, &OpenProjectPage::accepted, this, &OpenProjectDialog::openPageAccepted ); openPage = addPage( openPageWidget, i18n("Select a build system setup file, existing KDevelop project, " @@ -136,43 +155,39 @@ if( page ) { page->setProjectName( m_url.fileName() ); - OpenProjectPage* page2 = qobject_cast( openPage->widget() ); - if( page2 ) + // Default manager + page->setProjectManager( QStringLiteral("Generic Project Manager") ); + // clear the filelist + m_fileList.clear(); + + if( isDir ) { + // If a dir was selected fetch all files in it + KIO::ListJob* job = KIO::listDir( m_url ); + connect( job, &KIO::ListJob::entries, + this, &OpenProjectDialog::storeFileList); + KJobWidgets::setWindow(job, Core::self()->uiController()->activeMainWindow()); + job->exec(); + } else { + // Else we'lll just take the given file + m_fileList << url.fileName(); + } + // Now find a manager for the file(s) in our filelist. + bool managerFound = false; + foreach( const QString& manager, m_projectFilters.keys() ) { - // Default manager - page->setProjectManager( QStringLiteral("Generic Project Manager") ); - // clear the filelist - m_fileList.clear(); - - if( isDir ) { - // If a dir was selected fetch all files in it - KIO::ListJob* job = KIO::listDir( m_url ); - connect( job, &KIO::ListJob::entries, - this, &OpenProjectDialog::storeFileList); - KJobWidgets::setWindow(job, Core::self()->uiController()->activeMainWindow()); - job->exec(); - } else { - // Else we'lll just take the given file - m_fileList << url.fileName(); - } - // Now find a manager for the file(s) in our filelist. - bool managerFound = false; - foreach( const QString& manager, page2->projectFilters().keys() ) + foreach( const QString& filterexp, m_projectFilters.value(manager) ) { - foreach( const QString& filterexp, page2->projectFilters().value(manager) ) - { - if( !m_fileList.filter( QRegExp( filterexp, Qt::CaseSensitive, QRegExp::Wildcard ) ).isEmpty() ) - { - managerFound = true; - break; - } - } - if( managerFound ) + if( !m_fileList.filter( QRegExp( filterexp, Qt::CaseSensitive, QRegExp::Wildcard ) ).isEmpty() ) { - page->setProjectManager( manager ); + managerFound = true; break; } } + if( managerFound ) + { + page->setProjectManager( manager ); + break; + } } } m_url.setPath( m_url.path() + '/' + m_url.fileName() + '.' + ShellExtension::getInstance()->projectFileExtension() ); diff --git a/shell/openprojectpage.h b/shell/openprojectpage.h --- a/shell/openprojectpage.h +++ b/shell/openprojectpage.h @@ -25,8 +25,8 @@ Q_OBJECT public: - explicit OpenProjectPage( const QUrl& startUrl, QWidget* parent = nullptr ); - QMap projectFilters() const; + explicit OpenProjectPage( const QUrl& startUrl, const QStringList& filters, + QWidget* parent = nullptr ); void setUrl(const QUrl& url); signals: @@ -45,7 +45,6 @@ private: QUrl getAbsoluteUrl(const QString&) const; KFileWidget* fileWidget; - QMap m_projectFilters; }; } diff --git a/shell/openprojectpage.cpp b/shell/openprojectpage.cpp --- a/shell/openprojectpage.cpp +++ b/shell/openprojectpage.cpp @@ -20,37 +20,18 @@ #include "shellextension.h" #include "core.h" -#include "plugincontroller.h" namespace KDevelop { -OpenProjectPage::OpenProjectPage( const QUrl& startUrl, QWidget* parent ) +OpenProjectPage::OpenProjectPage( const QUrl& startUrl, const QStringList& filters, + QWidget* parent ) : QWidget( parent ) { QHBoxLayout* layout = new QHBoxLayout( this ); fileWidget = new KFileWidget( startUrl, this); - QStringList filters; - QStringList allEntry; - allEntry << "*."+ShellExtension::getInstance()->projectFileExtension(); - filters << QStringLiteral( "%1|%2 (%1)").arg("*."+ShellExtension::getInstance()->projectFileExtension(), ShellExtension::getInstance()->projectFileDescription()); - QVector plugins = ICore::self()->pluginController()->queryExtensionPlugins( QStringLiteral( "org.kdevelop.IProjectFileManager" ) ); - foreach(const KPluginMetaData& info, plugins) - { - QStringList filter = KPluginMetaData::readStringList(info.rawData(), QStringLiteral("X-KDevelop-ProjectFilesFilter")); - QString desc = info.value(QStringLiteral("X-KDevelop-ProjectFilesFilterDescription")); - QString filterline; - if(!filter.isEmpty() && !desc.isEmpty()) { - m_projectFilters.insert(info.name(), filter); - allEntry += filter; - filters << QStringLiteral("%1|%2 (%1)").arg(filter.join(QStringLiteral(" ")), desc); - } - } - - filters.prepend( i18n( "%1|All Project Files (%1)", allEntry.join( QStringLiteral(" ") ) ) ); - fileWidget->setFilter( filters.join(QStringLiteral("\n")) ); fileWidget->setMode( KFile::Modes( KFile::File | KFile::Directory | KFile::ExistingOnly ) ); @@ -120,10 +101,5 @@ emit urlSelected( getAbsoluteUrl( file ) ); } -QMap OpenProjectPage::projectFilters() const -{ - return m_projectFilters; -} - }