ledok

LedOK/device/ctrladvancedpanel.cpp

@@ -161,19 +161,19 @@ CtrlAdvancedPanel::CtrlAdvancedPanel() {
 
     hBox = new HBox(vBox);
 
-    labelWebServer = new QLabel;
+    lbWebAddr = new QLabel;
-    hBox->addWidget(labelWebServer);
+    hBox->addWidget(lbWebAddr);
 
-    fdWebServerAddr = new QComboBox;
+    fdWebAddr = new QComboBox;
-    fdWebServerAddr->addItem("www.m2mled.net");
+    fdWebAddr->addItem("www.m2mled.net");
-    fdWebServerAddr->addItem("www.ledaips.com");
+    fdWebAddr->addItem("www.ledaips.com");
-    fdWebServerAddr->addItem("https://www.taxihub.cn:2340");
+    fdWebAddr->addItem("https://www.taxihub.cn:2340");
-    fdWebServerAddr->addItem("https://www.ledaips.com:2340");
+    fdWebAddr->addItem("https://www.ledaips.com:2340");
-    fdWebServerAddr->addItem("https://www.36taxi.com:2340");
+    fdWebAddr->addItem("https://www.36taxi.com:2340");
-    fdWebServerAddr->addItem("www.tlzxled.com");
+    fdWebAddr->addItem("www.tlzxled.com");
-    fdWebServerAddr->setMinimumWidth(260);
+    fdWebAddr->setMinimumWidth(260);
-    fdWebServerAddr->setEditable(true);
+    fdWebAddr->setEditable(true);
-    hBox->addWidget(fdWebServerAddr);
+    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"));

LedOK/device/ctrladvancedpanel.h

@@ -35,8 +35,8 @@ private:
     QLineEdit *fdScreenHeight;
     QLabel *lbAlias;
     QLineEdit *fdAlias;
-    QLabel *labelWebServer;
+    QLabel *lbWebAddr;
-    QComboBox *fdWebServerAddr;
+    QComboBox *fdWebAddr;
     QLabel *lbCompanyId;
     QLineEdit *fdCompanyId;
     QLabel *lbRealtime;

LedOK/ts/app_en.ts

@@ -91,8 +91,8 @@
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2896"/>
-        <source>Web Server Address:</source>
+        <source>Web (Plat 2) Address</source>
-        <translation>Web Server Address:</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="1300"/>
@@ -144,7 +144,7 @@
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2893"/>
-        <source>Realtime Address:</source>
+        <source>Realtime (Plat 4) Address</source>
         <translation></translation>
     </message>
     <message>

LedOK/ts/app_ja.ts

@@ -91,8 +91,8 @@
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2896"/>
-        <source>Web Server Address:</source>
+        <source>Web (Plat 2) Address</source>
-        <translation>Webサーバのアドレス:</translation>
+        <translation>Web (Plat 2) のアドレス</translation>
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="1300"/>
@@ -251,8 +251,8 @@
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2893"/>
-        <source>Realtime Address:</source>
+        <source>Realtime (Plat 4) Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Realtime (Plat 4) のアドレス</translation>
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2897"/>

LedOK/ts/app_pt.ts

@@ -91,8 +91,8 @@
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2896"/>
-        <source>Web Server Address:</source>
+        <source>Web (Plat 2) Address</source>
-        <translation>Endereço do Web Server:</translation>
+        <translation>Endereço do Web (Plat 2)</translation>
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="1300"/>
@@ -154,8 +154,8 @@
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2893"/>
-        <source>Realtime Address:</source>
+        <source>Realtime (Plat 4) Address</source>
-        <translation>Servidor de Realtime:</translation>
+        <translation>Servidor de Realtime (Plat 4)</translation>
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2905"/>

LedOK/ts/app_zh_CN.ts

@@ -91,8 +91,8 @@
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2896"/>
-        <source>Web Server Address:</source>
+        <source>Web (Plat 2) Address</source>
-        <translation>Web服务器地址:</translation>
+        <translation>Web (2平台) 地址</translation>
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="1300"/>
@@ -144,8 +144,8 @@
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2893"/>
-        <source>Realtime Address:</source>
+        <source>Realtime (Plat 4) Address</source>
-        <translation>Realtime 地址:</translation>
+        <translation>Realtime (4平台) 地址</translation>
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2904"/>

LedOK/ts/app_zh_TW.ts

@@ -91,8 +91,8 @@
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2896"/>
-        <source>Web Server Address:</source>
+        <source>Web (Plat 2) Address</source>
-        <translation>Web伺服器地址：</translation>
+        <translation>Web (2平臺) 地址</translation>
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="1300"/>
@@ -144,8 +144,8 @@
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2893"/>
-        <source>Realtime Address:</source>
+        <source>Realtime (Plat 4) Address</source>
-        <translation>Realtime 地址:</translation>
+        <translation>Realtime (4平臺) 地址</translation>
     </message>
     <message>
         <location filename="../device/ctrladvancedpanel.cpp" line="2904"/>