diff options
| author | Alex <b0ris@b0ris-satellite.localdomain> | 2011-11-06 20:15:08 +0200 |
|---|---|---|
| committer | Alex <b0ris@b0ris-satellite.localdomain> | 2011-11-06 20:15:08 +0200 |
| commit | ec933b1cb13a3cb2eb94975d933c5a56eae8b416 (patch) | |
| tree | 6bbeccc8db87e7559e595f173743311d40e3d048 /client | |
| parent | 6cbc4914f13720381d6fc32492bb37e595769041 (diff) | |
Fix panel labels. Config format changes
Diffstat (limited to 'client')
| -rw-r--r-- | client/Dialog.cpp | 8 | ||||
| -rw-r--r-- | client/config.cfg | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/client/Dialog.cpp b/client/Dialog.cpp index 9703821..abd3178 100644 --- a/client/Dialog.cpp +++ b/client/Dialog.cpp @@ -7,7 +7,7 @@ #include "Dialog.h" #include "Proxy.h" - using namespace std; +using namespace std; ProxyDialog::ProxyDialog(QWidget *parent): QDialog(parent) { @@ -16,12 +16,12 @@ ProxyDialog::ProxyDialog(QWidget *parent): QDialog(parent) cfg->AcquireConfig(); if (! cfg->IsConfigValid()) { - Logger::Fatal((std::string)"No valid configuration found! Can't proceed."); + Logger::Fatal((string)"No valid configuration found! Can't proceed."); return ; } /* generic proxy panel */ - topLabel = new QLabel("Top Panel"); + topLabel = new QLabel(QString::fromLocal8Bit(cfg->TopPanelText.c_str())); topLabel->setAlignment(Qt::AlignHCenter); countryBox = new QComboBox; stateBox = new QComboBox; @@ -51,7 +51,7 @@ ProxyDialog::ProxyDialog(QWidget *parent): QDialog(parent) genericProxyGroup = new QButtonGroup; /* static proxy panel */ - bottomLabel = new QLabel("Bottom Panel"); + bottomLabel = new QLabel(QString::fromLocal8Bit(cfg->BottomPanelText.c_str())); bottomLabel->setAlignment(Qt::AlignHCenter); QGridLayout *bottomPanelLayout = new QGridLayout; unsigned nlines = cfg->GetStaticProxyGuiLines(); diff --git a/client/config.cfg b/client/config.cfg index c12c136..d7897a6 100644 --- a/client/config.cfg +++ b/client/config.cfg @@ -2,9 +2,9 @@ config_update_interval=600; client_update_interval=60000; server=8.8.8.8 600 60; server=8.8.4.4 100 50; -welcome_msg="Hello, world!"; -config_downloaded_msg="Конфиг успешно загружен!"; -top_panel_text="Верхняя панель"; -bottom_panel_text="Нижняя панель"; +welcome_msg=Hello, world!; +config_downloaded_msg=Конфиг успешно загружен!; +top_panel_text=Верхняя панель; +bottom_panel_text=Нижняя панель; speed_visibility=0; |