* Hide the import/export button, and set the new identity CheckBox set checked, when start a new Profile generation from Profile Manager.

* Set PluginItem icon size to 24

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5423 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-08-15 09:34:24 +00:00
parent cfe72859bf
commit 26109d88c4
4 changed files with 24 additions and 6 deletions

View File

@ -143,8 +143,8 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
ui.password_input->hide(); ui.password_input->hide();
ui.genPGPuserlabel->show(); ui.genPGPuserlabel->show();
ui.genPGPuser->show(); ui.genPGPuser->show();
ui.exportIdentity_PB->show() ; ui.exportIdentity_PB->show() ;
ui.importIdentity_PB->show() ; ui.importIdentity_PB->show() ;
setWindowTitle(tr("Create new Location")); setWindowTitle(tr("Create new Location"));
ui.genButton->setText(tr("Generate new Location")); ui.genButton->setText(tr("Generate new Location"));
ui.label_3->setText( titleStr.arg( tr("Create a new Location") ) ) ; ui.label_3->setText( titleStr.arg( tr("Create a new Location") ) ) ;
@ -255,6 +255,7 @@ void GenCertDialog::genPerson()
ui.genButton->hide(); ui.genButton->hide();
ui.label_location2->hide(); ui.label_location2->hide();
ui.importIdentity_PB->hide(); ui.importIdentity_PB->hide();
// QMessageBox::StandardButton info = QMessageBox::information(this, // QMessageBox::StandardButton info = QMessageBox::information(this,
// "Generating GPG key", // "Generating GPG key",
// "This process can take some time (approximately one minute), please be patient after pressing the OK button", // "This process can take some time (approximately one minute), please be patient after pressing the OK button",
@ -376,3 +377,10 @@ void GenCertDialog::loadCertificates()
} }
} }
void GenCertDialog::hideButtons()
{
ui.exportIdentity_PB->hide() ;
ui.importIdentity_PB->hide() ;
ui.new_gpg_key_checkbox->setChecked(true);
newGPGKeyGenUiSetup();
}

View File

@ -38,6 +38,9 @@ public:
GenCertDialog(QWidget *parent = 0, Qt::WFlags flags = 0); GenCertDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
/** Default destructor */ /** Default destructor */
void hideButtons();
private slots: private slots:
void genPerson(); void genPerson();
//void loadPerson(); //void loadPerson();
@ -45,11 +48,11 @@ private slots:
void importIdentity(); void importIdentity();
void exportIdentity(); void exportIdentity();
void checkChanged(int i); void checkChanged(int i);
void newGPGKeyGenUiSetup(); void newGPGKeyGenUiSetup();
private: private:
void init() ; void init() ;
/** Loads the saved connectidialog settings */ /** Loads the saved connectidialog settings */
// void loadSettings(); // void loadSettings();

View File

@ -226,6 +226,7 @@ void ProfileManager::loadCertificates()
void ProfileManager::newIdentity() void ProfileManager::newIdentity()
{ {
GenCertDialog gd; GenCertDialog gd;
gd.hideButtons() ;
gd.exec (); gd.exec ();
} }

View File

@ -70,8 +70,8 @@ border-radius: 0px}</string>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
<width>24</width> <width>48</width>
<height>24</height> <height>48</height>
</size> </size>
</property> </property>
<property name="flat"> <property name="flat">
@ -144,6 +144,12 @@ p, li { white-space: pre-wrap; }
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer> </spacer>
</item> </item>
<item> <item>