SVViewer

-added link on manual
Tyill · Mar 25, 2020 · d332ed9 · d332ed9
1 parent 6751a48
commit d332ed9
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 56 deletions.
diff --git a/src/SVViewer/forms/mainWin.ui b/src/SVViewer/forms/mainWin.ui
@@ -248,6 +248,7 @@
     <property name="title">
      <string>Помощь</string>
     </property>
+    <addaction name="actionManual"/>
     <addaction name="actionProgram"/>
    </widget>
    <widget class="QMenu" name="menu_3">
@@ -377,6 +378,11 @@
     <string>График</string>
    </property>
   </action>
+  <action name="actionManual">
+   <property name="text">
+    <string>Руководство пользователя</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

diff --git a/src/SVViewer/forms/ui_mainWin.h b/src/SVViewer/forms/ui_mainWin.h
@@ -48,6 +48,7 @@ class Ui_MainWin
     QAction *actionDnFont;
     QAction *actionScript;
     QAction *actionGraphSett;
+    QAction *actionManual;
     QWidget *centralWidget;
     QVBoxLayout *verticalLayout;
     QSplitter *splitter;
@@ -124,6 +125,8 @@ class Ui_MainWin
         actionScript->setIcon(icon6);
         actionGraphSett = new QAction(MainWin);
         actionGraphSett->setObjectName(QStringLiteral("actionGraphSett"));
+        actionManual = new QAction(MainWin);
+        actionManual->setObjectName(QStringLiteral("actionManual"));
         centralWidget = new QWidget(MainWin);
         centralWidget->setObjectName(QStringLiteral("centralWidget"));
         verticalLayout = new QVBoxLayout(centralWidget);
@@ -254,6 +257,7 @@ class Ui_MainWin
         menu->addAction(actionSaveWinState);
         menu->addAction(actionLoadWinState);
         menu->addAction(actionExit);
+        menu_2->addAction(actionManual);
         menu_2->addAction(actionProgram);
         menu_3->addAction(actionUpFont);
         menu_3->addAction(actionDnFont);
@@ -292,6 +296,7 @@ class Ui_MainWin
         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));
         actionGraphSett->setText(QApplication::translate("MainWin", "\320\223\321\200\320\260\321\204\320\270\320\272", 0));
+        actionManual->setText(QApplication::translate("MainWin", "\320\240\321\203\320\272\320\276\320\262\320\276\320\264\321\201\321\202\320\262\320\276 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217", 0));
         groupBox->setTitle(QString());
         btnSortByModule->setText(QApplication::translate("MainWin", "\320\234\320\276\320\264\321\203\320\273\320\270", 0));
         btnSortByGroup->setText(QApplication::translate("MainWin", "\320\223\321\200\321\203\320\277\320\277\321\213", 0));

diff --git a/src/SVViewer/resources/svviewer_en.qm b/src/SVViewer/resources/svviewer_en.qm
diff --git a/src/SVViewer/resources/svviewer_en.ts b/src/SVViewer/resources/svviewer_en.ts
@@ -5,192 +5,208 @@
     <name>MainWin</name>
     <message>
         <location filename="../forms/mainWin.ui" line="14"/>
-        <location filename="../forms/ui_mainWin.h" line="275"/>
+        <location filename="../forms/ui_mainWin.h" line="279"/>
         <source>SVViewer</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../forms/mainWin.ui" line="52"/>
-        <location filename="../forms/ui_mainWin.h" line="296"/>
+        <location filename="../forms/ui_mainWin.h" line="301"/>
         <source>Модули</source>
         <translation>Module</translation>
     </message>
     <message>
         <location filename="../forms/mainWin.ui" line="65"/>
-        <location filename="../forms/ui_mainWin.h" line="297"/>
+        <location filename="../forms/ui_mainWin.h" line="302"/>
         <source>Группы</source>
         <translation>Group</translation>
     </message>
     <message>
         <location filename="../forms/mainWin.ui" line="99"/>
-        <location filename="../forms/ui_mainWin.h" line="302"/>
+        <location filename="../forms/ui_mainWin.h" line="308"/>
         <source>Имя</source>
         <translation>Name</translation>
     </message>
     <message>
         <location filename="../forms/mainWin.ui" line="104"/>
-        <location filename="../forms/ui_mainWin.h" line="301"/>
+        <location filename="../forms/ui_mainWin.h" line="307"/>
         <source>Тип</source>
         <translation>Type</translation>
     </message>
     <message>
         <location filename="../forms/mainWin.ui" line="109"/>
