From e8a60daade9f1776fa574bf8fb5d6fbcf4701000 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Tue, 19 Dec 2017 18:52:48 +0100 Subject: [PATCH] Added toolButton for lunchmealplugin --- .../advancedviewplugin/advancedviewplugin.cpp | 1 + .../advancedviewplugin/advancedviewwidget.cpp | 3 ++- .../advancedviewplugin/advancedviewwidget.h | 4 ++-- plugins/lunchmealplugin/images/lunch-meal.png | Bin 0 -> 3497 bytes plugins/lunchmealplugin/lunchmealplugin.cpp | 12 ++++++++++ plugins/lunchmealplugin/lunchmealplugin.h | 3 +++ plugins/lunchmealplugin/lunchmealplugin.pro | 12 ++++++++-- .../lunchmealplugin_resources.qrc | 5 ++++ plugins/lunchmealplugin/lunchmealwidget.cpp | 22 ++++++++++++++++++ plugins/lunchmealplugin/lunchmealwidget.h | 21 +++++++++++++++++ 10 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 plugins/lunchmealplugin/images/lunch-meal.png create mode 100644 plugins/lunchmealplugin/lunchmealplugin_resources.qrc create mode 100644 plugins/lunchmealplugin/lunchmealwidget.cpp create mode 100644 plugins/lunchmealplugin/lunchmealwidget.h 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 0000000000000000000000000000000000000000..7c83e542a10588e518a59d8020b36ee35effab45 GIT binary patch literal 3497 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEil8qLj2xRhDA zLG$gFnVHrt$9PrpqMRDV?(ii#%{X#wf=TNcgVcnmH^;VIHez1loDn50WZfyOT9$Kj zn)ut(x3}Lf%K!i4rLE_+%a@Zp&6eKZzvT0|z59#Lzn@cmzNp?w^QgY@me;xmz8?Fp z{a}}E<@_CrQ}n0h@LLq!u8R4|FzZ%hlIjJfC5@*KXo{TQ`1(kHVy5}hqu~b@Mw>5K zsou!Xl*IOKGsjnr@AE7+?QrT%{wPwA;V!WDOQb+O=Z`(hIXg_8b696E7UZ7bb6R!% zceRYY!z=zxzn_bXx$h{{>0_FAzl^`D`M@nM-76g0Rtf^MPrbio@WHI7%>PRRQ`7N+ z?)bFwvYFxc9un-=U?BN_`#%S&iof*nGe=ad>fzs{rjEl3A>tp zYCkwJEp5tAmagAgCdLeFXDilSb~^EF;f%I>lP5^e^r)3xDEHu=u>J09FQ2b#sC7#I ze663kpRq7sEceWv`=;f^^K~bMFW4{qCTZrPhJ2;k`Dx!TUX)VKPRir5__A92!k71r zHv$*B&ax@~e*J8C+f8RHgMc#bmls(MdwkU_+xu(nPnN*V;RhCe-@54J^@cD8p8eZD z-00eA_xV=fDTnvc6J%$3)N=a1Nqnw7w|HjOH?AMkbKN!M^W7M3<;Tz39>={>?!{}C z-2uxi6y_=AzkST_|18b;=ozkxk9y4$zf5<0!+L<{(5>4C<#)236c@PEc(6R-$DJL~ z2UH&@+SUB|ZOl7Aj`9B6702KI*7#7Ez|D|$qWbf`4^AEXHmrCj_P_64T@(M_Yqobc zoCKTr@C*BeBefcJ(jUU>xLp#@mYrwHOYte~W@_4>JY#*q|H9u{W&Vu!_pA1;u4nvV zyI|+1)$f{raCNM23iun;vEN|DJF(>fN&LIxDhriX2b?cAQ9dglXjZ(?dCOJqv{zAk zjQ@#?hTe6ml|K8EyKJ5ei@>W7+tMBH@>g)jmA-z&YJ8nLe0Qrty|!w=Cwmwf@v5r%$_1ZhvusC*$rD)_l1?8Xr5- zma^rqGbok+ob>Mh>5gr_Kiu=K Rel$7wMo?TDA{quj`qi0Gd<_9jEGCi{Ipk|7* z(r)`j3?}gm^|jiwEX%&cdpkaMbE&%$U8Bg_P@>~?I6TCaF?GhosxvQ)TFlD+oL#!4 zRQZr*<<+G}mU5lceX7~}WzmxE6Yu(;G*)>-L{Ooue7&MF6mD;Byg>SX|;vf;fNAm24Rkt`8d9!V|UpTuo@%!jXXjk0B~v6EcKTgSbovmwkZ&ZB9{M{L#RJuQ) zefz$-qQ7>}HwX`MQhq1$(Wm^a&lK_2UHPR~#zH!J+k{(%q(%cCGo*E zGF{am#Z*`8P7>et39jFN3hv@O)#_uPaw=~lM=A45hfT*<^L^iE`S04)L#KKIq~1DP z1_%A)YP;X_X|wrl%YDhBd{H%Z^5yVtcVgQ0FZqYrg8ndAyCf z@Ojtro^86ttF=R%S%-`*S7PAlW|y;O^^OH>6o3#cW!yl zRAFmarV>5*?w=)zwP!thr-gkv=C?yfyD>PoBj68PVREOqZtpN`Lq5FI$tTRafuM zIz2WiPwBXX&BxRupRa$Hd`SL4POkF|Hlw+#?oAC6+CITC%GD(Pz-^VOEoU0UJsQ(_ zx$@oR-!<*quGJmB&N*{Q`mw(7XGIf?+iy!)hK7IqYINs2i{&>5>6cgkd49>A*}XWaxz^1(BFml% z&T5nENorXP%I#bXODC-B-NJR_rpTpLcJ9A|COkZ+(OIsvx zko;Vy9rx_QVhLda~wg>L8>3#4w)$Q}LtHnVK3_(fp zJ6lShDxG-QzoPIYtJCG|cW+LKev!*gcyU&v?A{Ua>mSTt{diUShu7-jSGC^v+)3Ab zbst7Q-@Tz)zu0a^&$<9%^XKgu`aKF$tTZRc&$%RZTDId3`y*|K$#M5R5`vFU@l0oq z)Jd3Y-91}k=FFX9Eq$`LIt2S4=3g*ed`rfO%XQ;tl{_QEO0SB2AtwKK{JVHDjre>7F8)RE(B!i&i}<)>(x?mpbgyz#cmC&>q5Ep1{SEr?*Yi zyEplb+w8-#ZJRHe{o7o6hiQ8TU%t0&^%<6HCz-Zeb1s_6c&BD($La}3A6->%U&`X| za_5cs&DCnTddAz2^K;r>7q1gg{U_F8<@EUG>~{%Qc&^HYvz`rWvlfocIl+G=#N`lA zq0Y8x!WTnDXZ1Y_{+61<;>!9jscqLAgS^6H*$nm*cijm7p75(=t9*K`qtgGa1+$B` zsyE)>E0FWV`gFeQS>w07yTzo7YfWxcD)|ZSFY{Pa~kdfol(gpIUb@Xy}4GxtH{J| zcd+sr={5ZB6}EGiOk+{&s`mO@!m}sT`0;E8%?IywQ)|rr6(k)CyZ&e0Nm-G9d%9|( zH2-yVmUA@x&$xAFb?H{`7rO*%a#F3cn-cXzKkbB~KAt~YgY~B3oqOgJ!uW()y#ginbZkktaAeV3`XfeVX6>x==if+AZqqvw zdh^Y{U9nCZINys^x$J=$ZIDX`osC3?%J=5*_9X&lW zxA1R|(7m}TLEwkpvMQTB>bLFXZ;HR!^yR|kvlAx--)Rq;&$8_8Qptl>Jq0|r0k+2j z)-_M|PfQQi*uLt#cw@b&*Y7foss9w`hZ~EtXC)k5fBHF}ixtbGOxEq!Yc?!X=8>P3 z*Ki?VU2jqD6BFsVP03P^b_QLvi245_W0lrrn++cFJ{%M8$A5SCT5-H_<<@OG9XXFY zcj8aow?$(9Wt~^*#xIvA@y^nd7w@u9oVT@z^?rxVl%4gBuB#I~?Ph7c>CcbP0l+XkK`;(-! literal 0 HcmV?d00001 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