github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 10:50:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lang] Changed translation file name.

Browse Source
This commit is contained in:
Leroy.H.Y 2019-09-09 12:50:37 +08:00
parent 9082ba1004
commit f1e8aa084c
No known key found for this signature in database
GPG Key ID: 6AC1673B587DC37D
4 changed files with 566 additions and 895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Qv2ray.pro
View File

@ -64,7 +64,7 @@ RESOURCES += \
TRANSLATIONS += \ TRANSLATIONS += \
translations/zh-CN.ts translations/source.ts
RC_ICONS += ./icons/Qv2ray.ico RC_ICONS += ./icons/Qv2ray.ico
ICON = ./icons/Qv2ray.icns ICON = ./icons/Qv2ray.icns

1
resources.qrc
View File

@ -1,6 +1,5 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>translations/zh-CN.qm</file>
<file>icons/Qv2ray.ico</file> <file>icons/Qv2ray.ico</file>
<file>icons/add_connection_btn.png</file> <file>icons/add_connection_btn.png</file>
<file>icons/import_connection_btn.png</file> <file>icons/import_connection_btn.png</file>

58
src/w_MainWindow.cpp
View File

@ -34,14 +34,14 @@ MainWindow::MainWindow(QWidget *parent)
hTray->setIcon(this->windowIcon()); hTray->setIcon(this->windowIcon());
hTray->setToolTip(TRAY_TOOLTIP_PREFIX); hTray->setToolTip(TRAY_TOOLTIP_PREFIX);
// //
QAction *action_Tray_ShowHide = new QAction(this->windowIcon(), tr("#Hide"), this); QAction *action_Tray_ShowHide = new QAction(this->windowIcon(), tr("Hide"), this);
QAction *action_Tray_Quit = new QAction(tr("#Quit"), this); QAction *action_Tray_Quit = new QAction(tr("Quit"), this);
QAction *action_Tray_Start = new QAction(tr("#Connect"), this); QAction *action_Tray_Start = new QAction(tr("Connect"), this);
QAction *action_Tray_Restart = new QAction(tr("#Reconnect"), this); QAction *action_Tray_Restart = new QAction(tr("Reconnect"), this);
QAction *action_Tray_Stop = new QAction(tr("#Disconnect"), this); QAction *action_Tray_Stop = new QAction(tr("Disconnect"), this);
// //
QAction *action_RCM_RenameConnection = new QAction(tr("#Rename"), this); QAction *action_RCM_RenameConnection = new QAction(tr("Rename"), this);
QAction *action_RCM_StartThis = new QAction(tr("#ConnectSelected"), this); QAction *action_RCM_StartThis = new QAction(tr("ConnectSelected"), this);
action_Tray_Start->setEnabled(true); action_Tray_Start->setEnabled(true);
action_Tray_Stop->setEnabled(false); action_Tray_Stop->setEnabled(false);
action_Tray_Restart->setEnabled(false); action_Tray_Restart->setEnabled(false);
@ -88,7 +88,7 @@ MainWindow::MainWindow(QWidget *parent)
on_startButton_clicked(); on_startButton_clicked();
//ToggleVisibility(); //ToggleVisibility();
this->hide(); this->hide();
trayMenu->actions()[0]->setText(tr("#Show")); trayMenu->actions()[0]->setText(tr("Show"));
} else { } else {
this->show(); this->show();
} }
@ -116,14 +116,14 @@ void MainWindow::VersionUpdate(QByteArray &data)
if (newversion > current && newversion > ignored) { if (newversion > current && newversion > ignored) {
LOG(MODULE_UPDATE, "New version detected.") LOG(MODULE_UPDATE, "New version detected.")
auto link = root["html_url"].toString(""); auto link = root["html_url"].toString("");
auto result = QvMessageBoxAsk(this, tr("#NewReleaseVersionFound"), auto result = QvMessageBoxAsk(this, tr("NewReleaseVersionFound"),
tr("#NewReleaseVersionFound") + ": " + root["tag_name"].toString("") + tr("NewReleaseVersionFound") + ": " + root["tag_name"].toString("") +
"\r\n" + "\r\n" +
root["name"].toString("") + root["name"].toString("") +
"\r\n------------\r\n" + "\r\n------------\r\n" +
root["body"].toString("") + root["body"].toString("") +
"\r\n------------\r\n" + "\r\n------------\r\n" +
tr("#ReleaseDownloadLink") + ": " + link, QMessageBox::Ignore); tr("ReleaseDownloadLink") + ": " + link, QMessageBox::Ignore);
if (result == QMessageBox::Yes) { if (result == QMessageBox::Yes) {
QDesktopServices::openUrl(QUrl::fromUserInput(link)); QDesktopServices::openUrl(QUrl::fromUserInput(link));
@ -184,7 +184,7 @@ void MainWindow::UpdateLog()
void MainWindow::on_startButton_clicked() void MainWindow::on_startButton_clicked()
{ {
if (CurrentConnectionName == "") { if (CurrentConnectionName == "") {
QvMessageBox(this, tr("#NoConfigSelected"), tr("#PleaseSelectAConfig")); QvMessageBox(this, tr("NoConfigSelected"), tr("PleaseSelectAConfig"));
return; return;
} }
@ -195,9 +195,9 @@ void MainWindow::on_startButton_clicked()
bool startFlag = this->vinstance->Start(); bool startFlag = this->vinstance->Start();
if (startFlag) { if (startFlag) {
this->hTray->showMessage("Qv2ray", tr("#ConnectedToServer") + " " + CurrentConnectionName, hTray->icon()); this->hTray->showMessage("Qv2ray", tr("ConnectedToServer") + " " + CurrentConnectionName, hTray->icon());
hTray->setToolTip(TRAY_TOOLTIP_PREFIX + tr("#ConnectedToServer") + ": " + CurrentConnectionName); hTray->setToolTip(TRAY_TOOLTIP_PREFIX + tr("ConnectedToServer") + ": " + CurrentConnectionName);
ui->statusLabel->setText(tr("#Connected") + ": " + CurrentConnectionName); ui->statusLabel->setText(tr("Connected") + ": " + CurrentConnectionName);
} }
trayMenu->actions()[2]->setEnabled(!startFlag); trayMenu->actions()[2]->setEnabled(!startFlag);
@ -214,7 +214,7 @@ void MainWindow::on_stopButton_clicked()
this->vinstance->Stop(); this->vinstance->Stop();
hTray->setToolTip(TRAY_TOOLTIP_PREFIX); hTray->setToolTip(TRAY_TOOLTIP_PREFIX);
QFile(QV2RAY_GENERATED_FILE_PATH).remove(); QFile(QV2RAY_GENERATED_FILE_PATH).remove();
ui->statusLabel->setText(tr("#Disconnected")); ui->statusLabel->setText(tr("Disconnected"));
ui->logText->clear(); ui->logText->clear();
trayMenu->actions()[2]->setEnabled(true); trayMenu->actions()[2]->setEnabled(true);
trayMenu->actions()[3]->setEnabled(false); trayMenu->actions()[3]->setEnabled(false);
@ -234,7 +234,7 @@ void MainWindow::on_restartButton_clicked()
void MainWindow::closeEvent(QCloseEvent *event) void MainWindow::closeEvent(QCloseEvent *event)
{ {
this->hide(); this->hide();
trayMenu->actions()[0]->setText(tr("#Show")); trayMenu->actions()[0]->setText(tr("Show"));
event->ignore(); event->ignore();
} }
@ -279,10 +279,10 @@ void MainWindow::ToggleVisibility()
SetWindowPos(HWND(this->winId()), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); SetWindowPos(HWND(this->winId()), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
SetWindowPos(HWND(this->winId()), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); SetWindowPos(HWND(this->winId()), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
#endif #endif
trayMenu->actions()[0]->setText(tr("#Hide")); trayMenu->actions()[0]->setText(tr("Hide"));
} else { } else {
this->hide(); this->hide();
trayMenu->actions()[0]->setText(tr("#Show")); trayMenu->actions()[0]->setText(tr("Show"));
} }
} }
@ -320,27 +320,27 @@ void MainWindow::ShowAndSetConnection(int index, bool SetConnection, bool ApplyC
ui->_hostLabel->setText(QSTRING(Server.address)); ui->_hostLabel->setText(QSTRING(Server.address));
ui->_portLabel->setText(QSTRING(to_string(Server.port))); ui->_portLabel->setText(QSTRING(to_string(Server.port)));
auto user = QList<VMessServerObject::UserObject>::fromStdList(Server.users).first(); auto user = QList<VMessServerObject::UserObject>::fromStdList(Server.users).first();
auto _configString = tr("#UUID") + ": " + QSTRING(user.id) auto _configString = tr("UUID") + ": " + QSTRING(user.id)
+ "\r\n" + "\r\n"
+ tr("#AlterID") + ": " + QSTRING(to_string(user.alterId)) + tr("AlterID") + ": " + QSTRING(to_string(user.alterId))
+ "\r\n" + "\r\n"
+ tr("#Transport") + ": " + outBoundRoot["streamSettings"].toObject()["network"].toString(); + tr("Transport") + ": " + outBoundRoot["streamSettings"].toObject()["network"].toString();
ui->detailInfoTxt->setPlainText(_configString); ui->detailInfoTxt->setPlainText(_configString);
} else if (outboundType == "shadowsocks") { } else if (outboundType == "shadowsocks") {
auto x = JSONToString(outBoundRoot["settings"].toObject()["servers"].toArray().first().toObject()); auto x = JSONToString(outBoundRoot["settings"].toObject()["servers"].toArray().first().toObject());
auto Server = StructFromJSONString<ShadowSocksServer>(x); auto Server = StructFromJSONString<ShadowSocksServer>(x);
ui->_hostLabel->setText(QSTRING(Server.address)); ui->_hostLabel->setText(QSTRING(Server.address));
ui->_portLabel->setText(QSTRING(to_string(Server.port))); ui->_portLabel->setText(QSTRING(to_string(Server.port)));
auto _configString = tr("#Email") + ": " + QSTRING(Server.email) auto _configString = tr("Email") + ": " + QSTRING(Server.email)
+ "\r\n" + "\r\n"
+ tr("#Encryption") + ": " + QSTRING(Server.method); + tr("Encryption") + ": " + QSTRING(Server.method);
ui->detailInfoTxt->setPlainText(_configString); ui->detailInfoTxt->setPlainText(_configString);
} else if (outboundType == "socks") { } else if (outboundType == "socks") {
auto x = JSONToString(outBoundRoot["settings"].toObject()["servers"].toArray().first().toObject()); auto x = JSONToString(outBoundRoot["settings"].toObject()["servers"].toArray().first().toObject());
auto Server = StructFromJSONString<SocksServerObject>(x); auto Server = StructFromJSONString<SocksServerObject>(x);
ui->_hostLabel->setText(QSTRING(Server.address)); ui->_hostLabel->setText(QSTRING(Server.address));
ui->_portLabel->setText(QSTRING(to_string(Server.port))); ui->_portLabel->setText(QSTRING(to_string(Server.port)));
auto _configString = tr("#Username") + ": " + QSTRING(Server.users.front().user); auto _configString = tr("Username") + ": " + QSTRING(Server.users.front().user);
ui->detailInfoTxt->setPlainText(_configString); ui->detailInfoTxt->setPlainText(_configString);
} }
@ -415,7 +415,7 @@ void MainWindow::on_connectionListWidget_itemChanged(QListWidgetItem *item)
auto configList = QList<string>::fromStdList(config.configs); auto configList = QList<string>::fromStdList(config.configs);
if (newName.trimmed().isEmpty()) { if (newName.trimmed().isEmpty()) {
QvMessageBox(this, tr("#RenameConnection"), tr("#CannotUseEmptyName")); QvMessageBox(this, tr("RenameConnection"), tr("CannotUseEmptyName"));
return; return;
} }
@ -424,7 +424,7 @@ void MainWindow::on_connectionListWidget_itemChanged(QListWidgetItem *item)
if (originalName != newName) { if (originalName != newName) {
if (configList.contains(newName.toStdString())) { if (configList.contains(newName.toStdString())) {
QvMessageBox(this, tr("#RenameConnection"), tr("#DuplicatedConnectionName")); QvMessageBox(this, tr("RenameConnection"), tr("DuplicatedConnectionName"));
return; return;
} }
@ -451,7 +451,7 @@ void MainWindow::on_connectionListWidget_itemChanged(QListWidgetItem *item)
void MainWindow::on_removeConfigButton_clicked() void MainWindow::on_removeConfigButton_clicked()
{ {
if (QvMessageBoxAsk(this, tr("#RemoveConnection"), tr("#RemoveConnectionConfirm")) == QMessageBox::Yes) { if (QvMessageBoxAsk(this, tr("RemoveConnection"), tr("RemoveConnectionConfirm")) == QMessageBox::Yes) {
auto conf = GetGlobalConfig(); auto conf = GetGlobalConfig();
QList<string> list = QList<string>::fromStdList(conf.configs); QList<string> list = QList<string>::fromStdList(conf.configs);
auto currentSelected = ui->connectionListWidget->currentIndex().row(); auto currentSelected = ui->connectionListWidget->currentIndex().row();
@ -491,7 +491,7 @@ void MainWindow::on_editConfigButton_clicked()
auto index = ui->connectionListWidget->currentIndex().row(); auto index = ui->connectionListWidget->currentIndex().row();
if (index < 0) { if (index < 0) {
QvMessageBox(this, tr("#NoConfigSelected"), tr("#PleaseSelectAConfig")); QvMessageBox(this, tr("NoConfigSelected"), tr("PleaseSelectAConfig"));
return; return;
} }

1400
translations/zh-CN.ts → translations/source.ts
View File

File diff suppressed because it is too large Load Diff