Compare commits
No commits in common. "master" and "1.5.4" have entirely different histories.
@ -141,14 +141,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# 1.5.1 : Fix: do not use cleanPath() on a url-address.
|
# 1.5.1 : Fix: do not use cleanPath() on a url-address.
|
||||||
# 1.5.2 : Remove .ipk and .gz files in /var/cache/opkg.
|
# 1.5.2 : Remove .ipk and .gz files in /var/cache/opkg.
|
||||||
# 1.5.3 : Build customer_(id) name without right justification.
|
# 1.5.3 : Build customer_(id) name without right justification.
|
||||||
# 1.5.4 : Try to run opkg-commands even under some error conditions (failure
|
VERSION="1.5.3"
|
||||||
# of customerEnvironment(), filesToUpdate() or
|
|
||||||
# syncCustomerRepositoryAndFS().
|
|
||||||
# 1.5.5 : Call into binary ptuPackageVersion to get installed package
|
|
||||||
# versions.
|
|
||||||
# 1.5.6 : Show additional update progress info in status bar.
|
|
||||||
# 1.5.7 : Add support for dynamic portrait / landscape.
|
|
||||||
VERSION="1.5.7"
|
|
||||||
# PLANNED TODOS:
|
# PLANNED TODOS:
|
||||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||||
|
@ -690,8 +690,7 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
|
|||||||
"\"libTCP_ZVT_CCPlugin.so\" : {"
|
"\"libTCP_ZVT_CCPlugin.so\" : {"
|
||||||
"\"VERSION\" : \"%s\""
|
"\"VERSION\" : \"%s\""
|
||||||
"}"
|
"}"
|
||||||
"},"
|
"}"
|
||||||
"\"PTU-PACKAGE-VERSIONS\" : %s"
|
|
||||||
"}",
|
"}",
|
||||||
psa.versionInfo.reason.toStdString().c_str(),
|
psa.versionInfo.reason.toStdString().c_str(),
|
||||||
psa.versionInfo.created.toStdString().c_str(),
|
psa.versionInfo.created.toStdString().c_str(),
|
||||||
@ -802,9 +801,7 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
|
|||||||
psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
|
psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
|
||||||
psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
|
psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
|
||||||
psa.pluginVersion.prmCalculatePriceConfigUi.toStdString().c_str(),
|
psa.pluginVersion.prmCalculatePriceConfigUi.toStdString().c_str(),
|
||||||
psa.pluginVersion.tcpZVT.toStdString().c_str(),
|
psa.pluginVersion.tcpZVT.toStdString().c_str());
|
||||||
|
|
||||||
psa.ptuPackageVersion.toStdString().c_str());
|
|
||||||
|
|
||||||
qInfo() << buf;
|
qInfo() << buf;
|
||||||
|
|
||||||
|
@ -77,8 +77,6 @@ struct PSAInstalled {
|
|||||||
|
|
||||||
DC2C print[32];
|
DC2C print[32];
|
||||||
|
|
||||||
QString ptuPackageVersion;
|
|
||||||
|
|
||||||
explicit PSAInstalled() {
|
explicit PSAInstalled() {
|
||||||
tariff.name = "N/A";
|
tariff.name = "N/A";
|
||||||
tariff.version = "N/A";
|
tariff.version = "N/A";
|
||||||
|
@ -12,9 +12,6 @@
|
|||||||
#include <QScrollBar>
|
#include <QScrollBar>
|
||||||
#include <QEvent>
|
#include <QEvent>
|
||||||
|
|
||||||
#include <QScreen>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
||||||
: QMainWindow(parent)
|
: QMainWindow(parent)
|
||||||
@ -33,7 +30,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
|||||||
this->statusBar()->setFont(f);
|
this->statusBar()->setFont(f);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
checkOrientation();
|
|
||||||
|
|
||||||
ui->updateProgress->setRange(0, 100);
|
ui->updateProgress->setRange(0, 100);
|
||||||
ui->updateProgress->reset();
|
ui->updateProgress->reset();
|
||||||
@ -63,24 +59,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
|||||||
m_exitTimer->setSingleShot(true);
|
m_exitTimer->setSingleShot(true);
|
||||||
m_exitTimer->start(1800 * 1000);
|
m_exitTimer->start(1800 * 1000);
|
||||||
|
|
||||||
m_statusTimer = new QTimer(this);
|
|
||||||
if (m_statusTimer) {
|
|
||||||
connect(m_statusTimer, &QTimer::timeout, [this]() {
|
|
||||||
static QString p(".");
|
|
||||||
QTime const &t = QDateTime::currentDateTime().time();
|
|
||||||
QString s = t.toString(Qt::ISODate);
|
|
||||||
s += ": Update might take several minutes " + p;
|
|
||||||
if (p.length() >= 5) {
|
|
||||||
p = ".";
|
|
||||||
} else {
|
|
||||||
p += ".";
|
|
||||||
}
|
|
||||||
this->statusBar()->showMessage(s);
|
|
||||||
});
|
|
||||||
m_statusTimer->setSingleShot(false);
|
|
||||||
m_statusTimer->start(1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
|
connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
|
||||||
connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
|
connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
|
||||||
connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
|
connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
|
||||||
@ -98,60 +76,9 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
|||||||
MainWindow::~MainWindow() {
|
MainWindow::~MainWindow() {
|
||||||
delete m_startTimer;
|
delete m_startTimer;
|
||||||
delete m_exitTimer;
|
delete m_exitTimer;
|
||||||
delete m_statusTimer;
|
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------- Ui::LAYOUT setting -------------------------------------
|
|
||||||
|
|
||||||
void MainWindow::checkOrientation()
|
|
||||||
{
|
|
||||||
QScreen *screen = QGuiApplication::primaryScreen();
|
|
||||||
Qt::ScreenOrientation orientation = screen->orientation();
|
|
||||||
|
|
||||||
switch (orientation) {
|
|
||||||
case Qt::PrimaryOrientation:
|
|
||||||
this->setLandscapeLayout();
|
|
||||||
break;
|
|
||||||
case Qt::LandscapeOrientation:
|
|
||||||
this->setLandscapeLayout();
|
|
||||||
break;
|
|
||||||
case Qt::PortraitOrientation:
|
|
||||||
this->setPortraitLayout();
|
|
||||||
break;
|
|
||||||
case Qt::InvertedLandscapeOrientation:
|
|
||||||
this->setLandscapeLayout();
|
|
||||||
break;
|
|
||||||
case Qt::InvertedPortraitOrientation:
|
|
||||||
this->setPortraitLayout();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
this->currentOrientation = orientation;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void MainWindow::setPortraitLayout()
|
|
||||||
{
|
|
||||||
// Adjust layout for portrait mode (480x800)
|
|
||||||
this->setFixedSize(480, 800);
|
|
||||||
ui->centralwidget->setFixedSize(480, 800);
|
|
||||||
}
|
|
||||||
|
|
||||||
void MainWindow::setLandscapeLayout()
|
|
||||||
{
|
|
||||||
// Adjust layout for landscape mode (800x480)
|
|
||||||
this->setFixedSize(800, 480);
|
|
||||||
ui->centralwidget->setFixedSize(800, 480);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void MainWindow::customEvent(QEvent *event) {
|
void MainWindow::customEvent(QEvent *event) {
|
||||||
if (event->type() == ProgressEvent::type()) {
|
if (event->type() == ProgressEvent::type()) {
|
||||||
ProgressEvent *pevent = (ProgressEvent *)event;
|
ProgressEvent *pevent = (ProgressEvent *)event;
|
||||||
|
@ -66,12 +66,6 @@ private:
|
|||||||
void onShowMessage(QString, QString);
|
void onShowMessage(QString, QString);
|
||||||
|
|
||||||
Ui::MainWindow *ui;
|
Ui::MainWindow *ui;
|
||||||
void checkOrientation();
|
|
||||||
void setPortraitLayout();
|
|
||||||
void setLandscapeLayout();
|
|
||||||
Qt::ScreenOrientation currentOrientation;
|
|
||||||
|
|
||||||
|
|
||||||
Worker *m_worker;
|
Worker *m_worker;
|
||||||
int const m_width;
|
int const m_width;
|
||||||
QTimer *m_startTimer;
|
QTimer *m_startTimer;
|
||||||
@ -79,6 +73,5 @@ private:
|
|||||||
bool m_progressRunning;
|
bool m_progressRunning;
|
||||||
//int m_progressValue;
|
//int m_progressValue;
|
||||||
UpdateDcEvent::UpdateStep m_updateStep;
|
UpdateDcEvent::UpdateStep m_updateStep;
|
||||||
QTimer *m_statusTimer;
|
|
||||||
};
|
};
|
||||||
#endif // MAINWINDOW_H
|
#endif // MAINWINDOW_H
|
||||||
|
@ -10,12 +10,6 @@
|
|||||||
<height>480</height>
|
<height>480</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>480</width>
|
|
||||||
<height>480</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
<property name="font">
|
||||||
<font>
|
<font>
|
||||||
<family>Source Code Pro</family>
|
<family>Source Code Pro</family>
|
||||||
@ -25,8 +19,15 @@
|
|||||||
<string>MainWindow</string>
|
<string>MainWindow</string>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="centralwidget">
|
<widget class="QWidget" name="centralwidget">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<widget class="QWidget" name="layoutWidget">
|
||||||
<item>
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>10</x>
|
||||||
|
<y>10</y>
|
||||||
|
<width>781</width>
|
||||||
|
<height>441</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<item row="3" column="2">
|
<item row="3" column="2">
|
||||||
<widget class="QPushButton" name="exit">
|
<widget class="QPushButton" name="exit">
|
||||||
@ -51,7 +52,6 @@
|
|||||||
<font>
|
<font>
|
||||||
<family>Misc Fixed</family>
|
<family>Misc Fixed</family>
|
||||||
<pointsize>11</pointsize>
|
<pointsize>11</pointsize>
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
<bold>true</bold>
|
||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
@ -61,11 +61,13 @@
|
|||||||
<property name="horizontalScrollBarPolicy">
|
<property name="horizontalScrollBarPolicy">
|
||||||
<enum>Qt::ScrollBarAsNeeded</enum>
|
<enum>Qt::ScrollBarAsNeeded</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="sizeAdjustPolicy">
|
||||||
|
<enum>QAbstractScrollArea::AdjustToContents</enum>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</widget>
|
||||||
</layout>
|
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
<resources/>
|
<resources/>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#include <Qt>
|
#include <Qt>
|
||||||
#include <QScopedPointer>
|
#include <QScopedPointer>
|
||||||
#include <QRegularExpression>
|
#include <QRegularExpression>
|
||||||
#include <QJsonArray>
|
|
||||||
|
|
||||||
#include "message_handler.h"
|
#include "message_handler.h"
|
||||||
#include <DeviceController/interfaces.h>
|
#include <DeviceController/interfaces.h>
|
||||||
@ -1462,41 +1461,5 @@ PSAInstalled Worker::getPSAInstalled() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
psaInstalled.ptuPackageVersion = "{}";
|
|
||||||
if (QFile::exists("/usr/bin/ptuPackageVersions")) {
|
|
||||||
Command c("/usr/bin/ptuPackageVersions -i -o json");
|
|
||||||
if (c.execute(m_workingDirectory)) {
|
|
||||||
QString r = c.getCommandResult();
|
|
||||||
// ptuPackageVersions returns a json-array
|
|
||||||
QJsonArray const &ja = QJsonDocument::fromJson(r.remove(QRegExp("\\n")).toUtf8()).array();
|
|
||||||
if (!ja.empty()) {
|
|
||||||
// transform the array into an object, containing the objects
|
|
||||||
// of the array (christian needs it this way)
|
|
||||||
QJsonObject o;
|
|
||||||
foreach (QJsonValue const &value, ja) {
|
|
||||||
if (value.isObject()) {
|
|
||||||
QJsonObject obj = value.toObject();
|
|
||||||
QStringList keys = obj.keys();
|
|
||||||
if (!keys.isEmpty()) {
|
|
||||||
QString const &k = obj.keys().first();
|
|
||||||
QJsonValue const &v = obj.value(k);
|
|
||||||
o.insert(k, v);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
psaInstalled.ptuPackageVersion =
|
|
||||||
QJsonDocument(o).toJson(QJsonDocument::Compact);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
qCritical() << __func__ << ":" << __LINE__
|
|
||||||
<< "ERROR array return by ptuPackageVersions empty";
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qCritical() << __func__ << ":" << __LINE__
|
|
||||||
<< "ERROR executing ptuPackageVersions";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return psaInstalled;
|
return psaInstalled;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user