mirror of https://github.com/by-sonic/tglock.git
Use custom fonts instead of Windows-related. Fixed build on Linux &
macOS.
This commit is contained in:
Andrey Maksimov
parent
c40ad94e11
commit
7d4c330fab
Binary file not shown.
|
|
@ -0,0 +1,93 @@
|
|||
Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://openfontlicense.org
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
67
src/main.rs
67
src/main.rs
|
|
@ -35,7 +35,7 @@ fn setup_fonts(ctx: &egui::Context) {
|
|||
fonts.font_data.insert(
|
||||
"system".to_owned(),
|
||||
std::sync::Arc::new(egui::FontData::from_static(include_bytes!(
|
||||
"C:\\Windows\\Fonts\\segoeui.ttf"
|
||||
"../fonts/IBMPlexSans-Regular.ttf"
|
||||
))),
|
||||
);
|
||||
fonts
|
||||
|
|
@ -78,7 +78,11 @@ impl App {
|
|||
};
|
||||
log_msg(&app.log, "Запущено", false);
|
||||
if !is_admin {
|
||||
log_msg(&app.log, "Нет прав администратора — DNS менять не получится", true);
|
||||
log_msg(
|
||||
&app.log,
|
||||
"Нет прав администратора — DNS менять не получится",
|
||||
true,
|
||||
);
|
||||
}
|
||||
{
|
||||
let adapter = app.adapter_name.clone();
|
||||
|
|
@ -110,7 +114,11 @@ impl App {
|
|||
std::thread::spawn(move || {
|
||||
// DNS
|
||||
if is_admin {
|
||||
let aname = adapter.lock().unwrap().clone().or_else(network::detect_adapter);
|
||||
let aname = adapter
|
||||
.lock()
|
||||
.unwrap()
|
||||
.clone()
|
||||
.or_else(network::detect_adapter);
|
||||
if let Some(ref name) = aname {
|
||||
if bypass::set_dns(name, "1.1.1.1", "1.0.0.1").is_ok() {
|
||||
bypass::flush_dns();
|
||||
|
|
@ -120,7 +128,11 @@ impl App {
|
|||
}
|
||||
}
|
||||
|
||||
log_msg(&log, &format!("Запускаю WS-прокси на 127.0.0.1:{}...", PROXY_PORT), false);
|
||||
log_msg(
|
||||
&log,
|
||||
&format!("Запускаю WS-прокси на 127.0.0.1:{}...", PROXY_PORT),
|
||||
false,
|
||||
);
|
||||
|
||||
let rt = tokio::runtime::Runtime::new().unwrap();
|
||||
let result = rt.block_on(ws_proxy::run_proxy(PROXY_PORT, stats));
|
||||
|
|
@ -144,7 +156,11 @@ impl App {
|
|||
let log = self.log.clone();
|
||||
let dns_set = self.dns_set.clone();
|
||||
std::thread::spawn(move || {
|
||||
let aname = adapter.lock().unwrap().clone().or_else(network::detect_adapter);
|
||||
let aname = adapter
|
||||
.lock()
|
||||
.unwrap()
|
||||
.clone()
|
||||
.or_else(network::detect_adapter);
|
||||
if let Some(ref name) = aname {
|
||||
let _ = bypass::reset_dns(name);
|
||||
bypass::flush_dns();
|
||||
|
|
@ -167,7 +183,12 @@ fn log_msg(log: &Arc<Mutex<Vec<LogEntry>>>, text: &str, err: bool) {
|
|||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.unwrap()
|
||||
.as_secs();
|
||||
let ts = format!("{:02}:{:02}:{:02}", (now % 86400) / 3600, (now % 3600) / 60, now % 60);
|
||||
let ts = format!(
|
||||
"{:02}:{:02}:{:02}",
|
||||
(now % 86400) / 3600,
|
||||
(now % 3600) / 60,
|
||||
now % 60
|
||||
);
|
||||
log.lock().unwrap().push(LogEntry {
|
||||
text: text.to_string(),
|
||||
is_error: err,
|
||||
|
|
@ -195,7 +216,10 @@ impl eframe::App for App {
|
|||
egui::RichText::new("ПРОКСИ РАБОТАЕТ").strong(),
|
||||
);
|
||||
ui.separator();
|
||||
ui.label(format!("Соединений: {} (WS: {}) | Всего: {}", active, ws, total));
|
||||
ui.label(format!(
|
||||
"Соединений: {} (WS: {}) | Всего: {}",
|
||||
active, ws, total
|
||||
));
|
||||
} else {
|
||||
ui.label("Прокси не запущен");
|
||||
}
|
||||
|
|
@ -245,8 +269,11 @@ impl eframe::App for App {
|
|||
.size(12.0)
|
||||
.color(egui::Color32::from_rgb(160, 165, 180)),
|
||||
);
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
if ui.add(
|
||||
ui.with_layout(
|
||||
egui::Layout::right_to_left(egui::Align::Center),
|
||||
|ui| {
|
||||
if ui
|
||||
.add(
|
||||
egui::Button::new(
|
||||
egui::RichText::new("@bysonicvpn_bot")
|
||||
.size(12.0)
|
||||
|
|
@ -254,10 +281,13 @@ impl eframe::App for App {
|
|||
.color(egui::Color32::from_rgb(100, 200, 255)),
|
||||
)
|
||||
.frame(false),
|
||||
).clicked() {
|
||||
)
|
||||
.clicked()
|
||||
{
|
||||
let _ = open::that("https://t.me/bysonicvpn_bot");
|
||||
}
|
||||
});
|
||||
},
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -266,14 +296,19 @@ impl eframe::App for App {
|
|||
|
||||
ui.vertical_centered(|ui| {
|
||||
if !running {
|
||||
ui.label(egui::RichText::new("Обход блокировки Telegram через WebSocket-прокси").size(15.0));
|
||||
ui.label(
|
||||
egui::RichText::new("Обход блокировки Telegram через WebSocket-прокси")
|
||||
.size(15.0),
|
||||
);
|
||||
ui.add_space(5.0);
|
||||
ui.label("Трафик идёт через web.telegram.org — провайдер видит обычный HTTPS");
|
||||
ui.add_space(15.0);
|
||||
|
||||
let btn = ui.add_sized(
|
||||
[340.0, 55.0],
|
||||
egui::Button::new(egui::RichText::new("Запустить обход").size(20.0).strong()),
|
||||
egui::Button::new(
|
||||
egui::RichText::new("Запустить обход").size(20.0).strong(),
|
||||
),
|
||||
);
|
||||
if btn.clicked() {
|
||||
self.start_proxy();
|
||||
|
|
@ -285,7 +320,10 @@ impl eframe::App for App {
|
|||
);
|
||||
ui.add_space(5.0);
|
||||
ui.label(format!("SOCKS5 прокси на 127.0.0.1:{}", PROXY_PORT));
|
||||
ui.label(format!("WebSocket-туннелей: {} | Соединений: {}", ws, active));
|
||||
ui.label(format!(
|
||||
"WebSocket-туннелей: {} | Соединений: {}",
|
||||
ws, active
|
||||
));
|
||||
ui.add_space(12.0);
|
||||
|
||||
// Stop button
|
||||
|
|
@ -350,7 +388,6 @@ impl eframe::App for App {
|
|||
egui::Color32::from_rgb(170, 170, 170),
|
||||
"Не-Telegram трафик проходит напрямую без изменений",
|
||||
);
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue