Skip to content

Commit 86740fe

Browse files
Wing-summerWing-summer
committed
build: 更新上游仓库；
1 parent c7d2658 commit 86740fe

File tree

10 files changed

+81
-49
lines changed

10 files changed

+81
-49
lines changed

‎3rdparty/AngelScript‎

‎3rdparty/angel-lsp‎

‎3rdparty/fmt‎

‎3rdparty/qwindowkit‎

‎lang/en_US/winghex_en_US.ts‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -807,12 +807,7 @@
807807
<translation>Clear</translation>
808808
</message>
809809
<message>
810-
<location filename="../../src/class/inspectqtloghelper.cpp" line="36"/>
811-
<source>TopMost</source>
812-
<translation>Top Most</translation>
813-
</message>
814-
<message>
815-
<location filename="../../src/class/inspectqtloghelper.cpp" line="56"/>
810+
<location filename="../../src/class/inspectqtloghelper.cpp" line="44"/>
816811
<source>Inspect</source>
817812
<translation>Inspect</translation>
818813
</message>
@@ -1805,7 +1800,12 @@
18051800
<translation>Unsupported file format</translation>
18061801
</message>
18071802
<message>
1808-
<location filename="../../src/dialog/mainwindow.cpp" line="4391"/>
1803+
<location filename="../../src/dialog/mainwindow.cpp" line="4343"/>
1804+
<source>LayoutRestoreBreak</source>
1805+
<translation>The editing views are not in the same area. Restoring the layout will disrupt the current simultaneous editing view arrangement. After restoration, they will be merged. Confirm to proceed?</translation>
1806+
</message>
1807+
<message>
1808+
<location filename="../../src/dialog/mainwindow.cpp" line="4406"/>
18091809
<source>ScriptStillRunning</source>
18101810
<translation>The script is still running. Are you sure to exit?</translation>
18111811
</message>
@@ -2230,7 +2230,7 @@
22302230
</message>
22312231
<message>
22322232
<location filename="../../src/dialog/mainwindow.cpp" line="4191"/>
2233-
<location filename="../../src/dialog/mainwindow.cpp" line="4420"/>
2233+
<location filename="../../src/dialog/mainwindow.cpp" line="4435"/>
22342234
<source>ConfirmSave</source>
22352235
<translation>Closing unsaved files or workspaces. Are you sure to save?</translation>
22362236
</message>
@@ -3578,7 +3578,7 @@
35783578
</message>
35793579
<message>
35803580
<location filename="../../src/dialog/scriptingdialog.cpp" line="916"/>
3581-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1763"/>
3581+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1777"/>
35823582
<source>ScriptStillRunning</source>
35833583
<translation>The script is still running. Are you sure to exit?</translation>
35843584
</message>
@@ -3678,8 +3678,13 @@
36783678
<translation>Code formatting failed</translation>
36793679
</message>
36803680
<message>
3681-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1672"/>
3682-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1692"/>
3681+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1646"/>
3682+
<source>LayoutRestoreBreak</source>
3683+
<translation>The editing views are not in the same area. Restoring the layout will disrupt the current simultaneous editing view arrangement. After restoration, they will be merged. Confirm to proceed?</translation>
3684+
</message>
3685+
<message>
3686+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1686"/>
3687+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1706"/>
36833688
<source>CannotSave2RunScript</source>
36843689
<translation>Unable to save, therefore unable to continue running the script.</translation>
36853690
</message>