-        <location filename="../forms/ui_mainWin.h" line="300"/>
-        <location filename="../src/mainWin.cpp" line="581"/>
+        <location filename="../forms/ui_mainWin.h" line="306"/>
+        <source>Цвет</source>
+        <translation>Color</translation>
+    </message>
+    <message>
+        <location filename="../forms/mainWin.ui" line="114"/>
+        <location filename="../forms/ui_mainWin.h" line="305"/>
+        <location filename="../src/mainWin.cpp" line="615"/>
         <source>Группа</source>
         <translation>Group</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="114"/>
-        <location filename="../forms/ui_mainWin.h" line="299"/>
+        <location filename="../forms/mainWin.ui" line="119"/>
+        <location filename="../forms/ui_mainWin.h" line="304"/>
         <source>Комментарий</source>
         <translation>Comment</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="236"/>
-        <location filename="../forms/ui_mainWin.h" line="307"/>
+        <location filename="../forms/mainWin.ui" line="241"/>
+        <location filename="../forms/ui_mainWin.h" line="313"/>
         <source>Файл</source>
         <translation>File</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="244"/>
-        <location filename="../forms/ui_mainWin.h" line="308"/>
+        <location filename="../forms/mainWin.ui" line="249"/>
+        <location filename="../forms/ui_mainWin.h" line="314"/>
         <source>Помощь</source>
         <translation>Help</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="250"/>
-        <location filename="../forms/ui_mainWin.h" line="309"/>
+        <location filename="../forms/mainWin.ui" line="256"/>
+        <location filename="../forms/ui_mainWin.h" line="315"/>
         <source>Вид</source>
         <translation>View</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="283"/>
-        <location filename="../forms/ui_mainWin.h" line="278"/>
+        <location filename="../forms/mainWin.ui" line="289"/>
+        <location filename="../forms/ui_mainWin.h" line="282"/>
         <source>Открыть</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="286"/>
-        <location filename="../forms/ui_mainWin.h" line="280"/>
+        <location filename="../forms/mainWin.ui" line="292"/>
+        <location filename="../forms/ui_mainWin.h" line="284"/>
         <source>Ctrl+O</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="291"/>
-        <location filename="../forms/ui_mainWin.h" line="281"/>
+        <location filename="../forms/mainWin.ui" line="297"/>
+        <location filename="../forms/ui_mainWin.h" line="285"/>
         <source>Выход</source>
         <translation>Exit</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="314"/>
-        <location filename="../forms/ui_mainWin.h" line="284"/>
+        <location filename="../forms/mainWin.ui" line="320"/>
+        <location filename="../forms/ui_mainWin.h" line="288"/>
         <source>Печать</source>
         <translation>Print</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="323"/>
-        <location filename="../forms/ui_mainWin.h" line="285"/>
+        <location filename="../forms/mainWin.ui" line="329"/>
+        <location filename="../forms/ui_mainWin.h" line="289"/>
         <source>Экспорт</source>
         <translation>Export</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="332"/>
-        <location filename="../forms/ui_mainWin.h" line="286"/>
+        <location filename="../forms/mainWin.ui" line="338"/>
+        <location filename="../forms/ui_mainWin.h" line="290"/>
         <source>Новое окно</source>
         <translation>New window</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="337"/>
-        <location filename="../forms/ui_mainWin.h" line="287"/>
+        <location filename="../forms/mainWin.ui" line="343"/>
+        <location filename="../forms/ui_mainWin.h" line="291"/>
         <source>Сохранить текущее состояние</source>
         <translation>Save current state</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="342"/>
-        <location filename="../forms/ui_mainWin.h" line="288"/>
+        <location filename="../forms/mainWin.ui" line="348"/>
+        <location filename="../forms/ui_mainWin.h" line="292"/>
         <source>Загрузить состояние окон</source>
         <translation>Load state windows</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="347"/>
-        <location filename="../forms/ui_mainWin.h" line="289"/>
+        <location filename="../forms/mainWin.ui" line="353"/>
+        <location filename="../forms/ui_mainWin.h" line="293"/>
         <source>Увеличить размер шрифта</source>
         <translation>Increase font size</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="350"/>
-        <location filename="../forms/ui_mainWin.h" line="290"/>
+        <location filename="../forms/mainWin.ui" line="356"/>
+        <location filename="../forms/ui_mainWin.h" line="294"/>
         <source>Ctrl+1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="355"/>
-        <location filename="../forms/ui_mainWin.h" line="291"/>
+        <location filename="../forms/mainWin.ui" line="361"/>
+        <location filename="../forms/ui_mainWin.h" line="295"/>
         <source>Уменьшить размер шрифта</source>
         <translation>Decrease font size</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="358"/>
