Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-08 14:22:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed styles loading in chat. Added missing history/compact/colored style

Browse source
This commit is contained in:
csoler 2017-03-02 22:30:51 +01:00
parent d053400914
commit 1e1fe7708f
6 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/settings/ChatPage.cpp
View file

@ -30,7 +30,6 @@
#include <retroshare/rspeers.h>
#include "ChatPage.h"
#include <gui/RetroShareLink.h>
#include "gui/chat/ChatStyle.h"
#include "gui/chat/ChatDialog.h"
#include "gui/notifyqt.h"
#include "rsharesettings.h"
@ -46,7 +45,7 @@
#define IMAGE_CHAT_DELETE ":/images/deletemail24.png"
#define IMAGE_CHAT_COPY ":/images/copyrslink.png"
static QString loadStyleInfo(ChatStyle::enumStyleType type, QComboBox *style_CB, QComboBox *comboBox, QString &styleVariant)
QString ChatPage::loadStyleInfo(ChatStyle::enumStyleType type, QComboBox *style_CB, QComboBox *comboBox, QString &styleVariant)
{
QList<ChatStyleInfo> styles;
QList<ChatStyleInfo>::iterator style;
@ -87,6 +86,15 @@ static QString loadStyleInfo(ChatStyle::enumStyleType type, QComboBox *style_CB,
whileBlocking(style_CB)->setCurrentIndex(activeItem);
switch(type)
{
case ChatStyle::TYPE_PUBLIC: on_publicList_currentRowChanged(activeItem); break ;
case ChatStyle::TYPE_PRIVATE: on_privateList_currentRowChanged(activeItem); break ;
case ChatStyle::TYPE_HISTORY: on_historyList_currentRowChanged(activeItem); break ;
default:
break ;
}
/* now the combobox should be filled */
int index = comboBox->findText(styleVariant);