Compare commits
10 Commits
master
...
work/fix_c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a244293f9f | ||
|
|
50ad18d095 | ||
|
|
ca53d163eb | ||
|
|
3bac752463 | ||
|
|
2ba3d970e1 | ||
|
|
a19502ca40 | ||
|
|
1b2919587a | ||
|
|
e5420973f5 | ||
|
|
931d20fecd | ||
|
|
725c6c30ce |
@@ -145,7 +145,7 @@ void CompletionModel::updateCompletion()
|
|||||||
m_filterModel->setFullText(m_fullText);
|
m_filterModel->setFullText(m_fullText);
|
||||||
m_filterModel->setFilterText(m_text);
|
m_filterModel->setFilterText(m_text);
|
||||||
m_filterModel->invalidate();
|
m_filterModel->invalidate();
|
||||||
} else if (text().startsWith(QLatin1Char(':')) && !text()[1].isUpper()
|
} else if (text().startsWith(QLatin1Char(':')) && text().size() > 1 && !text()[1].isUpper()
|
||||||
&& (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
|
&& (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
|
||||||
|| (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
|
|| (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
|
||||||
m_filterModel->setSourceModel(m_emojiModel);
|
m_filterModel->setSourceModel(m_emojiModel);
|
||||||
|
|||||||
@@ -31,15 +31,15 @@ Kirigami.Page {
|
|||||||
imageDoc.crop(selectionTool.selectionX / ratioX, selectionTool.selectionY / ratioY, selectionTool.selectionWidth / ratioX, selectionTool.selectionHeight / ratioY);
|
imageDoc.crop(selectionTool.selectionX / ratioX, selectionTool.selectionY / ratioY, selectionTool.selectionWidth / ratioX, selectionTool.selectionHeight / ratioY);
|
||||||
}
|
}
|
||||||
|
|
||||||
actions {
|
actions: [
|
||||||
left: Kirigami.Action {
|
Kirigami.Action {
|
||||||
id: undoAction
|
id: undoAction
|
||||||
text: i18nc("@action:button Undo modification", "Undo")
|
text: i18nc("@action:button Undo modification", "Undo")
|
||||||
icon.name: "edit-undo"
|
icon.name: "edit-undo"
|
||||||
onTriggered: imageDoc.undo();
|
onTriggered: imageDoc.undo();
|
||||||
visible: imageDoc.edited
|
visible: imageDoc.edited
|
||||||
}
|
},
|
||||||
main: Kirigami.Action {
|
Kirigami.Action {
|
||||||
id: okAction
|
id: okAction
|
||||||
text: i18nc("@action:button Accept image modification", "Accept")
|
text: i18nc("@action:button Accept image modification", "Accept")
|
||||||
icon.name: "dialog-ok"
|
icon.name: "dialog-ok"
|
||||||
@@ -54,7 +54,7 @@ Kirigami.Page {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -122,10 +122,10 @@ Kirigami.ScrollablePage {
|
|||||||
|
|
||||||
title: i18nc("@title:window", "Add server")
|
title: i18nc("@title:window", "Add server")
|
||||||
|
|
||||||
onSheetOpenChanged: if (!serverUrlField.isValidServer && !sheetOpen) {
|
onOpened: if (!serverUrlField.isValidServer && !opened) {
|
||||||
serverField.currentIndex = 0
|
serverField.currentIndex = 0
|
||||||
server = serverField.currentValue
|
server = serverField.currentValue
|
||||||
} else if (sheetOpen) {
|
} else if (opened) {
|
||||||
serverUrlField.forceActiveFocus()
|
serverUrlField.forceActiveFocus()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ RowLayout {
|
|||||||
text: i18n("Create a Space")
|
text: i18n("Create a Space")
|
||||||
icon.name: "list-add"
|
icon.name: "list-add"
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
let dialog = createSpaceDialog.createObject(root.overlay);
|
let dialog = createSpaceDialog.createObject(applicationWindow().overlay);
|
||||||
dialog.open()
|
dialog.open()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,13 +27,13 @@ Kirigami.Page {
|
|||||||
focus: true
|
focus: true
|
||||||
padding: 0
|
padding: 0
|
||||||
|
|
||||||
actions {
|
actions: [
|
||||||
main: Kirigami.Action {
|
Kirigami.Action {
|
||||||
visible: Kirigami.Settings.isMobile || !applicationWindow().pageStack.wideMode
|
visible: Kirigami.Settings.isMobile || !applicationWindow().pageStack.wideMode
|
||||||
icon.name: "view-right-new"
|
icon.name: "view-right-new"
|
||||||
onTriggered: applicationWindow().openRoomDrawer()
|
onTriggered: applicationWindow().openRoomDrawer()
|
||||||
}
|
}
|
||||||
}
|
]
|
||||||
|
|
||||||
KeyNavigation.left: pageStack.get(0)
|
KeyNavigation.left: pageStack.get(0)
|
||||||
|
|
||||||
|
|||||||
@@ -31,12 +31,12 @@ Kirigami.ScrollablePage {
|
|||||||
|
|
||||||
title: roomInformation.title
|
title: roomInformation.title
|
||||||
|
|
||||||
actions {
|
actions: [
|
||||||
main: Kirigami.Action {
|
Kirigami.Action {
|
||||||
icon.name: "settings-configure"
|
icon.name: "settings-configure"
|
||||||
onTriggered: applicationWindow().pageStack.pushDialogLayer('qrc:/Categories.qml', {room: root.room}, { title: i18n("Room Settings") })
|
onTriggered: applicationWindow().pageStack.pushDialogLayer('qrc:/Categories.qml', {room: root.room}, { title: i18n("Room Settings") })
|
||||||
}
|
}
|
||||||
}
|
]
|
||||||
|
|
||||||
RoomInformation {
|
RoomInformation {
|
||||||
id: roomInformation
|
id: roomInformation
|
||||||
|
|||||||
@@ -21,9 +21,9 @@ Registration::Registration()
|
|||||||
{
|
{
|
||||||
auto server = new QTcpServer(this);
|
auto server = new QTcpServer(this);
|
||||||
server->listen(QHostAddress("127.0.0.1"_ls), 20847);
|
server->listen(QHostAddress("127.0.0.1"_ls), 20847);
|
||||||
connect(server, &QTcpServer::newConnection, this, [=]() {
|
connect(server, &QTcpServer::newConnection, this, [this, server]() {
|
||||||
auto conn = server->nextPendingConnection();
|
auto conn = server->nextPendingConnection();
|
||||||
connect(conn, &QIODevice::readyRead, this, [=]() {
|
connect(conn, &QIODevice::readyRead, this, [this, conn]() {
|
||||||
auto code =
|
auto code =
|
||||||
"HTTP/1.0 200\nContent-type: text/html\n\n<html><head><script src=\"https://www.google.com/recaptcha/api.js\" async defer></script></head><body style=\"background: #00000000\"><center><div class=\"g-recaptcha\" data-sitekey=\"%1\"></div></center></body></html>"_ls
|
"HTTP/1.0 200\nContent-type: text/html\n\n<html><head><script src=\"https://www.google.com/recaptcha/api.js\" async defer></script></head><body style=\"background: #00000000\"><center><div class=\"g-recaptcha\" data-sitekey=\"%1\"></div></center></body></html>"_ls
|
||||||
.arg(m_recaptchaSiteKey);
|
.arg(m_recaptchaSiteKey);
|
||||||
@@ -86,7 +86,7 @@ void Registration::registerAccount()
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
auto job = m_connection->callApi<NeoChatRegisterJob>("user"_ls, authData, m_username, m_password, QString(), QString(), true);
|
auto job = m_connection->callApi<NeoChatRegisterJob>("user"_ls, authData, m_username, m_password, QString(), QString(), true);
|
||||||
connect(job, &BaseJob::result, this, [=]() {
|
connect(job, &BaseJob::result, this, [this, job]() {
|
||||||
if (job->status() == BaseJob::Success) {
|
if (job->status() == BaseJob::Success) {
|
||||||
setNextStep("loading"_ls);
|
setNextStep("loading"_ls);
|
||||||
auto connection = new NeoChatConnection(this);
|
auto connection = new NeoChatConnection(this);
|
||||||
@@ -332,7 +332,7 @@ void Registration::registerEmail()
|
|||||||
data.sendAttempt = 0;
|
data.sendAttempt = 0;
|
||||||
|
|
||||||
auto job = m_connection->callApi<RequestTokenToRegisterEmailJob>(data);
|
auto job = m_connection->callApi<RequestTokenToRegisterEmailJob>(data);
|
||||||
connect(job, &BaseJob::finished, this, [=]() {
|
connect(job, &BaseJob::finished, this, [this, job]() {
|
||||||
m_sid = job->jsonData()["sid"_ls].toString();
|
m_sid = job->jsonData()["sid"_ls].toString();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user