[regexxer] Fix the localization + add the gsettings schema to the localization

[Fabien Parent <fparent src gnome org>]

commit 675fc510857dadce6f95ffaa5d1231bb7b77b559
Author: Fabien Parent <parent f gmail com>
Date:   Sun Feb 20 15:57:42 2011 +0100

    Fix the localization + add the gsettings schema to the localization

 Makefile.am                    |    6 ++-
 po/POTFILES.in                 |    3 +-
 ui/.gitignore                  |    2 +-
 ui/org.regexxer.gschema.xml    |   69 ----------------------------------------
 ui/org.regexxer.gschema.xml.in |   69 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 75 insertions(+), 74 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4b25bb1..e027347 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,6 +84,7 @@ iconthemedir        = $(datadir)/icons/hicolor
 appicondir          = $(iconthemedir)/48x48/apps
 dist_appicon_DATA   = ui/regexxer.png
 
+gsettingsschema_in_files    = ui/org.regexxer.gschema.xml.in
 gsettingsschema_DATA = ui/org.regexxer.gschema.xml
 
 desktop_in_files    = ui/regexxer.desktop.in
@@ -93,17 +94,18 @@ desktop_DATA        = ui/regexxer.desktop
 dist_intltool       = intltool-extract.in intltool-merge.in intltool-update.in
 stockimages         = ui/stock_save_all_16.png ui/stock_save_all_24.png
 
-dist_noinst_DATA    = $(stockimages) $(dist_intltool) $(desktop_in_files)
+dist_noinst_DATA    = $(stockimages) $(dist_intltool) $(desktop_in_files) $(gsettingsschema_in_files)
 dist_noinst_SCRIPTS = autogen.sh
 
 BUILT_SOURCES       = $(nodist_src_regexxer_SOURCES)
-CLEANFILES          = $(nodist_src_regexxer_SOURCES) $(desktop_DATA)
+CLEANFILES          = $(nodist_src_regexxer_SOURCES) $(desktop_DATA) $(gsettingsschema_DATA)
 DISTCLEANFILES      = intltool-extract intltool-merge intltool-update
 
 pixbuf_csource      = $(GDK_PIXBUF_CSOURCE) --raw
 update_icon_cache   = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
 
 @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_XML_NOMERGE_RULE@
 
 install-data-hook: install-update-icon-cache
 	$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 523ab5e..559446b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,10 @@
 [encoding: UTF-8]
 ui/regexxer.desktop.in
-ui/regexxer.schemas.in
+ui/org.regexxer.gschema.xml.in
 src/filebuffer.cc
 src/filetree.cc
 src/main.cc
 src/mainwindow.cc
-src/pcreshell.cc
 src/prefdialog.cc
 src/statusline.cc
 [type: gettext/glade]ui/mainwindow.ui
diff --git a/ui/.gitignore b/ui/.gitignore
index 84538a4..a7851c8 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -1,3 +1,3 @@
 /regexxer.desktop
-/regexxer.schemas
+/org.regexxer.gschema.xml
 /stockimages.h
diff --git a/ui/org.regexxer.gschema.xml.in b/ui/org.regexxer.gschema.xml.in
new file mode 100644
index 0000000..02f8c72
--- /dev/null
+++ b/ui/org.regexxer.gschema.xml.in
@@ -0,0 +1,69 @@
+<schemalist>
+  <schema id="org.regexxer" path="/apps/regexxer/">
+    <key name="regex-patterns" type="as">
+      <default>[]</default>
+      <_summary>Regex Patterns</_summary>
+      <_description>List of last patterns used for the regex entry.</_description>
+    </key>
+
+    <key name="substitution-patterns" type="as">
+      <default>[]</default>
+      <_summary>Regex Patterns</_summary>
+      <_description>List of last patterns used for the substitution entry.</_description>
+    </key>
+
+    <key name="textview-font" type="s">
+      <default>'Monospace 10'</default>
+      <_summary>Text view font</_summary>
+      <_description>The font used in the file editor.</_description>
+    </key>
+
+    <key name="match-color" type="s">
+      <default>'#9DB8D2'</default>
+      <_summary>Match color</_summary>
+      <_description>The background color used to highlight matches of the search expression.</_description>
+    </key>
+
+    <key name="current-match-color" type="s">
+      <default>'#EED680'</default>
+      <_summary>Current-match color</_summary>
+      <_description>The background color used to highlight the currently selected match of the search expression.</_description>
+    </key>
+
+    <key name="fallback-encoding" type="s">
+      <default>'ISO-8859-15'</default>
+      <_summary>Fallback encoding</_summary>
+      <_description>Name of the character encoding to use if a file is not readable in either UTF-8 or the codeset specified by the current locale. Try "iconv --list" for a complete list of possible values.</_description>
+    </key>
+
+    <key name="window-width" type="i">
+      <default>800</default>
+      <_summary>window width</_summary>
+      <_description>The width of the window.</_description>
+    </key>
+
+    <key name="window-height" type="i">
+      <default>600</default>
+      <_summary>window height</_summary>
+      <_description>The height of the window.</_description>
+    </key>
+
+    <key name="window-position-x" type="i">
+      <default>10</default>
+      <_summary>window x position</_summary>
+      <_description>The X coordinate of the window.</_description>
+    </key>
+
+    <key name="window-position-y" type="i">
+      <default>10</default>
+      <_summary>window y position</_summary>
+      <_description>The Y coordinate of the window.</_description>
+    </key>
+
+    <key name="window-maximized" type="b">
+      <default>false</default>
+      <_summary>window maximization</_summary>
+      <_description>Whether the window is maximized.</_description>
+    </key>
+  </schema>
+</schemalist>