diff --git a/Makefile b/Makefile
index df8c4b2..28f3a5a 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ res:
pyuic4 -o qubesmanager/ui_settingsdlg.py settingsdlg.ui
pyuic4 -o qubesmanager/ui_restoredlg.py restoredlg.ui
pyuic4 -o qubesmanager/ui_backupdlg.py backupdlg.ui
+ pyuic4 -o qubesmanager/ui_globalsettingsdlg.py globalsettingsdlg.ui
update-repo-current:
ln -f $(RPMS_DIR)/x86_64/qubes-manager-*$(VERSION)*.rpm ../yum/current-release/current/dom0/rpm/
diff --git a/globalsettingsdlg.ui b/globalsettingsdlg.ui
new file mode 100644
index 0000000..850361c
--- /dev/null
+++ b/globalsettingsdlg.ui
@@ -0,0 +1,126 @@
+
+
+ GlobalSettings
+
+
+
+ 0
+ 0
+ 568
+ 342
+
+
+
+ Qubes Global Settings
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ UpdateVM:
+
+
+
+ -
+
+
+ -
+
+
+ ClockVM:
+
+
+
+ -
+
+
+ -
+
+
+ Default netVM:
+
+
+
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Default template:
+
+
+
+ -
+
+
+ -
+
+
+ Default kernel:
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ GlobalSettings
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ GlobalSettings
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/mainwindow.ui b/mainwindow.ui
index 59e2da6..b5e8fdf 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -186,6 +186,7 @@
Options
+
@@ -516,6 +517,11 @@
Backup VMs
+
+
+ Global settings
+
+
diff --git a/qubesmanager/global_settings.py b/qubesmanager/global_settings.py
new file mode 100644
index 0000000..373ddff
--- /dev/null
+++ b/qubesmanager/global_settings.py
@@ -0,0 +1,107 @@
+#!/usr/bin/python2.6
+#
+# The Qubes OS Project, http://www.qubes-os.org
+#
+# Copyright (C) 2012 Agnieszka Kostrzewa
+# Copyright (C) 2012 Marek Marczykowski
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+#
+
+import sys
+import os
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+
+from qubes.qubes import QubesVmCollection
+from qubes.qubes import QubesException
+from qubes.qubes import QubesDaemonPidfile
+from qubes.qubes import QubesHost
+
+import qubesmanager.resources_rc
+
+from pyinotify import WatchManager, Notifier, ThreadedNotifier, EventsCodes, ProcessEvent
+
+import subprocess
+import time
+import threading
+from operator import itemgetter
+
+from ui_globalsettingsdlg import *
+
+class GlobalSettingsWindow(Ui_GlobalSettings, QDialog):
+
+ def __init__(self, parent=None):
+ super(GlobalSettingsWindow, self).__init__(parent)
+
+ self.setupUi(self)
+
+ def reject(self):
+ self.done(0)
+
+ def save_and_apply(self):
+ pass
+
+# Bases on the original code by:
+# Copyright (c) 2002-2007 Pascal Varet
+
+def handle_exception( exc_type, exc_value, exc_traceback ):
+ import sys
+ import os.path
+ import traceback
+
+ filename, line, dummy, dummy = traceback.extract_tb( exc_traceback ).pop()
+ filename = os.path.basename( filename )
+ error = "%s: %s" % ( exc_type.__name__, exc_value )
+
+ QMessageBox.critical(None, "Houston, we have a problem...",
+ "Whoops. A critical error has occured. This is most likely a bug "
+ "in Qubes Global Settings application.
"
+ "%s" % error +
+ "at line %d of file %s.
"
+ % ( line, filename ))
+
+
+def main():
+
+ global qubes_host
+ qubes_host = QubesHost()
+
+ global app
+ app = QApplication(sys.argv)
+ app.setOrganizationName("The Qubes Project")
+ app.setOrganizationDomain("http://qubes-os.org")
+ app.setApplicationName("Qubes Global Settings")
+
+ sys.excepthook = handle_exception
+
+ qvm_collection = QubesVmCollection()
+ qvm_collection.lock_db_for_reading()
+ qvm_collection.load()
+ qvm_collection.unlock_db()
+
+ global global_window
+ global_window = GlobalSetingsWindow()
+
+ global_window.show()
+
+ app.exec_()
+ app.exit()
+
+
+
+if __name__ == "__main__":
+ main()
diff --git a/qubesmanager/main.py b/qubesmanager/main.py
index 144a09a..183fb24 100755
--- a/qubesmanager/main.py
+++ b/qubesmanager/main.py
@@ -42,6 +42,7 @@ from appmenu_select import AppmenuSelectWindow
from settings import VMSettingsWindow
from restore import RestoreVMsWindow
from backup import BackupVMsWindow
+from global_settings import GlobalSettingsWindow
from firewall import EditFwRulesDlg, QubesFirewallRulesModel
@@ -958,6 +959,11 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
if dialog.exec_():
model.apply_rules()
+ @pyqtSlot(name='on_action_global_settings_triggered')
+ def action_global_settings_triggered(self):
+ global_settings_window = GlobalSettingsWindow()
+ global_settings_window.exec_()
+
@pyqtSlot(name='on_action_restore_triggered')
def action_restore_triggered(self):