feedc0de/QtZeiterfassung
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Reports plugin #34

Merged
0xFEEDC0DE64 merged 7 commits from reports-plugin into devel 2017-12-19 00:18:52 +01:00
Conversation 0 Commits 7 Files Changed 39 +151 -62
24 changed files with 151 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e5a636868 - Show all commits

1
plugins/advancedviewplugin/advancedviewplugin.cpp
View File

@@ -11,7 +11,6 @@ AdvancedViewPlugin::AdvancedViewPlugin(QObject *parent) :
ZeiterfassungPlugin(parent)
{
qDebug() << "called";
Q_INIT_RESOURCE(advancedviewplugin_resources);
}
void AdvancedViewPlugin::attachTo(MainWindow &mainWindow)

2
plugins/advancedviewplugin/advancedviewplugin_resources.qrc
View File

@@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/zeiterfassunglib/plugins/advancedviewplugin">
<qresource prefix="/zeiterfassung/plugins/advancedviewplugin">
<file>images/advanced-view.png</file>
</qresource>
</RCC>

2
plugins/advancedviewplugin/advancedviewwidget.cpp
View File

@@ -9,7 +9,7 @@ AdvancedViewWidget::AdvancedViewWidget(StripsWidget &stripsWidget) :
QPushButton(&stripsWidget),
m_stripsWidget(stripsWidget)
{
setIcon(QIcon(QStringLiteral(":/zeiterfassunglib/plugins/advancedviewplugin/images/advanced-view.png")));
setIcon(QIcon(QStringLiteral(":/zeiterfassung/plugins/advancedviewplugin/images/advanced-view.png")));
connect(&stripsWidget, &StripsWidget::dateChanged, this, &AdvancedViewWidget::dateChanged);
dateChanged(stripsWidget.date());

BIN
plugins/presenceplugin/images/refresh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

10
plugins/presenceplugin/presenceplugin.pro
View File

@@ -15,9 +15,15 @@ DEPENDPATH += $$PWD/../../zeiterfassunglib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
HEADERS += presenceplugin.h \
presencewidget.h
presencewidget.h
SOURCES += presenceplugin.cpp \
presencewidget.cpp
presencewidget.cpp
FORMS +=
RESOURCES += presenceplugin_resources.qrc
TRANSLATIONS +=
OTHER_FILES += presenceplugin.json

5
plugins/presenceplugin/presenceplugin_resources.qrc Normal file
View File

@@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/zeiterfassung/plugins/presenceplugin">
<file>images/refresh.png</file>
</qresource>
</RCC>

3
plugins/presenceplugin/presencewidget.cpp
View File

@@ -24,7 +24,8 @@ PresenceWidget::PresenceWidget(MainWindow &mainWindow) :
m_labelNotAvailable->setFrameShadow(QFrame::Sunken);
m_mainWindow.statusBar()->addWidget(m_labelNotAvailable);
m_action = m_mainWindow.menuView()->addAction(tr("Refresh presence"), this, &PresenceWidget::timeout);
m_action = m_mainWindow.menuView()->addAction(QIcon(QStringLiteral(":zeiterfassung/plugins/presenceplugin/images/refresh.png")),
tr("Refresh presence"), this, &PresenceWidget::timeout);
auto timer = new QTimer(this);
timer->setInterval(60000);