From 5097446572fb90b8e39d4885452a36dfffd49000 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Sun, 20 Aug 2017 18:43:12 +0200
Subject: [PATCH] first about dialog

---
 src/gui/about_dialog/about_dialog.ui | 33 ++++++----------------------
 src/gui/about_dialog/aboutdialog.cpp |  1 +
 src/gui/main.ui                      | 19 +++++++++++++++-
 src/gui/mainwindow.cpp               | 12 ++++++++++
 4 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/gui/about_dialog/about_dialog.ui b/src/gui/about_dialog/about_dialog.ui
index e3e5413f..c6272cc1 100644
--- a/src/gui/about_dialog/about_dialog.ui
+++ b/src/gui/about_dialog/about_dialog.ui
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>AboutDialog</class>
  <widget class="QDialog" name="AboutDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -20,19 +23,7 @@
       <layout class="QHBoxLayout" name="horizontalLayout"/>
      </item>
      <item>
-      <widget class="QTextEdit" name="textEdit">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="acceptDrops">
-        <bool>false</bool>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Sunken</enum>
-       </property>
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
+      <widget class="QTextBrowser" name="textBrowser">
        <property name="html">
         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -44,20 +35,10 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;For more information on X!Tandem search tools, see &lt;a href=&quot;http://www.thegpm.org/tandem/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.thegpm.org/tandem/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
+       <property name="openExternalLinks">
+        <bool>true</bool>
        </property>
-      </spacer>
+      </widget>
      </item>
     </layout>
    </item>
diff --git a/src/gui/about_dialog/aboutdialog.cpp b/src/gui/about_dialog/aboutdialog.cpp
index 73751c8a..8fa0094f 100644
--- a/src/gui/about_dialog/aboutdialog.cpp
+++ b/src/gui/about_dialog/aboutdialog.cpp
@@ -23,6 +23,7 @@
 
 #include "aboutdialog.h"
 #include <QDebug>
+#include "ui_about_dialog.h"
 
 AboutDialog::AboutDialog(QWidget * parent):
     QDialog(parent),
diff --git a/src/gui/main.ui b/src/gui/main.ui
index 76d47375..a7f46715 100644
--- a/src/gui/main.ui
+++ b/src/gui/main.ui
@@ -123,7 +123,7 @@
   </action>
   <action name="actionAbout">
    <property name="text">
-    <string>About</string>
+    <string>&amp;About</string>
    </property>
   </action>
  </widget>
@@ -291,6 +291,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionAbout</sender>
+   <signal>triggered()</signal>
+   <receiver>Main</receiver>
+   <slot>doActionAbout()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>231</x>
+     <y>191</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>selectXpipFile()</slot>
@@ -303,5 +319,6 @@
   <slot>doActionLabelingMethods()</slot>
   <slot>doActionFasta()</slot>
   <slot>doActionSpectralCountingMcq()</slot>
+  <slot>doActionAbout()</slot>
  </slots>
 </ui>
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index c39f42a8..86b895ad 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -423,3 +423,15 @@ void MainWindow::doActionProticDb() {
     }
     qDebug() << "MainWindow::doActionProticDb end";
 }
+
+void MainWindow::doActionAbout() {
+    qDebug() << "MainWindow::doActionAbout begin";
+    if (_p_about_dialog == nullptr) {
+        _p_about_dialog = new AboutDialog(this);
+    }
+        _p_about_dialog->show();
+        _p_about_dialog->raise();
+        _p_about_dialog->activateWindow();
+        
+    qDebug() << "MainWindow::doActionAbout end";
+}
-- 
GitLab