|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/monich/harbour-logger</param>
<param name="branch">master</param>
- <param name="revision">6ddf232</param>
+ <param name="revision">66eb9f3</param>
</service>
</services>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/harbour-lib/src/HarbourSystemInfo.cpp
^
|
| @@ -44,6 +44,7 @@
#include <QFile>
#include <QTextStream>
+#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <sys/types.h>
@@ -255,7 +256,7 @@
argv[5] = NULL;
while ((dup2(fds[1], STDOUT_FILENO) == -1) && (errno == EINTR));
execvp(argv[0], (char**)argv);
- exit(1);
+ abort();
}
close(fds[1]);
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/logger/qml/pages/CoverPage.qml
^
|
| @@ -32,11 +32,15 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
+
import "logger.js" as Logger
+import "../harbour"
CoverBackground {
id: cover
+
allowResize: true
+ readonly property bool _privileged: ProcessState.privileged
Label {
id: title
@@ -55,6 +59,8 @@
}
ListView {
id: list
+
+ visible: _privileged
anchors {
top: title.bottom
left: parent.left
@@ -97,7 +103,18 @@
offset: 1 - 1 / slope
}
+ HarbourHighlightIcon {
+ visible: !_privileged
+ x: Theme.paddingLarge
+ anchors.verticalCenter: parent.verticalCenter
+ source: "images/shrug.svg"
+ sourceSize.width: cover.width - 2 * x
+ highlightColor: Theme.highlightColor
+ smooth: true
+ }
+
CoverActionList {
+ enabled: _privileged
CoverAction {
iconSource: "image://theme/icon-cover-cancel"
onTriggered: list.model.clear()
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/logger/qml/pages/LogPage.qml
^
|
| @@ -32,6 +32,8 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
+import org.nemomobile.notifications 1.0
+
import "logger.js" as Logger
import "../harbour"
@@ -55,6 +57,20 @@
SharePage {}
}
+ Notification {
+ id: clipboardNotification
+
+ //: Pop-up notification
+ //% "Copied to clipboard"
+ previewBody: qsTrId("logger-notification-copied_to_clipboard")
+ expireTimeout: 2000
+ Component.onCompleted: {
+ if ("icon" in clipboardNotification) {
+ clipboardNotification.icon = "icon-s-clipboard"
+ }
+ }
+ }
+
function connected() {
connectTimer.stop()
if (ProcessState.privileged) {
@@ -152,9 +168,10 @@
}
}
- delegate: Item {
+ delegate: BackgroundItem {
width: parent.width
height: textLabel.height
+ enabled: timeLabel.text.length > 0 || textLabel.text.length > 0
readonly property color textColor: Logger.textColor(messageType, messageLevel)
Label {
@@ -185,6 +202,12 @@
rightMargin: Theme.horizontalPageMargin
}
}
+
+ onPressAndHold: {
+ Clipboard.text = (timeLabel.text.length > 0) ?
+ (timeLabel.text + " " + textLabel.text) : textLabel.text
+ clipboardNotification.publish()
+ }
}
VerticalScrollDecorator {}
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/logger/qml/pages/SharePage.qml
^
|
| @@ -44,7 +44,7 @@
property var logSaver: LogSaver
property var shareModel: TransferMethodsModel // Context property
readonly property string _sharingApiVersion: SystemInfo.packageVersion("declarative-transferengine-qt5")
- readonly property bool _sharingBroken: SystemInfo.compareVersions(_sharingApiVersion, "0.4.0") >= 0 // QML API break
+ readonly property bool _sharingBroken: !_sharingApiVersion || SystemInfo.compareVersions(_sharingApiVersion, "0.4.0") >= 0 // QML API break
readonly property bool _readyToShare: !logSaver.packing && !logSaver.saving && !minWaitTimer.running
// For the page slide animation to kick in, the initial value of
@@ -125,7 +125,7 @@
InfoLabel {
id: sharingBrokenInfo
//: Info label displayed instead of sharing method list
- //% "In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder."
+ //% "In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder."
text: qsTrId("logger-sharepage-broken")
}
Item {
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/logger/settings/settings.qml
^
|
| @@ -71,7 +71,7 @@
description: applicationName ?
//: Settings page header description (app version)
//% "Version %1"
- qsTrId("logger-settings-page-header-version").arg("1.0.19") :
+ qsTrId("logger-settings-page-header-version").arg("1.0.20") :
""
Image {
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/logger/src/LoggerLogSaver.cpp
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2016-2020 Jolla Ltd.
- * Copyright (C) 2016-2020 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2021 Jolla Ltd.
+ * Copyright (C) 2016-2021 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -37,6 +37,7 @@
#include <QFileInfo>
#include <QDir>
+#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <sys/types.h>
@@ -150,6 +151,7 @@
// Child
execlp("tar", "tar", "-czf", qPrintable(iArchivePath), "-C",
qPrintable(iTempDir.path()), qPrintable(iArchiveName), NULL);
+ abort();
}
Q_EMIT archivePathChanged();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/logger/src/LoggerMain.cpp
^
|
| @@ -50,9 +50,10 @@
#include <QtQuick>
#include <QtQml>
-#include <fcntl.h>
+#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
+#include <fcntl.h>
#include <sys/fsuid.h>
#undef signals
@@ -124,6 +125,7 @@
dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
execvp(aExe, (char**)aArgv);
+ abort();
}
close(fd);
HDEBUG(pid << qPrintable(aOut));
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/nfc/translations/harbour-logger-nfc-pl.ts
^
|
| @@ -11,6 +11,11 @@
<source>Swipe left to configure log categories</source>
<translation>Przesuń w lewo aby skonfigurować kategorie logów</translation>
</message>
+ <message id="logger-notification-copied_to_clipboard">
+ <source>Copied to clipboard</source>
+ <extracomment>Pop-up notification</extracomment>
+ <translation>Skopiowane do schowka</translation>
+ </message>
<message id="logger-logpage-pm-clear-log">
<source>Clear log</source>
<translation>Wyczyść logi</translation>
@@ -117,7 +122,7 @@
<translation>Proszę czekać</translation>
</message>
<message id="logger-sharepage-broken">
- <source>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
+ <source>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
<extracomment>Info label displayed instead of sharing method list</extracomment>
<translation>Niestety w tej wersji Sailfish OS udostępnianie nie działa. Użyj menu wysuwanego, aby zapisać plik tar w katalogu dokumenty.</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/nfc/translations/harbour-logger-nfc-ru.ts
^
|
| @@ -11,6 +11,11 @@
<source>Swipe left to configure log categories</source>
<translation>Там справа что-то есть</translation>
</message>
+ <message id="logger-notification-copied_to_clipboard">
+ <source>Copied to clipboard</source>
+ <extracomment>Pop-up notification</extracomment>
+ <translation>Скопировано в буфер обмена</translation>
+ </message>
<message id="logger-logpage-pm-clear-log">
<source>Clear log</source>
<translation>Очистить журнал</translation>
@@ -117,7 +122,7 @@
<translation>Секундочку</translation>
</message>
<message id="logger-sharepage-broken">
- <source>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
+ <source>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
<extracomment>Info label displayed instead of sharing method list</extracomment>
<translation>Увы, но в этой версии Sailfish OS ничего так просто расшарить не получится. Вы можете сохранить тарбол в документы, а дальше разбирайтесь сами, что с ним делать.</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/nfc/translations/harbour-logger-nfc.ts
^
|
| @@ -11,6 +11,11 @@
<source>Swipe left to configure log categories</source>
<translation>Swipe left to configure log categories</translation>
</message>
+ <message id="logger-notification-copied_to_clipboard">
+ <source>Copied to clipboard</source>
+ <extracomment>Pop-up notification</extracomment>
+ <translation>Copied to clipboard</translation>
+ </message>
<message id="logger-logpage-pm-clear-log">
<source>Clear log</source>
<translation>Clear log</translation>
@@ -117,9 +122,9 @@
<translation>Please wait</translation>
</message>
<message id="logger-sharepage-broken">
- <source>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
+ <source>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
<extracomment>Info label displayed instead of sharing method list</extracomment>
- <translation>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</translation>
+ <translation>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</translation>
</message>
<message id="openrepos-logger-nfc-app_name">
<source>NFC Logger</source>
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/ofono/src/main.cpp
^
|
| @@ -262,6 +262,8 @@
packages.append("libgrilio");
packages.append("libgrilio-binder");
packages.append("ofono");
+ packages.append("ofono-binder-plugin");
+ packages.append("ofono-ril-plugin");
packages.append("ofono-ril-binder-plugin");
return OfonoLogger(&argc, argv, packages).run();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/ofono/translations/harbour-logger-ofono-nl.ts
^
|
| @@ -9,7 +9,12 @@
</message>
<message id="logger-mainpage-swipe-left-hint">
<source>Swipe left to configure log categories</source>
- <translation>Swipe left to configure log categories</translation>
+ <translation type="unfinished">Veeg naar links om logcategorieën te configureren</translation>
+ </message>
+ <message id="logger-notification-copied_to_clipboard">
+ <source>Copied to clipboard</source>
+ <extracomment>Pop-up notification</extracomment>
+ <translation type="unfinished">Gekopieerd naar het klembord</translation>
</message>
<message id="ofono-logger-pm-fix-mobile-data">
<source>Fix mobile data</source>
@@ -125,7 +130,7 @@
<translation>Even geduld</translation>
</message>
<message id="logger-sharepage-broken">
- <source>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
+ <source>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
<extracomment>Info label displayed instead of sharing method list</extracomment>
<translation type="unfinished">In-app delen is niet beschikbaar voor deze versie van Sailfish OS. Gebruik het katrolmenu om tarball op te slaan in de documentenmap.</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/ofono/translations/harbour-logger-ofono-pl.ts
^
|
| @@ -11,6 +11,11 @@
<source>Swipe left to configure log categories</source>
<translation>Przesuń w lewo aby skonfigurować kategorie logów</translation>
</message>
+ <message id="logger-notification-copied_to_clipboard">
+ <source>Copied to clipboard</source>
+ <extracomment>Pop-up notification</extracomment>
+ <translation>Skopiowane do schowka</translation>
+ </message>
<message id="ofono-logger-pm-fix-mobile-data">
<source>Fix mobile data</source>
<extracomment>Pull-down menu item</extracomment>
@@ -127,7 +132,7 @@
<translation>Proszę czekać</translation>
</message>
<message id="logger-sharepage-broken">
- <source>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
+ <source>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
<extracomment>Info label displayed instead of sharing method list</extracomment>
<translation type="unfinished">Niestety w tej wersji Sailfish OS nic tak łatwego do udostępnienia nie zadziała. Możesz zapisać plik tar w dokumentach, a następnie sam wymyślić, co z nim zrobić.</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/ofono/translations/harbour-logger-ofono-ru.ts
^
|
| @@ -11,6 +11,11 @@
<source>Swipe left to configure log categories</source>
<translation>Там справа что-то есть</translation>
</message>
+ <message id="logger-notification-copied_to_clipboard">
+ <source>Copied to clipboard</source>
+ <extracomment>Pop-up notification</extracomment>
+ <translation>Скопировано в буфер обмена</translation>
+ </message>
<message id="ofono-logger-pm-fix-mobile-data">
<source>Fix mobile data</source>
<extracomment>Pull-down menu item</extracomment>
@@ -127,7 +132,7 @@
<translation>Секундочку</translation>
</message>
<message id="logger-sharepage-broken">
- <source>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
+ <source>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
<extracomment>Info label displayed instead of sharing method list</extracomment>
<translation>Увы, но в этой версии Sailfish OS ничего так просто расшарить не получится. Вы можете сохранить тарбол в документы, а дальше разбирайтесь сами, что с ним делать.</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/ofono/translations/harbour-logger-ofono-sv.ts
^
|
| @@ -11,6 +11,11 @@
<source>Swipe left to configure log categories</source>
<translation>Svep vänster för att konfigurera loggkategorier</translation>
</message>
+ <message id="logger-notification-copied_to_clipboard">
+ <source>Copied to clipboard</source>
+ <extracomment>Pop-up notification</extracomment>
+ <translation>Kopierat till urklipp</translation>
+ </message>
<message id="ofono-logger-pm-fix-mobile-data">
<source>Fix mobile data</source>
<extracomment>Pull-down menu item</extracomment>
@@ -125,7 +130,7 @@
<translation>Vänta</translation>
</message>
<message id="logger-sharepage-broken">
- <source>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
+ <source>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
<extracomment>Info label displayed instead of sharing method list</extracomment>
<translation type="unfinished">Delning i appen är inte tillgänglig för den här versionen av Sailfish OS. Använd remskivmenyn för att spara tarball i dokumentmappen.</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/ofono/translations/harbour-logger-ofono-zh_CN.ts
^
|
| @@ -11,6 +11,11 @@
<source>Swipe left to configure log categories</source>
<translation>向左滑动即可配置日志分类</translation>
</message>
+ <message id="logger-notification-copied_to_clipboard">
+ <source>Copied to clipboard</source>
+ <extracomment>Pop-up notification</extracomment>
+ <translation>复制到剪贴板</translation>
+ </message>
<message id="ofono-logger-pm-fix-mobile-data">
<source>Fix mobile data</source>
<extracomment>Pull-down menu item</extracomment>
@@ -125,7 +130,7 @@
<translation>等稍等</translation>
</message>
<message id="logger-sharepage-broken">
- <source>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
+ <source>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
<extracomment>Info label displayed instead of sharing method list</extracomment>
<translation type="unfinished">此版本的 Sailfish OS 无法进行应用内共享。 使用滑轮菜单将 tarball 保存到文档文件夹。</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:openrepos-logger-ofono-1.0.20.tar.bz2/ofono/translations/harbour-logger-ofono.ts
^
|
| @@ -11,6 +11,11 @@
<source>Swipe left to configure log categories</source>
<translation>Swipe left to configure log categories</translation>
</message>
+ <message id="logger-notification-copied_to_clipboard">
+ <source>Copied to clipboard</source>
+ <extracomment>Pop-up notification</extracomment>
+ <translation>Copied to clipboard</translation>
+ </message>
<message id="ofono-logger-pm-fix-mobile-data">
<source>Fix mobile data</source>
<extracomment>Pull-down menu item</extracomment>
@@ -127,9 +132,9 @@
<translation>Please wait</translation>
</message>
<message id="logger-sharepage-broken">
- <source>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
+ <source>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</source>
<extracomment>Info label displayed instead of sharing method list</extracomment>
- <translation>In-app sharing is not available for this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</translation>
+ <translation>In-app sharing is not available in this version of Sailfish OS. Use the pulley menu to save tarball to the documents folder.</translation>
</message>
<message id="openrepos-logger-ofono-app_name">
<source>Ofono Log</source>
|
