Skip to content
Snippets Groups Projects
Unverified Commit a7388a70 authored by tastytea's avatar tastytea
Browse files

Use standard buttons where possible

parent f42b2fea
No related branches found
No related tags found
No related merge requests found
Pipeline #2811 passed
......@@ -329,21 +329,12 @@ ApplicationWindow {
footer: DialogButtonBox {
id: buttons
Button {
text: qsTr("Cancel")
DialogButtonBox.buttonRole: DialogButtonBox.DestructiveRole
onClicked: win.close()
standardButtons: DialogButtonBox.Save | DialogButtonBox.Cancel
onAccepted: {
imagePack.save();
win.close();
}
Button {
text: qsTr("Save")
DialogButtonBox.buttonRole: DialogButtonBox.ApplyRole
onClicked: {
imagePack.save();
win.close();
}
}
onRejected: win.close()
}
}
......@@ -54,6 +54,7 @@ ApplicationWindow {
footer: DialogButtonBox {
id: dbb
standardButtons: DialogButtonBox.Cancel
onAccepted: {
Nheko.joinRoom(input.text);
joinRoomRoot.close();
......@@ -68,11 +69,6 @@ ApplicationWindow {
DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
}
Button {
text: "Cancel"
DialogButtonBox.buttonRole: DialogButtonBox.RejectRole
}
}
}
......@@ -38,16 +38,10 @@ CreateRoom::CreateRoom(QWidget *parent)
conf::modals::WIDGET_MARGIN,
conf::modals::WIDGET_MARGIN);
auto buttonLayout = new QHBoxLayout();
buttonLayout->setSpacing(15);
buttonBox_ = new QDialogButtonBox(QDialogButtonBox::Cancel);
confirmBtn_ = new QPushButton(tr("Create room"), this);
confirmBtn_->setDefault(true);
cancelBtn_ = new QPushButton(tr("Cancel"), this);
buttonLayout->addStretch(1);
buttonLayout->addWidget(cancelBtn_);
buttonLayout->addWidget(confirmBtn_);
buttonBox_->addButton(confirmBtn_, QDialogButtonBox::AcceptRole);
QFont font;
font.setPointSizeF(font.pointSizeF() * 1.3);
......@@ -101,9 +95,9 @@ CreateRoom::CreateRoom(QWidget *parent)
layout->addLayout(visibilityLayout);
layout->addLayout(presetLayout);
layout->addLayout(directLayout);
layout->addLayout(buttonLayout);
layout->addWidget(buttonBox_);
connect(confirmBtn_, &QPushButton::clicked, this, [this]() {
connect(buttonBox_, &QDialogButtonBox::accepted, this, [this]() {
request_.name = nameInput_->text().toStdString();
request_.topic = topicInput_->text().toStdString();
request_.room_alias_name = aliasInput_->text().toStdString();
......@@ -114,7 +108,7 @@ CreateRoom::CreateRoom(QWidget *parent)
emit close();
});
connect(cancelBtn_, &QPushButton::clicked, this, [this]() {
connect(buttonBox_, &QDialogButtonBox::rejected, this, [this]() {
clearFields();
emit close();
});
......
......@@ -5,6 +5,7 @@
#pragma once
#include <QDialogButtonBox>
#include <QFrame>
#include <mtx/requests.hpp>
......@@ -37,7 +38,7 @@ private:
Toggle *directToggle_;
QPushButton *confirmBtn_;
QPushButton *cancelBtn_;
QDialogButtonBox *buttonBox_;
TextField *nameInput_;
TextField *topicInput_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment