Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
172 changed files with 4013 additions and 2461 deletions
Showing only changes of commit 20b1497989 - Show all commits

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

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

View File

@@ -18,12 +18,12 @@ PresenceWidget::PresenceWidget(MainWindow &mainWindow) :
{
connect(&m_mainWindow, &MainWindow::refreshEverything, this, &PresenceWidget::refresh);
m_buttonAvailable = new QPushButton(this);
m_buttonAvailable = new QPushButton(QIcon(QStringLiteral(":zeiterfassung/plugins/presenceplugin/images/present.png")), QStringLiteral(), this);
m_menuAvailable = new QMenu(this);
m_buttonAvailable->setMenu(m_menuAvailable);
m_mainWindow.statusBar()->addWidget(m_buttonAvailable);
m_buttonNotAvailable = new QPushButton(this);
m_buttonNotAvailable = new QPushButton(QIcon(QStringLiteral(":zeiterfassung/plugins/presenceplugin/images/not-present.png")), QStringLiteral(), this);
m_menuNotAvailable = new QMenu(this);
m_buttonNotAvailable->setMenu(m_menuNotAvailable);
m_mainWindow.statusBar()->addWidget(m_buttonNotAvailable);