Add French Canadian keyboard layout

[ChangeLog] Added French Canadian keyboard layout

Change-Id: I20efb7aa42cf2b30f6302980b931e2d5c9df930a
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

12 files changed, 219 insertions, 3 deletions

diff --git a/src/config.pri b/src/config.pri
index f44abec6..fc0ac9dd 100644
--- a/src/config.pri
+++ b/src/config.pri
@@ -59,6 +59,7 @@ disable-layouts {
         lang-et_EE \
         lang-fa_FA \
         lang-fi_FI \
+        lang-fr_CA \
         lang-fr_FR \
         lang-he_IL \
         lang-hi_IN \
diff --git a/src/plugins/myscript/plugin/plugin.pro b/src/plugins/myscript/plugin/plugin.pro
index 7e3eef3d..5d2056e0 100644
--- a/src/plugins/myscript/plugin/plugin.pro
+++ b/src/plugins/myscript/plugin/plugin.pro
@@ -60,7 +60,8 @@ contains(CONFIG, lang-es.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/es_E
 contains(CONFIG, lang-et.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/et_EE/handwriting.fallback
 contains(CONFIG, lang-fa.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fa_FA/handwriting.qml
 contains(CONFIG, lang-fi.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fi_FI/handwriting.fallback
-contains(CONFIG, lang-fr.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fr_FR/handwriting.fallback
+contains(CONFIG, lang-fr(_FR)?): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fr_FR/handwriting.fallback
+contains(CONFIG, lang-fr(_CA)?): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fr_CA/handwriting.fallback
 contains(CONFIG, lang-he.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/he_IL/handwriting.qml
 contains(CONFIG, lang-hi.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/hi_IN/handwriting.qml
 contains(CONFIG, lang-hr.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/hr_HR/handwriting.qml
diff --git a/src/plugins/t9write/plugin/plugin.pro b/src/plugins/t9write/plugin/plugin.pro
index 5afff643..495cb988 100644
--- a/src/plugins/t9write/plugin/plugin.pro
+++ b/src/plugins/t9write/plugin/plugin.pro
@@ -36,7 +36,8 @@ t9write-alphabetic {
     contains(CONFIG, lang-et.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/et_EE/handwriting.fallback
     contains(CONFIG, lang-fa.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fa_FA/handwriting.qml
     contains(CONFIG, lang-fi.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fi_FI/handwriting.fallback
-    contains(CONFIG, lang-fr.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fr_FR/handwriting.fallback
+    contains(CONFIG, lang-fr(_FR)?): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fr_FR/handwriting.fallback
+    contains(CONFIG, lang-fr(_CA)?): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fr_CA/handwriting.fallback
     contains(CONFIG, lang-he.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/he_IL/handwriting.qml
     contains(CONFIG, lang-hr.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/hr_HR/handwriting.qml
     contains(CONFIG, lang-hu.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/hu_HU/handwriting.qml
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/dialpad.fallback b/src/virtualkeyboard/content/layouts/fr_CA/dialpad.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/fr_CA/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/digits.fallback b/src/virtualkeyboard/content/layouts/fr_CA/digits.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/fr_CA/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/handwriting.fallback b/src/virtualkeyboard/content/layouts/fr_CA/handwriting.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/fr_CA/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/main.qml b/src/virtualkeyboard/content/layouts/fr_CA/main.qml
new file mode 100644
index 00000000..d71442bf
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/fr_CA/main.qml
@@ -0,0 +1,200 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.VirtualKeyboard 2.1
+
+KeyboardLayout {
+    inputMode: InputEngine.Latin
+    keyWeight: 160
+    KeyboardRow {
+        Key {
+            key: Qt.Key_Q
+            text: "q"
+        }
+        Key {
+            key: Qt.Key_W
+            text: "w"
+        }
+        Key {
+            key: Qt.Key_E
+            text: "e"
+            alternativeKeys: "éèeêë"
+        }
+        Key {
+            key: Qt.Key_R
+            text: "r"
+        }
+        Key {
+            key: Qt.Key_T
+            text: "t"
+        }
+        Key {
+            key: Qt.Key_Y
+            text: "y"
+            alternativeKeys: "yÿ"
+        }
+        Key {
+            key: Qt.Key_U
+            text: "u"
+            alternativeKeys: "ùuûü"
+        }
+        Key {
+            key: Qt.Key_I
+            text: "i"
+            alternativeKeys: "îiï"
+        }
+        Key {
+            key: Qt.Key_O
+            text: "o"
+            alternativeKeys: "ôoœ"
+        }
+        Key {
+            key: Qt.Key_P
+            text: "p"
+        }
+        BackspaceKey {}
+    }
+    KeyboardRow {
+        FillerKey {
+            weight: 56
+        }
+        Key {
+            key: Qt.Key_A
+            text: "a"
+            alternativeKeys: "aàâæ"
+        }
+        Key {
+            key: Qt.Key_S
+            text: "s"
+        }
+        Key {
+            key: Qt.Key_D
+            text: "d"
+        }
+        Key {
+            key: Qt.Key_F
+            text: "f"
+        }
+        Key {
+            key: Qt.Key_G
+            text: "g"
+        }
+        Key {
+            key: Qt.Key_H
+            text: "h"
+        }
+        Key {
+            key: Qt.Key_J
+            text: "j"
+        }
+        Key {
+            key: Qt.Key_K
+            text: "k"
+        }
+        Key {
+            key: Qt.Key_L
+            text: "l"
+        }
+        EnterKey {
+            weight: 283
+        }
+    }
+    KeyboardRow {
+        keyWeight: 156
+        ShiftKey {}
+        Key {
+            key: Qt.Key_Z
+            text: "z"
+        }
+        Key {
+            key: Qt.Key_X
+            text: "x"
+        }
+        Key {
+            key: Qt.Key_C
+            text: "c"
+            alternativeKeys: "cç"
+        }
+        Key {
+            key: Qt.Key_V
+            text: "v"
+        }
+        Key {
+            key: Qt.Key_B
+            text: "b"
+        }
+        Key {
+            key: Qt.Key_N
+            text: "n"
+        }
+        Key {
+            key: Qt.Key_M
+            text: "m"
+        }
+        Key {
+            key: Qt.Key_Comma
+            text: ","
+        }
+        Key {
+            key: Qt.Key_Period
+            text: "."
+        }
+        ShiftKey {
+            weight: 204
+        }
+    }
+    KeyboardRow {
+        keyWeight: 154
+        SymbolModeKey {
+            weight: 217
+        }
+        ChangeLanguageKey {
+            weight: 154
+        }
+        HandwritingModeKey {
+            weight: 154
+        }
+        SpaceKey {
+            weight: 864
+        }
+        Key {
+            key: Qt.Key_Apostrophe
+            text: "'"
+        }
+        Key {
+            key: 0xE000
+            text: ":-)"
+            alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ]
+        }
+        HideKeyboardKey {
+            weight: 204
+        }
+    }
+}
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/numbers.fallback b/src/virtualkeyboard/content/layouts/fr_CA/numbers.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/fr_CA/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/symbols.fallback b/src/virtualkeyboard/content/layouts/fr_CA/symbols.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/fr_CA/symbols.fallback
diff --git a/src/virtualkeyboard/doc/src/includes/layouts.qdocinc b/src/virtualkeyboard/doc/src/includes/layouts.qdocinc
index 3d064b23..6bd0148a 100644
--- a/src/virtualkeyboard/doc/src/includes/layouts.qdocinc
+++ b/src/virtualkeyboard/doc/src/includes/layouts.qdocinc
@@ -15,6 +15,7 @@ The Virtual Keyboard supports the following languages:
     \li \l {Estonian Layout}{Estonian}
     \li \l {Finnish Layout}{Finnish}
     \li \l {French Layout}{French}
+    \li \l {French Layout (Canadian)}{French (Canadian)}
     \li \l {German Layout}{German}
     \li \l {Greek Layout}{Greek}
     \li \l {Greek Layout (Latin)}{Greek (Latin)}
diff --git a/src/virtualkeyboard/doc/src/layouts.qdoc b/src/virtualkeyboard/doc/src/layouts.qdoc
index 327c26e9..efe21f2e 100644
--- a/src/virtualkeyboard/doc/src/layouts.qdoc
+++ b/src/virtualkeyboard/doc/src/layouts.qdoc
@@ -84,6 +84,10 @@ The next sections illustrate each layout.
 
 \image layouts/qtvirtualkeyboard-layout-fr_FR.png
 
+\section2 French Layout (Canadian)
+
+\image layouts/qtvirtualkeyboard-layout-fr_CA.png
+
 \section2 German Layout
 
 \image layouts/qtvirtualkeyboard-layout-de_DE.png
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro
index 9437ae63..eeca4b7e 100644
--- a/src/virtualkeyboard/virtualkeyboard.pro
+++ b/src/virtualkeyboard/virtualkeyboard.pro
@@ -173,7 +173,15 @@ contains(CONFIG, lang-fi.*) {
         content/layouts/fi_FI/numbers.fallback \
         content/layouts/fi_FI/symbols.fallback
 }
-contains(CONFIG, lang-fr.*) {
+contains(CONFIG, lang-fr(_CA)?) {
+    LAYOUT_FILES += \
+        content/layouts/fr_CA/dialpad.fallback \
+        content/layouts/fr_CA/digits.fallback \
+        content/layouts/fr_CA/main.qml \
+        content/layouts/fr_CA/numbers.fallback \
+        content/layouts/fr_CA/symbols.fallback
+}
+contains(CONFIG, lang-fr(_FR)?) {
     LAYOUT_FILES += \
         content/layouts/fr_FR/dialpad.fallback \
         content/layouts/fr_FR/digits.fallback \