mirror of
https://github.com/kunkundi/crossdesk.git
synced 2026-07-02 03:51:33 +08:00
Compare commits
4 Commits
latest
...
178d958c08
| Author | SHA1 | Date | |
|---|---|---|---|
| 178d958c08 | |||
| f9633f366b | |||
| 7a81f3e767 | |||
| bbbbbf7927 |
@@ -158,6 +158,9 @@ struct TranslationRow {
|
|||||||
X(signal_connected, u8"已连接服务器", "Connected", u8"Подключено к серверу") \
|
X(signal_connected, u8"已连接服务器", "Connected", u8"Подключено к серверу") \
|
||||||
X(signal_disconnected, u8"未连接服务器", "Disconnected", \
|
X(signal_disconnected, u8"未连接服务器", "Disconnected", \
|
||||||
u8"Нет подключения к серверу") \
|
u8"Нет подключения к серверу") \
|
||||||
|
X(signal_tls_cert_error, u8"证书验证失败,请重新安装自托管根证书", \
|
||||||
|
"Certificate verification failed. Reinstall the self-hosted root certificate.", \
|
||||||
|
u8"Ошибка проверки сертификата. Переустановите корневой сертификат.") \
|
||||||
X(p2p_connected, u8"对等连接已建立", "P2P Connected", u8"P2P подключено") \
|
X(p2p_connected, u8"对等连接已建立", "P2P Connected", u8"P2P подключено") \
|
||||||
X(p2p_disconnected, u8"对等连接已断开", "P2P Disconnected", \
|
X(p2p_disconnected, u8"对等连接已断开", "P2P Disconnected", \
|
||||||
u8"P2P отключено") \
|
u8"P2P отключено") \
|
||||||
|
|||||||
@@ -1231,6 +1231,8 @@ void Render::OnSignalStatusCb(SignalStatus status, const char* user_id,
|
|||||||
render->signal_connected_ = false;
|
render->signal_connected_ = false;
|
||||||
} else if (SignalStatus::SignalServerClosed == status) {
|
} else if (SignalStatus::SignalServerClosed == status) {
|
||||||
render->signal_connected_ = false;
|
render->signal_connected_ = false;
|
||||||
|
} else if (SignalStatus::SignalTlsCertError == status) {
|
||||||
|
render->signal_connected_ = false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (client_id.rfind("C-", 0) != 0) {
|
if (client_id.rfind("C-", 0) != 0) {
|
||||||
@@ -1258,6 +1260,8 @@ void Render::OnSignalStatusCb(SignalStatus status, const char* user_id,
|
|||||||
props->signal_connected_ = false;
|
props->signal_connected_ = false;
|
||||||
} else if (SignalStatus::SignalServerClosed == status) {
|
} else if (SignalStatus::SignalServerClosed == status) {
|
||||||
props->signal_connected_ = false;
|
props->signal_connected_ = false;
|
||||||
|
} else if (SignalStatus::SignalTlsCertError == status) {
|
||||||
|
props->signal_connected_ = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,20 +26,31 @@ int Render::StatusBar() {
|
|||||||
ImDrawList* draw_list = ImGui::GetWindowDrawList();
|
ImDrawList* draw_list = ImGui::GetWindowDrawList();
|
||||||
draw_list->AddCircleFilled(dot_pos, status_bar_height * 0.25f,
|
draw_list->AddCircleFilled(dot_pos, status_bar_height * 0.25f,
|
||||||
ImColor(1.0f, 1.0f, 1.0f), 100);
|
ImColor(1.0f, 1.0f, 1.0f), 100);
|
||||||
|
bool tls_cert_error =
|
||||||
|
signal_status_ == SignalStatus::SignalTlsCertError;
|
||||||
draw_list->AddCircleFilled(dot_pos, status_bar_height * 0.2f,
|
draw_list->AddCircleFilled(dot_pos, status_bar_height * 0.2f,
|
||||||
ImColor(signal_connected_ ? 0.0f : 1.0f,
|
tls_cert_error
|
||||||
signal_connected_ ? 1.0f : 0.0f, 0.0f),
|
? ImColor(1.0f, 0.65f, 0.0f)
|
||||||
|
: ImColor(signal_connected_ ? 0.0f : 1.0f,
|
||||||
|
signal_connected_ ? 1.0f : 0.0f,
|
||||||
|
0.0f),
|
||||||
100);
|
100);
|
||||||
|
|
||||||
ImGui::SetWindowFontScale(0.6f);
|
ImGui::SetWindowFontScale(0.6f);
|
||||||
|
const char* signal_status_text =
|
||||||
|
tls_cert_error
|
||||||
|
? localization::signal_tls_cert_error[localization_language_index_]
|
||||||
|
.c_str()
|
||||||
|
: (signal_connected_
|
||||||
|
? localization::signal_connected[localization_language_index_]
|
||||||
|
.c_str()
|
||||||
|
: localization::signal_disconnected
|
||||||
|
[localization_language_index_]
|
||||||
|
.c_str());
|
||||||
draw_list->AddText(
|
draw_list->AddText(
|
||||||
ImVec2(status_bar_width * 0.045f,
|
ImVec2(status_bar_width * 0.045f,
|
||||||
io.DisplaySize.y * (1 - STATUS_BAR_HEIGHT * 0.9f)),
|
io.DisplaySize.y * (1 - STATUS_BAR_HEIGHT * 0.9f)),
|
||||||
ImColor(0.0f, 0.0f, 0.0f),
|
ImColor(0.0f, 0.0f, 0.0f), signal_status_text);
|
||||||
signal_connected_
|
|
||||||
? localization::signal_connected[localization_language_index_].c_str()
|
|
||||||
: localization::signal_disconnected[localization_language_index_]
|
|
||||||
.c_str());
|
|
||||||
ImGui::SetWindowFontScale(1.0f);
|
ImGui::SetWindowFontScale(1.0f);
|
||||||
|
|
||||||
ImGui::EndChild();
|
ImGui::EndChild();
|
||||||
|
|||||||
+1
-1
Submodule submodules/minirtc updated: bb0fae0617...0d9a9d6a32
Reference in New Issue
Block a user