Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-02 18:44:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switched to use QPushButton for GxsGroupDialog

Browse Source
This commit is contained in:
defnax 2020-10-15 21:48:18 +02:00
parent 34ca2bdb71
commit 42042c807b
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
View File

@ -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;
}

17
retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1231</width>
<height>967</height>
<height>529</height>
</rect>
</property>
<property name="windowTitle">
@ -785,10 +785,10 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="1">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<item row="0" column="2">
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
@ -805,6 +805,13 @@
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="createButton">
<property name="text">
<string>Create</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

4
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -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;

4
retroshare-gui/src/qss/qdarkstyle-v2.qss
View File

@ -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;

4
retroshare-gui/src/qss/qdarkstyle.qss
View File

@ -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;