diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | bin/caribou.in | 1 | ||||
| -rw-r--r-- | caribou/__init__.py | 1 | ||||
| -rw-r--r-- | caribou/keyboard.py | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/caribou-prefs.ui (renamed from caribou/caribou-prefs.ui) | 0 |
7 files changed, 11 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index eae1719..6ee3575 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = caribou bin +SUBDIRS = caribou bin data diff --git a/bin/caribou.in b/bin/caribou.in index 89f9d4b..c9a8189 100644 --- a/bin/caribou.in +++ b/bin/caribou.in @@ -46,6 +46,7 @@ if os.path.dirname(__file__) != "@prefix@/bin": import caribou else: import caribou + caribou.data_path = os.path.join("@prefix@", "share", "caribou") import caribou.window as window import caribou.keyboard as keyboard diff --git a/caribou/__init__.py b/caribou/__init__.py index e69de29..1aadcdc 100644 --- a/caribou/__init__.py +++ b/caribou/__init__.py @@ -0,0 +1 @@ +data_path = "data/" diff --git a/caribou/keyboard.py b/caribou/keyboard.py index 835d6f5..738f9cc 100644 --- a/caribou/keyboard.py +++ b/caribou/keyboard.py @@ -25,15 +25,17 @@ import gobject import gtk import sys import virtkey +import os import keyboards +from . import data_path class KeyboardPreferences: __gtype_name__ = "KeyboardPreferences" def __init__(self): builder = gtk.Builder() - builder.add_from_file("caribou/caribou-prefs.ui") + builder.add_from_file(os.path.join(data_path, "caribou-prefs.ui")) self.window = builder.get_object("dialog_prefs") self.window.connect("destroy", self.destroy) diff --git a/configure.ac b/configure.ac index 3fc8c7a..cac2ab3 100644 --- a/configure.ac +++ b/configure.ac @@ -44,4 +44,5 @@ caribou/Makefile caribou/keyboards/Makefile bin/Makefile bin/caribou +data/Makefile ]) diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..c40b7d2 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,4 @@ +gtkbuilderdir = $(datadir)/caribou +gtkbuilder_DATA = caribou-prefs.ui + +EXTRA_DIST = $(gtkbuilder_DATA) diff --git a/caribou/caribou-prefs.ui b/data/caribou-prefs.ui index 40d100e..40d100e 100644 --- a/caribou/caribou-prefs.ui +++ b/data/caribou-prefs.ui |