Instead of having CcKeyboardPanel managing both UI and backend code, factor the backend code to a new CcKeyboardManager class and drop backend management from the panel itself. The new backend class handles the loading, creation and removal and search of keyboard shortcuts. It also resolves reversible shortcuts when searching. This patch moves the code to this new class, and updates the rest of the Keyboard panel to use it instead. https://bugzilla.gnome.org/show_bug.cgi?id=769063
75 lines
2.1 KiB
Makefile
75 lines
2.1 KiB
Makefile
# This is used in PANEL_CFLAGS
|
|
cappletname = keyboard
|
|
|
|
noinst_LTLIBRARIES = libkeyboard.la
|
|
|
|
BUILT_SOURCES = \
|
|
cc-keyboard-resources.c \
|
|
cc-keyboard-resources.h
|
|
|
|
libkeyboard_la_SOURCES = \
|
|
$(BUILT_SOURCES) \
|
|
cc-keyboard-manager.c \
|
|
cc-keyboard-manager.h \
|
|
cc-keyboard-panel.c \
|
|
cc-keyboard-panel.h \
|
|
cc-keyboard-item.c \
|
|
cc-keyboard-item.h \
|
|
cc-keyboard-option.c \
|
|
cc-keyboard-option.h \
|
|
cc-keyboard-shortcut-editor.c \
|
|
cc-keyboard-shortcut-editor.h \
|
|
wm-common.c \
|
|
wm-common.h \
|
|
keyboard-shortcuts.c \
|
|
keyboard-shortcuts.h
|
|
|
|
libkeyboard_la_CFLAGS = $(PANEL_CFLAGS) $(KEYBOARD_PANEL_CFLAGS) -I$(top_srcdir)/panels/common/
|
|
libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS)
|
|
|
|
resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/keyboard.gresource.xml)
|
|
cc-keyboard-resources.c: keyboard.gresource.xml $(resource_files)
|
|
$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_keyboard $<
|
|
cc-keyboard-resources.h: keyboard.gresource.xml $(resource_files)
|
|
$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_keyboard $<
|
|
|
|
@INTLTOOL_DESKTOP_RULE@
|
|
|
|
desktopdir = $(datadir)/applications
|
|
Desktop_in_files = gnome-keyboard-panel.desktop.in
|
|
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
|
|
|
itsdir = $(datadir)/gettext/its
|
|
its_DATA = gnome-keybindings.loc gnome-keybindings.its
|
|
|
|
@INTLTOOL_XML_NOMERGE_RULE@
|
|
|
|
xmldir = $(pkgdatadir)/keybindings
|
|
xml_in_files = \
|
|
00-multimedia.xml.in \
|
|
01-input-sources.xml.in \
|
|
01-launchers.xml.in \
|
|
01-screenshot.xml.in \
|
|
01-system.xml.in \
|
|
50-accessibility.xml.in
|
|
xml_DATA = $(xml_in_files:.xml.in=.xml)
|
|
|
|
pkgconfigdir = $(datadir)/pkgconfig
|
|
pkgconfig_DATA = gnome-keybindings.pc
|
|
|
|
AM_CPPFLAGS = \
|
|
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
|
|
|
|
CLEANFILES = \
|
|
$(Desktop_in_files) \
|
|
$(desktop_DATA) \
|
|
$(xml_DATA) \
|
|
$(BUILT_SOURCES)
|
|
EXTRA_DIST = $(xml_in_files) \
|
|
gnome-keybindings.its \
|
|
gnome-keybindings.loc \
|
|
gnome-keybindings.pc.in \
|
|
$(resource_files) \
|
|
keyboard.gresource.xml
|
|
|
|
-include $(top_srcdir)/git.mk
|