From c921a6c0fcdf5bff7cdb57f5ccc312ce34be580d Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Mon, 18 Dec 2017 20:31:36 +0100 Subject: [PATCH] Added icon to advanced view widget --- .../advancedviewplugin/advancedviewplugin.cpp | 5 +++-- .../advancedviewplugin/advancedviewplugin.pro | 7 ++++++ .../advancedviewplugin_resources.qrc | 5 +++++ .../advancedviewplugin/advancedviewwidget.cpp | 20 +++++++++++++----- .../advancedviewplugin/advancedviewwidget.h | 9 +++++--- .../images/advanced-view.png | Bin 0 -> 2772 bytes 6 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 plugins/advancedviewplugin/advancedviewplugin_resources.qrc create mode 100644 plugins/advancedviewplugin/images/advanced-view.png diff --git a/plugins/advancedviewplugin/advancedviewplugin.cpp b/plugins/advancedviewplugin/advancedviewplugin.cpp index d84bae7..e4124ba 100644 --- a/plugins/advancedviewplugin/advancedviewplugin.cpp +++ b/plugins/advancedviewplugin/advancedviewplugin.cpp @@ -9,10 +9,11 @@ AdvancedViewPlugin::AdvancedViewPlugin(QObject *parent) : ZeiterfassungPlugin(parent) { + Q_INIT_RESOURCE(advancedviewplugin_resources); } void AdvancedViewPlugin::attachTo(MainWindow &mainWindow) { - for(auto irgendwas : mainWindow.stripsWidgets()) - irgendwas->headerLayout()->addWidget(new AdvancedViewWidget(mainWindow)); + for(auto stripsWidget : mainWindow.stripsWidgets()) + stripsWidget->headerLayout()->addWidget(new AdvancedViewWidget(*stripsWidget)); } diff --git a/plugins/advancedviewplugin/advancedviewplugin.pro b/plugins/advancedviewplugin/advancedviewplugin.pro index a1a3e27..3a3116b 100644 --- a/plugins/advancedviewplugin/advancedviewplugin.pro +++ b/plugins/advancedviewplugin/advancedviewplugin.pro @@ -20,4 +20,11 @@ HEADERS += advancedviewplugin.h \ SOURCES += advancedviewplugin.cpp \ advancedviewwidget.cpp +FORMS += + +RESOURCES += \ + advancedviewplugin_resources.qrc + +TRANSLATIONS += + OTHER_FILES += advancedviewplugin.json diff --git a/plugins/advancedviewplugin/advancedviewplugin_resources.qrc b/plugins/advancedviewplugin/advancedviewplugin_resources.qrc new file mode 100644 index 0000000..c0cfae7 --- /dev/null +++ b/plugins/advancedviewplugin/advancedviewplugin_resources.qrc @@ -0,0 +1,5 @@ + + + images/advanced-view.png + + diff --git a/plugins/advancedviewplugin/advancedviewwidget.cpp b/plugins/advancedviewplugin/advancedviewwidget.cpp index 124115d..aab7f36 100644 --- a/plugins/advancedviewplugin/advancedviewwidget.cpp +++ b/plugins/advancedviewplugin/advancedviewwidget.cpp @@ -1,10 +1,20 @@ #include "advancedviewwidget.h" -#include "mainwindow.h" +#include -AdvancedViewWidget::AdvancedViewWidget(MainWindow &mainWindow) : - QToolButton(&mainWindow), - m_mainWindow(mainWindow) +#include "stripswidget.h" + +AdvancedViewWidget::AdvancedViewWidget(StripsWidget &stripsWidget) : + QToolButton(&stripsWidget), + m_stripsWidget(stripsWidget) { - setText(tr("X")); + setIcon(QIcon(QStringLiteral(":/zeiterfassunglib/plugins/advancedviewplugin/images/advanced-view.png"))); + setText(tr("Advanced view")); + connect(&stripsWidget, &StripsWidget::dateChanged, this, &AdvancedViewWidget::dateChanged); + dateChanged(stripsWidget.date()); +} + +void AdvancedViewWidget::dateChanged(const QDate &date) +{ + setEnabled(date.isValid()); } diff --git a/plugins/advancedviewplugin/advancedviewwidget.h b/plugins/advancedviewplugin/advancedviewwidget.h index d6397b6..b1c33bc 100644 --- a/plugins/advancedviewplugin/advancedviewwidget.h +++ b/plugins/advancedviewplugin/advancedviewwidget.h @@ -3,17 +3,20 @@ #include -class MainWindow; +class StripsWidget; class AdvancedViewWidget : public QToolButton { Q_OBJECT public: - explicit AdvancedViewWidget(MainWindow &mainWindow); + explicit AdvancedViewWidget(StripsWidget &stripsWidget); + +private Q_SLOTS: + void dateChanged(const QDate &date); private: - MainWindow &m_mainWindow; + StripsWidget &m_stripsWidget; }; #endif // ADVANCEDVIEWWIDGET_H diff --git a/plugins/advancedviewplugin/images/advanced-view.png b/plugins/advancedviewplugin/images/advanced-view.png new file mode 100644 index 0000000000000000000000000000000000000000..7a6c875cfd20053e6c267a5d0bc1ea5e3c711c5b GIT binary patch literal 2772 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 T>iF{*sI}_p>gTe~DWM4f!P(AS literal 0 HcmV?d00001