diff --git a/.gitignore b/.gitignore index 2f0373a7..d47c38f3 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,5 @@ ENV/ *.swp *.~undo-tree~ +*.glade~ +*.glade# diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fdb58181..57510d25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ checks:tests: PYTEST_ADDOPTS: "--color=yes" before_script: &before-script - "PATH=$PATH:$HOME/.local/bin" - - sudo dnf install -y python3-gobject gtk3 python3-pytest gtksourceview4 + - sudo dnf install -y python3-gobject gtk3 python3-pytest gtksourceview4 qubes-artwork python3-coverage xorg-x11-server-Xvfb python3-pip - pip3 install --quiet -r ci/requirements.txt - git clone https://github.com/QubesOS/qubes-core-admin-client ~/core-admin-client diff --git a/Makefile b/Makefile index 9d552f33..80a6bc57 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,8 @@ install-autostart: cp desktop/qubes-global-config.desktop $(DESTDIR)/usr/share/applications/ cp desktop/qubes-new-qube.desktop $(DESTDIR)/usr/share/applications/ cp desktop/qubes-policy-editor-gui.desktop $(DESTDIR)/usr/share/applications/ + cp desktop/qubes-virtual-browser.desktop $(DESTDIR)/usr/share/applications/ + xdg-settings set default-web-browser qubes-virtual-browser.desktop install-lang: mkdir -p $(DESTDIR)/usr/share/gtksourceview-4/language-specs/ diff --git a/desktop/qubes-virtual-browser.desktop b/desktop/qubes-virtual-browser.desktop new file mode 100644 index 00000000..4f8536b6 --- /dev/null +++ b/desktop/qubes-virtual-browser.desktop @@ -0,0 +1,13 @@ +### Note: With this installed, typing "xdg-settings set default-web-browser qubes-virtual-browser.desktop" will make it so that in gnome-terminal +### (typing "xdg-settings set default-web-browser firefox.desktop" will put it back to normal) + +[Desktop Entry] +Version=1.0 +Name=Qubes Virtual Browser +Exec=/usr/bin/qubes-virtual-browser %u +Icon=qubes-manager +Terminal=false +Type=Application +Categories=Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +NoDisplay=true diff --git a/qubes_config/global_config.glade b/qubes_config/global_config.glade index 5bbc12bb..600b25cd 100644 --- a/qubes_config/global_config.glade +++ b/qubes_config/global_config.glade @@ -6251,7 +6251,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, True False - Open URL in Disposable + Qubes Virtual Browser 0 + + + False + True + 2 + + + + + True + False + 10 + + + True + True + False + True + virtual_browser_ask + + + True + False + 10 + + + True + False + Open all URLs in <b>DisposableVM</b>: + True + + + False + True + 0 + + + + + + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + False + True + 3 + + + + + True + True + False + True + virtual_browser_ask + + + True + False + + + True + False + Copy all URLs to <b>Global Clipboard</b> + True + + + False + True + 0 + + + + + + + + False + True + 4 + + + + + True + True + False + True + virtual_browser_ask + + + True + False + + + True + False + <b>Discard</b> all URLs without asking + True + + + False + True + 0 + + + + + + + + False + True + 5 + + + + + True + False + Open URL in Disposable + 0 + + + + False + True + 6 + + + + + True + False + This policy governs Qubes OS behavior when using <tt>qvm-open-in-dvm</tt> with URL arguments on the command line. + True + True + 0 + + + + False + True + 7 + + True @@ -6325,7 +6528,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, False False - 2 + 8 @@ -6366,7 +6569,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, False True - 3 + 9 @@ -6407,7 +6610,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, False True - 4 + 10 @@ -6435,7 +6638,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, False True - 5 + 11 @@ -6476,7 +6679,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, False True - 6 + 12 @@ -6530,7 +6733,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, False True - 7 + 13 @@ -6556,7 +6759,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, False True - 8 + 14 @@ -6611,7 +6814,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, False True - 9 + 15 @@ -6677,7 +6880,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, False True - 10 + 16 @@ -6756,7 +6959,7 @@ Inter-qube copy and paste actions are performed via special keyboard shortcuts, False True - 11 + 17