Fix minor typos
This commit is contained in:
@@ -45,7 +45,7 @@ Flow {
|
|||||||
|
|
||||||
for (var i = 0; i < modelData.authors.length; i++) {
|
for (var i = 0; i < modelData.authors.length; i++) {
|
||||||
if (i === modelData.authors.length - 1 && i !== 0) {
|
if (i === modelData.authors.length - 1 && i !== 0) {
|
||||||
text += i18nc("Seperate the usernames of users", " and ")
|
text += i18nc("Separate the usernames of users", " and ")
|
||||||
} else if (i !== 0) {
|
} else if (i !== 0) {
|
||||||
text += ", "
|
text += ", "
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ void ActionsHandler::joinRoom(const QString &alias)
|
|||||||
auto joinRoomJob = m_connection->joinRoom(alias, QStringList{knownServer});
|
auto joinRoomJob = m_connection->joinRoom(alias, QStringList{knownServer});
|
||||||
|
|
||||||
Quotient::JoinRoomJob::connect(joinRoomJob, &JoinRoomJob::failure, [=] {
|
Quotient::JoinRoomJob::connect(joinRoomJob, &JoinRoomJob::failure, [=] {
|
||||||
Q_EMIT showMessage(MessageType::Error, i18n("Serveur error when joining the room \"%1\": %2",
|
Q_EMIT showMessage(MessageType::Error, i18n("Server error when joining the room \"%1\": %2",
|
||||||
joinRoomJob->errorString()));
|
joinRoomJob->errorString()));
|
||||||
});
|
});
|
||||||
Quotient::JoinRoomJob::connect(joinRoomJob, &JoinRoomJob::success, [this, joinRoomJob] {
|
Quotient::JoinRoomJob::connect(joinRoomJob, &JoinRoomJob::success, [this, joinRoomJob] {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ class ActionsHandler : public QObject
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
/// \brief List of command definition. Usefull for buiding an autcompletion
|
/// \brief List of command definition. Useful for building an autcompletion
|
||||||
/// engine or an help dialog.
|
/// engine or an help dialog.
|
||||||
Q_PROPERTY(QVariantList commands READ commands CONSTANT)
|
Q_PROPERTY(QVariantList commands READ commands CONSTANT)
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ Q_SIGNALS:
|
|||||||
/// These messages will be displayed in the room view header.
|
/// These messages will be displayed in the room view header.
|
||||||
void showMessage(MessageType messageType, QString message);
|
void showMessage(MessageType messageType, QString message);
|
||||||
|
|
||||||
/// \brief Emmited when an action made the user join a room.
|
/// \brief Emitted when an action made the user join a room.
|
||||||
///
|
///
|
||||||
/// Either when a new room was created, a direct chat was started
|
/// Either when a new room was created, a direct chat was started
|
||||||
/// or a group chat was joined. The UI will react to this signal
|
/// or a group chat was joined. The UI will react to this signal
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public:
|
|||||||
void setRoom(NeoChatRoom *room);
|
void setRoom(NeoChatRoom *room);
|
||||||
|
|
||||||
/// This function will look at the current QTextCursor and determine if there
|
/// This function will look at the current QTextCursor and determine if there
|
||||||
/// is the posibility to autocomplete it.
|
/// is the possibility to autocomplete it.
|
||||||
Q_INVOKABLE QVariantMap getAutocompletionInfo();
|
Q_INVOKABLE QVariantMap getAutocompletionInfo();
|
||||||
Q_INVOKABLE void replaceAutoComplete(const QString &word);
|
Q_INVOKABLE void replaceAutoComplete(const QString &word);
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ bool Clipboard::saveImage(const QUrl &localPath) const
|
|||||||
void Clipboard::saveText(QString message)
|
void Clipboard::saveText(QString message)
|
||||||
{
|
{
|
||||||
QRegularExpression re("<[^>]*>");
|
QRegularExpression re("<[^>]*>");
|
||||||
auto *mineData = new QMimeData; // ownership is transfered to clipboard
|
auto *mineData = new QMimeData; // ownership is transferred to clipboard
|
||||||
mineData->setHtml(message);
|
mineData->setHtml(message);
|
||||||
mineData->setText(message.replace(re, ""));
|
mineData->setText(message.replace(re, ""));
|
||||||
m_clipboard->setMimeData(mineData);
|
m_clipboard->setMimeData(mineData);
|
||||||
|
|||||||
@@ -91,10 +91,10 @@ private Q_SLOTS:
|
|||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
void busyChanged();
|
void busyChanged();
|
||||||
/// Error occured because of user inputs
|
/// Error occurred because of user inputs
|
||||||
void errorOccured(QString error, QString detail);
|
void errorOccured(QString error, QString detail);
|
||||||
|
|
||||||
/// Error occured because of server or bug in NeoChat
|
/// Error occurred because of server or bug in NeoChat
|
||||||
void globalErrorOccured(QString error, QString detail);
|
void globalErrorOccured(QString error, QString detail);
|
||||||
void syncDone();
|
void syncDone();
|
||||||
void connectionAdded(Quotient::Connection *_t1);
|
void connectionAdded(Quotient::Connection *_t1);
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ public:
|
|||||||
|
|
||||||
Q_INVOKABLE QString suffixForFileName(const QString &fileName) const;
|
Q_INVOKABLE QString suffixForFileName(const QString &fileName) const;
|
||||||
|
|
||||||
// These return a list of file extentions, not mimetypes
|
// These return a list of file extensions, not mimetypes
|
||||||
QStringList supportedImageFormats() const;
|
QStringList supportedImageFormats() const;
|
||||||
QStringList supportedAnimatedImageFormats() const;
|
QStringList supportedAnimatedImageFormats() const;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user