From 923b4061763ddfb7b60206762a2766b7d0605184 Mon Sep 17 00:00:00 2001
From: Martin Straka <martin.straka@nic.cz>
Date: Wed, 13 Dec 2023 15:40:42 +0100
Subject: [PATCH 1/2] Removed unused qml components from main.
---
src/main.cpp | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 2ebf87827..37b8c55a8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -188,23 +188,16 @@ const struct QmlTypeEntry qmlComponents[] = {
{ "FilterBar", 1, 0 },
{ "GovFormList", 1, 0 },
{ "GovServiceList", 1, 0 },
- { "InputLineMenu", 1, 0 },
- { "MenuImage", 1, 0 },
{ "MessageBox", 1, 0 },
{ "MessageList", 1, 0 },
- { "NextOverlaidImage", 1, 0 },
- { "OverlaidImage", 1, 0 },
{ "PageHeader", 1, 0 },
- { "TimedPasswordLine", 1, 0 },
{ "Pictogram", 1, 0 },
- { "PopupGroupLabel", 1, 0 },
{ "PopupItem", 1, 0 },
- { "SeparatorLine", 1, 0 },
- { "StatusBar", 1, 0 },
- { "ScrollableGridView", 1, 0 },
{ "ScrollableListView", 1, 0 },
+ { "SeparatorLine", 1, 0 },
{ "ShowPasswordOverlaidImage", 1, 0 },
{ "TextLineItem", 1, 0 },
+ { "TimedPasswordLine", 1, 0 },
{ NULL, 0, 0 }
};
--
GitLab
From 979c071b13165471b3285dbc0983c5c15278759d Mon Sep 17 00:00:00 2001
From: Martin Straka <martin.straka@nic.cz>
Date: Wed, 13 Dec 2023 15:42:03 +0100
Subject: [PATCH 2/2] Removed statusbar text parameter from task.
---
src/isds/isds_wrapper.cpp | 10 +++-------
src/isds/isds_wrapper.h | 11 +----------
src/worker/emitter.h | 3 +--
src/worker/task_download_message_list.cpp | 13 +++----------
src/worker/task_download_message_list.h | 5 +----
5 files changed, 9 insertions(+), 33 deletions(-)
diff --git a/src/isds/isds_wrapper.cpp b/src/isds/isds_wrapper.cpp
index bb4adea37..95854c1b5 100644
--- a/src/isds/isds_wrapper.cpp
+++ b/src/isds/isds_wrapper.cpp
@@ -79,11 +79,9 @@ IsdsWrapper::IsdsWrapper(QObject *parent)
SLOT(downloadMessageFinished(AcntId, qint64, bool, QString)));
connect(GlobInstcs::msgProcEmitterPtr,
- SIGNAL(downloadMessageListFinishedSignal(AcntId, bool, QString,
- QString, bool)),
+ SIGNAL(downloadMessageListFinishedSignal(AcntId, bool, QString, bool)),
this,
- SLOT(downloadMessageListFinished(AcntId, bool, QString,
- QString, bool)));
+ SLOT(downloadMessageListFinished(AcntId, bool, QString, bool)));
connect(GlobInstcs::msgProcEmitterPtr,
SIGNAL(importZFOFinishedSignal(int, int, QString)),
@@ -738,7 +736,6 @@ void IsdsWrapper::doLoginAction(const QString &isdsAction,
return;
} else if (acntData.loginMethod() == AcntData::LIM_UNAME_MEP) {
/* Basic login succeeded. Run MEP login. */
- emit statusBarTextMepChanged(tr("Waiting for confirmation ..."));
emit showMepWaitDialog(acntId.username(), true);
if (!Isds::Login::loginMep(*GlobInstcs::isdsSessionsPtr, acntId,
m_mepRunning, errTxt)) {
@@ -1028,8 +1025,7 @@ void IsdsWrapper::downloadMessageFinished(const AcntId &acntId, qint64 msgId,
}
void IsdsWrapper::downloadMessageListFinished(const AcntId &acntId,
- bool success, const QString &statusBarText, const QString &errTxt,
- bool isMsgReceived)
+ bool success, const QString &errTxt, bool isMsgReceived)
{
emit downloadMessageListFinishedSig(isMsgReceived, acntId.username(),
acntId.testing());
diff --git a/src/isds/isds_wrapper.h b/src/isds/isds_wrapper.h
index b35eeb796..3ea4ba5f4 100644
--- a/src/isds/isds_wrapper.h
+++ b/src/isds/isds_wrapper.h
@@ -486,13 +486,11 @@ public slots:
*
* @param[in] acntId Account identifier.
* @param[in] success True if success.
- * @param[in] statusBarText Text for status bar.
* @param[in] errTxt Error description.
* @param[in] isMsgReceived True if message type is received.
*/
void downloadMessageListFinished(const AcntId &acntId,
- bool success, const QString &statusBarText, const QString &errTxt,
- bool isMsgReceived);
+ bool success, const QString &errTxt, bool isMsgReceived);
/*!
* @brief Do some actions when import of one ZFO has been finished.
@@ -722,13 +720,6 @@ signals:
void sendSearchResultsSig(int totalCount, int currentCount,
int position, bool lastPage);
- /*!
- * @brief Set new status bar text from MEP login to QML.
- *
- * @param[in] txt Text message for status bar.
- */
- void statusBarTextMepChanged(QString txt);
-
/*!
* @brief Signal is emitted when login to ISDS of new account fails.
*
diff --git a/src/worker/emitter.h b/src/worker/emitter.h
index df25a6484..7f75d2b43 100644
--- a/src/worker/emitter.h
+++ b/src/worker/emitter.h
@@ -74,12 +74,11 @@ signals:
*
* @param[in] acntId Account identifier.
* @param[in] success True if success.
- * @param[in] statusBarText Text for statusBar.
* @param[in] errTxt Errot description.
* @param[in] isMsgReceived True if message type is received.
*/
void downloadMessageListFinishedSignal(const AcntId &acntId,
- bool success, const QString &statusBarText, const QString &errTxt,
+ bool success, const QString &errTxt,
bool isMsgReceived);
/*!
diff --git a/src/worker/task_download_message_list.cpp b/src/worker/task_download_message_list.cpp
index 5035a6b6a..c12ef25b0 100644
--- a/src/worker/task_download_message_list.cpp
+++ b/src/worker/task_download_message_list.cpp
@@ -46,7 +46,6 @@ TaskDownloadMessageList::TaskDownloadMessageList(const AcntId &acntId,
Isds::Type::DmFiltStates dmStatusFilter, unsigned long int dmOffset,
unsigned long int dmLimit, WorkerPool *workPool, bool downloadCompleteMsgs)
: m_result(DL_ERR),
- m_statusBarText(),
m_acntId(acntId),
m_msgDirect(msgDirect),
m_dmStatusFilter(dmStatusFilter),
@@ -76,14 +75,12 @@ void TaskDownloadMessageList::run(void)
logDebugLv0NL("Starting in thread '%p'", QThread::currentThreadId());
m_result = downloadMessageList(m_acntId, m_msgDirect, m_dmStatusFilter,
- m_dmOffset, m_dmLimit, m_workPool, m_downloadCompleteMsgs,
- m_statusBarText, m_lastError);
+ m_dmOffset, m_dmLimit, m_workPool, m_downloadCompleteMsgs, m_lastError);
if (GlobInstcs::msgProcEmitterPtr != Q_NULLPTR) {
emit GlobInstcs::msgProcEmitterPtr->downloadMessageListFinishedSignal(
m_acntId,
- TaskDownloadMessageList::DL_SUCCESS == m_result,
- m_statusBarText, m_lastError,
+ TaskDownloadMessageList::DL_SUCCESS == m_result, m_lastError,
m_msgDirect == Messages::TYPE_RECEIVED);
}
@@ -120,7 +117,7 @@ enum TaskDownloadMessageList::Result TaskDownloadMessageList::downloadMessageLis
const AcntId &acntId, enum Messages::MessageType msgDirect,
Isds::Type::DmFiltStates dmStatusFilter, unsigned long int dmOffset,
unsigned long int dmLimit, WorkerPool *workPool, bool downloadCompleteMsgs,
- QString &statusBarText, QString &lastError)
+ QString &lastError)
{
if (Q_UNLIKELY((!acntId.isValid()) ||
(GlobInstcs::isdsSessionsPtr == Q_NULLPTR) ||
@@ -156,7 +153,6 @@ enum TaskDownloadMessageList::Result TaskDownloadMessageList::downloadMessageLis
}
if (envelopes.isEmpty()) {
- statusBarText = tr("%1: No new messages.").arg(acntId.username());
return DL_SUCCESS;
}
@@ -174,9 +170,6 @@ enum TaskDownloadMessageList::Result TaskDownloadMessageList::downloadMessageLis
return DL_DB_INS_ERR;
}
- /* Store info text about new messages (for showing in status bar) */
- statusBarText = lastError;
-
/*
* For sent message where message status was changed
* we should update delivery info as well.
diff --git a/src/worker/task_download_message_list.h b/src/worker/task_download_message_list.h
index c55d88904..4b4dc5132 100644
--- a/src/worker/task_download_message_list.h
+++ b/src/worker/task_download_message_list.h
@@ -84,7 +84,6 @@ public:
* @param[in] workPool Pointer to worker pool.
* @param[in] downloadCompleteMsgs Download complete messages.
* @param[out] msgIds Message ID list (for download of complete messages).
- * @param[out] statusBarText Text about new messages for status bar.
* @param[out] lastError Last error description.
* @return Error state.
*/
@@ -93,11 +92,9 @@ public:
enum Messages::MessageType msgDirect,
Isds::Type::DmFiltStates dmStatusFilter, unsigned long int dmOffset,
unsigned long int dmLimit, WorkerPool *workPool,
- bool downloadCompleteMsgs, QString &statusBarText,
- QString &lastError);
+ bool downloadCompleteMsgs, QString &lastError);
enum Result m_result; /*!< Return state. */
- QString m_statusBarText; /*!< Return text about new messages for status bar. */
private:
/*!
--
GitLab