linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUI: allow starting in detailed view by cmdline flag

Browse Source 
Change-Id: I4248bfee47d807833e02a35ce8dd85fa6b297e77
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34296
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
This commit is contained in:
Georg Brandl
2024-08-05 10:45:24 +02:00
committed by Markus Zolliker
parent f2940d3f23
commit c272a8d619
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/frappy-gui
View File

@ -46,8 +46,11 @@ def parseArgv(argv):
loggroup.add_argument('-q', '--quiet', loggroup.add_argument('-q', '--quiet',
help='Supress everything but errors', help='Supress everything but errors',
action='store_true', default=False) action='store_true', default=False)
parser.add_argument('-D', '--detailed',
help='Start in detailed mode',
action='store_true', default=False)
parser.add_argument('node', parser.add_argument('node',
help='Nodes the Gui should connect to.\n', metavar='host[:port]', help='Nodes the GUI should connect to.\n', metavar='host[:port]',
nargs='*', type=str, default=[]) nargs='*', type=str, default=[])
return parser.parse_args(argv) return parser.parse_args(argv)
@ -67,7 +70,7 @@ def main(argv=None):
app = QApplication(argv) app = QApplication(argv)
win = MainWindow(args.node, logger) win = MainWindow(args, logger)
app.aboutToQuit.connect(win._onQuit) app.aboutToQuit.connect(win._onQuit)
win.show() win.show()

16
frappy/gui/mainwindow.py
View File

@ -88,10 +88,11 @@ class HistorySerializer(QObject):
settings = QSettings() settings = QSettings()
settings.setValue('consoleHistory', self.history) settings.setValue('consoleHistory', self.history)
class MainWindow(QMainWindow): class MainWindow(QMainWindow):
recentNodesChanged = pyqtSignal() recentNodesChanged = pyqtSignal()
def __init__(self, hosts, logger, parent=None): def __init__(self, args, logger, parent=None):
super().__init__(parent) super().__init__(parent)
# centralized handling for logging and cmd-history # centralized handling for logging and cmd-history
@ -104,6 +105,11 @@ class MainWindow(QMainWindow):
loadUi(self, 'mainwin.ui') loadUi(self, 'mainwin.ui')
Colors._setPalette(self.palette()) Colors._setPalette(self.palette())
self._nodeWidgets = {}
if args.detailed:
self.actionDetailed_View.setChecked(True)
self.toolBar.hide() self.toolBar.hide()
self.buildRecentNodeMenu() self.buildRecentNodeMenu()
self.recentNodesChanged.connect(self.buildRecentNodeMenu) self.recentNodesChanged.connect(self.buildRecentNodeMenu)
@ -127,10 +133,8 @@ class MainWindow(QMainWindow):
self.recentNodesChanged.connect(greeter.loadRecent) self.recentNodesChanged.connect(greeter.loadRecent)
self.tab.addPanel(greeter, 'Welcome') self.tab.addPanel(greeter, 'Welcome')
self._nodeWidgets = {}
# add localhost (if available) and SEC nodes given as arguments # add localhost (if available) and SEC nodes given as arguments
self.addNodes(hosts) self.addNodes(args.node)
@pyqtSlot() @pyqtSlot()
def on_actionAbout_triggered(self): def on_actionAbout_triggered(self):
@ -286,10 +290,6 @@ class MainWindow(QMainWindow):
self.tab.setCurrentIndex(curr_idx) self.tab.setCurrentIndex(curr_idx)
def _rebuildAdvanced(self, advanced): def _rebuildAdvanced(self, advanced):
if advanced:
pass
else:
pass
for widget in self._nodeWidgets.values(): for widget in self._nodeWidgets.values():
widget._rebuildAdvanced(advanced) widget._rebuildAdvanced(advanced)