Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed the group QComboBox layout and position

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3564 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-09-29 20:56:40 +00:00
parent 35054699bc
commit 1239bf88ee
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -880,17 +880,32 @@ ConclusionPage::ConclusionPage(QWidget *parent) : QWizardPage(parent) {
peerDetailsFrame->setLayout(peerDetailsLayout);
optionsFrame = new QGroupBox;
optionsFrame ->setTitle( tr("Options") );
optionsLayout = new QGridLayout();
groupLabel = new QLabel( tr("Add friend to group:") );
optionsLayout->addWidget(groupLabel, 0,0,1,1);
groupComboBox = new QComboBox(this);
optionsLayout->addWidget(groupComboBox, 0,1,1,1);
optionsFrame->setLayout(optionsLayout);
signGPGCheckBox = new QCheckBox();
signGPGCheckBox->setText(tr("Authenticate friend (Sign GPG Key)"));
registerField(SIGN_RADIO_BUTTON_FIELD_CONNECT_FRIEND_WIZARD,signGPGCheckBox);
acceptNoSignGPGCheckBox = new QCheckBox();
acceptNoSignGPGCheckBox->setText(tr("Add as friend to connect with"));
registerField(ACCEPT_RADIO_BUTTON_FIELD_CONNECT_FRIEND_WIZARD,acceptNoSignGPGCheckBox);
peerDetailsLayout->addWidget(acceptNoSignGPGCheckBox, 5,0,1,-1); // QWidget * widget, int fromRow, int fromColumn, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 )
peerDetailsLayout->addWidget(signGPGCheckBox, 6,0,1,-1); // QWidget * widget, int fromRow, int fromColumn, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 )
optionsLayout->addWidget(acceptNoSignGPGCheckBox, 5,0,1,-1); // QWidget * widget, int fromRow, int fromColumn, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 )
optionsLayout->addWidget(signGPGCheckBox, 6,0,1,-1); // QWidget * widget, int fromRow, int fromColumn, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 )
conclusionPageLayout = new QVBoxLayout();
conclusionPageLayout->addWidget(peerDetailsFrame);
conclusionPageLayout->addWidget(optionsFrame);
setLayout(conclusionPageLayout);
@ -931,9 +946,8 @@ ConclusionPage::ConclusionPage(QWidget *parent) : QWizardPage(parent) {
dyndns->setVisible(false);
registerField("dyndns",dyndns);
groupComboBox = new QComboBox(this);
groupLabel = new QLabel(this);
groupLabel->setVisible(false);
//groupLabel = new QLabel(this);
//groupLabel->setVisible(false);
registerField(GROUP_ID_FIELD_CONNECT_FRIEND_WIZARD, groupLabel);
}

2
retroshare-gui/src/gui/connect/ConnectFriendWizard.h
View File

@ -217,6 +217,8 @@ private slots:
private:
QGroupBox* peerDetailsFrame;
QGridLayout* peerDetailsLayout;
QGroupBox* optionsFrame;
QGridLayout* optionsLayout;
QLabel* trustLabel;
QLabel* trustEdit;
QLabel* nameLabel;