-        <location filename="../forms/ui_mainWin.h" line="292"/>
+        <location filename="../forms/mainWin.ui" line="364"/>
+        <location filename="../forms/ui_mainWin.h" line="296"/>
         <source>Ctrl+2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="367"/>
-        <location filename="../forms/ui_mainWin.h" line="293"/>
+        <location filename="../forms/mainWin.ui" line="373"/>
+        <location filename="../forms/ui_mainWin.h" line="297"/>
         <source>Скрипт</source>
         <translation>Script</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="372"/>
-        <location filename="../forms/ui_mainWin.h" line="294"/>
+        <location filename="../forms/mainWin.ui" line="378"/>
+        <location filename="../forms/ui_mainWin.h" line="298"/>
+        <source>График</source>
+        <translation>Graph</translation>
+    </message>
+    <message>
+        <location filename="../forms/mainWin.ui" line="383"/>
+        <location filename="../forms/ui_mainWin.h" line="299"/>
+        <source>Руководство пользователя</source>
+        <translation>User manual</translation>
+    </message>
+    <message>
         <source>Вид графика</source>
-        <translation>View graphics</translation>
+        <translation type="vanished">View graphics</translation>
     </message>
     <message>
         <source>Добавить</source>
         <translation type="vanished">Add</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="300"/>
-        <location filename="../forms/ui_mainWin.h" line="282"/>
+        <location filename="../forms/mainWin.ui" line="306"/>
+        <location filename="../forms/ui_mainWin.h" line="286"/>
         <source>Статистика</source>
         <translation>Stat</translation>
     </message>
     <message>
-        <location filename="../forms/mainWin.ui" line="305"/>
-        <location filename="../forms/ui_mainWin.h" line="283"/>
+        <location filename="../forms/mainWin.ui" line="311"/>
+        <location filename="../forms/ui_mainWin.h" line="287"/>
         <source>О программе</source>
         <translation>About the program</translation>
     </message>
     <message>
-        <location filename="../src/mainWin.cpp" line="386"/>
+        <location filename="../src/mainWin.cpp" line="413"/>
         <source>Сохранение состояния окон</source>
         <translation>Save state windows</translation>
     </message>
     <message>
-        <location filename="../src/mainWin.cpp" line="432"/>
+        <location filename="../src/mainWin.cpp" line="459"/>
         <source>Загрузка состояния окон</source>
         <translation>Load state windows</translation>
     </message>
     <message>
-        <location filename="../src/mainWin.cpp" line="472"/>
+        <location filename="../src/mainWin.cpp" line="506"/>
         <source>About SVisual</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainWin.cpp" line="473"/>
+        <location filename="../src/mainWin.cpp" line="507"/>
         <source>&lt;h2&gt;SVViewer &lt;/h2&gt;&lt;p&gt;Программное обеспечение предназначенное&lt;p&gt;для анализа сигналов с устройст.&lt;p&gt;2017</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainWin.cpp" line="616"/>
+        <location filename="../src/mainWin.cpp" line="656"/>
         <source>Модуль</source>
         <translation>Module</translation>
     </message>
     <message>
-        <location filename="../src/mainWin.cpp" line="667"/>
+        <location filename="../src/mainWin.cpp" line="713"/>
         <source>Файл не удалось прочитать</source>
         <translation>The file could not be read.</translation>
     </message>
@@ -203,7 +219,7 @@
         <translation type="vanished">Open of file data</translation>
     </message>
     <message>
-        <location filename="../src/mainWin.cpp" line="678"/>
+        <location filename="../src/mainWin.cpp" line="724"/>
         <source>Добавление файлов данных</source>
         <translation>Add of file data</translation>
     </message>

diff --git a/src/SVViewer/src/mainWin.cpp b/src/SVViewer/src/mainWin.cpp
@@ -494,7 +494,14 @@ void MainWin::Connect(){
         }
 
     });
-
+    connect(ui.actionManual, &QAction::triggered, [this]() {
+
+#ifdef SV_EN
+        QDesktopServices::openUrl(QUrl::fromLocalFile(QApplication::applicationDirPath() + "/SVManualEN.pdf"));
+#else
+        QDesktopServices::openUrl(QUrl::fromLocalFile(QApplication::applicationDirPath() + "/SVManualRU.pdf"));
+#endif
+    });    
 	connect(ui.actionProgram, &QAction::triggered, [this]() {
 	QMessageBox::about(this, tr("About SVisual"),
 			tr("<h2>SVViewer </h2>"