| @@ -414,7 +414,16 @@
if (r.at(0) == 0x0b && r.at(1) == 0x00)
keymap->process(r);
- retries = -1;
+ /* 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--;
+ }
+ else
+ {
+ retries = -1;
+ }
}
else
{
@@ -697,8 +706,6 @@
if (forceBacklightOn)
{
- printf("backlight forced on\n");
-
tca8424->setLeds(LED_BACKLIGHT_ON);
}
else if (backlightEnabled)
@@ -721,7 +728,7 @@
{
backlightTimer->start();
}
- }
+ } /* No backlight */
else
{
backlightTimer->stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.2.5.tar.bz2/settings-ui/qml/pages/BugReporter.qml
^
|
| @@ -11,9 +11,34 @@
allowedOrientations: Orientation.Portrait | Orientation.Landscape | Orientation.LandscapeInverted
+ Rectangle
+ {
+ z:2
+ anchors.fill: parent
+ visible: bugReportPageOpen
+ color: Qt.rgba(0, 0, 0, 0.5)
+
+ BusyIndicator
+ {
+ id: bi
+ size: BusyIndicatorSize.Large
+ anchors.centerIn: parent
+ running: bugReportPageOpen
+ }
+ Label
+ {
+ visible: bugReportPageOpen
+ text: qsTr("Launching external application...")
+ anchors.top: bi.bottom
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+
+ }
+
SilicaFlickable
{
anchors.fill: parent
+ z:1
contentHeight: column.height
@@ -29,28 +54,50 @@
}
Label
{
- text: qsTr("Launching email application...")
- anchors.horizontalCenter: column.horizontalCenter
+ text: qsTr("Please first check TOHKBD FAQ page at https://together.jolla.com. Button below opens this link in browser.")
+ color: Theme.primaryColor
+ width: parent.width - 2*Theme.paddingLarge
+ wrapMode: Text.WordWrap
+ horizontalAlignment: Text.AlignHCenter
+ anchors.horizontalCenter: parent.horizontalCenter
}
-
- ProgressBar
+ Button
{
- width: page.width - 2*Theme.paddingLarge
+ text: qsTr("Open FAQ")
+ anchors.horizontalCenter: parent.horizontalCenter
+ onClicked:
+ {
+ bugReportPageOpen = true
+ Qt.openUrlExternally("https://together.jolla.com/question/96836/tohkbd-faq/")
+ }
+ }
+ Label
+ {
+ text: qsTr("If there are no answer to your issue, please report it. Button below launches email client.")
+ color: Theme.primaryColor
+ width: parent.width - 2*Theme.paddingLarge
+ wrapMode: Text.WordWrap
+ horizontalAlignment: Text.AlignHCenter
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+ Button
+ {
+ text: qsTr("Report issue")
anchors.horizontalCenter: column.horizontalCenter
- indeterminate: true
+ onClicked:
+ {
+ bugReportPageOpen = true
+ Qt.openUrlExternally("mailto: toho@saunalahti.fi" +
+ "?subject=Tohkbd2 bug report, ui " + settingsui.version + ", daemon " + daemonVersion + ", SFOS " + sailfishVersion +
+ "&body=Write here what is wrong... (in Finnish or English) ")
+ }
}
- }
- }
- Component.onCompleted:
- {
- bugReportPageOpen = true
- Qt.openUrlExternally("mailto: toho@saunalahti.fi" +
- "?subject=Tohkbd2 bug report, ui " + settingsui.version + ", daemon " + daemonVersion + ", SFOS " + sailfishVersion +
- "&body=Write here what is wrong... (in Finnish or English) ")
- }
+ Component.onCompleted: bugReportPageOpen = false
+ }
+ }
}
|
| @@ -6,7 +6,6 @@
#include <QDir>
#include <QVariantMap>
#include <QVariantList>
-#include <QProcess>
#include <QThread>
#include <QSettings>
#include <QDebug>
@@ -102,14 +101,6 @@
return map;
}
-void SettingsUi::startApplication(QString appname)
-{
- QProcess proc;
- proc.startDetached("/usr/bin/xdg-open" , QStringList() << appname);
-
- QThread::msleep(100);
-}
-
QVariantList SettingsUi::getCurrentShortcuts()
{
QVariantList tmp;
|
