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

[Windows][UI][Fix] Fixed a Visibility Toggling Issue

Browse Source 
Former-commit-id: 91e0f72eed
This commit is contained in:
Leroy.H.Y 2019-08-18 00:47:49 +08:00
parent 53465986a7
commit c77a8cad0a
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/w_MainWindow.cpp
View File

@ -86,7 +86,7 @@ MainWindow::MainWindow(QWidget *parent)
ui->connectionListWidget->setCurrentItem(item); ui->connectionListWidget->setCurrentItem(item);
on_connectionListWidget_itemClicked(item); on_connectionListWidget_itemClicked(item);
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 {
@ -272,6 +272,7 @@ void MainWindow::ToggleVisibility()
if (this->isHidden()) { if (this->isHidden()) {
this->show(); this->show();
#ifdef _WIN32 #ifdef _WIN32
setWindowState(Qt::WindowNoState);
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

32
translations/en-US.ts
View File

@ -364,7 +364,7 @@
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.ui" line="276"/> <location filename="../src/w_MainWindow.ui" line="276"/>
<location filename="../src/w_MainWindow.cpp" line="449"/> <location filename="../src/w_MainWindow.cpp" line="450"/>
<source>#RemoveConnection</source> <source>#RemoveConnection</source>
<translation>Remove a connection</translation> <translation>Remove a connection</translation>
</message> </message>
@ -449,17 +449,17 @@
<translation>Disconnected</translation> <translation>Disconnected</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="318"/> <location filename="../src/w_MainWindow.cpp" line="319"/>
<source>#UUID</source> <source>#UUID</source>
<translation>UUID</translation> <translation>UUID</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="320"/> <location filename="../src/w_MainWindow.cpp" line="321"/>
<source>#AlterID</source> <source>#AlterID</source>
<translation>Alter ID</translation> <translation>Alter ID</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="322"/> <location filename="../src/w_MainWindow.cpp" line="323"/>
<source>#Transport</source> <source>#Transport</source>
<translation>Transport Settings</translation> <translation>Transport Settings</translation>
</message> </message>
@ -492,7 +492,7 @@
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="37"/> <location filename="../src/w_MainWindow.cpp" line="37"/>
<location filename="../src/w_MainWindow.cpp" line="278"/> <location filename="../src/w_MainWindow.cpp" line="279"/>
<source>#Hide</source> <source>#Hide</source>
<translation>Hide</translation> <translation>Hide</translation>
</message> </message>
@ -524,13 +524,13 @@
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="183"/> <location filename="../src/w_MainWindow.cpp" line="183"/>
<location filename="../src/w_MainWindow.cpp" line="489"/> <location filename="../src/w_MainWindow.cpp" line="490"/>
<source>#NoConfigSelected</source> <source>#NoConfigSelected</source>
<translation>No Config Selected</translation> <translation>No Config Selected</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="183"/> <location filename="../src/w_MainWindow.cpp" line="183"/>
<location filename="../src/w_MainWindow.cpp" line="489"/> <location filename="../src/w_MainWindow.cpp" line="490"/>
<source>#PleaseSelectAConfig</source> <source>#PleaseSelectAConfig</source>
<translation>Please select a config from the list</translation> <translation>Please select a config from the list</translation>
</message> </message>
@ -541,45 +541,45 @@
<translation>Connected to server</translation> <translation>Connected to server</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="413"/> <location filename="../src/w_MainWindow.cpp" line="414"/>
<location filename="../src/w_MainWindow.cpp" line="422"/> <location filename="../src/w_MainWindow.cpp" line="423"/>
<source>#RenameConnection</source> <source>#RenameConnection</source>
<translation>Rename a connection</translation> <translation>Rename a connection</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="413"/> <location filename="../src/w_MainWindow.cpp" line="414"/>
<source>#CannotUseEmptyName</source> <source>#CannotUseEmptyName</source>
<translation>You cannot use an empty connection name</translation> <translation>You cannot use an empty connection name</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="422"/> <location filename="../src/w_MainWindow.cpp" line="423"/>
<source>#DuplicatedConnectionName</source> <source>#DuplicatedConnectionName</source>
<translation>Connection name is duplicated</translation> <translation>Connection name is duplicated</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="449"/> <location filename="../src/w_MainWindow.cpp" line="450"/>
<source>#RemoveConnectionConfirm</source> <source>#RemoveConnectionConfirm</source>
<translation>Are you sure want to remove this connection</translation> <translation>Are you sure want to remove this connection</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="329"/> <location filename="../src/w_MainWindow.cpp" line="330"/>
<source>#Email</source> <source>#Email</source>
<translation>Email</translation> <translation>Email</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="331"/> <location filename="../src/w_MainWindow.cpp" line="332"/>
<source>#Encryption</source> <source>#Encryption</source>
<translation>Encryption</translation> <translation>Encryption</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="338"/> <location filename="../src/w_MainWindow.cpp" line="339"/>
<source>#Username</source> <source>#Username</source>
<translation>Username</translation> <translation>Username</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="91"/> <location filename="../src/w_MainWindow.cpp" line="91"/>
<location filename="../src/w_MainWindow.cpp" line="234"/> <location filename="../src/w_MainWindow.cpp" line="234"/>
<location filename="../src/w_MainWindow.cpp" line="281"/> <location filename="../src/w_MainWindow.cpp" line="282"/>
<source>#Show</source> <source>#Show</source>
<translation>Show</translation> <translation>Show</translation>
</message> </message>

32
translations/zh-CN.ts
View File

@ -364,7 +364,7 @@
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.ui" line="276"/> <location filename="../src/w_MainWindow.ui" line="276"/>
<location filename="../src/w_MainWindow.cpp" line="449"/> <location filename="../src/w_MainWindow.cpp" line="450"/>
<source>#RemoveConnection</source> <source>#RemoveConnection</source>
<translation>删除连接</translation> <translation>删除连接</translation>
</message> </message>
@ -449,17 +449,17 @@
<translation>已断开连接</translation> <translation>已断开连接</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="318"/> <location filename="../src/w_MainWindow.cpp" line="319"/>
<source>#UUID</source> <source>#UUID</source>
<translation>UUID</translation> <translation>UUID</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="320"/> <location filename="../src/w_MainWindow.cpp" line="321"/>
<source>#AlterID</source> <source>#AlterID</source>
<translation>Alter ID</translation> <translation>Alter ID</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="322"/> <location filename="../src/w_MainWindow.cpp" line="323"/>
<source>#Transport</source> <source>#Transport</source>
<translation>传输设置</translation> <translation>传输设置</translation>
</message> </message>
@ -492,7 +492,7 @@
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="37"/> <location filename="../src/w_MainWindow.cpp" line="37"/>
<location filename="../src/w_MainWindow.cpp" line="278"/> <location filename="../src/w_MainWindow.cpp" line="279"/>
<source>#Hide</source> <source>#Hide</source>
<translation>隐藏</translation> <translation>隐藏</translation>
</message> </message>
@ -524,13 +524,13 @@
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="183"/> <location filename="../src/w_MainWindow.cpp" line="183"/>
<location filename="../src/w_MainWindow.cpp" line="489"/> <location filename="../src/w_MainWindow.cpp" line="490"/>
<source>#NoConfigSelected</source> <source>#NoConfigSelected</source>
<translation>没有选择配置文件</translation> <translation>没有选择配置文件</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="183"/> <location filename="../src/w_MainWindow.cpp" line="183"/>
<location filename="../src/w_MainWindow.cpp" line="489"/> <location filename="../src/w_MainWindow.cpp" line="490"/>
<source>#PleaseSelectAConfig</source> <source>#PleaseSelectAConfig</source>
<translation>请从列表中选择配置</translation> <translation>请从列表中选择配置</translation>
</message> </message>
@ -541,45 +541,45 @@
<translation>已连接到服务器</translation> <translation>已连接到服务器</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="413"/> <location filename="../src/w_MainWindow.cpp" line="414"/>
<location filename="../src/w_MainWindow.cpp" line="422"/> <location filename="../src/w_MainWindow.cpp" line="423"/>
<source>#RenameConnection</source> <source>#RenameConnection</source>
<translation>重命名连接</translation> <translation>重命名连接</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="413"/> <location filename="../src/w_MainWindow.cpp" line="414"/>
<source>#CannotUseEmptyName</source> <source>#CannotUseEmptyName</source>
<translation>不能使用空连接名</translation> <translation>不能使用空连接名</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="422"/> <location filename="../src/w_MainWindow.cpp" line="423"/>
<source>#DuplicatedConnectionName</source> <source>#DuplicatedConnectionName</source>
<translation>连接重名</translation> <translation>连接重名</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="449"/> <location filename="../src/w_MainWindow.cpp" line="450"/>
<source>#RemoveConnectionConfirm</source> <source>#RemoveConnectionConfirm</source>
<translation>确定要删除连接吗</translation> <translation>确定要删除连接吗</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="329"/> <location filename="../src/w_MainWindow.cpp" line="330"/>
<source>#Email</source> <source>#Email</source>
<translation>邮箱</translation> <translation>邮箱</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="331"/> <location filename="../src/w_MainWindow.cpp" line="332"/>
<source>#Encryption</source> <source>#Encryption</source>
<translation>加密方法</translation> <translation>加密方法</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="338"/> <location filename="../src/w_MainWindow.cpp" line="339"/>
<source>#Username</source> <source>#Username</source>
<translation>用户名</translation> <translation>用户名</translation>
</message> </message>
<message> <message>
<location filename="../src/w_MainWindow.cpp" line="91"/> <location filename="../src/w_MainWindow.cpp" line="91"/>
<location filename="../src/w_MainWindow.cpp" line="234"/> <location filename="../src/w_MainWindow.cpp" line="234"/>
<location filename="../src/w_MainWindow.cpp" line="281"/> <location filename="../src/w_MainWindow.cpp" line="282"/>
<source>#Show</source> <source>#Show</source>
<translation>显示</translation> <translation>显示</translation>
</message> </message>