ported branch v0.5.0 commits 2623, 2624, 2626, 2633, 2634, 2643, 2644, 2646, 2651 and 2654 to trunk

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-28 20:46:45 +00:00
parent 12536efd16
commit 08065b4298
22 changed files with 264 additions and 299 deletions

View file

@ -206,16 +206,14 @@ TextPage::TextPage(QWidget *parent)
userCertEdit = new QTextEdit;
std::string invite = rsPeers->GetRetroshareInvite();
userCertEdit->setText(QString::fromStdString(invite));
userCertEdit->setReadOnly(true);
userCertEdit->setMinimumHeight(200);
userCertEdit->setMinimumWidth(530);
QFont font;
font.setPointSize(10);
font.setBold(false);
font.setStyleHint(QFont::TypeWriter, QFont::PreferDefault);
//font.setWeight(75);
QFont font("Courier New",10,50,false);
font.setStyleHint(QFont::TypeWriter,QFont::PreferMatch);
font.setStyle(QFont::StyleNormal);
userCertEdit->setFont(font);
userCertEdit->setText(QString::fromStdString(invite));
std::cerr << "TextPage() getting Invite: " << invite << std::endl;
@ -270,6 +268,9 @@ TextPage::TextPage(QWidget *parent)
friendCertEdit = new QTextEdit;
//font.setWeight(75);
friendCertEdit->setFont(font);
//=== add all widgets to one layout
textPageLayout = new QVBoxLayout();
textPageLayout->addWidget(userCertLabel);