Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move network diagram to System menu in Manager

Browse Source
This commit is contained in:
unman 2017-01-28 03:15:58 +00:00
parent a72003f44b
commit 4b31b206ef
No known key found for this signature in database
GPG Key ID: FDD1B8244731B36C
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
about.ui
View File

@ -88,13 +88,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="networkNotes">
<property name="text">
<string>Qubes Networking</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="ok"> <widget class="QPushButton" name="ok">
<property name="text"> <property name="text">

10
mainwindow.ui
View File

@ -279,6 +279,7 @@
<string>&amp;System</string> <string>&amp;System</string>
</property> </property>
<addaction name="action_global_settings"/> <addaction name="action_global_settings"/>
<addaction name="action_show_network"/>
<addaction name="action_backup"/> <addaction name="action_backup"/>
<addaction name="action_restore"/> <addaction name="action_restore"/>
</widget> </widget>
@ -697,6 +698,15 @@
<string>&amp;Global settings</string> <string>&amp;Global settings</string>
</property> </property>
</action> </action>
<action name="action_show_network">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/networking.png</normaloff>:/networking.png</iconset>
</property>
<property name="text">
<string>&amp;Qubes Network</string>
</property>
</action>
<action name="action_state"> <action name="action_state">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>

8
qubesmanager/about.py
View File

@ -25,7 +25,6 @@ from PyQt4.QtCore import SIGNAL, SLOT
from PyQt4.QtGui import QDialog, QIcon from PyQt4.QtGui import QDialog, QIcon
from qubesmanager.releasenotes import ReleaseNotesDialog from qubesmanager.releasenotes import ReleaseNotesDialog
from qubesmanager.informationnotes import InformationNotesDialog from qubesmanager.informationnotes import InformationNotesDialog
from qubesmanager.networknotes import NetworkNotesDialog
from ui_about import * from ui_about import *
@ -46,8 +45,6 @@ class AboutDialog(Ui_AboutDialog, QDialog):
self.on_release_notes_clicked) self.on_release_notes_clicked)
self.connect(self.informationNotes, SIGNAL("clicked()"), self.connect(self.informationNotes, SIGNAL("clicked()"),
self.on_information_notes_clicked) self.on_information_notes_clicked)
self.connect(self.networkNotes, SIGNAL("clicked()"),
self.on_network_notes_clicked)
def on_release_notes_clicked(self): def on_release_notes_clicked(self):
release_notes_dialog = ReleaseNotesDialog() release_notes_dialog = ReleaseNotesDialog()
@ -58,8 +55,3 @@ class AboutDialog(Ui_AboutDialog, QDialog):
information_notes_dialog = InformationNotesDialog() information_notes_dialog = InformationNotesDialog()
information_notes_dialog.exec_() information_notes_dialog.exec_()
self.accept() self.accept()
def on_network_notes_clicked(self):
network_notes_dialog = NetworkNotesDialog()
network_notes_dialog.exec_()
self.accept()

6
qubesmanager/main.py
View File

@ -55,6 +55,7 @@ from settings import VMSettingsWindow
from restore import RestoreVMsWindow from restore import RestoreVMsWindow
from backup import BackupVMsWindow from backup import BackupVMsWindow
from global_settings import GlobalSettingsWindow from global_settings import GlobalSettingsWindow
from networknotes import NetworkNotesDialog
from log_dialog import LogDialog from log_dialog import LogDialog
from thread_monitor import * from thread_monitor import *
from clipboard import * from clipboard import *
@ -1560,6 +1561,11 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
global_settings_window = GlobalSettingsWindow(app, self.qvm_collection) global_settings_window = GlobalSettingsWindow(app, self.qvm_collection)
global_settings_window.exec_() global_settings_window.exec_()
@pyqtSlot(name='on_action_show_network_triggered')
def action_show_network_triggered(self):
network_notes_dialog = NetworkNotesDialog()
network_notes_dialog.exec_()
@pyqtSlot(name='on_action_restore_triggered') @pyqtSlot(name='on_action_restore_triggered')
def action_restore_triggered(self): def action_restore_triggered(self):
restore_window = RestoreVMsWindow(app, self.qvm_collection, restore_window = RestoreVMsWindow(app, self.qvm_collection,

3
qubesmanager/networknotes.py
View File

@ -35,3 +35,6 @@ class NetworkNotesDialog(Ui_NetworkNotesDialog, QDialog):
self.setupUi(self) self.setupUi(self)
details = subprocess.check_output(['/usr/libexec/qubes-manager/qvm_net.py']) details = subprocess.check_output(['/usr/libexec/qubes-manager/qvm_net.py'])
self.networkNotes.setText(details) self.networkNotes.setText(details)
def accept(self):
QDialog.accept(self)