Added button for LogView

Author: serhmarch

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5) # 2.2 - case insensitive syntax
 
-project(ModbusTools VERSION 0.3.7 LANGUAGES CXX)
+project(ModbusTools VERSION 0.3.8 LANGUAGES CXX)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")

changelog.md

@@ -92,3 +92,7 @@
 * Added menu `File->Recent` to quick open previous projects
 * Added menu `File->Close` to close current project
 * Fixed Client Scanner for Modbus TCP scanning
+
+# 0.3.8
+
+* Added `Export` button for LogView

src/client/win_resource.rc

@@ -3,8 +3,8 @@
 IDI_ICON1	ICON	DISCARDABLE	"gui\\icons\\client.ico"
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,3,7,0
-	PRODUCTVERSION 0,3,7,0
+	FILEVERSION 0,3,8,0
+	PRODUCTVERSION 0,3,8,0
 	FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 	FILEFLAGS VS_FF_DEBUG
@@ -21,11 +21,11 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "\0"
 				VALUE "FileDescription", "\0"
-				VALUE "FileVersion", "0.3.7.0\0"
+				VALUE "FileVersion", "0.3.8.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "client.exe\0"
 				VALUE "ProductName", "client\0"
-				VALUE "ProductVersion", "0.3.7.0\0"
+				VALUE "ProductVersion", "0.3.8.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"

src/core/gui/core_logview.cpp

@@ -26,6 +26,10 @@
 #include <QPlainTextEdit>
 #include <QToolBar>
 
+#include <core.h>
+#include <gui/core_ui.h>
+#include <gui/dialogs/core_dialogs.h>
+
 mbCoreLogView::mbCoreLogView(QWidget *parent)
     : QWidget{parent}
 {
@@ -41,6 +45,11 @@ mbCoreLogView::mbCoreLogView(QWidget *parent)
     connect(actionClear, &QAction::triggered, this, &mbCoreLogView::clear);
     m_toolBar->addAction(actionClear);
 
+    QAction *actionExportLog = new QAction(m_toolBar);
+    actionExportLog->setIcon(QIcon(":/core/icons/logexport.png"));
+    connect(actionExportLog, &QAction::triggered, this, &mbCoreLogView::exportLog);
+    m_toolBar->addAction(actionExportLog);
+
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setSpacing(0);
     layout->setContentsMargins(0,0,0,0);
@@ -54,6 +63,19 @@ void mbCoreLogView::clear()
     m_text->clear();
 }
 
+void mbCoreLogView::exportLog()
+{
+    mbCoreUi *ui = mbCore::globalCore()->coreUi();
+    QString fileName =ui->dialogsCore()->getSaveFileName(ui, QStringLiteral("Export Log"), QString(), QStringLiteral("Text files (*.txt);;All files (*)"));
+    if (fileName.isEmpty())
+        return;
+    QFile file(fileName);
+    if (!file.open(QFile::WriteOnly))
+        return;
+    file.write(m_text->toPlainText().toUtf8());
+    file.close();
+}
+
 void mbCoreLogView::showMessage(const QString &message)
 {
     m_text->appendPlainText(message);

src/core/gui/core_logview.h

@@ -36,6 +36,7 @@ class mbCoreLogView : public QWidget
 
 public Q_SLOTS:
     void clear();
+    void exportLog();
     void showMessage(const QString& message);
 
 Q_SIGNALS:

src/core/gui/core_rsc.qrc

@@ -21,5 +21,6 @@
         <file>icons/dataviewitem.png</file>
         <file>icons/arrow_down.png</file>
         <file>icons/arrow_up.png</file>
+        <file>icons/logexport.png</file>
     </qresource>
 </RCC>

src/core/gui/icons/logexport.png

@@ -1,19 +1,19 @@
-#ifndef MBCORE_CONFIG_H
-#define MBCORE_CONFIG_H
-
-/*
-   Major part of mbtools version
-*/
-#define MBTOOLS_VERSION_MAJOR 0
-
-/*
-   Minor part of mbtools version
-*/
-#define MBTOOLS_VERSION_MINOR 3
-
-/*
-   Patch part of mbtools version
-*/
-#define MBTOOLS_VERSION_PATCH 7
-
-#endif // MBCORE_CONFIG_H
+#ifndef MBCORE_CONFIG_H
+#define MBCORE_CONFIG_H
+
+/*
+   Major part of mbtools version
+*/
+#define MBTOOLS_VERSION_MAJOR 0
+
+/*
+   Minor part of mbtools version
+*/
+#define MBTOOLS_VERSION_MINOR 3
+
+/*
+   Patch part of mbtools version
+*/
+#define MBTOOLS_VERSION_PATCH 8
+
+#endif // MBCORE_CONFIG_H

src/core/sdk/mbcore_config.h

@@ -3,8 +3,8 @@
 
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,3,7,0
-	PRODUCTVERSION 0,3,7,0
+	FILEVERSION 0,3,8,0
+	PRODUCTVERSION 0,3,8,0
 	FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 	FILEFLAGS VS_FF_DEBUG
@@ -21,11 +21,11 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "\0"
 				VALUE "FileDescription", "\0"
-				VALUE "FileVersion", "0.3.7.0\0"
+				VALUE "FileVersion", "0.3.8.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "core.dll\0"
 				VALUE "ProductName", "core\0"
-				VALUE "ProductVersion", "0.3.7.0\0"
+				VALUE "ProductVersion", "0.3.8.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"

src/core/win_resource.rc

@@ -3,8 +3,8 @@
 IDI_ICON1	ICON	DISCARDABLE	"gui\\icons\\server.ico"
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,3,7,0
-	PRODUCTVERSION 0,3,7,0
+	FILEVERSION 0,3,8,0
+	PRODUCTVERSION 0,3,8,0
 	FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 	FILEFLAGS VS_FF_DEBUG
@@ -21,11 +21,11 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "\0"
 				VALUE "FileDescription", "\0"
-				VALUE "FileVersion", "0.3.7.0\0"
+				VALUE "FileVersion", "0.3.8.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "server.exe\0"
 				VALUE "ProductName", "server\0"
-				VALUE "ProductVersion", "0.3.7.0\0"
+				VALUE "ProductVersion", "0.3.8.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"