From 42042c807b8d1d2281aae6015f9f1ea8860b1af9 Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 15 Oct 2020 21:48:18 +0200 Subject: [PATCH] Switched to use QPushButton for GxsGroupDialog --- retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 14 ++++++-------- retroshare-gui/src/gui/gxs/GxsGroupDialog.ui | 17 ++++++++++++----- .../src/gui/qss/stylesheet/Standard.qss | 4 ++-- retroshare-gui/src/qss/qdarkstyle-v2.qss | 4 ++-- retroshare-gui/src/qss/qdarkstyle.qss | 4 ++-- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 240f321db..ff1919403 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -92,8 +92,8 @@ GxsGroupDialog::~GxsGroupDialog() void GxsGroupDialog::init() { // connect up the buttons. - connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(submitGroup())); - connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(cancelDialog())); + connect(ui.createButton, SIGNAL(clicked()), this, SLOT(submitGroup())); + connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(cancelDialog())); connect(ui.pubKeyShare_cb, SIGNAL(clicked()), this, SLOT(setShareList())); connect(ui.addAdmins_cb, SIGNAL(clicked()), this, SLOT(setAdminsList())); connect(ui.filtercomboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged(int))); @@ -194,7 +194,7 @@ void GxsGroupDialog::setUiText(UiType uiType, const QString &text) //ui.contactsdockWidget->setWindowTitle(text); break; case UITYPE_BUTTONBOX_OK: - ui.buttonBox->button(QDialogButtonBox::Ok)->setText(text); + ui.createButton->setText(text); break; } } @@ -210,7 +210,7 @@ void GxsGroupDialog::setUiToolTip(UiType uiType, const QString &text) ui.addAdmins_cb->setToolTip(text); break; case UITYPE_BUTTONBOX_OK: - ui.buttonBox->button(QDialogButtonBox::Ok)->setToolTip(text); + ui.createButton->setToolTip(text); default: break; } @@ -224,7 +224,6 @@ void GxsGroupDialog::initMode() case MODE_CREATE: { ui.stackedWidget->setCurrentIndex(0); - ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); newGroup(); } break; @@ -233,15 +232,14 @@ void GxsGroupDialog::initMode() { ui.stackedWidget->setCurrentIndex(1); mReadonlyFlags = 0xffffffff; // Force all to readonly. - ui.buttonBox->setStandardButtons(QDialogButtonBox::Close); + ui.createButton->hide(); } break; case MODE_EDIT: { ui.stackedWidget->setCurrentIndex(0); - ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Submit Group Changes")); + ui.createButton->setText(tr("Submit Group Changes")); } break; } diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 88777cd59..e9ffcbb4d 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -7,7 +7,7 @@ 0 0 1231 - 967 + 529 @@ -785,10 +785,10 @@ QFrame::Raised - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + Cancel @@ -805,6 +805,13 @@ + + + + Create + + + diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 7303328be..a5ea03eca 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -135,7 +135,7 @@ CreateGxsChannelMsg QPushButton#postButton:hover { CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton, IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, -GxsCreateCommentDialog QPushButton#postButton { +GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton { font: bold; font-size: 15px; color: white; @@ -148,7 +148,7 @@ GxsCreateCommentDialog QPushButton#postButton { CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, -GxsCreateCommentDialog QPushButton#postButton:hover { +GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover { background: #03b1f3; border-radius: 4px; min-width: 4em; diff --git a/retroshare-gui/src/qss/qdarkstyle-v2.qss b/retroshare-gui/src/qss/qdarkstyle-v2.qss index 37db76884..24b9fed24 100644 --- a/retroshare-gui/src/qss/qdarkstyle-v2.qss +++ b/retroshare-gui/src/qss/qdarkstyle-v2.qss @@ -2089,7 +2089,7 @@ CreateGxsChannelMsg QPushButton#postButton:hover { CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton, IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, -GxsCreateCommentDialog QPushButton#postButton { +GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton { font: bold; font-size: 15px; color: white; @@ -2102,7 +2102,7 @@ GxsCreateCommentDialog QPushButton#postButton { CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, -GxsCreateCommentDialog QPushButton#postButton:hover { +GxsCreateCommentDialog QPushButton#postButton:hover, , GxsGroupDialog QPushButton#createButton:hover { background: #03b1f3; border-radius: 4px; min-width: 4em; diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss index 022e6eba0..7e3a78506 100644 --- a/retroshare-gui/src/qss/qdarkstyle.qss +++ b/retroshare-gui/src/qss/qdarkstyle.qss @@ -1241,7 +1241,7 @@ CreateGxsChannelMsg QPushButton#postButton:hover { CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton, IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, -GxsCreateCommentDialog QPushButton#postButton { +GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton { font: bold; font-size: 15px; color: white; @@ -1254,7 +1254,7 @@ GxsCreateCommentDialog QPushButton#postButton { CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, -GxsCreateCommentDialog QPushButton#postButton:hover { +GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover { background: #03b1f3; border-radius: 4px; min-width: 4em;