mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-15 09:27:09 -05:00
fixed the group QComboBox layout and position
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3564 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
35054699bc
commit
1239bf88ee
@ -880,17 +880,32 @@ ConclusionPage::ConclusionPage(QWidget *parent) : QWizardPage(parent) {
|
|||||||
|
|
||||||
peerDetailsFrame->setLayout(peerDetailsLayout);
|
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 = new QCheckBox();
|
||||||
signGPGCheckBox->setText(tr("Authenticate friend (Sign GPG Key)"));
|
signGPGCheckBox->setText(tr("Authenticate friend (Sign GPG Key)"));
|
||||||
registerField(SIGN_RADIO_BUTTON_FIELD_CONNECT_FRIEND_WIZARD,signGPGCheckBox);
|
registerField(SIGN_RADIO_BUTTON_FIELD_CONNECT_FRIEND_WIZARD,signGPGCheckBox);
|
||||||
acceptNoSignGPGCheckBox = new QCheckBox();
|
acceptNoSignGPGCheckBox = new QCheckBox();
|
||||||
acceptNoSignGPGCheckBox->setText(tr("Add as friend to connect with"));
|
acceptNoSignGPGCheckBox->setText(tr("Add as friend to connect with"));
|
||||||
registerField(ACCEPT_RADIO_BUTTON_FIELD_CONNECT_FRIEND_WIZARD,acceptNoSignGPGCheckBox);
|
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 )
|
optionsLayout->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(signGPGCheckBox, 6,0,1,-1); // QWidget * widget, int fromRow, int fromColumn, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 )
|
||||||
|
|
||||||
|
|
||||||
conclusionPageLayout = new QVBoxLayout();
|
conclusionPageLayout = new QVBoxLayout();
|
||||||
conclusionPageLayout->addWidget(peerDetailsFrame);
|
conclusionPageLayout->addWidget(peerDetailsFrame);
|
||||||
|
conclusionPageLayout->addWidget(optionsFrame);
|
||||||
|
|
||||||
setLayout(conclusionPageLayout);
|
setLayout(conclusionPageLayout);
|
||||||
|
|
||||||
@ -931,9 +946,8 @@ ConclusionPage::ConclusionPage(QWidget *parent) : QWizardPage(parent) {
|
|||||||
dyndns->setVisible(false);
|
dyndns->setVisible(false);
|
||||||
registerField("dyndns",dyndns);
|
registerField("dyndns",dyndns);
|
||||||
|
|
||||||
groupComboBox = new QComboBox(this);
|
//groupLabel = new QLabel(this);
|
||||||
groupLabel = new QLabel(this);
|
//groupLabel->setVisible(false);
|
||||||
groupLabel->setVisible(false);
|
|
||||||
registerField(GROUP_ID_FIELD_CONNECT_FRIEND_WIZARD, groupLabel);
|
registerField(GROUP_ID_FIELD_CONNECT_FRIEND_WIZARD, groupLabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -217,6 +217,8 @@ private slots:
|
|||||||
private:
|
private:
|
||||||
QGroupBox* peerDetailsFrame;
|
QGroupBox* peerDetailsFrame;
|
||||||
QGridLayout* peerDetailsLayout;
|
QGridLayout* peerDetailsLayout;
|
||||||
|
QGroupBox* optionsFrame;
|
||||||
|
QGridLayout* optionsLayout;
|
||||||
QLabel* trustLabel;
|
QLabel* trustLabel;
|
||||||
QLabel* trustEdit;
|
QLabel* trustEdit;
|
||||||
QLabel* nameLabel;
|
QLabel* nameLabel;
|
||||||
|
Loading…
Reference in New Issue
Block a user