GUI: New experimental dialog for selecting files to check
This commit is contained in:
parent
be7691c7b4
commit
fb248ed270
|
@ -79,7 +79,8 @@ HEADERS += aboutdialog.h \
|
||||||
txtreport.h \
|
txtreport.h \
|
||||||
xmlreport.h \
|
xmlreport.h \
|
||||||
xmlreportv1.h \
|
xmlreportv1.h \
|
||||||
xmlreportv2.h
|
xmlreportv2.h \
|
||||||
|
selectfilesdialog.h
|
||||||
|
|
||||||
SOURCES += aboutdialog.cpp \
|
SOURCES += aboutdialog.cpp \
|
||||||
application.cpp \
|
application.cpp \
|
||||||
|
@ -110,7 +111,8 @@ SOURCES += aboutdialog.cpp \
|
||||||
txtreport.cpp \
|
txtreport.cpp \
|
||||||
xmlreport.cpp \
|
xmlreport.cpp \
|
||||||
xmlreportv1.cpp \
|
xmlreportv1.cpp \
|
||||||
xmlreportv2.cpp
|
xmlreportv2.cpp \
|
||||||
|
selectfilesdialog.cpp
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
DEFINES += _CRT_SECURE_NO_WARNINGS
|
DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
#include "logview.h"
|
#include "logview.h"
|
||||||
#include "filelist.h"
|
#include "filelist.h"
|
||||||
#include "showtypes.h"
|
#include "showtypes.h"
|
||||||
|
#include "selectfilesdialog.h"
|
||||||
|
|
||||||
static const QString OnlineHelpURL("http://cppcheck.sourceforge.net/manual.html");
|
static const QString OnlineHelpURL("http://cppcheck.sourceforge.net/manual.html");
|
||||||
|
|
||||||
|
@ -347,9 +348,13 @@ QStringList MainWindow::SelectFilesToCheck(QFileDialog::FileMode mode)
|
||||||
// QFileDialog::getExistingDirectory() because they show native Windows
|
// QFileDialog::getExistingDirectory() because they show native Windows
|
||||||
// selection dialog which is a lot more usable than QT:s own dialog.
|
// selection dialog which is a lot more usable than QT:s own dialog.
|
||||||
if (mode == QFileDialog::ExistingFiles) {
|
if (mode == QFileDialog::ExistingFiles) {
|
||||||
selected = QFileDialog::getOpenFileNames(this,
|
SelectFilesDialog *dialog = new SelectFilesDialog;
|
||||||
tr("Select files to check"),
|
dialog->exec();
|
||||||
mSettings->value(SETTINGS_CHECK_PATH, "").toString());
|
/*
|
||||||
|
selected = QFileDialog::getOpenFileNames(this,
|
||||||
|
tr("Select files to check"),
|
||||||
|
mSettings->value(SETTINGS_CHECK_PATH, "").toString());
|
||||||
|
*/
|
||||||
if (selected.isEmpty())
|
if (selected.isEmpty())
|
||||||
mCurrentDirectory.clear();
|
mCurrentDirectory.clear();
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -0,0 +1,103 @@
|
||||||
|
|
||||||
|
#include "selectfilesdialog.h"
|
||||||
|
|
||||||
|
#include <QTreeView>
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
#include <QFileSystemModel>
|
||||||
|
#include <QList>
|
||||||
|
#include <QString>
|
||||||
|
#include <QPushButton>
|
||||||
|
|
||||||
|
class SelectFilesModel : public QFileSystemModel {
|
||||||
|
private:
|
||||||
|
QList<QString> selected;
|
||||||
|
QList<QString> unselected;
|
||||||
|
|
||||||
|
int getindex(const QList<QString> &s, const QString &filepath) const {
|
||||||
|
for (int i = 0; i < s.size(); ++i) {
|
||||||
|
if (filepath.startsWith(s[i]))
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public:
|
||||||
|
SelectFilesModel() : QFileSystemModel() {
|
||||||
|
QStringList f;
|
||||||
|
f << "*.cpp";
|
||||||
|
setNameFilters(f);
|
||||||
|
setNameFilterDisables(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
Qt::ItemFlags flags(const QModelIndex& index) const {
|
||||||
|
if (index.column() == 0)
|
||||||
|
return QFileSystemModel::flags(index) | Qt::ItemIsUserCheckable;
|
||||||
|
return QFileSystemModel::flags(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant data(const QModelIndex& index, int role=Qt::DisplayRole) const {
|
||||||
|
if (role == Qt::CheckStateRole) {
|
||||||
|
const QString filepath = filePath(index);
|
||||||
|
if (getindex(selected,filepath) >= 0 &&
|
||||||
|
getindex(unselected,filepath) == -1)
|
||||||
|
return Qt::Checked;
|
||||||
|
|
||||||
|
return Qt::Unchecked;
|
||||||
|
}
|
||||||
|
return QFileSystemModel::data(index, role);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool setData(const QModelIndex& index, const QVariant& value, int role) {
|
||||||
|
if (role == Qt::CheckStateRole) {
|
||||||
|
const QString filepath = filePath(index);
|
||||||
|
if (unselected.indexOf(filepath) != -1) {
|
||||||
|
// remove unchecked path
|
||||||
|
unselected.removeAll(filepath);
|
||||||
|
} else if (selected.indexOf(filepath) != -1) {
|
||||||
|
// remove checked path
|
||||||
|
selected.removeAll(filepath);
|
||||||
|
|
||||||
|
// remove child unchecked paths
|
||||||
|
int i;
|
||||||
|
while ((i = getindex(unselected,filepath)) != -1) {
|
||||||
|
unselected.removeAt(i);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (getindex(selected,filepath) == -1)
|
||||||
|
selected.append(filepath);
|
||||||
|
else
|
||||||
|
unselected.append(filepath);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rowCount(index) > 0)
|
||||||
|
emit(dataChanged(index, index.child(rowCount(index)-1,0)));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return QFileSystemModel::setData(index, value, role);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
SelectFilesDialog::SelectFilesDialog() : QDialog()
|
||||||
|
{
|
||||||
|
setModal(true);
|
||||||
|
|
||||||
|
resize(300,400);
|
||||||
|
|
||||||
|
QTreeView *treeView = new QTreeView(this);
|
||||||
|
treeView->setModel(new SelectFilesModel);
|
||||||
|
for (int i = 1; i < 4; ++i)
|
||||||
|
treeView->setColumnHidden(i, true);
|
||||||
|
|
||||||
|
QPushButton *cancel = new QPushButton("Cancel", this);
|
||||||
|
connect(cancel,SIGNAL(clicked()),this,SLOT(accept()));
|
||||||
|
|
||||||
|
setLayout(new QVBoxLayout(this));
|
||||||
|
layout()->addWidget(treeView);
|
||||||
|
layout()->addWidget(cancel);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
|
||||||
|
#ifndef selectfilesdialogH
|
||||||
|
#define selectfilesdialogH
|
||||||
|
|
||||||
|
#include <QDialog>
|
||||||
|
|
||||||
|
class SelectFilesDialog : public QDialog {
|
||||||
|
public:
|
||||||
|
SelectFilesDialog();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue