diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -8,8 +8,8 @@ itemdelegate.cpp messagebox.cpp messageboxinterface.cpp - newprojectdialog.cpp - newprojectdialoginterface.cpp + nameanddatasourcedialog.cpp + nameanddatasourcedialoginterface.cpp pageview.cpp pageviewerrorhandler.cpp runningtaskwidget.cpp @@ -20,7 +20,7 @@ ki18n_wrap_ui(widgets_SRCS editorview.ui filterwidget.ui - newprojectdialog.ui + nameanddatasourcedialog.ui ) add_library(widgets STATIC ${widgets_SRCS}) diff --git a/src/widgets/availablepagesview.h b/src/widgets/availablepagesview.h --- a/src/widgets/availablepagesview.h +++ b/src/widgets/availablepagesview.h @@ -41,15 +41,15 @@ namespace Widgets { -class NewProjectDialogInterface; +class NameAndDataSourceDialogInterface; class QuickSelectDialogInterface; class AvailablePagesView : public QWidget { Q_OBJECT public: - typedef QSharedPointer NewProjectDialogPtr; - typedef std::function ProjectDialogFactory; + typedef QSharedPointer NameAndDataSourceDialogPtr; + typedef std::function ProjectDialogFactory; typedef QSharedPointer QuickSelectDialogPtr; typedef std::function QuickSelectDialogFactory; diff --git a/src/widgets/availablepagesview.cpp b/src/widgets/availablepagesview.cpp --- a/src/widgets/availablepagesview.cpp +++ b/src/widgets/availablepagesview.cpp @@ -38,7 +38,7 @@ #include "presentation/querytreemodelbase.h" #include "widgets/messagebox.h" -#include "widgets/newprojectdialog.h" +#include "widgets/nameanddatasourcedialog.h" #include "widgets/quickselectdialog.h" #include "domain/project.h" @@ -97,7 +97,7 @@ layout->setContentsMargins(margins); m_projectDialogFactory = [] (QWidget *parent) { - return NewProjectDialogPtr(new NewProjectDialog(parent)); + return NameAndDataSourceDialogPtr(new NameAndDataSourceDialog(parent)); }; m_quickSelectDialogFactory = [] (QWidget *parent) { return QuickSelectDialogPtr(new QuickSelectDialog(parent)); @@ -241,7 +241,7 @@ void AvailablePagesView::onAddProjectTriggered() { - NewProjectDialogInterface::Ptr dialog = m_projectDialogFactory(this); + NameAndDataSourceDialogInterface::Ptr dialog = m_projectDialogFactory(this); dialog->setDataSourcesModel(m_sources); if (dialog->exec() == QDialog::Accepted) { @@ -254,7 +254,7 @@ void AvailablePagesView::onAddContextTriggered() { - NewProjectDialogInterface::Ptr dialog = m_projectDialogFactory(this); + NameAndDataSourceDialogInterface::Ptr dialog = m_projectDialogFactory(this); dialog->setWindowTitle(i18n("Add a context")); dialog->setDataSourcesModel(m_sources); diff --git a/src/widgets/newprojectdialog.h b/src/widgets/nameanddatasourcedialog.h rename from src/widgets/newprojectdialog.h rename to src/widgets/nameanddatasourcedialog.h --- a/src/widgets/newprojectdialog.h +++ b/src/widgets/nameanddatasourcedialog.h @@ -22,28 +22,28 @@ */ -#ifndef WIDGETS_NEWPROJECTDIALOG_H -#define WIDGETS_NEWPROJECTDIALOG_H +#ifndef WIDGETS_NAMEANDDATASOURCEDIALOG_H +#define WIDGETS_NAMEANDDATASOURCEDIALOG_H #include -#include "widgets/newprojectdialoginterface.h" +#include "widgets/nameanddatasourcedialoginterface.h" class QModelIndex; class KDescendantsProxyModel; namespace Ui { - class NewProjectDialog; + class NameAndDataSourceDialog; } namespace Widgets { -class NewProjectDialog : public QDialog, public NewProjectDialogInterface +class NameAndDataSourceDialog : public QDialog, public NameAndDataSourceDialogInterface { Q_OBJECT public: - explicit NewProjectDialog(QWidget *parent = nullptr); - ~NewProjectDialog(); + explicit NameAndDataSourceDialog(QWidget *parent = nullptr); + ~NameAndDataSourceDialog(); int exec() override; @@ -61,12 +61,12 @@ private: void applyDefaultSource(const QModelIndex &root); - Ui::NewProjectDialog *ui; + Ui::NameAndDataSourceDialog *ui; KDescendantsProxyModel *m_flattenProxy; QString m_name; Domain::DataSource::Ptr m_source; }; } -#endif // WIDGETS_NEWPROJECTDIALOG_H +#endif // WIDGETS_NAMEANDDATASOURCEDIALOG_H diff --git a/src/widgets/newprojectdialog.cpp b/src/widgets/nameanddatasourcedialog.cpp rename from src/widgets/newprojectdialog.cpp rename to src/widgets/nameanddatasourcedialog.cpp --- a/src/widgets/newprojectdialog.cpp +++ b/src/widgets/nameanddatasourcedialog.cpp @@ -22,9 +22,9 @@ */ -#include "newprojectdialog.h" +#include "nameanddatasourcedialog.h" -#include "ui_newprojectdialog.h" +#include "ui_nameanddatasourcedialog.h" #include #include @@ -54,50 +54,50 @@ } }; -NewProjectDialog::NewProjectDialog(QWidget *parent) +NameAndDataSourceDialog::NameAndDataSourceDialog(QWidget *parent) : QDialog(parent), - ui(new Ui::NewProjectDialog), + ui(new Ui::NameAndDataSourceDialog), m_flattenProxy(new KDescendantsProxyModel(this)) { ui->setupUi(this); - connect(ui->nameEdit, &QLineEdit::textChanged, this, &NewProjectDialog::onUserInputChanged); + connect(ui->nameEdit, &QLineEdit::textChanged, this, &NameAndDataSourceDialog::onUserInputChanged); auto taskSourceProxy = new TaskSourceProxy(this); taskSourceProxy->setSourceModel(m_flattenProxy); ui->sourceCombo->setModel(taskSourceProxy); m_flattenProxy->setDisplayAncestorData(true); connect(ui->sourceCombo, static_cast(&QComboBox::currentIndexChanged), - this, &NewProjectDialog::onUserInputChanged); + this, &NameAndDataSourceDialog::onUserInputChanged); onUserInputChanged(); } -NewProjectDialog::~NewProjectDialog() +NameAndDataSourceDialog::~NameAndDataSourceDialog() { delete ui; } -int NewProjectDialog::exec() +int NameAndDataSourceDialog::exec() { return QDialog::exec(); } -void NewProjectDialog::accept() +void NameAndDataSourceDialog::accept() { m_name = ui->nameEdit->text(); m_source = ui->sourceCombo->itemData(ui->sourceCombo->currentIndex(), Presentation::QueryTreeModelBase::ObjectRole) .value(); QDialog::accept(); } -void NewProjectDialog::setWindowTitle(const QString &title) +void NameAndDataSourceDialog::setWindowTitle(const QString &title) { QDialog::setWindowTitle(title); } -void NewProjectDialog::setDataSourcesModel(QAbstractItemModel *model) +void NameAndDataSourceDialog::setDataSourcesModel(QAbstractItemModel *model) { m_flattenProxy->setSourceModel(model); auto proxy = ui->sourceCombo->model(); @@ -109,17 +109,17 @@ } } -QString NewProjectDialog::name() const +QString NameAndDataSourceDialog::name() const { return m_name; } -Domain::DataSource::Ptr NewProjectDialog::dataSource() const +Domain::DataSource::Ptr NameAndDataSourceDialog::dataSource() const { return m_source; } -void NewProjectDialog::onUserInputChanged() +void NameAndDataSourceDialog::onUserInputChanged() { const auto text = ui->nameEdit->text(); const auto source = ui->sourceCombo->itemData(ui->sourceCombo->currentIndex(), @@ -130,4 +130,4 @@ buttonOk->setEnabled(!text.isEmpty() && source); } -#include "newprojectdialog.moc" +#include "nameanddatasourcedialog.moc" diff --git a/src/widgets/newprojectdialog.ui b/src/widgets/nameanddatasourcedialog.ui rename from src/widgets/newprojectdialog.ui rename to src/widgets/nameanddatasourcedialog.ui --- a/src/widgets/newprojectdialog.ui +++ b/src/widgets/nameanddatasourcedialog.ui @@ -1,7 +1,7 @@ - NewProjectDialog - + NameAndDataSourceDialog + 0 @@ -65,7 +65,7 @@ buttonBox accepted() - NewProjectDialog + NameAndDataSourceDialog accept() @@ -81,7 +81,7 @@ buttonBox rejected() - NewProjectDialog + NameAndDataSourceDialog reject() diff --git a/src/widgets/newprojectdialoginterface.h b/src/widgets/nameanddatasourcedialoginterface.h rename from src/widgets/newprojectdialoginterface.h rename to src/widgets/nameanddatasourcedialoginterface.h --- a/src/widgets/newprojectdialoginterface.h +++ b/src/widgets/nameanddatasourcedialoginterface.h @@ -22,8 +22,8 @@ */ -#ifndef WIDGETS_NEWPROJECTDIALOGINTERFACE_H -#define WIDGETS_NEWPROJECTDIALOGINTERFACE_H +#ifndef WIDGETS_NAMEANDDATASOURCEDIALOGINTERFACE_H +#define WIDGETS_NAMEANDDATASOURCEDIALOGINTERFACE_H #include @@ -33,13 +33,12 @@ namespace Widgets { -// This is used to create both Projects and Contexts -class NewProjectDialogInterface +class NameAndDataSourceDialogInterface { public: - typedef QSharedPointer Ptr; + typedef QSharedPointer Ptr; - virtual ~NewProjectDialogInterface(); + virtual ~NameAndDataSourceDialogInterface(); virtual int exec() = 0; @@ -51,4 +50,4 @@ } -#endif // WIDGETS_NEWPROJECTDIALOGINTERFACE_H +#endif // WIDGETS_NAMEANDDATASOURCEDIALOGINTERFACE_H diff --git a/src/widgets/newprojectdialoginterface.cpp b/src/widgets/nameanddatasourcedialoginterface.cpp rename from src/widgets/newprojectdialoginterface.cpp rename to src/widgets/nameanddatasourcedialoginterface.cpp --- a/src/widgets/newprojectdialoginterface.cpp +++ b/src/widgets/nameanddatasourcedialoginterface.cpp @@ -22,10 +22,10 @@ */ -#include "newprojectdialoginterface.h" +#include "nameanddatasourcedialoginterface.h" using namespace Widgets; -NewProjectDialogInterface::~NewProjectDialogInterface() +NameAndDataSourceDialogInterface::~NameAndDataSourceDialogInterface() { } diff --git a/tests/units/widgets/CMakeLists.txt b/tests/units/widgets/CMakeLists.txt --- a/tests/units/widgets/CMakeLists.txt +++ b/tests/units/widgets/CMakeLists.txt @@ -4,7 +4,7 @@ availablesourcesviewtest editorviewtest filterwidgettest - newprojectdialogtest + nameanddatasourcedialogtest pageviewerrorhandlertest pageviewtest quickselectdialogtest diff --git a/tests/units/widgets/availablepagesviewtest.cpp b/tests/units/widgets/availablepagesviewtest.cpp --- a/tests/units/widgets/availablepagesviewtest.cpp +++ b/tests/units/widgets/availablepagesviewtest.cpp @@ -39,17 +39,17 @@ #include "presentation/querytreemodelbase.h" #include "widgets/availablepagesview.h" -#include "widgets/newprojectdialog.h" +#include "widgets/nameanddatasourcedialog.h" #include "widgets/quickselectdialog.h" #include "messageboxstub.h" -class NewProjectDialogStub : public Widgets::NewProjectDialogInterface +class NameAndDataSourceDialogStub : public Widgets::NameAndDataSourceDialogInterface { public: - typedef QSharedPointer Ptr; + typedef QSharedPointer Ptr; - explicit NewProjectDialogStub() + explicit NameAndDataSourceDialogStub() : parent(nullptr), execCount(0), sourceModel(nullptr), @@ -196,7 +196,7 @@ QVERIFY(goToAction); auto projectDialogFactory = available.projectDialogFactory(); - QVERIFY(projectDialogFactory(&available).dynamicCast()); + QVERIFY(projectDialogFactory(&available).dynamicCast()); auto quickSelectDialogFactory = available.quickSelectDialogFactory(); QVERIFY(quickSelectDialogFactory(&available).dynamicCast()); @@ -262,7 +262,7 @@ // GIVEN AvailablePagesModelStub model; QStringListModel sourceModel; - auto dialogStub = NewProjectDialogStub::Ptr::create(); + auto dialogStub = NameAndDataSourceDialogStub::Ptr::create(); auto source = Domain::DataSource::Ptr::create(); @@ -296,7 +296,7 @@ // GIVEN AvailablePagesModelStub model; QStringListModel sourceModel; - auto dialogStub = NewProjectDialogStub::Ptr::create(); + auto dialogStub = NameAndDataSourceDialogStub::Ptr::create(); auto source = Domain::DataSource::Ptr::create(); diff --git a/tests/units/widgets/newprojectdialogtest.cpp b/tests/units/widgets/nameanddatasourcedialogtest.cpp rename from tests/units/widgets/newprojectdialogtest.cpp rename to tests/units/widgets/nameanddatasourcedialogtest.cpp --- a/tests/units/widgets/newprojectdialogtest.cpp +++ b/tests/units/widgets/nameanddatasourcedialogtest.cpp @@ -33,7 +33,7 @@ #include "presentation/querytreemodelbase.h" -#include "widgets/newprojectdialog.h" +#include "widgets/nameanddatasourcedialog.h" class UserInputSimulator : public QObject { @@ -68,13 +68,13 @@ } public: - Widgets::NewProjectDialog *dialog; + Widgets::NameAndDataSourceDialog *dialog; bool reject; QString nameInput; int sourceComboIndex; }; -class NewProjectDialogTest : public QObject +class NameAndDataSourceDialogTest : public QObject { Q_OBJECT private: @@ -126,7 +126,7 @@ private slots: void shouldHaveDefaultState() { - Widgets::NewProjectDialog dialog; + Widgets::NameAndDataSourceDialog dialog; QVERIFY(dialog.name().isEmpty()); QVERIFY(dialog.dataSource().isNull()); @@ -149,7 +149,7 @@ void shouldPositionDefaultProperties() { // GIVEN - Widgets::NewProjectDialog dialog; + Widgets::NameAndDataSourceDialog dialog; auto sourceModel = createSourceModel(); auto sourceCombo = dialog.findChild(QStringLiteral("sourceCombo")); @@ -164,7 +164,7 @@ void shouldProvideUserInputWhenAccepted() { // GIVEN - Widgets::NewProjectDialog dialog; + Widgets::NameAndDataSourceDialog dialog; auto sourceModel = createSourceModel(); dialog.setDataSourcesModel(sourceModel); @@ -191,7 +191,7 @@ void shouldNotProvideUserInputWhenReject() { // GIVEN - Widgets::NewProjectDialog dialog; + Widgets::NameAndDataSourceDialog dialog; auto sourceModel = createSourceModel(); dialog.setDataSourcesModel(sourceModel); @@ -213,7 +213,7 @@ void shouldNotAllowEmptyName() { // GIVEN - Widgets::NewProjectDialog dialog; + Widgets::NameAndDataSourceDialog dialog; auto sourceModel = createSourceModel(); dialog.setDataSourcesModel(sourceModel); @@ -237,7 +237,7 @@ void shouldNotAllowNoSelectedSource() { // GIVEN - Widgets::NewProjectDialog dialog; + Widgets::NameAndDataSourceDialog dialog; auto sourceModel = createSourceModel(); dialog.setDataSourcesModel(sourceModel); @@ -259,6 +259,6 @@ } }; -ZANSHIN_TEST_MAIN(NewProjectDialogTest) +ZANSHIN_TEST_MAIN(NameAndDataSourceDialogTest) -#include "newprojectdialogtest.moc" +#include "nameanddatasourcedialogtest.moc"