Merge lp:~michael-sheldon/ubuntu-keyboard/visual-refresh into lp:ubuntu-keyboard

Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: no longer in the source branch.
Merged at revision: 442
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/visual-refresh
Merge into: lp:ubuntu-keyboard
Diff against target: 3229 lines (+1006/-358)
150 files modified
plugins/ar/qml/Keyboard_ar.qml (+1/-1)
plugins/ar/qml/Keyboard_ar_email.qml (+1/-1)
plugins/ar/qml/Keyboard_ar_url.qml (+1/-1)
plugins/ar/qml/Keyboard_ar_url_search.qml (+1/-1)
plugins/az/qml/Keyboard_az.qml (+1/-1)
plugins/az/qml/Keyboard_az_email.qml (+1/-1)
plugins/az/qml/Keyboard_az_url.qml (+1/-1)
plugins/az/qml/Keyboard_az_url_search.qml (+1/-1)
plugins/bs/qml/Keyboard_bs.qml (+1/-1)
plugins/bs/qml/Keyboard_bs_email.qml (+1/-1)
plugins/bs/qml/Keyboard_bs_url.qml (+1/-1)
plugins/bs/qml/Keyboard_bs_url_search.qml (+1/-1)
plugins/ca/qml/Keyboard_ca.qml (+1/-1)
plugins/ca/qml/Keyboard_ca_email.qml (+1/-1)
plugins/ca/qml/Keyboard_ca_url.qml (+1/-1)
plugins/ca/qml/Keyboard_ca_url_search.qml (+1/-1)
plugins/cs/qml/Keyboard_cs.qml (+1/-1)
plugins/cs/qml/Keyboard_cs_email.qml (+1/-1)
plugins/cs/qml/Keyboard_cs_url.qml (+1/-1)
plugins/cs/qml/Keyboard_cs_url_search.qml (+1/-1)
plugins/da/qml/Keyboard_da.qml (+1/-1)
plugins/da/qml/Keyboard_da_email.qml (+1/-1)
plugins/da/qml/Keyboard_da_url.qml (+1/-1)
plugins/da/qml/Keyboard_da_url_search.qml (+1/-1)
plugins/de/qml/Keyboard_de.qml (+1/-1)
plugins/de/qml/Keyboard_de_email.qml (+1/-1)
plugins/de/qml/Keyboard_de_url.qml (+1/-1)
plugins/de/qml/Keyboard_de_url_search.qml (+1/-1)
plugins/el/qml/Keyboard_el.qml (+1/-1)
plugins/el/qml/Keyboard_el_email.qml (+1/-1)
plugins/el/qml/Keyboard_el_url.qml (+1/-1)
plugins/el/qml/Keyboard_el_url_search.qml (+1/-1)
plugins/emoji/qml/Keyboard_emoji.qml (+1/-1)
plugins/en/qml/Keyboard_en.qml (+1/-1)
plugins/en/qml/Keyboard_en_email.qml (+1/-1)
plugins/en/qml/Keyboard_en_url.qml (+1/-1)
plugins/en/qml/Keyboard_en_url_search.qml (+1/-1)
plugins/es/qml/Keyboard_es.qml (+1/-1)
plugins/es/qml/Keyboard_es_email.qml (+1/-1)
plugins/es/qml/Keyboard_es_url.qml (+1/-1)
plugins/es/qml/Keyboard_es_url_search.qml (+1/-1)
plugins/fi/qml/Keyboard_fi.qml (+1/-1)
plugins/fi/qml/Keyboard_fi_email.qml (+1/-1)
plugins/fi/qml/Keyboard_fi_url.qml (+1/-1)
plugins/fi/qml/Keyboard_fi_url_search.qml (+1/-1)
plugins/fr/qml/Keyboard_fr.qml (+1/-1)
plugins/fr/qml/Keyboard_fr_email.qml (+1/-1)
plugins/fr/qml/Keyboard_fr_url.qml (+1/-1)
plugins/fr/qml/Keyboard_fr_url_search.qml (+1/-1)
plugins/gd/qml/Keyboard_gd.qml (+1/-1)
plugins/gd/qml/Keyboard_gd_email.qml (+1/-1)
plugins/gd/qml/Keyboard_gd_url.qml (+1/-1)
plugins/gd/qml/Keyboard_gd_url_search.qml (+1/-1)
plugins/he/qml/Keyboard_he.qml (+1/-1)
plugins/he/qml/Keyboard_he_email.qml (+1/-1)
plugins/he/qml/Keyboard_he_url.qml (+1/-1)
plugins/he/qml/Keyboard_he_url_search.qml (+1/-1)
plugins/hr/qml/Keyboard_hr.qml (+1/-1)
plugins/hr/qml/Keyboard_hr_email.qml (+1/-1)
plugins/hr/qml/Keyboard_hr_url.qml (+1/-1)
plugins/hr/qml/Keyboard_hr_url_search.qml (+1/-1)
plugins/hu/qml/Keyboard_hu.qml (+1/-1)
plugins/hu/qml/Keyboard_hu_email.qml (+1/-1)
plugins/hu/qml/Keyboard_hu_url.qml (+1/-1)
plugins/hu/qml/Keyboard_hu_url_search.qml (+1/-1)
plugins/is/qml/Keyboard_is.qml (+1/-1)
plugins/is/qml/Keyboard_is_email.qml (+1/-1)
plugins/is/qml/Keyboard_is_url.qml (+1/-1)
plugins/is/qml/Keyboard_is_url_search.qml (+1/-1)
plugins/it/qml/Keyboard_it.qml (+1/-1)
plugins/it/qml/Keyboard_it_email.qml (+1/-1)
plugins/it/qml/Keyboard_it_url.qml (+1/-1)
plugins/it/qml/Keyboard_it_url_search.qml (+1/-1)
plugins/nb/qml/Keyboard_nb.qml (+1/-1)
plugins/nb/qml/Keyboard_nb_email.qml (+1/-1)
plugins/nb/qml/Keyboard_nb_url.qml (+1/-1)
plugins/nb/qml/Keyboard_nb_url_search.qml (+1/-1)
plugins/nl/qml/Keyboard_nl.qml (+1/-1)
plugins/nl/qml/Keyboard_nl_email.qml (+1/-1)
plugins/nl/qml/Keyboard_nl_url.qml (+1/-1)
plugins/nl/qml/Keyboard_nl_url_search.qml (+1/-1)
plugins/pinyin/qml/Keyboard_zh.qml (+1/-1)
plugins/pinyin/qml/Keyboard_zh_email.qml (+1/-1)
plugins/pinyin/qml/Keyboard_zh_url.qml (+1/-1)
plugins/pinyin/qml/Keyboard_zh_url_search.qml (+1/-1)
plugins/pl/qml/Keyboard_pl.qml (+1/-1)
plugins/pl/qml/Keyboard_pl_email.qml (+1/-1)
plugins/pl/qml/Keyboard_pl_url.qml (+1/-1)
plugins/pl/qml/Keyboard_pl_url_search.qml (+1/-1)
plugins/pt/qml/Keyboard_pt.qml (+1/-1)
plugins/pt/qml/Keyboard_pt_email.qml (+1/-1)
plugins/pt/qml/Keyboard_pt_url.qml (+1/-1)
plugins/pt/qml/Keyboard_pt_url_search.qml (+1/-1)
plugins/ro/qml/Keyboard_ro.qml (+1/-1)
plugins/ro/qml/Keyboard_ro_email.qml (+1/-1)
plugins/ro/qml/Keyboard_ro_url.qml (+1/-1)
plugins/ro/qml/Keyboard_ro_url_search.qml (+1/-1)
plugins/ru/qml/Keyboard_ru.qml (+1/-1)
plugins/ru/qml/Keyboard_ru_email.qml (+1/-1)
plugins/ru/qml/Keyboard_ru_url.qml (+1/-1)
plugins/ru/qml/Keyboard_ru_url_search.qml (+1/-1)
plugins/sl/qml/Keyboard_sl.qml (+1/-1)
plugins/sl/qml/Keyboard_sl_email.qml (+1/-1)
plugins/sl/qml/Keyboard_sl_url.qml (+1/-1)
plugins/sl/qml/Keyboard_sl_url_search.qml (+1/-1)
plugins/sr/qml/Keyboard_sr.qml (+1/-1)
plugins/sr/qml/Keyboard_sr_email.qml (+1/-1)
plugins/sr/qml/Keyboard_sr_url.qml (+1/-1)
plugins/sr/qml/Keyboard_sr_url_search.qml (+1/-1)
plugins/sv/qml/Keyboard_sv.qml (+1/-1)
plugins/sv/qml/Keyboard_sv_email.qml (+1/-1)
plugins/sv/qml/Keyboard_sv_url.qml (+1/-1)
plugins/sv/qml/Keyboard_sv_url_search.qml (+1/-1)
plugins/uk/qml/Keyboard_uk.qml (+1/-1)
plugins/uk/qml/Keyboard_uk_email.qml (+1/-1)
plugins/uk/qml/Keyboard_uk_url.qml (+1/-1)
plugins/uk/qml/Keyboard_uk_url_search.qml (+1/-1)
qml/Keyboard.qml (+23/-10)
qml/KeyboardContainer.qml (+1/-1)
qml/WordRibbon.qml (+9/-9)
qml/images/keyboard-caps-disabled.svg (+180/-0)
qml/images/keyboard-caps-enabled.svg (+181/-0)
qml/images/keyboard-caps-locked.svg (+186/-0)
qml/keys/ActionKey.qml (+20/-11)
qml/keys/BackspaceKey.qml (+1/-1)
qml/keys/CharKey.qml (+26/-23)
qml/keys/DropShadow.qml (+1/-1)
qml/keys/ExtendedKeysSelector.qml (+2/-4)
qml/keys/KeyPad.qml (+1/-1)
qml/keys/LanguageKey.qml (+1/-1)
qml/keys/LanguageMenu.qml (+3/-39)
qml/keys/Magnifier.qml (+2/-2)
qml/keys/OneTwoKey.qml (+1/-4)
qml/keys/PressArea.qml (+1/-1)
qml/keys/ReturnKey.qml (+2/-4)
qml/keys/ShiftKey.qml (+5/-6)
qml/keys/SmallSpaceKey.qml (+34/-0)
qml/keys/SpaceKey.qml (+15/-3)
qml/keys/Spacer.qml (+1/-1)
qml/keys/SymbolShiftKey.qml (+1/-3)
qml/keys/UrlKey.qml (+1/-2)
qml/keys/key_constants.js (+38/-23)
qml/keys/languages.js (+52/-0)
qml/languages/Keyboard_numbers.qml (+48/-43)
qml/languages/Keyboard_symbols.qml (+1/-1)
qml/languages/Keyboard_telephone.qml (+48/-43)
qml/qml.pro (+1/-1)
tests/autopilot/ubuntu_keyboard/emulators/keyboard.py (+1/-1)
tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+1/-1)
tests/testlayout/qml/Keyboard_testlayout.qml (+1/-1)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/visual-refresh
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+283480@code.launchpad.net

Commit message

Update keyboard visuals to match new design spec

Description of the change

Update keyboard visuals to match new design spec

To post a comment you must log in.
438. By Michael Sheldon

Switch suru keyboard enter icon

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
439. By Michael Sheldon

Update number and telephone layout to new style

440. By Michael Sheldon

Merge changes

441. By Michael Sheldon

Add missing small space key

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
442. By Michael Sheldon

Fix tablet detection in portrait orientation and switch to sizing based on proportion of screen

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
443. By Michael Sheldon

Fix sizing on URL key

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
444. By Michael Sheldon

Tweak word ribbon sizing and boldness

445. By Michael Sheldon

Fix alignment of bottom row

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
446. By Michael Sheldon

Update phone sizing

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
447. By Michael Sheldon

Fix key font sizing in landscape

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
448. By Michael Sheldon

Fix word ribbon sizing

449. By Michael Sheldon

Fix annotation sizing

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
450. By Michael Sheldon

Tweak annotation size and selection colours

451. By Michael Sheldon

Update imports

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
452. By Michael Sheldon

Add new keyboard shift key icons

453. By Michael Sheldon

Fix installation of new keyboard assets

454. By Michael Sheldon

Tweak annotation font size

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
455. By Michael Sheldon

Fix dismiss positioning for new layouts

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
456. By Michael Sheldon

Remove unused icon references

