From ec8ba4b5f9700fed31295233c05d5906e8f6e9d9 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 5 Jun 2014 10:50:15 +0200 Subject: build: Move data files to their dedicated subfolder --- .cvsignore | 35 -------- .gitignore | 27 ++---- Makefile.am | 9 +- configure.ac | 1 + data/50-mutter-navigation.xml.in | 98 ++++++++++++++++++++ data/50-mutter-system.xml.in | 13 +++ data/50-mutter-windows.xml.in | 50 +++++++++++ data/Makefile.am | 37 +++++++- data/default_icon.png | Bin 0 -> 1184 bytes data/mutter-schemas.convert | 5 ++ data/mutter-wayland.desktop.in | 17 ++++ data/mutter.desktop.in | 17 ++++ data/org.gnome.mutter.gschema.xml.in | 129 +++++++++++++++++++++++++++ data/org.gnome.mutter.wayland.gschema.xml.in | 33 +++++++ po/POTFILES.in | 12 +-- po/POTFILES.skip | 3 +- src/50-mutter-navigation.xml.in | 98 -------------------- src/50-mutter-system.xml.in | 13 --- src/50-mutter-windows.xml.in | 50 ----------- src/Makefile.am | 33 ------- src/default_icon.png | Bin 1184 -> 0 bytes src/mutter-schemas.convert | 5 -- src/mutter-wayland.desktop.in | 17 ---- src/mutter.desktop.in | 17 ---- src/org.gnome.mutter.gschema.xml.in | 129 --------------------------- src/org.gnome.mutter.wayland.gschema.xml.in | 33 ------- 26 files changed, 421 insertions(+), 460 deletions(-) delete mode 100644 .cvsignore create mode 100644 data/50-mutter-navigation.xml.in create mode 100644 data/50-mutter-system.xml.in create mode 100644 data/50-mutter-windows.xml.in create mode 100644 data/default_icon.png create mode 100644 data/mutter-schemas.convert create mode 100644 data/mutter-wayland.desktop.in create mode 100644 data/mutter.desktop.in create mode 100644 data/org.gnome.mutter.gschema.xml.in create mode 100644 data/org.gnome.mutter.wayland.gschema.xml.in delete mode 100644 src/50-mutter-navigation.xml.in delete mode 100644 src/50-mutter-system.xml.in delete mode 100644 src/50-mutter-windows.xml.in delete mode 100644 src/default_icon.png delete mode 100644 src/mutter-schemas.convert delete mode 100644 src/mutter-wayland.desktop.in delete mode 100644 src/mutter.desktop.in delete mode 100644 src/org.gnome.mutter.gschema.xml.in delete mode 100644 src/org.gnome.mutter.wayland.gschema.xml.in diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e848c649f..000000000 --- a/.cvsignore +++ /dev/null @@ -1,35 +0,0 @@ -Makefile -Makefile.in -aclocal.m4 -confdefs.h -config.cache -config.guess -config.h -config.log -config.status -config.sub -configure -configure.scan -libtool -ltconfig -ltmain.sh -stamp-h -stamp-h.in -stamp-h1 -stamp.h -version.h -config.h.in -install-sh -missing -mkinstalldirs -INSTALL -intl -ABOUT-NLS -COPYING -intltool-* -metacity.spec -autom4te.cache -compile -depcomp -omf.make -xmldocs.make diff --git a/.gitignore b/.gitignore index 446c09233..c2b89a4aa 100644 --- a/.gitignore +++ b/.gitignore @@ -19,11 +19,11 @@ libtool ltmain.sh missing .deps -src/50-mutter-navigation.xml -src/50-mutter-system.xml -src/50-mutter-windows.xml -src/mutter.desktop -src/mutter-wayland.desktop +data/50-mutter-navigation.xml +data/50-mutter-system.xml +data/50-mutter-windows.xml +data/mutter.desktop +data/mutter-wayland.desktop *.o *.a *.lo @@ -32,10 +32,6 @@ src/mutter-wayland.desktop *.swp *.gir *.typelib -tidy-enum-types.[ch] -tidy-marshal.[ch] -stamp-tidy-enum-types.h -stamp-tidy-marshal.h stamp-h1 *.gmo *.make @@ -44,14 +40,12 @@ stamp-it .intltool-merge-cache POTFILES po/*.pot -50-metacity-desktop-key.xml -50-metacity-key.xml libmutter.pc mutter -org.gnome.mutter.gschema.valid -org.gnome.mutter.gschema.xml -org.gnome.mutter.wayland.gschema.valid -org.gnome.mutter.wayland.gschema.xml +data/org.gnome.mutter.gschema.valid +data/org.gnome.mutter.gschema.xml +data/org.gnome.mutter.wayland.gschema.valid +data/org.gnome.mutter.wayland.gschema.xml testasyncgetprop testboxes testgradient @@ -66,9 +60,6 @@ test-focus test-gravity test-resizing test-size-hints -# We can't say just "wm-tester" here or it will ignore the directory -# rather than the binary -src/wm-tester/wm-tester INSTALL mkinstalldirs src/mutter-enum-types.[ch] diff --git a/Makefile.am b/Makefile.am index 931d367f3..97e6fa6da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,13 @@ -SUBDIRS=src po doc +SUBDIRS = data src po doc ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache +DISTCLEANFILES = \ + intltool-extract \ + intltool-merge \ + intltool-update \ + po/stamp-it \ + po/.intltool-merge-cache DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc diff --git a/configure.ac b/configure.ac index 77000ac41..ead3257c8 100644 --- a/configure.ac +++ b/configure.ac @@ -379,6 +379,7 @@ changequote([,])dnl AC_CONFIG_FILES([ Makefile +data/Makefile doc/Makefile doc/man/Makefile doc/reference/Makefile diff --git a/data/50-mutter-navigation.xml.in b/data/50-mutter-navigation.xml.in new file mode 100644 index 000000000..03ea8b96e --- /dev/null +++ b/data/50-mutter-navigation.xml.in @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/50-mutter-system.xml.in b/data/50-mutter-system.xml.in new file mode 100644 index 000000000..b8f4e6bda --- /dev/null +++ b/data/50-mutter-system.xml.in @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/data/50-mutter-windows.xml.in b/data/50-mutter-windows.xml.in new file mode 100644 index 000000000..6679958a7 --- /dev/null +++ b/data/50-mutter-windows.xml.in @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/Makefile.am b/data/Makefile.am index 58f590006..2c11822f3 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,36 @@ -defaultcursordir = $(pkgdatadir)/cursors +desktopfiles_in_files = \ + mutter.desktop.in \ + mutter-wayland.desktop.in +desktopfilesdir = $(datadir)/applications +desktopfiles_DATA = $(desktopfiles_in_files:.desktop.in=.desktop) -dist_defaultcursor_DATA = left_ptr.png +@INTLTOOL_DESKTOP_RULE@ + +xml_in_files = \ + 50-mutter-navigation.xml.in \ + 50-mutter-system.xml.in \ + 50-mutter-windows.xml.in +xmldir = $(GNOME_KEYBINDINGS_KEYSDIR) +xml_DATA = $(xml_in_files:.xml.in=.xml) + +gschema_in_files = \ + org.gnome.mutter.gschema.xml.in \ + org.gnome.mutter.wayland.gschema.xml.in +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) + +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ + +convertdir = $(datadir)/GConf/gsettings +convert_DATA = mutter-schemas.convert + +CLEANFILES = \ + $(desktopfiles_DATA) \ + $(gsettings_SCHEMAS) \ + $(xml_DATA) + +EXTRA_DIST = \ + $(convert_DATA) \ + $(desktopfiles_in_files) \ + $(gschema_in_files) \ + $(xml_in_files) diff --git a/data/default_icon.png b/data/default_icon.png new file mode 100644 index 000000000..5aad87988 Binary files /dev/null and b/data/default_icon.png differ diff --git a/data/mutter-schemas.convert b/data/mutter-schemas.convert new file mode 100644 index 000000000..2551c5948 --- /dev/null +++ b/data/mutter-schemas.convert @@ -0,0 +1,5 @@ +[org.gnome.mutter] +overlay-key = /apps/mutter/general/overlay_key +attach-modal-dialogs = /apps/mutter/general/attach_modal_dialogs +workspaces-only-on-primary = /apps/mutter/general/workspaces_only_on_primary +draggable-border-width = /apps/mutter/general/draggable_border_width diff --git a/data/mutter-wayland.desktop.in b/data/mutter-wayland.desktop.in new file mode 100644 index 000000000..850208942 --- /dev/null +++ b/data/mutter-wayland.desktop.in @@ -0,0 +1,17 @@ +[Desktop Entry] +Type=Application +_Name=Mutter (wayland compositor) +Exec=mutter --wayland --display-server +NoDisplay=true +# name of loadable control center module +X-GNOME-WMSettingsModule=metacity +# name we put on the WM spec check window +X-GNOME-WMName=Mutter +# back compat only +X-GnomeWMSettingsLibrary=metacity +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=mutter +X-GNOME-Bugzilla-Component=general +X-GNOME-Autostart-Phase=WindowManager +X-GNOME-Provides=windowmanager +X-GNOME-Autostart-Notify=true diff --git a/data/mutter.desktop.in b/data/mutter.desktop.in new file mode 100644 index 000000000..3bfb88d2d --- /dev/null +++ b/data/mutter.desktop.in @@ -0,0 +1,17 @@ +[Desktop Entry] +Type=Application +_Name=Mutter +Exec=mutter +NoDisplay=true +# name of loadable control center module +X-GNOME-WMSettingsModule=metacity +# name we put on the WM spec check window +X-GNOME-WMName=Mutter +# back compat only +X-GnomeWMSettingsLibrary=metacity +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=mutter +X-GNOME-Bugzilla-Component=general +X-GNOME-Autostart-Phase=WindowManager +X-GNOME-Provides=windowmanager +X-GNOME-Autostart-Notify=true diff --git a/data/org.gnome.mutter.gschema.xml.in b/data/org.gnome.mutter.gschema.xml.in new file mode 100644 index 000000000..cffeeb8c5 --- /dev/null +++ b/data/org.gnome.mutter.gschema.xml.in @@ -0,0 +1,129 @@ + + + + + 'Super_L' + <_summary>Modifier to use for extended window management operations + <_description> + This key will initiate the "overlay", which is a combination window + overview and application launching system. The default is intended + to be the "Windows key" on PC hardware. + + It's expected that this binding either the default or set to + the empty string. + + + + + false + <_summary>Attach modal dialogs + <_description> + When true, instead of having independent titlebars, modal dialogs + appear attached to the titlebar of the parent window and are moved + together with the parent window. + + + + + false + <_summary>Enable edge tiling when dropping windows on screen edges + <_description> + If enabled, dropping windows on vertical screen edges maximizes them + vertically and resizes them horizontally to cover half of the available + area. Dropping windows on the top screen edge maximizes them completely. + + + + + false + <_summary>Workspaces are managed dynamically + <_description> + Determines whether workspaces are managed dynamically or + whether there's a static number of workspaces (determined + by the num-workspaces key in org.gnome.desktop.wm.preferences). + + + + + false + <_summary>Workspaces only on primary + <_description> + Determines whether workspace switching should happen for windows + on all monitors or only for windows on the primary monitor. + + + + + false + <_summary>No tab popup + <_description> + Determines whether the use of popup and highlight frame should + be disabled for window cycling. + + + + + false + <_summary>Delay focus changes until the pointer stops moving + <_description> + If set to true, and the focus mode is either "sloppy" or "mouse" + then the focus will not be changed immediately when entering a + window, but only after the pointer stops moving. + + + + + 10 + + <_summary>Draggable border width + <_description> + The amount of total draggable borders. If the theme's visible + borders are not enough, invisible borders will be added to meet + this value. + + + + + true + <_summary>Auto maximize nearly monitor sized windows + <_description> + If enabled, new windows that are initially the size of the monitor + automatically get maximized. + + + + + false + <_summary>Place new windows in the center + <_description> + When true, the new windows will always be put in the center of the + active screen of the monitor. + + + + + + + + + + Left']]]> + + + + Right']]]> + + + + [] + <_summary>Select window from tab popup + + + + [] + <_summary>Cancel tab popup + + + + diff --git a/data/org.gnome.mutter.wayland.gschema.xml.in b/data/org.gnome.mutter.wayland.gschema.xml.in new file mode 100644 index 000000000..4bb5c1dfd --- /dev/null +++ b/data/org.gnome.mutter.wayland.gschema.xml.in @@ -0,0 +1,33 @@ + + + + F1']]]> + <_summary>Switch to VT 1 + + + F2']]]> + <_summary>Switch to VT 2 + + + F3']]]> + <_summary>Switch to VT 3 + + + F4']]]> + <_summary>Switch to VT 4 + + + F5']]]> + <_summary>Switch to VT 5 + + + F6']]]> + <_summary>Switch to VT 6 + + + F7']]]> + <_summary>Switch to VT 7 + + + diff --git a/po/POTFILES.in b/po/POTFILES.in index 2ad0e18dc..4d8d353d6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,8 +1,11 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -src/50-mutter-navigation.xml.in -src/50-mutter-system.xml.in -src/50-mutter-windows.xml.in +data/50-mutter-navigation.xml.in +data/50-mutter-system.xml.in +data/50-mutter-windows.xml.in +data/mutter.desktop.in +data/org.gnome.mutter.gschema.xml.in +data/org.gnome.mutter.wayland.gschema.xml.in src/backends/meta-monitor-manager.c src/compositor/compositor.c src/compositor/meta-background.c @@ -18,9 +21,6 @@ src/core/prefs.c src/core/screen.c src/core/util.c src/core/window.c -src/mutter.desktop.in -src/org.gnome.mutter.gschema.xml.in -src/org.gnome.mutter.wayland.gschema.xml.in src/ui/frames.c src/ui/resizepopup.c src/ui/theme.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 388d2ad13..f0b957293 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,2 +1 @@ -src/metacity.schemas.in -src/mutter-wayland.desktop.in +data/mutter-wayland.desktop.in diff --git a/src/50-mutter-navigation.xml.in b/src/50-mutter-navigation.xml.in deleted file mode 100644 index 03ea8b96e..000000000 --- a/src/50-mutter-navigation.xml.in +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/50-mutter-system.xml.in b/src/50-mutter-system.xml.in deleted file mode 100644 index b8f4e6bda..000000000 --- a/src/50-mutter-system.xml.in +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/src/50-mutter-windows.xml.in b/src/50-mutter-windows.xml.in deleted file mode 100644 index 6679958a7..000000000 --- a/src/50-mutter-windows.xml.in +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Makefile.am b/src/Makefile.am index 9867be414..fdd0334e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -345,51 +345,18 @@ testboxes_LDADD = $(MUTTER_LIBS) libmutter.la testgradient_LDADD = $(MUTTER_LIBS) libmutter.la testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la -@INTLTOOL_DESKTOP_RULE@ - -desktopfilesdir=$(datadir)/applications -desktopfiles_in_files=mutter.desktop.in -desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop) -desktopfiles_DATA = $(desktopfiles_files) - -xmldir = $(GNOME_KEYBINDINGS_KEYSDIR) -xml_in_files = \ - 50-mutter-navigation.xml.in \ - 50-mutter-system.xml.in \ - 50-mutter-windows.xml.in -xml_DATA = $(xml_in_files:.xml.in=.xml) - dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h -gsettings_SCHEMAS = org.gnome.mutter.gschema.xml org.gnome.mutter.wayland.gschema.xml -@INTLTOOL_XML_NOMERGE_RULE@ -@GSETTINGS_RULES@ - -convertdir = $(datadir)/GConf/gsettings -convert_DATA = mutter-schemas.convert - CLEANFILES = \ - $(desktopfiles_DATA) \ - $(gsettings_SCHEMAS) \ - $(xml_DATA) \ $(mutter_built_sources) \ $(typelib_DATA) \ $(gir_DATA) pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libmutter.pc EXTRA_DIST = \ - $(wmproperties_files) \ - $(IMAGES) \ - $(desktopfiles_in_files) \ - $(wmproperties_in_files) \ - $(xml_in_files) \ $(wayland_protocols) \ - org.gnome.mutter.gschema.xml.in \ - org.gnome.mutter.wayland.gschema.xml.in \ - mutter-schemas.convert \ libmutter.pc.in \ mutter-enum-types.h.in \ mutter-enum-types.c.in \ diff --git a/src/default_icon.png b/src/default_icon.png deleted file mode 100644 index 5aad87988..000000000 Binary files a/src/default_icon.png and /dev/null differ diff --git a/src/mutter-schemas.convert b/src/mutter-schemas.convert deleted file mode 100644 index 2551c5948..000000000 --- a/src/mutter-schemas.convert +++ /dev/null @@ -1,5 +0,0 @@ -[org.gnome.mutter] -overlay-key = /apps/mutter/general/overlay_key -attach-modal-dialogs = /apps/mutter/general/attach_modal_dialogs -workspaces-only-on-primary = /apps/mutter/general/workspaces_only_on_primary -draggable-border-width = /apps/mutter/general/draggable_border_width diff --git a/src/mutter-wayland.desktop.in b/src/mutter-wayland.desktop.in deleted file mode 100644 index 850208942..000000000 --- a/src/mutter-wayland.desktop.in +++ /dev/null @@ -1,17 +0,0 @@ -[Desktop Entry] -Type=Application -_Name=Mutter (wayland compositor) -Exec=mutter --wayland --display-server -NoDisplay=true -# name of loadable control center module -X-GNOME-WMSettingsModule=metacity -# name we put on the WM spec check window -X-GNOME-WMName=Mutter -# back compat only -X-GnomeWMSettingsLibrary=metacity -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=mutter -X-GNOME-Bugzilla-Component=general -X-GNOME-Autostart-Phase=WindowManager -X-GNOME-Provides=windowmanager -X-GNOME-Autostart-Notify=true diff --git a/src/mutter.desktop.in b/src/mutter.desktop.in deleted file mode 100644 index 3bfb88d2d..000000000 --- a/src/mutter.desktop.in +++ /dev/null @@ -1,17 +0,0 @@ -[Desktop Entry] -Type=Application -_Name=Mutter -Exec=mutter -NoDisplay=true -# name of loadable control center module -X-GNOME-WMSettingsModule=metacity -# name we put on the WM spec check window -X-GNOME-WMName=Mutter -# back compat only -X-GnomeWMSettingsLibrary=metacity -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=mutter -X-GNOME-Bugzilla-Component=general -X-GNOME-Autostart-Phase=WindowManager -X-GNOME-Provides=windowmanager -X-GNOME-Autostart-Notify=true diff --git a/src/org.gnome.mutter.gschema.xml.in b/src/org.gnome.mutter.gschema.xml.in deleted file mode 100644 index cffeeb8c5..000000000 --- a/src/org.gnome.mutter.gschema.xml.in +++ /dev/null @@ -1,129 +0,0 @@ - - - - - 'Super_L' - <_summary>Modifier to use for extended window management operations - <_description> - This key will initiate the "overlay", which is a combination window - overview and application launching system. The default is intended - to be the "Windows key" on PC hardware. - - It's expected that this binding either the default or set to - the empty string. - - - - - false - <_summary>Attach modal dialogs - <_description> - When true, instead of having independent titlebars, modal dialogs - appear attached to the titlebar of the parent window and are moved - together with the parent window. - - - - - false - <_summary>Enable edge tiling when dropping windows on screen edges - <_description> - If enabled, dropping windows on vertical screen edges maximizes them - vertically and resizes them horizontally to cover half of the available - area. Dropping windows on the top screen edge maximizes them completely. - - - - - false - <_summary>Workspaces are managed dynamically - <_description> - Determines whether workspaces are managed dynamically or - whether there's a static number of workspaces (determined - by the num-workspaces key in org.gnome.desktop.wm.preferences). - - - - - false - <_summary>Workspaces only on primary - <_description> - Determines whether workspace switching should happen for windows - on all monitors or only for windows on the primary monitor. - - - - - false - <_summary>No tab popup - <_description> - Determines whether the use of popup and highlight frame should - be disabled for window cycling. - - - - - false - <_summary>Delay focus changes until the pointer stops moving - <_description> - If set to true, and the focus mode is either "sloppy" or "mouse" - then the focus will not be changed immediately when entering a - window, but only after the pointer stops moving. - - - - - 10 - - <_summary>Draggable border width - <_description> - The amount of total draggable borders. If the theme's visible - borders are not enough, invisible borders will be added to meet - this value. - - - - - true - <_summary>Auto maximize nearly monitor sized windows - <_description> - If enabled, new windows that are initially the size of the monitor - automatically get maximized. - - - - - false - <_summary>Place new windows in the center - <_description> - When true, the new windows will always be put in the center of the - active screen of the monitor. - - - - - - - - - - Left']]]> - - - - Right']]]> - - - - [] - <_summary>Select window from tab popup - - - - [] - <_summary>Cancel tab popup - - - - diff --git a/src/org.gnome.mutter.wayland.gschema.xml.in b/src/org.gnome.mutter.wayland.gschema.xml.in deleted file mode 100644 index 4bb5c1dfd..000000000 --- a/src/org.gnome.mutter.wayland.gschema.xml.in +++ /dev/null @@ -1,33 +0,0 @@ - - - - F1']]]> - <_summary>Switch to VT 1 - - - F2']]]> - <_summary>Switch to VT 2 - - - F3']]]> - <_summary>Switch to VT 3 - - - F4']]]> - <_summary>Switch to VT 4 - - - F5']]]> - <_summary>Switch to VT 5 - - - F6']]]> - <_summary>Switch to VT 6 - - - F7']]]> - <_summary>Switch to VT 7 - - - -- cgit v1.2.1