GUI: allow starting in detailed view by cmdline flag
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:
@ -46,8 +46,11 @@ def parseArgv(argv):
|
||||
loggroup.add_argument('-q', '--quiet',
|
||||
help='Supress everything but errors',
|
||||
action='store_true', default=False)
|
||||
parser.add_argument('-D', '--detailed',
|
||||
help='Start in detailed mode',
|
||||
action='store_true', default=False)
|
||||
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=[])
|
||||
return parser.parse_args(argv)
|
||||
|
||||
@ -67,7 +70,7 @@ def main(argv=None):
|
||||
|
||||
app = QApplication(argv)
|
||||
|
||||
win = MainWindow(args.node, logger)
|
||||
win = MainWindow(args, logger)
|
||||
app.aboutToQuit.connect(win._onQuit)
|
||||
win.show()
|
||||
|
||||
|
@ -88,10 +88,11 @@ class HistorySerializer(QObject):
|
||||
settings = QSettings()
|
||||
settings.setValue('consoleHistory', self.history)
|
||||
|
||||
|
||||
class MainWindow(QMainWindow):
|
||||
recentNodesChanged = pyqtSignal()
|
||||
|
||||
def __init__(self, hosts, logger, parent=None):
|
||||
def __init__(self, args, logger, parent=None):
|
||||
super().__init__(parent)
|
||||
|
||||
# centralized handling for logging and cmd-history
|
||||
@ -104,6 +105,11 @@ class MainWindow(QMainWindow):
|
||||
loadUi(self, 'mainwin.ui')
|
||||
Colors._setPalette(self.palette())
|
||||
|
||||
self._nodeWidgets = {}
|
||||
|
||||
if args.detailed:
|
||||
self.actionDetailed_View.setChecked(True)
|
||||
|
||||
self.toolBar.hide()
|
||||
self.buildRecentNodeMenu()
|
||||
self.recentNodesChanged.connect(self.buildRecentNodeMenu)
|
||||
@ -127,10 +133,8 @@ class MainWindow(QMainWindow):
|
||||
self.recentNodesChanged.connect(greeter.loadRecent)
|
||||
self.tab.addPanel(greeter, 'Welcome')
|
||||
|
||||
self._nodeWidgets = {}
|
||||
|
||||
# add localhost (if available) and SEC nodes given as arguments
|
||||
self.addNodes(hosts)
|
||||
self.addNodes(args.node)
|
||||
|
||||
@pyqtSlot()
|
||||
def on_actionAbout_triggered(self):
|
||||
@ -286,10 +290,6 @@ class MainWindow(QMainWindow):
|
||||
self.tab.setCurrentIndex(curr_idx)
|
||||
|
||||
def _rebuildAdvanced(self, advanced):
|
||||
if advanced:
|
||||
pass
|
||||
else:
|
||||
pass
|
||||
for widget in self._nodeWidgets.values():
|
||||
widget._rebuildAdvanced(advanced)
|
||||
|
||||
|
Reference in New Issue
Block a user