Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-03 02:50:07 -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() void GxsGroupDialog::init()
{ {
// connect up the buttons. // connect up the buttons.
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(submitGroup())); connect(ui.createButton, SIGNAL(clicked()), this, SLOT(submitGroup()));
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(cancelDialog())); connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(cancelDialog()));
connect(ui.pubKeyShare_cb, SIGNAL(clicked()), this, SLOT(setShareList())); connect(ui.pubKeyShare_cb, SIGNAL(clicked()), this, SLOT(setShareList()));
connect(ui.addAdmins_cb, SIGNAL(clicked()), this, SLOT(setAdminsList())); connect(ui.addAdmins_cb, SIGNAL(clicked()), this, SLOT(setAdminsList()));
connect(ui.filtercomboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged(int))); 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); //ui.contactsdockWidget->setWindowTitle(text);
break; break;
case UITYPE_BUTTONBOX_OK: case UITYPE_BUTTONBOX_OK:
ui.buttonBox->button(QDialogButtonBox::Ok)->setText(text); ui.createButton->setText(text);
break; break;
} }
} }
@ -210,7 +210,7 @@ void GxsGroupDialog::setUiToolTip(UiType uiType, const QString &text)
ui.addAdmins_cb->setToolTip(text); ui.addAdmins_cb->setToolTip(text);
break; break;
case UITYPE_BUTTONBOX_OK: case UITYPE_BUTTONBOX_OK:
ui.buttonBox->button(QDialogButtonBox::Ok)->setToolTip(text); ui.createButton->setToolTip(text);
default: default:
break; break;
} }
@ -224,7 +224,6 @@ void GxsGroupDialog::initMode()
case MODE_CREATE: case MODE_CREATE:
{ {
ui.stackedWidget->setCurrentIndex(0); ui.stackedWidget->setCurrentIndex(0);
ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
newGroup(); newGroup();
} }
break; break;
@ -233,15 +232,14 @@ void GxsGroupDialog::initMode()
{ {
ui.stackedWidget->setCurrentIndex(1); ui.stackedWidget->setCurrentIndex(1);
mReadonlyFlags = 0xffffffff; // Force all to readonly. mReadonlyFlags = 0xffffffff; // Force all to readonly.
ui.buttonBox->setStandardButtons(QDialogButtonBox::Close); ui.createButton->hide();
} }
break; break;
case MODE_EDIT: case MODE_EDIT:
{ {
ui.stackedWidget->setCurrentIndex(0); ui.stackedWidget->setCurrentIndex(0);
ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); ui.createButton->setText(tr("Submit Group Changes"));
ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Submit Group Changes"));
} }
break; break;
} }

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

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1231</width> <width>1231</width>
<height>967</height> <height>529</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -785,10 +785,10 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="1"> <item row="0" column="2">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QPushButton" name="cancelButton">
<property name="standardButtons"> <property name="text">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <string>Cancel</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -805,6 +805,13 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="1">
<widget class="QPushButton" name="createButton">
<property name="text">
<string>Create</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </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, CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton,
IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton,
GxsCreateCommentDialog QPushButton#postButton { GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton {
font: bold; font: bold;
font-size: 15px; font-size: 15px;
color: white; color: white;
@ -148,7 +148,7 @@ GxsCreateCommentDialog QPushButton#postButton {
CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover,
IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover,
GxsCreateCommentDialog QPushButton#postButton:hover { GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover {
background: #03b1f3; background: #03b1f3;
border-radius: 4px; border-radius: 4px;
min-width: 4em; 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, CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton,
IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton,
GxsCreateCommentDialog QPushButton#postButton { GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton {
font: bold; font: bold;
font-size: 15px; font-size: 15px;
color: white; color: white;
@ -2102,7 +2102,7 @@ GxsCreateCommentDialog QPushButton#postButton {
CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover,
IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover,
GxsCreateCommentDialog QPushButton#postButton:hover { GxsCreateCommentDialog QPushButton#postButton:hover, , GxsGroupDialog QPushButton#createButton:hover {
background: #03b1f3; background: #03b1f3;
border-radius: 4px; border-radius: 4px;
min-width: 4em; 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, CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton,
IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton,
GxsCreateCommentDialog QPushButton#postButton { GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton {
font: bold; font: bold;
font-size: 15px; font-size: 15px;
color: white; color: white;
@ -1254,7 +1254,7 @@ GxsCreateCommentDialog QPushButton#postButton {
CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover,
IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover,
GxsCreateCommentDialog QPushButton#postButton:hover { GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover {
background: #03b1f3; background: #03b1f3;
border-radius: 4px; border-radius: 4px;
min-width: 4em; min-width: 4em;