gui: add about dialog, remove "about Qt" menu entry
Change-Id: I483cc8cbe67cff6d0e14ff9ce198cc50bebb7cf8 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30567 Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de> Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
This commit is contained in:
parent
dbf4ad373e
commit
3aaa12eee1
@ -21,8 +21,8 @@
|
|||||||
#
|
#
|
||||||
# *****************************************************************************
|
# *****************************************************************************
|
||||||
|
|
||||||
|
|
||||||
import frappy.client
|
import frappy.client
|
||||||
|
import frappy.version
|
||||||
from frappy.gui.qt import QInputDialog, QMainWindow, QMessageBox, QObject, \
|
from frappy.gui.qt import QInputDialog, QMainWindow, QMessageBox, QObject, \
|
||||||
QTreeWidgetItem, pyqtSignal, pyqtSlot, QWidget, QSettings, QAction, \
|
QTreeWidgetItem, pyqtSignal, pyqtSlot, QWidget, QSettings, QAction, \
|
||||||
QShortcut, QKeySequence
|
QShortcut, QKeySequence
|
||||||
@ -192,6 +192,31 @@ class MainWindow(QMainWindow):
|
|||||||
self.recentNodesChanged.connect(greeter.loadRecent)
|
self.recentNodesChanged.connect(greeter.loadRecent)
|
||||||
self.tab.addPanel(greeter, 'Welcome')
|
self.tab.addPanel(greeter, 'Welcome')
|
||||||
|
|
||||||
|
@pyqtSlot()
|
||||||
|
def on_actionAbout_triggered(self):
|
||||||
|
try:
|
||||||
|
ver = frappy.version.get_version()
|
||||||
|
except Exception:
|
||||||
|
ver = 'unknown'
|
||||||
|
|
||||||
|
QMessageBox.about(
|
||||||
|
self, 'About Frappy GUI',
|
||||||
|
f'''
|
||||||
|
<h2>About Frappy GUI</h2>
|
||||||
|
<p>A graphical client for the SECoP protocol.</p>
|
||||||
|
<p>© 2017-2023 Frappy contributors:</p>
|
||||||
|
<ul>
|
||||||
|
<li><a href="mailto:markus.zolliker@psi.ch">Markus Zolliker</a></li>
|
||||||
|
<li><a href="mailto:enrico.faulhaber@frm2.tum.de">Enrico Faulhaber</a></li>
|
||||||
|
<li><a href="mailto:a.zaft@fz-juelich.de">Alexander Zaft</a></li>
|
||||||
|
<li><a href="mailto:g.brandl@fz-juelich.de">Georg Brandl</a></li>
|
||||||
|
</ul>
|
||||||
|
<p>Frappy is available under the
|
||||||
|
<a href="http://www.gnu.org/licenses/gpl.html">GNU General
|
||||||
|
Public License</a> version 2.0 or later.</p>
|
||||||
|
<p style="font-weight: bold">Version: v{ver}</p>
|
||||||
|
''')
|
||||||
|
|
||||||
@pyqtSlot()
|
@pyqtSlot()
|
||||||
def on_actionAdd_SEC_node_triggered(self):
|
def on_actionAdd_SEC_node_triggered(self):
|
||||||
host, ok = QInputDialog.getText(self, 'Add SEC node',
|
host, ok = QInputDialog.getText(self, 'Add SEC node',
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1228</width>
|
<width>1228</width>
|
||||||
<height>30</height>
|
<height>31</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="menuFile">
|
<widget class="QMenu" name="menuFile">
|
||||||
@ -50,7 +50,6 @@
|
|||||||
<string>Help</string>
|
<string>Help</string>
|
||||||
</property>
|
</property>
|
||||||
<addaction name="actionAbout"/>
|
<addaction name="actionAbout"/>
|
||||||
<addaction name="actionAbout_Qt"/>
|
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenu" name="menuOptions">
|
<widget class="QMenu" name="menuOptions">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user