From 927c136fab9280d095d837b93f7c34da666b550c Mon Sep 17 00:00:00 2001 From: rbuj Date: Sun, 7 Aug 2022 10:33:33 +0200 Subject: trashapplet: Add data dir --- configure.ac | 1 + po/POTFILES.in | 4 +- trashapplet/Makefile.am | 33 +---- trashapplet/data/Makefile.am | 32 +++++ ...ets.TrashApplet.mate-panel-applet.desktop.in.in | 17 +++ ...mate.panel.applet.TrashAppletFactory.service.in | 3 + trashapplet/data/trashapplet-empty-progress.ui | 150 +++++++++++++++++++++ trashapplet/data/trashapplet-menu.xml | 6 + .../data/trashapplet-resources.gresource.xml | 7 + ...ets.TrashApplet.mate-panel-applet.desktop.in.in | 17 --- ...mate.panel.applet.TrashAppletFactory.service.in | 3 - trashapplet/src/Makefile.am | 8 +- trashapplet/trashapplet-empty-progress.ui | 150 --------------------- trashapplet/trashapplet-menu.xml | 6 - trashapplet/trashapplet-resources.gresource.xml | 7 - 15 files changed, 223 insertions(+), 221 deletions(-) create mode 100644 trashapplet/data/Makefile.am create mode 100644 trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in create mode 100644 trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in create mode 100644 trashapplet/data/trashapplet-empty-progress.ui create mode 100644 trashapplet/data/trashapplet-menu.xml create mode 100644 trashapplet/data/trashapplet-resources.gresource.xml delete mode 100644 trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in delete mode 100644 trashapplet/org.mate.panel.applet.TrashAppletFactory.service.in delete mode 100644 trashapplet/trashapplet-empty-progress.ui delete mode 100644 trashapplet/trashapplet-menu.xml delete mode 100644 trashapplet/trashapplet-resources.gresource.xml diff --git a/configure.ac b/configure.ac index ef62a368..3c9e7b46 100644 --- a/configure.ac +++ b/configure.ac @@ -594,6 +594,7 @@ stickynotes/org.mate.stickynotes.gschema.xml stickynotes/pixmaps/Makefile stickynotes/docs/Makefile trashapplet/Makefile +trashapplet/data/Makefile trashapplet/src/Makefile trashapplet/docs/Makefile cpufreq/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 621aebc8..4c1e044e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -72,7 +72,7 @@ timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in timerapplet/data/org.mate.panel.applet.timer.gschema.xml.in timerapplet/data/timerapplet-preferences.ui timerapplet/src/timerapplet.c -trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in +trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in +trashapplet/data/trashapplet-empty-progress.ui trashapplet/src/trashapplet.c trashapplet/src/trash-empty.c -trashapplet/trashapplet-empty-progress.ui diff --git a/trashapplet/Makefile.am b/trashapplet/Makefile.am index 26b85624..5b5350a3 100644 --- a/trashapplet/Makefile.am +++ b/trashapplet/Makefile.am @@ -1,34 +1,3 @@ -SUBDIRS = src docs - -appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.desktop.in -applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) - -$(applet_in_files): $(applet_in_files).in Makefile - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ - $< > $@ - -$(applet_DATA): $(applet_in_files) Makefile - $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ - -servicedir = $(datadir)/dbus-1/services -service_in_files = org.mate.panel.applet.TrashAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.TrashAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ - -EXTRA_DIST = \ - $(applet_in_files).in \ - $(service_in_files) \ - trashapplet-empty-progress.ui \ - trashapplet-menu.xml \ - trashapplet-resources.gresource.xml - -CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) +SUBDIRS = data src docs -include $(top_srcdir)/git.mk diff --git a/trashapplet/data/Makefile.am b/trashapplet/data/Makefile.am new file mode 100644 index 00000000..8603d6c2 --- /dev/null +++ b/trashapplet/data/Makefile.am @@ -0,0 +1,32 @@ +appletdir = $(datadir)/mate-panel/applets +applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.desktop.in +applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) + +$(applet_in_files): $(applet_in_files).in Makefile + $(AM_V_GEN)sed \ + -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ + -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ + $< > $@ + +$(applet_DATA): $(applet_in_files) Makefile + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ + +servicedir = $(datadir)/dbus-1/services +service_in_files = org.mate.panel.applet.TrashAppletFactory.service.in +service_DATA = $(service_in_files:.service.in=.service) + +org.mate.panel.applet.TrashAppletFactory.service: $(service_in_files) + $(AM_V_GEN)sed \ + -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ + $< > $@ + +EXTRA_DIST = \ + $(applet_in_files).in \ + $(service_in_files) \ + trashapplet-empty-progress.ui \ + trashapplet-menu.xml \ + trashapplet-resources.gresource.xml + +CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) + +-include $(top_srcdir)/git.mk diff --git a/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in new file mode 100644 index 00000000..77161ccc --- /dev/null +++ b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in @@ -0,0 +1,17 @@ +[Applet Factory] +Id=TrashAppletFactory +Location=@LIBEXECDIR@/trashapplet +Name=Trash Applet Factory +Description=Trash Applet Factory + +[TrashApplet] +Name=Trash +Description=Go to Trash +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=user-trash-full +MateComponentId=OAFIID:MATE_Panel_TrashApplet +X-MATE-Bugzilla-Bugzilla=MATE +X-MATE-Bugzilla-Product=mate-applets +X-MATE-Bugzilla-Component=trash applet +X-MATE-Bugzilla-Version=@VERSION@ +X-MATE-Bugzilla-OtherBinaries=trashapplet diff --git a/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in new file mode 100644 index 00000000..ead24d1d --- /dev/null +++ b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.TrashAppletFactory +Exec=@LIBEXECDIR@/trashapplet diff --git a/trashapplet/data/trashapplet-empty-progress.ui b/trashapplet/data/trashapplet-empty-progress.ui new file mode 100644 index 00000000..59c371a5 --- /dev/null +++ b/trashapplet/data/trashapplet-empty-progress.ui @@ -0,0 +1,150 @@ + + + + + + True + False + process-stop + + + False + 6 + Emptying the Trash + 400 + dialog + + + False + vertical + 2 + + + False + end + + + _Cancel + True + True + True + True + True + cancel_button_img + True + True + + + True + True + 0 + + + + + False + False + 0 + + + + + True + False + 6 + vertical + 12 + + + True + False + start + Emptying the Trash + + + + + + + False + True + 0 + + + + + True + False + 12 + + + True + False + From: + + + + + + False + True + 0 + + + + + True + False + middle + 0 + + + True + True + 1 + + + + + False + True + 1 + + + + + True + False + + + True + True + 2 + + + + + True + False + 0 + + + False + True + 3 + + + + + False + True + 1 + + + + + + cancel_button + + + diff --git a/trashapplet/data/trashapplet-menu.xml b/trashapplet/data/trashapplet-menu.xml new file mode 100644 index 00000000..e2bc5359 --- /dev/null +++ b/trashapplet/data/trashapplet-menu.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/trashapplet/data/trashapplet-resources.gresource.xml b/trashapplet/data/trashapplet-resources.gresource.xml new file mode 100644 index 00000000..db287937 --- /dev/null +++ b/trashapplet/data/trashapplet-resources.gresource.xml @@ -0,0 +1,7 @@ + + + + trashapplet-empty-progress.ui + trashapplet-menu.xml + + diff --git a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in b/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in deleted file mode 100644 index 77161ccc..00000000 --- a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in +++ /dev/null @@ -1,17 +0,0 @@ -[Applet Factory] -Id=TrashAppletFactory -Location=@LIBEXECDIR@/trashapplet -Name=Trash Applet Factory -Description=Trash Applet Factory - -[TrashApplet] -Name=Trash -Description=Go to Trash -# Translators: Do NOT translate or transliterate this text (this is an icon file name)! -Icon=user-trash-full -MateComponentId=OAFIID:MATE_Panel_TrashApplet -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-applets -X-MATE-Bugzilla-Component=trash applet -X-MATE-Bugzilla-Version=@VERSION@ -X-MATE-Bugzilla-OtherBinaries=trashapplet diff --git a/trashapplet/org.mate.panel.applet.TrashAppletFactory.service.in b/trashapplet/org.mate.panel.applet.TrashAppletFactory.service.in deleted file mode 100644 index ead24d1d..00000000 --- a/trashapplet/org.mate.panel.applet.TrashAppletFactory.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.mate.panel.applet.TrashAppletFactory -Exec=@LIBEXECDIR@/trashapplet diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am index 194e44ad..2def1827 100644 --- a/trashapplet/src/Makefile.am +++ b/trashapplet/src/Makefile.am @@ -23,11 +23,11 @@ trashapplet_LDADD = \ $(GIO_LIBS) \ -lX11 -trashapplet-resources.c: ../trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../ --generate-dependencies $(srcdir)/../trashapplet-resources.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../ --generate --c-name trashapplet $< +trashapplet-resources.c: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $< -trashapplet-resources.h: ../trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../ --generate-dependencies $(srcdir)/../trashapplet-resources.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../ --generate --c-name trashapplet $< +trashapplet-resources.h: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $< CLEANFILES = \ $(BUILT_SOURCES) diff --git a/trashapplet/trashapplet-empty-progress.ui b/trashapplet/trashapplet-empty-progress.ui deleted file mode 100644 index 59c371a5..00000000 --- a/trashapplet/trashapplet-empty-progress.ui +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - True - False - process-stop - - - False - 6 - Emptying the Trash - 400 - dialog - - - False - vertical - 2 - - - False - end - - - _Cancel - True - True - True - True - True - cancel_button_img - True - True - - - True - True - 0 - - - - - False - False - 0 - - - - - True - False - 6 - vertical - 12 - - - True - False - start - Emptying the Trash - - - - - - - False - True - 0 - - - - - True - False - 12 - - - True - False - From: - - - - - - False - True - 0 - - - - - True - False - middle - 0 - - - True - True - 1 - - - - - False - True - 1 - - - - - True - False - - - True - True - 2 - - - - - True - False - 0 - - - False - True - 3 - - - - - False - True - 1 - - - - - - cancel_button - - - diff --git a/trashapplet/trashapplet-menu.xml b/trashapplet/trashapplet-menu.xml deleted file mode 100644 index e2bc5359..00000000 --- a/trashapplet/trashapplet-menu.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/trashapplet/trashapplet-resources.gresource.xml b/trashapplet/trashapplet-resources.gresource.xml deleted file mode 100644 index db287937..00000000 --- a/trashapplet/trashapplet-resources.gresource.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - trashapplet-empty-progress.ui - trashapplet-menu.xml - - -- cgit v1.2.1