[-]
[+]
|
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.7.1</param>
+ <param name="revision">1.3.8</param>
</service>
</services>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.8.tar.bz2/harbour-sailtrix.desktop
^
|
@@ -9,7 +9,7 @@
MimeType=x-scheme-handler/matrix;x-url-handler/matrix.to
-#[X-Sailjail]
-#Permissions=Internet;Audio;Documents;Downloads;PublicDir;Pictures;Videos;Music;RemovableMedia
-#OrganizationName=org.yeheng
-#ApplicationName=sailtrix
+[X-Sailjail]
+Permissions=Internet;Audio;Documents;Downloads;PublicDir;Pictures;Videos;Music;RemovableMedia;Secrets;UserDirs;MediaIndexing
+OrganizationName=org.yeheng
+ApplicationName=sailtrix
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.8.tar.bz2/harbour-sailtrix.pro
^
|
@@ -128,6 +128,7 @@
qml/pages/PictureDisplay.qml \
qml/pages/RoomDirectory.qml \
qml/pages/Rooms.qml \
+ qml/pages/SSOLogin.qml \
qml/pages/Settings.qml \
qml/pages/Start.qml \
qml/pages/User.qml \
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.8.tar.bz2/qml/pages/CreateRoom.qml
^
|
@@ -12,7 +12,6 @@
property string alias_text;
property bool e2ee_enabled;
- title: "Create Room"
CreateRoomBackend {
id: backend
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.8.tar.bz2/qml/pages/LoginDialog.qml
^
|
@@ -35,6 +35,7 @@
id: homeserverUrl
EnterKey.iconSource: "image://theme/icon-m-enter-next"
EnterKey.onClicked: username.focus = true
+ validator: RegExpValidator { regExp: /^((?!-))(xn--)?[a-z0-9][a-z0-9-_]{0,61}[a-z0-9]{0,1}\.(xn--)?([a-z0-9\-]{1,61}|[a-z0-9-]{1,30}\.[a-z]{2,})$/ }
}
TextField {
@@ -44,6 +45,7 @@
id: username
EnterKey.iconSource: "image://theme/icon-m-enter-next"
EnterKey.onClicked: password.focus = true
+ acceptableInput: text.indexOf('@') < 0 && text.indexOf(':') < 0
}
PasswordField {
|
[-]
[+]
|
Added |
_service:tar_git:harbour-sailtrix-1.3.8.tar.bz2/qml/pages/SSOLogin.qml
^
|
@@ -0,0 +1,31 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import LoginBridge 1.0
+
+Dialog {
+ id: loginDialog
+
+ allowedOrientations: Orientation.All
+
+ LoginBridge {
+ id: bridge
+ }
+
+ Column {
+ id: column
+
+ width: parent.width
+ spacing: Theme.paddingLarge
+
+ DialogHeader {
+ title: qsTr("Login with SSO")
+ }
+
+ TextField {
+ label: qsTr("Homeserver")
+ placeholderText: qsTr("Homeserver URL (matrix.org)")
+ width: parent.width
+ id: homeserverUrl
+ }
+ }
+}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.8.tar.bz2/qml/pages/Start.qml
^
|
@@ -41,12 +41,20 @@
}
Button {
- text: qsTr("Log in")
+ text: qsTr("Log in with Username/Password")
preferredWidth: Theme.buttonWidthLarge
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: page.verticalCenter
onClicked: pageStack.push("LoginDialog.qml")
}
+
+ /* For later Button {
+ text: qsTr("Log in with SSO")
+ preferredWidth: Theme.buttonWidthLarge
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: page.verticalCenter
+ onClicked: pageStack.push("LoginDialog.qml")
+ } */
}
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.8.tar.bz2/src/rooms.cpp
^
|
@@ -38,6 +38,11 @@
m_regular_rooms->setSortCaseSensitivity(Qt::CaseInsensitive);
m_regular_rooms->sort(0);
+
+ m_favorites->setSortRole(RoomsModel::name);
+ m_favorites->setSortCaseSensitivity(Qt::CaseInsensitive);
+
+ m_favorites->sort(0);
qDebug() << "Sorted by name";
} else {
m_direct_rooms->setSortRole(RoomsModel::timestamp);
@@ -48,6 +53,11 @@
m_regular_rooms->setSortCaseSensitivity(Qt::CaseInsensitive);
m_regular_rooms->sort(0, Qt::DescendingOrder);
+
+ m_favorites->setSortRole(RoomsModel::timestamp);
+ m_favorites->setSortCaseSensitivity(Qt::CaseInsensitive);
+
+ m_favorites->sort(0, Qt::DescendingOrder);
qDebug() << "Sorted by timestamp";
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix-1.3.8.tar.bz2/translations/harbour-sailtrix.ts
^
|
@@ -4,59 +4,59 @@
<context>
<name>CreateRoom</name>
<message>
- <location filename="../qml/pages/CreateRoom.qml" line="52"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="51"/>
<source>Create Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/CreateRoom.qml" line="53"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="52"/>
<source>Create</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/CreateRoom.qml" line="58"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="57"/>
<source>Visibility</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/CreateRoom.qml" line="60"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="59"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/CreateRoom.qml" line="61"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="60"/>
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../qml/pages/CreateRoom.qml" line="71"/>
<location filename="../qml/pages/CreateRoom.qml" line="72"/>
- <location filename="../qml/pages/CreateRoom.qml" line="73"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/CreateRoom.qml" line="81"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="80"/>
<source>Topic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/CreateRoom.qml" line="82"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="81"/>
<source>Topic (optional)</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../qml/pages/CreateRoom.qml" line="102"/>
<location filename="../qml/pages/CreateRoom.qml" line="103"/>
- <location filename="../qml/pages/CreateRoom.qml" line="104"/>
<source>Room alias</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/CreateRoom.qml" line="121"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="120"/>
<source>Enable end-to-end encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/CreateRoom.qml" line="122"/>
+ <location filename="../qml/pages/CreateRoom.qml" line="121"/>
<source>Bridges and most bots won't work yet.</source>
<translation type="unfinished"></translation>
</message>
@@ -141,17 +141,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/LoginDialog.qml" line="41"/>
+ <location filename="../qml/pages/LoginDialog.qml" line="42"/>
<source>Username</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/LoginDialog.qml" line="42"/>
+ <location filename="../qml/pages/LoginDialog.qml" line="43"/>
<source>Username (user1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/LoginDialog.qml" line="50"/>
+ <location filename="../qml/pages/LoginDialog.qml" line="52"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
@@ -389,7 +389,7 @@
</message>
<message>
<location filename="../qml/custom/RoomsDisplay.qml" line="77"/>
- <source>Favroite</source>
+ <source>Favorite</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -399,6 +399,24 @@
</message>
</context>
<context>
+ <name>SSOLogin</name>
+ <message>
+ <location filename="../qml/pages/SSOLogin.qml" line="21"/>
+ <source>Login with SSO</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/SSOLogin.qml" line="25"/>
+ <source>Homeserver</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/SSOLogin.qml" line="26"/>
+ <source>Homeserver URL (matrix.org)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Settings</name>
<message>
<location filename="../qml/pages/Settings.qml" line="56"/>
@@ -550,7 +568,12 @@
</message>
<message>
<location filename="../qml/pages/Start.qml" line="44"/>
- <source>Log in</source>
+ <source>Log in with Username/Password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Start.qml" line="52"/>
+ <source>Log in with SSO</source>
<translation type="unfinished"></translation>
</message>
</context>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-sailtrix.yaml
^
|
@@ -1,6 +1,6 @@
Name: harbour-sailtrix
Summary: Matrix client for SailfishOS
-Version: 1.3.7.1
+Version: 1.3.8
Release: 1
# The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
@@ -13,6 +13,23 @@
- '%{name}-%{version}.tar.bz2'
Description: |
Matrix client
+
+ %if "%{?vendor}" == "chum"
+ DeveloperName: Heng Ye (HengYeDev)
+ Categories:
+ - Network
+ Custom:
+ Repo: https://gitlab.com/HengYeDev/harbour-sailtrix
+ Icon: https://gitlab.com/HengYeDev/harbour-sailtrix/-/raw/master/icons/172x172/harbour-sailtrix.png
+ Screenshots:
+ - https://openrepos.net/sites/default/files/packages/16540/screenshot-newrooms.png
+ - https://openrepos.net/sites/default/files/packages/16540/screenshot-8.png
+ - https://openrepos.net/sites/default/files/packages/16540/screenshot-messages.png
+ - https://openrepos.net/sites/default/files/packages/16540/screenshot-6.png
+ Url:
+ Donation: https://www.paypal.com/donate?business=YXF5TAF4A3H96&no_recurring=0&item_name=Assist+with+the+development+of+Sailtrix¤cy_code=USD
+ %endif
+
Builder: qmake5
# This section specifies build dependencies that are resolved using pkgconfig.
|