From 4787ae231945b6d6ca8b3c255924c4f13178f83c Mon Sep 17 00:00:00 2001 From: Alexander von Renteln Date: Tue, 8 Apr 2008 16:07:19 +0000 Subject: [PATCH] minor bugfix: ssl/no-ssl icons will only be displayed when connected --- src/client/networkmodel.cpp | 2 +- src/qtui/mainwin.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 9d463f64..f1b1c73b 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -288,7 +288,7 @@ QString BufferItem::toolTip(int column) const { switch(bufferType()) { case BufferInfo::StatusBuffer: { QString netName = Client::network(bufferInfo().networkId())->networkName(); - toolTip.append(tr("Status buffer from %1").arg(netName)); + toolTip.append(tr("Status buffer of %1").arg(netName)); break; } case BufferInfo::ChannelBuffer: diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index c8fc11bc..669261c9 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -89,7 +89,7 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) } connect(Client::instance(), SIGNAL(securedConnection()), this, SLOT(securedConnection())); - sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/no-ssl"))); + sslLabel->setPixmap(QPixmap()); statusBar()->addPermanentWidget(sslLabel); } @@ -350,6 +350,8 @@ void MainWin::connectedToCore() { statusBar()->showMessage(tr("Connected to core.")); setWindowIcon(onlineTrayIcon); systray->setIcon(onlineTrayIcon); + if(sslLabel->width() == 0) + sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/no-ssl"))); } void MainWin::securedConnection() { @@ -370,7 +372,7 @@ void MainWin::disconnectedFromCore() { statusBar()->showMessage(tr("Not connected to core.")); setWindowIcon(offlineTrayIcon); systray->setIcon(offlineTrayIcon); - sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/no-ssl"))); + sslLabel->setPixmap(QPixmap()); } AbstractUiMsg *MainWin::layoutMsg(const Message &msg) { -- 2.20.1