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

Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
Conversation 0 Commits 84 Files Changed 223 +2274 -1533
138 changed files with 2274 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f877ab8a0a - Show all commits

11
plugins/devtoolsplugin/devtoolsplugin.pro
View File

@@ -15,15 +15,14 @@ DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
HEADERS += devtoolsplugin.h \
logmodel.h \
logdialog.h
logmodel.h \
logdialog.h
SOURCES += devtoolsplugin.cpp \
logmodel.cpp \
logdialog.cpp
logmodel.cpp \
logdialog.cpp
FORMS += \
logdialog.ui
FORMS += logdialog.ui
RESOURCES += devtoolsplugin_resources.qrc

4
plugins/reportsplugin/reportsplugin.pro
View File

@@ -15,10 +15,10 @@ DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
HEADERS += reportsplugin.h \
reportswidget.h
reportswidget.h
SOURCES += reportsplugin.cpp \
reportswidget.cpp
reportswidget.cpp
FORMS +=

1
zeiterfassungcorelib/zeiterfassungcorelib.pro
View File

@@ -1,4 +1,5 @@
QT += core network
QT -= gui widgets
TARGET = zeiterfassungcorelib
TEMPLATE = lib

4
zeiterfassungguilib/dialogs/authenticationdialog.h
View File

@@ -4,9 +4,7 @@
#include "zeiterfassungguilib_global.h"
namespace Ui {
class AuthenticationDialog;
}
namespace Ui { class AuthenticationDialog; }
class ZEITERFASSUNGGUILIBSHARED_EXPORT AuthenticationDialog : public QDialog
{

16
zeiterfassungguilib/translations/zeiterfassungguilib_de.ts
View File

@@ -168,8 +168,8 @@
</message>
<message>
<location filename="../mainwindow.ui" line="143"/>
<location filename="../mainwindow.cpp" line="366"/>
<location filename="../mainwindow.cpp" line="377"/>
<location filename="../mainwindow.cpp" line="354"/>
<location filename="../mainwindow.cpp" line="365"/>
<source>Start</source>
<translation>Kommen</translation>
</message>
@@ -266,19 +266,19 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="192"/>
<location filename="../mainwindow.cpp" line="297"/>
<location filename="../mainwindow.cpp" line="291"/>
<source>Could not create booking!</source>
<translation>Konnte Buchung nicht erstellen!</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="220"/>
<location filename="../mainwindow.cpp" line="282"/>
<location filename="../mainwindow.cpp" line="276"/>
<source>Could not edit time assignment!</source>
<translation>Konnte Kontierung nicht bearbeiten!</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="396"/>
<location filename="../mainwindow.cpp" line="405"/>
<location filename="../mainwindow.cpp" line="384"/>
<location filename="../mainwindow.cpp" line="393"/>
<source>%0 (%1)</source>
<translation>%0 (%1)</translation>
</message>
@@ -288,8 +288,8 @@
<translation>Konnte Kontierung nicht erstellen!</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="366"/>
<location filename="../mainwindow.cpp" line="377"/>
<location filename="../mainwindow.cpp" line="354"/>
<location filename="../mainwindow.cpp" line="365"/>
<source>Switch</source>
<translation>Wechseln</translation>
</message>

16
zeiterfassungguilib/translations/zeiterfassungguilib_en.ts
View File

@@ -168,8 +168,8 @@
</message>
<message>
<location filename="../mainwindow.ui" line="143"/>
<location filename="../mainwindow.cpp" line="366"/>
<location filename="../mainwindow.cpp" line="377"/>
<location filename="../mainwindow.cpp" line="354"/>
<location filename="../mainwindow.cpp" line="365"/>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
@@ -266,7 +266,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="192"/>
<location filename="../mainwindow.cpp" line="297"/>
<location filename="../mainwindow.cpp" line="291"/>
<source>Could not create booking!</source>
<translation type="unfinished"></translation>
</message>
@@ -277,19 +277,19 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="220"/>
<location filename="../mainwindow.cpp" line="282"/>
<location filename="../mainwindow.cpp" line="276"/>
<source>Could not edit time assignment!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="366"/>
<location filename="../mainwindow.cpp" line="377"/>
<location filename="../mainwindow.cpp" line="354"/>
<location filename="../mainwindow.cpp" line="365"/>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="396"/>
<location filename="../mainwindow.cpp" line="405"/>
<location filename="../mainwindow.cpp" line="384"/>
<location filename="../mainwindow.cpp" line="393"/>
<source>%0 (%1)</source>
<translation type="unfinished"></translation>
</message>