From 330c8e4402663911893a95c1a4a84b83bafc9b11 Mon Sep 17 00:00:00 2001
From: Adam Treat <atreat@rim.com>
Date: Sat, 21 Jan 2012 15:32:10 -0500
Subject: [PATCH] Add resource files and the appropriate paths to enable
 bundling of color schemes and keyboard layouts into the actual executable.

---
 lib/color-schemes/color-schemes.qrc | 24 ++++++++++++++++++++++++
 lib/kb-layouts/kb-layouts.qrc       | 10 ++++++++++
 lib/tools.cpp                       |  4 ++--
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 lib/color-schemes/color-schemes.qrc
 create mode 100644 lib/kb-layouts/kb-layouts.qrc

diff --git a/lib/color-schemes/color-schemes.qrc b/lib/color-schemes/color-schemes.qrc
new file mode 100644
index 0000000..a1be0f3
--- /dev/null
+++ b/lib/color-schemes/color-schemes.qrc
@@ -0,0 +1,24 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource><file>BlackOnLightYellow.schema</file></qresource>
+    <qresource><file>BlackOnRandomLight.colorscheme</file></qresource>
+    <qresource><file>Linux.colorscheme</file></qresource>
+    <qresource><file>BlackOnWhite.schema</file></qresource>
+    <qresource><file>DarkPastels.colorscheme</file></qresource>
+    <qresource><file>GreenOnBlack.colorscheme</file></qresource>
+    <qresource><file>WhiteOnBlack.schema</file></qresource>
+    <qresource><file>historic/vim.schema</file></qresource>
+    <qresource><file>historic/Transparent.schema</file></qresource>
+    <qresource><file>historic/Transparent_MC.schema</file></qresource>
+    <qresource><file>historic/Linux.schema</file></qresource>
+    <qresource><file>historic/Transparent_darkbg.schema</file></qresource>
+    <qresource><file>historic/GreenTint.schema</file></qresource>
+    <qresource><file>historic/Transparent_lightbg.schema</file></qresource>
+    <qresource><file>historic/LightPicture.schema</file></qresource>
+    <qresource><file>historic/DarkPicture.schema</file></qresource>
+    <qresource><file>historic/syscolor.schema</file></qresource>
+    <qresource><file>historic/XTerm.schema</file></qresource>
+    <qresource><file>historic/BlackOnLightColor.schema</file></qresource>
+    <qresource><file>historic/GreenTint_MC.schema</file></qresource>
+    <qresource><file>historic/GreenOnBlack.schema</file></qresource>
+</RCC>
diff --git a/lib/kb-layouts/kb-layouts.qrc b/lib/kb-layouts/kb-layouts.qrc
new file mode 100644
index 0000000..ce85691
--- /dev/null
+++ b/lib/kb-layouts/kb-layouts.qrc
@@ -0,0 +1,10 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource><file>linux.keytab</file></qresource>
+    <qresource><file>solaris.keytab</file></qresource>
+    <qresource><file>macbook.keytab</file></qresource>
+    <qresource><file>default.keytab</file></qresource>
+    <qresource><file>vt420pc.keytab</file></qresource>
+    <qresource><file>historic/x11r5.keytab</file></qresource>
+    <qresource><file>historic/vt100.keytab</file></qresource>
+</RCC>
diff --git a/lib/tools.cpp b/lib/tools.cpp
index 385623c..1512140 100644
--- a/lib/tools.cpp
+++ b/lib/tools.cpp
@@ -12,7 +12,7 @@ But in some cases (apple bundle) there can be more locations).
 QString get_kb_layout_dir()
 {
 #ifdef BUNDLE_KEYBOARDLAYOUTS
-    return QString();
+    return QLatin1String(":/");
 #else
 //    qDebug() << __FILE__ << __FUNCTION__;
 
@@ -53,7 +53,7 @@ But in some cases (apple bundle) there can be more locations).
 QString get_color_schemes_dir()
 {
 #ifdef BUNDLE_COLORSCHEMES
-    return QString();
+    return QLatin1String(":/");
 #else
 //    qDebug() << __FILE__ << __FUNCTION__;