diff --git a/LedOK/device/ctrladvancedpanel.cpp b/LedOK/device/ctrladvancedpanel.cpp index d94ffbc..4085526 100644 --- a/LedOK/device/ctrladvancedpanel.cpp +++ b/LedOK/device/ctrladvancedpanel.cpp @@ -161,19 +161,19 @@ CtrlAdvancedPanel::CtrlAdvancedPanel() { hBox = new HBox(vBox); - labelWebServer = new QLabel; - hBox->addWidget(labelWebServer); + lbWebAddr = new QLabel; + hBox->addWidget(lbWebAddr); - fdWebServerAddr = new QComboBox; - fdWebServerAddr->addItem("www.m2mled.net"); - fdWebServerAddr->addItem("www.ledaips.com"); - fdWebServerAddr->addItem("https://www.taxihub.cn:2340"); - fdWebServerAddr->addItem("https://www.ledaips.com:2340"); - fdWebServerAddr->addItem("https://www.36taxi.com:2340"); - fdWebServerAddr->addItem("www.tlzxled.com"); - fdWebServerAddr->setMinimumWidth(260); - fdWebServerAddr->setEditable(true); - hBox->addWidget(fdWebServerAddr); + fdWebAddr = new QComboBox; + fdWebAddr->addItem("www.m2mled.net"); + fdWebAddr->addItem("www.ledaips.com"); + fdWebAddr->addItem("https://www.taxihub.cn:2340"); + fdWebAddr->addItem("https://www.ledaips.com:2340"); + fdWebAddr->addItem("https://www.36taxi.com:2340"); + fdWebAddr->addItem("www.tlzxled.com"); + fdWebAddr->setMinimumWidth(260); + fdWebAddr->setEditable(true); + hBox->addWidget(fdWebAddr); lbCompanyId = new QLabel; hBox->addWidget(lbCompanyId); @@ -188,7 +188,7 @@ CtrlAdvancedPanel::CtrlAdvancedPanel() { QMessageBox::information(this, tr("Tip"), tr("NoSelectedController")); return; } - auto serverAddr = fdWebServerAddr->currentText(); + auto serverAddr = fdWebAddr->currentText(); auto companyId = fdCompanyId->text(); // auto res = QMessageBox::question(this, tr("Tip Info"), tr("This operation will clear current program.")+"\n"+tr("Do you want to continue?")); // if(res != QMessageBox::Yes) return; @@ -2830,7 +2830,7 @@ void CtrlAdvancedPanel::init() { QJsonDocument json; QString err = checkReplyForJson(reply, &json); if(! err.isEmpty()) return; - fdWebServerAddr->setCurrentText(json["server"].toString()); + fdWebAddr->setCurrentText(json["server"].toString()); fdCompanyId->setText(json["companuID"].toString()); }); @@ -2895,10 +2895,11 @@ void CtrlAdvancedPanel::transUi() { btnCustomJsonGet->setText(tr("Get")); grpHighForBusy->setTitle(tr("Taxi top screen configuration")); - lbRealtime->setText(tr("Realtime Address:")); lbTitle->setText(tr("Advanced")); lbCompanyId->setText(tr("Compant ID:")); - labelWebServer->setText(tr("Web Server Address:")); + lbWebAddr->setText(tr("Web (Plat 2) Address")+":"); + lbRealtime->setText(tr("Realtime (Plat 4) Address")+":"); + lbMinBright->setText(tr("Min brightness")); label_3->setText(tr("Max brightness ")); lbAlias->setText(tr("Alias")); diff --git a/LedOK/device/ctrladvancedpanel.h b/LedOK/device/ctrladvancedpanel.h index 3aeb840..6ac6ee7 100644 --- a/LedOK/device/ctrladvancedpanel.h +++ b/LedOK/device/ctrladvancedpanel.h @@ -35,8 +35,8 @@ private: QLineEdit *fdScreenHeight; QLabel *lbAlias; QLineEdit *fdAlias; - QLabel *labelWebServer; - QComboBox *fdWebServerAddr; + QLabel *lbWebAddr; + QComboBox *fdWebAddr; QLabel *lbCompanyId; QLineEdit *fdCompanyId; QLabel *lbRealtime; diff --git a/LedOK/ts/app_en.ts b/LedOK/ts/app_en.ts index ad6621d..2e7546a 100644 --- a/LedOK/ts/app_en.ts +++ b/LedOK/ts/app_en.ts @@ -91,8 +91,8 @@ - Web Server Address: - Web Server Address: + Web (Plat 2) Address + @@ -144,7 +144,7 @@ - Realtime Address: + Realtime (Plat 4) Address diff --git a/LedOK/ts/app_ja.ts b/LedOK/ts/app_ja.ts index 50e4d66..f1b1512 100644 --- a/LedOK/ts/app_ja.ts +++ b/LedOK/ts/app_ja.ts @@ -91,8 +91,8 @@ - Web Server Address: - Webサーバのアドレス: + Web (Plat 2) Address + Web (Plat 2) のアドレス @@ -251,8 +251,8 @@ - Realtime Address: - + Realtime (Plat 4) Address + Realtime (Plat 4) のアドレス diff --git a/LedOK/ts/app_pt.ts b/LedOK/ts/app_pt.ts index 03374be..2938596 100644 --- a/LedOK/ts/app_pt.ts +++ b/LedOK/ts/app_pt.ts @@ -91,8 +91,8 @@ - Web Server Address: - Endereço do Web Server: + Web (Plat 2) Address + Endereço do Web (Plat 2) @@ -154,8 +154,8 @@ - Realtime Address: - Servidor de Realtime: + Realtime (Plat 4) Address + Servidor de Realtime (Plat 4) diff --git a/LedOK/ts/app_zh_CN.ts b/LedOK/ts/app_zh_CN.ts index 7faf662..09a04b6 100644 --- a/LedOK/ts/app_zh_CN.ts +++ b/LedOK/ts/app_zh_CN.ts @@ -91,8 +91,8 @@ - Web Server Address: - Web服务器地址: + Web (Plat 2) Address + Web (2平台) 地址 @@ -144,8 +144,8 @@ - Realtime Address: - Realtime 地址: + Realtime (Plat 4) Address + Realtime (4平台) 地址 diff --git a/LedOK/ts/app_zh_TW.ts b/LedOK/ts/app_zh_TW.ts index cc15f28..88554f3 100644 --- a/LedOK/ts/app_zh_TW.ts +++ b/LedOK/ts/app_zh_TW.ts @@ -91,8 +91,8 @@ - Web Server Address: - Web伺服器地址: + Web (Plat 2) Address + Web (2平臺) 地址 @@ -144,8 +144,8 @@ - Realtime Address: - Realtime 地址: + Realtime (Plat 4) Address + Realtime (4平臺) 地址