Skip to content

Commit 2584437

Browse files
sanny32sanny32
committed
Refactoring
1 parent 4a18dcd commit 2584437

4 files changed

Lines changed: 43 additions & 30 deletions

File tree

‎omodsim/formmodsim.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ inline QXmlStreamWriter& operator <<(QXmlStreamWriter& xml, FormModSim* frm)
506506

507507
xml.writeStartElement("FormModSim");
508508

509+
xml.writeAttribute("Version", FormModSim::VERSION.toString());
509510
xml.writeAttribute("DisplayMode", enumToString<DisplayMode>(frm->displayMode()));
510511
xml.writeAttribute("DataDisplayMode", enumToString<DataDisplayMode>(frm->dataDisplayMode()));
511512
xml.writeAttribute("DisplayHexAddresses", boolToString(frm->displayHexAddresses()));

‎omodsim/mainwindow.cpp‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,11 @@ void MainWindow::on_actionNew_triggered()
327327
///
328328
void MainWindow::on_actionOpen_triggered()
329329
{
330-
const auto filename = QFileDialog::getOpenFileName(this, QString(), _savePath, tr("XML files (*.xml);;All files (*)"));
330+
QStringList filters;
331+
filters << tr("XML files (*.xml)");
332+
filters << tr("All files (*)");
333+
334+
const auto filename = QFileDialog::getOpenFileName(this, QString(), _savePath, filters.join(";;"));
331335
if(filename.isEmpty()) return;
332336

333337
_savePath = QFileInfo(filename).absoluteDir().absolutePath();
@@ -371,15 +375,19 @@ void MainWindow::on_actionSaveAs_triggered()
371375
auto frm = currentMdiChild();
372376
if(!frm) return;
373377

378+
QStringList filters;
379+
filters << tr("XML files (*.xml)");
380+
filters << tr("All files (*)");
381+
374382
const auto dir = QString("%1%2%3").arg(_savePath, QDir::separator(), frm->windowTitle());
375383

376384
QString selectedFilter;
377-
auto filename = QFileDialog::getSaveFileName(this, QString(), dir, tr("XML files (*.xml);;All files (*)"), &selectedFilter);
385+
auto filename = QFileDialog::getSaveFileName(this, QString(), dir, filters.join(";;"), &selectedFilter);
378386

379387
if(filename.isEmpty()) return;
380388

381389
auto format = SerializationFormat::Binary;
382-
if(selectedFilter == tr("XML files (*.xml)")) {
390+
if(selectedFilter == filters[0]) {
383391
format = SerializationFormat::Xml;
384392
if(!filename.endsWith(".xml", Qt::CaseInsensitive)) {
385393
filename.append(".xml");
@@ -397,13 +405,17 @@ void MainWindow::on_actionSaveAs_triggered()
397405
///
398406
void MainWindow::on_actionSaveTestConfig_triggered()
399407
{
408+
QStringList filters;
409+
filters << tr("XML files (*.xml)");
410+
filters << tr("All files (*)");
411+
400412
QString selectedFilter;
401-
auto filename = QFileDialog::getSaveFileName(this, QString(), _savePath, tr("XML files (*.xml);;All files (*)"), &selectedFilter);
413+
auto filename = QFileDialog::getSaveFileName(this, QString(), _savePath, filters.join(";;"), &selectedFilter);
402414

403415
if(filename.isEmpty()) return;
404416

405417
auto format = SerializationFormat::Binary;
406-
if(selectedFilter == tr("XML files (*.xml)")) {
418+
if(selectedFilter == filters[0]) {
407419
format = SerializationFormat::Xml;
408420
if(!filename.endsWith(".xml", Qt::CaseInsensitive)) {
409421
filename.append(".xml");
@@ -419,7 +431,11 @@ void MainWindow::on_actionSaveTestConfig_triggered()
419431
///
420432
void MainWindow::on_actionRestoreTestConfig_triggered()
421433
{
422-
const auto filename = QFileDialog::getOpenFileName(this, QString(), _savePath, tr("XML files (*.xml);;All files (*)"));
434+
QStringList filters;
435+
filters << tr("XML files (*.xml)");
436+
filters << tr("All files (*)");
437+
438+
const auto filename = QFileDialog::getOpenFileName(this, QString(), _savePath, filters.join(";;"));
423439
if(filename.isEmpty()) return;
424440

425441
_savePath = QFileInfo(filename).absoluteDir().absolutePath();

‎omodsim/translations/omodsim_ru.ts‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,25 +1753,23 @@ Script.onInit(()=&gt;{
17531753
<translation>Шестнадцатиричные адреса</translation>
17541754
</message>
17551755
<message>
1756+
<location filename="../mainwindow.cpp" line="332"/>
1757+
<location filename="../mainwindow.cpp" line="380"/>
1758+
<location filename="../mainwindow.cpp" line="410"/>
1759+
<location filename="../mainwindow.cpp" line="436"/>
17561760
<source>All files (*)</source>
1757-
<translation type="vanished">Все файлы (*)</translation>
1761+
<translation>Все файлы (*)</translation>
17581762
</message>
17591763
<message>
1760-
<location filename="../mainwindow.cpp" line="330"/>
1761-
<location filename="../mainwindow.cpp" line="377"/>
1762-
<location filename="../mainwindow.cpp" line="401"/>
1763-
<location filename="../mainwindow.cpp" line="422"/>
1764-
<source>XML files (*.xml);;All files (*)</source>
1765-
<translation type="unfinished"></translation>
1766-
</message>
1767-
<message>
1768-
<location filename="../mainwindow.cpp" line="382"/>
1769-
<location filename="../mainwindow.cpp" line="406"/>
1764+
<location filename="../mainwindow.cpp" line="331"/>
1765+
<location filename="../mainwindow.cpp" line="379"/>
1766+
<location filename="../mainwindow.cpp" line="409"/>
1767+
<location filename="../mainwindow.cpp" line="435"/>
17701768
<source>XML files (*.xml)</source>
17711769
<translation type="unfinished"></translation>
17721770
</message>
17731771
<message>
1774-
<location filename="../mainwindow.cpp" line="1311"/>
1772+
<location filename="../mainwindow.cpp" line="1327"/>
17751773
<source>Capture Error:<byte value="xd"/>
17761774
%1</source>
17771775
<translation>Ошибка захвата:

‎omodsim/translations/omodsim_zh.ts‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1761,25 +1761,23 @@ Script.onInit(()=&gt;{
17611761
<translation type="vanished">俄语</translation>
17621762
</message>
17631763
<message>
1764+
<location filename="../mainwindow.cpp" line="332"/>
1765+
<location filename="../mainwindow.cpp" line="380"/>
1766+
<location filename="../mainwindow.cpp" line="410"/>
1767+
<location filename="../mainwindow.cpp" line="436"/>
17641768
<source>All files (*)</source>
1765-
<translation type="vanished">所有文件 (*)</translation>
1769+
<translation>所有文件 (*)</translation>
17661770
</message>
17671771
<message>
1768-
<location filename="../mainwindow.cpp" line="330"/>
1769-
<location filename="../mainwindow.cpp" line="377"/>
1770-
<location filename="../mainwindow.cpp" line="401"/>
1771-
<location filename="../mainwindow.cpp" line="422"/>
1772-
<source>XML files (*.xml);;All files (*)</source>
1773-
<translation type="unfinished"></translation>
1774-
</message>
1775-
<message>
1776-
<location filename="../mainwindow.cpp" line="382"/>
1777-
<location filename="../mainwindow.cpp" line="406"/>
1772+
<location filename="../mainwindow.cpp" line="331"/>
1773+
<location filename="../mainwindow.cpp" line="379"/>
1774+
<location filename="../mainwindow.cpp" line="409"/>
1775+
<location filename="../mainwindow.cpp" line="435"/>
17781776
<source>XML files (*.xml)</source>
17791777
<translation type="unfinished"></translation>
17801778
</message>
17811779
<message>
1782-
<location filename="../mainwindow.cpp" line="1311"/>
1780+
<location filename="../mainwindow.cpp" line="1327"/>
17831781
<source>Capture Error:<byte value="xd"/>
17841782
%1</source>
17851783
<translation>捕获错误：

0 commit comments

Comments
 (0)