From 60c4d5896a535e20cd61e591e871f940c8f83da9 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Fri, 1 Dec 2023 15:07:29 +0100 Subject: [PATCH] Set 'printerLocale' from settings --- src/ATBAPP/ATBDeviceControllerPlugin.cpp | 11 +++++++---- src/ATBAPP/ATBDeviceControllerPlugin.h | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ATBAPP/ATBDeviceControllerPlugin.cpp b/src/ATBAPP/ATBDeviceControllerPlugin.cpp index dce98a7..4e98404 100644 --- a/src/ATBAPP/ATBDeviceControllerPlugin.cpp +++ b/src/ATBAPP/ATBDeviceControllerPlugin.cpp @@ -80,6 +80,9 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con // read variables from setting this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString(); QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1(); + QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1(); + this->printerLocale = QLocale(printerLocaleString); + if (this->isMaster) { // open serial port @@ -509,8 +512,8 @@ void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface:: QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(), Qt::ISODate); QDateTime currentDateTime = QDateTime::fromString(printingData["currentDateTime"].toString(), Qt::ISODate); - QString parkingEndDateString = QLocale().toString(parkingEndDateTime.date(), QLocale::ShortFormat); - QString currentDateString = QLocale().toString(currentDateTime.date(), QLocale::ShortFormat); + QString parkingEndDateString = this->printerLocale.toString(parkingEndDateTime.date(), QLocale::ShortFormat); + QString currentDateString = this->printerLocale.toString(currentDateTime.date(), QLocale::ShortFormat); // set dynamic printer data: @@ -680,8 +683,8 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHashprinterLocale.toString(parkingEndDateTime.date(), QLocale::ShortFormat); + QString currentDateString = this->printerLocale.toString(currentDateTime.date(), QLocale::ShortFormat); /* ----------------------------------------------------------------------------------------- * note: the following highly depends on printer template files! diff --git a/src/ATBAPP/ATBDeviceControllerPlugin.h b/src/ATBAPP/ATBDeviceControllerPlugin.h index 9c1a0cc..48709f6 100644 --- a/src/ATBAPP/ATBDeviceControllerPlugin.h +++ b/src/ATBAPP/ATBDeviceControllerPlugin.h @@ -2,6 +2,7 @@ #define ATBDEVICECONTROLLERPLUGIN_H #include +#include #include "src/ATBAPP/DeviceControllerInterface.h" #include "src/ATBAPP/ATBAPPplugin.h" @@ -128,6 +129,8 @@ private: // dbus int init_sc_dbus(); + QLocale printerLocale; + private slots: // printer