[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/kimmoli/tohkbd2.git</param>
<param name="branch">master</param>
- <param name="revision">080212a872a4515e22c1c11c85aad6a090fec29a</param>
+ <param name="revision">69101e01e019a178eeebc84e9161e662f8cfc03a</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/daemon/config/com.kimmoli.tohkbd2.xml
^
|
@@ -1,28 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
- <interface name="com.kimmoli.tohkbd2">
- <method name="getVersion">
- <arg name="value" type="s" direction="out" />
- </method>
- <method name="quit" />
- <method name="fakeInputReport">
- <arg name="value" type="ay" direction="in" />
- </method>
- <method name="setShortcut">
- <arg name="key" type="s" direction="in" />
- <arg name="appPath" type="s" direction="in" />
- </method>
- <method name="setShortcutsToDefault" />
- <method name="setSettingInt">
- <arg name="key" type="s" direction="in" />
- <arg name="value" type="i" direction="in" />
- </method>
- <method name="setSettingString">
- <arg name="key" type="s" direction="in" />
- <arg name="value" type="s" direction="in" />
- </method>
- <signal name="keyboardConnectedChanged">
- <arg name="connected" type="b" direction="out" />
- </signal>
- </interface>
-</node>
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/daemon/src/keymapping_lut.h
^
|
@@ -1,265 +0,0 @@
-#ifndef KEYMAPPING_LUT_H
-#define KEYMAPPING_LUT_H
-
-#include <linux/input.h>
-#include "keymapping.h"
-
-/* Keycodes without modifier */
-
-static const int lut_plain_scandic[] =
-{
- 0xA1, KEY_TAB, 0,
- 0xA3, KEY_1, 0,
- 0xA4, KEY_2, 0,
- 0xA5, KEY_3, 0,
- 0xA6, KEY_4, 0,
- 0xA7, KEY_5, 0,
- 0xA8, KEY_6, 0,
- 0xA9, KEY_7, 0,
- 0xAA, KEY_8, 0,
- 0xAB, KEY_9, 0,
- 0xAC, KEY_0, 0,
- 0xAD, KEY_MINUS, 0,
- 0xAE, KEY_EQUAL, 0,
- 0xAF, KEY_BACKSPACE, 0,
- 0xB1, KEY_DELETE, 0,
- 0xB2, KEY_UP, 0,
- 0xB3, KEY_INSERT, 0,
- 0xB4, KEY_Q, 0,
- 0xB5, KEY_W, 0,
- 0xB6, KEY_E, 0,
- 0xB7, KEY_R, 0,
- 0xB8, KEY_T, 0,
- 0xB9, KEY_Y, 0,
- 0xBA, KEY_U, 0,
- 0xBB, KEY_I, 0,
- 0xBC, KEY_O, 0,
- 0xBD, KEY_P, 0,
- 0xBE, KEY_LEFTBRACE, 0,
- 0xC1, KEY_LEFT, 0,
- 0xC3, KEY_RIGHT, 0,
- 0xC4, KEY_A, 0,
- 0xC5, KEY_S, 0,
- 0xC6, KEY_D, 0,
- 0xC7, KEY_F, 0,
- 0xC8, KEY_G, 0,
- 0xC9, KEY_H, 0,
- 0xCA, KEY_J, 0,
- 0xCB, KEY_K, 0,
- 0xCC, KEY_L, 0,
- 0xCD, KEY_SEMICOLON, 0,
- 0xCE, KEY_APOSTROPHE, 0,
- 0xD1, KEY_HOME, 0,
- 0xD2, KEY_DOWN, 0,
- 0xD3, KEY_END, 0,
- 0xD4, KEY_Z, 0,
- 0xD5, KEY_X, 0,
- 0xD6, KEY_C, 0,
- 0xD7, KEY_V, 0,
- 0xD8, KEY_B, 0,
- 0xD9, KEY_N, 0,
- 0xDA, KEY_M, 0,
- 0xDB, KEY_SLASH, FORCE_SHIFT,
- 0xDC, KEY_1, FORCE_SHIFT,
- 0xDD, KEY_COMMA, 0,
- 0xDE, KEY_DOT, 0,
- 0xEC, KEY_2, FORCE_SHIFT,
- 0xEF, KEY_ENTER, 0,
- 0xE9, KEY_SPACE, 0,
- 0,0,0
-};
-
-static const int lut_plain_qwertz[] =
-{
- 0xA1, KEY_TAB, 0,
- 0xA3, KEY_1, 0,
- 0xA4, KEY_2, 0,
- 0xA5, KEY_3, 0,
- 0xA6, KEY_4, 0,
- 0xA7, KEY_5, 0,
- 0xA8, KEY_6, 0,
- 0xA9, KEY_7, 0,
- 0xAA, KEY_8, 0,
- 0xAB, KEY_9, 0,
- 0xAC, KEY_0, 0,
- 0xAD, KEY_MINUS, 0,
- 0xAE, KEY_EQUAL, 0,
- 0xAF, KEY_BACKSPACE, 0,
- 0xB1, KEY_DELETE, 0,
- 0xB2, KEY_UP, 0,
- 0xB3, KEY_INSERT, 0,
- 0xB4, KEY_Q, 0,
- 0xB5, KEY_W, 0,
- 0xB6, KEY_E, 0,
- 0xB7, KEY_R, 0,
- 0xB8, KEY_T, 0,
- 0xB9, KEY_Z, 0,
- 0xBA, KEY_U, 0,
- 0xBB, KEY_I, 0,
- 0xBC, KEY_O, 0,
- 0xBD, KEY_P, 0,
- 0xBE, KEY_KPPLUS, 0,
- 0xC1, KEY_LEFT, 0,
- 0xC3, KEY_RIGHT, 0,
- 0xC4, KEY_A, 0,
- 0xC5, KEY_S, 0,
- 0xC6, KEY_D, 0,
- 0xC7, KEY_F, 0,
- 0xC8, KEY_G, 0,
- 0xC9, KEY_H, 0,
- 0xCA, KEY_J, 0,
- 0xCB, KEY_K, 0,
- 0xCC, KEY_L, 0,
- 0xCD, KEY_SEMICOLON, 0,
- 0xCE, KEY_APOSTROPHE, 0,
- 0xD1, KEY_HOME, 0,
- 0xD2, KEY_DOWN, 0,
- 0xD3, KEY_END, 0,
- 0xD4, KEY_Y, 0,
- 0xD5, KEY_X, 0,
- 0xD6, KEY_C, 0,
- 0xD7, KEY_V, 0,
- 0xD8, KEY_B, 0,
- 0xD9, KEY_N, 0,
- 0xDA, KEY_M, 0,
- 0xDB, KEY_SLASH, FORCE_SHIFT,
- 0xDC, KEY_1, FORCE_SHIFT,
- 0xDD, KEY_COMMA, 0,
- 0xDE, KEY_DOT, 0,
- 0xEC, KEY_2, FORCE_SHIFT,
- 0xEF, KEY_ENTER, 0,
- 0xE9, KEY_SPACE, 0,
- 0,0,0
-};
-
-static const int lut_plain_azerty[] =
-{
- 0xA1, KEY_TAB, 0,
- 0xA3, KEY_1, 0,
- 0xA4, KEY_2, 0,
- 0xA5, KEY_3, 0,
- 0xA6, KEY_4, 0,
- 0xA7, KEY_5, 0,
- 0xA8, KEY_6, 0,
- 0xA9, KEY_7, 0,
- 0xAA, KEY_8, 0,
- 0xAB, KEY_9, 0,
- 0xAC, KEY_0, 0,
- 0xAD, KEY_MINUS, 0,
- 0xAE, KEY_EQUAL, 0,
- 0xAF, KEY_BACKSPACE, 0,
- 0xB1, KEY_DELETE, 0,
- 0xB2, KEY_UP, 0,
- 0xB3, KEY_INSERT, 0,
- 0xB4, KEY_A, 0,
- 0xB5, KEY_Z, 0,
- 0xB6, KEY_E, 0,
- 0xB7, KEY_R, 0,
- 0xB8, KEY_T, 0,
- 0xB9, KEY_Y, 0,
- 0xBA, KEY_U, 0,
- 0xBB, KEY_I, 0,
- 0xBC, KEY_O, 0,
- 0xBD, KEY_P, 0,
- 0xBE, KEY_KPPLUS, 0,
- 0xC1, KEY_LEFT, 0,
- 0xC3, KEY_RIGHT, 0,
- 0xC4, KEY_Q, 0,
- 0xC5, KEY_S, 0,
- 0xC6, KEY_D, 0,
- 0xC7, KEY_F, 0,
- 0xC8, KEY_G, 0,
- 0xC9, KEY_H, 0,
- 0xCA, KEY_J, 0,
- 0xCB, KEY_K, 0,
- 0xCC, KEY_L, 0,
- 0xCD, KEY_M, 0,
- 0xCE, KEY_APOSTROPHE, 0,
- 0xD1, KEY_HOME, 0,
- 0xD2, KEY_DOWN, 0,
- 0xD3, KEY_END, 0,
- 0xD4, KEY_W, 0,
- 0xD5, KEY_X, 0,
- 0xD6, KEY_C, 0,
- 0xD7, KEY_V, 0,
- 0xD8, KEY_B, 0,
- 0xD9, KEY_N, 0,
- //0xDA, KEY_M, 0,
- 0xDB, KEY_SLASH, FORCE_SHIFT,
- 0xDC, KEY_1, FORCE_SHIFT,
- 0xDD, KEY_COMMA, 0,
- 0xDE, KEY_DOT, 0,
- 0xEC, KEY_2, FORCE_SHIFT,
- 0xEF, KEY_ENTER, 0,
- 0xE9, KEY_SPACE, 0,
- 0,0,0
-};
-
-
-
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/settings-ui/i18n/no.ts
^
|
@@ -1,253 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="no" version="2.1">
-<context>
- <name/>
- <message id="tohkbd2-settings-app-name">
- <source>TOHKBD Settings</source>
- <extracomment>Application name</extracomment>
- <translation>TOHKBD-innstillinger</translation>
- </message>
- <message id="about">
- <source>About...</source>
- <extracomment>Menu option and header for about page</extracomment>
- <translation>Om...</translation>
- </message>
- <message id="team-header">
- <source>The TOHKBD2 Team</source>
- <extracomment>header label for the team presentation</extracomment>
- <translation>TOHKBD2-laget</translation>
- </message>
- <message id="version-settings-ui">
- <source>Settings UI version: </source>
- <extracomment>Version information field, for Settings UI application version</extracomment>
- <translation>Versjon:</translation>
- </message>
- <message id="version-daemon">
- <source>Daemon version: </source>
- <extracomment>Version information field, for daemon version (which runs as root)</extracomment>
- <translation>Nisseversjon:</translation>
- </message>
- <message id="version-user-daemon">
- <source>User Daemon version: </source>
- <extracomment>Version information field, for user daemon version (which runs as nemo)</extracomment>
- <translation>Brukernisseversjon:</translation>
- </message>
- <message id="version-sailfish">
- <source>Sailfish version: </source>
- <extracomment>Version information field, for Sailfish OS version</extracomment>
- <translation>Sailfish-versjon:</translation>
- </message>
- <message id="select-application">
- <source>Select application</source>
- <extracomment>Application shortcut selector page header</extracomment>
- <translation>Velg program</translation>
- </message>
- <message id="launch-ext-app">
- <source>Launching external application...</source>
- <extracomment>Text shown with busyindicator when starting external application</extracomment>
- <translation>Starter eksternt program...</translation>
- </message>
- <message id="report-a-bug">
- <source>Report a bug</source>
- <extracomment>Main menu selection for FAQ and reporting an issue, page header for bug reporter page. button text for triggering email app.</extracomment>
- <translation>Meld fra om en feil</translation>
- </message>
- <message id="faq-text">
- <source>Please first check TOHKBD FAQ page at https://together.jolla.com. Button below opens this link in browser.</source>
- <extracomment>Description above open faq -button</extracomment>
- <translation>Se OSS for TOHKBD på https://together.jolla.com først. Knappen nedenfor åpner denne lenka i nettleseren.</translation>
- </message>
- <message id="faq-button">
- <source>Open FAQ</source>
- <extracomment>Button text, clicking this will open url showing FAQ</extracomment>
- <translation>Åpne OSS</translation>
- </message>
- <message id="report-text">
- <source>If there is no answer to your issue, please report it. Button below launches email client.</source>
- <extracomment>Description above report issue -button</extracomment>
- <translation>Hvis spørsmålet ditt ikke er besvart, rapporter det. Knappen nedenfor starter epostklienten.</translation>
- </message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>Tilpass %1-tast</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Du endrer nå oppførselen til denne tasten</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Standard tast</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Sym + Tast</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Ingen</translation>
- </message>
- <message id="general-settings">
- <source>General settings</source>
- <extracomment>Main menu selection for general settings</extracomment>
- <translation>Generelle innstillinger</translation>
- </message>
- <message id="backlight-sect-header">
- <source>Backlight</source>
- <extracomment>Section header for backlight settings</extracomment>
- <translation>Bakbelysning</translation>
- </message>
- <message id="bg-always-on-sw">
- <source>Always on</source>
- <extracomment>Backlight always on switch text</extracomment>
- <translation>Alltid på</translation>
- </message>
- <message id="bg-always-on-desc">
- <source>Backlight is always on when keyboard attached and phone's display is on</source>
- <extracomment>Backlight always on description</extracomment>
- <translation>Bakbelysning er alltid på når tastaturet er tilkoblet og telefonskjermen er aktiv.</translation>
- </message>
- <message id="bg-automatic-sw">
- <source>Automatic</source>
- <extracomment>Backlight automatic switch text</extracomment>
- <translation>Automatisk</translation>
- </message>
- <message id="bg-automatic-desc">
- <source>Automatic backlight enable or always off</source>
- <extracomment>Backlight automatic description</extracomment>
- <translation>Slå på eller av automatisk bakbelysning</translation>
- </message>
- <message id="bg-timeout-slider">
- <source>Backlight timeout</source>
- <extracomment>Backlight timeout slider name</extracomment>
- <translation>Tidsgrense for bakbelysning</translation>
- </message>
- <message id="bg-brightness-slider">
- <source>Brightness threshold</source>
- <extracomment>Backlight brightness threshold slider</extracomment>
- <translation>Grense for lysstyrke</translation>
- </message>
- <message id="orientation-sect-header">
- <source>Orientation</source>
- <extracomment>Section header for orientation settings</extracomment>
- <translation>Skjermorientering</translation>
- </message>
- <message id="orientation-force-landscape-sw">
- <source>Force Landscape</source>
- <extracomment>Force landsacep switch text</extracomment>
- <translation>Tving landskapmodus</translation>
- </message>
- <message id="orientation-force-landscape-desc">
- <source>Force landscape orientation when keyboard attached</source>
- <extracomment>Force landsacep switch description</extracomment>
- <translation>Tving landskapmodus når tastaturet er tilkoblet</translation>
- </message>
- <message id="repeat-sect-header">
- <source>Repeat</source>
- <extracomment>Section header for repeat settings</extracomment>
- <translation>Gjenta</translation>
- </message>
- <message id="repeat-delay-slider">
- <source>Repeat start delay</source>
- <extracomment>Keyboard repeat start delay slider</extracomment>
- <translation>Forsinkelse</translation>
- </message>
- <message id="repeat-rate-slider">
- <source>Repeat rate</source>
- <extracomment>Keyboard repeat rate slider</extracomment>
- <translation>Rate</translation>
- </message>
- <message id="test-here">
- <source>Test here</source>
- <extracomment>Placeholder text for textfield to test repeat settings</extracomment>
- <translation>Test her</translation>
- </message>
- <message id="sticky-sect-header">
- <source>Sticky and locking modifier keys</source>
- <extracomment>Section header for sticky and locking settings</extracomment>
- <translation>Faste og låsende valgtaster</translation>
- </message>
- <message id="sticky-desc">
- <source>Sticky modifiers will toggle when pressed once and released after pressing any other key. Locking modifier will lock on double-press and released on third. In both modes you can also use them as normal modifier keys.</source>
- <oldsource>Sticky modifiers will toggle when pressed once and released after pressing any other key. Locking modifier will lock on double-press and released on third. In both modes you can also use them as normal modifier keys</oldsource>
- <extracomment>Description text for sticky and locking modifier keys</extracomment>
- <translation>Fast valgtast skrus på når du trykker en gang og av når du trykker en annen tast. Låsende valgtast skrus på med dobbelttrykk og av igjen med et nytt trykk. I begge modi kan de også brukes som vanlige valgtaster.</translation>
- </message>
- <message id="sticky-shift">
- <source>Sticky Shift</source>
- <translation>Fast Shift</translation>
- </message>
- <message id="locking-shift">
- <source>Locking Shift</source>
- <translation>Låsende Shift</translation>
- </message>
- <message id="sticky-ctrl">
- <source>Sticky Ctrl</source>
- <translation>Fast Ctrl</translation>
- </message>
- <message id="locking-ctrl">
- <source>Locking Ctrl</source>
- <translation>Låsende Ctrl</translation>
- </message>
- <message id="sticky-alt">
- <source>Sticky Alt</source>
- <translation>Fast Alt</translation>
- </message>
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/settings-ui/qml/components/Key.qml
^
|
@@ -1,44 +0,0 @@
-import QtQuick 2.0
-import Sailfish.Silica 1.0
-
-MouseArea
-{
- id: ma
- property string label: ""
- property string symLabel: ""
-
- property bool changed: false
-
- enabled: label.length > 0
-
- onClicked:
- {
- console.log(label)
-
- var dlg = pageStack.push(Qt.resolvedUrl("../pages/CustomizeKey.qml"),
- {
- "label": label,
- "symLabel": symLabel
- } )
-
- dlg.accepted.connect(function()
- {
- console.log("Change of " + label + " accepted.")
- changed = true
- })
- }
- onPressAndHold:
- {
- console.log("clicked")
- fullimageview.height = 284
- zoomin = false
- }
-
- Rectangle
- {
- anchors.fill: parent
- color: (ma.pressed ? Theme.highlightColor : (changed ? "red" : "transparent"))
- opacity: ma.pressed ? 0.6 : 0.3
- radius: 10
- }
-}
|
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/settings-ui/qml/images/image-keyboard-azerty.png
^
|
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/settings-ui/qml/images/image-keyboard-cyrillic.png
^
|
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/settings-ui/qml/images/image-keyboard-qwerty.png
^
|
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/settings-ui/qml/images/image-keyboard-qwertz.png
^
|
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/settings-ui/qml/images/image-keyboard-scandic.png
^
|
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/settings-ui/qml/images/image-keyboard-stealth.png
^
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/settings-ui/qml/pages/CustomizeKey.qml
^
|
@@ -1,119 +0,0 @@
-/*
- tohkbd2-settings-u, The Otherhalf Keyboard 2 settings UI
-*/
-
-import QtQuick 2.0
-import Sailfish.Silica 1.0
-
-Dialog
-{
- id: page
-
- property string label: "value"
- property string symLabel: "value"
-
- onDone:
- {
- if (result === DialogResult.Accepted)
- {
- }
- }
-
- SilicaFlickable
- {
- anchors.fill: parent
- contentHeight: col.height
- Column
- {
- id: col
- width: parent.width
- spacing: Theme.paddingLarge
- PageHeader
- {
- //: page header for key customizer, shows label of the key
- //% "Customize %1 -key"
- title: qsTrId("customize-key-header").arg(label)
- }
- Label
- {
- //: warning text shown on customizer page
- //% "You are about to change behaviour of this key"
- text: qsTrId("customize-key-warning")
- color: Theme.primaryColor
- width: parent.width - 2*Theme.paddingLarge
- wrapMode: Text.WordWrap
- horizontalAlignment: Text.AlignHCenter
- anchors.horizontalCenter: parent.horizontalCenter
- }
-
- Label
- {
- //: Text shon above the key without any modifiers, e.g. A
- //% "Plain key"
- text: qsTrId("plain-key")
- anchors.horizontalCenter: parent.horizontalCenter
- }
- Label
- {
- text: label
- font.bold: true
- font.pixelSize: Theme.fontSizeLarge
- anchors.horizontalCenter: parent.horizontalCenter
- Rectangle
- {
- id: plainKeyRect
- anchors.centerIn: parent
- height: parent.height + 10
- width: Math.max(height, parent.width + 16)
- border.color: Theme.primaryColor
- border.width: 3
- radius: 5
- color: "transparent"
- }
- OpacityRampEffect
- {
- direction: OpacityRamp.LeftToRight
- slope: 1.0
- offset: 0.33
- sourceItem: plainKeyRect
- }
- }
- Label
- {
- //: Text shon above the key wit sym modifier, e.g. ;
- //% "Key with Sym"
- text: qsTrId("with-sym-key")
- anchors.horizontalCenter: parent.horizontalCenter
- }
- Label
- {
- //: This text is shown instead of key label (e.g. A) if there is nothing assigned to this key
- //% "None"
- text: symLabel.length > 0 ? symLabel : qsTrId("none-key")
- font.bold: true
- font.pixelSize: Theme.fontSizeLarge
- anchors.horizontalCenter: parent.horizontalCenter
- Rectangle
- {
- id: symKeyRect
- visible: symLabel.length > 0
- anchors.centerIn: parent
- height: parent.height + 10
- width: Math.max(height, parent.width + 16)
- border.color: Theme.primaryColor
- border.width: 3
- radius: 5
- color: "transparent"
- }
- OpacityRampEffect
- {
- direction: OpacityRamp.LeftToRight
- slope: 1.0
- offset: 0.33
- sourceItem: symKeyRect
- }
- }
- }
- }
-}
-
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/settings-ui/qml/pages/KeyboardLayout.qml
^
|
@@ -1,346 +0,0 @@
-/*
- tohkbd2-settings-u, The Otherhalf Keyboard 2 settings UI
-*/
-
-import QtQuick 2.0
-import Sailfish.Silica 1.0
-import "../components"
-
-Page
-{
- id: page
-
- backNavigation: !zoomin
- clip: true
-
- property bool zoomin: false
-
- SlideshowView
- {
- anchors.centerIn: parent
-
- visible: !fullimageview.visible
-
- id: view
- width: page.width
- height: 290
- itemWidth: 540
- clip: true
-
- model: layoutsmodel
-
- delegate: Item
- {
- width: view.itemWidth
- height: view.height
- Image
- {
- id: img
- source: imagesource
- width: 540 - Theme.paddingLarge
- height: view.height
- anchors.top: parent.top
- anchors.horizontalCenter: parent.horizontalCenter
- fillMode: Image.PreserveAspectFit
- }
-
- MouseArea
- {
- enabled: false // !zoomin && view.currentIndex == index
- anchors.fill: parent
- onClicked:
- {
- zoomin = true
- fullimageview.height = 540
- //fullimageview.anchors.horizontalCenterOffset = 0
- fullimageview.source = imagesource
- fullimageviewFlickable.contentX = (fullimageview.width - page.width)/2
- }
- }
- }
- }
- Text
- {
- id: layoutlabel
- anchors.bottom: view.top
- anchors.bottomMargin: Theme.paddingLarge
- anchors.horizontalCenter: page.horizontalCenter
- text: layoutsmodel.count ? layoutsmodel.get(view.currentIndex).layoutname : ""
- color: Theme.primaryColor
- font.pixelSize: Theme.fontSizeLarge
- opacity: fullimageview.visible ? 0 : 1
- Behavior on opacity { NumberAnimation {} }
- }
- Text
- {
- id: layoutlabelActive
- anchors.bottom: layoutlabel.top
- anchors.bottomMargin: Theme.paddingSmall
- anchors.horizontalCenter: page.horizontalCenter
- //: label showing this layout is currently selected
- //% "Active"
- text: qsTrId("active-layout")
- color: Theme.primaryColor
- font.pixelSize: Theme.fontSizeMedium
- visible: layoutlabel.text === settings["masterLayout"]
- opacity: fullimageview.visible ? 0 : 1
- Behavior on opacity { NumberAnimation {} }
- }
- Button
- {
- id: layoutSelectButton
- enabled: layoutsmodel.count ? (layoutsmodel.get(view.currentIndex).implemented && opacity == 1) : false
- //: Button text for button to select this as active LayoutItem
- //% "Select"
- text: qsTrId("select-layout")
- anchors.top: view.bottom
- anchors.topMargin: Theme.paddingLarge
- anchors.horizontalCenter: page.horizontalCenter
- opacity: fullimageview.visible ? 0 : 1
- Behavior on opacity { NumberAnimation {} }
-
- onClicked:
- {
- settingsui.setSettingString("masterLayout", layoutsmodel.get(view.currentIndex).layoutname)
- pageStack.pop()
- }
- }
-
- SilicaFlickable
- {
- id: fullimageviewFlickable
- visible: fullimageview.height > 290
- height: fullimageview.height
- width: parent.width
-
- contentHeight: fullimageview.height
- contentWidth: fullimageview.width
- anchors.verticalCenter: parent.verticalCenter
-
- Image
- {
- id: fullimageview
- //anchors.verticalCenter: parent.verticalCenter
- width: 1787
- height: 290
- fillMode: Image.PreserveAspectFit
- visible: height > 290
- Behavior on height { NumberAnimation {} }
- }
-
- Column
- {
- anchors.left: fullimageview.left
- anchors.top: fullimageview.top
-
- Row
- {
- width: fullimageview.width
- height: (fullimageview.height - spacer.height)/5
-
- Repeater
- {
- model: row1
- delegate: Key {
- label: name
- symLabel: sym
- width: size * (fullimageview.width/16)
- height: fullimageview.height/5
- }
- }
- }
- Item
- {
- id: spacer
- height: 21
- width: 1
- }
- Row
- {
- width: fullimageview.width
- height: (fullimageview.height - spacer.height)/5
-
- Repeater
- {
- model: row2
- delegate: Key {
- label: name
- symLabel: sym
- width: size * (fullimageview.width/16)
- height: fullimageview.height/5
- }
- }
- }
- Row
- {
- width: fullimageview.width
- height: (fullimageview.height - spacer.height)/5
-
- Repeater
- {
- model: row3
- delegate: Key {
- label: name
- symLabel: sym
- width: size * (fullimageview.width/16)
- height: fullimageview.height/5
- }
- }
- }
- Row
- {
- width: fullimageview.width
- height: (fullimageview.height - spacer.height)/5
-
- Repeater
- {
- model: row4
- delegate: Key {
- label: name
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/user-daemon/config/com.kimmoli.tohkbd2user.xml
^
|
@@ -1,34 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
- <interface name="com.kimmoli.tohkbd2user">
- <method name="getActiveLayout">
- <arg name="value" type="s" direction="out" />
- </method>
- <method name="setActiveLayout">
- <arg name="value" type="s" direction="in" />
- </method>
- <method name="getOrientationLock">
- <arg name="value" type="s" direction="out" />
- </method>
- <method name="setOrientationLock">
- <arg name="value" type="s" direction="in" />
- </method>
- <method name="launchApplication">
- <arg name="desktopFilename" type="s" direction="in" />
- </method>
- <method name="showKeyboardConnectionNotification">
- <arg name="connected" type="b" direction="in" />
- </method>
- <method name="showTaskSwitcher" />
- <method name="nextAppTaskSwitcher" />
- <method name="hideTaskSwitcher" />
- <method name="actionWithRemorse">
- <arg name="action" type="s" direction="in" />
- </method>
- <method name="getVersion">
- <arg name="value" type="s" direction="out" />
- </method>
- <method name="takeScreenShot" />
- <method name="quit" />
- </interface>
-</node>
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-ambience-tohkbd2-0.4.2.tar.bz2/user-daemon/i18n/no.ts
^
|
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="no" version="2.1">
-<context>
- <name/>
- <message id="screenshot-saved">
- <source>Screenshot saved</source>
- <extracomment>Notification shown after screenshot is taken</extracomment>
- <translation>Skjermbilde lagret</translation>
- </message>
- <message id="keyb-connected">
- <source>Keyboard connected</source>
- <extracomment>Notification shown when keyboard is connected</extracomment>
- <translation>Tastatur tilkoblet</translation>
- </message>
- <message id="keyb-removed">
- <source>Keyboard removed</source>
- <extracomment>Notification shown when keyboard is removed</extracomment>
- <translation>Tastatur frakoblet</translation>
- </message>
- <message id="starting-app">
- <source>Starting %1...</source>
- <extracomment>Notification shown when application is started by pressing shortcut key</extracomment>
- <translation>Starter %1...</translation>
- </message>
- <message id="reboot-remorse">
- <source>Rebooting</source>
- <extracomment>Remorse timer text, "Rebooting" in 5 seconds</extracomment>
- <translation>Starter om</translation>
- </message>
- <message id="restart-lipstick-remorse">
- <source>Restarting Lipstick</source>
- <extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
- <translation>Omstart av Lipstick</translation>
- </message>
-</context>
-</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/.gitignore
^
|
@@ -2,7 +2,9 @@
*.pro.user
*.pro.user.*
*.qm
-userAdaptor.*
-userInterface.*
+userdaemonAdaptor.*
+userdaemonInterface.*
daemonAdaptor.*
daemonInterface.*
+settingsuiAdaptor.*
+settingsuiInterface.*
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/daemon.pro
^
|
@@ -1,29 +1,22 @@
TARGET = harbour-tohkbd2
-QT += dbus
+QT += dbus network
QT -= gui
-# D-bus adaptor and interface
-system(qdbusxml2cpp config/com.kimmoli.tohkbd2.xml -i src/tohkeyboard.h -a src/daemonAdaptor)
-system(qdbusxml2cpp config/com.kimmoli.tohkbd2.xml -p ../daemon/src/daemonInterface)
+CONFIG += link_pkgconfig
+PKGCONFIG += Qt5SystemInfo
DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\""
target.path = /usr/bin/
-systemd.path = /etc/systemd/system/
-systemd.files = config/$${TARGET}.service
-
udevrule.path = /etc/udev/rules.d/
udevrule.files = config/95-$${TARGET}.rules
-dbusconf.path = /etc/dbus-1/system.d/
-dbusconf.files = config/$${TARGET}.conf
-
vkblayout.path = /usr/share/maliit/plugins/com/jolla/layouts/
vkblayout.files = config/layouts/$${TARGET}.conf config/layouts/$${TARGET}.qml
-INSTALLS += target systemd udevrule dbusconf vkblayout
+INSTALLS += target udevrule vkblayout
message($${DEFINES})
@@ -36,11 +29,12 @@
src/driverBase.cpp \
src/tca8424driver.cpp \
src/keymapping.cpp \
- src/daemonAdaptor.cpp \
src/eepromdriver.cpp \
src/modifierhandler.cpp \
- ../user-daemon/src/userInterface.cpp \
- src/uinputevpoll.cpp
+ src/uinputevpoll.cpp \
+ ../dbus/src/daemonAdaptor.cpp \
+ ../dbus/src/userdaemonInterface.cpp \
+ ../dbus/src/settingsuiInterface.cpp
HEADERS += \
src/toh.h \
@@ -50,19 +44,16 @@
src/driverBase.h \
src/tca8424driver.h \
src/keymapping.h \
- src/daemonAdaptor.h \
src/defaultSettings.h \
src/eepromdriver.h \
- src/keymapping_lut.h \
src/modifierhandler.h \
- ../user-daemon/src/userInterface.h \
- src/uinputevpoll.h
+ src/uinputevpoll.h \
+ ../dbus/src/daemonAdaptor.h \
+ ../dbus/src/userdaemonInterface.h \
+ ../dbus/src/settingsuiInterface.h
OTHER_FILES += \
- config/$${TARGET}.service \
- config/$${TARGET}.conf \
config/layouts/$${TARGET}.conf \
config/layouts/$${TARGET}.qml \
- config/com.kimmoli.tohkbd2.xml \
config/icon-system-keyboard.png
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/defaultSettings.h
^
|
@@ -20,21 +20,22 @@
#define KEYREPEAT_DELAY 400
#define KEYREPEAT_RATE 25
-#define STICKY_SHIFT_ENABLED false
-#define STICKY_CTRL_ENABLED true
-#define STICKY_ALT_ENABLED false
-#define STICKY_SYM_ENABLED false
-#define LOCKING_SHIFT_ENABLED false
-#define LOCKING_CTRL_ENABLED false
-#define LOCKING_ALT_ENABLED false
-#define LOCKING_SYM_ENABLED false
+#define MODIFIER_SHIFT_MODE "Normal"
+#define MODIFIER_CTRL_MODE "Sticky"
+#define MODIFIER_ALT_MODE "Normal"
+#define MODIFIER_SYM_MODE "Normal"
#define FORCE_LANDSCAPE_ORIENTATION true
#define FORCE_BACKLIGHT_ON false
+#define TURN_DISPLAY_OFF_WHEN_REMOVED false
+#define KEEP_DISPLAY_ON_WHEN_CONNECTED false
+
#define MASTER_LAYOUT "Scandic"
#define ACTION_REBOOT_REMORSE "reboot-remorse"
#define ACTION_RESTART_LIPSTICK_REMORSE "restart-lipstick-remorse"
+#define VERBOSE_MODE_ENABLED false
+
#endif // DEFAULTSSETTINGS_H
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/driverBase.h
^
|
@@ -28,6 +28,7 @@
#include <linux/i2c-dev.h>
#include <sys/ioctl.h>
#include <fcntl.h>
+#include <unistd.h>
#include <QDebug>
#include <QObject>
#include <QByteArray>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/keymapping.cpp
^
|
@@ -1,12 +1,39 @@
+#include <QStringList>
+#include <QFile>
+#include <QTextStream>
+#include <QDir>
+
#include "keymapping.h"
#include <linux/input.h>
#include <stdio.h>
-#include "keymapping_lut.h"
+
+QStringList keymapping::keyNames = QStringList()
+ << "KEY_RESERVED" << "KEY_ESC" << "KEY_1" << "KEY_2" << "KEY_3" << "KEY_4" << "KEY_5" << "KEY_6" << "KEY_7" << "KEY_8" << "KEY_9"
+ << "KEY_0" << "KEY_MINUS" << "KEY_EQUAL" << "KEY_BACKSPACE" << "KEY_TAB" << "KEY_Q" << "KEY_W" << "KEY_E" << "KEY_R" << "KEY_T"
+ << "KEY_Y" << "KEY_U" << "KEY_I" << "KEY_O" << "KEY_P" << "KEY_LEFTBRACE" << "KEY_RIGHTBRACE" << "KEY_ENTER" << "KEY_LEFTCTRL"
+ << "KEY_A" << "KEY_S" << "KEY_D" << "KEY_F" << "KEY_G" << "KEY_H" << "KEY_J" << "KEY_K" << "KEY_L" << "KEY_SEMICOLON" << "KEY_APOSTROPHE"
+ << "KEY_GRAVE" << "KEY_LEFTSHIFT" << "KEY_BACKSLASH" << "KEY_Z" << "KEY_X" << "KEY_C" << "KEY_V" << "KEY_B" << "KEY_N" << "KEY_M"
+ << "KEY_COMMA" << "KEY_DOT" << "KEY_SLASH" << "KEY_RIGHTSHIFT" << "KEY_KPASTERISK" << "KEY_LEFTALT" << "KEY_SPACE" << "KEY_CAPSLOCK"
+ << "KEY_F1" << "KEY_F2" << "KEY_F3" << "KEY_F4" << "KEY_F5" << "KEY_F6" << "KEY_F7" << "KEY_F8" << "KEY_F9" << "KEY_F10" << "KEY_NUMLOCK"
+ << "KEY_SCROLLLOCK" << "KEY_KP7" << "KEY_KP8" << "KEY_KP9" << "KEY_KPMINUS" << "KEY_KP4" << "KEY_KP5" << "KEY_KP6" << "KEY_KPPLUS"
+ << "KEY_KP1" << "KEY_KP2" << "KEY_KP3" << "KEY_KP0" << "KEY_KPDOT" << "KEY_RESERVED" << "KEY_ZENKAKUHANKAKU" << "KEY_102ND" << "KEY_F11"
+ << "KEY_F12" << "KEY_RO" << "KEY_KATAKANA" << "KEY_HIRAGANA" << "KEY_HENKAN" << "KEY_KATAKANAHIRAGANA" << "KEY_MUHENKAN" << "KEY_KPJPCOMMA"
+ << "KEY_KPENTER" << "KEY_RIGHTCTRL" << "KEY_KPSLASH" << "KEY_SYSRQ" << "KEY_RIGHTALT" << "KEY_LINEFEED" << "KEY_HOME" << "KEY_UP"
+ << "KEY_PAGEUP" << "KEY_LEFT" << "KEY_RIGHT" << "KEY_END" << "KEY_DOWN" << "KEY_PAGEDOWN" << "KEY_INSERT" << "KEY_DELETE" << "KEY_MACRO"
+ << "KEY_MUTE" << "KEY_VOLUMEDOWN" << "KEY_VOLUMEUP" << "KEY_POWER" << "KEY_KPEQUAL" << "KEY_KPPLUSMINUS" << "KEY_PAUSE" << "KEY_SCALE"
+ << "KEY_KPCOMMA" << "KEY_HANGEUL" << "KEY_HANJA" << "KEY_YEN" << "KEY_LEFTMETA" << "KEY_RIGHTMETA" << "KEY_COMPOSE"
+ << "KEY_TOH_TABLE_DELIMITER" /* Keys after this are custom keys */
+ << "KEY_TOH_SCREENSHOT" << "KEY_TOH_SELFIE" << "KEY_TOH_NEWEMAIL" << "KEY_TOH_BACKLIGHT" << "KEY_TOH_NONE";
keymapping::keymapping(QObject *parent) :
QObject(parent)
{
+ layoutPath = QString();
+ alternativeLayout = QString();
+ originalLayout = QString();
+
pressedCode = 0;
+ verboseMode = false;
shift = new modifierHandler("shift");
ctrl = new modifierHandler("ctrl");
@@ -34,7 +61,6 @@
void keymapping::process(QByteArray inputReport)
{
- int n;
QList< QPair<int,int> > retKey;
char irCode = 0;
@@ -44,10 +70,14 @@
bool altDown = false;
bool symDown = false;
- printf("Processing report: ");
- for (n=0 ; n<inputReport.count() ; n++)
- printf("%02x ", inputReport.at(n));
- printf("\n");
+ if (verboseMode)
+ {
+ int n;
+ printf("Processing report: ");
+ for (n=0 ; n<inputReport.count() ; n++)
+ printf("%02x ", inputReport.at(n));
+ printf("\n");
+ }
QByteArray ir = inputReport.mid(5, 6);
@@ -88,6 +118,13 @@
return;
}
+ if (altDown && sym->pressed)
+ {
+ releaseStickyModifiers();
+ toggleAlternativeLayout();
+ return;
+ }
+
shift->set(leftShiftDown || shiftDown, ir.isEmpty());
ctrl->set(ctrlDown, ir.isEmpty());
alt->set(altDown, ir.isEmpty());
@@ -117,32 +154,13 @@
if (sym->pressed && irCode) /* With SYM modifier */
{
- int i = 0;
- while (lut_sym[i])
- {
- if (irCode == lut_sym[i])
- {
- retKey.append(qMakePair(lut_sym[i+1], lut_sym[i+2]));
- break;
- }
- i += 3;
- }
+ retKey.append(lut_sym.value(irCode));
}
- else if (irCode) /* Without SYM modifier */
+ else if (irCode) /* Plain key */
{
- int i = 0;
- while (lut_plain[i])
- {
- if (irCode == lut_plain[i])
- {
- retKey.append(qMakePair(lut_plain[i+1], lut_plain[i+2]));
- break;
- }
- i += 3;
- }
+ retKey.append(lut_plain.value(irCode));
}
-
/* If key is changed on the fly without break... emit released */
if (pressedCode)
{
@@ -172,54 +190,195 @@
sym->clear(force);
}
-void keymapping::setLayout(QString toLayout)
+bool keymapping::setLayout(QString toLayout, bool forceReload)
{
- if (toLayout == layout)
- return;
+ bool ret = true;
+ bool alternativeLayoutSet = false;
+
+ if ((toLayout == layout) && !forceReload)
+ return true;
+
+ if (forceReload && toLayout.isEmpty())
+ toLayout = layout;
int i = 0;
- if (toLayout == "Scandic")
+ QString filename = layoutPath + "/" + toLayout + ".tohkbdmap";
+
+ printf("keymap: reading file %s\n", qPrintable(filename));
+
+ QFile inputFile( filename );
+
+ if ( inputFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
- while (lut_plain_scandic[i])
+ lut_plain.clear();
+ lut_sym.clear();
+
+ QTextStream in( &inputFile );
+ while (!in.atEnd())
{
- lut_plain[i] = lut_plain_scandic[i];
- i++;
- lut_plain[i] = lut_plain_scandic[i];
- i++;
- lut_plain[i] = lut_plain_scandic[i];
+ QStringList line = in.readLine().split(QRegExp("\\s+"));
+
+ // Comment starts with #
+ if (line.at(0).startsWith("#"))
+ continue;
+
+ if (line.count() == 2)
+ {
+ if (QString::compare(line.at(0), "variant", Qt::CaseInsensitive) == 0)
+ {
+ if (QString::compare(line.at(1), "none", Qt::CaseInsensitive) == 0)
+ {
+ emit setKeymapVariant("");
+ }
+ else
+ {
+ emit setKeymapVariant(line.at(1));
+ }
+ }
+ else if (QString::compare(line.at(0), "alternative", Qt::CaseInsensitive) == 0)
+ {
+ alternativeLayout = line.at(1);
+ alternativeLayoutSet = true;
+ printf("keymap: alternative layout is %s\n", qPrintable(alternativeLayout));
+ }
+ }
+
+ if (line.count() != 5)
+ continue;
+
+ /*
+ * CODE PlainKey PlainModifier SymKey SymModifier
+ */
+
+ bool ok;
+ int code = line.at(0).toInt(&ok, 16);
+ int plainKeyIndex = keyNames.indexOf(line.at(1));
+ int symKeyIndex = keyNames.indexOf(line.at(3));
+ int plainModifier = 0;
+ int symModifier = 0;
+
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/keymapping.h
^
|
@@ -4,6 +4,7 @@
#include <QObject>
#include <QList>
#include <QPair>
+#include <QMap>
#include <linux/input.h>
#include "modifierhandler.h"
@@ -19,6 +20,7 @@
#define KEY_TOH_SELFIE (KEY_MAX+2)
#define KEY_TOH_NEWEMAIL (KEY_MAX+3)
#define KEY_TOH_BACKLIGHT (KEY_MAX+4)
+#define KEY_TOH_NONE (KEY_MAX+5)
class keymapping : public QObject
{
@@ -35,7 +37,11 @@
modifierHandler *alt;
modifierHandler *sym;
- void setLayout(QString toLayout);
+ bool setPathToLayouts(QString pathToLayouts);
+
+ bool setLayout(QString toLayout, bool forceReload = false);
+
+ bool verboseMode;
signals:
void shiftChanged();
@@ -46,18 +52,28 @@
void keyReleased();
void toggleCapsLock();
void bogusDetected();
+ void setKeymapVariant(QString keymapVariant);
+ void setKeymapLayout(QString keymapLayout);
public slots:
private:
+ void toggleAlternativeLayout();
+ QString alternativeLayout;
+ QString originalLayout;
+
bool keyIsPressed;
char pressedCode;
QByteArray _prevInputReport;
QString layout;
+ QString layoutPath;
+
+ QMap< int, QPair<int, int> > lut_plain;
+ QMap< int, QPair<int, int> > lut_sym;
- int lut_plain[256];
+ static QStringList keyNames;
};
#endif // KEYMAPPING_H
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/modifierhandler.cpp
^
|
@@ -1,6 +1,9 @@
#include <stdio.h>
#include "modifierhandler.h"
+QStringList modifierHandler::KeyModeNames = QStringList()
+ << "Normal" << "Sticky" << "Lock" << "Cycle";
+
modifierHandler::modifierHandler(QString name, QObject *parent) :
QObject(parent)
{
@@ -14,6 +17,8 @@
_wasHeldDown = false;
_lockCount = 0;
+ verboseMode = false;
+
printf("modifierHandler for \"%s\"\n", qPrintable(_name));
}
@@ -29,13 +34,13 @@
else
{
/* sticky or lock, but held while another key is being presed */
- if ((mode == Sticky || mode == Lock) && state && down && !alone)
+ if ((mode == Sticky || mode == Lock || mode == Cycle) && state && down && !alone)
{
_wasHeldDown = true;
}
/* If something was pressed while held, release when released */
- if ((mode == Sticky || mode == Lock) && !state && _wasHeldDown)
+ if ((mode == Sticky || mode == Lock || mode == Cycle) && !state && _wasHeldDown)
{
_wasHeldDown = false;
_lockCount = 0;
@@ -48,12 +53,12 @@
newPressed = !pressed;
}
/* Reset lock count if anything else pressed */
- else if (mode == Lock && !locked && !alone && _lockCount != 3)
+ else if ((mode == Lock || mode == Cycle) && !locked && !alone && _lockCount != 3)
{
_lockCount = 0;
}
/* If just modifier key is pressed */
- else if (mode == Lock && alone)
+ else if ((mode == Lock || mode == Cycle) && alone)
{
if (!down && state && (_lockCount == 0))
{
@@ -62,7 +67,7 @@
}
else if (down && !state && (_lockCount == 1))
{
- newPressed = false;
+ newPressed = (mode == Cycle);
_lockCount = 2;
}
else if (!down && state && (_lockCount == 2))
@@ -90,7 +95,10 @@
if (newPressed != pressed)
{
pressed = newPressed;
- printf("%s changed to %s\n", qPrintable(_name), pressed ? "down" : "up");
+
+ if (verboseMode)
+ printf("%s changed to %s\n", qPrintable(_name), pressed ? "down" : "up");
+
emit changed();
}
}
@@ -116,5 +124,13 @@
{
mode = newMode;
clear(true);
+
+ if (verboseMode)
+ printf("%s mode set to %s\n", qPrintable(_name), qPrintable(KeyModeNames.at(mode)));
}
}
+
+modifierHandler::KeyMode modifierHandler::toKeyMode(const QString &modename)
+{
+ return (KeyMode)KeyModeNames.indexOf(modename);
+}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/modifierhandler.h
^
|
@@ -2,6 +2,7 @@
#define MODIFIERHANDLER_H
#include <QObject>
+#include <QStringList>
class modifierHandler : public QObject
{
@@ -13,20 +14,25 @@
{
Normal = 0,
Sticky,
- Lock
+ Lock,
+ Cycle
} KeyMode;
- void set(bool state, bool alone);
- void clear(bool force = false);
+ static QStringList KeyModeNames;
+ static KeyMode toKeyMode(const QString &modename);
void setMode(KeyMode newMode);
-
KeyMode mode;
+ void set(bool state, bool alone);
+ void clear(bool force = false);
+
bool pressed;
bool down;
bool locked;
+ bool verboseMode;
+
signals:
void changed();
@@ -36,7 +42,6 @@
QString _name;
bool _wasHeldDown;
int _lockCount;
-
};
#endif // MODIFIERHANDLER_H
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/tca8424driver.cpp
^
|
@@ -61,9 +61,7 @@
QByteArray tca8424driver::readInputReport()
{
- QByteArray ret = QByteArray();
-
- ret = readBytes(tca8424address, 11);
+ QByteArray ret = readBytes(tca8424address, 11);
if (ret.isEmpty())
printf("Error: readInputReport() failed\n");
@@ -73,9 +71,7 @@
tca8424driver::PresenceResult tca8424driver::testComms()
{
- QByteArray ret = QByteArray();
-
- ret = readBytes(tca8424address, 2);
+ QByteArray ret = readBytes(tca8424address, 2);
if (ret.isEmpty())
{
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/tohkbd2-daemon.cpp
^
|
@@ -13,7 +13,7 @@
#include <sys/types.h>
#include "tohkeyboard.h"
#include "toh.h"
-#include "daemonAdaptor.h"
+#include "../dbus/src/daemonAdaptor.h"
#include <QtCore/QCoreApplication>
#include <QDBusConnection>
@@ -55,12 +55,23 @@
printf("Connected to D-Bus sessionbus\n");
-
Tohkbd tohkbd;
/* Register to dbus systemBus */
new Tohkbd2Adaptor(&tohkbd);
- tohkbd.registerDBus();
+ if (!tohkbd.registerDBus())
+ {
+ printf("Failed to register to dbus\n");
+ sleep(3);
+ exit(EXIT_FAILURE);
+ }
+
+ if (!tohkbd.init())
+ {
+ printf("Failed to initialise tohkbd daemon\n");
+ sleep(3);
+ exit(EXIT_FAILURE);
+ }
/* Nokia MCE display_status_ind
* used to enable and disable keyboard when display is on or off
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/tohkeyboard.cpp
^
|
@@ -9,11 +9,16 @@
#include <QtCore/QCoreApplication>
#include <QDBusMessage>
#include <QThread>
+#include <QTimer>
+#include <QHostAddress>
+#include <QtSystemInfo/QDeviceInfo>
+
+#include <mce/dbus-names.h>
+#include <mce/mode-names.h>
#include <unistd.h>
#include <linux/input.h>
#include <linux/uinput.h>
-#include <QTimer>
#include "tohkeyboard.h"
#include "toh.h"
@@ -25,6 +30,9 @@
static const char *SERVICE = SERVICE_NAME;
static const char *PATH = "/";
+QList<int> Tohkbd::FKEYS = QList<int>() << KEY_F1 << KEY_F2 << KEY_F3 << KEY_F4 << KEY_F5 << KEY_F6
+ << KEY_F7 << KEY_F8 << KEY_F9 << KEY_F10 << KEY_F11 << KEY_F12;
+
/* Main
*/
@@ -46,46 +54,83 @@
taskSwitcherVisible = false;
selfieLedOn = false;
gpioInterruptCounter = 0;
- actualSailfishVersion = QString();
+ verboseMode = true;
+ displayBlankPreventRequested = false;
fix_CapsLock = !checkSailfishVersion("1.1.7.0");
capsLock = false;
+ doNotChangeVkbLayout = checkSailfishVersion("2.0.0.0");
+
tohkbd2user = new ComKimmoliTohkbd2userInterface("com.kimmoli.tohkbd2user", "/", QDBusConnection::sessionBus(), this);
tohkbd2user->setTimeout(2000);
+ tohkbd2settingsui = new ComKimmoliTohkbd2settingsuiInterface("com.kimmoli.tohkbd2settingsui", "/", QDBusConnection::sessionBus(), this);
+ tohkbd2settingsui->setTimeout(2000);
+
thread = new QThread();
worker = new Worker();
+ backlightTimer = new QTimer(this);
+ presenceTimer = new QTimer(this);
+ repeatTimer = new QTimer(this);
+ displayBlankPreventTimer = new QTimer(this);
+ uinputif = new UinputIf();
+ uinputevpoll = new UinputEvPoll();
+ evpollThread = new QThread();
+ tca8424 = new tca8424driver(0x3b);
+ keymap = new keymapping();
+}
+
+/* Initialise. Returns false if failed
+ */
+bool Tohkbd::init()
+{
+ QString userDaemonVersion;
+
+ printf("waking up user daemon\n");
+
+ userDaemonVersion = tohkbd2user->getVersion();
+
+ /* User daemon needs to be same version as this daemon */
+ if (userDaemonVersion == APPVERSION)
+ {
+ printf("user daemon version %s\n", qPrintable(userDaemonVersion));
+ }
+ else
+ {
+ tohkbd2user->quit();
+ printf("wrong version of user daemon \"%s\"\n", qPrintable(userDaemonVersion));
+ return false;
+ }
+
+ connect(tohkbd2user, SIGNAL(physicalLayoutChanged(QString)), this, SLOT(handlePhysicalLayout(QString)));
+
worker->moveToThread(thread);
connect(worker, SIGNAL(gpioInterruptCaptured()), this, SLOT(handleGpioInterrupt()));
connect(worker, SIGNAL(workRequested()), thread, SLOT(start()));
connect(thread, SIGNAL(started()), worker, SLOT(doWork()));
connect(worker, SIGNAL(finished()), thread, SLOT(quit()), Qt::DirectConnection);
- backlightTimer = new QTimer(this);
backlightTimer->setSingleShot(true);
connect(backlightTimer, SIGNAL(timeout()), this, SLOT(backlightTimerTimeout()));
- presenceTimer = new QTimer(this);
presenceTimer->setInterval(2000);
presenceTimer->setSingleShot(true);
connect(presenceTimer, SIGNAL(timeout()), this, SLOT(presenceTimerTimeout()));
- repeatTimer = new QTimer(this);
repeatTimer->setSingleShot(true);
connect(repeatTimer, SIGNAL(timeout()), this, SLOT(repeatTimerTimeout()));
+ displayBlankPreventTimer->setSingleShot(true);
+ connect(displayBlankPreventTimer, SIGNAL(timeout()), this, SLOT(displayBlankPreventTimerTimeout()));
+
/* do this automatically at startup */
setVddState(true);
setInterruptEnable(true);
- uinputif = new UinputIf();
uinputif->openUinputDevice();
- uinputevpoll = new UinputEvPoll();
- evpollThread = new QThread();
-
uinputevpoll->moveToThread(evpollThread);
connect(uinputevpoll, SIGNAL(capsLockLedChanged(bool)), this, SLOT(capsLockLedState(bool)));
connect(uinputevpoll, SIGNAL(pollingRequested()), evpollThread, SLOT(start()));
@@ -94,31 +139,19 @@
uinputevpoll->requestPolling(uinputif->getFd());
- printf("uinputevpoll->requestPolling(uinputif->getFd());\n");
-
- tca8424 = new tca8424driver(0x3b);
- keymap = new keymapping();
-
- FKEYS.clear();
- FKEYS.append(KEY_F1);
- FKEYS.append(KEY_F2);
- FKEYS.append(KEY_F3);
- FKEYS.append(KEY_F4);
- FKEYS.append(KEY_F5);
- FKEYS.append(KEY_F6);
- FKEYS.append(KEY_F7);
- FKEYS.append(KEY_F8);
- FKEYS.append(KEY_F9);
- FKEYS.append(KEY_F10);
- FKEYS.append(KEY_F11);
- FKEYS.append(KEY_F12);
+ if (!keymap->setPathToLayouts(QString(tohkbd2user->getPathTo("keymaplocation"))))
+ {
+ return false;
+ }
reloadSettings();
- keymap->setLayout(masterLayout);
+ displayIsOn = getCurrentDisplayState();
if (currentActiveLayout.isEmpty())
+ {
changeActiveLayout(true);
+ }
if (currentOrientationLock.isEmpty())
{
@@ -128,6 +161,12 @@
checkKeypadPresence();
+ /* tell that keyboard is not attached, so maliit does not hide vkb */
+ if (!keypadIsPresent)
+ {
+ emitKeypadSlideEvent(false);
+ }
+
connect(keymap, SIGNAL(shiftChanged()), this, SLOT(handleShiftChanged()));
connect(keymap, SIGNAL(ctrlChanged()), this, SLOT(handleCtrlChanged()));
connect(keymap, SIGNAL(altChanged()), this, SLOT(handleAltChanged()));
@@ -136,6 +175,15 @@
connect(keymap, SIGNAL(keyPressed(QList< QPair<int, int> >)), this, SLOT(handleKeyPressed(QList< QPair<int, int> >)));
connect(keymap, SIGNAL(keyReleased()), this, SLOT(handleKeyReleased()));
connect(keymap, SIGNAL(bogusDetected()), tca8424, SLOT(reset()));
+ connect(keymap, SIGNAL(setKeymapLayout(QString)), tohkbd2user, SLOT(setKeymapLayout(QString)));
+ connect(keymap, SIGNAL(setKeymapVariant(QString)), tohkbd2user, SLOT(setKeymapVariant(QString)));
+
+ QString currentPhysicalLayout = tohkbd2user->getActivePhysicalLayout();
+
+ printf("physical layout is %s\n", qPrintable(currentPhysicalLayout));
+ keymap->setLayout(currentPhysicalLayout);
+
+ return true;
}
/* Remove uinput device, stop threads and unregister from dbus
@@ -143,7 +191,7 @@
Tohkbd::~Tohkbd()
{
/* Restore orientation when shutting down */
- if (forceLandscapeOrientation)
+ if (settingsMap.value("forceLandscapeOrientation").toBool())
{
tohkbd2user->setOrientationLock(currentOrientationLock);
}
@@ -179,7 +227,7 @@
/* Register to dbus
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/tohkeyboard.h
^
|
@@ -22,7 +22,8 @@
#include "tca8424driver.h"
#include "keymapping.h"
-#include "../user-daemon/src/userInterface.h"
+#include "../dbus/src/userdaemonInterface.h"
+#include "../dbus/src/settingsuiInterface.h"
#define SERVICE_NAME "com.kimmoli.tohkbd2"
#define EVDEV_OFFSET (8)
@@ -39,7 +40,8 @@
explicit Tohkbd(QObject *parent = 0);
virtual ~Tohkbd();
- void registerDBus();
+ bool init();
+ bool registerDBus();
public slots:
/* dbus signal handler slots */
@@ -52,7 +54,7 @@
void handleSymChanged();
void handleKeyPressed(QList< QPair<int, int> > keyCode);
void handleKeyReleased();
-
+ void handlePhysicalLayout(const QString &layout);
void toggleCapsLock();
void capsLockLedState(bool state);
@@ -60,18 +62,18 @@
void backlightTimerTimeout();
void presenceTimerTimeout();
void repeatTimerTimeout();
+ void displayBlankPreventTimerTimeout(bool forceCancel = false);
/* Interrupt */
void handleGpioInterrupt();
/* DBUS methods */
- Q_NOREPLY void fakeInputReport(const QByteArray &data);
QString getVersion();
Q_NOREPLY void quit();
Q_NOREPLY void setShortcut(const QString &key, const QString &appPath);
Q_NOREPLY void setShortcutsToDefault();
- Q_NOREPLY void setSettingInt(const QString &key, const int &value);
- Q_NOREPLY void setSettingString(const QString &key, const QString &value);
+ Q_NOREPLY void setSetting(const QString &key, const QDBusVariant &value);
+ Q_NOREPLY void forceKeymapReload(const QString &layout);
signals:
@@ -91,11 +93,13 @@
void reloadSettings();
void saveActiveLayout();
void saveOrientation();
- void keyboardConnectedNotification(bool connected);
void checkEEPROM();
bool tohcoreBind(bool bind);
void controlLeds(bool restore);
bool checkSailfishVersion(QString versionToCompare);
+ void setVerboseMode(bool verbose);
+ bool getCurrentDisplayState();
+ QVariantMap settingsMap;
int gpio_fd;
@@ -107,20 +111,15 @@
tca8424driver *tca8424;
keymapping *keymap;
- int backlightLuxThreshold;
- int keyRepeatDelay;
- int keyRepeatRate;
- bool forceBacklightOn;
-
QMutex mutex;
QTimer *backlightTimer;
QTimer *presenceTimer;
QTimer *repeatTimer;
+ QTimer *displayBlankPreventTimer;
QString currentActiveLayout;
QString currentOrientationLock;
- QString actualSailfishVersion;
QList< QPair<int, int> > lastKeyCode;
QHash<int, QString> applicationShortcuts;
@@ -128,28 +127,28 @@
bool keypadIsPresent;
bool vkbLayoutIsTohkbd;
bool dbusRegistered;
- bool stickyCtrl;
bool displayIsOn;
bool vddEnabled;
bool interruptsEnabled;
bool keyIsPressed;
bool keyRepeat;
- bool backlightEnabled;
bool slideEventEmitted;
- bool forceLandscapeOrientation;
bool taskSwitcherVisible;
bool selfieLedOn;
bool capsLock;
+ bool verboseMode;
+ bool displayBlankPreventRequested;
+ bool doNotChangeVkbLayout;
ComKimmoliTohkbd2userInterface *tohkbd2user;
+ ComKimmoliTohkbd2settingsuiInterface *tohkbd2settingsui;
- QByteArray FKEYS;
+ static QList<int> FKEYS;
int gpioInterruptCounter;
QTime gpioInterruptFloodDetect;
bool fix_CapsLock;
- QString masterLayout;
};
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/uinputevpoll.cpp
^
|
@@ -10,6 +10,7 @@
{
_polling = false;
_abort = false;
+ _uinputfd = -1;
}
void UinputEvPoll::abort()
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/daemon/src/uinputif.cpp
^
|
@@ -27,20 +27,18 @@
static const int eventsToRegister[] = { EV_KEY, EV_SW, EV_SYN, EV_LED,
-1 };
-static const int keysToRegister[] = { KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,KEY_HOME, KEY_END, KEY_PAGEDOWN, KEY_PAGEUP,
- KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0,
- KEY_A, KEY_B, KEY_C, KEY_D, KEY_E, KEY_F, KEY_G, KEY_H, KEY_I, KEY_J,
- KEY_K, KEY_L, KEY_M, KEY_N, KEY_O, KEY_P, KEY_Q, KEY_R, KEY_S, KEY_T,
- KEY_U, KEY_V, KEY_W, KEY_X, KEY_Y, KEY_Z, KEY_COMMA, KEY_DOT, KEY_SPACE,
- KEY_LEFTALT, KEY_LEFTSHIFT, KEY_LEFTCTRL,
- KEY_RIGHTALT, KEY_RIGHTSHIFT, KEY_RIGHTCTRL,
- KEY_BACKSPACE, KEY_DELETE, KEY_INSERT, KEY_EQUAL, KEY_MINUS, KEY_TAB,
- KEY_COMPOSE, KEY_APOSTROPHE, KEY_SEMICOLON, KEY_ENTER, KEY_ESC,
- KEY_POWER, KEY_PLAYCD, KEY_PAUSECD, KEY_VOLUMEDOWN, KEY_VOLUMEUP,
- KEY_CAPSLOCK, KEY_SLASH, KEY_BACKSLASH, KEY_GRAVE, KEY_102ND,
- KEY_LEFTBRACE, KEY_RIGHTBRACE,
- KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6,
- KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12,
+static const int keysToRegister[] = { KEY_ESC, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, KEY_MINUS, KEY_EQUAL, KEY_BACKSPACE,
+ KEY_TAB, KEY_Q, KEY_W, KEY_E, KEY_R, KEY_T, KEY_Y, KEY_U, KEY_I, KEY_O, KEY_P, KEY_LEFTBRACE, KEY_RIGHTBRACE, KEY_ENTER,
+ KEY_LEFTCTRL, KEY_A, KEY_S, KEY_D, KEY_F, KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, KEY_SEMICOLON, KEY_APOSTROPHE, KEY_GRAVE,
+ KEY_LEFTSHIFT, KEY_BACKSLASH, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_COMMA, KEY_DOT, KEY_SLASH, KEY_RIGHTSHIFT,
+ KEY_KPASTERISK, KEY_LEFTALT, KEY_SPACE, KEY_CAPSLOCK, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8,
+ KEY_F9, KEY_F10, KEY_NUMLOCK, KEY_SCROLLLOCK, KEY_KP7, KEY_KP8, KEY_KP9, KEY_KPMINUS, KEY_KP4, KEY_KP5, KEY_KP6,
+ KEY_KPPLUS, KEY_KP1, KEY_KP2, KEY_KP3, KEY_KP0, KEY_KPDOT, KEY_ZENKAKUHANKAKU, KEY_102ND, KEY_F11, KEY_F12, KEY_RO,
+ KEY_KATAKANA, KEY_HIRAGANA, KEY_HENKAN, KEY_KATAKANAHIRAGANA, KEY_MUHENKAN, KEY_KPJPCOMMA, KEY_KPENTER, KEY_RIGHTCTRL,
+ KEY_KPSLASH, KEY_SYSRQ, KEY_RIGHTALT, KEY_LINEFEED, KEY_HOME, KEY_UP, KEY_PAGEUP, KEY_LEFT, KEY_RIGHT, KEY_END, KEY_DOWN,
+ KEY_PAGEDOWN, KEY_INSERT, KEY_DELETE, KEY_MACRO, KEY_MUTE, KEY_VOLUMEDOWN, KEY_VOLUMEUP, KEY_POWER, KEY_KPEQUAL,
+ KEY_KPPLUSMINUS, KEY_PAUSE, KEY_SCALE, KEY_KPCOMMA, KEY_HANGEUL, KEY_HANGUEL, KEY_HANJA, KEY_YEN, KEY_LEFTMETA,
+ KEY_RIGHTMETA, KEY_COMPOSE,
-1 };
static const int switchesToRegister[] = { SW_LID, SW_KEYPAD_SLIDE,
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/dbus/com.kimmoli.tohkbd2.xml
^
|
@@ -0,0 +1,24 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="com.kimmoli.tohkbd2">
+ <method name="getVersion">
+ <arg name="value" type="s" direction="out" />
+ </method>
+ <method name="quit" />
+ <method name="setShortcut">
+ <arg name="key" type="s" direction="in" />
+ <arg name="appPath" type="s" direction="in" />
+ </method>
+ <method name="setShortcutsToDefault" />
+ <method name="setSetting">
+ <arg name="key" type="s" direction="in" />
+ <arg name="value" type="v" direction="in" />
+ </method>
+ <method name="forceKeymapReload">
+ <arg name="layout" type="s" direction="in" />
+ </method>
+ <signal name="keyboardConnectedChanged">
+ <arg name="connected" type="b" direction="out" />
+ </signal>
+ </interface>
+</node>
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/dbus/com.kimmoli.tohkbd2settingsui.service
^
|
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.kimmoli.tohkbd2settingsui
+Exec=/usr/bin/invoker --type=silica-qt5 -s -n -d 5 /usr/bin/harbour-tohkbd2-settingsui --showhelp
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/dbus/com.kimmoli.tohkbd2settingsui.xml
^
|
@@ -0,0 +1,6 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="com.kimmoli.tohkbd2settingsui">
+ <method name="showHelp" />
+ </interface>
+</node>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/dbus/com.kimmoli.tohkbd2user.service
^
|
(renamed from user-daemon/config/com.kimmoli.tohkbd2user.service)
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/dbus/com.kimmoli.tohkbd2user.xml
^
|
@@ -0,0 +1,54 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="com.kimmoli.tohkbd2user">
+ <method name="getActiveLayout">
+ <arg name="value" type="s" direction="out" />
+ </method>
+ <method name="setActiveLayout">
+ <arg name="value" type="s" direction="in" />
+ </method>
+ <method name="getOrientationLock">
+ <arg name="value" type="s" direction="out" />
+ </method>
+ <method name="setOrientationLock">
+ <arg name="value" type="s" direction="in" />
+ </method>
+ <method name="launchApplication">
+ <arg name="desktopFilename" type="s" direction="in" />
+ </method>
+ <method name="showKeyboardConnectionNotification">
+ <arg name="connected" type="b" direction="in" />
+ </method>
+ <method name="showTaskSwitcher" />
+ <method name="nextAppTaskSwitcher" />
+ <method name="hideTaskSwitcher" />
+ <method name="actionWithRemorse">
+ <arg name="action" type="s" direction="in" />
+ </method>
+ <method name="getVersion">
+ <arg name="value" type="s" direction="out" />
+ </method>
+ <method name="takeScreenShot" />
+ <method name="getActivePhysicalLayout">
+ <arg name="value" type="s" direction="out" />
+ </method>
+ <method name="getPathTo">
+ <arg name="file" type="s" direction="in" />
+ <arg name="path" type="s" direction="out" />
+ </method>
+ <method name="showUnsupportedLayoutNotification" />
+ <method name="installKeymaps">
+ <arg name="overwrite" type="b" direction="in" />
+ </method>
+ <method name="setKeymapLayout">
+ <arg name="value" type="s" direction="in" />
+ </method>
+ <method name="setKeymapVariant">
+ <arg name="value" type="s" direction="in" />
+ </method>
+ <method name="quit" />
+ <signal name="physicalLayoutChanged">
+ <arg name="layout" type="s" direction="out" />
+ </signal>
+ </interface>
+</node>
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/dbus/dbus.pro
^
|
@@ -0,0 +1,49 @@
+# tohkbd2 D-Bus related stuff
+#
+# kimmoli 2015
+
+TEMPLATE = aux
+
+# generate dbus interface and adaptor sources from xml templates
+
+# user-daemon
+system(qdbusxml2cpp com.kimmoli.tohkbd2user.xml -i ../user-daemon/src/userdaemon.h -a ../dbus/src/userdaemonAdaptor)
+system(qdbusxml2cpp com.kimmoli.tohkbd2user.xml -p ../dbus/src/userdaemonInterface)
+
+# daemom
+system(qdbusxml2cpp com.kimmoli.tohkbd2.xml -i ../daemon/src/tohkeyboard.h -a ../dbus/src/daemonAdaptor)
+system(qdbusxml2cpp com.kimmoli.tohkbd2.xml -p ../dbus/src/daemonInterface)
+
+# settings-ui
+system(qdbusxml2cpp com.kimmoli.tohkbd2settingsui.xml -i ../settings-ui/src/settingsui.h -a ../dbus/src/settingsuiAdaptor)
+system(qdbusxml2cpp com.kimmoli.tohkbd2settingsui.xml -p ../dbus/src/settingsuiInterface)
+
+# Install dbus related files
+
+dbus_services.path = /usr/share/dbus-1/services/
+dbus_services.files = com.kimmoli.tohkbd2settingsui.service \
+ com.kimmoli.tohkbd2user.service
+
+interfaces.path = /usr/share/dbus-1/interfaces/
+interfaces.files = com.kimmoli.tohkbd2settingsui.xml \
+ com.kimmoli.tohkbd2user.xml
+
+systemd_services.path = /lib/systemd/system/
+systemd_services.files = harbour-tohkbd2.service
+
+busconfig.path = /etc/dbus-1/system.d/
+busconfig.files = harbour-tohkbd2.conf
+
+INSTALLS = dbus_services \
+ interfaces \
+ systemd_services \
+ busconfig
+
+OTHER_FILES += \
+ com.kimmoli.tohkbd2.xml \
+ com.kimmoli.tohkbd2settingsui.xml \
+ com.kimmoli.tohkbd2user.xml \
+ com.kimmoli.tohkbd2settingsui.service \
+ com.kimmoli.tohkbd2user.service \
+ harbour-tohkbd2.conf \
+ harbour-tohkbd2.service
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/dbus/harbour-tohkbd2.conf
^
|
(renamed from daemon/config/harbour-tohkbd2.conf)
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/dbus/harbour-tohkbd2.service
^
|
(renamed from daemon/config/harbour-tohkbd2.service)
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/dbus/src/README
^
|
@@ -0,0 +1 @@
+Files in this folder are created during build.
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/harbour-ambience-tohkbd2.pro
^
|
@@ -3,5 +3,5 @@
#
TEMPLATE = subdirs
CONFIG = ordered
-SUBDIRS = user-daemon daemon settings-ui ambience
+SUBDIRS = dbus user-daemon daemon settings-ui ambience
OTHER_FILES = rpm/harbour-ambience-tohkbd2.spec
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/harbour-tohkbd2-settingsui.desktop
^
|
@@ -4,4 +4,3 @@
Name=TOHKBD Settings
Icon=harbour-tohkbd2-settingsui
Exec=harbour-tohkbd2-settingsui
-
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/ca.ts
^
|
@@ -66,36 +66,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>En cas de no rebre cap resposta a una incidència, podeu informar-ne via correu electrònic. Premeu el botó aquí sota per llançar el client d'email.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>Personalitza la tecla %1 </translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Aquesta acció modificarà el comportament d'aquesta tecla</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Tecla senzilla</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Tecla amb símbol</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Cap</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Configuració general</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Restableix els valors per defecte</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Dreceres</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>No està configurat</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Res, utilitza-ho com a %1</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation>Ajuda</translation>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation>Ordres de només-TOHKBD</translation>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation>Probablement aquesta llista no és completa del tot donat que el sistema operatiu/Qt pot oferir moltes més combinacions de teclat.</translation>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Commutador aplicacions</translation>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Captura de pantalla</translation>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>LED de selfie</translation>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Commutador llum teclat</translation>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Baixa el volum</translation>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Puja el volum</translation>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Nou correu</translation>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Commutador BloqMaj</translation>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Selecció de text</translation>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Selecciona-ho tot</translation>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Copia</translation>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Retalla</translation>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Enganxa</translation>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Desfés</translation>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Refés</translation>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Elimina paraula</translation>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Reinicia el telèfon</translation>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Reinicia lipstick</translation>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation>Combinacions de la tecla d'edició de text</translation>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Mostra l'ajuda</translation>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation>Normal</translation>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation>Permanent</translation>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation>Bloqueig</translation>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation>Rotatòria</translation>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation>Mode majúscules</translation>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation>Mode Ctrl</translation>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/cs_CZ.ts
^
|
@@ -66,36 +66,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>Pokud ani tam nenajdete odpověď na váš problém, nahlašte ho. Tlačítko níže otevře e-mailového klienta.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>Přizpůsobit %1-klávesu</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Chystáte se změnit chování této klávesy</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Prostý text</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Klávesa se Sym</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Žádná</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Obecné nastavení</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Vynulovat do výchozího nastavení</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Zkratky</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Není nakonfigurováno</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Nic, použijte jako %1 klávesou</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation>Nápověda</translation>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation>TOHKBD příkazy</translation>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation>Tento seznam pravděpodobně není kompletní, neboť operační systém/Qt může nabízet více kombinací kláves.</translation>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Přepínat aplikace</translation>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Snímek obrazovky</translation>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Selfie světlo</translation>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Přepnout podsvícení</translation>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Snížit hlasitost</translation>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Zvýšit hlasitost</translation>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Nový e-mail</translation>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Přepnout CapsLock</translation>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Vybrat text</translation>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Označit vše</translation>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Kopírovat</translation>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Vyjmout</translation>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Vložit</translation>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Zpět</translation>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Znovu</translation>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Smazat slovo</translation>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Restartovat telefon</translation>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Restartovat prostředí lipstick</translation>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation>Kombinace kláves pro editaci textu</translation>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Zobrazit tuto nápovědu</translation>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation>Běžné</translation>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation>Lepkavé</translation>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation>Zamknout</translation>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation>Rotovat</translation>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation>Mód Shift</translation>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation>Mód Ctrl</translation>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/da.ts
^
|
@@ -66,36 +66,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>Hvis der ikke er noget svar på dit problem, bedes du rapportere det. Knappen nedenfor starter din mail-klient.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>Tilpas %1 -tast</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Du er ved at ændre funktionen af denne tast</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Almindelig tast</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Tast med Sym</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Intet</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Generelle indstillinger</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Nulstil alle indstillinger</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Genveje</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Ikke konfigureret</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Ingen, brug som %1</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/de.ts
^
|
@@ -67,36 +67,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>Bitte melden sie, falls es keine Antwort oder Lösung für ihr Problem gibt. Die Schaltfläche unten startet das E-Mail Programm.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>%1-Taste anpassen</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Sie verändern das Verhalten dieser Taste</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Einfache Taste</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Taste mit Sym</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Nichts</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Allgemeine Einstellungen</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Alles zurücksetzen</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Tastenkürzel</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Nicht konfiguriert</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Nichts, benutze wie %1</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation>Hilfe</translation>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation>exklusive TOHKBD Kommandos</translation>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation>Diese Liste ist sehr wahrscheinlich nicht vollständig da das OS/Qt mehr Tastenkombinationen anbietet.</translation>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Apps umschalten</translation>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Screenshot</translation>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Selfie LED</translation>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Hintergrundbeleuchtung umschalten</translation>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Lautstärke vermindern</translation>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Lautstärke erhöhen</translation>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Neue Email</translation>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>CapsLock umschalten</translation>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Text auswählen</translation>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Alles auswählen</translation>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Kopieren</translation>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Ausschneiden</translation>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Einfügen</translation>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Rückgängig</translation>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Wiederholen</translation>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Wort löschen</translation>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Telefon neustarten</translation>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Lipstick neustarten</translation>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation>Textbearbeitungs Tastenkombination</translation>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Diese Hilfe anzeigen</translation>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation>Normal</translation>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation>Halten</translation>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation>Sperren</translation>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation>Wechseln</translation>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation>Shift Modus</translation>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation>Strg Modus</translation>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/engineering_en.ts
^
|
@@ -68,34 +68,183 @@
<extracomment>Description above report issue -button</extracomment>
<translation type="unfinished"></translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
+ <message id="general-settings">
+ <source>General settings</source>
+ <extracomment>Main menu selection for general settings</extracomment>
<translation type="unfinished"></translation>
</message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
<translation type="unfinished"></translation>
</message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
<translation type="unfinished"></translation>
</message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
<translation type="unfinished"></translation>
</message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
<translation type="unfinished"></translation>
</message>
- <message id="general-settings">
- <source>General settings</source>
- <extracomment>Main menu selection for general settings</extracomment>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
+ <extracomment>Modifier Alt mode selector combo-box label</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="mod-sym-mode">
+ <source>Sym mode</source>
+ <extracomment>Modifier Sym mode selector combo-box label</extracomment>
<translation type="unfinished"></translation>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/es.ts
^
|
@@ -66,36 +66,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>Si no hay respuesta a tu problema, por favor repórtalo. El botón de debajo lanza el cliente de correo.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>Personalizar tecla %1</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Estás a punto de cambiar el comportamiento de esta tecla</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Tecla sin modificadores</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Tecla con Sym</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Sin asignar</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Configuración general</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Volver a predeterminadas</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Accesos rápidos</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Sin configurar</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Nada, usar como %1</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/fi.ts
^
|
@@ -66,36 +66,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>Jos et löydä vastausta ongelmaasi UKK:stä, allaolevasta napista voit kertoa ongelmastasi sähköpostilla.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>Muokkaa %1 -näppäintä</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Olet muuttamassa tämän näppäimen toimintaa</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Näppäin</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Sym + Näppäin</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Ei mitään</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Yleiset asetukset</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Palauta oletukset</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Oikopolut</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Ei määritetty</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Ei mitään, käytä %1 näppäimenä</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation>Ohje</translation>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation>TOHKBD komennot</translation>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation>Käyttöjärjestelmä tai Qt saattaa tarjota myös näppäintoimintoja joita ei tässä luettelossa ole esitetty.</translation>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Vaihda sovelluksia</translation>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Ruudunkaappaus</translation>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Selfie LED</translation>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Taustavalo</translation>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Laske äänenvoimakkuutta</translation>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Nosta äänenvoimakkuutta</translation>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Uusi sähköposti</translation>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Caps Lock</translation>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Valitse tekstiä</translation>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Valitse kaikki</translation>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Kopioi</translation>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Leikkaa</translation>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Liitä</translation>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Kumoa</translation>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Tee uudelleen</translation>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Poista sana</translation>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Käynnistä puhelin uudelleen</translation>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Käynnistä Lipstick uudelleen</translation>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation>Tekstin muokkaus</translation>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Näytä ohje</translation>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation>Normaali</translation>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation>Pohjaan jäävä</translation>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation>Lukittua</translation>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation>Vaihtuva</translation>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation>Shift</translation>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation>Ctrl</translation>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/fr.ts
^
|
@@ -66,36 +66,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>Si vous ne trouvez pas de réponse à votre problème, merci de le rapporter. Le bouton ci-dessous lance votre application mail.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>modifier %1 -key</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Vous allez modifier le comportement de cette touche</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Touche de base</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Touche avec Sym</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Aucune</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Paramètres généraux</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Réinitialisation des paramètres par défaut</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Raccourcis</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Non configuré</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Vide, utiliser pour %1</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation>Aide</translation>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Capture d'écran</translation>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Éclairage autoportrait</translation>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Baisser le volume</translation>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Augmenter le volume</translation>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Tout sélectionner </translation>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Copier</translation>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Couper</translation>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Coller</translation>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Annuler</translation>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Refaire</translation>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Afficher l'aide</translation>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation>Verrouiller</translation>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/it.ts
^
|
@@ -68,36 +68,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>Se non trovi una risposta al tuo problema, per favore segnalalo. Il bottone sotto lancia il client di posta.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>Personalizza tasto %1</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Stai per cambiare la funzione di questo tasto</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Tasto non modificato</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Tasto con Sym</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Nessuno</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Impostazioni generali</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Riporta tutto ai valori predefiniti</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Scorciatoie</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Non configurato</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Nessuno, usa come %1</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation>Aiuto</translation>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Riavvia telefono</translation>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Riavvia lipstick</translation>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/ja.ts
^
|
@@ -39,12 +39,12 @@
<message id="select-application">
<source>Select application</source>
<extracomment>Application shortcut selector page header</extracomment>
- <translation>アプリケーションを洗濯</translation>
+ <translation>アプリケーションを選択</translation>
</message>
<message id="launch-ext-app">
<source>Launching external application...</source>
<extracomment>Text shown with busyindicator when starting external application</extracomment>
- <translation>外部アプリケーションを機動</translation>
+ <translation>外部アプリケーションを起動</translation>
</message>
<message id="report-a-bug">
<source>Report a bug</source>
@@ -66,36 +66,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>あなたの問題に対する答えがない場合は報告してください。下のボタンを押すとメールクライアントが起動します。</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>%1 -key をカスタマイズ</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>このキーの挙動を変更しようとしています</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Plainキー</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Sym組み合わせキー</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>なし</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>一般</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>すべてデフォルトにリセット</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>ショートカット</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>設定されていません</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>なし。 %1 として使用します</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-cycle">
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/nb.ts
^
|
@@ -0,0 +1,410 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.1">
+<context>
+ <name/>
+ <message id="tohkbd2-settings-app-name">
+ <source>TOHKBD Settings</source>
+ <extracomment>Application name</extracomment>
+ <translation>TOHKBD-innstillinger</translation>
+ </message>
+ <message id="about">
+ <source>About...</source>
+ <extracomment>Menu option and header for about page</extracomment>
+ <translation>Om...</translation>
+ </message>
+ <message id="team-header">
+ <source>The TOHKBD2 Team</source>
+ <extracomment>header label for the team presentation</extracomment>
+ <translation>TOHKBD2-laget</translation>
+ </message>
+ <message id="version-settings-ui">
+ <source>Settings UI version: </source>
+ <extracomment>Version information field, for Settings UI application version</extracomment>
+ <translation>Versjon:</translation>
+ </message>
+ <message id="version-daemon">
+ <source>Daemon version: </source>
+ <extracomment>Version information field, for daemon version (which runs as root)</extracomment>
+ <translation>Nisseversjon:</translation>
+ </message>
+ <message id="version-user-daemon">
+ <source>User Daemon version: </source>
+ <extracomment>Version information field, for user daemon version (which runs as nemo)</extracomment>
+ <translation>Brukernisseversjon:</translation>
+ </message>
+ <message id="version-sailfish">
+ <source>Sailfish version: </source>
+ <extracomment>Version information field, for Sailfish OS version</extracomment>
+ <translation>Sailfish-versjon:</translation>
+ </message>
+ <message id="select-application">
+ <source>Select application</source>
+ <extracomment>Application shortcut selector page header</extracomment>
+ <translation>Velg program</translation>
+ </message>
+ <message id="launch-ext-app">
+ <source>Launching external application...</source>
+ <extracomment>Text shown with busyindicator when starting external application</extracomment>
+ <translation>Starter eksternt program...</translation>
+ </message>
+ <message id="report-a-bug">
+ <source>Report a bug</source>
+ <extracomment>Main menu selection for FAQ and reporting an issue, page header for bug reporter page. button text for triggering email app.</extracomment>
+ <translation>Meld fra om en feil</translation>
+ </message>
+ <message id="faq-text">
+ <source>Please first check TOHKBD FAQ page at https://together.jolla.com. Button below opens this link in browser.</source>
+ <extracomment>Description above open faq -button</extracomment>
+ <translation>Se OSS for TOHKBD på https://together.jolla.com først. Knappen nedenfor åpner denne lenka i nettleseren.</translation>
+ </message>
+ <message id="faq-button">
+ <source>Open FAQ</source>
+ <extracomment>Button text, clicking this will open url showing FAQ</extracomment>
+ <translation>Åpne OSS</translation>
+ </message>
+ <message id="report-text">
+ <source>If there is no answer to your issue, please report it. Button below launches email client.</source>
+ <extracomment>Description above report issue -button</extracomment>
+ <translation>Hvis spørsmålet ditt ikke er besvart, rapporter det. Knappen nedenfor starter epostklienten.</translation>
+ </message>
+ <message id="general-settings">
+ <source>General settings</source>
+ <extracomment>Main menu selection for general settings</extracomment>
+ <translation>Generelle innstillinger</translation>
+ </message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Tilbakestill alle til standardverdier</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Snarveier</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Ikke satt opp</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Ingen, bruk som %1</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/nl_NL.ts
^
|
@@ -66,36 +66,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>Als er geen antwoord is voor uw probleem, rapporteer het dan. De knop hieronder opent de e-mailapp.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>%1-toets aanpassen</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>U staat op het punt om het gedrag van deze toets aan te passen</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Standaardtoets</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Toets met Sym</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Geen</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Algemene instellingen</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Alles herstellen naar standaardwaarden</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Sneltoetsen</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Niet ingesteld</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Niets; gebruiken als %1</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation>Hulp</translation>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation>TOHKBD-specifieke commando's</translation>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation>Deze lijst is mogelijk incompleet omdat het besturingssysteem/Qt meer toetsencombinaties aankan.</translation>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Tussen apps schakelen</translation>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Schermafdruk</translation>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Selfie-LED</translation>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Achtergrondverlichting schakelen</translation>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Volume verlagen</translation>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Volume verhogen</translation>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Nieuw e-mailbericht</translation>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>CapsLock schakelen</translation>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Tekst selecteren</translation>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Alles selecteren</translation>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Kopiëren</translation>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Knippen</translation>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Plakken</translation>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Ongedaan maken</translation>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Herhalen</translation>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Woord verwijderen</translation>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Telefoon herstarten</translation>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Lipstick herstarten</translation>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation>Toetsenbordcombinaties voor tekstbewerking</translation>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Deze hulp weergeven</translation>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation>Normaal</translation>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation>Vastgezet</translation>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation>Vergrendelen</translation>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation>Wisselen</translation>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation>Shift-modus</translation>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation>Ctrl-modus</translation>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/pl.ts
^
|
@@ -66,36 +66,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>Jeśli brakuje rozwiązania twojego problemu, proszę zgłoś go. Przycisk poniżej uruchamia klienta poczty e-mail.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>Dostosuj klawisz %1</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Zaraz zmienisz sposób działania tego klawisza</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Zwykły klawisz</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Klawisz z modyfikatorem</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Brak</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Ustawienia ogólne</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Przywróć ustawienia domyślne</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Skróty</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Nie ustawiony</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Nic, używaj jako %1</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation>Pomoc</translation>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Zrzut ekranu</translation>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Przycisz</translation>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Pogłośnij</translation>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Nowy email</translation>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Zaznacz tekst</translation>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Zaznacz wszystko</translation>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Kopiuj</translation>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Wytnij</translation>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Wklej</translation>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Cofnij</translation>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Zrestartuj telefon</translation>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Zrestartuj lipstick</translation>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Pokaż pomoc</translation>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation>Tryb shift</translation>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/ru_RU.ts
^
|
@@ -19,17 +19,17 @@
<message id="version-settings-ui">
<source>Settings UI version: </source>
<extracomment>Version information field, for Settings UI application version</extracomment>
- <translation>Версия программы настроек: </translation>
+ <translation>Версия приложения: </translation>
</message>
<message id="version-daemon">
<source>Daemon version: </source>
<extracomment>Version information field, for daemon version (which runs as root)</extracomment>
- <translation>Версия программы клавиатуры: </translation>
+ <translation>Версия демона клавиатуры (Root Daemon): </translation>
</message>
<message id="version-user-daemon">
<source>User Daemon version: </source>
<extracomment>Version information field, for user daemon version (which runs as nemo)</extracomment>
- <translation>Версия основной программы: </translation>
+ <translation>Версия пользовательсткого демона клавиатуры (User Daemon): </translation>
</message>
<message id="version-sailfish">
<source>Sailfish version: </source>
@@ -39,7 +39,7 @@
<message id="select-application">
<source>Select application</source>
<extracomment>Application shortcut selector page header</extracomment>
- <translation>Выберите приложения</translation>
+ <translation>Выберите приложение</translation>
</message>
<message id="launch-ext-app">
<source>Launching external application...</source>
@@ -54,48 +54,198 @@
<message id="faq-text">
<source>Please first check TOHKBD FAQ page at https://together.jolla.com. Button below opens this link in browser.</source>
<extracomment>Description above open faq -button</extracomment>
- <translation>Пожалуйста, посетите страницу FAQ проекта TOHKBD2 на https://together.jolla.com. Ссылка откроется в браузере автоматически.</translation>
+ <translation>Пожалуйста, сначала посетите FAQ-страницу проекта TOHKBD2 на https://together.jolla.com.
+Кнопка ниже откроет данную ссылку в окне браузера.</translation>
</message>
<message id="faq-button">
<source>Open FAQ</source>
<extracomment>Button text, clicking this will open url showing FAQ</extracomment>
- <translation>Посетить FAQ</translation>
+ <translation>Перейти в FAQ</translation>
</message>
<message id="report-text">
<source>If there is no answer to your issue, please report it. Button below launches email client.</source>
<extracomment>Description above report issue -button</extracomment>
<translation>Когда вы не найдете решения своей проблемы, пожалуйста сообщите об этом. Кнопка снизу откроет почтовый клиент.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>Настройка клавиши %1</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Вы собираетесь изменить поведение этой клавиши</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation> Обычная клавиша</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Клавиша с Sym</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Ничего</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Основные настройки</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Сбросить все к настройкам по-умолчанию</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Ярлыки</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Не настроено</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Ничего, использовать как %1</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation>Справка</translation>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation>Глобальные сочетания клавиш</translation>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation>Данный список может быть не полным, так как операционная система/Qt может получить поддержку новых сочетаний клавиш.</translation>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Переключение задач</translation>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Снимок экрана</translation>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Светодиод подсветки</translation>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Управление подсветкой клавиатуры</translation>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Уменьшить громкость</translation>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Увеличить громкость</translation>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Создать новый e-mail</translation>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Переключить Caps Lock</translation>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Выделить текст</translation>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Выделить все</translation>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Копировать</translation>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Вырезать</translation>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Вставить</translation>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Отменить</translation>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Повторить</translation>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Удалить слово</translation>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation>Перезагрузить телефон</translation>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/i18n/sv.ts
^
|
@@ -66,36 +66,185 @@
<extracomment>Description above report issue -button</extracomment>
<translation>Om det inte finns någon lösning på ditt problem, vänligen rapportera det. Knappen nedan öppnar email-klienten.</translation>
</message>
- <message id="customize-key-header">
- <source>Customize %1 -key</source>
- <extracomment>page header for key customizer, shows label of the key</extracomment>
- <translation>Skräddarsy %1 -tangenten</translation>
- </message>
- <message id="customize-key-warning">
- <source>You are about to change behaviour of this key</source>
- <extracomment>warning text shown on customizer page</extracomment>
- <translation>Du är på väg att ändra tangentens beteende</translation>
- </message>
- <message id="plain-key">
- <source>Plain key</source>
- <extracomment>Text shon above the key without any modifiers, e.g. A</extracomment>
- <translation>Tangent</translation>
- </message>
- <message id="with-sym-key">
- <source>Key with Sym</source>
- <extracomment>Text shon above the key wit sym modifier, e.g. ;</extracomment>
- <translation>Sym + tangent</translation>
- </message>
- <message id="none-key">
- <source>None</source>
- <extracomment>This text is shown instead of key label (e.g. A) if there is nothing assigned to this key</extracomment>
- <translation>Inget</translation>
- </message>
<message id="general-settings">
<source>General settings</source>
<extracomment>Main menu selection for general settings</extracomment>
<translation>Allmäna inställningar</translation>
</message>
+ <message id="reset-to-defaults">
+ <source>Reset all to defaults</source>
+ <extracomment>Pulldown menu optiion to reset default values</extracomment>
+ <translation>Återställ till standardinställningar</translation>
+ </message>
+ <message id="shortcuts">
+ <source>Shortcuts</source>
+ <extracomment>Main menu selection for shortcuts configurations</extracomment>
+ <translation>Genvägar</translation>
+ </message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation>Inte inställd</translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation>Ingenting, använd %1 som tangent</translation>
+ </message>
+ <message id="help">
+ <source>Help</source>
+ <extracomment>Main menu selection for Help page with keyboard shortcuts etc.</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="key-combinations">
+ <source>TOHKBD-only commands</source>
+ <oldsource>TOHKBD key combinations</oldsource>
+ <extracomment>Section header for list of TOHKBD daemon provided key combinations</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="more-desc">
+ <source>This list is most propably not complete as the operating system/Qt can offer more key combinations.</source>
+ <extracomment>Description text saying there can be more combinations by the OS</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-switch-app">
+ <source>Switch apps</source>
+ <oldsource>Switch between apps</oldsource>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-screeshot">
+ <source>Screenshot</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-selfie-led">
+ <source>Selfie LED</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-toggle-backlight">
+ <source>Toggle backlight</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-dec-volume">
+ <source>Decrease volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-inc-volume">
+ <source>Increase volume</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-new-email">
+ <source>New Email</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-capslock">
+ <source>Toggle CapsLock</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select">
+ <source>Select text</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-select-all">
+ <source>Select all</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-copy">
+ <source>Copy</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-cut">
+ <source>Cut</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-paste">
+ <source>Paste</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-undo">
+ <source>Undo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-redo">
+ <source>Redo</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-delete-word">
+ <source>Delete word</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-reboot-phone">
+ <source>Reboot phone</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-restart-lipstick">
+ <source>Restart lipstick</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="sys-key-combinations">
+ <source>Text edit key combinations</source>
+ <oldsource>System key combinations</oldsource>
+ <extracomment>Section header for list of key combinations provided by os (text edits mostly)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="help-this-help">
+ <source>Show this help</source>
+ <extracomment>Help page text (keep short)</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-normal">
+ <source>Normal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-sticky">
+ <source>Sticky</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-lock">
+ <source>Lock</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-mode-cycle">
+ <source>Cycle</source>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-shift-mode">
+ <source>Shift mode</source>
+ <extracomment>Modifier Shift mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-ctrl-mode">
+ <source>Ctrl mode</source>
+ <extracomment>Modifier Ctrl mode selector combo-box label</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message id="mod-alt-mode">
+ <source>Alt mode</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/qml/components/KeyboardHandler.qml
^
|
@@ -23,8 +23,10 @@
{
if (event.key === Qt.Key_Down)
{
- if (++upDownSelection >= upDownItemCount)
+ if (upDownSelection+1 >= upDownItemCount)
upDownSelection = 0
+ else
+ upDownSelection++
keyUpPressed()
event.accepted = true
}
@@ -38,8 +40,10 @@
}
else if (event.key === Qt.Key_Right)
{
- if (++leftRightSelection >= leftRightItemCount)
+ if (leftRightSelection+1 >= leftRightItemCount)
leftRightSelection = 0
+ else
+ leftRightSelection++
keyRightPressed()
event.accepted = true
}
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/qml/cover/HelpCoverPage.qml
^
|
@@ -0,0 +1,16 @@
+/*
+ tohkbd2-settings-u, The Otherhalf Keyboard 2 settings UI
+*/
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+CoverBackground
+{
+ Image
+ {
+ anchors.centerIn: parent
+ scale: 3.0
+ source: "image://theme/icon-m-question"
+ }
+}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/qml/pages/AboutPage.qml
^
|
@@ -4,6 +4,7 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
+import harbour.tohkbd2.ConsoleModel 1.0
import "../components"
Page
@@ -23,6 +24,9 @@
aboutPageOpen = false
else
aboutPageOpen = true
+
+ if (status === PageStatus.Activating)
+ consoleModel.executeCommand("rpm", [ "-q", "--changelog", "harbour-ambience-tohkbd2" ])
}
BusyIndicator
@@ -43,12 +47,18 @@
onKeyBackspacePressed: pageStack.pop()
}
+ ConsoleModel
+ {
+ id: consoleModel
+ }
+
SilicaFlickable
{
id: flick
anchors.fill: parent
contentHeight: column.height
+ VerticalScrollDecorator { flickable: flick }
Column
{
@@ -188,6 +198,34 @@
font.pixelSize: Theme.fontSizeMedium
anchors.horizontalCenter: parent.horizontalCenter
}
+ SectionHeader
+ {
+ //: section header for changelog
+ //% "Changes"
+ text: qsTrId("about-changes")
+ }
+ Column
+ {
+ width: parent.width - Theme.horizontalPageMargin
+ x: Theme.horizontalPageMargin
+ spacing: -Theme.fontSizeExtraSmall
+ Repeater
+ {
+ width: parent.width
+ model: consoleModel
+ delegate: Text
+ {
+ width: parent.width
+ text: modelData
+ textFormat: Text.PlainText
+ color: Theme.secondaryColor
+ wrapMode: Text.Wrap
+ font.pixelSize: Theme.fontSizeExtraSmall
+ font.bold: text.charAt(0) == "*"
+ visible: text.length > 1
+ }
+ }
+ }
}
}
ListModel
@@ -211,9 +249,5 @@
iconsource: "image://tohkbd2/kimmoli"
linkurl: "http://www.kimmoli.fi"
}
-
}
}
-
-
-
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/qml/pages/GeneralSettings.qml
^
|
@@ -4,6 +4,7 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
+import org.nemomobile.configuration 1.0
import "../components"
Page
@@ -64,14 +65,14 @@
//: Backlight always on description
//% "Backlight is always on when keyboard attached and phone's display is on"
description: qsTrId("bg-always-on-desc")
- onCheckedChanged: settingsui.setSettingInt("forceBacklightOn", checked ? 1 : 0)
+ onCheckedChanged: if (checked !== settings["forceBacklightOn"]) settingsui.setSetting("forceBacklightOn", checked)
width: parent.width - 2*Theme.paddingLarge
Component.onCompleted:
{
checked = settings["forceBacklightOn"]
/* Update to restore if overridden with key-combo Sym+Home */
- if (!checked)
- settingsui.setSettingInt("forceBacklightOn", 0)
+ if (!checked && !settings["forceBacklightOn"])
+ settingsui.setSetting("forceBacklightOn", false)
}
}
TextSwitch
@@ -83,7 +84,7 @@
//: Backlight automatic description
//% "Automatic backlight enable or always off"
description: qsTrId("bg-automatic-desc")
- onCheckedChanged: settingsui.setSettingInt("backlightEnabled", checked ? 1 : 0)
+ onCheckedChanged: if (checked !== settings["backlightEnabled"]) settingsui.setSetting("backlightEnabled", checked)
width: parent.width - 2*Theme.paddingLarge
Component.onCompleted: checked = settings["backlightEnabled"]
enabled: !alwaysOn.checked
@@ -110,7 +111,7 @@
if (wasChanged)
{
wasChanged = false
- settingsui.setSettingInt("backlightTimeout", value)
+ settingsui.setSetting("backlightTimeout", value)
}
}
}
@@ -136,29 +137,53 @@
if (wasChanged)
{
wasChanged = false
- settingsui.setSettingInt("backlightLuxThreshold", value)
+ settingsui.setSetting("backlightLuxThreshold", value)
}
}
}
SectionHeader
{
- //: Section header for orientation settings
- //% "Orientation"
+ //: Section header for display related settings
+ //% "Display"
text: qsTrId("orientation-sect-header")
}
TextSwitch
{
- //: Force landsacep switch text
+ //: Force landscape switch text
//% "Force Landscape"
text: qsTrId("orientation-force-landscape-sw")
- //: Force landsacep switch description
+ //: Force landscape switch description
//% "Force landscape orientation when keyboard attached"
description: qsTrId("orientation-force-landscape-desc")
- onCheckedChanged: settingsui.setSettingInt("forceLandscapeOrientation", checked ? 1 : 0)
+ onCheckedChanged: settingsui.setSetting("forceLandscapeOrientation", checked)
width: parent.width - 2*Theme.paddingLarge
Component.onCompleted: checked = settings["forceLandscapeOrientation"]
}
+ TextSwitch
+ {
+ //: Keep display on when connected switch text
+ //% "Display on when connected"
+ text: qsTrId("keep-display-on-when-connected-sw")
+ //: Keep display on when connected switch description
+ //% "Keep display on when keyboard is connected"
+ description: qsTrId("keep-display-on-when-connected-desc")
+ onCheckedChanged: settingsui.setSetting("keepDisplayOnWhenConnected", checked)
+ width: parent.width - 2*Theme.paddingLarge
+ Component.onCompleted: checked = settings["keepDisplayOnWhenConnected"]
+ }
+ TextSwitch
+ {
+ //: Display off when removed switch text
+ //% "Display off when removed"
+ text: qsTrId("turn-display-off-when-removed-sw")
+ //: Display off when removed switch description
+ //% "Turn display off when keyboard is removed"
+ description: qsTrId("turn-display-off-when-removed-desc")
+ onCheckedChanged: settingsui.setSetting("turnDisplayOffWhenRemoved", checked)
+ width: parent.width - 2*Theme.paddingLarge
+ Component.onCompleted: checked = settings["turnDisplayOffWhenRemoved"]
+ }
SectionHeader
{
@@ -186,7 +211,7 @@
if (wasChanged)
{
wasChanged = false
- settingsui.setSettingInt("keyRepeatDelay", value)
+ settingsui.setSetting("keyRepeatDelay", value)
}
}
}
@@ -210,7 +235,7 @@
if (wasChanged)
{
wasChanged = false
- settingsui.setSettingInt("keyRepeatRate", value)
+ settingsui.setSetting("keyRepeatRate", value)
}
}
}
@@ -238,7 +263,7 @@
Label
{
//: Description text for sticky and locking modifier keys
- //% "Sticky modifiers will toggle when pressed once and released after pressing any other key. Locking modifier will lock on double-press and released on third. In both modes you can also use them as normal modifier keys."
+ //% "In Sticky mode, modifier key will stay on after pressed once and released after pressing again or any other key. In Lock mode modifier key will lock on double-press and released on third. In Cycle mode Sticky and Lock modes are both active, after first press is Sticky and second press is Lock. In all modes you can also use them as normal modifier keys."
text: qsTrId("sticky-desc")
wrapMode: Text.Wrap
font.pixelSize: Theme.fontSizeExtraSmall
@@ -247,135 +272,89 @@
anchors.horizontalCenter: parent.horizontalCenter
}
- Row
+ Repeater
{
- width: parent.width - 2*Theme.paddingLarge
- TextSwitch
- {
- id: stickyShift
- //% "Sticky Shift"
- text: qsTrId("sticky-shift")
- onCheckedChanged:
- {
- if (checked)
- lockingShift.checked = false
- settingsui.setSettingInt("stickyShiftEnabled", checked ? 1 : 0)
- }
- width: parent.width/2
- Component.onCompleted: checked = settings["stickyShiftEnabled"]
- }
- TextSwitch
+ model: modifiers
+
+ ComboBox
{
- id: lockingShift
- //% "Locking Shift"
- text: qsTrId("locking-shift")
- onCheckedChanged:
- {
- if (checked)
- stickyShift.checked = false
- settingsui.setSettingInt("lockingShiftEnabled", checked ? 1 : 0)
+ width: parent.width
+ label: " " + combolabel + " "
+ menu: ContextMenu
+ {
+ id: modifierCBmenu
+ Repeater
+ {
+ model: modifierModes
+ MenuItem { text: name; onClicked: settingsui.setSetting(key, code); }
+ }
+ }
+ Component.onCompleted:
+ {
+ var i
+ for (i=0 ; i < modifierModes.count ; i++)
+ {
+ var item = modifierModes.get(i)
+ if (settings[key] === item["code"])
+ {
+ currentIndex = i
+ return
+ }
+ }
}
- width: parent.width/2
- Component.onCompleted: checked = settings["lockingShiftEnabled"]
}
}
- Row
+
+ SectionHeader
{
- width: parent.width - 2*Theme.paddingLarge
- TextSwitch
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/qml/pages/Help.qml
^
|
@@ -0,0 +1,229 @@
+/*
+ tohkbd2-settings-u, The Otherhalf Keyboard 2 settings UI
+*/
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import "../components"
+
+Page
+{
+ id: page
+
+ KeyboardHandler
+ {
+ id: kbdif
+ onKeyUpPressed: flick.flick(0, -1000)
+ onKeyDownPressed: flick.flick(0, 1000)
+ onKeyBackspacePressed: pageStack.pop()
+ }
+
+ Component.onCompleted: helpPageOpen = true
+ Component.onDestruction: helpPageOpen = false
+
+ SilicaFlickable
+ {
+ id: flick
+ anchors.fill: parent
+
+ contentHeight: column.height
+
+ Column
+ {
+ id: column
+
+ width: page.width
+
+ PageHeader
+ {
+ title: qsTrId("help")
+ }
+
+ Repeater
+ {
+ id: r
+ model: keycomboTopModel
+
+ Column
+ {
+ SectionHeader
+ {
+ text: name
+ }
+
+ Grid
+ {
+ id: keycomboGrid
+ columns: (page.orientation === Orientation.Landscape || page.orientation === Orientation.LandscapeInverted) ? 2 : 1
+ width: page.width - Theme.paddingLarge
+ x: Theme.paddingLarge
+
+ Repeater
+ {
+ id: kcRepeater
+ model: keycomboModel
+
+ ListItem
+ {
+ id: kcItem
+ width: keycomboGrid.width / keycomboGrid.columns
+ height: Theme.itemSizeExtraSmall
+ enabled: false
+
+ Label
+ {
+ id: key1Name
+ anchors.left: parent.left
+ //anchors.leftMargin: Theme.paddingSmall
+ anchors.verticalCenter: parent.verticalCenter
+ font.pixelSize: Theme.fontSizeSmall
+ font.bold: true
+ text: key1
+ color: Theme.primaryColor
+ }
+
+ Label
+ {
+ id: key2Name
+ anchors.left: key1Name.right
+ anchors.verticalCenter: parent.verticalCenter
+ font.pixelSize: Theme.fontSizeSmall
+ font.bold: true
+ text: "+" + key2
+ color: Theme.primaryColor
+ }
+
+ Label
+ {
+ id: key3Name
+ anchors.left: key2Name.right
+ anchors.verticalCenter: parent.verticalCenter
+ font.pixelSize: Theme.fontSizeSmall
+ font.bold: true
+ text: "+" + key3
+ color: Theme.primaryColor
+ visible: key3.length > 0
+ }
+
+ Label
+ {
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.horizontalCenter
+ color: Theme.primaryColor
+ font.pixelSize: Theme.fontSizeMedium
+ truncationMode: TruncationMode.Fade
+ text: name
+ }
+ }
+ }
+ }
+ }
+ }
+
+ Label
+ {
+ //: Description text saying there can be more combinations by the OS
+ //% "This list is most propably not complete as the operating system/Qt can offer more key combinations."
+ text: qsTrId("more-desc")
+ x: Theme.paddingLarge
+ wrapMode: Text.Wrap
+ font.pixelSize: Theme.fontSizeSmall
+ color: Theme.secondaryColor
+ width: parent.width - 2*Theme.paddingLarge
+ }
+
+ SectionHeader
+ {
+ text: qsTrId("shortcuts")
+ }
+
+ Grid
+ {
+ id: shortcutsGrid
+ columns: (page.orientation === Orientation.Landscape || page.orientation === Orientation.LandscapeInverted) ? 2 : 1
+
+ Repeater
+ {
+ id: repeater
+ model: shortcutsModel
+
+ ListItem
+ {
+ id: shortcutItem
+ width: page.width / shortcutsGrid.columns
+ height: Theme.itemSizeSmall
+ enabled: false
+
+ Image
+ {
+ id: keyFrame
+ source: "image://tohkbd2/icon-m-keyframe"
+ anchors
+ {
+ left: parent.left
+ leftMargin: Theme.paddingMedium
+ verticalCenter: parent.verticalCenter
+ }
+ scale: 0.8
+
+ Label
+ {
+ id: keyName
+ anchors.centerIn: parent
+ font.pixelSize: Theme.fontSizeMedium
+ font.bold: true
+ text: key
+ color: Theme.primaryColor
+ scale: 0.85
+ }
+ }
+
+ Image
+ {
+ id: appIcon
+ source: iconId
+ y: Math.round((parent.height - height) / 2)
+ property real size: Theme.itemSizeSmall * 0.6
+
+ sourceSize.width: size
+ sourceSize.height: size
+ width: size
+ height: size
+
+ anchors
+ {
+ left: keyFrame.right
+ leftMargin: Theme.paddingMedium
+ verticalCenter: parent.verticalCenter
+ }
+ }
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/qml/pages/LayoutSwitcher.qml
^
|
@@ -0,0 +1,99 @@
+/*
+ tohkbd2-settings-u, The Otherhalf Keyboard 2 settings UI
+*/
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import org.nemomobile.configuration 1.0
+import "../components"
+
+Page
+{
+ id: page
+
+ function getIndexOfCurrentLayout()
+ {
+ for (var i = 0; i < layoutsModel.count; ++i)
+ {
+ if (layoutsModel.get(i).name === settings["physicalLayout"])
+ {
+ return i
+ }
+ }
+ return -1
+ }
+
+ property int indexOfCurrentLayout: -1
+
+ Component.onCompleted:
+ {
+ indexOfCurrentLayout = getIndexOfCurrentLayout()
+ listView.positionViewAtIndex(indexOfCurrentLayout, ListView.Center)
+ kbdif.upDownSelection = indexOfCurrentLayout
+ }
+
+ KeyboardHandler
+ {
+ id: kbdif
+ upDownItemCount: layoutsModel.count
+ onKeyUpPressed: listView.positionViewAtIndex(upDownSelection, ListView.Contain)
+ onKeyDownPressed: listView.positionViewAtIndex(upDownSelection, ListView.Contain)
+
+ onKeyEnterPressed:
+ {
+ keymapLayout.value = layoutsModel.get(upDownSelection).key
+ pageStack.pop()
+ }
+ onKeyBackspacePressed: pageStack.pop()
+
+ Connections
+ {
+ target: page
+ onOrientationTransitionRunningChanged: if (!orientationTransitionRunning) listView.positionViewAtIndex(kbdif.upDownSelection, ListView.Contain)
+ }
+
+ }
+
+ SilicaListView
+ {
+ id: listView
+ model: layoutsModel
+ anchors.fill: parent
+
+ VerticalScrollDecorator {}
+
+ header: PageHeader
+ {
+ title: qsTrId("kbd-layout")
+ }
+
+ delegate: BackgroundItem
+ {
+ id: delegate
+ highlighted: index === kbdif.upDownSelection
+ height: Theme.itemSizeSmall
+ onDownChanged: kbdif.upDownSelection = index
+
+ Label
+ {
+ x: Theme.paddingLarge
+ text: name
+ anchors.verticalCenter: parent.verticalCenter
+ color: (delegate.highlighted || index == indexOfCurrentLayout) ? Theme.highlightColor : Theme.primaryColor
+ opacity: supported ? 1.0 : 0.65
+ }
+ onClicked:
+ {
+ keymapLayout.value = key
+ pageStack.pop()
+ }
+ }
+ }
+
+ ConfigurationValue
+ {
+ id: keymapLayout
+ key: "/desktop/lipstick-jolla-home/layout"
+ onValueChanged: indexOfCurrentLayout = getIndexOfCurrentLayout()
+ }
+}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/qml/pages/Tohkbd2Settings.qml
^
|
@@ -13,16 +13,60 @@
KeyboardHandler
{
id: kbdif
- upDownItemCount: settingslist.count
+ upDownItemCount: kr.menuOpen ? kr.menu.children.length : settingslist.count + 1
+
+ onUpDownSelectionChanged:
+ {
+ if (kr.menuOpen)
+ {
+ if (kr.menu.children[upDownSelection])
+ kr.menu._setHighlightedItem(kr.menu.children[upDownSelection])
+ }
+ else
+ {
+ if ((upDownSelection === (upDownItemCount - 1)) && (flick.contentHeight > flick.height))
+ flick.scrollToBottom()
+ }
+ }
+
onKeyEnterPressed:
{
- if (settingslist.get(upDownSelection).isEnabled)
+ if (kr.menuOpen)
+ {
+ if (kr.menu.children[upDownSelection])
+ kr.menu._activatedMenuItem(kr.menu.children[upDownSelection])
+ upDownSelection = -1
+ }
+ else if (upDownSelection === (upDownItemCount - 1))
{
- pageStack.push(Qt.resolvedUrl(settingslist.get(upDownSelection).pageId))
+ if (!kr.menuOpen)
+ {
+ updateLayouts()
+ kr.showMenu()
+ upDownSelection = 0
+ }
}
+ else
+ {
+ if (settingslist.get(upDownSelection).isEnabled && !kr.menuOpen)
+ {
+ pageStack.push(Qt.resolvedUrl(settingslist.get(upDownSelection).pageId))
+ }
+ }
+ }
+
+ onKeyBackspacePressed:
+ {
+ if (kr.menuOpen) kr.hideMenu()
+ upDownSelection = -1
}
}
+ RemorsePopup
+ {
+ id: remorse
+ }
+
SilicaFlickable
{
id: flick
@@ -65,9 +109,9 @@
width: 1
}
-
Repeater
{
+ id: repeater
model: settingslist
ListItem
@@ -76,7 +120,7 @@
height: Theme.itemSizeSmall
enabled: isEnabled
opacity: enabled ? 1.0 : 0.4
- highlighted: down || kbdif.upDownSelection === index
+ highlighted: (down || kbdif.upDownSelection === index) && !kr.menuOpen
Image
{
@@ -103,6 +147,88 @@
onDownChanged: kbdif.upDownSelection = index
}
}
+
+ ListItem
+ {
+ id: kr
+ width: parent.width
+ height: Theme.itemSizeSmall + kcm.height
+ highlighted: down || menuOpen || kbdif.upDownSelection === (kbdif.upDownItemCount - 1)
+ menu: kcm
+ showMenuOnPressAndHold: false
+ onClicked:
+ {
+ kbdif.upDownSelection = (kbdif.upDownItemCount - 1)
+ updateLayouts()
+ showMenu()
+ }
+
+ Image
+ {
+ id: kimg
+ x: Theme.paddingLarge
+ source: kr.highlighted ? "image://theme/icon-m-keyboard?" + Theme.highlightColor : "image://theme/icon-m-keyboard"
+ anchors.verticalCenter: parent.verticalCenter
+ }
+ Label
+ {
+ id: kprfx
+ //: Prefix for showing current layout
+ //% "Keyboard layout"
+ text: qsTrId("kbd-layout")
+ anchors.left: kimg.right
+ anchors.leftMargin: Theme.paddingLarge
+ anchors.verticalCenter: parent.verticalCenter
+ color: kr.highlighted ? Theme.highlightColor : Theme.primaryColor
+ }
+ Label
+ {
+ text: settings["physicalLayout"]
+ anchors.left: kprfx.right
+ anchors.leftMargin: Theme.paddingMedium
+ anchors.verticalCenter: parent.verticalCenter
+ color: Theme.highlightColor
+ }
+ }
+
+ ContextMenu
+ {
+ id: kcm
+ MenuItem
+ {
+ //: Context menu entry for changing the layout
+ //% "Change layout..."
+ text: qsTrId("change-layout")
+ onClicked: pageStack.push(Qt.resolvedUrl("LayoutSwitcher.qml"))
+ }
+ MenuItem
+ {
+ //: Context menu entry for reloading keyboard mapping file for tohkbd
+ //% "Reload keyboard mapping"
+ text: qsTrId("force-reload")
+ onClicked: settingsui.forceKeymapReload()
+ }
+ MenuItem
+ {
+ //: Context menu entry for overwrite keyboard mapping files with original ones
+ //% "Restore original keymap files"
+ text: qsTrId("reset-keymaps")
+ onClicked: remorse.execute(qsTrId("reset-keymaps"),
+ function() { settingsui.restoreOriginalKeymaps() } )
+ }
+ }
+
+ Label
+ {
+ //: Description text for sticky and locking modifier keys
+ //% "To change keyboard layout, click above and select 'Change layout'. Unsupported layouts are dimmed."
+ text: qsTrId("layout-desc")
+ x: Theme.paddingLarge
+ wrapMode: Text.Wrap
+ font.pixelSize: Theme.fontSizeSmall
+ color: Theme.secondaryColor
+ width: parent.width - 2*Theme.paddingLarge
+ }
}
}
@@ -116,10 +242,6 @@
//% "Shortcuts"
settingslist.append({"labelId": qsTrId("shortcuts"), "iconId":"image://theme/icon-m-shortcut", "pageId":"Shortcuts.qml", "isEnabled":(daemonVersion !== "N/A")})
- //: Main menu selection for layout selection
- //% "Layout"
- settingslist.append({"labelId": qsTrId("layout"), "iconId":"image://theme/icon-m-keyboard", "pageId":"KeyboardLayout.qml", "isEnabled":true})
-
//: Main menu selection for general settings
//% "General settings"
settingslist.append({"labelId": qsTrId("general-settings"), "iconId":"image://theme/icon-m-developer-mode", "pageId":"GeneralSettings.qml", "isEnabled":(daemonVersion !== "N/A")})
@@ -127,6 +249,10 @@
//: Main menu selection for FAQ and reporting an issue, page header for bug reporter page. button text for triggering email app.
//% "Report a bug"
settingslist.append({"labelId": qsTrId("report-a-bug"), "iconId":"image://theme/icon-m-crash-reporter", "pageId":"BugReporter.qml", "isEnabled":true})
+
+ //: Main menu selection for Help page with keyboard shortcuts etc.
+ //% "Help"
+ settingslist.append({"labelId": qsTrId("help"), "iconId":"image://theme/icon-m-question", "pageId":"Help.qml", "isEnabled":true})
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/qml/tohkbd2-settingsui.qml
^
|
@@ -14,6 +14,9 @@
onApplicationActiveChanged:
{
+ if (!applicationActive && viewMode === "--showhelp")
+ Qt.quit()
+
if (!applicationActive && bugReportPageOpen)
{
bugReportPageOpen = false
@@ -34,11 +37,25 @@
property bool bugReportPageOpen: false
property bool aboutPageOpen: false
+ property bool helpPageOpen: false
property var settings
- initialPage: Qt.resolvedUrl("pages/Tohkbd2Settings.qml")
- cover: Qt.resolvedUrl("cover/CoverPage.qml")
+ initialPage:
+ {
+ if (viewMode === "--showhelp")
+ return Qt.resolvedUrl("pages/Help.qml")
+ else
+ return Qt.resolvedUrl("pages/Tohkbd2Settings.qml")
+ }
+
+ cover:
+ {
+ if (viewMode === "--showhelp")
+ return Qt.resolvedUrl("cover/HelpCoverPage.qml")
+ else
+ return Qt.resolvedUrl("cover/CoverPage.qml")
+ }
function coverActionLeft()
{
@@ -62,6 +79,8 @@
updateApplicationsModel()
updateShortcutsModel()
settings = settingsui.getCurrentSettings()
+ updateKeycomboModel()
+ updateModifiers()
}
onShortcutsChanged:
@@ -73,6 +92,9 @@
{
settings = settingsui.getCurrentSettings()
}
+
+ onShowHelpPage: if (viewMode !== "--showhelp" && !helpPageOpen)
+ pageStack.push(Qt.resolvedUrl("pages/Help.qml"))
}
ListModel
@@ -117,6 +139,149 @@
"isAndroid": tmp[i]["isAndroid"]})
}
}
+
+ ListModel
+ {
+ id: keycomboTopModel
+ }
+ ListModel
+ {
+ id: keycomboModel1
+ }
+ ListModel
+ {
+ id: keycomboModel2
+ }
+
+ function updateKeycomboModel()
+ {
+ keycomboModel1.clear()
+ keycomboModel2.clear()
+ keycomboTopModel.clear()
+
+ //: Help page text (keep short)
+ //% "Show this help"
+ keycomboModel1.append({"key1": "Ctrl", "key2": "Sym", "key3": "1", "name": qsTrId("help-this-help")})
+ //: Help page text (keep short)
+ //% "Switch apps"
+ keycomboModel1.append({"key1": "Alt", "key2": "Tab", "key3": "", "name": qsTrId("help-switch-app")})
+ //: Help page text (keep short)
+ //% "Screenshot"
+ keycomboModel1.append({"key1": "Sym", "key2": "Ins", "key3": "", "name": qsTrId("help-screeshot")})
+ //: Help page text (keep short)
+ //% "Selfie LED"
+ keycomboModel1.append({"key1": "Sym", "key2": "Del", "key3": "", "name": qsTrId("help-selfie-led")})
+ //: Help page text (keep short)
+ //% "Toggle backlight"
+ keycomboModel1.append({"key1": "Sym", "key2": "Home", "key3": "", "name": qsTrId("help-toggle-backlight")})
+ //: Help page text (keep short)
+ //% "New Email"
+ keycomboModel1.append({"key1": "Sym", "key2": "@", "key3": "", "name": qsTrId("help-new-email")})
+ //: Help page text (keep short)
+ //% "Decrease volume"
+ keycomboModel1.append({"key1": "Sym", "key2": "Left", "key3": "", "name": qsTrId("help-dec-volume")})
+ //: Help page text (keep short)
+ //% "Increase volume"
+ keycomboModel1.append({"key1": "Sym", "key2": "Right", "key3": "", "name": qsTrId("help-inc-volume")})
+ //: Help page text (keep short)
+ //% "Reboot phone"
+ keycomboModel1.append({"key1": "Ctrl", "key2": "Alt", "key3": "Del", "name": qsTrId("help-reboot-phone")})
+ //: Help page text (keep short)
+ //% "Restart lipstick"
+ keycomboModel1.append({"key1": "Ctrl", "key2": "Alt", "key3": "Backspace", "name": qsTrId("help-restart-lipstick")})
+ //: Help page text (keep short)
+ //% "Toggle CapsLock"
+ keycomboModel1.append({"key1": "Sym", "key2": "Left-Shift", "key3": "", "name": qsTrId("help-capslock")})
+
+ //: Help page text (keep short)
+ //% "Select text"
+ keycomboModel2.append({"key1": "Shift", "key2": "Arrows", "key3": "", "name": qsTrId("help-select")})
+ //: Help page text (keep short)
+ //% "Select all"
+ keycomboModel2.append({"key1": "Ctrl", "key2": "A", "key3": "", "name": qsTrId("help-select-all")})
+ //: Help page text (keep short)
+ //% "Copy"
+ keycomboModel2.append({"key1": "Ctrl", "key2": "C", "key3": "", "name": qsTrId("help-copy")})
+ //: Help page text (keep short)
+ //% "Cut"
+ keycomboModel2.append({"key1": "Ctrl", "key2": "X", "key3": "", "name": qsTrId("help-cut")})
+ //: Help page text (keep short)
+ //% "Paste"
+ keycomboModel2.append({"key1": "Ctrl", "key2": "V", "key3": "", "name": qsTrId("help-paste")})
+ //: Help page text (keep short)
+ //% "Undo"
+ keycomboModel2.append({"key1": "Ctrl", "key2": "Z", "key3": "", "name": qsTrId("help-undo")})
+ //: Help page text (keep short)
+ //% "Redo"
+ keycomboModel2.append({"key1": "Ctrl", "key2": "Shift", "key3": "Z", "name": qsTrId("help-redo")})
+ //: Help page text (keep short)
+ //% "Delete word"
+ keycomboModel2.append({"key1": "Ctrl", "key2": "Backspace", "key3": "", "name": qsTrId("help-delete-word")})
+
+ //: Section header for list of TOHKBD daemon provided key combinations
+ //% "TOHKBD-only commands"
+ keycomboTopModel.append({"name": qsTrId("key-combinations"), "keycomboModel": keycomboModel1})
+
+ //: Section header for list of key combinations provided by os (text edits mostly)
+ //% "Text edit key combinations"
+ keycomboTopModel.append({"name": qsTrId("sys-key-combinations"), "keycomboModel": keycomboModel2})
+ }
+
+ ListModel
+ {
+ id: modifierModes
+ }
+
+ ListModel
+ {
+ id: modifiers
+ }
+
+ function updateModifiers()
+ {
+ modifierModes.clear()
+ modifiers.clear()
+
+ //% "Normal"
+ modifierModes.append({ "name": qsTrId("mod-mode-normal"), "code": "Normal" })
+ //% "Sticky"
+ modifierModes.append({ "name": qsTrId("mod-mode-sticky"), "code": "Sticky" })
+ //% "Lock"
+ modifierModes.append({ "name": qsTrId("mod-mode-lock"), "code": "Lock" })
+ //% "Cycle"
+ modifierModes.append({ "name": qsTrId("mod-mode-cycle"), "code": "Cycle" })
+
+ //: Modifier Shift mode selector combo-box label
+ //% "Shift mode"
+ modifiers.append({ "combolabel": qsTrId("mod-shift-mode"), "key": "modifierShiftMode" })
+ //: Modifier Ctrl mode selector combo-box label
+ //% "Ctrl mode"
+ modifiers.append({ "combolabel": qsTrId("mod-ctrl-mode"), "key": "modifierCtrlMode" })
+ //: Modifier Alt mode selector combo-box label
+ //% "Alt mode"
+ modifiers.append({ "combolabel": qsTrId("mod-alt-mode"), "key": "modifierAltMode" })
+ //: Modifier Sym mode selector combo-box label
+ //% "Sym mode"
+ modifiers.append({ "combolabel": qsTrId("mod-sym-mode"), "key": "modifierSymMode" })
+ }
+
+ ListModel
+ {
+ id: layoutsModel
+ }
+
+ function updateLayouts()
+ {
+ var i
+ var tmp = settingsui.getCurrentLayouts()
+
+ layoutsModel.clear()
+
+ for (i=0 ; i<tmp.length; i++)
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/settings-ui.pro
^
|
@@ -8,11 +8,11 @@
CONFIG += sailfishapp
CONFIG += link_pkgconfig
-PKGCONFIG += mlite5 sailfishapp
+PKGCONFIG += mlite5 Qt5SystemInfo sailfishapp
DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\""
-#system(lupdate src qml -no-obsolete -ts $$PWD/i18n/engineering_en.ts)
+system(lupdate src qml -no-obsolete -ts $$PWD/i18n/engineering_en.ts)
system(lrelease -idbased $$PWD/i18n/*.ts)
translations.path = /usr/share/$${TARGET}/i18n
@@ -24,13 +24,17 @@
SOURCES += src/tohkbd2-settingsui.cpp \
src/settingsui.cpp \
- ../daemon/src/daemonInterface.cpp \
- ../user-daemon/src/userInterface.cpp
+ src/consolemodel.cpp \
+ ../dbus/src/settingsuiAdaptor.cpp \
+ ../dbus/src/daemonInterface.cpp \
+ ../dbus/src/userdaemonInterface.cpp
HEADERS += src/settingsui.h \
src/IconProvider.h \
- ../daemon/src/daemonInterface.h \
- ../user-daemon/src/userInterface.h
+ src/consolemodel.h \
+ ../dbus/src/settingsuiAdaptor.h \
+ ../dbus/src/daemonInterface.h \
+ ../dbus/src/userdaemonInterface.h
OTHER_FILES += qml/tohkbd2-settingsui.qml \
qml/cover/CoverPage.qml \
@@ -38,7 +42,6 @@
qml/pages/AboutPage.qml \
qml/pages/ApplicationSelectionPage.qml \
qml/pages/Shortcuts.qml \
- qml/pages/KeyboardLayout.qml \
qml/pages/BugReporter.qml \
qml/pages/GeneralSettings.qml \
qml/icons/icon-m-test.png \
@@ -49,13 +52,7 @@
qml/icons/kimmoli.png \
qml/icons/wazd.png \
qml/icons/dirkvl.png \
- qml/components/Key.qml \
- qml/pages/CustomizeKey.qml \
- qml/images/image-keyboard-azerty.png \
- qml/images/image-keyboard-cyrillic.png \
- qml/images/image-keyboard-qwerty.png \
- qml/images/image-keyboard-qwertz.png \
- qml/images/image-keyboard-scandic.png \
- qml/images/image-keyboard-stealth.png \
- qml/components/KeyboardHandler.qml
-
+ qml/components/KeyboardHandler.qml \
+ qml/pages/Help.qml \
+ qml/cover/HelpCoverPage.qml \
+ qml/pages/LayoutSwitcher.qml
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/src/consolemodel.cpp
^
|
@@ -0,0 +1,144 @@
+/*
+
+ConsoleModel is courtesy of Harbour FileBrowser
+https://github.com/karip/harbour-file-browser
+
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org>
+*/
+
+#include "consolemodel.h"
+
+enum {
+ ModelDataRole = Qt::UserRole + 1
+};
+
+ConsoleModel::ConsoleModel(QObject *parent) :
+ QAbstractListModel(parent), m_process(0)
+{
+}
+
+ConsoleModel::~ConsoleModel()
+{
+}
+
+int ConsoleModel::rowCount(const QModelIndex &parent) const
+{
+ Q_UNUSED(parent);
+ return m_lines.count();
+}
+
+QVariant ConsoleModel::data(const QModelIndex &index, int role) const
+{
+ Q_UNUSED(role);
+ if (!index.isValid() || index.row() > m_lines.count()-1)
+ return QVariant();
+
+ QString line = m_lines.at(index.row());
+ return line;
+}
+
+QHash<int, QByteArray> ConsoleModel::roleNames() const
+{
+ QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
+ roles.insert(ModelDataRole, QByteArray("modelData"));
+ return roles;
+}
+
+void ConsoleModel::setLines(QStringList lines)
+{
+ if (m_lines == lines)
+ return;
+
+ beginResetModel();
+ m_lines = lines;
+ endResetModel();
+
+ emit linesChanged();
+}
+
+void ConsoleModel::setLines(QString lines)
+{
+ beginResetModel();
+ m_lines = lines.split(QRegExp("[\n\r]"));
+ endResetModel();
+ emit linesChanged();
+}
+
+void ConsoleModel::appendLine(QString line)
+{
+ beginInsertRows(QModelIndex(), m_lines.count(), m_lines.count());
+ m_lines.append(line);
+ endInsertRows();
+}
+
+bool ConsoleModel::executeCommand(QString command, QStringList arguments)
+{
+ // don't execute the command if an old command is still running
+ if (m_process && m_process->state() != QProcess::NotRunning) {
+ // if the old process doesn't stop in 1/2 secs, then don't run the new command
+ if (!m_process->waitForFinished(500))
+ return false;
+ }
+ setLines(QStringList());
+ m_process = new QProcess(this);
+ m_process->setReadChannel(QProcess::StandardOutput);
+ m_process->setProcessChannelMode(QProcess::MergedChannels); // merged stderr channel with stdout channel
+ connect(m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(readProcessChannels()));
+ connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(handleProcessFinish(int, QProcess::ExitStatus)));
+ connect(m_process, SIGNAL(error(QProcess::ProcessError)), this, SLOT(handleProcessError(QProcess::ProcessError)));
+ m_process->start(command, arguments);
+ // the process is killed when ConsoleModel is destroyed (usually when Page is closed)
+ // should we run the process in bg thread to allow the command to finish(?)
+
+ return true;
+}
+
+void ConsoleModel::readProcessChannels()
+{
+ while (m_process->canReadLine()) {
+ QString line = m_process->readLine();
+ appendLine(line);
+ }
+}
+
+void ConsoleModel::handleProcessFinish(int exitCode, QProcess::ExitStatus status)
+{
+ if (status == QProcess::CrashExit) { // if it crashed, then use some error exit code
+ exitCode = -99999;
+ appendLine("** crashed");
+
+ } else if (exitCode != 0) {
+ appendLine(QString("** error: %1").arg(exitCode));
+ }
+ emit processExited(exitCode);
+}
+
+void ConsoleModel::handleProcessError(QProcess::ProcessError error)
+{
+ Q_UNUSED(error);
+ emit processExited(-88888); // if error, then use some error exit code
+ appendLine("** error");
+}
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/src/consolemodel.h
^
|
@@ -0,0 +1,79 @@
+/*
+
+ConsoleModel is courtesy of Harbour FileBrowser
+https://github.com/karip/harbour-file-browser
+
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org>
+*/
+
+#ifndef CONSOLEMODEL_H
+#define CONSOLEMODEL_H
+
+#include <QAbstractListModel>
+#include <QStringList>
+#include <QProcess>
+
+/**
+ * @brief The ConsoleModel class holds a list of strings for a QML list model.
+ */
+class ConsoleModel : public QAbstractListModel
+{
+ Q_OBJECT
+ Q_PROPERTY(QStringList lines READ lines() WRITE setLines(QString) NOTIFY linesChanged())
+
+public:
+ explicit ConsoleModel(QObject *parent = 0);
+ ~ConsoleModel();
+
+ // methods needed by ListView
+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ QHash<int, QByteArray> roleNames() const;
+
+ // property accessors
+ QStringList lines() const { return m_lines; }
+ void setLines(QStringList lines);
+ void setLines(QString lines);
+
+ void appendLine(QString line);
+
+ Q_INVOKABLE bool executeCommand(QString command, QStringList arguments);
+
+signals:
+ void linesChanged();
+ void processExited(int exitCode);
+
+private slots:
+ void readProcessChannels();
+ void handleProcessFinish(int exitCode, QProcess::ExitStatus status);
+ void handleProcessError(QProcess::ProcessError error);
+
+private:
+ QProcess *m_process;
+ QStringList m_lines;
+};
+
+#endif // CONSOLEMODEL_H
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/src/settingsui.cpp
^
|
@@ -10,29 +10,90 @@
#include <QSettings>
#include <QDebug>
#include <QtDBus/QtDBus>
-#include <algorithm>
-
+#include <QtSystemInfo/QDeviceInfo>
+#include <QtAlgorithms>
+#include <mlite5/MDesktopEntry>
+#include <linux/input.h>
#include "../../daemon/src/defaultSettings.h"
+#include "../dbus/src/settingsuiAdaptor.h"
-#include <mlite5/MDesktopEntry>
+static const char *SERVICE = SERVICE_NAME;
+static const char *PATH = "/";
-#include <linux/input.h>
SettingsUi::SettingsUi(QObject *parent) :
QObject(parent)
{
+ m_dbusRegistered = false;
+
+ new Tohkbd2settingsuiAdaptor(this);
+
+ registerDBus();
+
tohkbd2daemon = new ComKimmoliTohkbd2Interface("com.kimmoli.tohkbd2", "/", QDBusConnection::systemBus(), this);
tohkbd2daemon->setTimeout(2000);
tohkbd2user = new ComKimmoliTohkbd2userInterface("com.kimmoli.tohkbd2user", "/", QDBusConnection::sessionBus(), this);
tohkbd2user->setTimeout(2000);
+ connect(tohkbd2user, SIGNAL(physicalLayoutChanged(QString)), this, SLOT(handlePhysicalLayoutChange(QString)));
+
+ layoutToLanguage.insert("cz" ,"Čeština");
+ layoutToLanguage.insert("dk" ,"Dansk");
+ layoutToLanguage.insert("de" ,"Deutsch");
+ layoutToLanguage.insert("ee" ,"Eesti");
+ layoutToLanguage.insert("us" ,"English");
+ layoutToLanguage.insert("es" ,"Español");
+ layoutToLanguage.insert("fr" ,"Français");
+ layoutToLanguage.insert("it" ,"Italiano");
+ layoutToLanguage.insert("nl" ,"Nederlands");
+ layoutToLanguage.insert("no" ,"Norsk");
+ layoutToLanguage.insert("pl" ,"Polski");
+ layoutToLanguage.insert("pt" ,"Português");
+ layoutToLanguage.insert("fi" ,"Suomi");
+ layoutToLanguage.insert("se" ,"Svenska");
+ layoutToLanguage.insert("tr" ,"Türkçe");
+ layoutToLanguage.insert("kz" ,"Қазақ");
+ layoutToLanguage.insert("ru" ,"Русский");
+
emit versionChanged();
}
SettingsUi::~SettingsUi()
{
+ if (m_dbusRegistered)
+ {
+ QDBusConnection connection = QDBusConnection::sessionBus();
+ connection.unregisterObject(PATH);
+ connection.unregisterService(SERVICE);
+
+ printf("tohkbd2-settingsui: unregistered from dbus sessionBus\n");
+ }
+}
+
+void SettingsUi::registerDBus()
+{
+ if (!m_dbusRegistered)
+ {
+ // DBus
+ QDBusConnection connection = QDBusConnection::sessionBus();
+ if (!connection.registerService(SERVICE))
+ {
+ QCoreApplication::quit();
+ return;
+ }
+
+ if (!connection.registerObject(PATH, this))
+ {
+ QCoreApplication::quit();
+ return;
+ }
+ m_dbusRegistered = true;
+
+ printf("tohkbd2-settingsui: succesfully registered to dbus sessionBus \"%s\"\n", SERVICE);
+ }
}
+
QString SettingsUi::readVersion()
{
return APPVERSION;
@@ -61,7 +122,7 @@
{
MDesktopEntry app(list.at(i).absoluteFilePath());
- if (!app.hidden() && !app.icon().isEmpty() && !app.noDisplay() && !app.notShowIn().contains("X-Meego"))
+ if (!app.hidden() && !app.icon().isEmpty() && !app.noDisplay() && !app.notShowIn().contains("X-Meego", Qt::CaseInsensitive))
{
map.clear();
map.insert("filePath", list.at(i).absoluteFilePath());
@@ -80,7 +141,7 @@
}
// sort them by application name
- std::sort(tmp.begin(), tmp.end(), appNameLessThan);
+ qSort(tmp.begin(), tmp.end(), appNameLessThan);
return tmp;
}
@@ -90,8 +151,8 @@
QVariantMap map;
QSettings settings("harbour-tohkbd2", "tohkbd2");
- settings.beginGroup("generalsettings");
+ settings.beginGroup("generalsettings");
map.insert("backlightTimeout", settings.value("backlightTimeout", BACKLIGHT_TIMEOUT).toInt());
map.insert("backlightLuxThreshold", settings.value("backlightLuxThreshold", BACKLIGHT_LUXTHRESHOLD).toInt());
map.insert("keyRepeatDelay", settings.value("keyRepeatDelay", KEYREPEAT_DELAY).toInt());
@@ -99,19 +160,18 @@
map.insert("backlightEnabled", settings.value("backlightEnabled", BACKLIGHT_ENABLED).toBool());
map.insert("forceLandscapeOrientation", settings.value("forceLandscapeOrientation", FORCE_LANDSCAPE_ORIENTATION).toBool());
map.insert("forceBacklightOn", settings.value("forceBacklightOn", FORCE_BACKLIGHT_ON).toBool());
- map.insert("stickyShiftEnabled", settings.value("stickyShiftEnabled", STICKY_SHIFT_ENABLED).toBool());
- map.insert("stickyCtrlEnabled", settings.value("stickyCtrlEnabled", STICKY_CTRL_ENABLED).toBool());
- map.insert("stickyAltEnabled", settings.value("stickyAltEnabled", STICKY_ALT_ENABLED).toBool());
- map.insert("stickySymEnabled", settings.value("stickySymEnabled", STICKY_SYM_ENABLED).toBool());
- map.insert("lockingShiftEnabled", settings.value("lockingShiftEnabled", LOCKING_SHIFT_ENABLED).toBool());
- map.insert("lockingCtrlEnabled", settings.value("lockingCtrlEnabled", LOCKING_CTRL_ENABLED).toBool());
- map.insert("lockingAltEnabled", settings.value("lockingAltEnabled", LOCKING_ALT_ENABLED).toBool());
- map.insert("lockingSymEnabled", settings.value("lockingSymEnabled", LOCKING_SYM_ENABLED).toBool());
+ map.insert("modifierShiftMode", settings.value("modifierShiftMode", MODIFIER_SHIFT_MODE).toString());
+ map.insert("modifierCtrlMode", settings.value("modifierCtrlMode", MODIFIER_CTRL_MODE).toString());
+ map.insert("modifierAltMode", settings.value("modifierAltMode", MODIFIER_ALT_MODE).toString());
+ map.insert("modifierSymMode", settings.value("modifierSymMode", MODIFIER_SYM_MODE).toString());
+ map.insert("turnDisplayOffWhenRemoved", settings.value("turnDisplayOffWhenRemoved", TURN_DISPLAY_OFF_WHEN_REMOVED).toBool());
+ map.insert("keepDisplayOnWhenConnected", settings.value("keepDisplayOnWhenConnected", KEEP_DISPLAY_ON_WHEN_CONNECTED).toBool());
+ map.insert("verboseMode", settings.value("verboseMode", VERBOSE_MODE_ENABLED).toBool());
settings.endGroup();
- settings.beginGroup("layoutsettings");
- map.insert("masterLayout", settings.value("masterLayout", QString(MASTER_LAYOUT)).toString());
- settings.endGroup();
+ QString layout = QString(tohkbd2user->getActivePhysicalLayout());
+
+ map.insert("physicalLayout", layoutToLanguage.value(layout));
return map;
}
@@ -174,22 +234,11 @@
emit shortcutsChanged();
}
-void SettingsUi::setSettingInt(QString key, int value)
+void SettingsUi::setSetting(QString key, QVariant value)
{
qDebug() << "setting" << key << "to" << value;
- tohkbd2daemon->setSettingInt(key, value);
-
- QThread::msleep(200);
-
- emit settingsChanged();
-}
-
-void SettingsUi::setSettingString(QString key, QString value)
-{
- qDebug() << "setting" << key << "to" << value;
-
- tohkbd2daemon->setSettingString(key, value);
+ tohkbd2daemon->setSetting(key, QDBusVariant(value));
QThread::msleep(200);
@@ -209,21 +258,20 @@
void SettingsUi::setSettingsToDefault()
{
- setSettingInt("backlightTimeout", BACKLIGHT_TIMEOUT);
- setSettingInt("backlightLuxThreshold", BACKLIGHT_LUXTHRESHOLD);
- setSettingInt("keyRepeatDelay", KEYREPEAT_DELAY);
- setSettingInt("keyRepeatRate", KEYREPEAT_RATE);
- setSettingInt("backlightEnabled", BACKLIGHT_ENABLED ? 1 : 0);
- setSettingInt("forceLandscapeOrientation", FORCE_LANDSCAPE_ORIENTATION ? 1 : 0);
- setSettingInt("forceBacklightOn", FORCE_BACKLIGHT_ON ? 1 : 0);
- setSettingInt("stickyShiftEnabled", STICKY_SHIFT_ENABLED ? 1 : 0);
- setSettingInt("stickyCtrlEnabled", STICKY_CTRL_ENABLED ? 1 : 0);
- setSettingInt("stickyAltEnabled", STICKY_ALT_ENABLED ? 1 : 0);
- setSettingInt("stickySymEnabled", STICKY_SYM_ENABLED ? 1 : 0);
- setSettingInt("lockingShiftEnabled", LOCKING_SHIFT_ENABLED ? 1 : 0);
- setSettingInt("lockingCtrlEnabled", LOCKING_CTRL_ENABLED ? 1 : 0);
- setSettingInt("lockingAltEnabled", LOCKING_ALT_ENABLED ? 1 : 0);
- setSettingInt("lockingSymEnabled", LOCKING_SYM_ENABLED ? 1 : 0);
+ setSetting("backlightTimeout", BACKLIGHT_TIMEOUT);
+ setSetting("backlightLuxThreshold", BACKLIGHT_LUXTHRESHOLD);
+ setSetting("keyRepeatDelay", KEYREPEAT_DELAY);
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/src/settingsui.h
^
|
@@ -6,41 +6,60 @@
#define SETTINGSUI_H
#include <QObject>
#include <QVariantList>
+#include <QTimer>
+#include <QMap>
-#include "../daemon/src/daemonInterface.h"
-#include "../user-daemon/src/userInterface.h"
+#include "../dbus/src/daemonInterface.h"
+#include "../dbus/src/userdaemonInterface.h"
+#define SERVICE_NAME "com.kimmoli.tohkbd2settingsui"
+
+class QDBusInterface;
class SettingsUi : public QObject
{
Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", SERVICE_NAME)
Q_PROPERTY(QString version READ readVersion NOTIFY versionChanged())
public:
explicit SettingsUi(QObject *parent = 0);
~SettingsUi();
+ void registerDBus();
QString readVersion();
Q_INVOKABLE QVariantList getApplications();
Q_INVOKABLE QVariantList getCurrentShortcuts();
Q_INVOKABLE QVariantMap getCurrentSettings();
+ Q_INVOKABLE QVariantList getCurrentLayouts();
Q_INVOKABLE void setShortcut(QString key, QString appPath);
Q_INVOKABLE QString readDaemonVersion();
Q_INVOKABLE QString readUserDaemonVersion();
Q_INVOKABLE QString readSailfishVersion();
Q_INVOKABLE void setShortcutsToDefault();
Q_INVOKABLE void setSettingsToDefault();
- Q_INVOKABLE void setSettingInt(QString key, int value);
- Q_INVOKABLE void setSettingString(QString key, QString value);
+ Q_INVOKABLE void setSetting(QString key, QVariant value);
+ Q_INVOKABLE void forceKeymapReload();
+ Q_INVOKABLE void restoreOriginalKeymaps();
+
+public slots:
+ void showHelp() { emit showHelpPage(); }
signals:
void versionChanged();
void shortcutsChanged();
void settingsChanged();
+ void showHelpPage();
+
+private slots:
+ void handlePhysicalLayoutChange(QString layout);
private:
ComKimmoliTohkbd2Interface *tohkbd2daemon;
ComKimmoliTohkbd2userInterface *tohkbd2user;
+
+ bool m_dbusRegistered;
+ QMap<QString, QString> layoutToLanguage;
};
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/settings-ui/src/tohkbd2-settingsui.cpp
^
|
@@ -2,11 +2,6 @@
tohkbd2-settings-u, The Otherhalf Keyboard 2 settings UI
*/
-
-#ifdef QT_QML_DEBUG
-#include <QtQuick>
-#endif
-
#include <sailfishapp.h>
#include <QtQml>
#include <QScopedPointer>
@@ -17,11 +12,13 @@
#include <QCoreApplication>
#include "settingsui.h"
#include "IconProvider.h"
+#include "consolemodel.h"
int main(int argc, char *argv[])
{
qmlRegisterType<SettingsUi>("harbour.tohkbd2.settingsui", 1, 0, "SettingsUi");
+ qmlRegisterType<ConsoleModel>("harbour.tohkbd2.ConsoleModel", 1, 0, "ConsoleModel");
QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
@@ -38,9 +35,21 @@
QQmlEngine *engine = view->engine();
engine->addImageProvider(QLatin1String("tohkbd2"), new IconProvider);
+ QString viewMode;
+
+ if (argc > 1)
+ viewMode = QString(argv[1]);
+
+ if (!viewMode.startsWith("--"))
+ viewMode = QString();
+
+ view->rootContext()->setContextProperty("viewMode", viewMode);
+
view->setSource(SailfishApp::pathTo("qml/tohkbd2-settingsui.qml"));
view->show();
+ QObject::connect(engine, SIGNAL(quit()), app.data(), SLOT(quit()));
+
return app->exec();
}
|
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/icon-lock-tohkbd2.png
^
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/keymaps.qrc
^
|
@@ -0,0 +1,12 @@
+<RCC>
+ <qresource prefix="/">
+ <file>layouts/fi.tohkbdmap</file>
+ <file>layouts/us.tohkbdmap</file>
+ <file>layouts/de.tohkbdmap</file>
+ <file>layouts/README</file>
+ <file>layouts/ru.tohkbdmap</file>
+ <file>layouts/no.tohkbdmap</file>
+ <file>layouts/pl.tohkbdmap</file>
+ <file>layouts/fr.tohkbdmap</file>
+ </qresource>
+</RCC>
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/layouts/README
^
|
@@ -0,0 +1,63 @@
+TOHKBD2 Keyboard mapping files
+------------------------------
+
+Scancodes: (scandic qwerty keyboard shown)
+
+ +-------------+------+----+----+----+----+----+----+----+----+----+----+----+-----------+
+ | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | Backspace |
+ | A1 | A3 | A4 | A5 | A6 | A7 | A8 | A9 | AA | AB | AC | AD | AE | AF |
+ +------+------+------+----+----+----+----+----+----+----+----+----+----+----+-----------+
+ | Del | Up | Ins | q | w | e | r | t | y | u | i | o | p | å | Ctrl |
+ | B1 | B2 | B3 | B4 | B5 | B6 | B7 | B8 | B9 | BA | BB | BC | BD | BE | |
+ +------+------+------+----+----+----+----+----+----+----+----+----+----+----+-----------+
+ | Left | | Right| a | s | d | f | g | h | j | k | l | ö | ä | Alt |
+ | C1 | | C3 | C4 | C5 | C6 | C7 | C8 | C9 | CA | CB | CC | CD | CE | |
+ +------+------+------+----+----+----+----+----+----+----+----+----+----+----+-----------+
+ | Home | Down | End | z | x | c | v | b | n | m | ? | ! | , | . | |
+ | D1 | D2 | D3 | D4 | D5 | D6 | D7 | D8 | D9 | DA | DB | DC | DD | DE | |
+ +------+------+------+----+----+----+----+----+----+----+----+----+----+----+ Return |
+ | Sym | Ctrl | Shift | Space | Shift | @ | Sym | EF |
+ | | | | E9 | | EC | | |
+ +-------------+------+---------+-------------------+---------+----+---------+-----------+
+
+Ctrl, Alt, Shift or Sym keys can not be remapped.
+
+Mapping file format is one scancode for each row, followed by key names and modifiers
+for plain key and key with Sym pressed separated with space(s):
+
+Scancode PlainKeyName PlainKeyModifier SymKeyname SymKeyModifier
+C6 KEY_D 0 KEY_3 RALT
+
+Supported KeyNames are first 127 keys defined in linux/input.h:
+
+KEY_ESC, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9,
+KEY_0, KEY_MINUS, KEY_EQUAL, KEY_BACKSPACE, KEY_TAB, KEY_Q, KEY_W, KEY_E, KEY_R, KEY_T,
+KEY_Y, KEY_U, KEY_I, KEY_O, KEY_P, KEY_LEFTBRACE, KEY_RIGHTBRACE, KEY_ENTER, KEY_LEFTCTRL,
+KEY_A, KEY_S, KEY_D, KEY_F, KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, KEY_SEMICOLON, KEY_APOSTROPHE,
+KEY_GRAVE, KEY_LEFTSHIFT, KEY_BACKSLASH, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M,
+KEY_COMMA, KEY_DOT, KEY_SLASH, KEY_RIGHTSHIFT, KEY_KPASTERISK, KEY_LEFTALT, KEY_SPACE, KEY_CAPSLOCK,
+KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_NUMLOCK,
+KEY_SCROLLLOCK, KEY_KP7, KEY_KP8, KEY_KP9, KEY_KPMINUS, KEY_KP4, KEY_KP5, KEY_KP6, KEY_KPPLUS,
+KEY_KP1, KEY_KP2, KEY_KP3, KEY_KP0, KEY_KPDOT, KEY_ZENKAKUHANKAKU, KEY_102ND, KEY_F11, KEY_F12,
+KEY_RO, KEY_KATAKANA, KEY_HIRAGANA, KEY_HENKAN, KEY_KATAKANAHIRAGANA, KEY_MUHENKAN, KEY_KPJPCOMMA,
+KEY_KPENTER, KEY_RIGHTCTRL, KEY_KPSLASH, KEY_SYSRQ, KEY_RIGHTALT, KEY_LINEFEED, KEY_HOME, KEY_UP,
+KEY_PAGEUP, KEY_LEFT, KEY_RIGHT, KEY_END, KEY_DOWN, KEY_PAGEDOWN, KEY_INSERT, KEY_DELETE, KEY_MACRO,
+KEY_MUTE, KEY_VOLUMEDOWN, KEY_VOLUMEUP, KEY_POWER, KEY_KPEQUAL, KEY_KPPLUSMINUS, KEY_PAUSE, KEY_SCALE,
+KEY_KPCOMMA, KEY_HANGEUL, KEY_HANJA, KEY_YEN, KEY_LEFTMETA, KEY_RIGHTMETA, KEY_COMPOSE
+
+And a few custom keys:
+
+KEY_TOH_SCREENSHOT, KEY_TOH_SELFIE, KEY_TOH_NEWEMAIL, KEY_TOH_BACKLIGHT
+
+For non-mapped key, use KEY_TOH_NONE
+
+Supported modifiers:
+
+0 No modifier
+SHIFT Shift
+RALT Right Alt or AltGr
+LALT Left Alt
+CTRL Ctrl
+
+If a combination is needed, just write them together, or separate them with a | e.g. RALT|SHIFT (not with space)
+
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/layouts/de.tohkbdmap
^
|
@@ -0,0 +1,65 @@
+# TOHKBD2 Key mapping file
+# Deutch QWERTZ (de)
+#
+variant nodeadkeys
+#
+#Code Plain key Plain mod Sym key Sym mod
+#
+A1 KEY_TAB 0 KEY_ESC 0
+A3 KEY_1 0 KEY_F1 0
+A4 KEY_2 0 KEY_F2 0
+A5 KEY_3 0 KEY_F3 0
+A6 KEY_4 0 KEY_F4 0
+A7 KEY_5 0 KEY_F5 0
+A8 KEY_6 0 KEY_F6 0
+A9 KEY_7 0 KEY_F7 0
+AA KEY_8 0 KEY_F8 0
+AB KEY_9 0 KEY_F9 0
+AC KEY_0 0 KEY_F10 0
+AD KEY_SLASH 0 KEY_F11 0
+AE KEY_0 SHIFT KEY_F12 0
+AF KEY_BACKSPACE 0 KEY_BACKSPACE 0
+B1 KEY_DELETE 0 KEY_TOH_SELFIE 0
+B2 KEY_UP 0 KEY_PAGEUP 0
+B3 KEY_INSERT 0 KEY_TOH_SCREENSHOT 0
+B4 KEY_Q 0 KEY_RIGHTBRACE RALT
+B5 KEY_W 0 KEY_BACKSLASH 0
+B6 KEY_E 0 KEY_4 SHIFT
+B7 KEY_R 0 KEY_5 SHIFT
+B8 KEY_T 0 KEY_GRAVE 0
+B9 KEY_Y 0 KEY_6 SHIFT
+BA KEY_U 0 KEY_RIGHTBRACE SHIFT
+BB KEY_I 0 KEY_7 RALT
+BC KEY_O 0 KEY_0 RALT
+BD KEY_P 0 KEY_SLASH SHIFT
+BE KEY_LEFTBRACE 0 KEY_RIGHTBRACE 0
+C1 KEY_LEFT 0 KEY_VOLUMEDOWN 0
+C3 KEY_RIGHT 0 KEY_VOLUMEUP 0
+C4 KEY_A 0 KEY_COMMA SHIFT
+C5 KEY_S 0 KEY_BACKSLASH SHIFT
+C6 KEY_D 0 KEY_3 RALT
+C7 KEY_F 0 KEY_EQUAL SHIFT
+C8 KEY_G 0 KEY_EQUAL 0
+C9 KEY_H 0 KEY_TOH_NONE 0
+CA KEY_J 0 KEY_TOH_NONE 0
+CB KEY_K 0 KEY_8 RALT
+CC KEY_L 0 KEY_9 RALT
+CD KEY_SEMICOLON 0 KEY_8 SHIFT
+CE KEY_APOSTROPHE 0 KEY_9 SHIFT
+D1 KEY_HOME 0 KEY_TOH_BACKLIGHT 0
+D2 KEY_DOWN 0 KEY_PAGEDOWN 0
+D3 KEY_END 0 KEY_END 0
+D4 KEY_Z 0 KEY_DOT SHIFT
+D5 KEY_X 0 KEY_2 SHIFT
+D6 KEY_C 0 KEY_E RALT
+D7 KEY_V 0 KEY_7 SHIFT
+D8 KEY_B 0 KEY_102ND RALT
+D9 KEY_N 0 KEY_MINUS RALT
+DA KEY_M 0 KEY_M RALT
+DB KEY_MINUS SHIFT KEY_MINUS SHIFT
+DC KEY_1 SHIFT KEY_1 SHIFT
+DD KEY_COMMA 0 KEY_102ND 0
+DE KEY_DOT 0 KEY_102ND SHIFT
+EC KEY_MINUS 0 KEY_Q RALT
+EF KEY_ENTER 0 KEY_ENTER 0
+E9 KEY_SPACE 0 KEY_SPACE 0
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/layouts/fi.tohkbdmap
^
|
@@ -0,0 +1,65 @@
+# TOHKBD2 Key mapping file
+# Finnish (fi)
+#
+variant nodeadkeys
+#
+#Code Plain key Plain mod Sym key Sym mod
+#
+A1 KEY_TAB 0 KEY_ESC 0
+A3 KEY_1 0 KEY_F1 0
+A4 KEY_2 0 KEY_F2 0
+A5 KEY_3 0 KEY_F3 0
+A6 KEY_4 0 KEY_F4 0
+A7 KEY_5 0 KEY_F5 0
+A8 KEY_6 0 KEY_F6 0
+A9 KEY_7 0 KEY_F7 0
+AA KEY_8 0 KEY_F8 0
+AB KEY_9 0 KEY_F9 0
+AC KEY_0 0 KEY_F10 0
+AD KEY_SLASH 0 KEY_F11 0
+AE KEY_0 SHIFT KEY_F12 0
+AF KEY_BACKSPACE 0 KEY_BACKSPACE 0
+B1 KEY_DELETE 0 KEY_TOH_SELFIE 0
+B2 KEY_UP 0 KEY_PAGEUP 0
+B3 KEY_INSERT 0 KEY_TOH_SCREENSHOT 0
+B4 KEY_Q 0 KEY_RIGHTBRACE RALT
+B5 KEY_W 0 KEY_3 SHIFT
+B6 KEY_E 0 KEY_4 RALT
+B7 KEY_R 0 KEY_5 SHIFT
+B8 KEY_T 0 KEY_RIGHTBRACE SHIFT
+B9 KEY_Y 0 KEY_6 SHIFT
+BA KEY_U 0 KEY_BACKSLASH SHIFT
+BB KEY_I 0 KEY_7 RALT
+BC KEY_O 0 KEY_0 RALT
+BD KEY_P 0 KEY_SLASH SHIFT
+BE KEY_LEFTBRACE 0 KEY_MINUS 0
+C1 KEY_LEFT 0 KEY_VOLUMEDOWN 0
+C3 KEY_RIGHT 0 KEY_VOLUMEUP 0
+C4 KEY_A 0 KEY_COMMA SHIFT
+C5 KEY_S 0 KEY_BACKSLASH 0
+C6 KEY_D 0 KEY_3 RALT
+C7 KEY_F 0 KEY_EQUAL SHIFT
+C8 KEY_G 0 KEY_EQUAL 0
+C9 KEY_H 0 KEY_H 0
+CA KEY_J 0 KEY_J 0
+CB KEY_K 0 KEY_8 RALT
+CC KEY_L 0 KEY_9 RALT
+CD KEY_SEMICOLON 0 KEY_8 SHIFT
+CE KEY_APOSTROPHE 0 KEY_9 SHIFT
+D1 KEY_HOME 0 KEY_TOH_BACKLIGHT 0
+D2 KEY_DOWN 0 KEY_PAGEDOWN 0
+D3 KEY_END 0 KEY_END 0
+D4 KEY_Z 0 KEY_DOT SHIFT
+D5 KEY_X 0 KEY_2 SHIFT
+D6 KEY_C 0 KEY_E RALT
+D7 KEY_V 0 KEY_7 SHIFT
+D8 KEY_B 0 KEY_102ND RALT
+D9 KEY_N 0 KEY_MINUS RALT
+DA KEY_M 0 KEY_M RALT
+DB KEY_MINUS SHIFT KEY_MINUS SHIFT
+DC KEY_1 SHIFT KEY_1 SHIFT
+DD KEY_COMMA 0 KEY_102ND 0
+DE KEY_DOT 0 KEY_102ND SHIFT
+EC KEY_2 RALT KEY_TOH_NEWEMAIL 0
+EF KEY_ENTER 0 KEY_ENTER 0
+E9 KEY_SPACE 0 KEY_SPACE 0
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/layouts/fr.tohkbdmap
^
|
@@ -0,0 +1,65 @@
+# TOHKBD2 Key mapping file
+# French AZERTY (fr)
+#
+variant nodeadkeys
+#
+#Code Plain key Plain mod Sym key Sym mod
+#
+A1 KEY_TAB 0 KEY_ESC 0
+A3 KEY_1 SHIFT KEY_F1 0
+A4 KEY_2 SHIFT KEY_F2 0
+A5 KEY_3 SHIFT KEY_F3 0
+A6 KEY_4 SHIFT KEY_F4 0
+A7 KEY_5 SHIFT KEY_F5 0
+A8 KEY_6 SHIFT KEY_F6 0
+A9 KEY_7 SHIFT KEY_F7 0
+AA KEY_8 SHIFT KEY_F8 0
+AB KEY_9 SHIFT KEY_F9 0
+AC KEY_0 SHIFT KEY_F10 0
+AD KEY_6 0 KEY_F11 0
+AE KEY_EQUAL 0 KEY_F12 0
+AF KEY_BACKSPACE 0 KEY_BACKSPACE 0
+B1 KEY_DELETE 0 KEY_TOH_SELFIE 0
+B2 KEY_UP 0 KEY_PAGEUP 0
+B3 KEY_INSERT 0 KEY_TOH_SCREENSHOT 0
+B4 KEY_Q 0 KEY_2 RALT
+B5 KEY_W 0 KEY_3 RALT
+B6 KEY_E 0 KEY_RIGHTBRACE 0
+B7 KEY_R 0 KEY_APOSTROPHE SHIFT
+B8 KEY_T 0 KEY_0 RALT
+B9 KEY_Y 0 KEY_1 0
+BA KEY_U 0 KEY_BACKSLASH 0
+BB KEY_I 0 KEY_4 RALT
+BC KEY_O 0 KEY_EQUAL RALT
+BD KEY_P 0 KEY_8 0
+BE KEY_7 0 KEY_EQUAL SHIFT
+C1 KEY_LEFT 0 KEY_VOLUMEDOWN 0
+C3 KEY_RIGHT 0 KEY_VOLUMEUP 0
+C4 KEY_A 0 KEY_COMMA 0
+C5 KEY_S 0 KEY_4 0
+C6 KEY_D 0 KEY_D 0
+C7 KEY_F 0 KEY_7 RALT
+C8 KEY_G 0 KEY_G 0
+C9 KEY_H 0 KEY_H 0
+CA KEY_J 0 KEY_J 0
+CB KEY_K 0 KEY_5 RALT
+CC KEY_L 0 KEY_MINUS RALT
+CD KEY_SEMICOLON 0 KEY_5 0
+CE KEY_2 0 KEY_MINUS 0
+D1 KEY_HOME 0 KEY_TOH_BACKLIGHT 0
+D2 KEY_DOWN 0 KEY_PAGEDOWN 0
+D3 KEY_END 0 KEY_END 0
+D4 KEY_Z 0 KEY_DOT 0
+D5 KEY_X 0 KEY_3 0
+D6 KEY_C 0 KEY_E RALT
+D7 KEY_V 0 KEY_DOT SHIFT
+D8 KEY_B 0 KEY_6 RALT
+D9 KEY_N 0 KEY_8 RALT
+DA KEY_9 0 KEY_BACKSLASH SHIFT
+DB KEY_0 0 KEY_M SHIFT
+DC KEY_APOSTROPHE 0 KEY_SLASH 0
+DD KEY_M 0 KEY_102ND 0
+DE KEY_COMMA SHIFT KEY_102ND SHIFT
+EC KEY_LEFTBRACE 0 KEY_LEFTBRACE SHIFT
+EF KEY_ENTER 0 KEY_ENTER 0
+E9 KEY_SPACE 0 KEY_SPACE 0
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/layouts/no.tohkbdmap
^
|
@@ -0,0 +1,65 @@
+# TOHKBD2 Key mapping file
+# Norsk (no)
+#
+variant nodeadkeys
+#
+#Code Plain key Plain mod Sym key Sym mod
+#
+A1 KEY_TAB 0 KEY_ESC 0
+A3 KEY_1 0 KEY_F1 0
+A4 KEY_2 0 KEY_F2 0
+A5 KEY_3 0 KEY_F3 0
+A6 KEY_4 0 KEY_F4 0
+A7 KEY_5 0 KEY_F5 0
+A8 KEY_6 0 KEY_F6 0
+A9 KEY_7 0 KEY_F7 0
+AA KEY_8 0 KEY_F8 0
+AB KEY_9 0 KEY_F9 0
+AC KEY_0 0 KEY_F10 0
+AD KEY_SLASH 0 KEY_F11 0
+AE KEY_0 SHIFT KEY_F12 0
+AF KEY_BACKSPACE 0 KEY_BACKSPACE 0
+B1 KEY_DELETE 0 KEY_TOH_SELFIE 0
+B2 KEY_UP 0 KEY_PAGEUP 0
+B3 KEY_INSERT 0 KEY_TOH_SCREENSHOT 0
+B4 KEY_Q 0 KEY_RIGHTBRACE RALT
+B5 KEY_W 0 KEY_3 SHIFT
+B6 KEY_E 0 KEY_4 RALT
+B7 KEY_R 0 KEY_5 SHIFT
+B8 KEY_T 0 KEY_RIGHTBRACE SHIFT
+B9 KEY_Y 0 KEY_6 SHIFT
+BA KEY_U 0 KEY_BACKSLASH SHIFT
+BB KEY_I 0 KEY_7 RALT
+BC KEY_O 0 KEY_0 RALT
+BD KEY_P 0 KEY_SLASH SHIFT
+BE KEY_LEFTBRACE 0 KEY_MINUS 0
+C1 KEY_LEFT 0 KEY_VOLUMEDOWN 0
+C3 KEY_RIGHT 0 KEY_VOLUMEUP 0
+C4 KEY_A 0 KEY_COMMA SHIFT
+C5 KEY_S 0 KEY_BACKSLASH 0
+C6 KEY_D 0 KEY_3 RALT
+C7 KEY_F 0 KEY_EQUAL SHIFT
+C8 KEY_G 0 KEY_EQUAL RALT
+C9 KEY_H 0 KEY_H 0
+CA KEY_J 0 KEY_J 0
+CB KEY_K 0 KEY_8 RALT
+CC KEY_L 0 KEY_9 RALT
+CD KEY_SEMICOLON 0 KEY_8 SHIFT
+CE KEY_APOSTROPHE 0 KEY_9 SHIFT
+D1 KEY_HOME 0 KEY_TOH_BACKLIGHT 0
+D2 KEY_DOWN 0 KEY_PAGEDOWN 0
+D3 KEY_END 0 KEY_END 0
+D4 KEY_Z 0 KEY_DOT SHIFT
+D5 KEY_X 0 KEY_2 SHIFT
+D6 KEY_C 0 KEY_E RALT
+D7 KEY_V 0 KEY_7 SHIFT
+D8 KEY_B 0 KEY_GRAVE 0
+D9 KEY_N 0 KEY_EQUAL 0
+DA KEY_M 0 KEY_M RALT
+DB KEY_MINUS SHIFT KEY_MINUS SHIFT
+DC KEY_1 SHIFT KEY_1 SHIFT
+DD KEY_COMMA 0 KEY_102ND 0
+DE KEY_DOT 0 KEY_102ND SHIFT
+EC KEY_2 RALT KEY_TOH_NEWEMAIL 0
+EF KEY_ENTER 0 KEY_ENTER 0
+E9 KEY_SPACE 0 KEY_SPACE 0
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/layouts/pl.tohkbdmap
^
|
@@ -0,0 +1,82 @@
+# TOHKBD2 Key mapping file
+# Polish (pl)
+#
+# TL;DR - polish programmers + most symbols as drawn. You'll find the curly brackets as
+# sym+h and sym+j, square brackets as symbols between L and Alt (old round brackets)
+#
+# The layout is based on the US layout (as the PL programmers keyboard is)
+# All the local characters are symbol+character, like sym+a gives ą etc.
+# Shift+symbol+character gives respective capital letter, like shift+sym+a gives Ą.
+# For this to happen, though, the pre-carved symbol characters needed to be moved.
+# Where possible, I tried to put them where they sit on a US keyboard, but the keys
+# left of the Ctrl key. There's too few of them (1), unlike 3 as you get on a full
+# keyboard. I used the only key as the backslash/pipe sign. The square brackets
+# are placed as the hw hor intended, on sym+k and sym+l, so these are still available,
+# but I needed to move the curly brackets as the right curly bracket (sym+o ) is now ó.
+# As there was no character drawn as sym+h and sym+j, I used them for the curly brackets.
+# I replaced the round brackets with square brackets - round brackets are normally as
+# shift+9 and shift+0, so no need to have them there.
+# The other lost symbols are like on a US keyboard - $ is shift+4, ; is just next to l,
+# apostrophe follows ;.
+variant nodeadkeys
+#
+#Code Plain key Plain mod Sym key Sym mod
+#
+A1 KEY_TAB 0 KEY_ESC 0
+A3 KEY_1 0 KEY_F1 0
+A4 KEY_2 0 KEY_F2 0
+A5 KEY_3 0 KEY_F3 0
+A6 KEY_4 0 KEY_F4 0
+A7 KEY_5 0 KEY_F5 0
+A8 KEY_6 0 KEY_F6 0
+A9 KEY_7 0 KEY_F7 0
+AA KEY_8 0 KEY_F8 0
+AB KEY_9 0 KEY_F9 0
+AC KEY_0 0 KEY_F10 0
+AD KEY_MINUS 0 KEY_F11 0
+AE KEY_EQUAL 0 KEY_F12 0
+AF KEY_BACKSPACE 0 KEY_BACKSPACE 0
+B1 KEY_DELETE 0 KEY_TOH_SELFIE 0
+B2 KEY_UP 0 KEY_PAGEUP 0
+B3 KEY_INSERT 0 KEY_TOH_SCREENSHOT 0
+B4 KEY_Q 0 KEY_GRAVE SHIFT
+B5 KEY_W 0 KEY_3 SHIFT
+B6 KEY_E 0 KEY_E RALT
+B7 KEY_R 0 KEY_5 SHIFT
+B8 KEY_T 0 KEY_6 SHIFT
+B9 KEY_Y 0 KEY_7 SHIFT
+BA KEY_U 0 KEY_8 SHIFT
+BB KEY_I 0 KEY_LEFTBRACE SHIFT
+BC KEY_O 0 KEY_O RALT
+BD KEY_P 0 KEY_MINUS SHIFT
+BE KEY_BACKSLASH 0 KEY_BACKSLASH SHIFT
+C1 KEY_LEFT 0 KEY_VOLUMEDOWN 0
+C3 KEY_RIGHT 0 KEY_VOLUMEUP 0
+C4 KEY_A 0 KEY_A RALT
+C5 KEY_S 0 KEY_S RALT
+C6 KEY_D 0 KEY_D 0
+C7 KEY_F 0 KEY_GRAVE 0
+C8 KEY_G 0 KEY_G 0
+C9 KEY_H 0 KEY_LEFTBRACE SHIFT
+CA KEY_J 0 KEY_RIGHTBRACE SHIFT
+CB KEY_K 0 KEY_LEFTBRACE 0
+CC KEY_L 0 KEY_L RALT
+CD KEY_SEMICOLON 0 KEY_LEFTBRACE 0
+CE KEY_APOSTROPHE 0 KEY_RIGHTBRACE 0
+D1 KEY_HOME 0 KEY_TOH_BACKLIGHT 0
+D2 KEY_DOWN 0 KEY_PAGEDOWN 0
+D3 KEY_END 0 KEY_END 0
+D4 KEY_Z 0 KEY_Z RALT
+D5 KEY_X 0 KEY_X RALT
+D6 KEY_C 0 KEY_C RALT
+D7 KEY_V 0 KEY_SLASH 0
+D8 KEY_B 0 KEY_BACKSLASH SHIFT
+D9 KEY_N 0 KEY_N RALT
+DA KEY_M 0 KEY_M 0
+DB KEY_SLASH 0 KEY_SLASH SHIFT
+DC KEY_1 SHIFT KEY_1 SHIFT
+DD KEY_COMMA 0 KEY_102ND 0
+DE KEY_DOT 0 KEY_102ND SHIFT
+EC KEY_2 SHIFT KEY_TOH_NEWEMAIL 0
+EF KEY_ENTER 0 KEY_ENTER 0
+E9 KEY_SPACE 0 KEY_SPACE 0
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/layouts/ru.tohkbdmap
^
|
@@ -0,0 +1,68 @@
+# TOHKBD2 Key mapping file
+# Russian (ru)
+#
+variant none
+#
+# Alternative layout can be toggled with Sym-Alt
+alternative us
+#
+#Code Plain key Plain mod Sym key Sym mod
+#
+A1 KEY_TAB 0 KEY_ESC 0
+A3 KEY_1 0 KEY_F1 0
+A4 KEY_2 0 KEY_F2 0
+A5 KEY_3 0 KEY_F3 0
+A6 KEY_4 0 KEY_F4 0
+A7 KEY_5 0 KEY_F5 0
+A8 KEY_6 0 KEY_F6 0
+A9 KEY_7 0 KEY_F7 0
+AA KEY_8 0 KEY_F8 0
+AB KEY_9 0 KEY_F9 0
+AC KEY_0 0 KEY_F10 0
+AD KEY_MINUS 0 KEY_F11 0
+AE KEY_EQUAL 0 KEY_F12 0
+AF KEY_BACKSPACE 0 KEY_BACKSPACE 0
+B1 KEY_DELETE 0 KEY_TOH_SELFIE 0
+B2 KEY_UP 0 KEY_PAGEUP 0
+B3 KEY_INSERT 0 KEY_TOH_SCREENSHOT 0
+B4 KEY_Q 0 KEY_GRAVE SHIFT
+B5 KEY_W 0 KEY_3 SHIFT
+B6 KEY_E 0 KEY_4 SHIFT
+B7 KEY_R 0 KEY_5 SHIFT
+B8 KEY_T 0 KEY_6 SHIFT
+B9 KEY_Y 0 KEY_7 SHIFT
+BA KEY_U 0 KEY_8 SHIFT
+BB KEY_I 0 KEY_LEFTBRACE SHIFT
+BC KEY_O 0 KEY_RIGHTBRACE SHIFT
+BD KEY_P 0 KEY_MINUS SHIFT
+BE KEY_LEFTBRACE 0 KEY_EQUAL SHIFT
+C1 KEY_LEFT 0 KEY_VOLUMEDOWN 0
+C3 KEY_RIGHT 0 KEY_VOLUMEUP 0
+C4 KEY_A 0 KEY_SEMICOLON 0
+C5 KEY_S 0 KEY_APOSTROPHE 0
+C6 KEY_D 0 KEY_D 0
+C7 KEY_F 0 KEY_GRAVE 0
+C8 KEY_G 0 KEY_G 0
+C9 KEY_H 0 KEY_H 0
+CA KEY_J 0 KEY_J 0
+CB KEY_K 0 KEY_LEFTBRACE 0
+CC KEY_L 0 KEY_RIGHTBRACE 0
+CD KEY_SEMICOLON 0 KEY_9 SHIFT
+CE KEY_APOSTROPHE 0 KEY_0 SHIFT
+D1 KEY_HOME 0 KEY_TOH_BACKLIGHT 0
+D2 KEY_DOWN 0 KEY_PAGEDOWN 0
+D3 KEY_END 0 KEY_END 0
+D4 KEY_Z 0 KEY_SEMICOLON SHIFT
+D5 KEY_X 0 KEY_APOSTROPHE SHIFT
+D6 KEY_C 0 KEY_C 0
+D7 KEY_V 0 KEY_SLASH 0
+D8 KEY_B 0 KEY_BACKSLASH SHIFT
+D9 KEY_N 0 KEY_BACKSLASH 0
+DA KEY_M 0 KEY_M 0
+DB KEY_COMMA 0 KEY_102ND 0
+DC KEY_DOT 0 KEY_102ND SHIFT
+DD KEY_SLASH SHIFT KEY_SLASH SHIFT
+DE KEY_SLASH 0 KEY_1 SHIFT
+EC KEY_2 SHIFT KEY_TOH_NEWEMAIL 0
+EF KEY_ENTER 0 KEY_ENTER 0
+E9 KEY_SPACE 0 KEY_SPACE 0
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/layouts/us.tohkbdmap
^
|
@@ -0,0 +1,65 @@
+# TOHKBD2 Key mapping file
+# English (us)
+#
+variant none
+#
+#Code Plain key Plain mod Sym key Sym mod
+#
+A1 KEY_TAB 0 KEY_ESC 0
+A3 KEY_1 0 KEY_F1 0
+A4 KEY_2 0 KEY_F2 0
+A5 KEY_3 0 KEY_F3 0
+A6 KEY_4 0 KEY_F4 0
+A7 KEY_5 0 KEY_F5 0
+A8 KEY_6 0 KEY_F6 0
+A9 KEY_7 0 KEY_F7 0
+AA KEY_8 0 KEY_F8 0
+AB KEY_9 0 KEY_F9 0
+AC KEY_0 0 KEY_F10 0
+AD KEY_MINUS 0 KEY_F11 0
+AE KEY_EQUAL 0 KEY_F12 0
+AF KEY_BACKSPACE 0 KEY_BACKSPACE 0
+B1 KEY_DELETE 0 KEY_TOH_SELFIE 0
+B2 KEY_UP 0 KEY_PAGEUP 0
+B3 KEY_INSERT 0 KEY_TOH_SCREENSHOT 0
+B4 KEY_Q 0 KEY_GRAVE SHIFT
+B5 KEY_W 0 KEY_3 SHIFT
+B6 KEY_E 0 KEY_4 SHIFT
+B7 KEY_R 0 KEY_5 SHIFT
+B8 KEY_T 0 KEY_6 SHIFT
+B9 KEY_Y 0 KEY_7 SHIFT
+BA KEY_U 0 KEY_8 SHIFT
+BB KEY_I 0 KEY_LEFTBRACE SHIFT
+BC KEY_O 0 KEY_RIGHTBRACE SHIFT
+BD KEY_P 0 KEY_MINUS SHIFT
+BE KEY_LEFTBRACE 0 KEY_EQUAL SHIFT
+C1 KEY_LEFT 0 KEY_VOLUMEDOWN 0
+C3 KEY_RIGHT 0 KEY_VOLUMEUP 0
+C4 KEY_A 0 KEY_SEMICOLON 0
+C5 KEY_S 0 KEY_APOSTROPHE 0
+C6 KEY_D 0 KEY_D 0
+C7 KEY_F 0 KEY_GRAVE 0
+C8 KEY_G 0 KEY_G 0
+C9 KEY_H 0 KEY_H 0
+CA KEY_J 0 KEY_J 0
+CB KEY_K 0 KEY_LEFTBRACE 0
+CC KEY_L 0 KEY_RIGHTBRACE 0
+CD KEY_SEMICOLON 0 KEY_9 SHIFT
+CE KEY_APOSTROPHE 0 KEY_0 SHIFT
+D1 KEY_HOME 0 KEY_TOH_BACKLIGHT 0
+D2 KEY_DOWN 0 KEY_PAGEDOWN 0
+D3 KEY_END 0 KEY_END 0
+D4 KEY_Z 0 KEY_SEMICOLON SHIFT
+D5 KEY_X 0 KEY_APOSTROPHE SHIFT
+D6 KEY_C 0 KEY_C 0
+D7 KEY_V 0 KEY_SLASH 0
+D8 KEY_B 0 KEY_BACKSLASH SHIFT
+D9 KEY_N 0 KEY_BACKSLASH 0
+DA KEY_M 0 KEY_M 0
+DB KEY_SLASH SHIFT KEY_SLASH SHIFT
+DC KEY_1 SHIFT KEY_1 SHIFT
+DD KEY_COMMA 0 KEY_102ND 0
+DE KEY_DOT 0 KEY_102ND SHIFT
+EC KEY_2 SHIFT KEY_TOH_NEWEMAIL 0
+EF KEY_ENTER 0 KEY_ENTER 0
+E9 KEY_SPACE 0 KEY_SPACE 0
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/x-harbour.tohkbd2.conf
^
|
@@ -0,0 +1,3 @@
+x-nemo-icon=/usr/share/harbour-tohkbd2-user/icon-system-keyboard.png
+urgency=0
+transient=true
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/config/x-harbour.tohkbd2.screenshot.conf
^
|
@@ -0,0 +1,4 @@
+appIcon=/usr/share/harbour-tohkbd2-user/icon-lock-tohkbd2.png
+x-nemo-icon=/usr/share/harbour-tohkbd2-user/icon-lock-tohkbd2.png
+x-nemo-preview-/usr/share/harbour-tohkbd2-user/icon-lock-tohkbd2.png
+x-nemo-priority=60
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/harbour-tohkbd2-user.desktop
^
|
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+NoDisplay=true
+Name=TOHKBD2 User Daemon
+Icon=icon-launcher-dummy
+Exec=/usr/bin/harbour-tohkbd2-user
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/ca.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>S'està reiniciant Lipstick</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation>El teclat físic seleccionat no està suportat per TOHKBD2, o bé manca el fitxer de configuració o és invàlid.</translation>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/cs_CZ.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Restartování Lipstick</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation type="unfinished"/>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/da.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Genstarter Lipstick</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation type="unfinished"/>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/de.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Starte Lipstick neu</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation>Das ausgewählte physikalische Tastaturlayout wird von TOHKBD2 nicht unterstützt. Die Konfigurationsdatei könnte auch fehlen oder fehlerhaft sein.</translation>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/engineering_en.ts
^
|
@@ -33,5 +33,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/es.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Reiniciando Lipstick</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation type="unfinished"/>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/fi.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Lipstick käynnistyy uudelleen</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation>TOHKBD2 ei tue valittua näppäimistöasettelua, tai määritystiedosto saattaa sisältää virheitä.</translation>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/fr.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Redémarrage de Lipstick</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation type="unfinished"/>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/it.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Rilancio di Lipstick</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation type="unfinished"/>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/ja.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Lipstickを再起動しています</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation type="unfinished"/>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Added |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/nb.ts
^
|
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.1">
+<context>
+ <name/>
+ <message id="screenshot-saved">
+ <source>Screenshot saved</source>
+ <extracomment>Notification shown after screenshot is taken</extracomment>
+ <translation>Skjermbilde lagret</translation>
+ </message>
+ <message id="keyb-connected">
+ <source>Keyboard connected</source>
+ <extracomment>Notification shown when keyboard is connected</extracomment>
+ <translation>Tastatur tilkoblet</translation>
+ </message>
+ <message id="keyb-removed">
+ <source>Keyboard removed</source>
+ <extracomment>Notification shown when keyboard is removed</extracomment>
+ <translation>Tastatur frakoblet</translation>
+ </message>
+ <message id="starting-app">
+ <source>Starting %1...</source>
+ <extracomment>Notification shown when application is started by pressing shortcut key</extracomment>
+ <translation>Starter %1...</translation>
+ </message>
+ <message id="reboot-remorse">
+ <source>Rebooting</source>
+ <extracomment>Remorse timer text, "Rebooting" in 5 seconds</extracomment>
+ <translation>Starter om</translation>
+ </message>
+ <message id="restart-lipstick-remorse">
+ <source>Restarting Lipstick</source>
+ <extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
+ <translation>Omstart av Lipstick</translation>
+ </message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/nl_NL.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Bezig met het herstarten van Lipstick</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation>De geselecteerde, fysieke indeling wordt niet ondersteund door TOHKBD2. Het kan ook zijn dat het configuratiebestand ongeldig is of ontbreekt.</translation>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/pl.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Restartowanie Lipstick</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation type="unfinished"/>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/ru_RU.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Перезапуск домашнего экрана</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation>Выбранная раскладка клавиатуры не поддерживается TOHKBD2. Или файл конфигурации содержит ошибки. Или его вообще нет. Или еще что-нибудь.</translation>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/i18n/sv.ts
^
|
@@ -31,5 +31,11 @@
<extracomment>Remorse timer text, "Restarting Lipstick" in 5 seconds</extracomment>
<translation>Startar om Lipstick</translation>
</message>
+ <message id="layout-unsupported">
+ <source>The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing.</source>
+ <oldsource>The selected physical layout is not supported by TOHKBD2</oldsource>
+ <extracomment>Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.</extracomment>
+ <translation type="unfinished"/>
+ </message>
</context>
</TS>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/src/screenshot.cpp
^
|
@@ -28,14 +28,15 @@
else
printf("tohkbd2-user: Screenshot failed\n");
+ notif.setAppName("TOHKBD");
//: Notification shown after screenshot is taken
//% "Screenshot saved"
notif.setSummary(qtTrId("screenshot-saved"));
notif.setPreviewSummary(qtTrId("screenshot-saved"));
notif.setBody(ssFilename.split("/").last());
notif.setPreviewBody(ssFilename.split("/").last());
- notif.setHintValue("x-nemo-preview-icon", "icon-l-image");
- notif.setHintValue("x-nemo-icon", "icon-l-image");
+ notif.setCategory("x-harbour.tohkbd2.screenshot");
+ notif.setReplacesId(0);
args.clear();
args.append((QStringList() << ssFilename));
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/src/tohkbd2user.cpp
^
|
@@ -16,11 +16,14 @@
#include <QQmlContext>
#include <QScopedPointer>
#include <QTimer>
+#include <QDir>
+#include <QFile>
+#include <QResource>
#include <sailfishapp.h>
#include "userdaemon.h"
-#include "userAdaptor.h"
+#include "../dbus/src/userdaemonAdaptor.h"
#include "viewhelper.h"
#include "applauncher.h"
#include "screenshot.h"
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/src/userdaemon.cpp
^
|
@@ -10,6 +10,11 @@
{
m_dbusRegistered = false;
m_launchPending = false;
+
+ installKeymaps(false);
+
+ physicalLayout = new MGConfItem("/desktop/lipstick-jolla-home/layout");
+ connect(physicalLayout, SIGNAL(valueChanged()), this, SLOT(handlePhysicalLayout()));
}
UserDaemon::~UserDaemon()
@@ -61,6 +66,22 @@
MGConfItem ci("/sailfish/text_input/active_layout");
ci.set(value);
+
+ QString tohlayout("harbour-tohkbd2.qml");
+ MGConfItem el("/sailfish/text_input/enabled_layouts");
+ QStringList list = el.value().toStringList();
+ if (value.compare(tohlayout) == 0) {
+ if (!list.contains(tohlayout)) {
+ list.append(tohlayout);
+ el.set(list);
+ }
+ }
+ else {
+ if (list.contains(tohlayout)) {
+ list.removeAll(tohlayout);
+ el.set(list);
+ }
+ }
}
else
{
@@ -159,7 +180,7 @@
Notification notif;
notif.setPreviewBody(text);
- notif.setHintValue("x-nemo-preview-icon", SailfishApp::pathTo("/icon-system-keyboard.png").toLocalFile());
+ notif.setCategory("x-harbour.tohkbd2");
notif.publish();
}
@@ -169,3 +190,82 @@
emit _requestActionWithRemorse(action);
}
+
+void UserDaemon::handlePhysicalLayout()
+{
+ emit physicalLayoutChanged(getActivePhysicalLayout());
+}
+
+QString UserDaemon::getActivePhysicalLayout()
+{
+ return physicalLayout->value().toString();
+}
+
+QString UserDaemon::getPathTo(const QString &filename)
+{
+ if (filename == "keymaplocation")
+ {
+ return QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + KEYMAP_FOLDER;
+ }
+
+ return SailfishApp::pathTo(filename).toLocalFile();
+}
+
+void UserDaemon::showUnsupportedLayoutNotification()
+{
+ //: Notification shown when a physical layout is not supported or the config file has an error. Notification text will scroll.
+ //% "The selected physical layout is not supported by TOHKBD2. Config file can also be invalid or missing."
+ showNotification(qtTrId("layout-unsupported"));
+}
+
+void UserDaemon::installKeymaps(const bool &overwrite)
+{
+ QDir keymapfolder(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + KEYMAP_FOLDER);
+ keymapfolder.mkpath(".");
+
+ QDir keymapRes(":/layouts/");
+ QFileInfoList list = keymapRes.entryInfoList();
+
+ int i;
+ for (i=0 ; i < list.size() ; i++)
+ {
+ QString from = list.at(i).absoluteFilePath();
+ QString to = keymapfolder.path() + "/" + from.split("/").last();
+
+ QFileInfo toFile(to);
+
+ if(!toFile.exists() || overwrite)
+ {
+ QFile newToFile(to);
+ QResource res(from);
+
+ if (newToFile.open(QIODevice::WriteOnly) && res.isValid())
+ {
+ qint64 ws;
+ if (res.isCompressed())
+ ws = newToFile.write( qUncompress(res.data(), res.size()));
+ else
+ ws = newToFile.write( (char *)res.data());
+
+ newToFile.close();
+ printf("tohkbd2-user: Wrote %s (%lld bytes) to %s\n", qPrintable(from), ws, qPrintable(to));
+ }
+ else
+ {
+ printf("tohkbd2-user: Failed to write %s\n", qPrintable(to));
+ }
+ }
+ }
+}
+
+void UserDaemon::setKeymapLayout(const QString &value)
+{
+ MGConfItem keymapLayout("/desktop/lipstick-jolla-home/layout");
+ keymapLayout.set(value);
+}
+
+void UserDaemon::setKeymapVariant(const QString &value)
+{
+ MGConfItem keymapVariant("/desktop/lipstick-jolla-home/variant");
+ keymapVariant.set(value);
+}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/src/userdaemon.h
^
|
@@ -8,6 +8,7 @@
#include <mlite5/MDesktopEntry>
#define SERVICE_NAME "com.kimmoli.tohkbd2user"
+#define KEYMAP_FOLDER "/harbour-tohkbd2"
class QDBusInterface;
class UserDaemon : public QObject
@@ -27,6 +28,7 @@
void _lauchApplication(const QString &desktoFilename);
void _requestActionWithRemorse(const QString &action);
void _takeScreenShot();
+ void physicalLayoutChanged(QString layout);
public slots:
QString getActiveLayout();
@@ -41,15 +43,23 @@
void hideTaskSwitcher() { emit _hideTaskSwitcher(); }
void actionWithRemorse(const QString &action);
void takeScreenShot() { emit _takeScreenShot(); }
+ QString getActivePhysicalLayout();
+ QString getPathTo(const QString &filename);
+ void showUnsupportedLayoutNotification();
+ void installKeymaps(const bool &overwrite);
+ void setKeymapLayout(const QString &value);
+ void setKeymapVariant(const QString &value);
void quit();
void launchSuccess(const QString &appName);
void launchFailed();
+ void handlePhysicalLayout();
private:
void showNotification(const QString &text);
bool m_dbusRegistered;
bool m_launchPending;
+ MGConfItem *physicalLayout;
};
#endif // UserDaemon_H
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/user-daemon.pro
^
|
@@ -5,48 +5,53 @@
QT += dbus gui-private
-system(qdbusxml2cpp config/com.kimmoli.tohkbd2user.xml -i src/userdaemon.h -a src/userAdaptor)
-system(qdbusxml2cpp config/com.kimmoli.tohkbd2user.xml -p ../user-daemon/src/userInterface)
-
-#system(lupdate src qml -no-obsolete -ts $$PWD/i18n/engineering_en.ts)
+system(lupdate src qml -no-obsolete -ts $$PWD/i18n/engineering_en.ts)
system(lrelease -idbased $$PWD/i18n/*.ts)
DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\""
-dbusService.files = config/com.kimmoli.tohkbd2user.service
-dbusService.path = /usr/share/dbus-1/services/
-
-dbusInterface.files = config/com.kimmoli.tohkbd2user.xml
-dbusInterface.path = /usr/share/dbus-1/interfaces/
-
translations.path = /usr/share/$${TARGET}/i18n
translations.files = i18n/*.qm
icons.path = /usr/share/$${TARGET}
-icons.files = config/icon-system-keyboard.png
+icons.files = config/icon-system-keyboard.png \
+ config/icon-lock-tohkbd2.png
+
+notificationCategories.path = /usr/share/lipstick/notificationcategories
+notificationCategories.files = config/x-harbour.tohkbd2.conf \
+ config/x-harbour.tohkbd2.screenshot.conf
-INSTALLS += dbusService dbusInterface translations icons
+INSTALLS += translations icons notificationCategories
message($${DEFINES})
SOURCES += \
src/tohkbd2user.cpp \
- src/userAdaptor.cpp \
+ ../dbus/src/userdaemonAdaptor.cpp \
src/userdaemon.cpp \
src/viewhelper.cpp \
src/applauncher.cpp \
src/screenshot.cpp
-OTHER_FILES += \
- config/com.kimmoli.tohkbd2user.service \
- config/com.kimmoli.tohkbd2user.xml \
- config/icon-system-keyboard.png \
- i18n/*.ts \
- qml/taskswitcher.qml
-
HEADERS += \
- src/userAdaptor.h \
+ ../dbus/src/userdaemonAdaptor.h \
src/userdaemon.h \
src/viewhelper.h \
src/applauncher.h \
src/screenshot.h
+
+RESOURCES += \
+ config/keymaps.qrc
+
+OTHER_FILES += \
+ harbour-tohkbd2-user.desktop \
+ config/icon-system-keyboard.png \
+ config/icon-lock-tohkbd2.png \
+ config/x-harbour.tohkbd2.conf \
+ config/x-harbour.tohkbd2.screenshot.conf \
+ i18n/*.ts \
+ qml/taskswitcher.qml \
+ config/layouts/*.tohkbdmap \
+ config/x-harbour.tohkbd2.conf \
+ config/x-harbour.tohkbd2.screenshot.conf
+
|