Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed to hide Search Box Action when ChatWidget is used on FriendsDialog

Browse Source 
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
This commit is contained in:
defnax 2014-12-30 18:49:54 +00:00
parent a766850a22
commit 892fd75bb5
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -176,6 +176,10 @@ IdDialog::IdDialog(QWidget *parent) :
/* Setup tree */ /* Setup tree */
ui->treeWidget_IdList->sortByColumn(RSID_COL_NICKNAME, Qt::AscendingOrder); ui->treeWidget_IdList->sortByColumn(RSID_COL_NICKNAME, Qt::AscendingOrder);
ui->treeWidget_IdList->setContextMenuPolicy(Qt::CustomContextMenu) ; 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); mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this);

1
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -280,6 +280,7 @@ void ChatWidget::init(const ChatId &chat_id, const QString &title)
messageCount = Settings->getPublicChatHistoryCount(); messageCount = Settings->getPublicChatHistoryCount();
ui->titleBarFrame->setVisible(false); ui->titleBarFrame->setVisible(false);
ui->actionSearch_History->setVisible(false);
} }
if (rsHistory->getEnable(hist_chat_type)) if (rsHistory->getEnable(hist_chat_type))

4
retroshare-gui/src/gui/qss/chat/standard/private/main.css
View File

@ -8,7 +8,7 @@
.incomingHeader { .incomingHeader {
background-color:#dfedff; background-color:#dfedff;
border-color:#fafafa #d1dfef #d1dfef #fafafa; border-color:#fafafa #d1dfef #d1dfef #fafafa;
color: #295b07; color: #91968f;
} }
.outgoingHeader { .outgoingHeader {
@ -20,7 +20,7 @@
.hincomingHeader { .hincomingHeader {
background-color:#dfedff; background-color:#dfedff;
border-color:#fafafa #d1dfef #d1dfef #fafafa; border-color:#fafafa #d1dfef #d1dfef #fafafa;
color: #88f042; color: #7F837D;
} }
.houtgoingHeader { .houtgoingHeader {