simplify

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 426e2258c157e6fcbed738d6fea9aa312d595ab3..399053cc4a283cf22fb128486b3b867862127fff 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -161,7 +161,6 @@ void MainWindow::initStatusBar() {
 
     m_statusLabelBalance = new ClickableLabel(this);
     m_statusLabelBalance->setText("Balance: 0 XMR");
-    m_statusLabelBalance->setTextInteractionFlags(Qt::TextSelectableByMouse);
     m_statusLabelBalance->setContextMenuPolicy(Qt::ActionsContextMenu);
     this->statusBar()->addPermanentWidget(m_statusLabelBalance);
 

diff --git a/src/plugins/calc/CalcWidget.cpp b/src/plugins/calc/CalcWidget.cpp
index efd81f0c5556b5ab1639fd662d8194771abecb41..11ea972e1ec59bd19dd2e2d144953793696c7cb2 100644 (file)
--- a/src/plugins/calc/CalcWidget.cpp
+++ b/src/plugins/calc/CalcWidget.cpp
@@ -51,7 +51,6 @@ CalcWidget::CalcWidget(QWidget *parent)
     QPixmap warningIcon = QPixmap(":/assets/images/warning.png");
     ui->icon_warning->setPixmap(warningIcon.scaledToWidth(32, Qt::SmoothTransformation));
 
-    this->onPricesReceived();
     this->updateStatus();
 }
 
@@ -155,29 +154,12 @@ void CalcWidget::setupComboBox(QComboBox *comboBox, const QStringList &crypto, c
 }
 
 void CalcWidget::updateStatus() {
-    QString warningText;
-    if (conf()->get(Config::disableWebsocket).toBool()) {
-        warningText = "Websocket is disabled.";
-    }
-    else if (conf()->get(Config::offlineMode).toBool()) {
-        warningText = "Offline mode is enabled.";
-    }
-    else if (conf()->get(Config::syncPaused).toBool() && conf()->get(Config::syncPausedAlsoDisconnectWebSocket).toBool()) {
-        warningText = "Sync is paused.";
-    }
-
     if (!m_comboBoxInit) {
-        if (warningText.isEmpty())
-            warningText = "Waiting on exchange data.";
-
-        ui->label_warning->setText(warningText);
+        ui->label_warning->setText("Waiting on exchange data.");
         ui->frame_warning->show();
     }
     else if (websocketNotifier()->stale(10)) {
-        if (warningText.isEmpty())
-            warningText = "No new exchange rates received for over 10 minutes.";
-
-        ui->label_warning->setText(warningText);
+        ui->label_warning->setText("No new exchange rates received for over 10 minutes.");
         ui->frame_warning->show();
     }
     else {