|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://gitlab.com/HengYeDev/harbour-sailtrix</param>
<param name="branch">master</param>
- <param name="revision">1.3.3</param>
+ <param name="revision">1.3.4</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.4.tar.bz2/harbour-sailtrix.pro.user
^
|
| @@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2021-09-29T21:19:08. -->
+<!-- Written by QtCreator 4.15.2, 2021-10-31T09:03:41. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -37,6 +37,7 @@
<value type="bool" key="EditorConfiguration.MouseHiding">true</value>
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
<value type="int" key="EditorConfiguration.PaddingMode">1</value>
+ <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
<value type="bool" key="EditorConfiguration.ShowMargin">false</value>
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
@@ -45,6 +46,7 @@
<value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
<value type="int" key="EditorConfiguration.TabSize">8</value>
<value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+ <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
<value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
<value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
@@ -59,6 +61,7 @@
<valuemap type="QVariantMap">
<valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
<value type="bool" key="AutoTest.Framework.Boost">true</value>
+ <value type="bool" key="AutoTest.Framework.CTest">false</value>
<value type="bool" key="AutoTest.Framework.Catch">true</value>
<value type="bool" key="AutoTest.Framework.GTest">true</value>
<value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
@@ -69,9 +72,9 @@
<value type="bool" key="AutoTest.UseGlobal">true</value>
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
- <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.Questionable</value>
+ <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.BuildSystem</value>
<valuemap type="QVariantMap" key="ClangTools">
- <value type="bool" key="ClangTools.AnalyzeOpenFiles">false</value>
+ <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
<value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
<value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
<value type="int" key="ClangTools.ParallelJobs">8</value>
@@ -86,9 +89,9 @@
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Mer.Device.Type</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-3.4.0.24-i486 (in Sailfish OS Build Engine)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-3.4.0.24-i486 (in Sailfish OS Build Engine)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">SailfishOS-3.4.0.24-i486</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-3.4.0.24-i486 (in Sailfish SDK Build Engine)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-3.4.0.24-i486 (in Sailfish SDK Build Engine)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">SailfishOS-3.4.0.24-i486.default</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
@@ -99,8 +102,8 @@
<value type="QString" key="MerBuildConfiguration.SigningUser"></value>
<value type="QString" key="MerSfdkConfigurationAspect.Options"></value>
<value type="QString" key="MerSpecFileAspect.Path"></value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_OS_Build_Engine-Debug</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_OS_Build_Engine-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_SDK_Build_Engine-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_SDK_Build_Engine-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -109,7 +112,6 @@
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
@@ -128,11 +130,16 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerSdkStartStep</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="MerClearBuildEnvironmentStep.Arguments">reset</value>
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerClearBuildEnvironmentStep</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -152,8 +159,8 @@
<value type="QString" key="MerBuildConfiguration.SigningUser"></value>
<value type="QString" key="MerSfdkConfigurationAspect.Options"></value>
<value type="QString" key="MerSpecFileAspect.Path"></value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_OS_Build_Engine-Release</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_OS_Build_Engine-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_SDK_Build_Engine-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_SDK_Build_Engine-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -162,7 +169,6 @@
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
@@ -181,11 +187,16 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerSdkStartStep</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="MerClearBuildEnvironmentStep.Arguments">reset</value>
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerClearBuildEnvironmentStep</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -206,8 +217,8 @@
<value type="QString" key="MerBuildConfiguration.SigningUser"></value>
<value type="QString" key="MerSfdkConfigurationAspect.Options"></value>
<value type="QString" key="MerSpecFileAspect.Path"></value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_OS_Build_Engine-Profile</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_OS_Build_Engine-Profile</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_SDK_Build_Engine-Profile</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/heng/ssd-data/SailfishApps/build-harbour-sailtrix-SailfishOS_3_4_0_24_i486_in_Sailfish_SDK_Build_Engine-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -216,7 +227,6 @@
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
@@ -235,11 +245,16 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerSdkStartStep</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="MerClearBuildEnvironmentStep.Arguments">reset</value>
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerClearBuildEnvironmentStep</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -350,6 +365,7 @@
<value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <value type="QString" key="Analyzer.Valgrind.Callgrind.Arguments"></value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
@@ -360,12 +376,14 @@
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
<value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
<value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+ <value type="QString" key="Analyzer.Valgrind.Memcheck.Arguments"></value>
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
<value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
<value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindArguments"></value>
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">/usr/bin/valgrind</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
<value type="int">0</value>
@@ -410,9 +428,9 @@
<variable>ProjectExplorer.Project.Target.1</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Mer.Device.Type</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-3.4.0.24-armv7hl (in Sailfish OS Build Engine)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-3.4.0.24-armv7hl (in Sailfish OS Build Engine)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">SailfishOS-3.4.0.24-armv7hl</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-3.4.0.24-armv7hl (in Sailfish SDK Build Engine)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-3.4.0.24-armv7hl (in Sailfish SDK Build Engine)</value>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.4.tar.bz2/qml/pages/Credits.qml
^
|
| @@ -18,7 +18,7 @@
spacing: Theme.paddingLarge
Label {
- text: "Sailtrix 1.3.3"
+ text: "Sailtrix 1.3.4"
color: Theme.highlightColor
font.family: Theme.fontFamilyHeading
font.pixelSize: Theme.fontSizeLarge
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.4.tar.bz2/qml/pages/Messages.qml
^
|
| @@ -1,4 +1,4 @@
-import QtQuick 2.4
+import QtQuick 2.5
import Sailfish.Silica 1.0
import Messages 1.0
import Sailfish.Pickers 1.0
@@ -230,7 +230,7 @@
Label {
id: texts
- text: is_image ? "<style>small{color:" + Theme.secondaryColor + ";</style>" + (grouped ?"" : "<b>" + (display_name ? display_name : user_id) + "</b>") + " <small>" + formatTimestamp(timestamp) + "</small>" : is_event ? content : ("<style>a:link{color:" + Theme.highlightColor + ";} small { color:" + Theme.secondaryColor + ";}</style>" + (grouped ? "" : "<b>" + (display_name ? display_name : user_id) + "</b>") +" <small>" + formatTimestamp(timestamp) + "</small><br>" + content)
+ text: is_image ? "<style>small{color:" + Theme.secondaryColor + ";</style>" + (grouped ?"" : "<b>" + (display_name ? display_name : user_id) + "</b>") + " <small>" + formatTimestamp(timestamp) + "</small>" : is_event ? content : ("<style>a:link{color:" + (is_self ? Theme.primaryColor: Theme.highlightColor) + ";} small { color:" + Theme.secondaryColor + ";}</style>" + (grouped ? "" : "<b>" + (display_name ? display_name : user_id) + "</b>") +" <small>" + formatTimestamp(timestamp) + "</small><br>" + content)
color: is_event ? Theme.secondaryColor : (highlighted || is_self ? Theme.highlightColor : Theme.primaryColor)
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
leftPadding: Theme.paddingSmall
@@ -338,6 +338,7 @@
anchors.leftMargin: is_self ? icon.width + Theme.paddingSmall : undefined
anchors.rightMargin: is_self ? undefined : icon.width + Theme.paddingSmall
anchors.top: chatBox.bottom
+ autoTransform: true
fillMode: Image.PreserveAspectFit
source: (image_path) ? image_path : "image://theme/icon-l-image"
onSourceChanged: console.log(source);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.4.tar.bz2/qml/pages/PictureDisplay.qml
^
|
| @@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.5
import Sailfish.Silica 1.0
import PictureDisplayBackend 1.0
import Nemo.Notifications 1.0
@@ -70,6 +70,7 @@
width: parent.width
height: parent.height - header.height
fillMode: Image.PreserveAspectFit
+ autoTransform: true
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.4.tar.bz2/src/messages.cpp
^
|
| @@ -16,6 +16,7 @@
#include <QDesktopServices>
#include <QHash>
#include <QCryptographicHash>
+#include <QRegularExpression>
#include "messagesmodel.h"
#include <openssl/rand.h>
#include <olm/olm.h>
@@ -2342,5 +2343,19 @@
QString Messages::get_html_body(const QString &plaintext_body, qint64 timestamp) {
QString result = plaintext_body;
result.replace("\n", "<br>");
- return result;
+ return linkify_html(result);
}
+
+QString Messages::linkify_html(QString orig) {
+ QString new_string = orig;
+
+ QRegularExpression find_emails(QStringLiteral("(?:[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])"));
+ QRegularExpressionMatchIterator match = find_emails.globalMatch(orig);
+ while (match.hasNext()) {
+ QRegularExpressionMatch m = match.next();
+ QString to_replace = m.captured();
+ new_string = orig.replace(to_replace, QStringLiteral("<a href=\"mailto:") + to_replace + QStringLiteral("\">") + to_replace + "</a>");
+ }
+ return new_string;
+}
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.4.tar.bz2/src/messages.h
^
|
| @@ -163,6 +163,7 @@
QString get_html_body(const QString& plaintext_body, qint64 timestamp);
QJsonObject get_message_json(QString message);
QString getFilter();
+ QString linkify_html(QString orig);
};
#endif // MESSAGES_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.4.tar.bz2/src/rooms.cpp
^
|
| @@ -744,8 +744,11 @@
bool is_direct = false;
- if (!has_name) {
+ //if (!has_name) {
int j = 0;
+ qDebug() << "Value of DM_OBJ when Detecting DMs:" << dm_obj;
+ qDebug() << "I am looking for room id:" << room_id;
+
for (QJsonValue value : dm_obj) {
QJsonArray arr = value.toArray();
QString user_id = dm_obj.keys().at(j);
@@ -773,7 +776,7 @@
j++;
}
- }
+ //}
if (!has_name) {
room_name = "Unnamed room";
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-sailtrix-1.3.4.tar.bz2/translations/harbour-sailtrix-pl.ts
^
|
| @@ -0,0 +1,551 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pl">
+<context>
+ <name>CreateRoom</name>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="50"/>
+ <source>Create Room</source>
+ <translation>Utwórz pokój</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="51"/>
+ <source>Create</source>
+ <translation>Utwórz</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="56"/>
+ <source>Visibility</source>
+ <translation>Widoczność</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="58"/>
+ <source>Private</source>
+ <translation>Prywatny</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="59"/>
+ <source>Public</source>
+ <translation>Publiczny</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="70"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="71"/>
+ <source>Name</source>
+ <translation>Nazwa</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="79"/>
+ <source>Topic</source>
+ <translation>Temat</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="80"/>
+ <source>Topic (optional)</source>
+ <translation>Temat (opcjonalnie)</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="101"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="102"/>
+ <source>Room alias</source>
+ <translation>Alias pokoju</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="119"/>
+ <source>Enable end-to-end encryption</source>
+ <translation>Włącz szyfrowanie end-to-end</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CreateRoom.qml" line="120"/>
+ <source>Bridges and most bots won't work yet.</source>
+ <translation>Mosty i większość botów jeszcze nie działa</translation>
+ </message>
+</context>
+<context>
+ <name>Credits</name>
+ <message>
+ <location filename="../qml/pages/Credits.qml" line="10"/>
+ <source>Credits</source>
+ <translation>Podziękowania</translation>
+ </message>
+</context>
+<context>
+ <name>Invite</name>
+ <message>
+ <location filename="../qml/pages/Invite.qml" line="15"/>
+ <source>Invite</source>
+ <translation>zaproś</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Invite.qml" line="35"/>
+ <source>You've been invited to</source>
+ <translation>Zostałeś zaproszony do</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Invite.qml" line="35"/>
+ <source> chat with</source>
+ <translation>czat z</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Invite.qml" line="51"/>
+ <source>Join</source>
+ <translation>Dołącz</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Invite.qml" line="65"/>
+ <source>Reject</source>
+ <translation>Odrzuć</translation>
+ </message>
+</context>
+<context>
+ <name>JoinPublicRoom</name>
+ <message>
+ <location filename="../qml/pages/JoinPublicRoom.qml" line="19"/>
+ <source>Join Room</source>
+ <translation>Dołącz do pokoju</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/JoinPublicRoom.qml" line="20"/>
+ <source>Join</source>
+ <translation>Dołącz</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/JoinPublicRoom.qml" line="78"/>
+ <source> members</source>
+ <translation> członkowie</translation>
+ </message>
+</context>
+<context>
+ <name>LoginDialog</name>
+ <message>
+ <location filename="../qml/pages/LoginDialog.qml" line="28"/>
+ <source>Login</source>
+ <translation>Login</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/LoginDialog.qml" line="32"/>
+ <source>Homeserver</source>
+ <translation>Serwer domowy</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/LoginDialog.qml" line="33"/>
+ <source>Homeserver URL (matrix.org)</source>
+ <translation>URL serwera domowego (matrix.org)</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/LoginDialog.qml" line="41"/>
+ <source>Username</source>
+ <translation>Nazwa użytkownika</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/LoginDialog.qml" line="42"/>
+ <source>Username (user1)</source>
+ <translation>Nazwa użytkownika (user1)</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/LoginDialog.qml" line="50"/>
+ <source>Password</source>
+ <translation>Hasło</translation>
+ </message>
+</context>
+<context>
+ <name>Messages</name>
+ <message>
+ <location filename="../qml/pages/Messages.qml" line="36"/>
+ <location filename="../qml/pages/Messages.qml" line="39"/>
+ <source>File saved</source>
+ <translation>Plik zapisany</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Messages.qml" line="37"/>
+ <source>File saved to Downloads directory</source>
+ <translation>Plik zapisany do katalogu Pobrane</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Messages.qml" line="125"/>
+ <source>Copy</source>
+ <translation>Kopiuj</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Messages.qml" line="131"/>
+ <source>Reply</source>
+ <translation>Odpowiedz</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Messages.qml" line="134"/>
+ <source>Replying to </source>
+ <translation>Odpowiadanie do</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Messages.qml" line="147"/>
+ <source>Edit</source>
+ <translation>Edytuj</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Messages.qml" line="165"/>
+ <source>Delete</source>
+ <translation>Usuń</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Messages.qml" line="255"/>
+ <source>Download audio</source>
+ <translation>Pobierz dźwięk</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Messages.qml" line="287"/>
+ <location filename="../qml/pages/Messages.qml" line="307"/>
+ <source>View video</source>
+ <translation>Zobacz film</translation>
+ </message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.4.tar.bz2/translations/harbour-sailtrix.ts
^
|
| @@ -208,37 +208,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Messages.qml" line="408"/>
+ <location filename="../qml/pages/Messages.qml" line="409"/>
<source>Message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Messages.qml" line="409"/>
+ <location filename="../qml/pages/Messages.qml" line="410"/>
<source>Send message to room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Messages.qml" line="452"/>
+ <location filename="../qml/pages/Messages.qml" line="453"/>
<source>New Messages</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Messages.qml" line="473"/>
+ <location filename="../qml/pages/Messages.qml" line="474"/>
<source>Send file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/messages.cpp" line="1288"/>
+ <location filename="../src/messages.cpp" line="1289"/>
<source> invited </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/messages.cpp" line="1292"/>
+ <location filename="../src/messages.cpp" line="1293"/>
<source> changed their profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/messages.cpp" line="1294"/>
+ <location filename="../src/messages.cpp" line="1295"/>
<source> joined</source>
<translation type="unfinished"></translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-sailtrix
Summary: Matrix client for SailfishOS
-Version: 1.3.3
+Version: 1.3.4
Release: 0
# The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
|
