Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-23 16:21:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

changend default emoticons path.

Browse source 
fixed underline icon 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-04-04 16:08:12 +00:00
parent d3d6682bcb
commit cb795b3c67
3 changed files with 47 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
retroshare-gui/src/gui/ChatDialog.cpp
View file

@ -90,7 +90,13 @@ ChatDialog::ChatDialog(QWidget *parent)
QFont font = QFont("Comic Sans MS", 10);
setChatInfo(tr("Welcome to RetroShare's group chat."), QString::fromUtf8("blue"));
setChatInfo(tr("Welcome to RetroShare's group chat."), QString::fromUtf8("blue"));
QMenu * grpchatmenu = new QMenu();
grpchatmenu->addAction(ui.actionClearChat);
ui.menuButton->setMenu(grpchatmenu);
_underline = false;
/* Hide platform specific features */
@ -363,10 +369,17 @@ void ChatDialog::setFont()
font.setBold(ui.textboldChatButton->isChecked());
font.setUnderline(ui.textunderlineChatButton->isChecked());
font.setItalic(ui.textitalicChatButton->isChecked());
font.setItalic(ui.textitalicChatButton->isChecked());
//font.setStrikeOut(ui.textstrikeChatButton->isChecked());
ui.lineEdit->setFont(font);
}
void ChatDialog::underline()
{
_underline = !_underline;
ui.lineEdit->setFontUnderline(_underline);
}
// Update Chat Info information
@ -398,8 +411,7 @@ void ChatDialog::displayInfoChatMenu(const QPoint& pos)
void ChatDialog::loadEmoticonsgroupchat()
{
QDir smdir(QApplication::applicationDirPath() + "/emoticons/kopete");
//QDir smdir(":/gui/images/emoticons/kopete");
QDir smdir(QApplication::applicationDirPath() + "/emoticons/default");
QFileInfoList sminfo = smdir.entryInfoList(QStringList() << "*.gif" << "*.png", QDir::Files, QDir::Name);
foreach(QFileInfo info, sminfo)
{
@ -420,8 +432,8 @@ void ChatDialog::smileyWidgetgroupchat()
QWidget *smWidget = new QWidget;
smWidget->setWindowTitle("Emoticons");
smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png")));
smWidget->setFixedSize(256,256);
//smWidget->setFixedSize(256,256);
int x = 0, y = 0;
@ -435,6 +447,7 @@ void ChatDialog::smileyWidgetgroupchat()
smButton->setIconSize(QSize(24,24));
smButton->setIcon(QPixmap(i.value()));
smButton->setToolTip(i.key());
//smButton->setFixedSize(24,24);
++x;
if(x > 4)
{