Release v1.4 #11

Merged
0xFEEDC0DE64 merged 16 commits from devel into master 2017-12-17 17:14:39 +01:00
163 changed files with 1396 additions and 897 deletions
Showing only changes of commit 98b5c0ece4 - Show all commits

View File

@@ -11,10 +11,10 @@ translationsinstall.files = $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \
$$[QT_INSTALL_TRANSLATIONS]/qtquick1_de.qm \ $$[QT_INSTALL_TRANSLATIONS]/qtquick1_de.qm \
$$[QT_INSTALL_TRANSLATIONS]/qtscript_de.qm \ $$[QT_INSTALL_TRANSLATIONS]/qtscript_de.qm \
$$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \ $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \
translations/zeiterfassung_en.qm \ $$OUT_PWD/translations/zeiterfassung_en.qm \
translations/zeiterfassung_de.qm \ $$OUT_PWD/translations/zeiterfassung_de.qm \
../zeiterfassunglib/translations/zeiterfassunglib_en.qm \ $$OUT_PWD/../zeiterfassunglib/translations/zeiterfassunglib_en.qm \
../zeiterfassunglib/translations/zeiterfassunglib_de.qm $$OUT_PWD/../zeiterfassunglib/translations/zeiterfassunglib_de.qm
INSTALLS += translationsinstall INSTALLS += translationsinstall
themesinstall.path = $${DESTDIR}/themes themesinstall.path = $${DESTDIR}/themes

View File

