diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp index 33eb903b0..96b12215b 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp @@ -95,6 +95,7 @@ IdEditDialog::IdEditDialog(QWidget *parent) : ui->pushButton_Tag->hide(); // unfinished ui->plainTextEdit_Tag->hide(); ui->label_TagCheck->hide(); + ui->frame_Tags->setHidden(true); } IdEditDialog::~IdEditDialog() {} @@ -263,6 +264,9 @@ void IdEditDialog::setupExistingId(const RsGxsGroupId& keyId) }, this ); }); + + // force resize of dialog, to hide empty space from the hidden recogn tags area + adjustSize(); } void IdEditDialog::enforceNoAnonIds() diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index ff31a3f6a..4d552735e 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -112,15 +112,18 @@ NewsFeed::NewsFeed(QWidget *parent) : MainPage(parent), ui(new Ui::NewsFeed), ui->feedOptionsButton->hide(); // (csoler) Hidden until we repare the system to display a specific settings page. QString hlp_str = tr( - "

  News Feed

\ + "

  Activity Feed

\

The Activity Feed displays the last events on your network, sorted by the time you received them. \ This gives you a summary of the activity of your friends. \ You can configure which events to show by pressing on Options.

\

The various events shown are: \

\ ") ; diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp index 403a0d76e..fa79b9d70 100644 --- a/retroshare-gui/src/gui/Posted/PostedItem.cpp +++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp @@ -437,6 +437,10 @@ void PostedItem::setup() ui->clearButton->hide(); ui->readAndClearButton->hide(); ui->nameLabel->hide(); + + //hide read & new not used + ui->readButton->hide(); + ui->newLabel->hide(); } void PostedItem::makeDownVote() @@ -699,7 +703,7 @@ void PostedItem::setReadStatus(bool isNew, bool isUnread) ui->readButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-read.png")); } - ui->newLabel->setVisible(isNew); + //ui->newLabel->setVisible(isNew); ui->mainFrame->setProperty("new", isNew); ui->mainFrame->style()->unpolish(ui->mainFrame); diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index 52a5628a9..ddb6fcce3 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -311,8 +311,18 @@ void ConfCertDialog::loadInvitePage() QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bool signatures_included,bool use_short_format,bool include_additional_locators) { //infotext += tr("

Use this certificate to make new friends. Send it by email, or give it hand to hand.

") ; - QString infotext = QObject::tr("

This certificate contains:") ; - infotext += "