From 1f6f1a48e5ad9a45e6395840a8fdaba6dcee1d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 13 Jun 2016 22:19:29 +0200 Subject: [PATCH] ui: Move ui files to $(srcdir)/resources/ui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: Jonathon Jongsma --- po/POTFILES.in | 14 ++++++------- src/Makefile.am | 20 +++++++++---------- .../ui}/remote-viewer-connect.ui | 0 src/{ => resources/ui}/virt-viewer-about.ui | 0 src/{ => resources/ui}/virt-viewer-auth.ui | 0 .../ui}/virt-viewer-guest-details.ui | 0 .../ui}/virt-viewer-preferences.ui | 0 .../ui}/virt-viewer-vm-connection.ui | 0 src/{ => resources/ui}/virt-viewer.ui | 0 src/resources/virt-viewer.gresource.xml | 19 ++++++++++++++++++ src/virt-viewer-util.h | 2 +- src/virt-viewer.gresource.xml | 19 ------------------ 12 files changed, 37 insertions(+), 37 deletions(-) rename src/{ => resources/ui}/remote-viewer-connect.ui (100%) rename src/{ => resources/ui}/virt-viewer-about.ui (100%) rename src/{ => resources/ui}/virt-viewer-auth.ui (100%) rename src/{ => resources/ui}/virt-viewer-guest-details.ui (100%) rename src/{ => resources/ui}/virt-viewer-preferences.ui (100%) rename src/{ => resources/ui}/virt-viewer-vm-connection.ui (100%) rename src/{ => resources/ui}/virt-viewer.ui (100%) create mode 100644 src/resources/virt-viewer.gresource.xml delete mode 100644 src/virt-viewer.gresource.xml diff --git a/po/POTFILES.in b/po/POTFILES.in index adf8fa7..b25306d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index a93c24b..bbabc61 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 $^ | \ diff --git a/src/remote-viewer-connect.ui b/src/resources/ui/remote-viewer-connect.ui similarity index 100% rename from src/remote-viewer-connect.ui rename to src/resources/ui/remote-viewer-connect.ui diff --git a/src/virt-viewer-about.ui b/src/resources/ui/virt-viewer-about.ui similarity index 100% rename from src/virt-viewer-about.ui rename to src/resources/ui/virt-viewer-about.ui diff --git a/src/virt-viewer-auth.ui b/src/resources/ui/virt-viewer-auth.ui similarity index 100% rename from src/virt-viewer-auth.ui rename to src/resources/ui/virt-viewer-auth.ui diff --git a/src/virt-viewer-guest-details.ui b/src/resources/ui/virt-viewer-guest-details.ui similarity index 100% rename from src/virt-viewer-guest-details.ui rename to src/resources/ui/virt-viewer-guest-details.ui diff --git a/src/virt-viewer-preferences.ui b/src/resources/ui/virt-viewer-preferences.ui similarity index 100% rename from src/virt-viewer-preferences.ui rename to src/resources/ui/virt-viewer-preferences.ui diff --git a/src/virt-viewer-vm-connection.ui b/src/resources/ui/virt-viewer-vm-connection.ui similarity index 100% rename from src/virt-viewer-vm-connection.ui rename to src/resources/ui/virt-viewer-vm-connection.ui diff --git a/src/virt-viewer.ui b/src/resources/ui/virt-viewer.ui similarity index 100% rename from src/virt-viewer.ui rename to src/resources/ui/virt-viewer.ui diff --git a/src/resources/virt-viewer.gresource.xml b/src/resources/virt-viewer.gresource.xml new file mode 100644 index 0000000..b8ced29 --- /dev/null +++ b/src/resources/virt-viewer.gresource.xml @@ -0,0 +1,19 @@ + + + + ui/remote-viewer-connect.ui + ui/virt-viewer-about.ui + ui/virt-viewer-auth.ui + ui/virt-viewer-guest-details.ui + ui/virt-viewer-preferences.ui + ui/virt-viewer-vm-connection.ui + ui/virt-viewer.ui + ../../icons/16x16/virt-viewer.png + ../../icons/22x22/virt-viewer.png + ../../icons/24x24/virt-viewer.png + ../../icons/24x24/virt-viewer-usb.png + ../../icons/32x32/virt-viewer.png + ../../icons/48x48/virt-viewer.png + ../../icons/256x256/virt-viewer.png + + diff --git a/src/virt-viewer-util.h b/src/virt-viewer-util.h index 5515f66..14a477a 100644 --- a/src/virt-viewer-util.h +++ b/src/virt-viewer-util.h @@ -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); diff --git a/src/virt-viewer.gresource.xml b/src/virt-viewer.gresource.xml deleted file mode 100644 index 019678f..0000000 --- a/src/virt-viewer.gresource.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - remote-viewer-connect.ui - virt-viewer-about.ui - virt-viewer-auth.ui - virt-viewer-guest-details.ui - virt-viewer-preferences.ui - virt-viewer-vm-connection.ui - virt-viewer.ui - ../icons/16x16/virt-viewer.png - ../icons/22x22/virt-viewer.png - ../icons/24x24/virt-viewer.png - ../icons/24x24/virt-viewer-usb.png - ../icons/32x32/virt-viewer.png - ../icons/48x48/virt-viewer.png - ../icons/256x256/virt-viewer.png - -