pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-28 07:06:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui: Move ui files to $(srcdir)/resources/ui

Browse Source 
I'd like to keep our resources all in the same place. In the future we
will be able to have:
$(srcdir)
 |_ resources
    |_ ui: for our {remote,virt}-viewer ui specific files
    |_ gtk: for files that can be automatically handled by Gtk (like
    |       app-menu).
    |_ css: for custom themes (like:
            https://bugs.freedesktop.org/show_bug.cgi?id=94276)

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2016-06-13 22:19:29 +02:00
parent 1315f0aa3d
commit 1f6f1a48e5
12 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
po/POTFILES.in
View File

@ -2,11 +2,11 @@ data/remote-viewer.desktop.in
data/virt-viewer-mime.xml.in
src/remote-viewer-main.c
src/remote-viewer.c
[type: gettext/glade] src/remote-viewer-connect.ui
[type: gettext/glade] src/virt-viewer-about.ui
[type: gettext/glade] src/resources/ui/remote-viewer-connect.ui
[type: gettext/glade] src/resources/ui/virt-viewer-about.ui
src/virt-viewer-app.c
src/virt-viewer-auth.c
[type: gettext/glade] src/virt-viewer-auth.ui
[type: gettext/glade] src/resources/ui/virt-viewer-auth.ui
src/virt-viewer-display-vnc.c
src/virt-viewer-file-transfer-dialog.c
src/virt-viewer-main.c
@ -16,7 +16,7 @@ src/virt-viewer-vm-connection.c
src/virt-viewer-window.c
src/virt-viewer-file.c
src/virt-viewer.c
[type: gettext/glade] src/virt-viewer.ui
[type: gettext/glade] src/virt-viewer-guest-details.ui
[type: gettext/glade] src/virt-viewer-vm-connection.ui
[type: gettext/glade] src/virt-viewer-preferences.ui
[type: gettext/glade] src/resources/ui/virt-viewer.ui
[type: gettext/glade] src/resources/ui/virt-viewer-guest-details.ui
[type: gettext/glade] src/resources/ui/virt-viewer-vm-connection.ui
[type: gettext/glade] src/resources/ui/virt-viewer-preferences.ui

20
src/Makefile.am
View File

@ -6,20 +6,20 @@ bin_PROGRAMS =
noinst_LTLIBRARIES = libvirt-viewer-util.la libvirt-viewer.la
noinst_DATA = \
virt-viewer.ui \
virt-viewer-about.ui \
virt-viewer-auth.ui \
virt-viewer-guest-details.ui \
virt-viewer-vm-connection.ui \
virt-viewer-preferences.ui \
remote-viewer-connect.ui \
resources/ui/virt-viewer.ui \
resources/ui/virt-viewer-about.ui \
resources/ui/virt-viewer-auth.ui \
resources/ui/virt-viewer-guest-details.ui \
resources/ui/virt-viewer-vm-connection.ui \
resources/ui/virt-viewer-preferences.ui \
resources/ui/remote-viewer-connect.ui \
$(NULL)
EXTRA_DIST = \
$(noinst_DATA) \
virt-viewer-enums.c.etemplate \
virt-viewer-enums.h.etemplate \
virt-viewer.gresource.xml \
resources/virt-viewer.gresource.xml \
$(NULL)
ENUMS_FILES = \
@ -33,8 +33,8 @@ BUILT_SOURCES = \
virt-viewer-enums.c \
$(NULL)
virt-viewer-resources.c virt-viewer-resources.h: virt-viewer.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/virt-viewer.gresource.xml)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name virt_viewer $<
virt-viewer-resources.c virt-viewer-resources.h: resources/virt-viewer.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir)/resources $(srcdir)/resources/virt-viewer.gresource.xml)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/resources --generate --c-name virt_viewer $<
virt-viewer-enums.c virt-viewer-enums.h: %: %.etemplate $(ENUMS_FILES)
$(AM_V_GEN)$(GLIB_MKENUMS) --template $^ | \

0
src/remote-viewer-connect.ui → src/resources/ui/remote-viewer-connect.ui
View File

0
src/virt-viewer-about.ui → src/resources/ui/virt-viewer-about.ui
View File

0
src/virt-viewer-auth.ui → src/resources/ui/virt-viewer-auth.ui
View File

0
src/virt-viewer-guest-details.ui → src/resources/ui/virt-viewer-guest-details.ui
View File

0
src/virt-viewer-preferences.ui → src/resources/ui/virt-viewer-preferences.ui
View File

0
src/virt-viewer-vm-connection.ui → src/resources/ui/virt-viewer-vm-connection.ui
View File

0
src/virt-viewer.ui → src/resources/ui/virt-viewer.ui
View File

19
src/resources/virt-viewer.gresource.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/virt-manager/virt-viewer">
<file>ui/remote-viewer-connect.ui</file>
<file>ui/virt-viewer-about.ui</file>
<file>ui/virt-viewer-auth.ui</file>
<file>ui/virt-viewer-guest-details.ui</file>
<file>ui/virt-viewer-preferences.ui</file>
<file>ui/virt-viewer-vm-connection.ui</file>
<file>ui/virt-viewer.ui</file>
<file alias="icons/16x16/virt-viewer.png">../../icons/16x16/virt-viewer.png</file>
<file alias="icons/22x22/virt-viewer.png">../../icons/22x22/virt-viewer.png</file>
<file alias="icons/24x24/virt-viewer.png">../../icons/24x24/virt-viewer.png</file>
<file alias="icons/24x24/virt-viewer-usb.png">../../icons/24x24/virt-viewer-usb.png</file>
<file alias="icons/32x32/virt-viewer.png">../../icons/32x32/virt-viewer.png</file>
<file alias="icons/48x48/virt-viewer.png">../../icons/48x48/virt-viewer.png</file>
<file alias="icons/256x256/virt-viewer.png">../../icons/256x256/virt-viewer.png</file>
</gresource>
</gresources>

2
src/virt-viewer-util.h
View File

@ -34,7 +34,7 @@ enum {
};
#define VIRT_VIEWER_ERROR virt_viewer_error_quark ()
#define VIRT_VIEWER_RESOURCE_PREFIX "/org/virt-manager/virt-viewer"
#define VIRT_VIEWER_RESOURCE_PREFIX "/org/virt-manager/virt-viewer/ui"
GQuark virt_viewer_error_quark(void);

19
src/virt-viewer.gresource.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/virt-manager/virt-viewer">
<file>remote-viewer-connect.ui</file>
<file>virt-viewer-about.ui</file>
<file>virt-viewer-auth.ui</file>
<file>virt-viewer-guest-details.ui</file>
<file>virt-viewer-preferences.ui</file>
<file>virt-viewer-vm-connection.ui</file>
<file>virt-viewer.ui</file>
<file alias="icons/16x16/virt-viewer.png">../icons/16x16/virt-viewer.png</file>
<file alias="icons/22x22/virt-viewer.png">../icons/22x22/virt-viewer.png</file>
<file alias="icons/24x24/virt-viewer.png">../icons/24x24/virt-viewer.png</file>
<file alias="icons/24x24/virt-viewer-usb.png">../icons/24x24/virt-viewer-usb.png</file>
<file alias="icons/32x32/virt-viewer.png">../icons/32x32/virt-viewer.png</file>
<file alias="icons/48x48/virt-viewer.png">../icons/48x48/virt-viewer.png</file>
<file alias="icons/256x256/virt-viewer.png">../icons/256x256/virt-viewer.png</file>
</gresource>
</gresources>