hgf/qt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hgf:5deed3f75ea0c25f83f15162da3af61d3cd874ed
Branches Tags
hgf:main
hgf:master
..
compare: hgf:135e321e608c2bf41a7560f714b7f65d16a405dd
Branches Tags
hgf:master
hgf:main

No commits in common. "5deed3f75ea0c25f83f15162da3af61d3cd874ed" and "135e321e608c2bf41a7560f714b7f65d16a405dd" have entirely different histories.
5deed3f75e ... 135e321e60

8 changed files with 44 additions and 43 deletions
Show Stats Expand all files Collapse all files

33
LedOK/device/ctrladvancedpanel.cpp
View File

@ -161,19 +161,19 @@ CtrlAdvancedPanel::CtrlAdvancedPanel() {
hBox = new HBox(vBox); hBox = new HBox(vBox);
lbWebAddr = new QLabel; labelWebServer = new QLabel;
hBox->addWidget(lbWebAddr); hBox->addWidget(labelWebServer);
fdWebAddr = new QComboBox; fdWebServerAddr = new QComboBox;
fdWebAddr->addItem("www.m2mled.net"); fdWebServerAddr->addItem("www.m2mled.net");
fdWebAddr->addItem("www.ledaips.com"); fdWebServerAddr->addItem("www.ledaips.com");
fdWebAddr->addItem("https://www.taxihub.cn:2340"); fdWebServerAddr->addItem("https://www.taxihub.cn:2340");
fdWebAddr->addItem("https://www.ledaips.com:2340"); fdWebServerAddr->addItem("https://www.ledaips.com:2340");
fdWebAddr->addItem("https://www.36taxi.com:2340"); fdWebServerAddr->addItem("https://www.36taxi.com:2340");
fdWebAddr->addItem("www.tlzxled.com"); fdWebServerAddr->addItem("www.tlzxled.com");
fdWebAddr->setMinimumWidth(260); fdWebServerAddr->setMinimumWidth(260);
fdWebAddr->setEditable(true); fdWebServerAddr->setEditable(true);
hBox->addWidget(fdWebAddr); hBox->addWidget(fdWebServerAddr);
lbCompanyId = new QLabel; lbCompanyId = new QLabel;
hBox->addWidget(lbCompanyId); hBox->addWidget(lbCompanyId);
@ -188,7 +188,7 @@ CtrlAdvancedPanel::CtrlAdvancedPanel() {
QMessageBox::information(this, tr("Tip"), tr("NoSelectedController")); QMessageBox::information(this, tr("Tip"), tr("NoSelectedController"));
return; return;
} }
auto serverAddr = fdWebAddr->currentText(); auto serverAddr = fdWebServerAddr->currentText();
auto companyId = fdCompanyId->text(); 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?")); // 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; // if(res != QMessageBox::Yes) return;
@ -2830,7 +2830,7 @@ void CtrlAdvancedPanel::init() {
QJsonDocument json; QJsonDocument json;
QString err = checkReplyForJson(reply, &json); QString err = checkReplyForJson(reply, &json);
if(! err.isEmpty()) return; if(! err.isEmpty()) return;
fdWebAddr->setCurrentText(json["server"].toString()); fdWebServerAddr->setCurrentText(json["server"].toString());
fdCompanyId->setText(json["companuID"].toString()); fdCompanyId->setText(json["companuID"].toString());
}); });
@ -2895,11 +2895,10 @@ void CtrlAdvancedPanel::transUi() {
btnCustomJsonGet->setText(tr("Get")); btnCustomJsonGet->setText(tr("Get"));
grpHighForBusy->setTitle(tr("Taxi top screen configuration")); grpHighForBusy->setTitle(tr("Taxi top screen configuration"));
lbRealtime->setText(tr("Realtime Address:"));
lbTitle->setText(tr("Advanced")); lbTitle->setText(tr("Advanced"));
lbCompanyId->setText(tr("Compant ID:")); lbCompanyId->setText(tr("Compant ID:"));
lbWebAddr->setText(tr("Web (Plat 2) Address")+":"); labelWebServer->setText(tr("Web Server Address:"));
lbRealtime->setText(tr("Realtime (Plat 4) Address")+":");
lbMinBright->setText(tr("Min brightness")); lbMinBright->setText(tr("Min brightness"));
label_3->setText(tr("Max brightness ")); label_3->setText(tr("Max brightness "));
lbAlias->setText(tr("Alias")); lbAlias->setText(tr("Alias"));

4
LedOK/device/ctrladvancedpanel.h
View File

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

12
LedOK/gutil/cpp.h
View File

@ -85,7 +85,9 @@ template <class V>
class Vector : public SharedPtr<std::vector<V>> { class Vector : public SharedPtr<std::vector<V>> {
public: public:
using SharedPtr<std::vector<V>>::SharedPtr; using SharedPtr<std::vector<V>>::SharedPtr;
typedef typename std::vector<V>::iterator iterator;
using iterator = std::_Vector_iterator<std::_Vector_val<std::_Simple_types<V>>>;
using const_iterator = std::_Vector_const_iterator<std::_Vector_val<std::_Simple_types<V>>>;
Vector(std::initializer_list<V> _Ilist) { Vector(std::initializer_list<V> _Ilist) {
this->ptr = new SharedData<std::vector<V>>{1, _Ilist}; this->ptr = new SharedData<std::vector<V>>{1, _Ilist};
@ -96,7 +98,7 @@ public:
return *this; return *this;
} }
Vector &append(V&& val) { Vector &append(V&& val) {
(*this)->push_back(std::move(val)); (*this)->push_back(_STD move(val));
return *this; return *this;
} }
Vector &operator<<(const V &val) { Vector &operator<<(const V &val) {
@ -104,7 +106,7 @@ public:
return *this; return *this;
} }
Vector &operator<<(V&& val) { Vector &operator<<(V&& val) {
(*this)->push_back(std::move(val)); (*this)->push_back(_STD move(val));
return *this; return *this;
} }
@ -125,8 +127,8 @@ public:
struct NodeBase { struct NodeBase {
NodeBase *next = this; NodeBase *next{this};
NodeBase *prev = this; NodeBase *prev{this};
}; };
template <class P> template <class P>
struct _Node : NodeBase { struct _Node : NodeBase {

6
LedOK/ts/app_en.ts
View File

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

8
LedOK/ts/app_ja.ts
View File

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

8
LedOK/ts/app_pt.ts
View File

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

8
LedOK/ts/app_zh_CN.ts
View File

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

8
LedOK/ts/app_zh_TW.ts
View File

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