diff --git a/plugins/advancedviewplugin/advancedviewplugin.cpp b/plugins/advancedviewplugin/advancedviewplugin.cpp index 6ce9d44..c1ad9ad 100644 --- a/plugins/advancedviewplugin/advancedviewplugin.cpp +++ b/plugins/advancedviewplugin/advancedviewplugin.cpp @@ -5,6 +5,7 @@ #include "mainwindow.h" #include "stripswidget.h" + #include "advancedviewwidget.h" AdvancedViewPlugin::AdvancedViewPlugin(QObject *parent) : diff --git a/plugins/advancedviewplugin/advancedviewwidget.cpp b/plugins/advancedviewplugin/advancedviewwidget.cpp index 15eb880..1c9c56d 100644 --- a/plugins/advancedviewplugin/advancedviewwidget.cpp +++ b/plugins/advancedviewplugin/advancedviewwidget.cpp @@ -6,10 +6,11 @@ #include "advancedviewdialog.h" AdvancedViewWidget::AdvancedViewWidget(StripsWidget &stripsWidget) : - QPushButton(&stripsWidget), + QToolButton(&stripsWidget), m_stripsWidget(stripsWidget) { setIcon(QIcon(QStringLiteral(":/zeiterfassung/plugins/advancedviewplugin/images/advanced-view.png"))); + setText(tr("Advanced view")); connect(&stripsWidget, &StripsWidget::dateChanged, this, &AdvancedViewWidget::dateChanged); dateChanged(stripsWidget.date()); diff --git a/plugins/advancedviewplugin/advancedviewwidget.h b/plugins/advancedviewplugin/advancedviewwidget.h index cb3bcd9..52bff81 100644 --- a/plugins/advancedviewplugin/advancedviewwidget.h +++ b/plugins/advancedviewplugin/advancedviewwidget.h @@ -1,11 +1,11 @@ #ifndef ADVANCEDVIEWWIDGET_H #define ADVANCEDVIEWWIDGET_H -#include +#include class StripsWidget; -class AdvancedViewWidget : public QPushButton +class AdvancedViewWidget : public QToolButton { Q_OBJECT diff --git a/plugins/lunchmealplugin/images/lunch-meal.png b/plugins/lunchmealplugin/images/lunch-meal.png new file mode 100644 index 0000000..7c83e54 Binary files /dev/null and b/plugins/lunchmealplugin/images/lunch-meal.png differ diff --git a/plugins/lunchmealplugin/lunchmealplugin.cpp b/plugins/lunchmealplugin/lunchmealplugin.cpp index ce70c4e..209428e 100644 --- a/plugins/lunchmealplugin/lunchmealplugin.cpp +++ b/plugins/lunchmealplugin/lunchmealplugin.cpp @@ -1,9 +1,21 @@ #include "lunchmealplugin.h" #include +#include + +#include "mainwindow.h" +#include "stripswidget.h" + +#include "lunchmealwidget.h" LunchMealPlugin::LunchMealPlugin(QObject *parent) : ZeiterfassungPlugin(parent) { qDebug() << "called"; } + +void LunchMealPlugin::attachTo(MainWindow &mainWindow) +{ + for(auto stripsWidget : mainWindow.stripsWidgets()) + stripsWidget->headerLayout()->addWidget(new LunchMealWidget(*stripsWidget)); +} diff --git a/plugins/lunchmealplugin/lunchmealplugin.h b/plugins/lunchmealplugin/lunchmealplugin.h index c5626a8..3c8f524 100644 --- a/plugins/lunchmealplugin/lunchmealplugin.h +++ b/plugins/lunchmealplugin/lunchmealplugin.h @@ -5,6 +5,8 @@ #include "zeiterfassungplugin.h" +class MainWindow; + class Q_DECL_EXPORT LunchMealPlugin : public ZeiterfassungPlugin { Q_OBJECT @@ -15,6 +17,7 @@ public: explicit LunchMealPlugin(QObject *parent = Q_NULLPTR); // ZeiterfassungPlugin interface + void attachTo(MainWindow &mainWindow) Q_DECL_OVERRIDE; }; #endif // LUNCHMEALPLUGIN_H diff --git a/plugins/lunchmealplugin/lunchmealplugin.pro b/plugins/lunchmealplugin/lunchmealplugin.pro index d0dd373..e57c562 100644 --- a/plugins/lunchmealplugin/lunchmealplugin.pro +++ b/plugins/lunchmealplugin/lunchmealplugin.pro @@ -14,8 +14,16 @@ DEPENDPATH += $$PWD/../../zeiterfassunglib DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT -HEADERS += lunchmealplugin.h +HEADERS += lunchmealplugin.h \ + lunchmealwidget.h -SOURCES += lunchmealplugin.cpp +SOURCES += lunchmealplugin.cpp \ + lunchmealwidget.cpp + +FORMS += + +RESOURCES += lunchmealplugin_resources.qrc + +TRANSLATIONS += OTHER_FILES += lunchmealplugin.json diff --git a/plugins/lunchmealplugin/lunchmealplugin_resources.qrc b/plugins/lunchmealplugin/lunchmealplugin_resources.qrc new file mode 100644 index 0000000..ca3c14e --- /dev/null +++ b/plugins/lunchmealplugin/lunchmealplugin_resources.qrc @@ -0,0 +1,5 @@ + + + images/lunch-meal.png + + diff --git a/plugins/lunchmealplugin/lunchmealwidget.cpp b/plugins/lunchmealplugin/lunchmealwidget.cpp new file mode 100644 index 0000000..1d5f1b2 --- /dev/null +++ b/plugins/lunchmealplugin/lunchmealwidget.cpp @@ -0,0 +1,22 @@ +#include "lunchmealwidget.h" + +#include + +#include "stripswidget.h" +#include "mainwindow.h" +#include "zeiterfassungapi.h" + +LunchMealWidget::LunchMealWidget(StripsWidget &stripsWidget) : + QToolButton(&stripsWidget), + m_stripsWidget(stripsWidget) +{ + setIcon(QIcon(QStringLiteral(":/zeiterfassung/plugins/lunchmealplugin/images/lunch-meal.png"))); + setText(tr("Lunch meal")); + + connect(this, &QAbstractButton::pressed, this, &LunchMealWidget::pressedSlot); +} + +void LunchMealWidget::pressedSlot() +{ + +} diff --git a/plugins/lunchmealplugin/lunchmealwidget.h b/plugins/lunchmealplugin/lunchmealwidget.h new file mode 100644 index 0000000..a609ab9 --- /dev/null +++ b/plugins/lunchmealplugin/lunchmealwidget.h @@ -0,0 +1,21 @@ +#ifndef LUNCHMEALWIDGET_H +#define LUNCHMEALWIDGET_H + +#include + +class StripsWidget; + +class LunchMealWidget : public QToolButton +{ + Q_OBJECT +public: + explicit LunchMealWidget(StripsWidget &stripsWidget); + +private Q_SLOTS: + void pressedSlot(); + +private: + StripsWidget &m_stripsWidget; +}; + +#endif // LUNCHMEALWIDGET_H