From 892fd75bb5cb19385ac0cd9c5b326179d2f96ac1 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Tue, 30 Dec 2014 18:49:54 +0000
Subject: [PATCH] Fixed to hide Search Box Action when ChatWidget is used on
 FriendsDialog Fixed Incoming Nickname Text color, which looks for your eyes
 better then green. Added fixed size for the splitter in Identity

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/Identity/IdDialog.cpp              | 4 ++++
 retroshare-gui/src/gui/chat/ChatWidget.cpp                | 1 +
 retroshare-gui/src/gui/qss/chat/standard/private/main.css | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index 5d27dcdf8..caf63be6b 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -176,6 +176,10 @@ IdDialog::IdDialog(QWidget *parent) :
 	/* Setup tree */
 	ui->treeWidget_IdList->sortByColumn(RSID_COL_NICKNAME, Qt::AscendingOrder);
 	ui->treeWidget_IdList->setContextMenuPolicy(Qt::CustomContextMenu) ;
+	
+	// Set initial size of the splitter
+  ui->splitter->setStretchFactor(0, 0);
+  ui->splitter->setStretchFactor(1, 1);
 
 	mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this);
 
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index c50f16d55..48548fd4d 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -280,6 +280,7 @@ void ChatWidget::init(const ChatId &chat_id, const QString &title)
         messageCount = Settings->getPublicChatHistoryCount();
 
         ui->titleBarFrame->setVisible(false);
+        ui->actionSearch_History->setVisible(false);
     }
 
 	if (rsHistory->getEnable(hist_chat_type)) 
diff --git a/retroshare-gui/src/gui/qss/chat/standard/private/main.css b/retroshare-gui/src/gui/qss/chat/standard/private/main.css
index 5f9a460dd..7bcf8c66d 100644
--- a/retroshare-gui/src/gui/qss/chat/standard/private/main.css
+++ b/retroshare-gui/src/gui/qss/chat/standard/private/main.css
@@ -8,7 +8,7 @@
 .incomingHeader {
 	background-color:#dfedff;
 	border-color:#fafafa #d1dfef #d1dfef #fafafa;
-	color: #295b07;
+	color: #91968f;
 }
 
 .outgoingHeader {
@@ -20,7 +20,7 @@
 .hincomingHeader {
 	background-color:#dfedff;
 	border-color:#fafafa #d1dfef #d1dfef #fafafa;
-	color: #88f042;
+	color: #7F837D;
 }
 
 .houtgoingHeader {