457. By Michael Sheldon

Fix light font

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
458. By Michael Sheldon

Update telephone layout visuals to remove keys that can't be handled by libphonenumber

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
459. By Michael Sheldon

Fix dragging keyboard from top with no word ribbon

460. By Michael Sheldon

Merge changes

461. By Michael Sheldon

Reduce word ribbon size on phones slightly

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/ar/qml/Keyboard_ar.qml'
--- plugins/ar/qml/Keyboard_ar.qml 2015-04-13 10:54:12 +0000
+++ plugins/ar/qml/Keyboard_ar.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ar/qml/Keyboard_ar_email.qml'
--- plugins/ar/qml/Keyboard_ar_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/ar/qml/Keyboard_ar_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ar/qml/Keyboard_ar_url.qml'
--- plugins/ar/qml/Keyboard_ar_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/ar/qml/Keyboard_ar_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ar/qml/Keyboard_ar_url_search.qml'
--- plugins/ar/qml/Keyboard_ar_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/ar/qml/Keyboard_ar_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/az/qml/Keyboard_az.qml'
--- plugins/az/qml/Keyboard_az.qml 2015-04-13 10:54:12 +0000
+++ plugins/az/qml/Keyboard_az.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/az/qml/Keyboard_az_email.qml'
--- plugins/az/qml/Keyboard_az_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/az/qml/Keyboard_az_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/az/qml/Keyboard_az_url.qml'
--- plugins/az/qml/Keyboard_az_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/az/qml/Keyboard_az_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/az/qml/Keyboard_az_url_search.qml'
--- plugins/az/qml/Keyboard_az_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/az/qml/Keyboard_az_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/bs/qml/Keyboard_bs.qml'
--- plugins/bs/qml/Keyboard_bs.qml 2015-04-13 10:54:12 +0000
+++ plugins/bs/qml/Keyboard_bs.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/bs/qml/Keyboard_bs_email.qml'
--- plugins/bs/qml/Keyboard_bs_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/bs/qml/Keyboard_bs_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/bs/qml/Keyboard_bs_url.qml'
--- plugins/bs/qml/Keyboard_bs_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/bs/qml/Keyboard_bs_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/bs/qml/Keyboard_bs_url_search.qml'
--- plugins/bs/qml/Keyboard_bs_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/bs/qml/Keyboard_bs_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ca/qml/Keyboard_ca.qml'
--- plugins/ca/qml/Keyboard_ca.qml 2015-04-13 10:54:12 +0000
+++ plugins/ca/qml/Keyboard_ca.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ca/qml/Keyboard_ca_email.qml'
--- plugins/ca/qml/Keyboard_ca_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/ca/qml/Keyboard_ca_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ca/qml/Keyboard_ca_url.qml'
--- plugins/ca/qml/Keyboard_ca_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/ca/qml/Keyboard_ca_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ca/qml/Keyboard_ca_url_search.qml'
--- plugins/ca/qml/Keyboard_ca_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/ca/qml/Keyboard_ca_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/cs/qml/Keyboard_cs.qml'
--- plugins/cs/qml/Keyboard_cs.qml 2015-04-13 10:54:12 +0000
+++ plugins/cs/qml/Keyboard_cs.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/cs/qml/Keyboard_cs_email.qml'
--- plugins/cs/qml/Keyboard_cs_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/cs/qml/Keyboard_cs_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/cs/qml/Keyboard_cs_url.qml'
--- plugins/cs/qml/Keyboard_cs_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/cs/qml/Keyboard_cs_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/cs/qml/Keyboard_cs_url_search.qml'
--- plugins/cs/qml/Keyboard_cs_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/cs/qml/Keyboard_cs_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/da/qml/Keyboard_da.qml'
--- plugins/da/qml/Keyboard_da.qml 2015-04-13 10:54:12 +0000
+++ plugins/da/qml/Keyboard_da.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/da/qml/Keyboard_da_email.qml'
--- plugins/da/qml/Keyboard_da_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/da/qml/Keyboard_da_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/da/qml/Keyboard_da_url.qml'
--- plugins/da/qml/Keyboard_da_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/da/qml/Keyboard_da_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/da/qml/Keyboard_da_url_search.qml'
--- plugins/da/qml/Keyboard_da_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/da/qml/Keyboard_da_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/de/qml/Keyboard_de.qml'
--- plugins/de/qml/Keyboard_de.qml 2015-04-13 10:54:12 +0000
+++ plugins/de/qml/Keyboard_de.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/de/qml/Keyboard_de_email.qml'
--- plugins/de/qml/Keyboard_de_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/de/qml/Keyboard_de_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/de/qml/Keyboard_de_url.qml'
--- plugins/de/qml/Keyboard_de_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/de/qml/Keyboard_de_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/de/qml/Keyboard_de_url_search.qml'
--- plugins/de/qml/Keyboard_de_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/de/qml/Keyboard_de_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/el/qml/Keyboard_el.qml'
--- plugins/el/qml/Keyboard_el.qml 2015-05-07 13:16:07 +0000
+++ plugins/el/qml/Keyboard_el.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/el/qml/Keyboard_el_email.qml'
--- plugins/el/qml/Keyboard_el_email.qml 2015-05-07 13:16:07 +0000
+++ plugins/el/qml/Keyboard_el_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/el/qml/Keyboard_el_url.qml'
--- plugins/el/qml/Keyboard_el_url.qml 2015-05-07 13:16:07 +0000
+++ plugins/el/qml/Keyboard_el_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/el/qml/Keyboard_el_url_search.qml'
--- plugins/el/qml/Keyboard_el_url_search.qml 2015-05-07 13:16:07 +0000
+++ plugins/el/qml/Keyboard_el_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/emoji/qml/Keyboard_emoji.qml'
--- plugins/emoji/qml/Keyboard_emoji.qml 2015-04-13 10:54:12 +0000
+++ plugins/emoji/qml/Keyboard_emoji.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
19import "emoji.js" as Emoji19import "emoji.js" as Emoji
2020
2121
=== modified file 'plugins/en/qml/Keyboard_en.qml'
--- plugins/en/qml/Keyboard_en.qml 2015-04-13 10:54:12 +0000
+++ plugins/en/qml/Keyboard_en.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/en/qml/Keyboard_en_email.qml'
--- plugins/en/qml/Keyboard_en_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/en/qml/Keyboard_en_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/en/qml/Keyboard_en_url.qml'
--- plugins/en/qml/Keyboard_en_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/en/qml/Keyboard_en_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/en/qml/Keyboard_en_url_search.qml'
--- plugins/en/qml/Keyboard_en_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/en/qml/Keyboard_en_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/es/qml/Keyboard_es.qml'
--- plugins/es/qml/Keyboard_es.qml 2015-04-13 10:54:12 +0000
+++ plugins/es/qml/Keyboard_es.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/es/qml/Keyboard_es_email.qml'
--- plugins/es/qml/Keyboard_es_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/es/qml/Keyboard_es_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/es/qml/Keyboard_es_url.qml'
--- plugins/es/qml/Keyboard_es_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/es/qml/Keyboard_es_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/es/qml/Keyboard_es_url_search.qml'
--- plugins/es/qml/Keyboard_es_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/es/qml/Keyboard_es_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/fi/qml/Keyboard_fi.qml'
--- plugins/fi/qml/Keyboard_fi.qml 2015-04-13 10:54:12 +0000
+++ plugins/fi/qml/Keyboard_fi.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/fi/qml/Keyboard_fi_email.qml'
--- plugins/fi/qml/Keyboard_fi_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/fi/qml/Keyboard_fi_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/fi/qml/Keyboard_fi_url.qml'
--- plugins/fi/qml/Keyboard_fi_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/fi/qml/Keyboard_fi_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/fi/qml/Keyboard_fi_url_search.qml'
--- plugins/fi/qml/Keyboard_fi_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/fi/qml/Keyboard_fi_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/fr/qml/Keyboard_fr.qml'
--- plugins/fr/qml/Keyboard_fr.qml 2015-04-13 10:54:12 +0000
+++ plugins/fr/qml/Keyboard_fr.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/fr/qml/Keyboard_fr_email.qml'
--- plugins/fr/qml/Keyboard_fr_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/fr/qml/Keyboard_fr_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/fr/qml/Keyboard_fr_url.qml'
--- plugins/fr/qml/Keyboard_fr_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/fr/qml/Keyboard_fr_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/fr/qml/Keyboard_fr_url_search.qml'
--- plugins/fr/qml/Keyboard_fr_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/fr/qml/Keyboard_fr_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/gd/qml/Keyboard_gd.qml'
--- plugins/gd/qml/Keyboard_gd.qml 2015-05-07 13:16:07 +0000
+++ plugins/gd/qml/Keyboard_gd.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/gd/qml/Keyboard_gd_email.qml'
--- plugins/gd/qml/Keyboard_gd_email.qml 2015-05-07 13:16:07 +0000
+++ plugins/gd/qml/Keyboard_gd_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/gd/qml/Keyboard_gd_url.qml'
--- plugins/gd/qml/Keyboard_gd_url.qml 2015-05-07 13:16:07 +0000
+++ plugins/gd/qml/Keyboard_gd_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/gd/qml/Keyboard_gd_url_search.qml'
--- plugins/gd/qml/Keyboard_gd_url_search.qml 2015-05-07 13:16:07 +0000
+++ plugins/gd/qml/Keyboard_gd_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/he/qml/Keyboard_he.qml'
--- plugins/he/qml/Keyboard_he.qml 2015-04-13 10:54:12 +0000
+++ plugins/he/qml/Keyboard_he.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/he/qml/Keyboard_he_email.qml'
--- plugins/he/qml/Keyboard_he_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/he/qml/Keyboard_he_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/he/qml/Keyboard_he_url.qml'
--- plugins/he/qml/Keyboard_he_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/he/qml/Keyboard_he_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/he/qml/Keyboard_he_url_search.qml'
--- plugins/he/qml/Keyboard_he_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/he/qml/Keyboard_he_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/hr/qml/Keyboard_hr.qml'
--- plugins/hr/qml/Keyboard_hr.qml 2015-04-13 10:54:12 +0000
+++ plugins/hr/qml/Keyboard_hr.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/hr/qml/Keyboard_hr_email.qml'
--- plugins/hr/qml/Keyboard_hr_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/hr/qml/Keyboard_hr_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/hr/qml/Keyboard_hr_url.qml'
--- plugins/hr/qml/Keyboard_hr_url.qml 2015-05-07 13:04:09 +0000
+++ plugins/hr/qml/Keyboard_hr_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/hr/qml/Keyboard_hr_url_search.qml'
--- plugins/hr/qml/Keyboard_hr_url_search.qml 2015-05-07 13:04:09 +0000
+++ plugins/hr/qml/Keyboard_hr_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/hu/qml/Keyboard_hu.qml'
--- plugins/hu/qml/Keyboard_hu.qml 2015-04-13 10:54:12 +0000
+++ plugins/hu/qml/Keyboard_hu.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/hu/qml/Keyboard_hu_email.qml'
--- plugins/hu/qml/Keyboard_hu_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/hu/qml/Keyboard_hu_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/hu/qml/Keyboard_hu_url.qml'
--- plugins/hu/qml/Keyboard_hu_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/hu/qml/Keyboard_hu_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/hu/qml/Keyboard_hu_url_search.qml'
--- plugins/hu/qml/Keyboard_hu_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/hu/qml/Keyboard_hu_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/is/qml/Keyboard_is.qml'
--- plugins/is/qml/Keyboard_is.qml 2016-01-05 16:45:41 +0000
+++ plugins/is/qml/Keyboard_is.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/is/qml/Keyboard_is_email.qml'
--- plugins/is/qml/Keyboard_is_email.qml 2016-01-05 16:45:41 +0000
+++ plugins/is/qml/Keyboard_is_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/is/qml/Keyboard_is_url.qml'
--- plugins/is/qml/Keyboard_is_url.qml 2016-01-05 16:45:41 +0000
+++ plugins/is/qml/Keyboard_is_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/is/qml/Keyboard_is_url_search.qml'
--- plugins/is/qml/Keyboard_is_url_search.qml 2016-01-05 16:45:41 +0000
+++ plugins/is/qml/Keyboard_is_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/it/qml/Keyboard_it.qml'
--- plugins/it/qml/Keyboard_it.qml 2015-04-13 10:54:12 +0000
+++ plugins/it/qml/Keyboard_it.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/it/qml/Keyboard_it_email.qml'
--- plugins/it/qml/Keyboard_it_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/it/qml/Keyboard_it_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/it/qml/Keyboard_it_url.qml'
--- plugins/it/qml/Keyboard_it_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/it/qml/Keyboard_it_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/it/qml/Keyboard_it_url_search.qml'
--- plugins/it/qml/Keyboard_it_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/it/qml/Keyboard_it_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/nb/qml/Keyboard_nb.qml'
--- plugins/nb/qml/Keyboard_nb.qml 2015-05-07 13:16:07 +0000
+++ plugins/nb/qml/Keyboard_nb.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/nb/qml/Keyboard_nb_email.qml'
--- plugins/nb/qml/Keyboard_nb_email.qml 2015-05-07 13:16:07 +0000
+++ plugins/nb/qml/Keyboard_nb_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/nb/qml/Keyboard_nb_url.qml'
--- plugins/nb/qml/Keyboard_nb_url.qml 2015-05-07 13:16:07 +0000
+++ plugins/nb/qml/Keyboard_nb_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/nb/qml/Keyboard_nb_url_search.qml'
--- plugins/nb/qml/Keyboard_nb_url_search.qml 2015-05-07 13:16:07 +0000
+++ plugins/nb/qml/Keyboard_nb_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/nl/qml/Keyboard_nl.qml'
--- plugins/nl/qml/Keyboard_nl.qml 2015-04-13 10:54:12 +0000
+++ plugins/nl/qml/Keyboard_nl.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/nl/qml/Keyboard_nl_email.qml'
--- plugins/nl/qml/Keyboard_nl_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/nl/qml/Keyboard_nl_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/nl/qml/Keyboard_nl_url.qml'
--- plugins/nl/qml/Keyboard_nl_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/nl/qml/Keyboard_nl_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/nl/qml/Keyboard_nl_url_search.qml'
--- plugins/nl/qml/Keyboard_nl_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/nl/qml/Keyboard_nl_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pinyin/qml/Keyboard_zh.qml'
--- plugins/pinyin/qml/Keyboard_zh.qml 2015-04-13 10:54:12 +0000
+++ plugins/pinyin/qml/Keyboard_zh.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pinyin/qml/Keyboard_zh_email.qml'
--- plugins/pinyin/qml/Keyboard_zh_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/pinyin/qml/Keyboard_zh_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pinyin/qml/Keyboard_zh_url.qml'
--- plugins/pinyin/qml/Keyboard_zh_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/pinyin/qml/Keyboard_zh_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pinyin/qml/Keyboard_zh_url_search.qml'
--- plugins/pinyin/qml/Keyboard_zh_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/pinyin/qml/Keyboard_zh_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pl/qml/Keyboard_pl.qml'
--- plugins/pl/qml/Keyboard_pl.qml 2015-04-13 10:54:12 +0000
+++ plugins/pl/qml/Keyboard_pl.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pl/qml/Keyboard_pl_email.qml'
--- plugins/pl/qml/Keyboard_pl_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/pl/qml/Keyboard_pl_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pl/qml/Keyboard_pl_url.qml'
--- plugins/pl/qml/Keyboard_pl_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/pl/qml/Keyboard_pl_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pl/qml/Keyboard_pl_url_search.qml'
--- plugins/pl/qml/Keyboard_pl_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/pl/qml/Keyboard_pl_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pt/qml/Keyboard_pt.qml'
--- plugins/pt/qml/Keyboard_pt.qml 2015-04-13 10:54:12 +0000
+++ plugins/pt/qml/Keyboard_pt.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pt/qml/Keyboard_pt_email.qml'
--- plugins/pt/qml/Keyboard_pt_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/pt/qml/Keyboard_pt_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pt/qml/Keyboard_pt_url.qml'
--- plugins/pt/qml/Keyboard_pt_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/pt/qml/Keyboard_pt_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/pt/qml/Keyboard_pt_url_search.qml'
--- plugins/pt/qml/Keyboard_pt_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/pt/qml/Keyboard_pt_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ro/qml/Keyboard_ro.qml'
--- plugins/ro/qml/Keyboard_ro.qml 2015-05-06 10:40:33 +0000
+++ plugins/ro/qml/Keyboard_ro.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ro/qml/Keyboard_ro_email.qml'
--- plugins/ro/qml/Keyboard_ro_email.qml 2015-05-06 10:40:33 +0000
+++ plugins/ro/qml/Keyboard_ro_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ro/qml/Keyboard_ro_url.qml'
--- plugins/ro/qml/Keyboard_ro_url.qml 2015-05-06 10:40:33 +0000
+++ plugins/ro/qml/Keyboard_ro_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ro/qml/Keyboard_ro_url_search.qml'
--- plugins/ro/qml/Keyboard_ro_url_search.qml 2015-05-06 10:40:33 +0000
+++ plugins/ro/qml/Keyboard_ro_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ru/qml/Keyboard_ru.qml'
--- plugins/ru/qml/Keyboard_ru.qml 2015-04-13 10:54:12 +0000
+++ plugins/ru/qml/Keyboard_ru.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ru/qml/Keyboard_ru_email.qml'
--- plugins/ru/qml/Keyboard_ru_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/ru/qml/Keyboard_ru_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ru/qml/Keyboard_ru_url.qml'
--- plugins/ru/qml/Keyboard_ru_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/ru/qml/Keyboard_ru_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/ru/qml/Keyboard_ru_url_search.qml'
--- plugins/ru/qml/Keyboard_ru_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/ru/qml/Keyboard_ru_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sl/qml/Keyboard_sl.qml'
--- plugins/sl/qml/Keyboard_sl.qml 2015-05-07 13:16:07 +0000
+++ plugins/sl/qml/Keyboard_sl.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sl/qml/Keyboard_sl_email.qml'
--- plugins/sl/qml/Keyboard_sl_email.qml 2015-05-15 12:21:01 +0000
+++ plugins/sl/qml/Keyboard_sl_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sl/qml/Keyboard_sl_url.qml'
--- plugins/sl/qml/Keyboard_sl_url.qml 2015-05-15 12:21:01 +0000
+++ plugins/sl/qml/Keyboard_sl_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sl/qml/Keyboard_sl_url_search.qml'
--- plugins/sl/qml/Keyboard_sl_url_search.qml 2015-05-15 12:21:01 +0000
+++ plugins/sl/qml/Keyboard_sl_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sr/qml/Keyboard_sr.qml'
--- plugins/sr/qml/Keyboard_sr.qml 2015-04-13 10:54:12 +0000
+++ plugins/sr/qml/Keyboard_sr.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sr/qml/Keyboard_sr_email.qml'
--- plugins/sr/qml/Keyboard_sr_email.qml 2015-04-13 10:54:12 +0000
+++ plugins/sr/qml/Keyboard_sr_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sr/qml/Keyboard_sr_url.qml'
--- plugins/sr/qml/Keyboard_sr_url.qml 2015-04-13 10:54:12 +0000
+++ plugins/sr/qml/Keyboard_sr_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sr/qml/Keyboard_sr_url_search.qml'
--- plugins/sr/qml/Keyboard_sr_url_search.qml 2015-04-13 10:54:12 +0000
+++ plugins/sr/qml/Keyboard_sr_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sv/qml/Keyboard_sv.qml'
--- plugins/sv/qml/Keyboard_sv.qml 2015-04-20 14:03:56 +0000
+++ plugins/sv/qml/Keyboard_sv.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sv/qml/Keyboard_sv_email.qml'
--- plugins/sv/qml/Keyboard_sv_email.qml 2015-04-20 14:03:56 +0000
+++ plugins/sv/qml/Keyboard_sv_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sv/qml/Keyboard_sv_url.qml'
--- plugins/sv/qml/Keyboard_sv_url.qml 2015-04-20 14:03:56 +0000
+++ plugins/sv/qml/Keyboard_sv_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/sv/qml/Keyboard_sv_url_search.qml'
--- plugins/sv/qml/Keyboard_sv_url_search.qml 2015-05-08 14:44:20 +0000
+++ plugins/sv/qml/Keyboard_sv_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/uk/qml/Keyboard_uk.qml'
--- plugins/uk/qml/Keyboard_uk.qml 2015-05-07 13:16:07 +0000
+++ plugins/uk/qml/Keyboard_uk.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/uk/qml/Keyboard_uk_email.qml'
--- plugins/uk/qml/Keyboard_uk_email.qml 2015-05-07 13:16:07 +0000
+++ plugins/uk/qml/Keyboard_uk_email.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/uk/qml/Keyboard_uk_url.qml'
--- plugins/uk/qml/Keyboard_uk_url.qml 2015-05-07 13:16:07 +0000
+++ plugins/uk/qml/Keyboard_uk_url.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'plugins/uk/qml/Keyboard_uk_url_search.qml'
--- plugins/uk/qml/Keyboard_uk_url_search.qml 2015-05-07 13:16:07 +0000
+++ plugins/uk/qml/Keyboard_uk_url_search.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {
2121
=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml 2016-01-04 14:13:58 +0000
+++ qml/Keyboard.qml 2016-01-28 19:06:48 +0000
@@ -40,6 +40,7 @@
40 objectName: "fullScreenItem"40 objectName: "fullScreenItem"
4141
42 property bool landscape: width > height42 property bool landscape: width > height
43 readonly property bool tablet: landscape ? width >= units.gu(90) : height >= units.gu(90)
4344
44 property variant input_method: maliit_input_method45 property variant input_method: maliit_input_method
45 property variant event_handler: maliit_event_handler46 property variant event_handler: maliit_event_handler
@@ -57,8 +58,11 @@
57 anchors.left: parent.left58 anchors.left: parent.left
5859
59 width: parent.width60 width: parent.width
60 height: fullScreenItem.landscape ? (fullScreenItem.height * UI.phoneKeyboardHeightLandscape) + wordRibbon.height61 height: fullScreenItem.height * (fullScreenItem.landscape ? fullScreenItem.tablet ? UI.tabletKeyboardHeightLandscape
61 : (fullScreenItem.height * UI.phoneKeyboardHeightPortrait) + wordRibbon.height62 : UI.phoneKeyboardHeightLandscape
63 : fullScreenItem.tablet ? UI.tabletKeyboardHeightPortrait
64 : UI.phoneKeyboardHeightPortrait)
65 + wordRibbon.height + borderTop.height
6266
63 property int keypadHeight: height;67 property int keypadHeight: height;
6468
@@ -89,7 +93,7 @@
89 anchors.right: parent.right93 anchors.right: parent.right
90 anchors.top: parent.top94 anchors.top: parent.top
91 height: (parent.height - canvas.keypadHeight) + wordRibbon.height +95 height: (parent.height - canvas.keypadHeight) + wordRibbon.height +
92 borderTop.height + units.gu(UI.top_margin)96 borderTop.height
9397
94 drag.target: keyboardSurface98 drag.target: keyboardSurface
95 drag.axis: Drag.YAxis;99 drag.axis: Drag.YAxis;
@@ -124,6 +128,13 @@
124 onWidthChanged: fullScreenItem.reportKeyboardVisibleRect();128 onWidthChanged: fullScreenItem.reportKeyboardVisibleRect();
125 onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();129 onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
126130
131 Rectangle {
132 width: parent.width
133 height: units.dp(1)
134 color: UI.dividerColor
135 anchors.bottom: wordRibbon.visible ? wordRibbon.top : keyboardComp.top
136 }
137
127 WordRibbon {138 WordRibbon {
128 id: wordRibbon139 id: wordRibbon
129 objectName: "wordRibbon"140 objectName: "wordRibbon"
@@ -133,7 +144,9 @@
133 anchors.bottom: keyboardComp.top144 anchors.bottom: keyboardComp.top
134 width: parent.width;145 width: parent.width;
135146
136 height: canvas.wordribbon_visible ? units.gu(UI.wordribbonHeight) : 0147 height: canvas.wordribbon_visible ? (fullScreenItem.tablet ? units.gu(UI.tabletWordribbonHeight)
148 : units.gu(UI.phoneWordribbonHeight))
149 : 0
137 onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();150 onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
138 }151 }
139152
@@ -141,7 +154,7 @@
141 id: keyboardComp154 id: keyboardComp
142 objectName: "keyboardComp"155 objectName: "keyboardComp"
143156
144 height: canvas.keypadHeight - wordRibbon.height157 height: canvas.keypadHeight - wordRibbon.height + keypad.anchors.topMargin
145 width: parent.width158 width: parent.width
146 anchors.bottom: parent.bottom159 anchors.bottom: parent.bottom
147160
@@ -154,12 +167,13 @@
154167
155 color: UI.backgroundColor168 color: UI.backgroundColor
156 }169 }
157170
158 Image {171 Rectangle {
159 id: borderTop172 id: borderTop
160 source: "styles/ubuntu/images/border_top.png"173 color: UI.backgroundColor
161 width: parent.width174 width: parent.width
162 anchors.top: parent.top.bottom175 anchors.top: parent.top.bottom
176 height: wordRibbon.visible ? 0 : units.gu(UI.top_margin)
163 }177 }
164178
165 KeyboardContainer {179 KeyboardContainer {
@@ -167,8 +181,7 @@
167181
168 anchors.top: borderTop.bottom182 anchors.top: borderTop.bottom
169 anchors.bottom: background.bottom183 anchors.bottom: background.bottom
170 anchors.topMargin: units.gu( UI.top_margin )184 anchors.bottomMargin: units.gu(UI.bottom_margin)
171 anchors.bottomMargin: units.gu( UI.bottom_margin )
172 width: parent.width185 width: parent.width
173186
174 onPopoverEnabledChanged: fullScreenItem.reportKeyboardVisibleRect();187 onPopoverEnabledChanged: fullScreenItem.reportKeyboardVisibleRect();
175188
=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml 2015-07-24 14:42:03 +0000
+++ qml/KeyboardContainer.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import QtMultimedia 5.018import QtMultimedia 5.0
19import QtQuick.Window 2.019import QtQuick.Window 2.0
20import "languages/"20import "languages/"
2121
=== modified file 'qml/WordRibbon.qml'
--- qml/WordRibbon.qml 2016-01-04 14:13:58 +0000
+++ qml/WordRibbon.qml 2016-01-28 19:06:48 +0000
@@ -16,6 +16,7 @@
1616
17import QtQuick 2.417import QtQuick 2.4
18import Ubuntu.Components 1.318import Ubuntu.Components 1.3
19import "keys/key_constants.js" as UI
1920
20Rectangle {21Rectangle {
2122
@@ -25,7 +26,7 @@
2526
26 Rectangle {27 Rectangle {
27 anchors.fill: parent28 anchors.fill: parent
28 color: "#f1f1f1"29 color: UI.backgroundColor
29 }30 }
3031
31 ListView {32 ListView {
@@ -48,23 +49,22 @@
48 height: wordRibbonCanvas.height49 height: wordRibbonCanvas.height
49 anchors.margins: 050 anchors.margins: 0
50 property alias word_text: wordItem // For testing in Autopilot51 property alias word_text: wordItem // For testing in Autopilot
51 property alias textBold: wordItem.font.bold // Exposed for autopilot52 property bool textBold: isPrimaryCandidate || listView.count == 1 // Exposed for autopilot
5253
53 Item {54 Item {
54 anchors.fill: parent55 anchors.fill: parent
55 anchors.margins: {56 anchors.margins: {
56 top: units.gu(0)57 top: units.gu(0)
57 bottom: units.gu(0)58 bottom: units.gu(0)
58 left: units.gu(1)59 left: units.gu(2)
59 right: units.gu(1)60 right: units.gu(2)
60 }61 }
6162
62 Text {63 Label {
63 id: wordItem64 id: wordItem
64 font.pixelSize: units.gu(1.9)65 font.pixelSize: units.dp(fullScreenItem.tablet ? UI.tabletWordRibbonFontSize : UI.phoneWordRibbonFontSize)
65 font.family: "Ubuntu Medium"66 font.family: UI.fontFamily
66 color: "#999999"67 font.weight: textBold ? Font.Bold : Font.Light
67 font.bold: isPrimaryCandidate || listView.count == 1
68 text: word;68 text: word;
69 anchors.centerIn: parent69 anchors.centerIn: parent
70 }70 }
7171
=== added file 'qml/images/keyboard-caps-disabled.svg'
--- qml/images/keyboard-caps-disabled.svg 1970-01-01 00:00:00 +0000
+++ qml/images/keyboard-caps-disabled.svg 2016-01-28 19:06:48 +0000
@@ -0,0 +1,180 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12 width="96"
13 height="96"
14 id="svg4874"
15 version="1.1"
16 inkscape:version="0.91+devel r"
17 viewBox="0 0 96 96.000001"
18 sodipodi:docname="keyboard-caps-disabled.svg">
19 <defs
20 id="defs4876" />
21 <sodipodi:namedview
22 id="base"
23 pagecolor="#ffffff"
24 bordercolor="#666666"
25 borderopacity="1.0"
26 inkscape:pageopacity="0.0"
27 inkscape:pageshadow="2"
28 inkscape:zoom="5.6199992"
29 inkscape:cx="36.912809"
30 inkscape:cy="16.645887"
31 inkscape:document-units="px"
32 inkscape:current-layer="g4780"
33 showgrid="true"
34 showborder="true"
35 fit-margin-top="0"
36 fit-margin-left="0"
37 fit-margin-right="0"
38 fit-margin-bottom="0"
39 inkscape:snap-bbox="true"
40 inkscape:bbox-paths="true"
41 inkscape:bbox-nodes="true"
42 inkscape:snap-bbox-edge-midpoints="true"
43 inkscape:snap-bbox-midpoints="true"
44 inkscape:object-paths="true"
45 inkscape:snap-intersection-paths="true"
46 inkscape:object-nodes="true"
47 inkscape:snap-smooth-nodes="false"
48 inkscape:snap-midpoints="true"
49 inkscape:snap-object-midpoints="true"
50 inkscape:snap-center="true"
51 showguides="true"
52 inkscape:guide-bbox="true"
53 inkscape:snap-others="false">
54 <inkscape:grid
55 type="xygrid"
56 id="grid5451"
57 empspacing="8" />
58 <sodipodi:guide
59 orientation="1,0"
60 position="8,-8.0000001"
61 id="guide4063"
62 inkscape:locked="false" />
63 <sodipodi:guide
64 orientation="1,0"
65 position="4,-8.0000001"
66 id="guide4065"
67 inkscape:locked="false" />
68 <sodipodi:guide
69 orientation="0,1"
70 position="-8,88.000001"
71 id="guide4067"
72 inkscape:locked="false" />
73 <sodipodi:guide
74 orientation="0,1"
75 position="-8,92.000001"
76 id="guide4069"
77 inkscape:locked="false" />
78 <sodipodi:guide
79 orientation="0,1"
80 position="104,4"
81 id="guide4071"
82 inkscape:locked="false" />
83 <sodipodi:guide
84 orientation="0,1"
85 position="-5,8.0000001"
86 id="guide4073"
87 inkscape:locked="false" />
88 <sodipodi:guide
89 orientation="1,0"
90 position="92,-8.0000001"
91 id="guide4075"
92 inkscape:locked="false" />
93 <sodipodi:guide
94 orientation="1,0"
95 position="88,-8.0000001"
96 id="guide4077"
97 inkscape:locked="false" />
98 <sodipodi:guide
99 orientation="0,1"
100 position="-8,84.000001"
101 id="guide4074"
102 inkscape:locked="false" />
103 <sodipodi:guide
104 orientation="1,0"
105 position="12,-8.0000001"
106 id="guide4076"
107 inkscape:locked="false" />
108 <sodipodi:guide
109 orientation="0,1"
110 position="-5,12"
111 id="guide4078"
112 inkscape:locked="false" />
113 <sodipodi:guide
114 orientation="1,0"
115 position="84,-9.0000001"
116 id="guide4080"
117 inkscape:locked="false" />
118 <sodipodi:guide
119 position="48,-8.0000001"
120 orientation="1,0"
121 id="guide4170"
122 inkscape:locked="false" />
123 <sodipodi:guide
124 position="-8,48"
125 orientation="0,1"
126 id="guide4172"
127 inkscape:locked="false" />
128 </sodipodi:namedview>
129 <metadata
130 id="metadata4879">
131 <rdf:RDF>
132 <cc:Work
133 rdf:about="">
134 <dc:format>image/svg+xml</dc:format>
135 <dc:type
136 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
137 <dc:title />
138 </cc:Work>
139 </rdf:RDF>
140 </metadata>
141 <g
142 inkscape:label="Layer 1"
143 inkscape:groupmode="layer"
144 id="layer1"
145 transform="translate(67.857146,-78.50504)">
146 <g
147 transform="matrix(0,-1,-1,0,373.50506,516.50504)"
148 id="g4845"
149 style="display:inline">
150 <g
151 inkscape:export-ydpi="90"
152 inkscape:export-xdpi="90"
153 inkscape:export-filename="next01.png"
154 transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
155 id="g4778"
156 inkscape:label="Layer 1">
157 <g
158 transform="matrix(-1,0,0,1,575.99999,611)"
159 id="g4780"
160 style="display:inline">
161 <rect
162 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
163 id="rect4782"
164 width="96.037987"
165 height="96"
166 x="-438.00244"
167 y="345.36221"
168 transform="scale(-1,1)" />
169 <path
170 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99980235;marker:none;enable-background:accumulate"
171 d="M 48,4.0078127 C 29.14382,30.199769 15.144531,59.992188 15.144531,59.992188 H 32 V 82 H 64 V 60 H 80.855469 C 80.855469,60.00002 66.8562,30.205639 48,4.0136721 Z m -0.002,7.2128903 C 61.890077,31.358675 70.875351,49.40304 74.212891,56 H 59.998047 V 78 H 36 V 55.992188 H 21.785156 c 3.33727,-6.596421 12.322541,-24.635102 26.212891,-44.771485 z"
172 transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)"
173 id="path4218"
174 inkscape:connector-curvature="0"
175 sodipodi:nodetypes="ccccccccccccccccc" />
176 </g>
177 </g>
178 </g>
179 </g>
180</svg>
0181
=== added file 'qml/images/keyboard-caps-enabled.svg'
--- qml/images/keyboard-caps-enabled.svg 1970-01-01 00:00:00 +0000
+++ qml/images/keyboard-caps-enabled.svg 2016-01-28 19:06:48 +0000
@@ -0,0 +1,181 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12 width="96"
13 height="96"
14 id="svg4874"
15 version="1.1"
16 inkscape:version="0.91+devel r"
17 viewBox="0 0 96 96.000001"
18 sodipodi:docname="keyboard-caps-enabled.svg">
19 <defs
20 id="defs4876" />
21 <sodipodi:namedview
22 id="base"
23 pagecolor="#ffffff"
24 bordercolor="#666666"
25 borderopacity="1.0"
26 inkscape:pageopacity="0.0"
27 inkscape:pageshadow="2"
28 inkscape:zoom="5.6199992"
29 inkscape:cx="36.912809"
30 inkscape:cy="16.645887"
31 inkscape:document-units="px"
32 inkscape:current-layer="g4780"
33 showgrid="true"
34 showborder="true"
35 fit-margin-top="0"
36 fit-margin-left="0"
37 fit-margin-right="0"
38 fit-margin-bottom="0"
39 inkscape:snap-bbox="true"
40 inkscape:bbox-paths="true"
41 inkscape:bbox-nodes="true"
42 inkscape:snap-bbox-edge-midpoints="true"
43 inkscape:snap-bbox-midpoints="true"
44 inkscape:object-paths="true"
45 inkscape:snap-intersection-paths="true"
46 inkscape:object-nodes="true"
47 inkscape:snap-smooth-nodes="false"
48 inkscape:snap-midpoints="true"
49 inkscape:snap-object-midpoints="true"
50 inkscape:snap-center="true"
51 showguides="true"
52 inkscape:guide-bbox="true"
53 inkscape:snap-others="false">
54 <inkscape:grid
55 type="xygrid"
56 id="grid5451"
57 empspacing="8" />
58 <sodipodi:guide
59 orientation="1,0"
60 position="8,-8.0000001"
61 id="guide4063"
62 inkscape:locked="false" />
63 <sodipodi:guide
64 orientation="1,0"
65 position="4,-8.0000001"
66 id="guide4065"
67 inkscape:locked="false" />
68 <sodipodi:guide
69 orientation="0,1"
70 position="-8,88.000001"
71 id="guide4067"
72 inkscape:locked="false" />
73 <sodipodi:guide
74 orientation="0,1"
75 position="-8,92.000001"
76 id="guide4069"
77 inkscape:locked="false" />
78 <sodipodi:guide
79 orientation="0,1"
80 position="104,4"
81 id="guide4071"
82 inkscape:locked="false" />
83 <sodipodi:guide
84 orientation="0,1"
85 position="-5,8.0000001"
86 id="guide4073"
87 inkscape:locked="false" />
88 <sodipodi:guide
89 orientation="1,0"
90 position="92,-8.0000001"
91 id="guide4075"
92 inkscape:locked="false" />
93 <sodipodi:guide
94 orientation="1,0"
95 position="88,-8.0000001"
96 id="guide4077"
97 inkscape:locked="false" />
98 <sodipodi:guide
99 orientation="0,1"
100 position="-8,84.000001"
101 id="guide4074"
102 inkscape:locked="false" />
103 <sodipodi:guide
104 orientation="1,0"
105 position="12,-8.0000001"
106 id="guide4076"
107 inkscape:locked="false" />
108 <sodipodi:guide
109 orientation="0,1"
110 position="-5,12"
111 id="guide4078"
112 inkscape:locked="false" />
113 <sodipodi:guide
114 orientation="1,0"
115 position="84,-9.0000001"
116 id="guide4080"
117 inkscape:locked="false" />
118 <sodipodi:guide
119 position="48,-8.0000001"
120 orientation="1,0"
121 id="guide4170"
122 inkscape:locked="false" />
123 <sodipodi:guide
124 position="-8,48"
125 orientation="0,1"
126 id="guide4172"
127 inkscape:locked="false" />
128 </sodipodi:namedview>
129 <metadata
130 id="metadata4879">
131 <rdf:RDF>
132 <cc:Work
133 rdf:about="">
134 <dc:format>image/svg+xml</dc:format>
135 <dc:type
136 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
137 <dc:title />
138 </cc:Work>
139 </rdf:RDF>
140 </metadata>
141 <g
142 inkscape:label="Layer 1"
143 inkscape:groupmode="layer"
144 id="layer1"
145 transform="translate(67.857146,-78.50504)">
146 <g
147 transform="matrix(0,-1,-1,0,373.50506,516.50504)"
148 id="g4845"
149 style="display:inline">
150 <g
151 inkscape:export-ydpi="90"
152 inkscape:export-xdpi="90"
153 inkscape:export-filename="next01.png"
154 transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
155 id="g4778"
156 inkscape:label="Layer 1">
157 <g
158 transform="matrix(-1,0,0,1,575.99999,611)"
159 id="g4780"
160 style="display:inline">
161 <rect
162 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
163 id="rect4782"
164 width="96.037987"
165 height="96"
166 x="-438.00244"
167 y="345.36221"
168 transform="scale(-1,1)" />
169 <path
170 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate"
171 d="m 433.99374,393.36223 c -26.20232,18.85618 -56.0079,32.85641 -56.0079,32.85641 v -16.85642 h -22.01583 v -32 h 22.00871 v -16.85641 c -2e-5,0 29.80555,14.00022 56.00788,32.85642 h 0.008 z"
172 id="path4218"
173 inkscape:connector-curvature="0"
174 inkscape:transform-center-x="8.7500002e-06"
175 inkscape:transform-center-y="36.503129"
176 sodipodi:nodetypes="cccccccccc" />
177 </g>
178 </g>
179 </g>
180 </g>
181</svg>
0182
=== added file 'qml/images/keyboard-caps-locked.svg'
--- qml/images/keyboard-caps-locked.svg 1970-01-01 00:00:00 +0000
+++ qml/images/keyboard-caps-locked.svg 2016-01-28 19:06:48 +0000
@@ -0,0 +1,186 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12 width="96"
13 height="96"
14 id="svg4874"
15 version="1.1"
16 inkscape:version="0.91+devel r"
17 viewBox="0 0 96 96.000001"
18 sodipodi:docname="keyboard-caps-locked.svg">
19 <defs
20 id="defs4876" />
21 <sodipodi:namedview
22 id="base"
23 pagecolor="#ffffff"
24 bordercolor="#666666"
25 borderopacity="1.0"
26 inkscape:pageopacity="0.0"
27 inkscape:pageshadow="2"
28 inkscape:zoom="10.976561"
29 inkscape:cx="18.398291"
30 inkscape:cy="25.558996"
31 inkscape:document-units="px"
32 inkscape:current-layer="g4780"
33 showgrid="true"
34 showborder="true"
35 fit-margin-top="0"
36 fit-margin-left="0"
37 fit-margin-right="0"
38 fit-margin-bottom="0"
39 inkscape:snap-bbox="true"
40 inkscape:bbox-paths="true"
41 inkscape:bbox-nodes="true"
42 inkscape:snap-bbox-edge-midpoints="true"
43 inkscape:snap-bbox-midpoints="true"
44 inkscape:object-paths="true"
45 inkscape:snap-intersection-paths="true"
46 inkscape:object-nodes="true"
47 inkscape:snap-smooth-nodes="false"
48 inkscape:snap-midpoints="true"
49 inkscape:snap-object-midpoints="true"
50 inkscape:snap-center="true"
51 showguides="true"
52 inkscape:guide-bbox="true"
53 inkscape:snap-others="false">
54 <inkscape:grid
55 type="xygrid"
56 id="grid5451"
57 empspacing="8" />
58 <sodipodi:guide
59 orientation="1,0"
60 position="8,-8.0000001"
61 id="guide4063"
62 inkscape:locked="false" />
63 <sodipodi:guide
64 orientation="1,0"
65 position="4,-8.0000001"
66 id="guide4065"
67 inkscape:locked="false" />
68 <sodipodi:guide
69 orientation="0,1"
70 position="-8,88.000001"
71 id="guide4067"
72 inkscape:locked="false" />
73 <sodipodi:guide
74 orientation="0,1"
75 position="-8,92.000001"
76 id="guide4069"
77 inkscape:locked="false" />
78 <sodipodi:guide
79 orientation="0,1"
80 position="104,4"
81 id="guide4071"
82 inkscape:locked="false" />
83 <sodipodi:guide
84 orientation="0,1"
85 position="-5,8.0000001"
86 id="guide4073"
87 inkscape:locked="false" />
88 <sodipodi:guide
89 orientation="1,0"
90 position="92,-8.0000001"
91 id="guide4075"
92 inkscape:locked="false" />
93 <sodipodi:guide
94 orientation="1,0"
95 position="88,-8.0000001"
96 id="guide4077"
97 inkscape:locked="false" />
98 <sodipodi:guide
99 orientation="0,1"
100 position="-8,84.000001"
101 id="guide4074"
102 inkscape:locked="false" />
103 <sodipodi:guide
104 orientation="1,0"
105 position="12,-8.0000001"
106 id="guide4076"
107 inkscape:locked="false" />
108 <sodipodi:guide
109 orientation="0,1"
110 position="-5,12"
111 id="guide4078"
112 inkscape:locked="false" />
113 <sodipodi:guide
114 orientation="1,0"
115 position="84,-9.0000001"
116 id="guide4080"
117 inkscape:locked="false" />
118 <sodipodi:guide
119 position="48,-8.0000001"
120 orientation="1,0"
121 id="guide4170"
122 inkscape:locked="false" />
123 <sodipodi:guide
124 position="-8,48"
125 orientation="0,1"
126 id="guide4172"
127 inkscape:locked="false" />
128 </sodipodi:namedview>
129 <metadata
130 id="metadata4879">
131 <rdf:RDF>
132 <cc:Work
133 rdf:about="">
134 <dc:format>image/svg+xml</dc:format>
135 <dc:type
136 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
137 <dc:title />
138 </cc:Work>
139 </rdf:RDF>
140 </metadata>
141 <g
142 inkscape:label="Layer 1"
143 inkscape:groupmode="layer"
144 id="layer1"
145 transform="translate(67.857146,-78.50504)">
146 <g
147 transform="matrix(0,-1,-1,0,373.50506,516.50504)"
148 id="g4845"
149 style="display:inline">
150 <g
151 inkscape:export-ydpi="90"
152 inkscape:export-xdpi="90"
153 inkscape:export-filename="next01.png"
154 transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
155 id="g4778"
156 inkscape:label="Layer 1">
157 <g
158 transform="matrix(-1,0,0,1,575.99999,611)"
159 id="g4780"
160 style="display:inline">
161 <rect
162 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
163 id="rect4782"
164 width="96.037987"
165 height="96"
166 x="-438.00244"
167 y="345.36221"
168 transform="scale(-1,1)" />
169 <path
170 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate"
171 d="m 433.99374,393.36223 c -26.20232,18.85618 -56.0079,32.85641 -56.0079,32.85641 v -16.85642 h -22.01583 v -32 h 22.00871 v -16.85641 c -2e-5,0 29.80555,14.00022 56.00788,32.85642 h 0.008 z"
172 id="path4218"
173 inkscape:connector-curvature="0"
174 inkscape:transform-center-x="8.7500002e-06"
175 inkscape:transform-center-y="36.503129"
176 sodipodi:nodetypes="cccccccccc" />
177 <path
178 style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
179 d="m 345.9668,377.36133 v 32 h 4 v -32 z"
180 id="path4250"
181 inkscape:connector-curvature="0" />
182 </g>
183 </g>
184 </g>
185 </g>
186</svg>
0187
=== added file 'qml/images/keyboard_spacebar@27.png'
1Binary files qml/images/keyboard_spacebar@27.png 1970-01-01 00:00:00 +0000 and qml/images/keyboard_spacebar@27.png 2016-01-28 19:06:48 +0000 differ188Binary files qml/images/keyboard_spacebar@27.png 1970-01-01 00:00:00 +0000 and qml/images/keyboard_spacebar@27.png 2016-01-28 19:06:48 +0000 differ
=== modified file 'qml/keys/ActionKey.qml'
--- qml/keys/ActionKey.qml 2014-11-05 14:44:19 +0000
+++ qml/keys/ActionKey.qml 2016-01-28 19:06:48 +0000
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19import Ubuntu.Components 0.119import Ubuntu.Components 1.3
2020
21import "key_constants.js" as UI21import "key_constants.js" as UI
2222
@@ -26,6 +26,10 @@
26 property string iconShifted: ""26 property string iconShifted: ""
27 property string iconCapsLock: ""27 property string iconCapsLock: ""
2828
29 property string iconSourceNormal: ""
30 property string iconSourceShifted: ""
31 property string iconSourceCapsLock: ""
32
29 noMagnifier: true33 noMagnifier: true
30 skipAutoCaps: true34 skipAutoCaps: true
31 property int padding: UI.actionKeyPadding35 property int padding: UI.actionKeyPadding
@@ -33,8 +37,8 @@
33 // action keys are a bit wider37 // action keys are a bit wider
34 width: panel.keyWidth + units.gu( padding )38 width: panel.keyWidth + units.gu( padding )
3539
36 imgNormal: UI.imageActionKey40 normalColor: UI.actionKeyColor
37 imgPressed: UI.imageActionKeyPressed41 pressedColor: UI.actionKeyPressedColor
3842
39 // can be overwritten by keys43 // can be overwritten by keys
40 property color colorNormal: UI.fontColor44 property color colorNormal: UI.fontColor
@@ -52,14 +56,15 @@
5256
53 Icon {57 Icon {
54 id: iconImage58 id: iconImage
55 name: actionKeyRoot.iconNormal59 source: iconSourceNormal !== "" ? iconSourceNormal
60 : iconNormal ? "image://theme/%1".arg(iconNormal)
61 : ""
56 color: actionKeyRoot.colorNormal62 color: actionKeyRoot.colorNormal
57 anchors.centerIn: parent63 anchors.centerIn: parent
58 anchors.verticalCenterOffset: fullScreenItem.landscape ? -units.dp( UI.keyMargins ) : -units.gu(UI.row_margin/2) - units.gu(0.15)64 anchors.verticalCenterOffset: -actionKeyRoot.rowMargin / 2 - units.gu(0.15)
59
60 visible: (label == "")65 visible: (label == "")
61 width: units.gu(2.5)66 height: actionKeyRoot.fontSize
62 height: units.gu(2.5)67 width: height
63 }68 }
64 }69 }
6570
@@ -70,7 +75,9 @@
70 name: "SHIFTED"75 name: "SHIFTED"
71 PropertyChanges {76 PropertyChanges {
72 target: iconImage77 target: iconImage
73 name: actionKeyRoot.iconShifted78 source: iconSourceShifted !== "" ? iconSourceShifted
79 : iconShifted ? "image://theme/%1".arg(iconShifted)
80 : ""
74 color: actionKeyRoot.colorShifted81 color: actionKeyRoot.colorShifted
75 }82 }
76 },83 },
@@ -78,7 +85,9 @@
78 name: "CAPSLOCK"85 name: "CAPSLOCK"
79 PropertyChanges {86 PropertyChanges {
80 target: iconImage87 target: iconImage
81 name: actionKeyRoot.iconCapsLock88 source: iconSourceCapsLock !== "" ? iconSourceCapsLock
89 : iconCapsLock ? "image://theme/%1".arg(iconCapsLock)
90 : ""
82 color: actionKeyRoot.colorCapsLock91 color: actionKeyRoot.colorCapsLock
83 }92 }
84 }93 }
8594
=== modified file 'qml/keys/BackspaceKey.qml'
--- qml/keys/BackspaceKey.qml 2013-10-09 13:51:12 +0000
+++ qml/keys/BackspaceKey.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19ActionKey {19ActionKey {
20 iconNormal: "erase";20 iconNormal: "erase";
2121
=== modified file 'qml/keys/CharKey.qml'
--- qml/keys/CharKey.qml 2016-01-04 14:13:58 +0000
+++ qml/keys/CharKey.qml 2016-01-28 19:06:48 +0000
@@ -49,16 +49,23 @@
49 property bool leftSide: false49 property bool leftSide: false
50 property bool rightSide: false50 property bool rightSide: false
5151
52 property double rowMargin: fullScreenItem.tablet ? units.gu(UI.tabletRowMargin)
53 : (fullScreenItem.landscape ? units.dp(UI.phoneRowMarginLandscape)
54 : units.dp(UI.phoneRowMarginPortrait))
55 property double keyMargin: fullScreenItem.tablet ? units.gu(UI.tabletKeyMargins)
56 : units.gu(UI.phoneKeyMargins)
57
52 // These properties are used by autopilot to determine the visible 58 // These properties are used by autopilot to determine the visible
53 // portion of the key to press59 // portion of the key to press
54 readonly property double leftOffset: buttonImage.anchors.leftMargin60 readonly property double leftOffset: buttonRect.anchors.leftMargin
55 readonly property double rightOffset: buttonImage.anchors.rightMargin61 readonly property double rightOffset: buttonRect.anchors.rightMargin
5662
57 /* design */63 /* design */
58 property string imgNormal: UI.imageCharKey64 property string normalColor: UI.charKeyColor
59 property string imgPressed: UI.imageCharKeyPressed65 property string pressedColor: UI.charKeyPressedColor
60 // fontSize can be overwritten when using the component, e.g. SymbolShiftKey uses smaller fontSize66 // Scale the font so the label fits if a long word is set
61 property int fontSize: units.gu( UI.fontSize );67 property int fontSize: (fullScreenItem.landscape ? (height / 2) : (height / 2.8))
68 * (4 / (label.length >= 2 ? (label.length <= 6 ? label.length + 2 : 8) : 4));
6269
63 /// annotation shows a small label in the upper right corner70 /// annotation shows a small label in the upper right corner
64 // if the annotiation property is set, it will be used. If not, the first position in extended[] list or extendedShifted[] list will71 // if the annotiation property is set, it will be used. If not, the first position in extended[] list or extendedShifted[] list will
@@ -119,19 +126,14 @@
119 height: panel.keyHeight126 height: panel.keyHeight
120 width: parent.width127 width: parent.width
121128
122 BorderImage {129 Rectangle {
123 id: buttonImage130 id: buttonRect
131 color: key.currentlyPressed || key.highlight ? pressedColor : normalColor
124 anchors.fill: parent132 anchors.fill: parent
125 anchors.leftMargin: key.leftSide ? (parent.width - panel.keyWidth) + units.dp(UI.keyMargins) : units.dp(UI.keyMargins)133 anchors.leftMargin: key.leftSide ? (parent.width - panel.keyWidth) + key.keyMargin : key.keyMargin
126 anchors.rightMargin: key.rightSide ? (parent.width - panel.keyWidth) + units.dp(UI.keyMargins) : units.dp(UI.keyMargins)134 anchors.rightMargin: key.rightSide ? (parent.width - panel.keyWidth) + key.keyMargin : key.keyMargin
127 anchors.bottomMargin: fullScreenItem.landscape ? units.dp( UI.keyMargins ) * 2 : units.gu(UI.row_margin);135 anchors.bottomMargin: key.rowMargin
128 source: key.imgNormal136 radius: units.dp(4)
129
130 BorderImage {
131 anchors.fill: parent
132 visible: key.currentlyPressed || key.highlight
133 source: key.imgPressed
134 }
135137
136 /// label of the key138 /// label of the key
137 // the label is also the value subitted to the app139 // the label is also the value subitted to the app
@@ -141,7 +143,7 @@
141 text: (panel.activeKeypadState === "NORMAL") ? label : shifted;143 text: (panel.activeKeypadState === "NORMAL") ? label : shifted;
142 font.family: UI.fontFamily144 font.family: UI.fontFamily
143 font.pixelSize: fontSize145 font.pixelSize: fontSize
144 font.bold: UI.fontBold146 font.weight: Font.Light
145 color: UI.fontColor147 color: UI.fontColor
146 anchors.right: parent.right148 anchors.right: parent.right
147 anchors.left: parent.left149 anchors.left: parent.left
@@ -150,7 +152,8 @@
150 anchors.verticalCenter: parent.verticalCenter 152 anchors.verticalCenter: parent.verticalCenter
151 anchors.verticalCenterOffset: -units.gu(0.15)153 anchors.verticalCenterOffset: -units.gu(0.15)
152 horizontalAlignment: Text.AlignHCenter154 horizontalAlignment: Text.AlignHCenter
153 elide: Text.ElideRight155 // Avoid eliding characters that are slightly too wide (e.g. some emoji)
156 elide: text.length <= 2 ? Text.ElideNone : Text.ElideRight
154 }157 }
155 158
156 /// shows an annotation159 /// shows an annotation
@@ -164,9 +167,9 @@
164 anchors.top: parent.top167 anchors.top: parent.top
165 anchors.topMargin: units.gu(UI.annotationTopMargin)168 anchors.topMargin: units.gu(UI.annotationTopMargin)
166 anchors.rightMargin: units.gu(UI.annotationRightMargin)169 anchors.rightMargin: units.gu(UI.annotationRightMargin)
167 170 font.family: UI.annotationFont
168 font.pixelSize: units.gu( UI.annotationFontSize )171 font.pixelSize: fullScreenItem.tablet ? units.dp(UI.tabletAnnotationFontSize) : units.dp(UI.phoneAnnotationFontSize)
169 font.bold: false172 font.weight: Font.Light
170 color: UI.annotationFontColor173 color: UI.annotationFontColor
171 }174 }
172175
173176
=== modified file 'qml/keys/DropShadow.qml'
--- qml/keys/DropShadow.qml 2013-09-25 12:09:46 +0000
+++ qml/keys/DropShadow.qml 2016-01-28 19:06:48 +0000
@@ -1,7 +1,7 @@
11
2// from qt-components/desktop2// from qt-components/desktop
33
4import QtQuick 2.04import QtQuick 2.4
55
6ShaderEffect {6ShaderEffect {
7 id: effect7 id: effect
88
=== modified file 'qml/keys/ExtendedKeysSelector.qml'
--- qml/keys/ExtendedKeysSelector.qml 2015-12-09 14:19:04 +0000
+++ qml/keys/ExtendedKeysSelector.qml 2016-01-28 19:06:48 +0000
@@ -20,8 +20,6 @@
20import Ubuntu.Components.ListItems 1.3 as ListItem20import Ubuntu.Components.ListItems 1.3 as ListItem
21import Ubuntu.Components.Popups 1.321import Ubuntu.Components.Popups 1.3
2222
23import QtQuick.Window 2.0
24
25import "key_constants.js" as UI23import "key_constants.js" as UI
2624
27KeyPopover {25KeyPopover {
@@ -118,8 +116,8 @@
118 text: modelData116 text: modelData
119 font.family: UI.fontFamily117 font.family: UI.fontFamily
120 font.pixelSize: text.length > 2 ? units.gu( UI.smallFontSize ) : units.gu( UI.fontSize )118 font.pixelSize: text.length > 2 ? units.gu( UI.smallFontSize ) : units.gu( UI.fontSize )
121 font.bold: UI.fontBold119 font.weight: Font.Light
122 color: key.highlight ? UbuntuColors.orange : UI.fontColor120 color: key.highlight ? UI.selectionColor : UI.fontColor
123 Component.onCompleted: __width += (textCell.width + units.gu( UI.popoverCellPadding));121 Component.onCompleted: __width += (textCell.width + units.gu( UI.popoverCellPadding));
124 }122 }
125123
126124
=== modified file 'qml/keys/KeyPad.qml'
--- qml/keys/KeyPad.qml 2013-10-15 12:24:32 +0000
+++ qml/keys/KeyPad.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19Item {19Item {
20 id: keyPadRoot20 id: keyPadRoot
2121
=== modified file 'qml/keys/LanguageKey.qml'
--- qml/keys/LanguageKey.qml 2015-02-09 14:46:50 +0000
+++ qml/keys/LanguageKey.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19ActionKey {19ActionKey {
20 iconNormal: "language-chooser";20 iconNormal: "language-chooser";
2121
=== modified file 'qml/keys/LanguageMenu.qml'
--- qml/keys/LanguageMenu.qml 2015-12-09 14:19:04 +0000
+++ qml/keys/LanguageMenu.qml 2016-01-28 19:06:48 +0000
@@ -19,6 +19,7 @@
19import Ubuntu.Components.ListItems 1.3 as ListItem19import Ubuntu.Components.ListItems 1.3 as ListItem
2020
21import "key_constants.js" as UI21import "key_constants.js" as UI
22import "languages.js" as Languages
2223
23Item {24Item {
2425
@@ -50,7 +51,7 @@
50 model: maliit_input_method.enabledLanguages51 model: maliit_input_method.enabledLanguages
5152
52 delegate: ListItem.Standard {53 delegate: ListItem.Standard {
53 text: languageIdToName(modelData)54 text: Languages.languageIdToName(modelData)
54 showDivider: modelData != maliit_input_method.enabledLanguages[maliit_input_method.enabledLanguages.length - 1]55 showDivider: modelData != maliit_input_method.enabledLanguages[maliit_input_method.enabledLanguages.length - 1]
55 control: CheckBox {56 control: CheckBox {
56 checked: maliit_input_method.activeLanguage == modelData57 checked: maliit_input_method.activeLanguage == modelData
@@ -71,7 +72,7 @@
71 Component {72 Component {
72 id: settingsComp73 id: settingsComp
73 Column {74 Column {
74 width: parent.width75 width: menuList.width
75 height: settingsItem.height + settingsDiv.height * 276 height: settingsItem.height + settingsDiv.height * 2
76 ListItem.ThinDivider { id: settingsDiv }77 ListItem.ThinDivider { id: settingsDiv }
77 ListItem.ThinDivider { }78 ListItem.ThinDivider { }
@@ -90,41 +91,4 @@
90 footer: greeter_status.greeterActive ? null : settingsComp91 footer: greeter_status.greeterActive ? null : settingsComp
91 }92 }
9293
93 function languageIdToName(languageId)
94 {
95 if (languageId == "ar") return i18n.tr("Arabic");
96 if (languageId == "az") return i18n.tr("Azerbaijani");
97 if (languageId == "bs") return i18n.tr("Bosnian");
98 if (languageId == "ca") return i18n.tr("Catalan");
99 if (languageId == "cs") return i18n.tr("Czech");
100 if (languageId == "da") return i18n.tr("Danish");
101 if (languageId == "de") return i18n.tr("German");
102 if (languageId == "emoji") return i18n.tr("Emoji");
103 if (languageId == "el") return i18n.tr("Greek");
104 if (languageId == "en") return i18n.tr("English");
105 if (languageId == "es") return i18n.tr("Spanish");
106 if (languageId == "fi") return i18n.tr("Finnish");
107 if (languageId == "fr") return i18n.tr("French");
108 if (languageId == "gd") return i18n.tr("Scottish Gaelic");
109 if (languageId == "he") return i18n.tr("Hebrew");
110 if (languageId == "hr") return i18n.tr("Croatian");
111 if (languageId == "hu") return i18n.tr("Hungarian");
112 if (languageId == "is") return i18n.tr("Icelandic");
113 if (languageId == "it") return i18n.tr("Italian");
114 if (languageId == "nl") return i18n.tr("Dutch");
115 if (languageId == "nb") return i18n.tr("Norwegian");
116 if (languageId == "pl") return i18n.tr("Polish");
117 if (languageId == "pt") return i18n.tr("Portuguese");
118 if (languageId == "ro") return i18n.tr("Romanian");
119 if (languageId == "ru") return i18n.tr("Russian");
120 if (languageId == "sl") return i18n.tr("Slovenian");
121 if (languageId == "sr") return i18n.tr("Serbian");
122 if (languageId == "sv") return i18n.tr("Swedish");
123 if (languageId == "uk") return i18n.tr("Ukrainian");
124 if (languageId == "zh") return i18n.tr("Chinese - Pinyin");
125
126 // fallback
127 return languageId.charAt(0).toUpperCase() + languageId.slice(1);
128 }
129
130}94}
13195
=== modified file 'qml/keys/Magnifier.qml'
--- qml/keys/Magnifier.qml 2014-09-26 13:22:23 +0000
+++ qml/keys/Magnifier.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import "key_constants.js" as UI18import "key_constants.js" as UI
1919
20/*!20/*!
@@ -83,8 +83,8 @@
83 anchors.centerIn: parent83 anchors.centerIn: parent
84 text: currentlyAssignedKey ? currentlyAssignedKey.valueToSubmit : ""84 text: currentlyAssignedKey ? currentlyAssignedKey.valueToSubmit : ""
85 font.family: UI.fontFamily85 font.family: UI.fontFamily
86 font.weight: Font.Light
86 font.pixelSize: units.gu( UI.fontSizeMagnified )87 font.pixelSize: units.gu( UI.fontSizeMagnified )
87 font.bold: UI.fontBold
88 color: UI.fontColor88 color: UI.fontColor
89 }89 }
9090
9191
=== modified file 'qml/keys/OneTwoKey.qml'
--- qml/keys/OneTwoKey.qml 2014-08-20 12:45:36 +0000
+++ qml/keys/OneTwoKey.qml 2016-01-28 19:06:48 +0000
@@ -14,12 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19ActionKey {19ActionKey {
20 iconNormal: "../images/icon_shift@18.png";
21 iconShifted: "../images/icon_shift_upsidedown@18.png";
22 iconCapsLock: "../images/icon_shift_white@18.png";
23 action: "shift"20 action: "shift"
24 overridePressArea: true21 overridePressArea: true
2522
2623
=== modified file 'qml/keys/PressArea.qml'
--- qml/keys/PressArea.qml 2015-12-10 17:50:51 +0000
+++ qml/keys/PressArea.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19/*!19/*!
20 MultiPointTouchArea is similar to the MouseArea20 MultiPointTouchArea is similar to the MouseArea
2121
=== modified file 'qml/keys/ReturnKey.qml'
--- qml/keys/ReturnKey.qml 2014-11-19 13:57:09 +0000
+++ qml/keys/ReturnKey.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import "key_constants.js" as UI18import "key_constants.js" as UI
1919
20ActionKey {20ActionKey {
@@ -25,11 +25,9 @@
25 enabled: actionKeyOverride ? actionKeyOverride.enabled : true25 enabled: actionKeyOverride ? actionKeyOverride.enabled : true
26 // overrideIcon has high priority over label26 // overrideIcon has high priority over label
27 label: overrideIconName == "" ? overrideLabel : ""27 label: overrideIconName == "" ? overrideLabel : ""
28 // Scale the font so the label fits if a long word is set
29 fontSize: units.gu(UI.symbolShiftKeyFontSize) * (4 / (label.length >= 4 ? (label.length <= 6 ? label.length : 6) : 4));
30 shifted: label28 shifted: label
3129
32 iconNormal: (overrideIconName == "") && (overrideLabel == "") ? "keyboard-return" : overrideIconName30 iconNormal: (overrideIconName == "") && (overrideLabel == "") ? "keyboard-enter" : overrideIconName
33 iconShifted: iconNormal31 iconShifted: iconNormal
34 iconCapsLock: iconNormal32 iconCapsLock: iconNormal
3533
3634
=== modified file 'qml/keys/ShiftKey.qml'
--- qml/keys/ShiftKey.qml 2015-12-09 14:19:04 +0000
+++ qml/keys/ShiftKey.qml 2016-01-28 19:06:48 +0000
@@ -17,13 +17,12 @@
17import QtQuick 2.417import QtQuick 2.4
18import Ubuntu.Components 1.318import Ubuntu.Components 1.3
1919
20import "key_constants.js" as UI
21
20ActionKey {22ActionKey {
21 iconNormal: "keyboard-caps"23 iconSourceNormal: "../images/keyboard-caps-disabled.svg"
22 iconShifted: "keyboard-caps-active"24 iconSourceShifted: "../images/keyboard-caps-enabled.svg"
23 iconCapsLock: "keyboard-caps-lock"25 iconSourceCapsLock: "../images/keyboard-caps-locked.svg"
24
25 // XXX: Disabled due to problems with coloring - see LP: #1251285 for details
26 // colorShifted: UbuntuColors.orange
2726
28 action: "shift"27 action: "shift"
2928
3029
=== added file 'qml/keys/SmallSpaceKey.qml'
--- qml/keys/SmallSpaceKey.qml 1970-01-01 00:00:00 +0000
+++ qml/keys/SmallSpaceKey.qml 2016-01-28 19:06:48 +0000
@@ -0,0 +1,34 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.4
18import Ubuntu.Components 1.3
19
20import "key_constants.js" as UI
21import "languages.js" as Languages
22
23ActionKey {
24 normalColor: UI.charKeyColor
25 pressedColor: UI.charKeyPressedColor
26
27 Image {
28 anchors.centerIn: parent
29 source: "../images/keyboard_spacebar.png"
30 }
31
32 action: "space"
33 switchBackFromSymbols: true
34}
035
=== modified file 'qml/keys/SpaceKey.qml'
--- qml/keys/SpaceKey.qml 2014-08-29 15:11:05 +0000
+++ qml/keys/SpaceKey.qml 2016-01-28 19:06:48 +0000
@@ -14,17 +14,29 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 1.3
1819
19import "key_constants.js" as UI20import "key_constants.js" as UI
21import "languages.js" as Languages
2022
21ActionKey {23ActionKey {
22 label: " ";24 label: " ";
23 shifted: " ";25 shifted: " ";
2426
25 imgNormal: UI.imageCharKey27 normalColor: UI.charKeyColor
26 imgPressed: UI.imageCharKeyPressed28 pressedColor: UI.charKeyPressedColor
2729
28 action: "space"30 action: "space"
29 switchBackFromSymbols: true31 switchBackFromSymbols: true
32
33 Label {
34 anchors.centerIn: parent
35 anchors.verticalCenterOffset: -parent.rowMargin / 2 - units.gu(0.15)
36 font.family: UI.spaceFontFamily
37 font.weight: Font.Light
38 fontSize: fullScreenItem.tablet ? UI.tabletSpaceFontSize : UI.phoneSpaceFontSize
39 opacity: UI.spaceOpacity
40 text: Languages.languageIdToName(maliit_input_method.activeLanguage)
41 }
30}42}
3143
=== modified file 'qml/keys/Spacer.qml'
--- qml/keys/Spacer.qml 2013-09-07 07:55:28 +0000
+++ qml/keys/Spacer.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19/**19/**
20 * an invisible spacer the size of a regular key.20 * an invisible spacer the size of a regular key.
2121
=== modified file 'qml/keys/SymbolShiftKey.qml'
--- qml/keys/SymbolShiftKey.qml 2014-08-20 12:45:36 +0000
+++ qml/keys/SymbolShiftKey.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19import "key_constants.js" as UI19import "key_constants.js" as UI
2020
@@ -23,8 +23,6 @@
23 shifted: "?123";23 shifted: "?123";
24 action: "symbols";24 action: "symbols";
2525
26 fontSize: units.gu(UI.symbolShiftKeyFontSize);
27
28 overridePressArea: true;26 overridePressArea: true;
2927
30 onPressed: {28 onPressed: {
3129
=== modified file 'qml/keys/UrlKey.qml'
--- qml/keys/UrlKey.qml 2013-10-25 13:16:15 +0000
+++ qml/keys/UrlKey.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import "../keys/key_constants.js" as UI18import "../keys/key_constants.js" as UI
1919
20CharKey {20CharKey {
@@ -23,5 +23,4 @@
23 label: ".com";23 label: ".com";
24 shifted: label24 shifted: label
25 extendedShifted: extended25 extendedShifted: extended
26 fontSize: units.gu(UI.smallFontSize);
27}26}
2827
=== modified file 'qml/keys/key_constants.js'
--- qml/keys/key_constants.js 2015-03-26 02:53:03 +0000
+++ qml/keys/key_constants.js 2016-01-28 19:06:48 +0000
@@ -16,19 +16,29 @@
1616
17.pragma library17.pragma library
1818
19var keyMargins = 1.8; // dp19var tabletKeyMargins = 0.5; // gu
20var phoneKeyMargins = 0.25 // gu
20var fontSize = 2.5; // gu21var fontSize = 2.5; // gu
21var fontSizeMagnified = 4; // gu22var fontSizeMagnified = 4; // gu
22var fontFamily = "Ubuntu";23var fontFamily = "Ubuntu";
23var fontColor = "#5d5d5d"24var fontColor = "#333333";
24var fontBold = false25var fontBold = false;
2526var selectionColor = "#19B6EE";
26var backgroundColor = "#f1f1f1"27
2728var backgroundColor = "#f7f7f7";
28var annotationFontSize = 0.85; // gu29var dividerColor = "#cdcdcd";
30
31var tabletAnnotationFontSize = 10; // dp
32var phoneAnnotationFontSize = 10; // dp
29var annotationTopMargin = 0.35; // gu33var annotationTopMargin = 0.35; // gu
30var annotationRightMargin = 0.65; // gu34var annotationRightMargin = 0.65; // gu
31var annotationFontColor = "#5d5d5d"35var annotationFontColor = "#333333";
36var annotationFont = "Ubuntu";
37
38var spaceFontFamily = "Ubuntu";
39var tabletSpaceFontSize = "large";
40var phoneSpaceFontSize = "small";
41var spaceOpacity = 0.33;
3242
33/* magnifier */43/* magnifier */
34var magnifierHorizontalPadding = 1.8; // gu, stretch the magnifier a little bit in x-axis44var magnifierHorizontalPadding = 1.8; // gu, stretch the magnifier a little bit in x-axis
@@ -45,15 +55,17 @@
45var popoverEdgeMargin = 2.2; // gu55var popoverEdgeMargin = 2.2; // gu
46var popoverSquat = 3; // gu, when no wordribbon, avoid click-through above input trap56var popoverSquat = 3; // gu, when no wordribbon, avoid click-through above input trap
4757
48var imageCharKey = "../images/white_key.sci"58var charKeyColor = "white"
49var imageCharKeyPressed = "../images/grey_key.sci"59var charKeyPressedColor = "#d9d9d9"
5060
51var imageActionKey = "../images/action_key.sci"61var actionKeyColor = "#cdcdcd"
52var imageActionKeyPressed = "../images/grey_key.sci"62var actionKeyPressedColor = "#aeaeae"
5363
54var top_margin = 1.35; // gu64var top_margin = 1; // gu
55var bottom_margin = 0; // gu65var bottom_margin = 0; // gu
56var row_margin = 1.5; // gu66var tabletRowMargin = 1; // gu
67var phoneRowMarginLandscape = 4; // dp
68var phoneRowMarginPortrait = 7; // dp
5769
58var urlLayoutLeftSpacerSize = 5; // gu70var urlLayoutLeftSpacerSize = 5; // gu
59var emailLayoutUrlKeyPadding = 1.5; // gu71var emailLayoutUrlKeyPadding = 1.5; // gu
@@ -61,10 +73,13 @@
61/* language menu */73/* language menu */
62var languageMenuListViewPadding = 2.22; // gu74var languageMenuListViewPadding = 2.22; // gu
6375
64var wordribbonHeight = 3; // gu76var tabletWordribbonHeight = 6; // gu
6577var phoneWordribbonHeight = 4; // gu
66var phoneKeyboardHeightPortrait = 0.41;78var tabletWordRibbonFontSize = 17 // dp
67var phoneKeyboardHeightLandscape = 0.50;79var phoneWordRibbonFontSize = 14 // dp
6880
69var tabletKeyboardHeightPortrait = 0.28;81var phoneKeyboardHeightPortrait = 0.40; // percent of screen
70var tabletKeyboardHeightLandscape = 0.38;82var phoneKeyboardHeightLandscape = 0.49; // percent of screen
83
84var tabletKeyboardHeightPortrait = 0.39; // percent of screen
85var tabletKeyboardHeightLandscape = 0.42; // percent of screen
7186
=== added file 'qml/keys/languages.js'
--- qml/keys/languages.js 1970-01-01 00:00:00 +0000
+++ qml/keys/languages.js 2016-01-28 19:06:48 +0000
@@ -0,0 +1,52 @@
1/*
2 * Copyright 2016 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17function languageIdToName(languageId)
18{
19 if (languageId == "ar") return i18n.tr("Arabic");
20 if (languageId == "az") return i18n.tr("Azerbaijani");
21 if (languageId == "bs") return i18n.tr("Bosnian");
22 if (languageId == "ca") return i18n.tr("Catalan");
23 if (languageId == "cs") return i18n.tr("Czech");
24 if (languageId == "da") return i18n.tr("Danish");
25 if (languageId == "de") return i18n.tr("German");
26 if (languageId == "emoji") return i18n.tr("Emoji");
27 if (languageId == "el") return i18n.tr("Greek");
28 if (languageId == "en") return i18n.tr("English");
29 if (languageId == "es") return i18n.tr("Spanish");
30 if (languageId == "fi") return i18n.tr("Finnish");
31 if (languageId == "fr") return i18n.tr("French");
32 if (languageId == "gd") return i18n.tr("Scottish Gaelic");
33 if (languageId == "he") return i18n.tr("Hebrew");
34 if (languageId == "hr") return i18n.tr("Croatian");
35 if (languageId == "hu") return i18n.tr("Hungarian");
36 if (languageId == "is") return i18n.tr("Icelandic");
37 if (languageId == "it") return i18n.tr("Italian");
38 if (languageId == "nl") return i18n.tr("Dutch");
39 if (languageId == "nb") return i18n.tr("Norwegian");
40 if (languageId == "pl") return i18n.tr("Polish");
41 if (languageId == "pt") return i18n.tr("Portuguese");
42 if (languageId == "ro") return i18n.tr("Romanian");
43 if (languageId == "ru") return i18n.tr("Russian");
44 if (languageId == "sl") return i18n.tr("Slovenian");
45 if (languageId == "sr") return i18n.tr("Serbian");
46 if (languageId == "sv") return i18n.tr("Swedish");
47 if (languageId == "uk") return i18n.tr("Ukrainian");
48 if (languageId == "zh") return i18n.tr("Chinese - Pinyin");
49
50 // fallback
51 return languageId.charAt(0).toUpperCase() + languageId.slice(1);
52}
053
=== modified file 'qml/languages/Keyboard_numbers.qml'
--- qml/languages/Keyboard_numbers.qml 2014-05-28 11:14:15 +0000
+++ qml/languages/Keyboard_numbers.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import "../keys"18import "../keys"
1919
20KeyPad {20KeyPad {
@@ -26,48 +26,53 @@
26 Column {26 Column {
27 id: c127 id: c1
28 anchors.fill: parent28 anchors.fill: parent
29 anchors.margins: 0;29 anchors.leftMargin: units.gu(1);
3030 anchors.rightMargin: units.gu(1);
31 spacing: 031 anchors.bottomMargin: units.gu(1);
3232
33 Row {33 property double numKeyWidth: panel.keyWidth - units.gu(0.75);
34 anchors.horizontalCenter: parent.horizontalCenter;34 property double numKeyHeight: panel.keyHeight - units.gu(1);
35 anchors.margins: 50;35
36 spacing: 036 spacing: units.gu(1);
3737
38 CharKey { label: "1"; noMagnifier: true; }38 Row {
39 CharKey { label: "2"; noMagnifier: true; }39 anchors.horizontalCenter: parent.horizontalCenter;
40 CharKey { label: "3"; noMagnifier: true; }40 spacing: units.gu(0.5);
41 }41
4242 CharKey { label: "1"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
43 Row {43 CharKey { label: "2"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
44 anchors.horizontalCenter: parent.horizontalCenter;44 CharKey { label: "3"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
45 anchors.margins: 50;45 CharKey { label: "-"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
46 spacing: 046 }
4747
48 CharKey { label: "4"; noMagnifier: true; }48 Row {
49 CharKey { label: "5"; noMagnifier: true; }49 anchors.horizontalCenter: parent.horizontalCenter;
50 CharKey { label: "6"; noMagnifier: true; }50 spacing: units.gu(0.5);
51 }51
5252 CharKey { label: "4"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
53 Row {53 CharKey { label: "5"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
54 anchors.horizontalCenter: parent.horizontalCenter;54 CharKey { label: "6"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
55 anchors.margins: 50;55 SmallSpaceKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; }
56 spacing: 056 }
5757
58 CharKey { label: "7"; noMagnifier: true; }58 Row {
59 CharKey { label: "8"; noMagnifier: true; }59 anchors.horizontalCenter: parent.horizontalCenter;
60 CharKey { label: "9"; noMagnifier: true; }60 spacing: units.gu(0.5);
61 }61
6262 CharKey { label: "7"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
63 Row {63 CharKey { label: "8"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
64 anchors.horizontalCenter: parent.horizontalCenter;64 CharKey { label: "9"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
65 anchors.margins: 50;65 BackspaceKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; }
66 spacing: 066 }
6767
68 CharKey { label: "."; extended: ["-", "."]; noMagnifier: true; }68 Row {
69 CharKey { label: "0"; noMagnifier: true; }69 anchors.horizontalCenter: parent.horizontalCenter;
70 BackspaceKey { padding: 0; }70 spacing: units.gu(0.5);
71
72 CharKey { label: "+"; annotation: "#*"; extended: ["#", "*"]; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
73 CharKey { label: "0"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
74 CharKey { label: "."; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
75 ReturnKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; }
71 }76 }
72 } // column77 } // column
73}78}
7479
=== modified file 'qml/languages/Keyboard_symbols.qml'
--- qml/languages/Keyboard_symbols.qml 2015-01-26 19:50:40 +0000
+++ qml/languages/Keyboard_symbols.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import "../keys"18import "../keys"
19import "../keys/key_constants.js" as UI19import "../keys/key_constants.js" as UI
2020
2121
=== modified file 'qml/languages/Keyboard_telephone.qml'
--- qml/languages/Keyboard_telephone.qml 2014-12-12 17:28:08 +0000
+++ qml/languages/Keyboard_telephone.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import "../keys"18import "../keys"
1919
20KeyPad {20KeyPad {
@@ -26,48 +26,53 @@
26 Column {26 Column {
27 id: c127 id: c1
28 anchors.fill: parent28 anchors.fill: parent
29 anchors.margins: 0;29 anchors.leftMargin: units.gu(1);
3030 anchors.rightMargin: units.gu(1);
31 spacing: 031 anchors.bottomMargin: units.gu(1);
3232
33 Row {33 property double numKeyWidth: panel.keyWidth - units.gu(0.75);
34 anchors.horizontalCenter: parent.horizontalCenter;34 property double numKeyHeight: panel.keyHeight - units.gu(1);
35 anchors.margins: 50;35
36 spacing: 036 spacing: units.gu(1);
3737
38 CharKey { label: "1"; noMagnifier: true; }38 Row {
39 CharKey { label: "2"; noMagnifier: true; }39 anchors.horizontalCenter: parent.horizontalCenter;
40 CharKey { label: "3"; noMagnifier: true; }40 spacing: units.gu(0.5);
41 }41
4242 CharKey { label: "1"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
43 Row {43 CharKey { label: "2"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
44 anchors.horizontalCenter: parent.horizontalCenter;44 CharKey { label: "3"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
45 anchors.margins: 50;45 CharKey { label: "#"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
46 spacing: 046 }
4747
48 CharKey { label: "4"; noMagnifier: true; }48 Row {
49 CharKey { label: "5"; noMagnifier: true; }49 anchors.horizontalCenter: parent.horizontalCenter;
50 CharKey { label: "6"; noMagnifier: true; }50 spacing: units.gu(0.5);
51 }51
5252 CharKey { label: "4"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
53 Row {53 CharKey { label: "5"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
54 anchors.horizontalCenter: parent.horizontalCenter;54 CharKey { label: "6"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
55 anchors.margins: 50;55 CharKey { label: "*"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
56 spacing: 056 }
5757
58 CharKey { label: "7"; noMagnifier: true; }58 Row {
59 CharKey { label: "8"; noMagnifier: true; }59 anchors.horizontalCenter: parent.horizontalCenter;
60 CharKey { label: "9"; noMagnifier: true; }60 spacing: units.gu(0.5);
61 }61
6262 CharKey { label: "7"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
63 Row {63 CharKey { label: "8"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
64 anchors.horizontalCenter: parent.horizontalCenter;64 CharKey { label: "9"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
65 anchors.margins: 50;65 BackspaceKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; }
66 spacing: 066 }
6767
68 CharKey { label: "+"; annotation: "*#"; extended: ["*", "#"]; noMagnifier: true; }68 Row {
69 CharKey { label: "0"; noMagnifier: true; }69 anchors.horizontalCenter: parent.horizontalCenter;
70 BackspaceKey { padding: 0; }70 spacing: units.gu(0.5);
71
72 CharKey { label: "+"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
73 CharKey { label: "0"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
74 CharKey { label: ""; enabled: false; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
75 ReturnKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; }
71 }76 }
72 } // column77 } // column
73}78}
7479
=== modified file 'qml/qml.pro'
--- qml/qml.pro 2015-04-15 12:56:56 +0000
+++ qml/qml.pro 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
1414
1515
16images.path = "$$UBUNTU_KEYBOARD_DATA_DIR/images"16images.path = "$$UBUNTU_KEYBOARD_DATA_DIR/images"
17images.files = images/*.png images/*.sci17images.files = images/*.png images/*.sci images/*.svg
1818
19INSTALLS += qml qml_keys qml_languages images19INSTALLS += qml qml_keys qml_languages images
2020
2121
=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/keyboard.py'
--- tests/autopilot/ubuntu_keyboard/emulators/keyboard.py 2015-08-18 11:37:58 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/keyboard.py 2016-01-28 19:06:48 +0000
@@ -126,7 +126,7 @@
126 if self.is_available():126 if self.is_available():
127 x, y, h, w = self._keyboard_container.globalRect127 x, y, h, w = self._keyboard_container.globalRect
128 x_pos = int(w / 2)128 x_pos = int(w / 2)
129 start_y = y + int(h / 2)129 start_y = y + int(h / 2.5)
130 end_y = y + h130 end_y = y + h
131 self.pointer.drag(x_pos, start_y, x_pos, end_y)131 self.pointer.drag(x_pos, start_y, x_pos, end_y)
132132
133133
=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2016-01-04 14:13:58 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2016-01-28 19:06:48 +0000
@@ -1185,7 +1185,7 @@
11851185
1186 """1186 """
1187 qml = dedent("""1187 qml = dedent("""
1188 import QtQuick 2.01188 import QtQuick 2.4
1189 import Ubuntu.Components 1.11189 import Ubuntu.Components 1.1
1190 import Ubuntu.Web 0.21190 import Ubuntu.Web 0.2
11911191
11921192
=== modified file 'tests/testlayout/qml/Keyboard_testlayout.qml'
--- tests/testlayout/qml/Keyboard_testlayout.qml 2015-04-17 13:15:54 +0000
+++ tests/testlayout/qml/Keyboard_testlayout.qml 2016-01-28 19:06:48 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import keys 1.018import keys 1.0
1919
20KeyPad {20KeyPad {

Subscribers

People subscribed via source and target branches