diff --git a/about.ui b/about.ui index 623877c..76bf0c9 100644 --- a/about.ui +++ b/about.ui @@ -88,13 +88,6 @@ - - - - Qubes Networking - - - diff --git a/mainwindow.ui b/mainwindow.ui index 1d0f684..e96b33d 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -279,6 +279,7 @@ &System + @@ -697,6 +698,15 @@ &Global settings + + + + :/networking.png:/networking.png + + + &Qubes Network + + true diff --git a/qubesmanager/about.py b/qubesmanager/about.py index fa45328..4d8677d 100644 --- a/qubesmanager/about.py +++ b/qubesmanager/about.py @@ -25,7 +25,6 @@ from PyQt4.QtCore import SIGNAL, SLOT from PyQt4.QtGui import QDialog, QIcon from qubesmanager.releasenotes import ReleaseNotesDialog from qubesmanager.informationnotes import InformationNotesDialog -from qubesmanager.networknotes import NetworkNotesDialog from ui_about import * @@ -46,8 +45,6 @@ class AboutDialog(Ui_AboutDialog, QDialog): self.on_release_notes_clicked) self.connect(self.informationNotes, SIGNAL("clicked()"), self.on_information_notes_clicked) - self.connect(self.networkNotes, SIGNAL("clicked()"), - self.on_network_notes_clicked) def on_release_notes_clicked(self): release_notes_dialog = ReleaseNotesDialog() @@ -58,8 +55,3 @@ class AboutDialog(Ui_AboutDialog, QDialog): information_notes_dialog = InformationNotesDialog() information_notes_dialog.exec_() self.accept() - - def on_network_notes_clicked(self): - network_notes_dialog = NetworkNotesDialog() - network_notes_dialog.exec_() - self.accept() diff --git a/qubesmanager/main.py b/qubesmanager/main.py index 007ae07..5bc6874 100755 --- a/qubesmanager/main.py +++ b/qubesmanager/main.py @@ -55,6 +55,7 @@ from settings import VMSettingsWindow from restore import RestoreVMsWindow from backup import BackupVMsWindow from global_settings import GlobalSettingsWindow +from networknotes import NetworkNotesDialog from log_dialog import LogDialog from thread_monitor import * from clipboard import * @@ -1560,6 +1561,11 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow): global_settings_window = GlobalSettingsWindow(app, self.qvm_collection) 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') def action_restore_triggered(self): restore_window = RestoreVMsWindow(app, self.qvm_collection, diff --git a/qubesmanager/networknotes.py b/qubesmanager/networknotes.py index 2133c41..8aa03ee 100644 --- a/qubesmanager/networknotes.py +++ b/qubesmanager/networknotes.py @@ -35,3 +35,6 @@ class NetworkNotesDialog(Ui_NetworkNotesDialog, QDialog): self.setupUi(self) details = subprocess.check_output(['/usr/libexec/qubes-manager/qvm_net.py']) self.networkNotes.setText(details) + + def accept(self): + QDialog.accept(self)