diff options
| author | Eitan Isaacson <eitan@monotonous.org> | 2011-04-24 16:57:28 -0700 |
|---|---|---|
| committer | Eitan Isaacson <eitan@monotonous.org> | 2011-05-02 10:21:08 -0700 |
| commit | e1ae6ee91507a47cbe2fe537f3107c17390bc0e2 (patch) | |
| tree | 04ea360d747c6e489e50c9649fe33cd6723f83a8 /data | |
| parent | f195b7aafa878568e7aae8ccc27e3716ae7c21cc (diff) | |
| download | caribou-e1ae6ee91507a47cbe2fe537f3107c17390bc0e2.tar.gz | |
Major re-work of Python modules:
* Created Antler to use new keyboard model via PyGI
* Rearanged settings to accomodate view/model seperation.
* Created in preferences executable, it will be a standalone
generic caribou settings UI where we will eventually get the important
stuff in GNOME's control panel.
* DBusified the UI.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/layouts/Makefile.am | 2 | ||||
| -rw-r--r-- | data/layouts/natural/Makefile.am | 8 | ||||
| -rw-r--r-- | data/layouts/touch/Makefile.am | 8 | ||||
| -rw-r--r-- | data/layouts/touch/ara.json (renamed from data/layouts/natural/ara.json) | 0 | ||||
| -rw-r--r-- | data/layouts/touch/il.json (renamed from data/layouts/natural/il.json) | 0 | ||||
| -rw-r--r-- | data/layouts/touch/us.json (renamed from data/layouts/natural/us.json) | 0 |
7 files changed, 11 insertions, 11 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 98da3b2..745443b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -17,8 +17,8 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) EXTRA_DIST = $(desktop_in_files) $(autostart_in_files) -org.gnome.caribou.gschema.xml.in: $(top_srcdir)/caribou/common/settings.py - PYTHONPATH=${PYTHONPATH}:$(top_srcdir) $(PYTHON) $< > $@ +org.gnome.caribou.gschema.xml.in: $(top_srcdir)/tools/make_schema.py + $< org.gnome.caribou CLEANFILES = $(desktop_DATA) \ $(autostart_DATA) \ diff --git a/data/layouts/Makefile.am b/data/layouts/Makefile.am index 40457f3..9d82efe 100644 --- a/data/layouts/Makefile.am +++ b/data/layouts/Makefile.am @@ -1 +1 @@ -SUBDIRS = natural +SUBDIRS = touch diff --git a/data/layouts/natural/Makefile.am b/data/layouts/natural/Makefile.am deleted file mode 100644 index f02c463..0000000 --- a/data/layouts/natural/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -naturallayoutsdir = $(datadir)/caribou/layouts/natural - -naturallayouts_DATA = \ - ara.json \ - il.json \ - us.json - -EXTRA_DIST = $(naturallayouts_DATA) diff --git a/data/layouts/touch/Makefile.am b/data/layouts/touch/Makefile.am new file mode 100644 index 0000000..f18d728 --- /dev/null +++ b/data/layouts/touch/Makefile.am @@ -0,0 +1,8 @@ +touchlayoutsdir = $(datadir)/caribou/layouts/touch + +touchlayouts_DATA = \ + ara.json \ + il.json \ + us.json + +EXTRA_DIST = $(touchlayouts_DATA) diff --git a/data/layouts/natural/ara.json b/data/layouts/touch/ara.json index e757ee9..e757ee9 100644 --- a/data/layouts/natural/ara.json +++ b/data/layouts/touch/ara.json diff --git a/data/layouts/natural/il.json b/data/layouts/touch/il.json index b0939ed..b0939ed 100644 --- a/data/layouts/natural/il.json +++ b/data/layouts/touch/il.json diff --git a/data/layouts/natural/us.json b/data/layouts/touch/us.json index 20fcf04..20fcf04 100644 --- a/data/layouts/natural/us.json +++ b/data/layouts/touch/us.json |