From 1423458afcbb6737f5f26206053a375a491dedd8 Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Mon, 21 Mar 2016 09:21:45 +0100 Subject: [PATCH] Preferences: hide built-in OSK settings when system OSK is selected --- resources/forms/preferences.ui | 71 ++++++++++++---------------- resources/i18n/OpenBoard_ar.ts | 6 ++- resources/i18n/OpenBoard_bg.ts | 6 ++- resources/i18n/OpenBoard_ca.ts | 6 ++- resources/i18n/OpenBoard_cs.ts | 6 ++- resources/i18n/OpenBoard_da.ts | 6 ++- resources/i18n/OpenBoard_de.ts | 6 ++- resources/i18n/OpenBoard_el.ts | 6 ++- resources/i18n/OpenBoard_en.ts | 8 ++-- resources/i18n/OpenBoard_en_UK.ts | 8 ++-- resources/i18n/OpenBoard_es.ts | 6 ++- resources/i18n/OpenBoard_fr.ts | 6 ++- resources/i18n/OpenBoard_fr_CH.ts | 6 ++- resources/i18n/OpenBoard_it.ts | 6 ++- resources/i18n/OpenBoard_iw.ts | 6 ++- resources/i18n/OpenBoard_ja.ts | 6 ++- resources/i18n/OpenBoard_ko.ts | 6 ++- resources/i18n/OpenBoard_mg.ts | 6 ++- resources/i18n/OpenBoard_nb.ts | 6 ++- resources/i18n/OpenBoard_nl.ts | 6 ++- resources/i18n/OpenBoard_pl.ts | 6 ++- resources/i18n/OpenBoard_pt.ts | 6 ++- resources/i18n/OpenBoard_ro.ts | 6 ++- resources/i18n/OpenBoard_ru.ts | 6 ++- resources/i18n/OpenBoard_sk.ts | 6 ++- resources/i18n/OpenBoard_sv.ts | 6 ++- resources/i18n/OpenBoard_tr.ts | 6 ++- resources/i18n/OpenBoard_zh.ts | 6 ++- resources/i18n/OpenBoard_zh_CN.ts | 6 ++- resources/i18n/OpenBoard_zh_TW.ts | 6 ++- src/core/UBPreferencesController.cpp | 9 ++++ src/core/UBPreferencesController.h | 1 + 32 files changed, 182 insertions(+), 77 deletions(-) diff --git a/resources/forms/preferences.ui b/resources/forms/preferences.ui index 9d21a794..8371aecf 100644 --- a/resources/forms/preferences.ui +++ b/resources/forms/preferences.ui @@ -422,12 +422,26 @@ Virtual Keyboard - - - - Use system keyboard (recommended) - - + + + + + + + + + Built-in virtual keyboard button size: + + + + + + + Use system keyboard (recommended) + + + + @@ -445,35 +459,8 @@ - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Keyboard button size: - - - - - - - + + Qt::Horizontal @@ -2670,7 +2657,7 @@ Public License instead of this License. But first, please read <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'.Helvetica Neue DeskInterface'; font-size:13pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:12pt; font-weight:600;">Translations</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;"><br /></span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">A special thanks to:</span></p> @@ -2717,7 +2704,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://creativecommons.org/licenses/by/3.0/"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;">Creative Commons BY-ND</span></a></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#000000;">DGESCO (</span></a><a href="mailto:degre.numerique@education.gouv.fr"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;">degre.numerique@education.gouv.fr</span></a><a href="http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#000000;">)</span></a></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#000000;">Source: </span></a><a href="http://eduscol.education.fr/cid72979/polices-de-caracteres-cursives-pour-l-enseignement-de-l-ecriture.html"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;">http://eduscol.education.fr/cid72979/polices-de-caracteres-cursives-pour-l-enseignement-de-l-ecriture.html</span></a></p> -<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande';"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;"><br /></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">GeTypo Libre</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">Creative Commons BY-NC-ND</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.ge.ch/sem/cc/by-nc-nd/"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">http://www.ge.ch/sem/cc/by-nc-nd/</span></a></p> @@ -2764,17 +2751,17 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'.Helvetica Neue DeskInterface'; font-size:13pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">OpenBoard 1.10.0</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">OpenBoard 1.3.0</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">OpenBoard is copyright © 2015. All rights reserved.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">OpenBoard is derived from Open-Sankoré. Open-Sankoré is copyright © 2010-2015 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA). All right reserved.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">OpenBoard is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3 of the License, with a specific linking exception for the OpenSSL project's &quot;OpenSSL&quot; library (or with modified versions of it that use the same license as the &quot;OpenSSL&quot; library). You can find the source code of this software at </span><a href="https://github.com/DIP-SEM/OpenBoard"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">github.com/DIP-SEM/OpenBoard</span></a><span style=" font-family:'Cantarell'; font-size:10pt;">, </span><a href="https://github.com/DIP-SEM/OpenBoard-ThirdParty"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">github.com/DIP-SEM/OpenBoard-ThirdParty</span></a><span style=" font-family:'Cantarell'; font-size:10pt;">, and </span><a href="https://github.com/DIP-SEM/OpenBoard-Importer"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">github.com/DIP-SEM/OpenBoard-Importer.</span></a><span style=" font-family:'Cantarell'; font-size:10pt;"> </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">OpenBoard is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3 of the License, with a specific linking exception for the OpenSSL project's &quot;OpenSSL&quot; library (or with modified versions of it that use the same license as the &quot;OpenSSL&quot; library). You can find the source code of this software at </span><a href="https://github.com/DIP-SEM/OpenBoard"><span style=" font-family:'.Helvetica Neue DeskInterface'; font-size:10pt; text-decoration: underline; color:#0000ff;">github.com/DIP-SEM/OpenBoard</span></a><span style=" font-family:'Cantarell'; font-size:10pt;">, </span><a href="https://github.com/DIP-SEM/OpenBoard-ThirdParty"><span style=" font-family:'.Helvetica Neue DeskInterface'; font-size:10pt; text-decoration: underline; color:#0000ff;">github.com/DIP-SEM/OpenBoard-ThirdParty</span></a><span style=" font-family:'Cantarell'; font-size:10pt;">, and </span><a href="https://github.com/DIP-SEM/OpenBoard-Importer"><span style=" font-family:'.Helvetica Neue DeskInterface'; font-size:10pt; text-decoration: underline; color:#0000ff;">github.com/DIP-SEM/OpenBoard-Importer.</span></a><span style=" font-family:'Cantarell'; font-size:10pt;"> </span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">OpenBoard is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License below for more details.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">Contact :</span></p> @@ -2783,8 +2770,8 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">Case Postale 241</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">1211 Genève 8</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">Switzerland</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.openboard.ch"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">openboard.ch</span></a></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; text-decoration: underline; color:#0000ff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.openboard.ch"><span style=" font-family:'.Helvetica Neue DeskInterface'; font-size:11pt; text-decoration: underline; color:#0000ff;">openboard.ch</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Helvetica Neue DeskInterface'; font-size:11pt; text-decoration: underline; color:#0000ff;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">email: </span><a href="mailto:sem.logistique@edu.ge.ch"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;">sem.logistique@edu.ge.ch</span></a></p></td></tr></table></body></html> diff --git a/resources/i18n/OpenBoard_ar.ts b/resources/i18n/OpenBoard_ar.ts index 3f57731e..5e8d5520 100644 --- a/resources/i18n/OpenBoard_ar.ts +++ b/resources/i18n/OpenBoard_ar.ts @@ -2486,7 +2486,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - حجم أزرار لوحة المفاتيح: + حجم أزرار لوحة المفاتيح: Toolbar @@ -2600,6 +2600,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_bg.ts b/resources/i18n/OpenBoard_bg.ts index 1442129e..9a9988a9 100644 --- a/resources/i18n/OpenBoard_bg.ts +++ b/resources/i18n/OpenBoard_bg.ts @@ -2473,7 +2473,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Големина на бутоните на клавиатурата: + Големина на бутоните на клавиатурата: Positioned at the Top (recommended for tablets) @@ -2595,6 +2595,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_ca.ts b/resources/i18n/OpenBoard_ca.ts index 51a9d327..ef3c4db3 100644 --- a/resources/i18n/OpenBoard_ca.ts +++ b/resources/i18n/OpenBoard_ca.ts @@ -2474,7 +2474,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Mida de les tecles: + Mida de les tecles: Toolbar @@ -2588,6 +2588,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_cs.ts b/resources/i18n/OpenBoard_cs.ts index c16bcdec..f9ea57bb 100644 --- a/resources/i18n/OpenBoard_cs.ts +++ b/resources/i18n/OpenBoard_cs.ts @@ -2516,7 +2516,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Velikost tlačítka klávesnice: + Velikost tlačítka klávesnice: Stylus Palette @@ -2598,6 +2598,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_da.ts b/resources/i18n/OpenBoard_da.ts index 20528dfd..ddddbbd3 100644 --- a/resources/i18n/OpenBoard_da.ts +++ b/resources/i18n/OpenBoard_da.ts @@ -2481,7 +2481,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Størrelse på tastaturknapper: + Størrelse på tastaturknapper: Toolbar @@ -2591,6 +2591,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_de.ts b/resources/i18n/OpenBoard_de.ts index eab08bf7..6ce93662 100644 --- a/resources/i18n/OpenBoard_de.ts +++ b/resources/i18n/OpenBoard_de.ts @@ -2485,7 +2485,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Tastengröße der Tastatur: + Tastengröße der Tastatur: Toolbar @@ -2596,6 +2596,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_el.ts b/resources/i18n/OpenBoard_el.ts index 690544be..4260bfbf 100644 --- a/resources/i18n/OpenBoard_el.ts +++ b/resources/i18n/OpenBoard_el.ts @@ -2473,7 +2473,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Μέγεθος πλήκτρων πληκτρολογίου: + Μέγεθος πλήκτρων πληκτρολογίου: Positioned at the Top (recommended for tablets) @@ -2595,6 +2595,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_en.ts b/resources/i18n/OpenBoard_en.ts index 3bf1d6f1..bf59ddce 100644 --- a/resources/i18n/OpenBoard_en.ts +++ b/resources/i18n/OpenBoard_en.ts @@ -2404,10 +2404,6 @@ p, li { white-space: pre-wrap; } Virtual Keyboard - - Keyboard button size: - - Positioned at the Top (recommended for tablets) @@ -2528,6 +2524,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_en_UK.ts b/resources/i18n/OpenBoard_en_UK.ts index 6d81a163..7080b3b6 100644 --- a/resources/i18n/OpenBoard_en_UK.ts +++ b/resources/i18n/OpenBoard_en_UK.ts @@ -2404,10 +2404,6 @@ p, li { white-space: pre-wrap; } Virtual Keyboard - - Keyboard button size: - - Positioned at the Top (recommended for tablets) @@ -2528,6 +2524,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_es.ts b/resources/i18n/OpenBoard_es.ts index 028032c5..26d94b66 100644 --- a/resources/i18n/OpenBoard_es.ts +++ b/resources/i18n/OpenBoard_es.ts @@ -2479,7 +2479,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Tamaño de los botones del teclado: + Tamaño de los botones del teclado: Toolbar @@ -2589,6 +2589,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_fr.ts b/resources/i18n/OpenBoard_fr.ts index 1034f10a..d0e08a3b 100644 --- a/resources/i18n/OpenBoard_fr.ts +++ b/resources/i18n/OpenBoard_fr.ts @@ -2483,7 +2483,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Taille des touches du clavier virtuel: + Taille des touches du clavier virtuel: Positioned at the Top (recommended for tablets) @@ -2605,6 +2605,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) Utiliser le clavier virtuel système (recommandé) + + Built-in virtual keyboard button size: + Taille des touches du clavier virtuel integré : + trapFlashDialog diff --git a/resources/i18n/OpenBoard_fr_CH.ts b/resources/i18n/OpenBoard_fr_CH.ts index 9f4604e3..6bd567b4 100644 --- a/resources/i18n/OpenBoard_fr_CH.ts +++ b/resources/i18n/OpenBoard_fr_CH.ts @@ -2483,7 +2483,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Taille des touches du clavier virtuel: + Taille des touches du clavier virtuel: Positioned at the Top (recommended for tablets) @@ -2605,6 +2605,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) Utiliser le clavier virtuel système (recommandé) + + Built-in virtual keyboard button size: + Taille des touches du clavier virtuel integré : + trapFlashDialog diff --git a/resources/i18n/OpenBoard_it.ts b/resources/i18n/OpenBoard_it.ts index c439676a..3786d465 100644 --- a/resources/i18n/OpenBoard_it.ts +++ b/resources/i18n/OpenBoard_it.ts @@ -2485,7 +2485,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Dimensione pulsanti tastiera: + Dimensione pulsanti tastiera: Toolbar @@ -2595,6 +2595,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_iw.ts b/resources/i18n/OpenBoard_iw.ts index 636b6fa3..0d98c054 100644 --- a/resources/i18n/OpenBoard_iw.ts +++ b/resources/i18n/OpenBoard_iw.ts @@ -2478,7 +2478,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - גודל מקשי המקלדת: + גודל מקשי המקלדת: Toolbar @@ -2588,6 +2588,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_ja.ts b/resources/i18n/OpenBoard_ja.ts index 06cfe0da..05290e17 100644 --- a/resources/i18n/OpenBoard_ja.ts +++ b/resources/i18n/OpenBoard_ja.ts @@ -2472,7 +2472,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - キーボードボタンサイズ: + キーボードボタンサイズ: Toolbar @@ -2582,6 +2582,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_ko.ts b/resources/i18n/OpenBoard_ko.ts index cca56514..0f51affd 100644 --- a/resources/i18n/OpenBoard_ko.ts +++ b/resources/i18n/OpenBoard_ko.ts @@ -2486,7 +2486,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - 키보드 버튼 크기: + 키보드 버튼 크기: Toolbar @@ -2596,6 +2596,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_mg.ts b/resources/i18n/OpenBoard_mg.ts index f4cdd963..8041ef07 100644 --- a/resources/i18n/OpenBoard_mg.ts +++ b/resources/i18n/OpenBoard_mg.ts @@ -2473,7 +2473,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Haben'ny kitendrin'ny fafan-teny: + Haben'ny kitendrin'ny fafan-teny: Positioned at the Top (recommended for tablets) @@ -2595,6 +2595,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_nb.ts b/resources/i18n/OpenBoard_nb.ts index c5c84904..b9e12e8c 100644 --- a/resources/i18n/OpenBoard_nb.ts +++ b/resources/i18n/OpenBoard_nb.ts @@ -2480,7 +2480,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Tastestørrelse tastatur: + Tastestørrelse tastatur: Toolbar @@ -2592,6 +2592,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_nl.ts b/resources/i18n/OpenBoard_nl.ts index fe4446df..b4ba1bff 100644 --- a/resources/i18n/OpenBoard_nl.ts +++ b/resources/i18n/OpenBoard_nl.ts @@ -2470,7 +2470,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Formaat knoppen van toetsenbord: + Formaat knoppen van toetsenbord: Toolbar @@ -2580,6 +2580,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_pl.ts b/resources/i18n/OpenBoard_pl.ts index c513e0dc..4b13cca1 100644 --- a/resources/i18n/OpenBoard_pl.ts +++ b/resources/i18n/OpenBoard_pl.ts @@ -2496,7 +2496,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Rozmiar przycisków klawiatury: + Rozmiar przycisków klawiatury: Toolbar @@ -2606,6 +2606,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_pt.ts b/resources/i18n/OpenBoard_pt.ts index ac35c7b8..edc24147 100644 --- a/resources/i18n/OpenBoard_pt.ts +++ b/resources/i18n/OpenBoard_pt.ts @@ -2483,7 +2483,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Tamanho dos botões do teclado: + Tamanho dos botões do teclado: Toolbar @@ -2595,6 +2595,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_ro.ts b/resources/i18n/OpenBoard_ro.ts index 8ceccdcb..ee3ce709 100644 --- a/resources/i18n/OpenBoard_ro.ts +++ b/resources/i18n/OpenBoard_ro.ts @@ -2485,7 +2485,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Dimensiune buton tastatură: + Dimensiune buton tastatură: Toolbar @@ -2595,6 +2595,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_ru.ts b/resources/i18n/OpenBoard_ru.ts index 5c03d5b0..95b9741c 100644 --- a/resources/i18n/OpenBoard_ru.ts +++ b/resources/i18n/OpenBoard_ru.ts @@ -2485,7 +2485,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Размер клавиш клавиатуры: + Размер клавиш клавиатуры: Toolbar @@ -2595,6 +2595,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_sk.ts b/resources/i18n/OpenBoard_sk.ts index 125588bc..75203bb2 100644 --- a/resources/i18n/OpenBoard_sk.ts +++ b/resources/i18n/OpenBoard_sk.ts @@ -2517,7 +2517,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Veľkosť tlačidla klávesnice: + Veľkosť tlačidla klávesnice: Stylus Palette @@ -2599,6 +2599,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_sv.ts b/resources/i18n/OpenBoard_sv.ts index 9308e2a5..0a0395bc 100644 --- a/resources/i18n/OpenBoard_sv.ts +++ b/resources/i18n/OpenBoard_sv.ts @@ -2486,7 +2486,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Storlek på tangentbordet knappar: + Storlek på tangentbordet knappar: Toolbar @@ -2596,6 +2596,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_tr.ts b/resources/i18n/OpenBoard_tr.ts index bc4f4f71..9b9c9c84 100644 --- a/resources/i18n/OpenBoard_tr.ts +++ b/resources/i18n/OpenBoard_tr.ts @@ -2471,7 +2471,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Klavye tuş boyutu: + Klavye tuş boyutu: Positioned at the Top (recommended for tablets) @@ -2593,6 +2593,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_zh.ts b/resources/i18n/OpenBoard_zh.ts index 8472a748..90dd8f2f 100644 --- a/resources/i18n/OpenBoard_zh.ts +++ b/resources/i18n/OpenBoard_zh.ts @@ -2483,7 +2483,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - 键盘钮大小： + 键盘钮大小： Toolbar @@ -2593,6 +2593,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_zh_CN.ts b/resources/i18n/OpenBoard_zh_CN.ts index 8472a748..90dd8f2f 100644 --- a/resources/i18n/OpenBoard_zh_CN.ts +++ b/resources/i18n/OpenBoard_zh_CN.ts @@ -2483,7 +2483,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - 键盘钮大小： + 键盘钮大小： Toolbar @@ -2593,6 +2593,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/resources/i18n/OpenBoard_zh_TW.ts b/resources/i18n/OpenBoard_zh_TW.ts index 4b49e78e..dcd9da75 100644 --- a/resources/i18n/OpenBoard_zh_TW.ts +++ b/resources/i18n/OpenBoard_zh_TW.ts @@ -2458,7 +2458,7 @@ p, li { white-space: pre-wrap; } Keyboard button size: - 按鍵大小: + 按鍵大小: Positioned at the Top (recommended for tablets) @@ -2580,6 +2580,10 @@ p, li { white-space: pre-wrap; } Use system keyboard (recommended) + + Built-in virtual keyboard button size: + + trapFlashDialog diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp index 2ca34217..98a8b8f0 100644 --- a/src/core/UBPreferencesController.cpp +++ b/src/core/UBPreferencesController.cpp @@ -130,6 +130,8 @@ void UBPreferencesController::wire() connect(mPreferencesUI->useSystemOSKCheckBox, SIGNAL(clicked(bool)), settings->useSystemOnScreenKeyboard, SLOT(setBool(bool))); + connect(mPreferencesUI->useSystemOSKCheckBox, SIGNAL(clicked(bool)), this, SLOT(systemOSKCheckBoxToggled(bool))); + connect(mPreferencesUI->keyboardPaletteKeyButtonSize, SIGNAL(currentIndexChanged(const QString &)), settings->boardKeyboardPaletteKeyBtnSize, SLOT(setString(const QString &))); connect(mPreferencesUI->startModeComboBox, SIGNAL(currentIndexChanged(int)), settings->appStartMode, SLOT(setInt(int))); @@ -201,6 +203,7 @@ void UBPreferencesController::init() } mPreferencesUI->useSystemOSKCheckBox->setChecked(settings->useSystemOnScreenKeyboard->get().toBool()); + this->systemOSKCheckBoxToggled(mPreferencesUI->useSystemOSKCheckBox->isChecked()); mPreferencesUI->startModeComboBox->setCurrentIndex(settings->appStartMode->get().toInt()); @@ -451,6 +454,12 @@ void UBPreferencesController::toolbarOrientationHorizontal(bool checked) settings->appToolBarOrientationVertical->set(!checked); } +void UBPreferencesController::systemOSKCheckBoxToggled(bool checked) +{ + mPreferencesUI->keyboardPaletteKeyButtonSize->setVisible(!checked); + mPreferencesUI->keyboardPaletteKeyButtonSize_Label->setVisible(!checked); +} + UBBrushPropertiesFrame::UBBrushPropertiesFrame(QFrame* owner, const QList& lightBackgroundColors, const QList& darkBackgroundColors, const QList& lightBackgroundSelectedColors, const QList& darkBackgroundSelectedColors, UBPreferencesController* controller) diff --git a/src/core/UBPreferencesController.h b/src/core/UBPreferencesController.h index fa15b255..a73ffc4a 100644 --- a/src/core/UBPreferencesController.h +++ b/src/core/UBPreferencesController.h @@ -93,6 +93,7 @@ class UBPreferencesController : public QObject void toolbarPositionChanged(bool checked); void toolbarOrientationVertical(bool checked); void toolbarOrientationHorizontal(bool checked); + void systemOSKCheckBoxToggled(bool checked); private slots: void adjustScreens(int screen);