Merge remote-tracking branch 'origin/pr/347'

* origin/pr/347:
  Remove old global settings

.pylintrc

@@ -4,7 +4,6 @@ ignore=tests,
     ui_about.py,
     ui_backupdlg.py,
     ui_bootfromdevice.py,
-    ui_globalsettingsdlg.py,
     ui_informationnotes.py,
     ui_logdlg.py,
     ui_multiselectwidget.py,

Makefile

@@ -38,7 +38,6 @@ install:
 	cp qubesmanager/qvm_about.sh $(DESTDIR)/usr/libexec/qubes-manager/
 
 	mkdir -p $(DESTDIR)/usr/share/applications
-	cp qubes-global-settings.desktop $(DESTDIR)/usr/share/applications/
 	cp qubes-vm-create.desktop $(DESTDIR)/usr/share/applications/
 	cp qubes-backup.desktop $(DESTDIR)/usr/share/applications/
 	cp qubes-backup-restore.desktop $(DESTDIR)/usr/share/applications/

README.md

@@ -37,6 +37,3 @@ Located in the tests/ directory.
 
 To run qube manager and backup tests:
     python3 test_name.py -v
-
-To run global settings tests:
-    sudo systemctl stop qubesd; sudo -E python3 test_global_settings.py -v ; sudo systemctl start qubesd

debian/install

@@ -1,4 +1,3 @@
-/usr/bin/qubes-global-settings
 /usr/bin/qubes-vm-settings
 /usr/bin/qubes-vm-create
 /usr/bin/qubes-vm-boot-from-device
@@ -19,7 +18,6 @@
 /usr/lib/*/dist-packages/qubesmanager/backup.py
 /usr/lib/*/dist-packages/qubesmanager/backup_utils.py
 /usr/lib/*/dist-packages/qubesmanager/firewall.py
-/usr/lib/*/dist-packages/qubesmanager/global_settings.py
 /usr/lib/*/dist-packages/qubesmanager/multiselectwidget.py
 /usr/lib/*/dist-packages/qubesmanager/restore.py
 /usr/lib/*/dist-packages/qubesmanager/settings.py
@@ -39,11 +37,8 @@
 
 /usr/lib/*/dist-packages/qubesmanager/resources_rc.py
 
-/usr/lib/*/dist-packages/qubesmanager/global_settings.css
-
 /usr/lib/*/dist-packages/qubesmanager/ui_backupdlg.py
 /usr/lib/*/dist-packages/qubesmanager/ui_bootfromdevice.py
-/usr/lib/*/dist-packages/qubesmanager/ui_globalsettingsdlg.py
 /usr/lib/*/dist-packages/qubesmanager/ui_multiselectwidget.py
 /usr/lib/*/dist-packages/qubesmanager/ui_newappvmdlg.py
 /usr/lib/*/dist-packages/qubesmanager/ui_newfwruledlg.py
@@ -67,15 +62,13 @@
 /usr/lib/*/dist-packages/qubesmanager/tests/__init__.py
 /usr/lib/*/dist-packages/qubesmanager/tests/test_backup.py
 /usr/lib/*/dist-packages/qubesmanager/tests/test_backup_utils.py
-/usr/lib/*/dist-packages/qubesmanager/tests/test_global_settings.py
 /usr/lib/*/dist-packages/qubesmanager/tests/test_qube_manager.py
 /usr/lib/*/dist-packages/qubesmanager/tests/test_create_new_vm.py
 /usr/lib/*/dist-packages/qubesmanager/tests/test_vm_settings.py
 /usr/lib/*/dist-packages/qubesmanager/tests/test_clone_vm.py
 
 /usr/lib/*/dist-packages/qubesmanager-*.egg-info/*
 
-/usr/share/applications/qubes-global-settings.desktop
 /usr/share/applications/qubes-vm-create.desktop
 /usr/share/applications/qubes-backup.desktop
 /usr/share/applications/qubes-backup-restore.desktop

qubesmanager.pro

@@ -3,7 +3,6 @@ SOURCES = \
           ui/backupdlg.ui \
           ui/bootfromdevice.ui \
           ui/devicelist.ui \
-          ui/globalsettingsdlg.ui \
           ui/informationnotes.ui \
           ui/logdlg.ui \
           ui/multiselectwidget.ui \
@@ -24,7 +23,6 @@ SOURCES = \
           qubesmanager/create_new_vm.py \
           qubesmanager/device_list.py \
           qubesmanager/firewall.py \
-          qubesmanager/global_settings.py \
           qubesmanager/informationnotes.py \
           qubesmanager/log_dialog.py \
           qubesmanager/multiselectwidget.py \
@@ -38,7 +36,6 @@ SOURCES = \
           qubesmanager/ui_backupdlg.py \
           qubesmanager/ui_bootfromdevice.py \
           qubesmanager/ui_devicelist.py \
-          qubesmanager/ui_globalsettingsdlg.py \
           qubesmanager/ui_informationnotes.py \
           qubesmanager/ui_logdlg.py \
           qubesmanager/ui_multiselectwidget.py \