@@ -3,11 +3,12 @@
#include <QDialog> #include <QDialog>
#include "zeiterfassunglib_global.h"
#include "zeiterfassungapi.h" #include "zeiterfassungapi.h"
namespace Ui { class AboutMeDialog; } namespace Ui { class AboutMeDialog; }
class AboutMeDialog : public QDialog class ZEITERFASSUNGLIBSHARED_EXPORT AboutMeDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@@ -3,11 +3,13 @@
#include <QDialog> #include <QDialog>
#include "zeiterfassunglib_global.h"
namespace Ui { namespace Ui {
class AuthenticationDialog; class AuthenticationDialog;
} }
class AuthenticationDialog : public QDialog class ZEITERFASSUNGLIBSHARED_EXPORT AuthenticationDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@@ -4,9 +4,11 @@
#include <QDialog> #include <QDialog>
#include <QTime> #include <QTime>
#include "zeiterfassunglib_global.h"
namespace Ui { class BookingDialog; } namespace Ui { class BookingDialog; }
class BookingDialog : public QDialog class ZEITERFASSUNGLIBSHARED_EXPORT BookingDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@@ -4,9 +4,11 @@
#include <QDialog> #include <QDialog>
#include <QLocale> #include <QLocale>
#include "zeiterfassunglib_global.h"
namespace Ui { class LanguageSelectionDialog; } namespace Ui { class LanguageSelectionDialog; }
class LanguageSelectionDialog : public QDialog class ZEITERFASSUNGLIBSHARED_EXPORT LanguageSelectionDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@@ -3,10 +3,12 @@
#include <QDialog> #include <QDialog>
#include "zeiterfassunglib_global.h"
class ZeiterfassungSettings; class ZeiterfassungSettings;
namespace Ui { class SettingsDialog; } namespace Ui { class SettingsDialog; }
class SettingsDialog : public QDialog class ZEITERFASSUNGLIBSHARED_EXPORT SettingsDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@@ -4,13 +4,15 @@
#include <QDialog> #include <QDialog>
#include <QTime> #include <QTime>
#include "zeiterfassunglib_global.h"
template <class Key, class T> class QMap; template <class Key, class T> class QMap;
class ZeiterfassungSettings; class ZeiterfassungSettings;
namespace Ui { class TimeAssignmentDialog; } namespace Ui { class TimeAssignmentDialog; }
class TimeAssignmentDialog : public QDialog class ZEITERFASSUNGLIBSHARED_EXPORT TimeAssignmentDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@@ -4,13 +4,15 @@
#include <QDialog> #include <QDialog>
#include <QUrl> #include <QUrl>
#include "zeiterfassunglib_global.h"
class QNetworkAccessManager; class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class ZeiterfassungSettings; class ZeiterfassungSettings;
namespace Ui { class UpdateDialog; } namespace Ui { class UpdateDialog; }
class UpdateDialog : public QDialog class ZEITERFASSUNGLIBSHARED_EXPORT UpdateDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@@ -6,6 +6,7 @@
#include <QMainWindow> #include <QMainWindow>
#include <QMap> #include <QMap>
#include "zeiterfassunglib_global.h"
#include "zeiterfassungapi.h" #include "zeiterfassungapi.h"
#include "replies/getprojectsreply.h" #include "replies/getprojectsreply.h"
#include "replies/getauswertungreply.h" #include "replies/getauswertungreply.h"
@@ -21,7 +22,7 @@ class StripsWidget;
class BookingsModel; class BookingsModel;
class TimeAssignmentsModel; class TimeAssignmentsModel;
class MainWindow : public QMainWindow class ZEITERFASSUNGLIBSHARED_EXPORT MainWindow : public QMainWindow
{ {
Q_OBJECT Q_OBJECT

View File

@@ -4,11 +4,12 @@
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QVector> #include <QVector>
#include "zeiterfassunglib_global.h"
#include "zeiterfassungapi.h" #include "zeiterfassungapi.h"
class StripsWidget; class StripsWidget;
class BookingsModel : public QAbstractListModel class ZEITERFASSUNGLIBSHARED_EXPORT BookingsModel : public QAbstractListModel
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(StripsWidget* stripsWidget READ stripsWidget WRITE setStripsWidget NOTIFY stripsWidgetChanged) Q_PROPERTY(StripsWidget* stripsWidget READ stripsWidget WRITE setStripsWidget NOTIFY stripsWidgetChanged)

View File

@@ -4,11 +4,12 @@
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QVector> #include <QVector>
#include "zeiterfassunglib_global.h"
#include "zeiterfassungapi.h" #include "zeiterfassungapi.h"
class StripsWidget; class StripsWidget;
class TimeAssignmentsModel : public QAbstractListModel class ZEITERFASSUNGLIBSHARED_EXPORT TimeAssignmentsModel : public QAbstractListModel
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(StripsWidget* stripsWidget READ stripsWidget WRITE setStripsWidget NOTIFY stripsWidgetChanged) Q_PROPERTY(StripsWidget* stripsWidget READ stripsWidget WRITE setStripsWidget NOTIFY stripsWidgetChanged)

View File

@@ -6,10 +6,12 @@
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include "zeiterfassunglib_global.h"
class QUiLoader; class QUiLoader;
class QByteArray; class QByteArray;
class StripFactory : public QObject class ZEITERFASSUNGLIBSHARED_EXPORT StripFactory : public QObject
{ {
Q_OBJECT Q_OBJECT

View File

@@ -6,6 +6,7 @@
#include <QWidget> #include <QWidget>
#include <QTime> #include <QTime>
#include "zeiterfassunglib_global.h"
#include "zeiterfassungapi.h" #include "zeiterfassungapi.h"
#include "replies/getbookingsreply.h" #include "replies/getbookingsreply.h"
#include "replies/gettimeassignmentsreply.h" #include "replies/gettimeassignmentsreply.h"
@@ -16,7 +17,7 @@ template <typename T> class QVector;
class StripFactory; class StripFactory;
class StripsWidget : public QWidget class ZEITERFASSUNGLIBSHARED_EXPORT StripsWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@@ -3,9 +3,11 @@
#include <QTime> #include <QTime>
int timeToSeconds(const QTime &time); #include "zeiterfassunglib_global.h"
QTime timeBetween(const QTime &l, const QTime &r);
QTime timeAdd(const QTime &l, const QTime &r); int ZEITERFASSUNGLIBSHARED_EXPORT timeToSeconds(const QTime &time);
QTime timeNormalise(const QTime &time); QTime ZEITERFASSUNGLIBSHARED_EXPORT timeBetween(const QTime &l, const QTime &r);
QTime ZEITERFASSUNGLIBSHARED_EXPORT timeAdd(const QTime &l, const QTime &r);
QTime ZEITERFASSUNGLIBSHARED_EXPORT timeNormalise(const QTime &time);
#endif // TIMEUTILS_H #endif // TIMEUTILS_H

View File

@@ -3,7 +3,9 @@
#include <QObject> #include <QObject>
class ZeiterfassungPlugin : public QObject #include "zeiterfassunglib_global.h"
class ZEITERFASSUNGLIBSHARED_EXPORT ZeiterfassungPlugin : public QObject
{ {
Q_OBJECT Q_OBJECT

View File

@@ -7,7 +7,9 @@
#include <QStringList> #include <QStringList>
#include <QDate> #include <QDate>
class ZeiterfassungSettings : public QSettings #include "zeiterfassunglib_global.h"
class ZEITERFASSUNGLIBSHARED_EXPORT ZeiterfassungSettings : public QSettings
{ {
Q_OBJECT Q_OBJECT