From f95edb6b7eaf3148f72fc9b69e3974f58ebcae70 Mon Sep 17 00:00:00 2001
From: Alex <b0ris@b0ris-satellite.localdomain>
Date: Sun, 6 Nov 2011 22:28:42 +0200
Subject: Static button labels + FIX speed visibility bug

---
 client/Config.cpp |  2 +-
 client/Dialog.cpp | 24 ++++++++++++++----------
 client/config.cfg |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'client')

diff --git a/client/Config.cpp b/client/Config.cpp
index 4c31039..31e5189 100755
--- a/client/Config.cpp
+++ b/client/Config.cpp
@@ -80,7 +80,7 @@ Config::Config(): QObject(), StaticProxySpeedLow(50)
 		else if (key.compare("speed_visibility") == 0)
 		{
 			IsSpeedVisible = false;
-			if (value.compare("true"))
+			if (value.compare("1") == 0)
 			{
 				IsSpeedVisible = true;
 			}
diff --git a/client/Dialog.cpp b/client/Dialog.cpp
index abd3178..45ef01b 100644
--- a/client/Dialog.cpp
+++ b/client/Dialog.cpp
@@ -61,21 +61,25 @@ ProxyDialog::ProxyDialog(QWidget *parent): QDialog(parent)
 		for (unsigned j = 0; j < staticProxyLine.size(); j++)
 		{
 			stringstream ss;
-			if (staticProxyLine[j].speed > cfg->StaticProxySpeedLow)
+			if (cfg->IsSpeedVisible)
 			{
-				ss << "<font color=\"green\"><b>" << staticProxyLine[j].speed << "</b></font>";
+				if (staticProxyLine[j].speed > cfg->StaticProxySpeedLow)
+				{
+					ss << "<font color=\"green\"><b>" << staticProxyLine[j].speed << "</b></font>";
+				}
+				else
+				{
+					ss << "<font color=\"red\"><b>" << staticProxyLine[j].speed << "</b></font>";
+				}
+				ss << " ";
 			}
-			else
-			{
-				ss << "<font color=\"red\"><b>" << staticProxyLine[j].speed << "</b></font>";
-			}
-			QLabel *speedLabel = new QLabel(ss.str().c_str());
-			QString btnStr = QString::fromUtf8(staticProxyLine[j]. name.c_str());
+			ss << staticProxyLine[j].name;
+			
+			QString btnStr = QString::fromLocal8Bit(ss.str().c_str());
 			QLabel *btnLabel = new QLabel(btnStr);
 			QHBoxLayout *btnLayout = new QHBoxLayout;
-			btnLayout->setSizeConstraint(QLayout::SetMinimumSize);
-			btnLayout->addWidget(speedLabel);
 			btnLayout->addWidget(btnLabel);
+			btnLayout->setSizeConstraint(QLayout::SetMinimumSize);
 			QPushButton *btn = new QPushButton();
 			btn->setLayout(btnLayout);
 			btn->setCheckable(true);
diff --git a/client/config.cfg b/client/config.cfg
index d7897a6..dcc139b 100644
--- a/client/config.cfg
+++ b/client/config.cfg
@@ -6,5 +6,5 @@ welcome_msg=Hello, world!;
 config_downloaded_msg=Конфиг успешно загружен!;
 top_panel_text=Верхняя панель;
 bottom_panel_text=Нижняя панель;
-speed_visibility=0;
+speed_visibility=1;
 
-- 
cgit v1.2.3