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

fixes to system menu

Browse Source 
Added global settings and create VM shortcuts to menu; replaced Add New Shortcut with vm settings in VM menu.
This commit is contained in:
Marta Marczykowska-Górecka 2017-07-16 16:36:36 +02:00
parent eb9c5d603b
commit e2f6c00817
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
5 changed files with 18 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.qubesos.QubesManager.conf
View File

@ -1,15 +0,0 @@
<!DOCTYPE busconfig PUBLIC
"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
<!-- This config allows anyone to control QubesManager -->
<policy context="default">
<allow send_destination="org.qubesos.QubesManager"/>
</policy>
<policy group="qubes">
<allow own="org.qubesos.QubesManager"/>
</policy>
</busconfig>

22
org.qubesos.QubesManager.xml
View File

@ -1,22 +0,0 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.qubesos.QubesManager">
<method name="notify_error">
<arg name="vmname" type="s" direction="in"/>
<arg name="message" type="s" direction="in"/>
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
<method name="clear_error_exact">
<arg name="vmname" type="s" direction="in"/>
<arg name="message" type="s" direction="in"/>
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
<method name="clear_error">
<arg name="vmname" type="s" direction="in"/>
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
<method name="show_manager">
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
</interface>
</node>

10
qubes-global-settings.desktop Normal file
View File

@ -0,0 +1,10 @@
[Desktop Entry]
Type=Application
Exec=qubes-global-settings
Path=/user/bin
Icon=qubes-manager
Terminal=false
Name=Qubes Global Settings
GenericName=Qubes Global Settings
StartupNotify=false
Categories=System;

8
qubes-manager.desktop → qubes-vm-create.desktop
View File

@ -1,10 +1,10 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Exec=qubes-manager Exec=qubes-vm-create
Path=/var/lib/qubes Path=/usr/bin
Icon=qubes-manager Icon=qubes-manager
Terminal=false Terminal=false
Name=Qubes VM Manager Name=Create Qubes VM
GenericName=Qubes VM Manager GenericName=Create Qubes VM
StartupNotify=false StartupNotify=false
Categories=System;X-Xfce-Toplevel; Categories=System;X-Xfce-Toplevel;

13
rpm_spec/qmgr.spec
View File

@ -42,12 +42,9 @@ cp qubesmanager/mount_for_backup.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
cp qubesmanager/qvm_about.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/ cp qubesmanager/qvm_about.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
mkdir -p $RPM_BUILD_ROOT/usr/share/applications mkdir -p $RPM_BUILD_ROOT/usr/share/applications
cp qubes-manager.desktop $RPM_BUILD_ROOT/usr/share/applications cp qubes-global-settings.desktop $RPM_BUILD_ROOT/usr/share/applications/
mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart/ cp qubes-vm-create.desktop $RPM_BUILD_ROOT/usr/share/applications/
cp qubes-manager.desktop $RPM_BUILD_ROOT/etc/xdg/autostart/
install -D org.qubesos.QubesManager.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d/org.qubesos.QubesManager.conf
install -D org.qubesos.QubesManager.xml $RPM_BUILD_ROOT/usr/share/dbus-1/interfaces/org.qubesos.QubesManager.xml
%post %post
update-desktop-database &> /dev/null || : update-desktop-database &> /dev/null || :
@ -108,7 +105,5 @@ rm -rf $RPM_BUILD_ROOT
%dir %{python3_sitelib}/qubesmanager-*.egg-info %dir %{python3_sitelib}/qubesmanager-*.egg-info
%{python3_sitelib}/qubesmanager-*.egg-info/* %{python3_sitelib}/qubesmanager-*.egg-info/*
/usr/share/applications/qubes-manager.desktop /usr/share/applications/qubes-global-settings.desktop
/etc/xdg/autostart/qubes-manager.desktop /usr/share/applications/qubes-vm-create.desktop
/etc/dbus-1/system.d/org.qubesos.QubesManager.conf
/usr/share/dbus-1/interfaces/org.qubesos.QubesManager.xml