From daa7cc9405cce6e99eb56cf0125accc134572826 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Fri, 15 Dec 2017 19:38:45 +0100 Subject: [PATCH] Added zeiterfassunglib --- zeiterfassung.pro | 7 +- zeiterfassung/installs.pri | 71 +++ zeiterfassung/installs_unix.pri | 3 + zeiterfassung/installs_win32.pri | 31 ++ zeiterfassung/main.cpp | 14 +- .../translations/zeiterfassung_de.ts | 411 ++++-------------- .../translations/zeiterfassung_en.ts | 411 ++++-------------- zeiterfassung/unix/start.sh | 1 + zeiterfassung/win32/Qt.conf | 0 zeiterfassung/zeiterfassung.pro | 145 +----- .../cpp14polyfills.h | 0 .../replies/createbookingreply.cpp | 0 .../replies/createbookingreply.h | 3 +- .../replies/createtimeassignmentreply.cpp | 0 .../replies/createtimeassignmentreply.h | 3 +- .../replies/deletebookingreply.cpp | 0 .../replies/deletebookingreply.h | 3 +- .../replies/deletetimeassignmentreply.cpp | 0 .../replies/deletetimeassignmentreply.h | 3 +- .../replies/getauswertungreply.cpp | 0 .../replies/getauswertungreply.h | 3 +- .../replies/getbookingsreply.cpp | 0 .../replies/getbookingsreply.h | 3 +- .../replies/getpresencestatusreply.cpp | 0 .../replies/getpresencestatusreply.h | 3 +- .../replies/getprojectsreply.cpp | 0 .../replies/getprojectsreply.h | 3 +- .../replies/gettimeassignmentsreply.cpp | 0 .../replies/gettimeassignmentsreply.h | 3 +- .../replies/loginpagereply.cpp | 0 .../replies/loginpagereply.h | 3 +- .../replies/loginreply.cpp | 0 .../replies/loginreply.h | 3 +- .../replies/updatebookingreply.cpp | 0 .../replies/updatebookingreply.h | 3 +- .../replies/updatetimeassignmentreply.cpp | 0 .../replies/updatetimeassignmentreply.h | 3 +- .../replies/userinforeply.cpp | 0 .../replies/userinforeply.h | 3 +- .../replies/zeiterfassungreply.cpp | 0 .../replies/zeiterfassungreply.h | 4 +- .../translations/zeiterfassunglib_de.qm | Bin 0 -> 23 bytes .../translations/zeiterfassunglib_de.ts | 267 ++++++++++++ .../translations/zeiterfassunglib_en.qm | Bin 0 -> 23 bytes .../translations/zeiterfassunglib_en.ts | 267 ++++++++++++ .../zeiterfassungapi.cpp | 0 .../zeiterfassungapi.h | 4 +- zeiterfassunglib/zeiterfassunglib.pro | 56 +++ zeiterfassunglib/zeiterfassunglib_global.h | 12 + 49 files changed, 939 insertions(+), 807 deletions(-) create mode 100644 zeiterfassung/installs.pri create mode 100644 zeiterfassung/installs_unix.pri create mode 100644 zeiterfassung/installs_win32.pri create mode 100755 zeiterfassung/unix/start.sh create mode 100644 zeiterfassung/win32/Qt.conf rename {zeiterfassung => zeiterfassunglib}/cpp14polyfills.h (100%) rename {zeiterfassung => zeiterfassunglib}/replies/createbookingreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/createbookingreply.h (78%) rename {zeiterfassung => zeiterfassunglib}/replies/createtimeassignmentreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/createtimeassignmentreply.h (79%) rename {zeiterfassung => zeiterfassunglib}/replies/deletebookingreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/deletebookingreply.h (76%) rename {zeiterfassung => zeiterfassunglib}/replies/deletetimeassignmentreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/deletetimeassignmentreply.h (76%) rename {zeiterfassung => zeiterfassunglib}/replies/getauswertungreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/getauswertungreply.h (81%) rename {zeiterfassung => zeiterfassunglib}/replies/getbookingsreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/getbookingsreply.h (82%) rename {zeiterfassung => zeiterfassunglib}/replies/getpresencestatusreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/getpresencestatusreply.h (82%) rename {zeiterfassung => zeiterfassunglib}/replies/getprojectsreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/getprojectsreply.h (82%) rename {zeiterfassung => zeiterfassunglib}/replies/gettimeassignmentsreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/gettimeassignmentsreply.h (82%) rename {zeiterfassung => zeiterfassunglib}/replies/loginpagereply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/loginpagereply.h (76%) rename {zeiterfassung => zeiterfassunglib}/replies/loginreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/loginreply.h (76%) rename {zeiterfassung => zeiterfassunglib}/replies/updatebookingreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/updatebookingreply.h (77%) rename {zeiterfassung => zeiterfassunglib}/replies/updatetimeassignmentreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/updatetimeassignmentreply.h (79%) rename {zeiterfassung => zeiterfassunglib}/replies/userinforeply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/userinforeply.h (81%) rename {zeiterfassung => zeiterfassunglib}/replies/zeiterfassungreply.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/replies/zeiterfassungreply.h (83%) create mode 100644 zeiterfassunglib/translations/zeiterfassunglib_de.qm create mode 100644 zeiterfassunglib/translations/zeiterfassunglib_de.ts create mode 100644 zeiterfassunglib/translations/zeiterfassunglib_en.qm create mode 100644 zeiterfassunglib/translations/zeiterfassunglib_en.ts rename {zeiterfassung => zeiterfassunglib}/zeiterfassungapi.cpp (100%) rename {zeiterfassung => zeiterfassunglib}/zeiterfassungapi.h (97%) create mode 100644 zeiterfassunglib/zeiterfassunglib.pro create mode 100644 zeiterfassunglib/zeiterfassunglib_global.h diff --git a/zeiterfassung.pro b/zeiterfassung.pro index 56af3c4..9c52032 100644 --- a/zeiterfassung.pro +++ b/zeiterfassung.pro @@ -1,3 +1,6 @@ -TEMPLATE=subdirs +TEMPLATE = subdirs -SUBDIRS+=zeiterfassung +SUBDIRS += zeiterfassung \ + zeiterfassunglib + +zeiterfassung.depends += zeiterfassunglib diff --git a/zeiterfassung/installs.pri b/zeiterfassung/installs.pri new file mode 100644 index 0000000..78833de --- /dev/null +++ b/zeiterfassung/installs.pri @@ -0,0 +1,71 @@ +translationsinstall.path = $${DESTDIR}/translations +translationsinstall.files = $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtbase_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtquick1_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtscript_nen.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtbase_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtquick1_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtscript_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \ + translations/zeiterfassung_en.qm \ + translations/zeiterfassung_de.qm \ + ../zeiterfassunglib/translations/zeiterfassunglib_en.qm \ + ../zeiterfassunglib/translations/zeiterfassunglib_de.qm +INSTALLS += translationsinstall + +themesinstall.path = $${DESTDIR}/themes +themesinstall.files = themes/dark_theme.qss +INSTALLS += themesinstall + +darkthemeinstall.path = $${DESTDIR}/themes/dark_theme +darkthemeinstall.files = themes/dark_theme/checkbox_indeterminate_disabled.png \ + themes/dark_theme/radio_unchecked.png \ + themes/dark_theme/up_arrow.png \ + themes/dark_theme/branch_closed-on.png \ + themes/dark_theme/checkbox_checked_disabled.png \ + themes/dark_theme/checkbox_unchecked.png \ + themes/dark_theme/checkbox_indeterminate.png \ + themes/dark_theme/stylesheet-branch-more.png \ + themes/dark_theme/checkbox_checked.png \ + themes/dark_theme/checkbox_unchecked_disabled.png \ + themes/dark_theme/radio_checked.png \ + themes/dark_theme/checkbox_indeterminate_focus.png \ + themes/dark_theme/checkbox_checked_focus.png \ + themes/dark_theme/branch_closed.png \ + themes/dark_theme/Vsepartoolbar.png \ + themes/dark_theme/radio_checked_disabled.png \ + themes/dark_theme/left_arrow.png \ + themes/dark_theme/Vmovetoolbar.png \ + themes/dark_theme/branch_open-on.png \ + themes/dark_theme/close.png \ + themes/dark_theme/stylesheet-branch-end.png \ + themes/dark_theme/stylesheet-vline.png \ + themes/dark_theme/down_arrow_disabled.png \ + themes/dark_theme/radio_unchecked_disabled.png \ + themes/dark_theme/left_arrow_disabled.png \ + themes/dark_theme/Hmovetoolbar.png \ + themes/dark_theme/close-pressed.png \ + themes/dark_theme/up_arrow_disabled.png \ + themes/dark_theme/branch_open.png \ + themes/dark_theme/radio_checked_focus.png \ + themes/dark_theme/sizegrip.png \ + themes/dark_theme/checkbox_unchecked_focus.png \ + themes/dark_theme/right_arrow_disabled.png \ + themes/dark_theme/Hsepartoolbar.png \ + themes/dark_theme/undock.png \ + themes/dark_theme/transparent.png \ + themes/dark_theme/close-hover.png \ + themes/dark_theme/radio_unchecked_focus.png \ + themes/dark_theme/down_arrow.png \ + themes/dark_theme/right_arrow.png +INSTALLS += darkthemeinstall + +stripsinstall.path = $${DESTDIR}/strips +stripsinstall.files = strips/bookingstartstrip.ui \ + strips/bookingendstrip.ui \ + strips/timeassignmentstrip.ui +INSTALLS += stripsinstall diff --git a/zeiterfassung/installs_unix.pri b/zeiterfassung/installs_unix.pri new file mode 100644 index 0000000..0e21c25 --- /dev/null +++ b/zeiterfassung/installs_unix.pri @@ -0,0 +1,3 @@ +scriptsinstall.path = $${DESTDIR} +scriptsinstall.files = unix/start.sh +INSTALLS += scriptsinstall diff --git a/zeiterfassung/installs_win32.pri b/zeiterfassung/installs_win32.pri new file mode 100644 index 0000000..f824ae9 --- /dev/null +++ b/zeiterfassung/installs_win32.pri @@ -0,0 +1,31 @@ +CONFIG(debug, release|debug): DEBUG_SIGN = d + +libinstall.path = $${DESTDIR} +libinstall.files = win32/Qt.conf \ + $$OUT_PWD/../lib/zeiterfassunglib.dll \ + $$[QT_INSTALL_BINS]/Qt5Core$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/Qt5Gui$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/Qt5Network$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/Qt5Widgets$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll \ + $$[QT_INSTALL_BINS]/libstd~1.dll \ + $$[QT_INSTALL_BINS]/libwinpthread-1.dll +INSTALLS += libinstall + +iconenginesinstall.path = $$DESTDIR/plugins/iconengines +iconenginesinstall.files = $$[QT_INSTALL_PLUGINS]/iconengines/qsvgicon$${DEBUG_SIGN}.dll + +imageformatsinstall.path = $$DESTDIR/plugins/imageformats +imageformatsinstall.files = $$[QT_INSTALL_PLUGINS]/imageformats/qdds$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qgif$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qicns$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qico$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qsvg$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qtga$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qwbmp$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qwebp$${DEBUG_SIGN}.dll + +platformsinstall.path = $$DESTDIR/plugins/platforms +win32: platformsinstall.files = $$[QT_INSTALL_PLUGINS]/platforms/qwindows$${DEBUG_SIGN}.dll diff --git a/zeiterfassung/main.cpp b/zeiterfassung/main.cpp index a40b1f7..b823c50 100755 --- a/zeiterfassung/main.cpp +++ b/zeiterfassung/main.cpp @@ -24,6 +24,12 @@ #include "replies/userinforeply.h" #include "stripfactory.h" +struct { + QTranslator qtTranslator; + QTranslator zeiterfassungTranslator; + QTranslator zeiterfassunglibTranslator; +} translators; + bool loadAndInstallTranslator(QTranslator &translator, const QLocale &locale, const QString &filename, @@ -72,12 +78,10 @@ bool loadTranslations(QSplashScreen &splashScreen, ZeiterfassungSettings &settin QLocale locale(settings.language(), QLocale::Austria); QLocale::setDefault(locale); - QTranslator qtTranslator(qApp); - QTranslator zeiterfassungTranslator(qApp); - auto translationsDir = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(QStringLiteral("translations")); - loadAndInstallTranslator(qtTranslator, locale, QStringLiteral("qt"), QStringLiteral("_"), translationsDir); - loadAndInstallTranslator(zeiterfassungTranslator, locale, QStringLiteral("zeiterfassung"), QStringLiteral("_"), translationsDir); + loadAndInstallTranslator(translators.qtTranslator, locale, QStringLiteral("qt"), QStringLiteral("_"), translationsDir); + loadAndInstallTranslator(translators.zeiterfassungTranslator, locale, QStringLiteral("zeiterfassung"), QStringLiteral("_"), translationsDir); + loadAndInstallTranslator(translators.zeiterfassunglibTranslator, locale, QStringLiteral("zeiterfassunglib"), QStringLiteral("_"), translationsDir); return true; } diff --git a/zeiterfassung/translations/zeiterfassung_de.ts b/zeiterfassung/translations/zeiterfassung_de.ts index 370f0de..84ab4c3 100644 --- a/zeiterfassung/translations/zeiterfassung_de.ts +++ b/zeiterfassung/translations/zeiterfassung_de.ts @@ -111,141 +111,6 @@ Text - - CreateBookingReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - Parsing JSON failed: %0 - JSON konnte nicht geparst werden: %0 - - - - JSON document is not an object! - JSON Dokument ist kein Objekt! - - - - JSON does not contain bookingNr! - JSON beinhaltet keine bookingNr! - - - - CreateTimeAssignmentReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - Parsing JSON failed: %0 - JSON konnte nicht geparst werden: %0 - - - - JSON document is not an object! - JSON Dokument ist kein Objekt! - - - - JSON does not contain bookingNr! - JSON beinhaltet keine bookingNr! - - - - DeleteBookingReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - DeleteTimeAssignmentReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - GetAuswertungReply - - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - GetBookingsReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - Parsing JSON failed: %0 - JSON konnte nicht geparst werden: %0 - - - - JSON document is not an array! - JSON Dokument ist keine Liste! - - - - GetProjectsReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - Parsing JSON failed: %0 - JSON konnte nicht geparst werden: %0 - - - - JSON document is not an object! - JSON Dokument ist kein Objekt! - - - - JSON does not contain elements! - JSON beinhaltet kein elements! - - - - elements is not an array! - elements ist keine Liste! - - - - GetTimeAssignmentsReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - Parsing JSON failed: %0 - JSON konnte nicht geparst werden: %0 - - - - JSON document is not an array! - JSON Dokument ist keine Liste! - - LanguageSelectionDialog @@ -275,42 +140,6 @@ Deutsch - - LoginPageReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - Could not find necessary keywords in login page! - Konnte notwendiges Schlüsselwort in der Login-Seite finden! - - - - LoginReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - Response did not contain a Location header. - Antwort enthielt keinen Location-Header. - - - - Authentication failure. Please check username and password. - Authentifizierungsfehler. Bitte überprüfen Sie Benutzername und Passwort. - - - - An unknown authentication failure occured. Redirected to: %0 - Bei der Authentifizierung ist ein unbekannter Fehler aufgetreten. Weiterleitung nach %0 - - MainWindow @@ -330,8 +159,8 @@ - - + + Start Kommen @@ -426,178 +255,180 @@ Hilfe - + Zeiterfassung - %0 (%1) Zeiterfassung - %0 (%1) - - + + Could not open auswertung! - + Could not open default PDF viewer! Konnte den PDF-Anzeiger nicht öffnen! - + Subproject Subprojekt - + Workpackage Arbeitspaket - + Text Text - - - - + + + + %0: %1 %0: %1 - - + + + + ??? ??? - - + + Balance Saldo - - + + Holidays Urlaubstage - - + + Could not load bookings! Konnte Buchungen nicht laden! - + Could not load Auswertung! - + %0h %0h - + Could not delete booking! Konnte Buchung nicht löschen! - + Edit booking Buchung bearbeiten - + Delete booking Buchung löschen - + Could not edit booking! Konnte Buchung nicht bearbeiten! - + Create booking Buchung erstellen - - + + n/a n/v - + Refresh bookings Buchungen aktualisieren - - - + + + Could not create booking! Konnte Buchung nicht erstellen! - + Do you really want to delete the booking? Möchten Sie die Buchung wirklich löschen? - + Refresh time assignments Kontierungen aktualisieren - + Edit time assignment Kontierung bearbeiten - + Delete time assignment Kontierung löschen - - - + + + Could not edit time assignment! Konnte Kontierung nicht bearbeiten! - + Do you really want to delete the time assignment? Möchten Sie die Kontierung wirklich löschen? - + Could not delete time assignment! Konnte Kontierung nicht löschen! - - + + %0 (%1) %0 (%1) - + Create time assignment Kontierung erstellen - - + + Could not create time assignment! Konnte Kontierung nicht erstellen! - - + + Switch Wechseln @@ -941,29 +772,6 @@ Your bookings and time assignments for this day are in an illegal state!Text - - UpdateBookingReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - Parsing JSON failed: %0 - JSON konnte nicht geparst werden: %0 - - - - JSON document is not an object! - JSON Dokument ist kein Objekt! - - - - JSON does not contain bookingNr! - JSON beinhaltet keine bookingNr! - - UpdateDialog @@ -983,62 +791,11 @@ Your bookings and time assignments for this day are in an illegal state!Heute nicht mehr anzeigen - + Could not open default webbrowser! Konnte den Standard-Browser nicht öffnen! - - UpdateTimeAssignmentReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - Parsing JSON failed: %0 - JSON konnte nicht geparst werden: %0 - - - - JSON document is not an object! - JSON Dokument ist kein Objekt! - - - - JSON does not contain bookingNr! - JSON beinhaltet keine bookingNr! - - - - UserInfoReply - - - Request error occured: %0 - Fehler bei Anfrage aufgetreten: %0 - - - - Parsing JSON failed: %0 - JSON konnte nicht geparst werden: %0 - - - - JSON document is not an object! - JSON Dokument ist kein Objekt! - - - - JSON does not contain evoAppsUser! - JSON beinhaltet kein evoAppsUser! - - - - evoAppsUser is not an object! - evoAppsUser ist kein Objekt! - - bookingEndStrip @@ -1058,101 +815,101 @@ Your bookings and time assignments for this day are in an illegal state! main - + Loading settings... Lade Einstellungen... - + Loading translations... Lade Übersetzungen... - - + + Invalid language selection! Ungültige Sprachauswahl! - + You did not select a valid language! Sie haben keine gültige Sprachauswahl getroffen! - + Loading theme... Lade Aussehen... - - - - + + + + Could not load theme! Konnte Aussehen nicht laden! - + Theme file does not exist! Aussehen-Datei existiert nicht! - + Loading login page... Lade Login-Seite... - - + + Could not access Zeiterfassung! Konnte Zeiterfassung nicht erreichen! - + Base url Basis URL - + Please enter the base url to the Zeiterfassung: Bitte geben Sie die Basis URL zur Zeiterfassung ein: - + Authenticating... Authentifiziere... - - + + Could not authenticate with Zeiterfassung! Konnte nicht mit Zeiterfassung authentifizieren! - + Getting user information... Hole Benutzer Information... - - + + Could not get user information! Konnte Benutzer Information nicht holen! - + Loading strip layouts... Lade Streifenlayouts... - - - - - - - - + + + + + + + + Could not load strips! Konnte Streifenlayouts nicht laden! diff --git a/zeiterfassung/translations/zeiterfassung_en.ts b/zeiterfassung/translations/zeiterfassung_en.ts index 281e6e6..25b2183 100644 --- a/zeiterfassung/translations/zeiterfassung_en.ts +++ b/zeiterfassung/translations/zeiterfassung_en.ts @@ -111,141 +111,6 @@ - - CreateBookingReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - CreateTimeAssignmentReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - DeleteBookingReply - - - Request error occured: %0 - - - - - DeleteTimeAssignmentReply - - - Request error occured: %0 - - - - - GetAuswertungReply - - - - Request error occured: %0 - - - - - GetBookingsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetProjectsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain elements! - - - - - elements is not an array! - - - - - GetTimeAssignmentsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - LanguageSelectionDialog @@ -275,42 +140,6 @@ - - LoginPageReply - - - Request error occured: %0 - - - - - Could not find necessary keywords in login page! - - - - - LoginReply - - - Request error occured: %0 - - - - - Response did not contain a Location header. - - - - - Authentication failure. Please check username and password. - - - - - An unknown authentication failure occured. Redirected to: %0 - - - MainWindow @@ -330,8 +159,8 @@ - - + + Start @@ -426,178 +255,180 @@ - + Zeiterfassung - %0 (%1) - - + + Could not open auswertung! - + Could not open default PDF viewer! - + Subproject - + Workpackage - + Text - - - - + + + + %0: %1 - - + + + + ??? - - + + Balance - - + + Holidays - - + + Could not load bookings! - + Could not load Auswertung! - + %0h - + Could not delete booking! - + Edit booking - + Delete booking - + Could not edit booking! - + Create booking - - + + n/a - + Refresh bookings - - - + + + Could not create booking! - + Do you really want to delete the booking? - + Refresh time assignments - + Edit time assignment - + Delete time assignment - - - + + + Could not edit time assignment! - + Do you really want to delete the time assignment? - + Could not delete time assignment! - - + + %0 (%1) - + Create time assignment - - + + Could not create time assignment! - - + + Switch @@ -941,29 +772,6 @@ Your bookings and time assignments for this day are in an illegal state! - - UpdateBookingReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - UpdateDialog @@ -983,62 +791,11 @@ Your bookings and time assignments for this day are in an illegal state! - + Could not open default webbrowser! - - UpdateTimeAssignmentReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - UserInfoReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain evoAppsUser! - - - - - evoAppsUser is not an object! - - - bookingEndStrip @@ -1058,101 +815,101 @@ Your bookings and time assignments for this day are in an illegal state! main - + Loading settings... - + Loading translations... - - + + Invalid language selection! - + You did not select a valid language! - + Loading theme... - - - - + + + + Could not load theme! - + Theme file does not exist! - + Loading login page... - - + + Could not access Zeiterfassung! - + Base url - + Please enter the base url to the Zeiterfassung: - + Authenticating... - - + + Could not authenticate with Zeiterfassung! - + Getting user information... - - + + Could not get user information! - + Loading strip layouts... - - - - - - - - + + + + + + + + Could not load strips! diff --git a/zeiterfassung/unix/start.sh b/zeiterfassung/unix/start.sh new file mode 100755 index 0000000..59aa5f8 --- /dev/null +++ b/zeiterfassung/unix/start.sh @@ -0,0 +1 @@ +LD_LIBRARY_PATH=../lib ./zeiterfassung diff --git a/zeiterfassung/win32/Qt.conf b/zeiterfassung/win32/Qt.conf new file mode 100644 index 0000000..e69de29 diff --git a/zeiterfassung/zeiterfassung.pro b/zeiterfassung/zeiterfassung.pro index 4fdd91e..671ba01 100755 --- a/zeiterfassung/zeiterfassung.pro +++ b/zeiterfassung/zeiterfassung.pro @@ -1,18 +1,19 @@ QT += network gui widgets uitools +TARGET = zeiterfassung +TEMPLATE = app + CONFIG += c++14 CONFIG -= app_bundle -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS +DESTDIR = $${OUT_PWD}/../bin -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +LIBS += -L$$OUT_PWD/../lib -lzeiterfassunglib + +INCLUDEPATH += $$PWD/../zeiterfassunglib +DEPENDPATH += $$PWD/../zeiterfassunglib + +DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT RC_ICONS = icon.ico @@ -30,23 +31,7 @@ SOURCES += main.cpp \ dialogs/updatedialog.cpp \ stripswidget.cpp \ timeutils.cpp \ - stripfactory.cpp \ - zeiterfassungapi.cpp \ - replies/loginpagereply.cpp \ - replies/loginreply.cpp \ - replies/userinforeply.cpp \ - replies/getbookingsreply.cpp \ - replies/createbookingreply.cpp \ - replies/updatebookingreply.cpp \ - replies/deletebookingreply.cpp \ - replies/gettimeassignmentsreply.cpp \ - replies/createtimeassignmentreply.cpp \ - replies/updatetimeassignmentreply.cpp \ - replies/getprojectsreply.cpp \ - replies/getauswertungreply.cpp \ - replies/zeiterfassungreply.cpp \ - replies/deletetimeassignmentreply.cpp \ - replies/getpresencestatusreply.cpp + stripfactory.cpp HEADERS += \ mainwindow.h \ @@ -62,24 +47,7 @@ HEADERS += \ dialogs/updatedialog.h \ stripswidget.h \ timeutils.h \ - stripfactory.h \ - zeiterfassungapi.h \ - replies/loginpagereply.h \ - replies/loginreply.h \ - replies/userinforeply.h \ - replies/getbookingsreply.h \ - replies/createbookingreply.h \ - replies/updatebookingreply.h \ - replies/deletebookingreply.h \ - replies/gettimeassignmentsreply.h \ - replies/createtimeassignmentreply.h \ - replies/updatetimeassignmentreply.h \ - replies/getprojectsreply.h \ - replies/getauswertungreply.h \ - replies/zeiterfassungreply.h \ - replies/deletetimeassignmentreply.h \ - cpp14polyfills.h \ - replies/getpresencestatusreply.h + stripfactory.h FORMS += \ mainwindow.ui \ @@ -98,89 +66,6 @@ TRANSLATIONS += \ translations/zeiterfassung_en.ts \ translations/zeiterfassung_de.ts -win32 { - CONFIG(debug, release|debug) { - translationsinstall.path = $${OUT_PWD}/debug/translations - themesinstall.path = $${OUT_PWD}/debug/themes - darkthemeinstall.path = $${OUT_PWD}/debug/themes/dark_theme - stripsinstall.path = $${OUT_PWD}/debug/strips - } else { - translationsinstall.path = $${OUT_PWD}/release/translations - themesinstall.path = $${OUT_PWD}/release/themes - darkthemeinstall.path = $${OUT_PWD}/release/themes/dark_theme - stripsinstall.path = $${OUT_PWD}/release/strips - } -} -unix { - translationsinstall.path = $${OUT_PWD}/translations - themesinstall.path = $${OUT_PWD}/themes - darkthemeinstall.path = $${OUT_PWD}/themes/dark_theme - stripsinstall.path = $${OUT_PWD}/strips -} - -translationsinstall.files = $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtbase_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtquick1_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtscript_nen.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtbase_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtquick1_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtscript_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \ - translations/zeiterfassung_en.qm \ - translations/zeiterfassung_de.qm - -themesinstall.files = themes/dark_theme.qss - -darkthemeinstall.files = themes/dark_theme/checkbox_indeterminate_disabled.png \ - themes/dark_theme/radio_unchecked.png \ - themes/dark_theme/up_arrow.png \ - themes/dark_theme/branch_closed-on.png \ - themes/dark_theme/checkbox_checked_disabled.png \ - themes/dark_theme/checkbox_unchecked.png \ - themes/dark_theme/checkbox_indeterminate.png \ - themes/dark_theme/stylesheet-branch-more.png \ - themes/dark_theme/checkbox_checked.png \ - themes/dark_theme/checkbox_unchecked_disabled.png \ - themes/dark_theme/radio_checked.png \ - themes/dark_theme/checkbox_indeterminate_focus.png \ - themes/dark_theme/checkbox_checked_focus.png \ - themes/dark_theme/branch_closed.png \ - themes/dark_theme/Vsepartoolbar.png \ - themes/dark_theme/radio_checked_disabled.png \ - themes/dark_theme/left_arrow.png \ - themes/dark_theme/Vmovetoolbar.png \ - themes/dark_theme/branch_open-on.png \ - themes/dark_theme/close.png \ - themes/dark_theme/stylesheet-branch-end.png \ - themes/dark_theme/stylesheet-vline.png \ - themes/dark_theme/down_arrow_disabled.png \ - themes/dark_theme/radio_unchecked_disabled.png \ - themes/dark_theme/left_arrow_disabled.png \ - themes/dark_theme/Hmovetoolbar.png \ - themes/dark_theme/close-pressed.png \ - themes/dark_theme/up_arrow_disabled.png \ - themes/dark_theme/branch_open.png \ - themes/dark_theme/radio_checked_focus.png \ - themes/dark_theme/sizegrip.png \ - themes/dark_theme/checkbox_unchecked_focus.png \ - themes/dark_theme/right_arrow_disabled.png \ - themes/dark_theme/Hsepartoolbar.png \ - themes/dark_theme/undock.png \ - themes/dark_theme/transparent.png \ - themes/dark_theme/close-hover.png \ - themes/dark_theme/radio_unchecked_focus.png \ - themes/dark_theme/down_arrow.png \ - themes/dark_theme/right_arrow.png - -stripsinstall.files = strips/bookingstartstrip.ui \ - strips/bookingendstrip.ui \ - strips/timeassignmentstrip.ui - -INSTALLS += translationsinstall -INSTALLS += themesinstall -INSTALLS += darkthemeinstall -INSTALLS += stripsinstall +include(installs.pri) +unix: include(installs_unix.pri) +win32: include(installs_win32.pri) diff --git a/zeiterfassung/cpp14polyfills.h b/zeiterfassunglib/cpp14polyfills.h similarity index 100% rename from zeiterfassung/cpp14polyfills.h rename to zeiterfassunglib/cpp14polyfills.h diff --git a/zeiterfassung/replies/createbookingreply.cpp b/zeiterfassunglib/replies/createbookingreply.cpp similarity index 100% rename from zeiterfassung/replies/createbookingreply.cpp rename to zeiterfassunglib/replies/createbookingreply.cpp diff --git a/zeiterfassung/replies/createbookingreply.h b/zeiterfassunglib/replies/createbookingreply.h similarity index 78% rename from zeiterfassung/replies/createbookingreply.h rename to zeiterfassunglib/replies/createbookingreply.h index accc5dd..7111181 100644 --- a/zeiterfassung/replies/createbookingreply.h +++ b/zeiterfassunglib/replies/createbookingreply.h @@ -5,9 +5,10 @@ #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" -class CreateBookingReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT CreateBookingReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/createtimeassignmentreply.cpp b/zeiterfassunglib/replies/createtimeassignmentreply.cpp similarity index 100% rename from zeiterfassung/replies/createtimeassignmentreply.cpp rename to zeiterfassunglib/replies/createtimeassignmentreply.cpp diff --git a/zeiterfassung/replies/createtimeassignmentreply.h b/zeiterfassunglib/replies/createtimeassignmentreply.h similarity index 79% rename from zeiterfassung/replies/createtimeassignmentreply.h rename to zeiterfassunglib/replies/createtimeassignmentreply.h index 634b907..0224410 100644 --- a/zeiterfassung/replies/createtimeassignmentreply.h +++ b/zeiterfassunglib/replies/createtimeassignmentreply.h @@ -5,9 +5,10 @@ #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" -class CreateTimeAssignmentReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT CreateTimeAssignmentReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/deletebookingreply.cpp b/zeiterfassunglib/replies/deletebookingreply.cpp similarity index 100% rename from zeiterfassung/replies/deletebookingreply.cpp rename to zeiterfassunglib/replies/deletebookingreply.cpp diff --git a/zeiterfassung/replies/deletebookingreply.h b/zeiterfassunglib/replies/deletebookingreply.h similarity index 76% rename from zeiterfassung/replies/deletebookingreply.h rename to zeiterfassunglib/replies/deletebookingreply.h index 94796c4..6e701fa 100644 --- a/zeiterfassung/replies/deletebookingreply.h +++ b/zeiterfassunglib/replies/deletebookingreply.h @@ -5,9 +5,10 @@ #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" -class DeleteBookingReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT DeleteBookingReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/deletetimeassignmentreply.cpp b/zeiterfassunglib/replies/deletetimeassignmentreply.cpp similarity index 100% rename from zeiterfassung/replies/deletetimeassignmentreply.cpp rename to zeiterfassunglib/replies/deletetimeassignmentreply.cpp diff --git a/zeiterfassung/replies/deletetimeassignmentreply.h b/zeiterfassunglib/replies/deletetimeassignmentreply.h similarity index 76% rename from zeiterfassung/replies/deletetimeassignmentreply.h rename to zeiterfassunglib/replies/deletetimeassignmentreply.h index b2a545e..ec7a4d0 100644 --- a/zeiterfassung/replies/deletetimeassignmentreply.h +++ b/zeiterfassunglib/replies/deletetimeassignmentreply.h @@ -5,9 +5,10 @@ #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" -class DeleteTimeAssignmentReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT DeleteTimeAssignmentReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/getauswertungreply.cpp b/zeiterfassunglib/replies/getauswertungreply.cpp similarity index 100% rename from zeiterfassung/replies/getauswertungreply.cpp rename to zeiterfassunglib/replies/getauswertungreply.cpp diff --git a/zeiterfassung/replies/getauswertungreply.h b/zeiterfassunglib/replies/getauswertungreply.h similarity index 81% rename from zeiterfassung/replies/getauswertungreply.h rename to zeiterfassunglib/replies/getauswertungreply.h index b220880..c39e93e 100644 --- a/zeiterfassung/replies/getauswertungreply.h +++ b/zeiterfassunglib/replies/getauswertungreply.h @@ -6,9 +6,10 @@ #include #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" -class GetAuswertungReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT GetAuswertungReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/getbookingsreply.cpp b/zeiterfassunglib/replies/getbookingsreply.cpp similarity index 100% rename from zeiterfassung/replies/getbookingsreply.cpp rename to zeiterfassunglib/replies/getbookingsreply.cpp diff --git a/zeiterfassung/replies/getbookingsreply.h b/zeiterfassunglib/replies/getbookingsreply.h similarity index 82% rename from zeiterfassung/replies/getbookingsreply.h rename to zeiterfassunglib/replies/getbookingsreply.h index 459a426..e60c8d7 100644 --- a/zeiterfassung/replies/getbookingsreply.h +++ b/zeiterfassunglib/replies/getbookingsreply.h @@ -6,10 +6,11 @@ #include #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" #include "zeiterfassungapi.h" -class GetBookingsReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT GetBookingsReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/getpresencestatusreply.cpp b/zeiterfassunglib/replies/getpresencestatusreply.cpp similarity index 100% rename from zeiterfassung/replies/getpresencestatusreply.cpp rename to zeiterfassunglib/replies/getpresencestatusreply.cpp diff --git a/zeiterfassung/replies/getpresencestatusreply.h b/zeiterfassunglib/replies/getpresencestatusreply.h similarity index 82% rename from zeiterfassung/replies/getpresencestatusreply.h rename to zeiterfassunglib/replies/getpresencestatusreply.h index f75b230..730b2fb 100644 --- a/zeiterfassung/replies/getpresencestatusreply.h +++ b/zeiterfassunglib/replies/getpresencestatusreply.h @@ -5,10 +5,11 @@ #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" #include "zeiterfassungapi.h" -class GetPresenceStatusReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT GetPresenceStatusReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/getprojectsreply.cpp b/zeiterfassunglib/replies/getprojectsreply.cpp similarity index 100% rename from zeiterfassung/replies/getprojectsreply.cpp rename to zeiterfassunglib/replies/getprojectsreply.cpp diff --git a/zeiterfassung/replies/getprojectsreply.h b/zeiterfassunglib/replies/getprojectsreply.h similarity index 82% rename from zeiterfassung/replies/getprojectsreply.h rename to zeiterfassunglib/replies/getprojectsreply.h index faa4886..5aa5c23 100644 --- a/zeiterfassung/replies/getprojectsreply.h +++ b/zeiterfassunglib/replies/getprojectsreply.h @@ -6,10 +6,11 @@ #include #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" #include "zeiterfassungapi.h" -class GetProjectsReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT GetProjectsReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/gettimeassignmentsreply.cpp b/zeiterfassunglib/replies/gettimeassignmentsreply.cpp similarity index 100% rename from zeiterfassung/replies/gettimeassignmentsreply.cpp rename to zeiterfassunglib/replies/gettimeassignmentsreply.cpp diff --git a/zeiterfassung/replies/gettimeassignmentsreply.h b/zeiterfassunglib/replies/gettimeassignmentsreply.h similarity index 82% rename from zeiterfassung/replies/gettimeassignmentsreply.h rename to zeiterfassunglib/replies/gettimeassignmentsreply.h index 153064e..aa5355c 100644 --- a/zeiterfassung/replies/gettimeassignmentsreply.h +++ b/zeiterfassunglib/replies/gettimeassignmentsreply.h @@ -6,10 +6,11 @@ #include #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" #include "zeiterfassungapi.h" -class GetTimeAssignmentsReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT GetTimeAssignmentsReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/loginpagereply.cpp b/zeiterfassunglib/replies/loginpagereply.cpp similarity index 100% rename from zeiterfassung/replies/loginpagereply.cpp rename to zeiterfassunglib/replies/loginpagereply.cpp diff --git a/zeiterfassung/replies/loginpagereply.h b/zeiterfassunglib/replies/loginpagereply.h similarity index 76% rename from zeiterfassung/replies/loginpagereply.h rename to zeiterfassunglib/replies/loginpagereply.h index 203cb5d..daf0f44 100644 --- a/zeiterfassung/replies/loginpagereply.h +++ b/zeiterfassunglib/replies/loginpagereply.h @@ -5,9 +5,10 @@ #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" -class LoginPageReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT LoginPageReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/loginreply.cpp b/zeiterfassunglib/replies/loginreply.cpp similarity index 100% rename from zeiterfassung/replies/loginreply.cpp rename to zeiterfassunglib/replies/loginreply.cpp diff --git a/zeiterfassung/replies/loginreply.h b/zeiterfassunglib/replies/loginreply.h similarity index 76% rename from zeiterfassung/replies/loginreply.h rename to zeiterfassunglib/replies/loginreply.h index bcf7dc1..2626d7a 100644 --- a/zeiterfassung/replies/loginreply.h +++ b/zeiterfassunglib/replies/loginreply.h @@ -5,9 +5,10 @@ #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" -class LoginReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT LoginReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/updatebookingreply.cpp b/zeiterfassunglib/replies/updatebookingreply.cpp similarity index 100% rename from zeiterfassung/replies/updatebookingreply.cpp rename to zeiterfassunglib/replies/updatebookingreply.cpp diff --git a/zeiterfassung/replies/updatebookingreply.h b/zeiterfassunglib/replies/updatebookingreply.h similarity index 77% rename from zeiterfassung/replies/updatebookingreply.h rename to zeiterfassunglib/replies/updatebookingreply.h index f61e179..c948485 100644 --- a/zeiterfassung/replies/updatebookingreply.h +++ b/zeiterfassunglib/replies/updatebookingreply.h @@ -5,9 +5,10 @@ #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" -class UpdateBookingReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT UpdateBookingReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/updatetimeassignmentreply.cpp b/zeiterfassunglib/replies/updatetimeassignmentreply.cpp similarity index 100% rename from zeiterfassung/replies/updatetimeassignmentreply.cpp rename to zeiterfassunglib/replies/updatetimeassignmentreply.cpp diff --git a/zeiterfassung/replies/updatetimeassignmentreply.h b/zeiterfassunglib/replies/updatetimeassignmentreply.h similarity index 79% rename from zeiterfassung/replies/updatetimeassignmentreply.h rename to zeiterfassunglib/replies/updatetimeassignmentreply.h index 84b4cca..ea9977a 100644 --- a/zeiterfassung/replies/updatetimeassignmentreply.h +++ b/zeiterfassunglib/replies/updatetimeassignmentreply.h @@ -5,9 +5,10 @@ #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" -class UpdateTimeAssignmentReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT UpdateTimeAssignmentReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/userinforeply.cpp b/zeiterfassunglib/replies/userinforeply.cpp similarity index 100% rename from zeiterfassung/replies/userinforeply.cpp rename to zeiterfassunglib/replies/userinforeply.cpp diff --git a/zeiterfassung/replies/userinforeply.h b/zeiterfassunglib/replies/userinforeply.h similarity index 81% rename from zeiterfassung/replies/userinforeply.h rename to zeiterfassunglib/replies/userinforeply.h index aeee527..3b7fc09 100644 --- a/zeiterfassung/replies/userinforeply.h +++ b/zeiterfassunglib/replies/userinforeply.h @@ -5,10 +5,11 @@ #include +#include "zeiterfassunglib_global.h" #include "zeiterfassungreply.h" #include "zeiterfassungapi.h" -class UserInfoReply : public ZeiterfassungReply +class ZEITERFASSUNGLIBSHARED_EXPORT UserInfoReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassung/replies/zeiterfassungreply.cpp b/zeiterfassunglib/replies/zeiterfassungreply.cpp similarity index 100% rename from zeiterfassung/replies/zeiterfassungreply.cpp rename to zeiterfassunglib/replies/zeiterfassungreply.cpp diff --git a/zeiterfassung/replies/zeiterfassungreply.h b/zeiterfassunglib/replies/zeiterfassungreply.h similarity index 83% rename from zeiterfassung/replies/zeiterfassungreply.h rename to zeiterfassunglib/replies/zeiterfassungreply.h index 58f31f4..6ac1b68 100644 --- a/zeiterfassung/replies/zeiterfassungreply.h +++ b/zeiterfassunglib/replies/zeiterfassungreply.h @@ -3,9 +3,11 @@ #include +#include "zeiterfassunglib_global.h" + class ZeiterfassungApi; -class ZeiterfassungReply : public QObject +class ZEITERFASSUNGLIBSHARED_EXPORT ZeiterfassungReply : public QObject { Q_OBJECT diff --git a/zeiterfassunglib/translations/zeiterfassunglib_de.qm b/zeiterfassunglib/translations/zeiterfassunglib_de.qm new file mode 100644 index 0000000000000000000000000000000000000000..9dad8dffceb9623e88f8b96d9cd0caf25574c6fa GIT binary patch literal 23 fcmcE7ks@*G{hX<16=n7(EZlpygMop8iIEWihQJ9+ literal 0 HcmV?d00001 diff --git a/zeiterfassunglib/translations/zeiterfassunglib_de.ts b/zeiterfassunglib/translations/zeiterfassunglib_de.ts new file mode 100644 index 0000000..7522e74 --- /dev/null +++ b/zeiterfassunglib/translations/zeiterfassunglib_de.ts @@ -0,0 +1,267 @@ + + + + + CreateBookingReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + CreateTimeAssignmentReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + DeleteBookingReply + + + Request error occured: %0 + + + + + DeleteTimeAssignmentReply + + + Request error occured: %0 + + + + + GetAuswertungReply + + + + Request error occured: %0 + + + + + GetBookingsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + GetPresenceStatusReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + GetProjectsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain elements! + + + + + elements is not an array! + + + + + GetTimeAssignmentsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + LoginPageReply + + + Request error occured: %0 + + + + + Could not find necessary keywords in login page! + + + + + LoginReply + + + Request error occured: %0 + + + + + Response did not contain a Location header. + + + + + Authentication failure. Please check username and password. + + + + + An unknown authentication failure occured. Redirected to: %0 + + + + + UpdateBookingReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + UpdateTimeAssignmentReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + UserInfoReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain evoAppsUser! + + + + + evoAppsUser is not an object! + + + + diff --git a/zeiterfassunglib/translations/zeiterfassunglib_en.qm b/zeiterfassunglib/translations/zeiterfassunglib_en.qm new file mode 100644 index 0000000000000000000000000000000000000000..9dad8dffceb9623e88f8b96d9cd0caf25574c6fa GIT binary patch literal 23 fcmcE7ks@*G{hX<16=n7(EZlpygMop8iIEWihQJ9+ literal 0 HcmV?d00001 diff --git a/zeiterfassunglib/translations/zeiterfassunglib_en.ts b/zeiterfassunglib/translations/zeiterfassunglib_en.ts new file mode 100644 index 0000000..159cf9a --- /dev/null +++ b/zeiterfassunglib/translations/zeiterfassunglib_en.ts @@ -0,0 +1,267 @@ + + + + + CreateBookingReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + CreateTimeAssignmentReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + DeleteBookingReply + + + Request error occured: %0 + + + + + DeleteTimeAssignmentReply + + + Request error occured: %0 + + + + + GetAuswertungReply + + + + Request error occured: %0 + + + + + GetBookingsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + GetPresenceStatusReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + GetProjectsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain elements! + + + + + elements is not an array! + + + + + GetTimeAssignmentsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + LoginPageReply + + + Request error occured: %0 + + + + + Could not find necessary keywords in login page! + + + + + LoginReply + + + Request error occured: %0 + + + + + Response did not contain a Location header. + + + + + Authentication failure. Please check username and password. + + + + + An unknown authentication failure occured. Redirected to: %0 + + + + + UpdateBookingReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + UpdateTimeAssignmentReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + UserInfoReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain evoAppsUser! + + + + + evoAppsUser is not an object! + + + + diff --git a/zeiterfassung/zeiterfassungapi.cpp b/zeiterfassunglib/zeiterfassungapi.cpp similarity index 100% rename from zeiterfassung/zeiterfassungapi.cpp rename to zeiterfassunglib/zeiterfassungapi.cpp diff --git a/zeiterfassung/zeiterfassungapi.h b/zeiterfassunglib/zeiterfassungapi.h similarity index 97% rename from zeiterfassung/zeiterfassungapi.h rename to zeiterfassunglib/zeiterfassungapi.h index 86bfa0c..19e04e2 100644 --- a/zeiterfassung/zeiterfassungapi.h +++ b/zeiterfassunglib/zeiterfassungapi.h @@ -8,6 +8,8 @@ #include #include +#include "zeiterfassunglib_global.h" + class QNetworkAccessManager; class LoginPageReply; @@ -25,7 +27,7 @@ class GetProjectsReply; class GetAuswertungReply; class GetPresenceStatusReply; -class ZeiterfassungApi : public QObject +class ZEITERFASSUNGLIBSHARED_EXPORT ZeiterfassungApi : public QObject { Q_OBJECT diff --git a/zeiterfassunglib/zeiterfassunglib.pro b/zeiterfassunglib/zeiterfassunglib.pro new file mode 100644 index 0000000..33dcaf4 --- /dev/null +++ b/zeiterfassunglib/zeiterfassunglib.pro @@ -0,0 +1,56 @@ +QT += network gui widgets + +TARGET = zeiterfassunglib +TEMPLATE = lib + +CONFIG += c++14 + +DESTDIR = $${OUT_PWD}/../lib + +DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DEFINES += ZEITERFASSUNGLIB_LIBRARY + +SOURCES += zeiterfassungapi.cpp \ + replies/createtimeassignmentreply.cpp \ + replies/updatebookingreply.cpp \ + replies/getbookingsreply.cpp \ + replies/getpresencestatusreply.cpp \ + replies/gettimeassignmentsreply.cpp \ + replies/deletetimeassignmentreply.cpp \ + replies/loginpagereply.cpp \ + replies/getprojectsreply.cpp \ + replies/getauswertungreply.cpp \ + replies/loginreply.cpp \ + replies/userinforeply.cpp \ + replies/zeiterfassungreply.cpp \ + replies/updatetimeassignmentreply.cpp \ + replies/deletebookingreply.cpp \ + replies/createbookingreply.cpp + +HEADERS += cpp14polyfills.h \ + zeiterfassunglib_global.h \ + zeiterfassungapi.h \ + replies/createtimeassignmentreply.h \ + replies/updatebookingreply.h \ + replies/getbookingsreply.h \ + replies/getpresencestatusreply.h \ + replies/gettimeassignmentsreply.h \ + replies/deletetimeassignmentreply.h \ + replies/loginpagereply.h \ + replies/getprojectsreply.h \ + replies/getauswertungreply.h \ + replies/loginreply.h \ + replies/userinforeply.h \ + replies/zeiterfassungreply.h \ + replies/updatetimeassignmentreply.h \ + replies/deletebookingreply.h \ + replies/createbookingreply.h + +TRANSLATIONS += \ + translations/zeiterfassunglib_en.ts \ + translations/zeiterfassunglib_de.ts + +# unix { +# target.path = /usr/lib +# INSTALLS += target +# } diff --git a/zeiterfassunglib/zeiterfassunglib_global.h b/zeiterfassunglib/zeiterfassunglib_global.h new file mode 100644 index 0000000..bfb9534 --- /dev/null +++ b/zeiterfassunglib/zeiterfassunglib_global.h @@ -0,0 +1,12 @@ +#ifndef ZEITERFASSUNGLIB_GLOBAL_H +#define ZEITERFASSUNGLIB_GLOBAL_H + +#include + +#if defined(ZEITERFASSUNGLIB_LIBRARY) +# define ZEITERFASSUNGLIBSHARED_EXPORT Q_DECL_EXPORT +#else +# define ZEITERFASSUNGLIBSHARED_EXPORT Q_DECL_IMPORT +#endif + +#endif // ZEITERFASSUNGLIB_GLOBAL_H