diff --git a/mainwindow.cpp b/mainwindow.cpp index 26f6df3..28995e2 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -320,6 +320,8 @@ void MainWindow::onQuit() { } void MainWindow::scrollDownTextEdit() { + qCritical() << "ON REPLACE LAST CALLED AT" << QDateTime::currentDateTime().toString(Qt::ISODateWithMs); + ui->updateStatus->setEnabled(true); QTextCursor tmpCursor = ui->updateStatus->textCursor(); @@ -329,6 +331,8 @@ void MainWindow::scrollDownTextEdit() { } void MainWindow::onAppendText(QString text, QString suffix) { + qCritical() << "ON APPEND CALLED AT" << QDateTime::currentDateTime().toString(Qt::ISODateWithMs); + QString editText = ui->updateStatus->toPlainText(); if (!suffix.isNull() && suffix.size() > 0) { //qInfo() << "TEXT" << text << "SUFFIX" << suffix; @@ -336,21 +340,26 @@ void MainWindow::onAppendText(QString text, QString suffix) { editText += QString("\n").leftJustified(m_width-3, '='); editText += " "; } - editText += (QString("\n") + text).leftJustified(m_width - (2 + suffix.size()) ) + suffix; + QString const &add = (QString("\n") + text).leftJustified(m_width - (2 + suffix.size())) + suffix; + editText += add; } else { - editText += text.leftJustified(m_width-9); + QString const &add = text.leftJustified(m_width-9); + editText += add; } - Utils::printLineEditInfo(editText.split('\n')); - ui->updateStatus->setPlainText(editText.trimmed()); + Utils::printLineEditInfo(editText.split('\n', QString::SplitBehavior::SkipEmptyParts)); + ui->updateStatus->setText(editText.trimmed()); + scrollDownTextEdit(); } void MainWindow::onReplaceLast(QStringList newTextLines, QString suffix) { + qCritical() << "ON REPLACE LAST CALLED AT" << QDateTime::currentDateTime().toString(Qt::ISODateWithMs); + int const s = newTextLines.size(); if (s > 0) { QString editText = ui->updateStatus->toPlainText(); - QStringList lines = editText.split('\n'); + QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts); QString newText; if (lines.size() >= s) { for (int i = 0; i < s; ++i) { @@ -379,15 +388,22 @@ void MainWindow::onReplaceLast(QStringList newTextLines, QString suffix) { } void MainWindow::onReplaceLast(QString text, QString suffix) { - //qInfo() << "REPL TEXT" << text << "SUFFIX" << suffix; + qCritical() << "ON REPLACE LAST CALLED AT" << QDateTime::currentDateTime().toString(Qt::ISODateWithMs); + QString editText = ui->updateStatus->toPlainText(); - QStringList lines = editText.split('\n'); + QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts); if (lines.size() > 0) { lines.removeLast(); if (!suffix.isNull() && suffix.size() > 0 && suffix != "\n") { - lines += text.leftJustified(m_width-10) + suffix; + QString const add = text.leftJustified(m_width-10) + suffix; + if (!add.isEmpty()) { + lines += text.leftJustified(m_width-10) + suffix; + } } else { - lines += text.leftJustified(m_width-10); + QString const add = text.leftJustified(m_width-10); + if (!add.isEmpty()) { + lines += text.leftJustified(m_width-10); + } } }