‎lang/zh_CN/winghex_zh_CN.ts‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -807,12 +807,7 @@
807807
<translation>清空</translation>
808808
</message>
809809
<message>
810-
<location filename="../../src/class/inspectqtloghelper.cpp" line="36"/>
811-
<source>TopMost</source>
812-
<translation>窗口置顶</translation>
813-
</message>
814-
<message>
815-
<location filename="../../src/class/inspectqtloghelper.cpp" line="56"/>
810+
<location filename="../../src/class/inspectqtloghelper.cpp" line="44"/>
816811
<source>Inspect</source>
817812
<translation>监视</translation>
818813
</message>
@@ -1900,7 +1895,7 @@
19001895
</message>
19011896
<message>
19021897
<location filename="../../src/dialog/mainwindow.cpp" line="4191"/>
1903-
<location filename="../../src/dialog/mainwindow.cpp" line="4420"/>
1898+
<location filename="../../src/dialog/mainwindow.cpp" line="4435"/>
19041899
<source>ConfirmSave</source>
19051900
<translation>正在关闭未保存的文件或工作区，你确定保存吗？</translation>
19061901
</message>
@@ -1940,7 +1935,12 @@
19401935
<translation>【错误】</translation>
19411936
</message>
19421937
<message>
1943-
<location filename="../../src/dialog/mainwindow.cpp" line="4391"/>
1938+
<location filename="../../src/dialog/mainwindow.cpp" line="4343"/>
1939+
<source>LayoutRestoreBreak</source>
1940+
<translation>编辑视图不在同一区域，恢复布局会破坏现有的同时可见编辑视图的布局，恢复后会合并，确认继续？</translation>
1941+
</message>
1942+
<message>
1943+
<location filename="../../src/dialog/mainwindow.cpp" line="4406"/>
19441944
<source>ScriptStillRunning</source>
19451945
<translation>脚本仍在运行，你确定要退出吗？</translation>
19461946
</message>
@@ -3576,14 +3576,19 @@
35763576
<translation>代码格式化失败</translation>
35773577
</message>
35783578
<message>
3579-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1672"/>
3580-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1692"/>
3579+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1646"/>
3580+
<source>LayoutRestoreBreak</source>
3581+
<translation>编辑视图不在同一区域，恢复布局会破坏现有的同时可见编辑视图的布局，恢复后会合并，确认继续？</translation>
3582+
</message>
3583+
<message>
3584+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1686"/>
3585+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1706"/>
35813586
<source>CannotSave2RunScript</source>
35823587
<translation>无法保存，故无法继续运行脚本。</translation>
35833588
</message>
35843589
<message>
35853590
<location filename="../../src/dialog/scriptingdialog.cpp" line="916"/>
3586-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1763"/>
3591+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1777"/>
35873592
<source>ScriptStillRunning</source>
35883593
<translation>脚本仍在运行，你确定要退出吗？</translation>
35893594
</message>

‎lang/zh_TW/winghex_zh_TW.ts‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -807,12 +807,7 @@
807807
<translation>清空</translation>
808808
</message>
809809
<message>
810-
<location filename="../../src/class/inspectqtloghelper.cpp" line="36"/>
811-
<source>TopMost</source>
812-
<translation>窗口置頂</translation>
813-
</message>
814-
<message>
815-
<location filename="../../src/class/inspectqtloghelper.cpp" line="56"/>
810+
<location filename="../../src/class/inspectqtloghelper.cpp" line="44"/>
816811
<source>Inspect</source>
817812
<translation>監視</translation>
818813
</message>
@@ -1900,7 +1895,7 @@
19001895
</message>
19011896
<message>
19021897
<location filename="../../src/dialog/mainwindow.cpp" line="4191"/>
1903-
<location filename="../../src/dialog/mainwindow.cpp" line="4420"/>
1898+
<location filename="../../src/dialog/mainwindow.cpp" line="4435"/>
19041899
<source>ConfirmSave</source>
19051900
<translation>正在關閉未保存的檔或工作區，你確定保存嗎？</translation>
19061901
</message>
@@ -1940,7 +1935,12 @@
19401935
<translation>【錯誤】</translation>
19411936
</message>
19421937
<message>
1943-
<location filename="../../src/dialog/mainwindow.cpp" line="4391"/>
1938+
<location filename="../../src/dialog/mainwindow.cpp" line="4343"/>
1939+
<source>LayoutRestoreBreak</source>
1940+
<translation>編輯視圖不在同一區域，恢復佈局會破壞現有的同時可見編輯視圖的佈局，恢復後會合並，確認繼續？</translation>
1941+
</message>
1942+
<message>
1943+
<location filename="../../src/dialog/mainwindow.cpp" line="4406"/>
19441944
<source>ScriptStillRunning</source>
19451945
<translation>腳本仍在運行，你確定要退出嗎？</translation>
19461946
</message>
@@ -3576,14 +3576,19 @@
35763576
<translation>代碼格式化失敗</translation>
35773577
</message>
35783578
<message>
3579-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1672"/>
3580-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1692"/>
3579+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1646"/>
3580+
<source>LayoutRestoreBreak</source>
3581+
<translation>編輯視圖不在同一區域，恢復佈局會破壞現有的同時可見編輯視圖的佈局，恢復後會合並，確認繼續？</translation>
3582+
</message>
3583+
<message>
3584+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1686"/>
3585+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1706"/>
35813586
<source>CannotSave2RunScript</source>
35823587
<translation>無法保存，故無法繼續運行腳本。</translation>
35833588
</message>
35843589
<message>
35853590
<location filename="../../src/dialog/scriptingdialog.cpp" line="916"/>
3586-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1763"/>
3591+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1777"/>
35873592
<source>ScriptStillRunning</source>
35883593
<translation>腳本仍在運行，你確定要退出嗎？</translation>
35893594
</message>

