|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/monich/harbour-foilnotes.git</param>
<param name="branch">master</param>
- <param name="revision">db5e74f</param>
+ <param name="revision">bc394d0</param>
</service>
</services>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/LICENSE
^
|
| @@ -1,5 +1,5 @@
-Copyright (C) 2018-2021 Jolla Ltd.
-Copyright (C) 2018-2021 Slava Monich <slava@monich.com>
+Copyright (C) 2018-2022 Jolla Ltd.
+Copyright (C) 2018-2022 Slava Monich <slava@monich.com>
You may use this file under the terms of the BSD license as follows:
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/app.pro
^
|
| @@ -13,7 +13,7 @@
QT += qml quick sql
isEmpty(VERSION) {
- VERSION = 1.0.28
+ VERSION = 1.1.0
}
V1 = $$system(echo $$VERSION | cut -f1 -d.)
@@ -256,9 +256,7 @@
$${HARBOUR_LIB_INCLUDE}/HarbourQrCodeImageProvider.h \
$${HARBOUR_LIB_INCLUDE}/HarbourSystemInfo.h \
$${HARBOUR_LIB_INCLUDE}/HarbourSystemState.h \
- $${HARBOUR_LIB_INCLUDE}/HarbourSystem.h \
$${HARBOUR_LIB_INCLUDE}/HarbourTask.h \
- $${HARBOUR_LIB_INCLUDE}/HarbourTheme.h \
$${HARBOUR_LIB_SRC}/HarbourMce.h
SOURCES += \
@@ -271,9 +269,7 @@
$${HARBOUR_LIB_SRC}/HarbourQrCodeImageProvider.cpp \
$${HARBOUR_LIB_SRC}/HarbourSystemInfo.cpp \
$${HARBOUR_LIB_SRC}/HarbourSystemState.cpp \
- $${HARBOUR_LIB_SRC}/HarbourSystem.cpp \
- $${HARBOUR_LIB_SRC}/HarbourTask.cpp \
- $${HARBOUR_LIB_SRC}/HarbourTheme.cpp
+ $${HARBOUR_LIB_SRC}/HarbourTask.cpp
HARBOUR_QML_COMPONENTS = \
$${HARBOUR_LIB_QML}/HarbourColorEditorDialog.qml \
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/harbour-foilnotes.desktop
^
|
| @@ -5,6 +5,9 @@
Icon=harbour-foilnotes
Exec=harbour-foilnotes
+[X-Sailjail]
+Sandboxing=Disabled
+
[X-HarbourBackup]
BackupPathList=.local/share/foil/:Documents/FoilNotes/
BackupConfigList=/apps/harbour-foilnotes/
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/qml/CoverPage.qml
^
|
| @@ -10,6 +10,7 @@
property bool encryptedPageSelected
readonly property int coverActionHeight: Theme.itemSizeSmall
readonly property bool jailed: HarbourProcessState.jailedApp
+ readonly property bool darkOnLight: ('colorScheme' in Theme) && Theme.colorScheme === 1
signal newNote()
@@ -18,7 +19,7 @@
anchors.fill: appTitle
color: Theme.primaryColor
- opacity: HarbourTheme.opacityFaint
+ opacity: FoilNotes.opacityFaint
}
Label {
@@ -41,7 +42,7 @@
source: "images/edge.svg"
sourceSize.height: Theme.paddingMedium
highlightColor: titleBackground.color
- opacity: HarbourTheme.opacityFaint
+ opacity: FoilNotes.opacityFaint
smooth: true
}
@@ -97,7 +98,7 @@
width: content.width
height: Theme.paddingSmall/4
color: Theme.primaryColor
- opacity: HarbourTheme.opacityLow
+ opacity: FoilNotes.opacityLow
smooth: true
visible: !jailed
}
@@ -109,7 +110,7 @@
y: (cover.height - height)/2 - parent.y
height: size
sourceSize.height: size
- source: HarbourTheme.darkOnLight ? "images/fancy-lock-dark.svg" : "images/fancy-lock.svg"
+ source: darkOnLight ? "images/fancy-lock-dark.svg" : "images/fancy-lock.svg"
opacity: 0.1
}
@@ -158,7 +159,7 @@
CoverActionList {
enabled: !jailed
CoverAction {
- readonly property url lockIcon: Qt.resolvedUrl("images/" + (HarbourTheme.darkOnLight ? "lock-dark.svg" : "lock.svg"))
+ readonly property url lockIcon: Qt.resolvedUrl("images/" + (darkOnLight ? "lock-dark.svg" : "lock.svg"))
iconSource: FoilNotesModel.keyAvailable ? lockIcon : "image://theme/icon-cover-new"
onTriggered: {
if (FoilNotesModel.keyAvailable) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/qml/EncryptedPage.qml
^
|
| @@ -11,6 +11,7 @@
property var hints
property var foilModel
readonly property real screenHeight: isPortrait ? Screen.height : Screen.width
+ readonly property bool darkOnLight: ('colorScheme' in Theme) && Theme.colorScheme === 1
property bool isCurrentPage: true
signal decryptNote(var note)
@@ -28,10 +29,10 @@
id: foilUiComponent
QtObject {
- readonly property real opacityFaint: HarbourTheme.opacityFaint
- readonly property real opacityLow: HarbourTheme.opacityLow
- readonly property real opacityHigh: HarbourTheme.opacityHigh
- readonly property real opacityOverlay: HarbourTheme.opacityOverlay
+ readonly property real opacityFaint: FoilNotes.opacityFaint
+ readonly property real opacityLow: FoilNotes.opacityLow
+ readonly property real opacityHigh: FoilNotes.opacityHigh
+ readonly property real opacityOverlay: FoilNotes.opacityOverlay
readonly property var settings: FoilNotesSettings
readonly property bool otherFoilAppsInstalled: FoilNotes.otherFoilAppsInstalled
@@ -207,11 +208,11 @@
width: Theme.itemSizeHuge
height: width
- color: Theme.rgba(Theme.primaryColor, HarbourTheme.opacityFaint * HarbourTheme.opacityLow)
+ color: Theme.rgba(Theme.primaryColor, FoilNotes.opacityFaint * FoilNotes.opacityLow)
radius: width/2
Image {
- source: HarbourTheme.darkOnLight ? "images/fancy-lock-dark.svg" : "images/fancy-lock.svg"
+ source: darkOnLight ? "images/fancy-lock-dark.svg" : "images/fancy-lock.svg"
height: Math.floor(circle.height * 5 / 8)
sourceSize.height: height
anchors.centerIn: circle
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/qml/NoteItem.qml
^
|
| @@ -41,7 +41,7 @@
color: "transparent"
smooth: true
visible: opacity > 0
- opacity: selected ? HarbourTheme.opacityHigh : 0
+ opacity: selected ? FoilNotes.opacityHigh : 0
Behavior on opacity { FadeAnimation { duration: fadeDiration } }
}
@@ -128,7 +128,7 @@
right: parent.right
rightMargin: Theme.paddingMedium
}
- opacity: HarbourTheme.opacityLow
+ opacity: FoilNotes.opacityLow
color: highlighted ? Theme.highlightColor : Theme.primaryColor
font {
family: Theme.fontFamily
@@ -161,7 +161,7 @@
z: noteItem.z + 1
anchors.fill: parent
active: opacity > 0
- opacity: selected ? (highlighted ? HarbourTheme.opacityLow : 1 ): 0
+ opacity: selected ? (highlighted ? FoilNotes.opacityLow : 1 ): 0
Behavior on opacity { FadeAnimation { duration: fadeDiration } }
sourceComponent: Component {
Item {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/qml/NotePage.qml
^
|
| @@ -173,7 +173,7 @@
}
width: parent.width
color: page.color
- opacity: HarbourTheme.opacityFaint
+ opacity: FoilNotes.opacityFaint
}
HarbourHighlightIcon {
@@ -216,8 +216,8 @@
// Pick the most different standard color out of these two:
readonly property color pagenrColor1: Theme.primaryColor
readonly property color pagenrColor2: Theme.highlightBackgroundColor
- readonly property real pagenrColorDiff1: HarbourTheme.colorDifference(page.color, pagenrColor1)
- readonly property real pagenrColorDiff2: HarbourTheme.colorDifference(page.color, pagenrColor2)
+ readonly property real pagenrColorDiff1: FoilNotes.colorDifference(page.color, pagenrColor1)
+ readonly property real pagenrColorDiff2: FoilNotes.colorDifference(page.color, pagenrColor2)
readonly property color pagenrColor: (pagenrColorDiff2 > pagenrColorDiff2) ? pagenrColor2 : pagenrColor1
Loader {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/src/FoilNotes.cpp
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2020 Jolla Ltd.
- * Copyright (C) 2018-2020 Slava Monich <slava@monich.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava@monich.com>
*
* You may use this file under the terms of the BSD license as follows:
*
@@ -157,4 +157,12 @@
return iPrivate->iOtherFoilAppsInstalled;
}
+qreal FoilNotes::colorDifference(const QColor& aColor1, const QColor& aColor2)
+{
+ const qreal dr = aColor1.red() - aColor2.red();
+ const qreal dg = aColor1.green() - aColor2.green();
+ const qreal db = aColor1.blue() - aColor2.blue();
+ return dr * dr + dg * dg + db * db;
+}
+
#include "FoilNotes.moc"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/src/FoilNotes.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava@monich.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava@monich.com>
*
* You may use this file under the terms of the BSD license as follows:
*
@@ -36,6 +36,7 @@
#include <QObject>
#include <QString>
+#include <QColor>
class QQmlEngine;
class QJSEngine;
@@ -44,6 +45,10 @@
class FoilNotes : public QObject {
Q_OBJECT
Q_PROPERTY(bool otherFoilAppsInstalled READ otherFoilAppsInstalled NOTIFY otherFoilAppsInstalledChanged)
+ Q_PROPERTY(qreal opacityFaint READ opacityFaint CONSTANT)
+ Q_PROPERTY(qreal opacityLow READ opacityLow CONSTANT)
+ Q_PROPERTY(qreal opacityHigh READ opacityHigh CONSTANT)
+ Q_PROPERTY(qreal opacityOverlay READ opacityOverlay CONSTANT)
public:
explicit FoilNotes(QObject* aParent = Q_NULLPTR);
@@ -52,9 +57,15 @@
static QObject* createSingleton(QQmlEngine* aEngine, QJSEngine* aScript);
Q_INVOKABLE static QString generateFileName(QString aText);
+ Q_INVOKABLE static qreal colorDifference(const QColor& aColor1, const QColor& aColor2);
bool otherFoilAppsInstalled() const;
+ static qreal opacityFaint() { return 0.2; }
+ static qreal opacityLow() { return 0.4; }
+ static qreal opacityHigh() { return 0.6; }
+ static qreal opacityOverlay() { return 0.8; }
+
Q_SIGNALS:
void otherFoilAppsInstalledChanged();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/src/main.cpp
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava@monich.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava@monich.com>
*
* You may use this file under the terms of the BSD license as follows:
*
@@ -54,7 +54,6 @@
#include "HarbourOrganizeListModel.h"
#include "HarbourProcessState.h"
#include "HarbourSystemState.h"
-#include "HarbourTheme.h"
#include <sailfishapp.h>
#include <gutil_log.h>
@@ -66,7 +65,6 @@
{
qmlRegisterSingletonType<HarbourProcessState>(uri, v1, v2, "HarbourProcessState", HarbourProcessState::createSingleton);
qmlRegisterSingletonType<HarbourSystemState>(uri, v1, v2, "HarbourSystemState", HarbourSystemState::createSingleton);
- qmlRegisterSingletonType<HarbourTheme>(uri, v1, v2, "HarbourTheme", HarbourTheme::createSingleton);
qmlRegisterSingletonType<FoilNotesHints>(uri, v1, v2, "FoilNotesHints", FoilNotesHints::createSingleton);
qmlRegisterSingletonType<FoilNotesSettings>(uri, v1, v2, "FoilNotesSettings", FoilNotesSettings::createSingleton);
qmlRegisterSingletonType<FoilNotes>(uri, v1, v2, "FoilNotes", FoilNotes::createSingleton);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilnotes-1.1.0.tar.gz/translations/harbour-foilnotes-pl.ts
^
|
| @@ -41,7 +41,7 @@
<message id="foilnotes-menu-nfc_share">
<source>Share via NFC</source>
<extracomment>Share current note via NFC</extracomment>
- <translation type="unfinished">Udostępnij przez NFC</translation>
+ <translation>Udostępnij przez NFC</translation>
</message>
<message id="foilnotes-menu-show_qrcode">
<source>Show QR code</source>
@@ -160,7 +160,7 @@
<message id="foilnotes-notification-nfc_note_received">
<source>Note received via NFC</source>
<extracomment>Pop-up notification</extracomment>
- <translation type="unfinished">Notatka przyszła przez NFC</translation>
+ <translation>Odebrano notatkę przez NFC</translation>
</message>
<message id="foilnotes-enter_password_view-label-enter_password">
<source>Secret notes are locked. Please enter your password</source>
@@ -393,12 +393,12 @@
<message id="foilnotes-nfc_share-info-nfc_off">
<source>NFC is off</source>
<extracomment>Full screen info label</extracomment>
- <translation type="unfinished">NFC jest wyłączone.</translation>
+ <translation>NFC jest wyłączone.</translation>
</message>
<message id="foilnotes-nfc_share-info-ready">
<source>Touch another NFC capable device with Foil Notes running full screen.</source>
<extracomment>Full screen info label</extracomment>
- <translation type="unfinished">Przyłóż czujnik NFC do innego urządzenia z Foil Notes otwartą na pełnym ekranie.</translation>
+ <translation>Dotknij innego urządzenia obsługującego NFC z Foil Notes otwartym na pełnym ekranie. </translation>
</message>
</context>
</TS>
|
