Merge pull request #13 from Tyill/signalScript

Signal script
Tyill · May 14, 2019 · 8967765 · 8967765
2 parents 0b652ef + b3feb82
commit 8967765
Show file tree

Hide file tree

Showing 96 changed files with 11,500 additions and 386 deletions.
diff --git a/linux/Dependences/liblua53.so b/linux/Dependences/liblua53.so
diff --git a/man/en/SVManualEN.pdf b/man/en/SVManualEN.pdf
diff --git a/man/en/User manual.docx b/man/en/User manual.docx
diff --git a/man/ru/SVManualRU.pdf b/man/ru/SVManualRU.pdf
diff --git a/man/ru/Руководство пользователя.docx b/man/ru/Руководство пользователя.docx
diff --git a/mswin/Dependences/x64/Debug/lua53.dll b/mswin/Dependences/x64/Debug/lua53.dll
diff --git a/mswin/Dependences/x64/Debug/lua53.lib b/mswin/Dependences/x64/Debug/lua53.lib
diff --git a/mswin/Dependences/x64/Release/lua53.dll b/mswin/Dependences/x64/Release/lua53.dll
diff --git a/mswin/Dependences/x64/Release/lua53.lib b/mswin/Dependences/x64/Release/lua53.lib
diff --git a/mswin/VS12/SVExportPanel/SVExportPanel.vcxproj.user b/mswin/VS12/SVExportPanel/SVExportPanel.vcxproj.user
diff --git a/mswin/VS12/SVGraphPanel/SVGraphPanel.vcxproj.user b/mswin/VS12/SVGraphPanel/SVGraphPanel.vcxproj.user
diff --git a/mswin/VS12/SVMonitor/GeneratedFiles/qrc_resource.cpp b/mswin/VS12/SVMonitor/GeneratedFiles/qrc_resource.cpp
diff --git a/mswin/VS12/SVMonitor/GeneratedFiles/ui_mainwin.h b/mswin/VS12/SVMonitor/GeneratedFiles/ui_mainwin.h
@@ -51,6 +51,7 @@ class Ui_MainWin
     QAction *actionLoadWinState;
     QAction *actionUpFont;
     QAction *actionDnFont;
+    QAction *actionScript;
     QWidget *centralWidget;
     QVBoxLayout *verticalLayout_2;
     QSplitter *splitter;
@@ -139,6 +140,11 @@ class Ui_MainWin
         actionUpFont->setObjectName(QStringLiteral("actionUpFont"));
         actionDnFont = new QAction(MainWin);
         actionDnFont->setObjectName(QStringLiteral("actionDnFont"));
+        actionScript = new QAction(MainWin);
+        actionScript->setObjectName(QStringLiteral("actionScript"));
+        QIcon icon9;
+        icon9.addFile(QStringLiteral(":/SVMonitor/images/script.png"), QSize(), QIcon::Normal, QIcon::Off);
+        actionScript->setIcon(icon9);
         centralWidget = new QWidget(MainWin);
         centralWidget->setObjectName(QStringLiteral("centralWidget"));
         verticalLayout_2 = new QVBoxLayout(centralWidget);
@@ -260,6 +266,7 @@ class Ui_MainWin
         mainToolBar->addAction(actionPrint);
         mainToolBar->addAction(actionExport);
         mainToolBar->addAction(actionNewWin);
+        mainToolBar->addAction(actionScript);
 
         retranslateUi(MainWin);
 
@@ -287,6 +294,7 @@ class Ui_MainWin
         actionUpFont->setShortcut(QApplication::translate("MainWin", "Ctrl+1", 0));
         actionDnFont->setText(QApplication::translate("MainWin", "\320\243\320\274\320\265\320\275\321\214\321\210\320\270\321\202\321\214 \321\200\320\260\320\267\320\274\320\265\321\200 \321\210\321\200\320\270\321\204\321\202\320\260", 0));
         actionDnFont->setShortcut(QApplication::translate("MainWin", "Ctrl+2", 0));