‎src/class/inspectqtloghelper.cpp‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@ void InspectQtLogHelper::init() {
3131
QObject::connect(a, &QAction::triggered, qApp, [this]() { _ctx->clear(); });
3232
menu->addAction(a);
3333

34-
auto af = ma.at(0);
35-
af = menu->insertSeparator(af);
36-
a = new QAction(tr("TopMost"), menu);
37-
a->setCheckable(true);
38-
QObject::connect(a, &QAction::toggled, qApp, [this](bool b) {
39-
_logger->setWindowFlag(Qt::WindowStaysOnTopHint, b);
40-
if (!_logger->isVisible()) {
41-
_logger->setVisible(true);
42-
}
43-
});
44-
menu->insertAction(af, a);
45-
4634
for (auto &a : ma) {
4735
a->setEnabled(true);
4836
}

‎src/dialog/mainwindow.cpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4332,6 +4332,21 @@ void MainWindow::restoreLayout(const QByteArray &layout) {
43324332
m_dock->restoreState(layout);
43334333
} else {
43344334
auto curEditor = m_curEditor;
4335+
if (m_views.size() > 1) {
4336+
auto notSameContainer = std::any_of(
4337+
m_views.begin(), m_views.end(), [curEditor](EditorView *view) {
4338+
return curEditor->dockAreaWidget() !=
4339+
view->dockAreaWidget();
4340+
});
4341+
if (notSameContainer) {
4342+
auto ret = WingMessageBox::warning(
4343+
this, qAppName(), tr("LayoutRestoreBreak"),
4344+
QMessageBox::Yes | QMessageBox::No);
4345+
if (ret == QMessageBox::No) {
4346+
return;
4347+
}
4348+
}
4349+
}
43354350

43364351
// remove temperaily
43374352
QVector<EditorView *> hiddenView;

‎src/dialog/scriptingdialog.cpp‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,6 +1636,20 @@ void ScriptingDialog::on_restoreLayout() {
16361636
}
16371637

16381638
auto curEditor = m_curEditor;
1639+
if (m_views.size() > 1) {
1640+
auto notSameContainer = std::any_of(
1641+
m_views.begin(), m_views.end(), [curEditor](ScriptEditor *view) {
1642+
return curEditor->dockAreaWidget() != view->dockAreaWidget();
1643+
});
1644+
if (notSameContainer) {
1645+
auto ret = WingMessageBox::warning(
1646+
this, qAppName(), tr("LayoutRestoreBreak"),
1647+
QMessageBox::Yes | QMessageBox::No);
1648+
if (ret == QMessageBox::No) {
1649+
return;
1650+
}
1651+
}
1652+
}
16391653

16401654
// remove temperaily
16411655
QVector<ScriptEditor *> hiddenView;

0 commit comments

Comments
 (0)