diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index b7e8b6054..7422bd4ca 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -99,7 +99,7 @@ void PulseAddDialog::cleanup()
ui.frame_URL->setEnabled(false);
ui.pushButton_Post->setEnabled(false);
- ui.pushButton_Post->setText("Post Pulse to Wire");
+ ui.pushButton_Post->setText("Post");
ui.frame_input->setVisible(true);
ui.widget_sentiment->setVisible(true);
diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
index 0b6c4a70c..1594966db 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
@@ -7,17 +7,17 @@
0
0
720
- 633
+ 493
-
- -
+
+
-
-
+
0
0
@@ -34,8 +34,8 @@
QFrame::Raised
-
-
-
+
+
-
@@ -55,24 +55,37 @@
- -
+
-
GroupLabel
- -
+
-
IDLabel
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
- -
+
-
QFrame::StyledPanel
@@ -149,7 +162,7 @@
- -
+
-
QFrame::StyledPanel
@@ -286,15 +299,8 @@
- -
+
-
-
-
-
-
- Cancel
-
-
-
-
@@ -311,7 +317,14 @@
-
- Post Pulse to Wire
+ Post
+
+
+
+ -
+
+
+ Cancel
diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
index f3365825a..dc1cf0420 100644
--- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
@@ -740,10 +740,6 @@
FOLLOW
-
-
- :/images/invite.png:/images/invite.png
-
Qt::ToolButtonTextBesideIcon
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
index c2f209a19..41a2bf23a 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
@@ -509,10 +509,6 @@
FOLLOW
-
-
- :/images/invite.png:/images/invite.png
-
Qt::ToolButtonTextBesideIcon
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.ui b/retroshare-gui/src/gui/TheWire/WireDialog.ui
index 8b4f1d2a9..2aeefe92f 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.ui
@@ -20,6 +20,18 @@
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
@@ -29,12 +41,24 @@
- QFrame::StyledPanel
+ QFrame::NoFrame
- QFrame::Raised
+ QFrame::Plain
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
@@ -63,13 +87,6 @@
- -
-
-
- ...
-
-
-
-
@@ -192,7 +209,7 @@
0
0
228
- 442
+ 488
@@ -253,6 +270,10 @@
<
+
+
+ :/icons/png/arrow-left.png:/icons/png/arrow-left.png
+
-
@@ -260,6 +281,10 @@
>
+
+
+ :/icons/png/arrow-right.png:/icons/png/arrow-right.png
+
-
@@ -357,8 +382,8 @@
0
0
- 508
- 435
+ 523
+ 484
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
index aa4f63696..f3602cacc 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
@@ -138,7 +138,7 @@ void WireGroupItem::setSelected(bool on)
}
else
{
- setBackground("gray");
+ setBackground("white");
}
}
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index be77a72fb..b8eaa0aa6 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -135,7 +135,9 @@ CreateGxsChannelMsg QPushButton#postButton:hover {
CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton,
IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton,
-GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton{
+GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton,
+PulseAddDialog QPushButton#pushButton_Post, PulseTopLevel QToolButton#toolButton_follow,
+PulseViewGroup QToolButton#toolButton_follow{
font: bold;
font-size: 15px;
color: white;
@@ -144,16 +146,21 @@ GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#create
max-height: 27px;
min-width: 4em;
padding: 2px;
+ padding-left: 6px;
+ padding-right: 6px;
}
CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover,
IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover,
GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover,
-ShareManager QPushButton#closeButton:hover {
+ShareManager QPushButton#closeButton:hover, PulseAddDialog QPushButton#pushButton_Post:hover,
+PulseTopLevel QToolButton#toolButton_follow:hover, PulseViewGroup QToolButton#toolButton_follow:hover{
background: #03b1f3;
border-radius: 4px;
min-width: 4em;
padding: 2px;
+ padding-left: 6px;
+ padding-right: 6px;
}
ShareManager QPushButton#closeButton {
@@ -206,7 +213,8 @@ SearchDialog QPushButton#pushButtonSearch:hover{
}
CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#submitButton:disabled,
-CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled {
+CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled,
+PulseAddDialog QPushButton#pushButton_Post:disabled {
font: bold;
font-size: 15px;
color: white;
@@ -214,7 +222,8 @@ CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPus
border-radius: 4px;
max-height: 27px;
min-width: 4em;
- padding: 2px;
+ padding-left: 6px;
+ padding-right: 6px;
}
/* Forums */
@@ -492,6 +501,7 @@ GxsCircleItem QLabel#nameLabel, QLabel#titleLabel {
font: bold italic;
}
+
ForumNewItem > QFrame#frame, ForumMsgItem > QFrame#frame {
border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
@@ -1045,8 +1055,7 @@ MessageWidget QTextBrowser#toText , QTextBrowser#ccText , QTextBrowser#bccText {
border: none;
}
-WireGroupItem QWidget:hover
-{
+WireGroupItem QWidget:hover{
background-color: #7ecbfb;
}
diff --git a/retroshare-gui/src/gui/qss/stylesheet/qss.default b/retroshare-gui/src/gui/qss/stylesheet/qss.default
index d55011bee..9c46bc17e 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/qss.default
+++ b/retroshare-gui/src/gui/qss/stylesheet/qss.default
@@ -89,6 +89,11 @@ GxsChannelPostsWidgetWithModel QLabel#channelName_LB
qproperty-fontSizeFactor: 250;
}
+PostedListWidgetWithModel QLabel#namelabel
+{
+ qproperty-fontSizeFactor: 250;
+}
+
CreateLobbyDialog QLabel#lobbyInfoLabel
{
qproperty-fontSizeFactor: 150;
diff --git a/retroshare-gui/src/qss/qdarkstyle-v2.qss b/retroshare-gui/src/qss/qdarkstyle-v2.qss
index b31ed8154..5a03785d9 100644
--- a/retroshare-gui/src/qss/qdarkstyle-v2.qss
+++ b/retroshare-gui/src/qss/qdarkstyle-v2.qss
@@ -2179,6 +2179,11 @@ GxsChannelPostItem QFrame#mainFrame {
background-color: #19232D;
}
+GxsChannelPostItem QLabel#subjectLabel, GxsChannelPostItem QLabel#titleLabel {
+ font: 12pt;
+ font: bold italic;
+}
+
BoardPostDisplayWidget_compact QPushButton#shareButton {
background-color: transparent;
min-width: 80px;
@@ -2241,6 +2246,10 @@ BoardPostDisplayWidget_card QLabel#titleLabel{
font: bold;
}
+GxsForumMsgItem QFrame#frame{
+ background-color: #19232D;
+}
+
WireGroupItem QFrame#wire_frame{
background: transparent;
}
diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss
index b6af8f258..a65813f00 100644
--- a/retroshare-gui/src/qss/qdarkstyle.qss
+++ b/retroshare-gui/src/qss/qdarkstyle.qss
@@ -1239,6 +1239,23 @@ GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-button {
}
+GxsChannelPostItem QFrame#mainFrame {
+ background: #302F2F;
+}
+
+GxsChannelPostItem > QFrame#mainFrame [new=false]{
+ background: #302F2F;
+}
+
+GxsChannelPostItem > QFrame#mainFrame[new=true] {
+ background-color: #005000;
+}
+
+GxsChannelPostItem QLabel#subjectLabel, GxsChannelPostItem QLabel#titleLabel {
+ font: 12pt;
+ font: bold italic;
+}
+
CreateGxsChannelMsg QPushButton#postButton {
font: bold;
font-size: 15px;
@@ -1259,7 +1276,9 @@ CreateGxsChannelMsg QPushButton#postButton:hover {
CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton,
IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton,
-GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton {
+GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton,
+PulseAddDialog QPushButton#pushButton_Post, PulseTopLevel QToolButton#toolButton_follow,
+PulseViewGroup QToolButton#toolButton_follow {
font: bold;
font-size: 15px;
color: white;
@@ -1268,12 +1287,15 @@ GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#create
max-height: 27px;
min-width: 4em;
padding: 2px;
+ padding-left: 6px;
+ padding-right: 6px;
}
CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover,
IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover,
GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover,
-ShareManager QPushButton#closeButton {
+ShareManager QPushButton#closeButton:hover, PulseAddDialog QPushButton#pushButton_Post:hover,
+PulseTopLevel QToolButton#toolButton_follow:hover, PulseViewGroup QToolButton#toolButton_follow:hover{
background: #03b1f3;
border-radius: 4px;
min-width: 4em;
@@ -1281,7 +1303,8 @@ ShareManager QPushButton#closeButton {
}
CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#submitButton:disabled,
-CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled {
+CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled,
+PulseAddDialog QPushButton#pushButton_Post:disabled {
font: bold;
font-size: 15px;
color: white;
@@ -1358,6 +1381,10 @@ GxsForumThreadWidget QLabel#forumName
font: bold;
}
+GxsForumMsgItem QFrame#frame{
+ background: #302F2F;
+}
+
BoardPostDisplayWidget_compact QPushButton#shareButton
{
background-color: transparent;