From 0246a11aa7bfef5460bbb968b4025bb77367c5b5 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 17 Dec 2010 13:17:35 +0100
Subject: [PATCH] Maemo: Improve file selection dialog for publishing.
- Make sure file names are completely visible.
- Show hidden files.
- Pre-unselect files of types unlikely to be included in the package.
---
.../qt-maemo/maemopublishedprojectmodel.cpp | 28 +++++++++++++++++++
.../qt-maemo/maemopublishedprojectmodel.h | 3 ++
.../maemopublishingfileselectiondialog.cpp | 2 ++
3 files changed, 33 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.cpp
index 66750ae9651..625f3e65a49 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.cpp
@@ -40,6 +40,8 @@
****************************************************************************/
#include "maemopublishedprojectmodel.h"
+#include <QtCore/QFileInfo>
+
namespace Qt4ProjectManager {
namespace Internal {
namespace {
@@ -49,6 +51,32 @@ const int IncludeColumn = 2;
MaemoPublishedProjectModel::MaemoPublishedProjectModel(QObject *parent)
: QFileSystemModel(parent)
{
+ setFilter(filter() | QDir::Hidden | QDir::System);
+}
+
+void MaemoPublishedProjectModel::initFilesToExclude()
+{
+ initFilesToExclude(rootPath());
+}
+
+void MaemoPublishedProjectModel::initFilesToExclude(const QString &filePath)
+{
+ QFileInfo fi(filePath);
+ if (fi.isDir()) {
+ const QStringList fileNames = QDir(filePath).entryList(QDir::Files
+ | QDir::Dirs | QDir::NoDotAndDotDot | QDir::System | QDir::Hidden);
+ foreach (const QString &fileName, fileNames)
+ initFilesToExclude(filePath + QLatin1Char('/') + fileName);
+ } else {
+ const QString &fileName = fi.fileName();
+ if (fi.isHidden() || fileName.endsWith(QLatin1String(".o"))
+ || fileName == QLatin1String("Makefile")
+ || fileName.contains(QLatin1String(".pro.user"))
+ || fileName.contains(QLatin1String(".so"))
+ || fileName.endsWith(QLatin1String(".a"))) {
+ m_filesToExclude.insert(filePath);
+ }
+ }
}
int MaemoPublishedProjectModel::columnCount(const QModelIndex &parent) const
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.h b/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.h
index e0b4cb62507..51de90c3d03 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.h
@@ -53,6 +53,7 @@ class MaemoPublishedProjectModel : public QFileSystemModel
Q_OBJECT
public:
explicit MaemoPublishedProjectModel(QObject *parent = 0);
+ void initFilesToExclude();
QStringList filesToExclude() const { return m_filesToExclude.toList(); }
private:
@@ -65,6 +66,8 @@ private:
int role);
virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+ void initFilesToExclude(const QString &filePath);
+
QSet<QString> m_filesToExclude;
};
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.cpp
index 5bc22569deb..ed123a76d50 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.cpp
@@ -54,8 +54,10 @@ MaemoPublishingFileSelectionDialog::MaemoPublishingFileSelectionDialog(const QSt
ui->setupUi(this);
m_projectModel = new MaemoPublishedProjectModel(this);
const QModelIndex rootIndex = m_projectModel->setRootPath(projectPath);
+ m_projectModel->initFilesToExclude();
ui->projectView->setModel(m_projectModel);
ui->projectView->setRootIndex(rootIndex);
+ ui->projectView->header()->setResizeMode(0, QHeaderView::ResizeToContents);
}
MaemoPublishingFileSelectionDialog::~MaemoPublishingFileSelectionDialog()
--
GitLab