+        actionScript->setText(QApplication::translate("MainWin", "\320\241\320\272\321\200\320\270\320\277\321\202", 0));
         groupBox->setTitle(QString());
         label->setText(QApplication::translate("MainWin", "\320\234\320\276\320\264\321\203\320\273\320\270", 0));
         btnSlowPlay->setText(QApplication::translate("MainWin", "\320\242\320\270\321\205\320\270\320\271 \321\200\320\265\320\266\320\270\320\274", 0));

diff --git a/mswin/VS12/SVMonitor/SVMonitor.vcxproj b/mswin/VS12/SVMonitor/SVMonitor.vcxproj
@@ -317,6 +317,7 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>
     </CustomBuild>
+    <None Include="..\..\..\src\SVMonitor\resources\svmonitor_en.qm" />
     <None Include="..\..\..\src\SVMonitor\resources\svmonitor_en.ts" />
   </ItemGroup>
   <ItemGroup>
@@ -392,7 +393,7 @@
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>$(OutDir);$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5PrintSupportd.lib;Qt5Widgetsd.lib;%(AdditionalDependencies);SVAuxFunc.lib;SVConfig.lib;SVServer.lib;SVGraphPanel.lib;SVExportPanel.lib;sqlite3.lib;Qt5SerialPortd.lib</AdditionalDependencies>
+      <AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5PrintSupportd.lib;Qt5Widgetsd.lib;%(AdditionalDependencies);SVAuxFunc.lib;SVConfig.lib;SVServer.lib;SVGraphPanel.lib;SVExportPanel.lib;SVScriptPanel.lib;sqlite3.lib;Qt5SerialPortd.lib</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
@@ -410,7 +411,7 @@
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>$(OutDir);$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5PrintSupportd.lib;Qt5Widgetsd.lib;%(AdditionalDependencies);SVAuxFunc.lib;SVConfig.lib;SVServer.lib;SVGraphPanel.lib;SVExportPanel.lib;sqlite3.lib;Qt5SerialPortd.lib</AdditionalDependencies>
+      <AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5PrintSupportd.lib;Qt5Widgetsd.lib;%(AdditionalDependencies);SVAuxFunc.lib;SVConfig.lib;SVServer.lib;SVGraphPanel.lib;SVExportPanel.lib;SVScriptPanel.lib;sqlite3.lib;Qt5SerialPortd.lib</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
@@ -427,7 +428,7 @@
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>$(OutDir);$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5PrintSupport.lib;Qt5Widgets.lib;%(AdditionalDependencies);SVAuxFunc.lib;SVConfig.lib;SVServer.lib;SVGraphPanel.lib;SVExportPanel.lib;sqlite3.lib;Qt5SerialPort.lib</AdditionalDependencies>
+      <AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5PrintSupport.lib;Qt5Widgets.lib;%(AdditionalDependencies);SVAuxFunc.lib;SVConfig.lib;SVServer.lib;SVGraphPanel.lib;SVExportPanel.lib;SVScriptPanel.lib;sqlite3.lib;Qt5SerialPort.lib</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
@@ -445,7 +446,7 @@
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>$(OutDir);$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5PrintSupport.lib;Qt5Widgets.lib;%(AdditionalDependencies);SVAuxFunc.lib;SVConfig.lib;SVServer.lib;SVGraphPanel.lib;SVExportPanel.lib;sqlite3.lib;Qt5SerialPort.lib</AdditionalDependencies>
+      <AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5PrintSupport.lib;Qt5Widgets.lib;%(AdditionalDependencies);SVAuxFunc.lib;SVConfig.lib;SVServer.lib;SVGraphPanel.lib;SVExportPanel.lib;SVScriptPanel.lib;sqlite3.lib;Qt5SerialPort.lib</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>

diff --git a/mswin/VS12/SVMonitor/SVMonitor.vcxproj.filters b/mswin/VS12/SVMonitor/SVMonitor.vcxproj.filters
@@ -185,6 +185,9 @@
     <None Include="..\..\..\src\SVMonitor\resources\svmonitor_en.ts">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="..\..\..\src\SVMonitor\resources\svmonitor_en.qm">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\src\SVMonitor\resources\resource.rc">

diff --git a/mswin/VS12/SVMonitor/SVMonitor.vcxproj.user b/mswin/VS12/SVMonitor/SVMonitor.vcxproj.user