Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
previewer: Use GResource for data files
  • Loading branch information
Christian Persch authored and raveit65 committed Mar 22, 2018
1 parent 9668d3f commit c3fe25e
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 22 deletions.
4 changes: 0 additions & 4 deletions data/Makefile.am
Expand Up @@ -19,10 +19,6 @@ ui_DATA = \
atril-toolbar.xml \
hand-open.png

if ENABLE_PREVIEWER
ui_DATA += atril-previewer-ui.xml
endif

#
# Desktop file
#
Expand Down
18 changes: 15 additions & 3 deletions previewer/Makefile.am
Expand Up @@ -5,11 +5,12 @@ man_MANS = atril-previewer.1

atril_previewer_SOURCES = \
ev-previewer.c \
ev-previewer-resources.c \
ev-previewer-window.h \
ev-previewer-window.c
ev-previewer-window.c \
$(NULL)

atril_previewer_CPPFLAGS = \
-DATRILDATADIR=\"$(pkgdatadir)\" \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/libdocument \
Expand All @@ -33,6 +34,17 @@ atril_previewer_LDADD = \
$(PREVIEWER_LIBS) \
$(WEBKIT_LIBS)

EXTRA_DIST = $(man_MANS)
ev-previewer-resources.c: previewer.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/previewer.gresource.xml)
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev_previewer $<

EXTRA_DIST = \
previewer.gresource.xml \
previewer-ui.xml \
$(man_MANS) \
$(NULL)

CLEANFILES = \
ev-previewer-resources.c \
$(NULL)

-include $(top_srcdir)/git.mk
18 changes: 3 additions & 15 deletions previewer/ev-previewer-window.c
Expand Up @@ -468,12 +468,6 @@ ev_previewer_window_dispose (GObject *object)
G_OBJECT_CLASS (ev_previewer_window_parent_class)->dispose (object);
}

static gchar*
data_dir (void)
{
return g_strdup (ATRILDATADIR);
}

static void
ev_previewer_window_init (EvPreviewerWindow *window)
{
Expand Down Expand Up @@ -513,7 +507,6 @@ ev_previewer_window_constructor (GType type,
GtkWidget *toolbar;
GtkAction *action;
GError *error = NULL;
gchar *datadir, *ui_path;
gdouble dpi;

object = G_OBJECT_CLASS (ev_previewer_window_parent_class)->constructor (type,
Expand Down Expand Up @@ -566,14 +559,9 @@ ev_previewer_window_constructor (GType type,
window->accels_group, 1);
gtk_window_add_accel_group (GTK_WINDOW (window),
gtk_ui_manager_get_accel_group (window->ui_manager));
datadir = data_dir ();
ui_path = g_build_filename (datadir, "atril-previewer-ui.xml", NULL);
if (!gtk_ui_manager_add_ui_from_file (window->ui_manager, ui_path, &error)) {
g_warning ("Failed to load ui from atril-previewer-ui.xml: %s", error->message);
g_error_free (error);
}
g_free (ui_path);
g_free (datadir);

gtk_ui_manager_add_ui_from_resource (window->ui_manager, "/org/mate/atril/previewer/ui/previewer.xml", &error);
g_assert_no_error (error);

/* GTKUIManager connects actions accels only for menu items,
* but not for tool items. See bug #612972.
Expand Down
File renamed without changes.
23 changes: 23 additions & 0 deletions previewer/previewer.gresource.xml
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright © 2012 Christian Persch
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
This program is distributed in the hope conf it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<gresources>
<gresource prefix="/org/mate/atril/previewer">
<file alias="ui/previewer.xml" compressed="true" preprocess="xml-stripblanks">previewer-ui.xml</file>
</gresource>
</gresources>

0 comments on commit c3fe25e

Please sign in to comment.