diff --git a/plugins/absenceplugin/absenceplugin.pro b/plugins/absenceplugin/absenceplugin.pro index 5e0eb4f..65a0bbe 100644 --- a/plugins/absenceplugin/absenceplugin.pro +++ b/plugins/absenceplugin/absenceplugin.pro @@ -4,17 +4,20 @@ TARGET = absenceplugin DBLIBS += core gui -HEADERS += absencedialog.h \ +HEADERS += \ absencesmodel.h \ absenceplugin.h \ - absencewidget.h + absencewidget.h \ + absencesdialog.h -SOURCES += absencedialog.cpp \ +SOURCES += \ absencesmodel.cpp \ absenceplugin.cpp \ - absencewidget.cpp + absencewidget.cpp \ + absencesdialog.cpp -FORMS += absencedialog.ui +FORMS += \ + absencesdialog.ui RESOURCES += absenceplugin_resources.qrc diff --git a/plugins/absenceplugin/absencedialog.cpp b/plugins/absenceplugin/absencesdialog.cpp similarity index 83% rename from plugins/absenceplugin/absencedialog.cpp rename to plugins/absenceplugin/absencesdialog.cpp index 40c66fa..0e249aa 100644 --- a/plugins/absenceplugin/absencedialog.cpp +++ b/plugins/absenceplugin/absencesdialog.cpp @@ -1,5 +1,5 @@ -#include "absencedialog.h" -#include "ui_absencedialog.h" +#include "absencesdialog.h" +#include "ui_absencesdialog.h" #include #include @@ -10,35 +10,35 @@ #include "absencesmodel.h" -AbsenceDialog::AbsenceDialog(int userId, const QDate &date, ZeiterfassungApi &erfassung, QWidget *parent) : +AbsencesDialog::AbsencesDialog(int userId, const QDate &date, ZeiterfassungApi &erfassung, QWidget *parent) : ZeiterfassungDialog(parent), - ui(new Ui::AbsenceDialog) + ui(new Ui::AbsencesDialog) { ui->setupUi(this); ui->labelTitle->setText(tr("Absences for %0").arg(QLocale().toString(date))); m_model = new AbsencesModel(userId, date, erfassung, this); - connect(m_model, &AbsencesModel::errorOccured, this, &AbsenceDialog::errorOccured); + connect(m_model, &AbsencesModel::errorOccured, this, &AbsencesDialog::errorOccured); ui->treeView->setModel(m_model); ui->treeView->setEnabled(m_model->enabled()); connect(m_model, &AbsencesModel::enabledChanged, ui->treeView, &QWidget::setEnabled); - connect(ui->treeView, &QWidget::customContextMenuRequested, this, &AbsenceDialog::customContextMenuRequested); + connect(ui->treeView, &QWidget::customContextMenuRequested, this, &AbsencesDialog::customContextMenuRequested); } -AbsenceDialog::~AbsenceDialog() +AbsencesDialog::~AbsencesDialog() { delete ui; } -void AbsenceDialog::errorOccured(const QString &message) +void AbsencesDialog::errorOccured(const QString &message) { QMessageBox::warning(this, tr("Could not load absences!"), tr("Could not load absences!") % "\n\n" % message); } -void AbsenceDialog::customContextMenuRequested(const QPoint &pos) +void AbsencesDialog::customContextMenuRequested(const QPoint &pos) { auto index = ui->treeView->indexAt(pos); diff --git a/plugins/absenceplugin/absencedialog.h b/plugins/absenceplugin/absencesdialog.h similarity index 54% rename from plugins/absenceplugin/absencedialog.h rename to plugins/absenceplugin/absencesdialog.h index 9ab7e80..ea5effb 100644 --- a/plugins/absenceplugin/absencedialog.h +++ b/plugins/absenceplugin/absencesdialog.h @@ -7,22 +7,22 @@ class QDate; class ZeiterfassungApi; class AbsencesModel; -namespace Ui { class AbsenceDialog; } +namespace Ui { class AbsencesDialog; } -class AbsenceDialog : public ZeiterfassungDialog +class AbsencesDialog : public ZeiterfassungDialog { Q_OBJECT public: - explicit AbsenceDialog(int userId, const QDate &date, ZeiterfassungApi &erfassung, QWidget *parent = 0); - ~AbsenceDialog(); + explicit AbsencesDialog(int userId, const QDate &date, ZeiterfassungApi &erfassung, QWidget *parent = 0); + ~AbsencesDialog(); private Q_SLOTS: void errorOccured(const QString &message); void customContextMenuRequested(const QPoint &pos); private: - Ui::AbsenceDialog *ui; + Ui::AbsencesDialog *ui; AbsencesModel *m_model; }; diff --git a/plugins/absenceplugin/absencedialog.ui b/plugins/absenceplugin/absencesdialog.ui similarity index 91% rename from plugins/absenceplugin/absencedialog.ui rename to plugins/absenceplugin/absencesdialog.ui index 4db3095..b4f5d80 100644 --- a/plugins/absenceplugin/absencedialog.ui +++ b/plugins/absenceplugin/absencesdialog.ui @@ -1,7 +1,7 @@ - AbsenceDialog - + AbsencesDialog + 0 @@ -50,7 +50,7 @@ buttonBox accepted() - AbsenceDialog + AbsencesDialog accept() @@ -66,7 +66,7 @@ buttonBox rejected() - AbsenceDialog + AbsencesDialog reject() diff --git a/plugins/absenceplugin/absencewidget.cpp b/plugins/absenceplugin/absencewidget.cpp index 444f87f..23ebd4b 100644 --- a/plugins/absenceplugin/absencewidget.cpp +++ b/plugins/absenceplugin/absencewidget.cpp @@ -3,7 +3,7 @@ #include "stripswidget.h" #include "mainwindow.h" -#include "absencedialog.h" +#include "absencesdialog.h" AbsenceWidget::AbsenceWidget(StripsWidget &stripsWidget) : QToolButton(&stripsWidget), @@ -17,7 +17,7 @@ AbsenceWidget::AbsenceWidget(StripsWidget &stripsWidget) : void AbsenceWidget::pressedSlot() { - AbsenceDialog dialog(m_stripsWidget.mainWindow().userInfo().userId, m_stripsWidget.date(), + AbsencesDialog dialog(m_stripsWidget.mainWindow().userInfo().userId, m_stripsWidget.date(), m_stripsWidget.mainWindow().erfassung(), this); dialog.exec(); }