From 7c17651b621d615be80443d894ff0d988c52fcc2 Mon Sep 17 00:00:00 2001 From: Mat3o Date: Mon, 15 Jun 2020 14:19:02 +0200 Subject: [PATCH 1/3] add default file extensions when saving/loading --- src/widgetApp/NetSettingsDialog.cpp | 14 ++++++++++++-- src/widgetApp/RaportDialog.cpp | 12 +++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/widgetApp/NetSettingsDialog.cpp b/src/widgetApp/NetSettingsDialog.cpp index 970d717..3877c9d 100644 --- a/src/widgetApp/NetSettingsDialog.cpp +++ b/src/widgetApp/NetSettingsDialog.cpp @@ -58,8 +58,13 @@ void NetSettingsDialog::clearData() void NetSettingsDialog::readData(bool isIpv6) { + QString dir = QCoreApplication::applicationDirPath(); + + QString filters("JSON files (*.json);;All files (*.*)"); + QString defaultFilter("JSON files (*.json)"); + FileIO fileIO; - QString path = QFileDialog::getOpenFileName(this); + QString path = QFileDialog::getOpenFileName(nullptr, tr("Load state..."), dir, filters, &defaultFilter); if(path != nullptr) { @@ -77,8 +82,13 @@ void NetSettingsDialog::readData(bool isIpv6) void NetSettingsDialog::saveData(bool isIpv6) { + QString dir = QCoreApplication::applicationDirPath(); + + QString filters("JSON files (*.json);;All files (*.*)"); + QString defaultFilter("JSON files (*.json)"); + FileIO fileIO; - QString path = QFileDialog::getSaveFileName(this); + QString path = QFileDialog::getSaveFileName(nullptr, tr("Save state..."), dir, filters, &defaultFilter); if(path != nullptr) { diff --git a/src/widgetApp/RaportDialog.cpp b/src/widgetApp/RaportDialog.cpp index cfbb313..8a35027 100644 --- a/src/widgetApp/RaportDialog.cpp +++ b/src/widgetApp/RaportDialog.cpp @@ -55,11 +55,17 @@ void RaportDialog::injectData(const std::shared_ptr& net4, std::unique } void RaportDialog::on_saveButton_clicked() -{ +{ QString dir = QCoreApplication::applicationDirPath(); - QString filename = QFileDialog::getSaveFileName(this); + QString fileName = "DesignYourNetwork_report.txt"; + QString fullPath = dir + '/' + fileName; + + QString filters("Text files (*.txt);;All files (*.*)"); + QString defaultFilter("Text files (*.txt)"); + + QString saveFileName = QFileDialog::getSaveFileName(nullptr, tr("Save report as..."), fullPath, filters, &defaultFilter); - reportGenerator->save(filename); + reportGenerator->save(saveFileName); } void RaportDialog::on_checkBox_toggled(bool checked) From 5998c5eaf56450b6065f53bc617b4d3357d551b7 Mon Sep 17 00:00:00 2001 From: Mat3o Date: Mon, 15 Jun 2020 14:19:31 +0200 Subject: [PATCH 2/3] add manual text --- src/widgetApp/ManualDialog.ui | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/widgetApp/ManualDialog.ui b/src/widgetApp/ManualDialog.ui index 9d5563b..f182798 100644 --- a/src/widgetApp/ManualDialog.ui +++ b/src/widgetApp/ManualDialog.ui @@ -65,6 +65,22 @@ 261 + + true + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">1. Choose IP protocol version.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">2. Fill input boxes with required data.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">3. Press &quot;Calculate&quot; button.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">4. Draw your subnetworks by pressing &quot;Draw&quot; button.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">5. You can easily custimoze Names for subnetworks and Hosts, which takes effect in report and during saving state.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">6. You can save informations about subnetworks by pressing &quot;Save&quot; button in &quot;Report&quot; window both general and specific depending on the choice in the window.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">7. Whether subnetworks meet your requirments you can save them state by choosing &quot;Save&quot; from menu. &quot;Later&quot; you can Load these.</p></body></html> + From 42322e1d43145496b8901aeb22988be90a497a32 Mon Sep 17 00:00:00 2001 From: Mat3o Date: Mon, 15 Jun 2020 14:30:27 +0200 Subject: [PATCH 3/3] fix header guard --- src/core/Host.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/Host.h b/src/core/Host.h index b522d1c..a5d85fb 100644 --- a/src/core/Host.h +++ b/src/core/Host.h @@ -1,6 +1,6 @@ #pragma once #ifndef HOST_H -#define HOSTH +#define HOST_H #include #include