fix: 修复终端输出颜色不跟随主题;修复光标字节大小显示;

This commit is contained in:
寂静的羽夏 2025-03-30 10:18:20 +08:00
parent 8449bae812
commit 5aaa59937d
5 changed files with 86 additions and 84 deletions

View File

@ -61,7 +61,7 @@ qsizetype QHexCursor::selectionLength(qsizetype index) const {
qsizetype QHexCursor::currentSelectionLength() const {
if (hasPreviewSelection() && m_preMode != SelectionRemove) {
return qAbs(m_position - m_selection + 1);
return qAbs(m_position - m_selection) + 1;
}
qsizetype len = 0;

@ -1 +1 @@
Subproject commit fe0774c1d2ff5c86832d5850c1dccbbf3a6c3c66
Subproject commit 4307a2552e52d9f7e5c8fc2bd1d3148748e968f9

View File

@ -1334,7 +1334,7 @@
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="1066"/>
<location filename="../../src/dialog/mainwindow.cpp" line="1135"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3788"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3790"/>
<source>NothingToSave</source>
<translation></translation>
</message>
@ -1498,7 +1498,7 @@
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="1641"/>
<location filename="../../src/dialog/mainwindow.cpp" line="1654"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3020"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3022"/>
<source>LayoutRestoring...</source>
<translation>...</translation>
</message>
@ -1509,7 +1509,7 @@
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="1667"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3004"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3006"/>
<source>SaveLayout</source>
<translation></translation>
</message>
@ -1620,13 +1620,13 @@
<location filename="../../src/dialog/mainwindow.cpp" line="2137"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2167"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2194"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3174"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3237"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3255"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3263"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3509"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3826"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3835"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3176"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3239"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3257"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3265"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3511"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3828"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3837"/>
<source>Error</source>
<translation></translation>
</message>
@ -1643,8 +1643,8 @@
<location filename="../../src/dialog/mainwindow.cpp" line="1952"/>
<location filename="../../src/dialog/mainwindow.cpp" line="1986"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2046"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3826"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3835"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3828"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3837"/>
<source>FilePermission</source>
<translation></translation>
</message>
@ -1670,7 +1670,7 @@
<location filename="../../src/dialog/mainwindow.cpp" line="2114"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2181"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2761"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3794"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3796"/>
<source>ChooseSaveFile</source>
<translation></translation>
</message>
@ -1690,42 +1690,42 @@
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3027"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3029"/>
<source>SaveLayoutSuccess</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3030"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3032"/>
<source>SaveLayoutError</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3215"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3217"/>
<source>HasClonedView</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3781"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3783"/>
<source>SaveWorkSpace</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3782"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3784"/>
<source>WingHexWorkSpace (*.wingpro)</source>
<translation> (*.wingpro)</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3897"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3899"/>
<source>ConfirmSave</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3916"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3918"/>
<source>Column %1</source>
<translation> %1</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3977"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3979"/>
<source>ConfirmAPPSave</source>
<translation></translation>
</message>
@ -1735,7 +1735,7 @@
<location filename="../../src/dialog/mainwindow.cpp" line="1244"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2061"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2125"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3866"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3868"/>
<source>SaveSuccessfully</source>
<translation></translation>
</message>
@ -1746,7 +1746,7 @@
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3215"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3217"/>
<source>Warn</source>
<translation></translation>
</message>
@ -1919,7 +1919,7 @@
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="2603"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2644"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3368"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3370"/>
<source>NoSelection</source>
<translation></translation>
</message>
@ -1970,88 +1970,88 @@
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="2969"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2971"/>
<source>TooManyBytesDecode</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="2998"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3000"/>
<source>LayoutSaving...</source>
<translation>...</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3004"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3006"/>
<source>PleaseInput</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3036"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3038"/>
<source>LogExporting...</source>
<translation>...</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3041"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3043"/>
<source>ExportLogError</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3044"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3046"/>
<source>ExportLogSuccess</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3052"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3054"/>
<source>ClearLogSuccess</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3113"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3115"/>
<source>BadNetwork</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3118"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3120"/>
<source>NewestVersion</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="386"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3115"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3117"/>
<source>OlderVersion</source>
<translation>使 Github Gitee </translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3100"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3102"/>
<source>CheckingUpdate</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3175"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3177"/>
<source>Too much opened files</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3237"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3239"/>
<source>FilePermissionSure2Quit</source>
<translation>退</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3255"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3257"/>
<source>UnknownErrorSure2Quit</source>
<translation>退</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3263"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3265"/>
<source>WorkSpaceUnSavedSure2Quit</source>
<translation>退</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3426"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3428"/>
<source>CopyLimit</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3510"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3512"/>
<source>ErrOpenFileBelow</source>
<translation></translation>
</message>

View File

@ -1334,7 +1334,7 @@
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="1066"/>
<location filename="../../src/dialog/mainwindow.cpp" line="1135"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3788"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3790"/>
<source>NothingToSave</source>
<translation></translation>
</message>
@ -1498,7 +1498,7 @@
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="1641"/>
<location filename="../../src/dialog/mainwindow.cpp" line="1654"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3020"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3022"/>
<source>LayoutRestoring...</source>
<translation>...</translation>
</message>
@ -1509,7 +1509,7 @@
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="1667"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3004"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3006"/>
<source>SaveLayout</source>
<translation></translation>
</message>
@ -1620,13 +1620,13 @@
<location filename="../../src/dialog/mainwindow.cpp" line="2137"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2167"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2194"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3174"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3237"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3255"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3263"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3509"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3826"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3835"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3176"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3239"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3257"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3265"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3511"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3828"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3837"/>
<source>Error</source>
<translation></translation>
</message>
@ -1643,8 +1643,8 @@
<location filename="../../src/dialog/mainwindow.cpp" line="1952"/>
<location filename="../../src/dialog/mainwindow.cpp" line="1986"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2046"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3826"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3835"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3828"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3837"/>
<source>FilePermission</source>
<translation></translation>
</message>
@ -1670,7 +1670,7 @@
<location filename="../../src/dialog/mainwindow.cpp" line="2114"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2181"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2761"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3794"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3796"/>
<source>ChooseSaveFile</source>
<translation></translation>
</message>
@ -1690,42 +1690,42 @@
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3027"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3029"/>
<source>SaveLayoutSuccess</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3030"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3032"/>
<source>SaveLayoutError</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3215"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3217"/>
<source>HasClonedView</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3781"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3783"/>
<source>SaveWorkSpace</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3782"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3784"/>
<source>WingHexWorkSpace (*.wingpro)</source>
<translation> (*.wingpro)</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3897"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3899"/>
<source>ConfirmSave</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3916"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3918"/>
<source>Column %1</source>
<translation> %1</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3977"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3979"/>
<source>ConfirmAPPSave</source>
<translation></translation>
</message>
@ -1735,7 +1735,7 @@
<location filename="../../src/dialog/mainwindow.cpp" line="1244"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2061"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2125"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3866"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3868"/>
<source>SaveSuccessfully</source>
<translation></translation>
</message>
@ -1746,7 +1746,7 @@
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3215"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3217"/>
<source>Warn</source>
<translation></translation>
</message>
@ -1919,7 +1919,7 @@
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="2603"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2644"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3368"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3370"/>
<source>NoSelection</source>
<translation></translation>
</message>
@ -1970,88 +1970,88 @@
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="2969"/>
<location filename="../../src/dialog/mainwindow.cpp" line="2971"/>
<source>TooManyBytesDecode</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="2998"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3000"/>
<source>LayoutSaving...</source>
<translation>...</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3004"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3006"/>
<source>PleaseInput</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3036"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3038"/>
<source>LogExporting...</source>
<translation>...</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3041"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3043"/>
<source>ExportLogError</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3044"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3046"/>
<source>ExportLogSuccess</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3052"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3054"/>
<source>ClearLogSuccess</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3113"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3115"/>
<source>BadNetwork</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3118"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3120"/>
<source>NewestVersion</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="386"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3115"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3117"/>
<source>OlderVersion</source>
<translation>使 Github Gitee </translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3100"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3102"/>
<source>CheckingUpdate</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3175"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3177"/>
<source>Too much opened files</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3237"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3239"/>
<source>FilePermissionSure2Quit</source>
<translation>退</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3255"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3257"/>
<source>UnknownErrorSure2Quit</source>
<translation>退</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3263"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3265"/>
<source>WorkSpaceUnSavedSure2Quit</source>
<translation>退</translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3426"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3428"/>
<source>CopyLimit</source>
<translation></translation>
</message>
<message>
<location filename="../../src/dialog/mainwindow.cpp" line="3510"/>
<location filename="../../src/dialog/mainwindow.cpp" line="3512"/>
<source>ErrOpenFileBelow</source>
<translation></translation>
</message>

View File

@ -2931,6 +2931,8 @@ void MainWindow::on_selectionChanged() {
return;
}
on_locChanged();
auto cursor = hexeditor->cursor();
QByteArrayList buffer;
bool isPreview = false;