Added a Blockquote Button to ToolBar, changed Message Toasters Icon label as ToolButton

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2126 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-01-25 20:16:54 +00:00
parent 777b52753a
commit 704d89ab9a
7 changed files with 59 additions and 28 deletions

View file

@ -91,9 +91,11 @@ ChanMsgDialog::ChanMsgDialog(bool msg, QWidget *parent, Qt::WFlags flags)
connect(ui.sizeincreaseButton, SIGNAL (clicked()), this, SLOT (fontSizeIncrease()));
connect(ui.sizedecreaseButton, SIGNAL (clicked()), this, SLOT (fontSizeDecrease()));
connect(ui.blockquoteButton, SIGNAL (clicked()), this, SLOT (blockQuote()));
connect(ui.actionQuote, SIGNAL(triggered()), this, SLOT(blockQuote()));
connect(ui.codeButton, SIGNAL (clicked()), this, SLOT (toggleCode()));
connect(ui.splitPostButton, SIGNAL (clicked()), this, SLOT (addPostSplitter()));
connect(ui.msgText, SIGNAL( checkSpellingChanged( bool ) ), this, SLOT( spellChecking( bool ) ) );
connect(ui.msgText, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)),
this, SLOT(currentCharFormatChanged(const QTextCharFormat &)));
@ -500,7 +502,7 @@ void ChanMsgDialog::insertForwardPastedText(std::string msg)
while( (i=msg.find_first_of('\n',i+1)) < msg.size())
msg.replace(i,1,std::string("\n<BR/>> ")) ;
ui.msgText->setHtml(QString("<HTML><blockquote ><font color=\"blue\">")+QString::fromStdString(std::string("") + msg)+"</font><br/><br/></blockquote></HTML>") ;
ui.msgText->setHtml(QString("<HTML><blockquote [type=cite]><font color=\"blue\">")+QString::fromStdString(std::string("") + msg)+"</font><br/><br/></blockquote></HTML>") ;
ui.msgText->setFocus( Qt::OtherFocusReason );

View file

@ -666,6 +666,7 @@ border: 1px solid #CCCCCC;}</string>
<addaction name="actionContactsView"/>
<addaction name="separator"/>
<addaction name="actionAttach"/>
<addaction name="actionQuote"/>
<addaction name="actionSaveas"/>
</widget>
<action name="actionSend">
@ -690,6 +691,9 @@ border: 1px solid #CCCCCC;}</string>
</property>
</action>
<action name="actionContactsView">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/contacts24.png</normaloff>:/images/contacts24.png</iconset>
@ -725,6 +729,21 @@ border: 1px solid #CCCCCC;}</string>
<string>Attach File</string>
</property>
</action>
<action name="actionQuote">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/quote_24.png</normaloff>:/images/quote_24.png</iconset>
</property>
<property name="text">
<string>Quote</string>
</property>
<property name="toolTip">
<string>Add Blockquote</string>
</property>
</action>
</widget>
<tabstops>
<tabstop>msgSendList</tabstop>