ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow sending encrypted messages if build supports it

Browse Source
This commit is contained in:
Tobias Fella
2022-05-19 23:27:53 +02:00
parent ded60b906b
commit b1581a54d1
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
imports/NeoChat/Component/ChatBox/ChatBar.qml
View File

@@ -94,11 +94,11 @@ ToolBar {
//property int lineHeight: contentHeight / lineCount //property int lineHeight: contentHeight / lineCount
text: inputFieldText text: inputFieldText
placeholderText: currentRoom.usesEncryption ? i18n("This room is encrypted. Sending encrypted messages is not yet supported.") : editEventId.length > 0 ? i18n("Edit Message") : i18n("Write your message...") placeholderText: readOnly ? i18n("This room is encrypted. Sending encrypted messages is not yet supported.") : editEventId.length > 0 ? i18n("Edit Message") : currentRoom.usesEncryption ? i18n("Send an encrypted message…") : i18n("Send a message…")
verticalAlignment: TextEdit.AlignVCenter verticalAlignment: TextEdit.AlignVCenter
horizontalAlignment: TextEdit.AlignLeft horizontalAlignment: TextEdit.AlignLeft
wrapMode: Text.Wrap wrapMode: Text.Wrap
readOnly: currentRoom.usesEncryption readOnly: currentRoom.usesEncryption && !Controller.encryptionSupported
Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.colorSet: Kirigami.Theme.View
Kirigami.Theme.inherit: false Kirigami.Theme.inherit: false

11
src/controller.cpp
View File

@@ -706,4 +706,13 @@ bool Controller::hasWindowSystem() const
QString Controller::plainText(QQuickTextDocument *document) const QString Controller::plainText(QQuickTextDocument *document) const
{ {
return document->textDocument()->toPlainText(); return document->textDocument()->toPlainText();
} }
bool Controller::encryptionSupported() const
{
#ifdef QUOTIENT_07
return Quotient::encryptionSupported();
#else
return false;
#endif
}

2
src/controller.h
View File

@@ -41,6 +41,7 @@ class Controller : public QObject
Q_PROPERTY(bool supportSystemTray READ supportSystemTray CONSTANT) Q_PROPERTY(bool supportSystemTray READ supportSystemTray CONSTANT)
Q_PROPERTY(bool hasWindowSystem READ hasWindowSystem CONSTANT) Q_PROPERTY(bool hasWindowSystem READ hasWindowSystem CONSTANT)
Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged) Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
Q_PROPERTY(bool encryptionSupported READ encryptionSupported CONSTANT)
public: public:
static Controller &instance(); static Controller &instance();
@@ -96,6 +97,7 @@ public:
Q_INVOKABLE void setBlur(QQuickItem *item, bool blur); Q_INVOKABLE void setBlur(QQuickItem *item, bool blur);
Q_INVOKABLE void raiseWindow(QWindow *window); Q_INVOKABLE void raiseWindow(QWindow *window);
Q_INVOKABLE QString plainText(QQuickTextDocument *document) const; Q_INVOKABLE QString plainText(QQuickTextDocument *document) const;
bool encryptionSupported() const;
private: private:
explicit Controller(QObject *parent = nullptr); explicit Controller(QObject *parent = nullptr);