From 43aa8e6bedff642ba584c447c03886c1f0c52aac Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 Dec 2017 00:35:44 +0300 Subject: Remove default parameter from staticbrowserbox. --- src/gui/windows/didyouknowwindow.cpp | 2 +- src/gui/windows/helpwindow.cpp | 5 +++-- src/gui/windows/serverinfowindow.cpp | 18 +++++++++++------- src/gui/windows/updaterwindow.cpp | 23 +++++++++++++---------- src/gui/windows/whoisonline.cpp | 14 +++++++------- 5 files changed, 35 insertions(+), 27 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp index f6bf36ac6..64f08a323 100644 --- a/src/gui/windows/didyouknowwindow.cpp +++ b/src/gui/windows/didyouknowwindow.cpp @@ -176,7 +176,7 @@ void DidYouKnowWindow::loadFile(const int num) translator, lines); for (size_t i = 0, sz = lines.size(); i < sz; ++i) - mBrowserBox->addRow(lines[i]); + mBrowserBox->addRow(lines[i], false); } void DidYouKnowWindow::setVisible(Visible visible) diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp index 44203d46d..2823c6da9 100644 --- a/src/gui/windows/helpwindow.cpp +++ b/src/gui/windows/helpwindow.cpp @@ -157,7 +157,7 @@ void HelpWindow::loadFile(std::string file) translator, lines); for (size_t i = 0, sz = lines.size(); i < sz; ++i) - mBrowserBox->addRow(lines[i]); + mBrowserBox->addRow(lines[i], false); } void HelpWindow::loadTags() @@ -209,7 +209,8 @@ void HelpWindow::search(const std::string &text0) { const char *const str = (*it).c_str(); mBrowserBox->addRow(strprintf(" -> @@%s|%s@@", str, - translator->getChar(str))); + translator->getChar(str)), + false); } loadFile("footer"); mScrollArea->setVerticalScrollAmount(0); diff --git a/src/gui/windows/serverinfowindow.cpp b/src/gui/windows/serverinfowindow.cpp index 20f8d5f42..d3c851835 100644 --- a/src/gui/windows/serverinfowindow.cpp +++ b/src/gui/windows/serverinfowindow.cpp @@ -100,20 +100,23 @@ void ServerInfoWindow::showServerInfo() if (type == ServerFreeType::Free) { // TRANSLATORS: server info comment - mBrowserBox->addRow(_("##BServer with free license.")); + mBrowserBox->addRow(_("##BServer with free license."), + false); } else if (type == ServerFreeType::NonFree) { // TRANSLATORS: server info comment - mBrowserBox->addRow(_("##BServer with non free license.")); + mBrowserBox->addRow(_("##BServer with non free license."), + false); } else if (type == ServerFreeType::Unknown || type == ServerFreeType::NotSet) { // TRANSLATORS: server info comment - mBrowserBox->addRow(_("##BServer unknown license.")); + mBrowserBox->addRow(_("##BServer unknown license."), + false); } - mBrowserBox->addRow(""); + mBrowserBox->addRow("", false); addServerComment(mServerInfo.serverUrl, // TRANSLATORS: server info comment _("Server")); @@ -141,8 +144,8 @@ void ServerInfoWindow::addSourcesList(const STD_VECTOR &list, { if (!list.empty()) { - mBrowserBox->addRow(""); - mBrowserBox->addRow(comment); + mBrowserBox->addRow("", false); + mBrowserBox->addRow(comment, false); FOR_EACH (STD_VECTOR::const_iterator, it, list) { const ServerUrlInfo &info = *it; @@ -171,7 +174,8 @@ void ServerInfoWindow::addServerComment(const std::string &url, comment.c_str(), url.c_str()); } - mBrowserBox->addRow(str); + mBrowserBox->addRow(str, + false); } } diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 3858b0a5e..5bff64bc3 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -399,24 +399,24 @@ void UpdaterWindow::loadNews() if (file.is_open()) file << line << std::endl; if (cnt < maxNews) - mBrowserBox->addRow(line); + mBrowserBox->addRow(line, false); } else { if (file.is_open()) file << line << std::endl; if (cnt < maxNews) - mBrowserBox->addRow(line); + mBrowserBox->addRow(line, false); } } file.close(); if (cnt > maxNews) { - mBrowserBox->addRow(""); + mBrowserBox->addRow("", false); // TRANSLATORS: updater window checkbox mBrowserBox->addRow("news", _("Show all news (can be slow)")); - mBrowserBox->addRow(""); + mBrowserBox->addRow("", false); } // Free the memory buffer now that we don't need it anymore free(mMemoryBuffer); @@ -856,15 +856,18 @@ void UpdaterWindow::logic() switch (mDownloadStatus) { case UpdateDownloadStatus::UPDATE_ERROR: - mBrowserBox->addRow(""); + mBrowserBox->addRow("", false); // TRANSLATORS: update message - mBrowserBox->addRow(_("##1 The update process is incomplete.")); + mBrowserBox->addRow(_("##1 The update process is incomplete."), + false); // TRANSLATORS: Continues "The update process is incomplete.". - mBrowserBox->addRow(_("##1 It is strongly recommended that")); + mBrowserBox->addRow(_("##1 It is strongly recommended that"), + false); // TRANSLATORS: Begins "It is strongly recommended that". - mBrowserBox->addRow(_("##1 you try again later.")); + mBrowserBox->addRow(_("##1 you try again later."), + false); if (mDownload != nullptr) - mBrowserBox->addRow(mDownload->getError()); + mBrowserBox->addRow(mDownload->getError(), false); mBrowserBox->updateHeight(); mScrollArea->setVerticalScrollAmount( mScrollArea->getVerticalMaxScroll()); @@ -1095,7 +1098,7 @@ void UpdaterWindow::loadFile(std::string file) Files::loadTextFileLocal(mUpdatesDir + "/local/help/news.txt", lines); for (size_t i = 0, sz = lines.size(); i < sz; ++i) - mBrowserBox->addRow(lines[i]); + mBrowserBox->addRow(lines[i], false); mBrowserBox->updateHeight(); } diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 41738180a..8e35fb141 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -247,34 +247,34 @@ void WhoIsOnline::updateWindow(size_t numOnline) bool addedFromSection(false); FOR_EACH (STD_VECTOR::const_iterator, it, mFriends) { - mBrowserBox->addRow((*it)->getText()); + mBrowserBox->addRow((*it)->getText(), false); addedFromSection = true; } if (addedFromSection == true) { - mBrowserBox->addRow("---"); + mBrowserBox->addRow("---", false); addedFromSection = false; } FOR_EACH (STD_VECTOR::const_iterator, it, mEnemy) { - mBrowserBox->addRow((*it)->getText()); + mBrowserBox->addRow((*it)->getText(), false); addedFromSection = true; } if (addedFromSection == true) { - mBrowserBox->addRow("---"); + mBrowserBox->addRow("---", false); addedFromSection = false; } FOR_EACH (STD_VECTOR::const_iterator, it, mNeutral) { - mBrowserBox->addRow((*it)->getText()); + mBrowserBox->addRow((*it)->getText(), false); addedFromSection = true; } if (addedFromSection == true && !mDisregard.empty()) - mBrowserBox->addRow("---"); + mBrowserBox->addRow("---", false); FOR_EACH (STD_VECTOR::const_iterator, it, mDisregard) - mBrowserBox->addRow((*it)->getText()); + mBrowserBox->addRow((*it)->getText(), false); if (mScrollArea->getVerticalMaxScroll() < mScrollArea->getVerticalScrollAmount()) -- cgit v1.2.3-60-g2f50