Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-20 21:34:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added action to GroupChats Button Menu for disable/enable Emoticon's, not yet stored

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2371 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-02-19 18:33:35 +00:00
parent e3f2afd031
commit 459c364636
6 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -173,6 +173,7 @@ PeersDialog::PeersDialog(QWidget *parent)
QMenu * grpchatmenu = new QMenu();
grpchatmenu->addAction(ui.actionClearChat);
grpchatmenu->addAction(ui.actionDisable_Emoticons);
ui.menuButton->setMenu(grpchatmenu);
_underline = false;
@ -967,6 +968,8 @@ void PeersDialog::insertChat()
count ++;
}
if(!ui.actionDisable_Emoticons->isChecked())
{
QHashIterator<QString, QString> i(smileys);
while(i.hasNext())
{
@ -974,6 +977,7 @@ void PeersDialog::insertChat()
foreach(QString code, i.key().split("|"))
extraTxt.replace(code, "<img src=\"" + i.value() + "\" />");
}
}
if ((msgWidget->verticalScrollBar()->maximum() - 30) < msgWidget->verticalScrollBar()->value() ) {
msgWidget->append(extraTxt);

36
retroshare-gui/src/gui/PeersDialog.ui
View File

@ -1117,6 +1117,10 @@ border: 1px solid #CCCCCC;}</string>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/fonts.png</normaloff>:/images/fonts.png</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
@ -1158,7 +1162,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QToolButton" name="menuButton">
<widget class="QPushButton" name="menuButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@ -1180,11 +1184,18 @@ p, li { white-space: pre-wrap; }
<property name="text">
<string/>
</property>
<property name="popupMode">
<enum>QToolButton::MenuButtonPopup</enum>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/configure.png</normaloff>:/images/configure.png</iconset>
</property>
<property name="autoRaise">
<bool>false</bool>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
@ -1301,6 +1312,10 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
<action name="actionClearChat">
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/edit-clear-history.png</normaloff>:/images/edit-clear-history.png</iconset>
</property>
<property name="text">
<string>Clear Chat History</string>
</property>
@ -1377,6 +1392,17 @@ p, li { white-space: pre-wrap; }
<string>Edit your status Message</string>
</property>
</action>
<action name="actionDisable_Emoticons">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Disable Emoticons</string>
</property>
<property name="toolTip">
<string>Disable Emoticons</string>
</property>
</action>
</widget>
<resources>
<include location="images.qrc"/>

4
retroshare-gui/src/gui/images.qrc
View File

@ -11,16 +11,17 @@
<file>images/btn4.png</file>
<file>images/btn_26.png</file>
<file>images/btn_26_hover.png</file>
<file>images/btn_26_pressed.png</file>
<file>images/btn_27.png</file>
<file>images/btn_27_hover.png</file>
<file>images/connect_established.png</file>
<file>images/connect_creating.png</file>
<file>images/connect_no.png</file>
<file>images/edit-clear-history.png</file>
<file>images/feedback_arrow.png</file>
<file>images/feedback_arrow_hover.png</file>
<file>images/list_bullet_arrow.png</file>
<file>images/rc_combined.png</file>
<file>images/btn_26_pressed.png</file>
<file>images/combobox_arrow.png</file>
<file>images/arrow-left.png</file>
<file>images/arrow-right.png</file>
@ -37,6 +38,7 @@
<file>images/backgroundl.png</file>
<file>images/blockdevice.png</file>
<file>images/blockdevice2.png</file>
<file>images/configure.png</file>
<file>images/channels.png</file>
<file>images/turtle.png</file>
<file>images/channels16.png</file>

BIN
retroshare-gui/src/gui/images/configure.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
retroshare-gui/src/gui/images/edit-clear-history.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

2
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View File

@ -53,7 +53,6 @@
#define IMAGE_FORUMS ":/images/konversation.png"
#define IMAGE_CHANNELS ":/images/channels.png"
#define IMAGE_PREFERENCES ":/images/settings16.png"
#define IMAGE_CHAT ":/images/chats_24x24.png"
#define IMAGE_RETROSHARE ":/images/RetroShare16.png"
#define IMAGE_ABOUT ":/images/informations_24x24.png"
#define IMAGE_STATISTIC ":/images/ksysguard32.png"
@ -63,7 +62,6 @@
#define IMAGE_RSM32 ":/images/rsmessenger32.png"
#define IMAGE_RSM16 ":/images/rsmessenger16.png"
#define IMAGE_CLOSE ":/images/close_normal.png"
#define IMAGE_SMPLAYER ":/images/smplayer_icon32.png"
#define IMAGE_CALENDAR ":/images/calendar.png"
#define IMAGE_NEWSFEED ":/images/konqsidebar_news24.png"
#define IMAGE_LINKS ":/images/ktorrent.png"