Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 07:29:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show Stats 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); 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 */ /* Hide platform specific features */
@ -363,10 +369,17 @@ void ChatDialog::setFont()
font.setBold(ui.textboldChatButton->isChecked()); font.setBold(ui.textboldChatButton->isChecked());
font.setUnderline(ui.textunderlineChatButton->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); ui.lineEdit->setFont(font);
} }
void ChatDialog::underline()
{
_underline = !_underline;
ui.lineEdit->setFontUnderline(_underline);
}
// Update Chat Info information // Update Chat Info information
@ -398,8 +411,7 @@ void ChatDialog::displayInfoChatMenu(const QPoint& pos)
void ChatDialog::loadEmoticonsgroupchat() void ChatDialog::loadEmoticonsgroupchat()
{ {
QDir smdir(QApplication::applicationDirPath() + "/emoticons/kopete"); QDir smdir(QApplication::applicationDirPath() + "/emoticons/default");
//QDir smdir(":/gui/images/emoticons/kopete");
QFileInfoList sminfo = smdir.entryInfoList(QStringList() << "*.gif" << "*.png", QDir::Files, QDir::Name); QFileInfoList sminfo = smdir.entryInfoList(QStringList() << "*.gif" << "*.png", QDir::Files, QDir::Name);
foreach(QFileInfo info, sminfo) foreach(QFileInfo info, sminfo)
{ {
@ -420,8 +432,8 @@ void ChatDialog::smileyWidgetgroupchat()
QWidget *smWidget = new QWidget; QWidget *smWidget = new QWidget;
smWidget->setWindowTitle("Emoticons"); smWidget->setWindowTitle("Emoticons");
smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png"))); smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png")));
smWidget->setFixedSize(256,256); //smWidget->setFixedSize(256,256);
int x = 0, y = 0; int x = 0, y = 0;
@ -435,6 +447,7 @@ void ChatDialog::smileyWidgetgroupchat()
smButton->setIconSize(QSize(24,24)); smButton->setIconSize(QSize(24,24));
smButton->setIcon(QPixmap(i.value())); smButton->setIcon(QPixmap(i.value()));
smButton->setToolTip(i.key()); smButton->setToolTip(i.key());
//smButton->setFixedSize(24,24);
++x; ++x;
if(x > 4) if(x > 4)
{ {

7
retroshare-gui/src/gui/ChatDialog.h
View File

@ -24,9 +24,11 @@
#include "mainpage.h" #include "mainpage.h"
#include "ui_ChatDialog.h" #include "ui_ChatDialog.h"
#include "ui_SmWidget.h"
#include "chat/PopupChatDialog.h" #include "chat/PopupChatDialog.h"
class QFont;
class QAction; class QAction;
class QTextEdit; class QTextEdit;
class QTextCharFormat; class QTextCharFormat;
@ -71,6 +73,8 @@ void toggleSendItem( QTreeWidgetItem *item, int col );
void setFont(); void setFont();
void getFont(); void getFont();
void underline();
void on_actionClearChat_triggered(); void on_actionClearChat_triggered();
@ -91,7 +95,8 @@ private:
QTreeView *msgSendList; QTreeView *msgSendList;
QColor textColor; QColor textColor;
QColor _currentColor; QColor _currentColor;
bool _underline;
QHash<QString, QString> smileys; QHash<QString, QString> smileys;

25
retroshare-gui/src/gui/ChatDialog.ui
View File

@ -853,7 +853,7 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/edit-underline.png</iconset> <iconset resource="images.qrc" >:/images/edit-italic.png</iconset>
</property> </property>
<property name="checkable" > <property name="checkable" >
<bool>true</bool> <bool>true</bool>
@ -881,7 +881,7 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/edit-italic.png</iconset> <iconset resource="images.qrc" >:/images/edit-underline.png</iconset>
</property> </property>
<property name="checkable" > <property name="checkable" >
<bool>true</bool> <bool>true</bool>
@ -988,6 +988,25 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="7" >
<widget class="QPushButton" name="menuButton" >
<property name="minimumSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="1" column="0" > <item row="1" column="0" >
@ -1052,7 +1071,7 @@
</action> </action>
<action name="actionClearChat" > <action name="actionClearChat" >
<property name="text" > <property name="text" >
<string>ClearChat</string> <string>Clear Chat History</string>
</property> </property>
</action> </action>
</widget> </widget>