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: \
\
- Connection attempts (useful to make friends with new people and control who's trying to reach you)
\
- - Channel and Forum posts
\
- - New Channels and Forums you can subscribe to
\
+ - Channel, Forum and Board posts
\
+ - Circle membership requests and invites
\
+ - New Channels, Forums and Boards you can subscribe to
\
+ - Channel and Board comments
\
+ - New Mail messages
\
- Private messages from your friends
\
\
") ;
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 += "
" ;
+ QString infotext;
+
+ if(use_short_format)
+ {
+ infotext += tr("This Retroshare ID contains:") ;
+ }
+ else
+ {
+ infotext += tr("
This certificate contains:") ;
+ }
+
+ infotext += "
" ;
if(use_short_format)
{
@@ -350,6 +360,9 @@ QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bo
infotext += QString("") ;
if(rsPeers->getOwnId() == detail.id)
+ if(use_short_format)
+ infotext += tr("You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.
") ;
+ else
infotext += tr("You can use this certificate to make new friends. Send it by email, or give it hand to hand.
") ;
return infotext;
diff --git a/retroshare-gui/src/gui/feeds/GxsCircleItem.ui b/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
index ced9279b3..c295d1b57 100644
--- a/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
@@ -24,7 +24,7 @@
1
-
-
+
0
diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
index d632caac6..3d51f0acb 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
@@ -981,7 +981,7 @@ void CreateGxsChannelMsg::toggle()
void CreateGxsChannelMsg::on_removeButton_clicked()
{
- preview_W->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE),true);
+ preview_W->setPixmap(QPixmap(), false);
removeButton->hide();
}
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index e817c5523..7d5730b39 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -501,11 +501,11 @@ GxsChannelPostItem QLabel#logoLabel {
background-color: black;
}
-GxsCircleItem QFrame#frame {
+GxsCircleItem QFrame#mainFrame {
background-color: white;
}
-GxsCircleItem QLabel#nameLabel, QLabel#titleLabel {
+GxsCircleItem QLabel#gxsIdLabel, QLabel#nameLabel, QLabel#titleLabel {
font: 11pt;
font: bold italic;
}
diff --git a/retroshare-gui/src/gui/settings/AppearancePage.ui b/retroshare-gui/src/gui/settings/AppearancePage.ui
index 5a27a8f28..a06a4933e 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.ui
+++ b/retroshare-gui/src/gui/settings/AppearancePage.ui
@@ -249,40 +249,9 @@
QFrame::NoFrame
-
-
-
-
-
-
- Icon Size = 8x8
-
-
- -
-
- Icon Size = 16x16
-
-
- -
-
- Icon Size = 24x24
-
-
- -
-
- Icon Size = 32x32
-
-
- -
-
- Icon Size = 64x64
-
-
- -
-
- Icon Size = 128x128
-
-
-
-
+
+ 0
+
-
-
@@ -333,6 +302,53 @@
+ -
+
+
-
+
+ Icon Size = 8x8
+
+
+ -
+
+ Icon Size = 16x16
+
+
+ -
+
+ Icon Size = 24x24
+
+
+ -
+
+ Icon Size = 32x32
+
+
+ -
+
+ Icon Size = 64x64
+
+
+ -
+
+ Icon Size = 128x128
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
diff --git a/retroshare-gui/src/gui/settings/PluginsPage.ui b/retroshare-gui/src/gui/settings/PluginsPage.ui
index 3da9a5696..064df8b89 100644
--- a/retroshare-gui/src/gui/settings/PluginsPage.ui
+++ b/retroshare-gui/src/gui/settings/PluginsPage.ui
@@ -7,28 +7,21 @@
0
0
423
- 514
+ 375
Qt::NoContextMenu
-
- -
-
+
+
-
+
-
+
0
0
-
- Authorize all plugins
-
-
-
- -
-
Plugins
@@ -52,7 +45,7 @@
0
0
- 345
+ 385
16
@@ -85,8 +78,14 @@
- -
+
-
+
+
+ 16777215
+ 100
+
+
Plugin look-up directories
@@ -104,18 +103,18 @@
- -
-
-
- Qt::Vertical
+
-
+
+
+
+ 0
+ 0
+
-
-
- 20
- 40
-
+
+ Authorize all plugins
-
+