diff --git a/src/gui/about_dialog/about_dialog.ui b/src/gui/about_dialog/about_dialog.ui index e3e5413fd9f99fa14772543ee9c48c6e8400cbab..c6272cc154c48fcdecd555362cf5007c3a6f4d71 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><!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"> @@ -44,20 +35,10 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">For more information on X!Tandem search tools, see <a href="http://www.thegpm.org/tandem/"><span style=" text-decoration: underline; color:#0000ff;">http://www.thegpm.org/tandem/</span></a></p></body></html></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 73751c8a67deba8a3db2c31320f41ee3731a16c3..8fa0094f5ce16f1f1dc893c0c258295cb9f20a43 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 76d473752b39be3942bdac1a2767167f4fc98713..a7f4671544c6fb35d9d4d9f41b8ded4da921ae2a 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>&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 c39f42a8fb45d209545240027c278813fe124147..86b895adfecf483ccc07e3d2f259d738aa3f51fc 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"; +}