|
[-]
[+]
|
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">9f6dd1593d6cfe5826f01866c288db15f35ad550</param>
+ <param name="revision">307a52168dfe08eb3ea303ac832f2828d43daab8</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.9.tar.bz2/daemon/src/tohkeyboard.cpp
^
|
| @@ -289,6 +289,7 @@
bool Tohkbd::checkKeypadPresence()
{
bool __prev_keypadPresence = keypadIsPresent;
+
if (!vddEnabled)
{
/* keyboard is being connected to base */
@@ -440,17 +441,13 @@
/* Process report only if it has correct length of 11 */
if (r.at(0) == 0x0b && r.at(1) == 0x00)
- keymap->process(r);
-
- /* Check if interrupt line is still down, there is another report for us then */
- if (readOneLineFromFile("/sys/class/gpio/gpio" GPIO_INT "/value") == "0")
{
- printf("Interrupt is still low. Reread report.\n");
- retries--;
+ keymap->process(r);
+ retries = -1;
}
else
{
- retries = -1;
+ retries--;
}
}
else
@@ -472,124 +469,128 @@
{
bool processAllKeys = true;
- if (!displayIsOn && !slideEventEmitted)
+ /* No need to do this all if we are repeating */
+ if (!keyRepeat)
{
- emitKeypadSlideEvent(true);
- /* slideEventEmitted is used to limit events to just one
- * emitted once when key pressed while display is off
- * it is reset when display turns on. */
- slideEventEmitted = true;
- }
-
- checkDoWeNeedBacklight();
-
- /* alt+TAB is the task-switcher */
- if (keymap->alt->pressed && keyCode.at(0).first == KEY_TAB)
- {
- if (!taskSwitcherVisible)
+ if (!displayIsOn && !slideEventEmitted)
{
- /* show taskswitcher and advance one app */
- taskSwitcherVisible = true;
- tohkbd2user->call(QDBus::AutoDetect, "nextAppTaskSwitcher");
- tohkbd2user->call(QDBus::AutoDetect, "showTaskSwitcher");
+ emitKeypadSlideEvent(true);
+ /* slideEventEmitted is used to limit events to just one
+ * emitted once when key pressed while display is off
+ * it is reset when display turns on. */
+ slideEventEmitted = true;
}
- else
+
+ checkDoWeNeedBacklight();
+
+ /* alt+TAB is the task-switcher */
+ if (keymap->alt->pressed && keyCode.at(0).first == KEY_TAB)
{
- /* Toggle to next app */
- tohkbd2user->call(QDBus::AutoDetect, "nextAppTaskSwitcher");
+ if (!taskSwitcherVisible)
+ {
+ /* show taskswitcher and advance one app */
+ taskSwitcherVisible = true;
+ tohkbd2user->call(QDBus::AutoDetect, "nextAppTaskSwitcher");
+ tohkbd2user->call(QDBus::AutoDetect, "showTaskSwitcher");
+ }
+ else
+ {
+ /* Toggle to next app */
+ tohkbd2user->call(QDBus::AutoDetect, "nextAppTaskSwitcher");
+ }
+ /* Don't process further */
+ keyIsPressed = true;
+ return;
}
- /* Don't process further */
- keyIsPressed = true;
- return;
- }
- /* Check custom key mappings */
+ /* Check custom key mappings */
- if (keyCode.at(0).first > KEY_MAX)
- {
- switch (keyCode.at(0).first)
+ if (keyCode.at(0).first > KEY_MAX)
{
- /* Sym-Int takes a screenshot */
- case KEY_TOH_SCREENSHOT:
- tohkbd2user->call(QDBus::AutoDetect, "takeScreenShot");
- break;
+ switch (keyCode.at(0).first)
+ {
+ /* Sym-Int takes a screenshot */
+ case KEY_TOH_SCREENSHOT:
+ tohkbd2user->call(QDBus::AutoDetect, "takeScreenShot");
+ break;
+
+ /* Sym-Del toggles "selfie" led */
+ case KEY_TOH_SELFIE:
+ selfieLedOn = !selfieLedOn;
+ tca8424->setLeds(selfieLedOn ? LED_SELFIE_ON : LED_SELFIE_OFF);
+ break;
+
+ case KEY_TOH_NEWEMAIL:
+ {
+ QDBusMessage m = QDBusMessage::createMethodCall("com.jolla.email.ui",
+ "/com/jolla/email/ui",
+ "",
+ "mailto" );
+
+ QList<QVariant> args;
+ args.append(QStringList() << "mailto:");
+ m.setArguments(args);
+
+ QDBusConnection::sessionBus().send(m);
+ }
+ break;
- /* Sym-Del toggles "selfie" led */
- case KEY_TOH_SELFIE:
- selfieLedOn = !selfieLedOn;
- tca8424->setLeds(selfieLedOn ? LED_SELFIE_ON : LED_SELFIE_OFF);
- break;
+ default:
+ break;
+ }
- case KEY_TOH_NEWEMAIL:
- {
- QDBusMessage m = QDBusMessage::createMethodCall("com.jolla.email.ui",
- "/com/jolla/email/ui",
- "",
- "mailto" );
+ /* Don't process further */
+ keyIsPressed = true;
+ return;
+ }
- QList<QVariant> args;
- args.append(QStringList() << "mailto:");
- m.setArguments(args);
+ /* if F1...F12 key is pressed then launch detached process */
- QDBusConnection::sessionBus().send(m);
- }
- break;
+ if (FKEYS.contains(keyCode.at(0).first))
+ {
+ QString cmd = applicationShortcuts[keyCode.at(0).first];
- default:
- break;
- }
+ if (!cmd.isEmpty())
+ {
+ printf("Requesting user daemon to start %s\n", qPrintable(cmd));
- /* Don't process further */
- keyIsPressed = true;
- return;
- }
+ QList<QVariant> args;
+ args.append(cmd);
+ tohkbd2user->callWithArgumentList(QDBus::AutoDetect, "launchApplication", args);
- /* if F1...F12 key is pressed then launch detached process */
+ /* Don't process further */
+ keyIsPressed = true;
+ return;
+ }
+ }
- if (FKEYS.contains(keyCode.at(0).first))
- {
- QString cmd = applicationShortcuts[keyCode.at(0).first];
+ /* Catch ctrl-alt-del (Works only from left ctrl or stickies) */
- if (!cmd.isEmpty())
+ if (keymap->alt->pressed && keymap->ctrl->pressed && keyCode.at(0).first == KEY_DELETE)
{
- printf("Requesting user daemon to start %s\n", qPrintable(cmd));
+ printf("Requesting user daemon to reboot with remorse.\n");
QList<QVariant> args;
- args.append(cmd);
- tohkbd2user->callWithArgumentList(QDBus::AutoDetect, "launchApplication", args);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.9.tar.bz2/settings-ui/i18n/engineering_en.ts
^
|
| @@ -50,7 +50,7 @@
</message>
<message id="report-a-bug">
<source>Report a bug</source>
- <extracomment>Main menu selection for FAQ and reporting an issue</extracomment>
+ <extracomment>Main menu selection for FAQ and reporting an issue, page header for bug reporter page. button text for triggering email app.</extracomment>
<translation type="unfinished"></translation>
</message>
<message id="faq-text">
@@ -68,11 +68,6 @@
<extracomment>Description above report issue -button</extracomment>
<translation type="unfinished"></translation>
</message>
- <message id="report-button">
- <source>Report issue</source>
- <extracomment>Button text, clicking this will launch email app</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>
@@ -179,7 +174,8 @@
<translation type="unfinished"></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>
+ <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 type="unfinished"></translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.9.tar.bz2/settings-ui/qml/pages/ApplicationSelectionPage.qml
^
|
| @@ -5,8 +5,6 @@
{
id: page
- allowedOrientations: Orientation.Portrait | Orientation.Landscape | Orientation.LandscapeInverted
-
property string keyId: ""
signal selected(string keyId, string filePath)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.9.tar.bz2/settings-ui/qml/pages/BugReporter.qml
^
|
| @@ -10,8 +10,6 @@
{
id: page
- allowedOrientations: Orientation.Portrait | Orientation.Landscape | Orientation.LandscapeInverted
-
KeyboardHandler
{
id: kbdif
@@ -99,9 +97,7 @@
}
Button
{
- //: Button text, clicking this will launch email app
- //% "Report issue"
- text: qsTrId("report-button")
+ text: qsTrId("report-a-bug")
anchors.horizontalCenter: column.horizontalCenter
onClicked:
{
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.9.tar.bz2/settings-ui/qml/pages/CustomizeKey.qml
^
|
| @@ -9,8 +9,6 @@
{
id: page
- allowedOrientations: Orientation.Portrait | Orientation.Landscape | Orientation.LandscapeInverted
-
property string label: "value"
property string symLabel: "value"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.9.tar.bz2/settings-ui/qml/pages/GeneralSettings.qml
^
|
| @@ -10,8 +10,6 @@
{
id: page
- allowedOrientations: Orientation.Portrait | Orientation.Landscape | Orientation.LandscapeInverted
-
KeyboardHandler
{
id: kbdif
@@ -234,7 +232,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"
+ //% "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."
text: qsTrId("sticky-desc")
wrapMode: Text.Wrap
font.pixelSize: Theme.fontSizeExtraSmall
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.9.tar.bz2/settings-ui/qml/pages/KeyboardLayout.qml
^
|
| @@ -10,8 +10,6 @@
{
id: page
- allowedOrientations: Orientation.Portrait | Orientation.Landscape | Orientation.LandscapeInverted
-
backNavigation: !zoomin
clip: true
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.9.tar.bz2/settings-ui/qml/pages/Shortcuts.qml
^
|
| @@ -10,8 +10,6 @@
{
id: page
- allowedOrientations: Orientation.Portrait | Orientation.Landscape | Orientation.LandscapeInverted
-
KeyboardHandler
{
id: kbdif
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.9.tar.bz2/settings-ui/qml/pages/Tohkbd2Settings.qml
^
|
| @@ -10,8 +10,6 @@
{
id: page
- allowedOrientations: Orientation.Portrait | Orientation.Landscape | Orientation.LandscapeInverted
-
KeyboardHandler
{
id: kbdif
@@ -126,7 +124,7 @@
//% "General settings"
settingslist.append({"labelId": qsTrId("general-settings"), "iconId":"image://theme/icon-m-developer-mode", "pageId":"GeneralSettings.qml", "isEnabled":(daemonVersion !== "N/A")})
- //: Main menu selection for FAQ and reporting an issue
+ //: 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})
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.9.tar.bz2/settings-ui/qml/tohkbd2-settingsui.qml
^
|
| @@ -10,6 +10,8 @@
{
id: apppage
+ _defaultPageOrientations: Orientation.Portrait | Orientation.Landscape | Orientation.LandscapeInverted
+
onApplicationActiveChanged:
{
if (!applicationActive && bugReportPageOpen)
|
