From 704d89ab9a775a08e19120f2d50f22d3ad5070b8 Mon Sep 17 00:00:00 2001 From: defnax Date: Mon, 25 Jan 2010 20:16:54 +0000 Subject: [PATCH] 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 --- retroshare-gui/src/gui/images.qrc | 1 + retroshare-gui/src/gui/images/quote_24.png | Bin 0 -> 1598 bytes .../src/gui/images/quote_24_hover.png | Bin 0 -> 1593 bytes retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp | 4 +- retroshare-gui/src/gui/msgs/ChanMsgDialog.ui | 19 ++++++ .../src/gui/toaster/MessageToaster.cpp | 2 + .../src/gui/toaster/MessageToaster.ui | 61 ++++++++++-------- 7 files changed, 59 insertions(+), 28 deletions(-) create mode 100644 retroshare-gui/src/gui/images/quote_24.png create mode 100644 retroshare-gui/src/gui/images/quote_24_hover.png diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 65202ae3b..752c42883 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -295,6 +295,7 @@ images/preview.png images/player_play.png images/quick_restart24.png + images/quote_24.png images/redled.png images/greenled.png images/grayled.png diff --git a/retroshare-gui/src/gui/images/quote_24.png b/retroshare-gui/src/gui/images/quote_24.png new file mode 100644 index 0000000000000000000000000000000000000000..57107f679d49e61793edbf6bcafa43f313515b9c GIT binary patch literal 1598 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 literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp b/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp index 3954d69de..c9eec606d 100644 --- a/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp +++ b/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp @@ -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
> ")) ; - ui.msgText->setHtml(QString("
")+QString::fromStdString(std::string("") + msg)+"

") ; + ui.msgText->setHtml(QString("
")+QString::fromStdString(std::string("") + msg)+"

") ; ui.msgText->setFocus( Qt::OtherFocusReason ); diff --git a/retroshare-gui/src/gui/msgs/ChanMsgDialog.ui b/retroshare-gui/src/gui/msgs/ChanMsgDialog.ui index e7a866517..da1556823 100644 --- a/retroshare-gui/src/gui/msgs/ChanMsgDialog.ui +++ b/retroshare-gui/src/gui/msgs/ChanMsgDialog.ui @@ -666,6 +666,7 @@ border: 1px solid #CCCCCC;} + @@ -690,6 +691,9 @@ border: 1px solid #CCCCCC;} + + true + :/images/contacts24.png:/images/contacts24.png @@ -725,6 +729,21 @@ border: 1px solid #CCCCCC;} Attach File + + + true + + + + :/images/quote_24.png:/images/quote_24.png + + + Quote + + + Add Blockquote + + msgSendList diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.cpp b/retroshare-gui/src/gui/toaster/MessageToaster.cpp index 46e8e31f7..a70818f03 100644 --- a/retroshare-gui/src/gui/toaster/MessageToaster.cpp +++ b/retroshare-gui/src/gui/toaster/MessageToaster.cpp @@ -32,6 +32,8 @@ MessageToaster::MessageToaster( QWidget * parent, Qt::WFlags f) // connect buttons connect(closebtn, SIGNAL(clicked()), this, SLOT(closeClicked())); connect(openmessagebtn, SIGNAL(clicked()), this, SLOT(openmessageClicked())); + connect(openmessagetoolButton, SIGNAL(clicked()), this, SLOT(openmessageClicked())); + // init state displayState = dsInactive; } diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.ui b/retroshare-gui/src/gui/toaster/MessageToaster.ui index b01c3388b..ea69669cb 100644 --- a/retroshare-gui/src/gui/toaster/MessageToaster.ui +++ b/retroshare-gui/src/gui/toaster/MessageToaster.ui @@ -7,7 +7,7 @@ 0 0 304 - 115 + 113 @@ -47,34 +47,41 @@ border: 2px solid #CCCCCC;} QFrame::Raised + + + + 10 + 30 + 61 + 61 + + + + + 64 + 64 + + + + + + + + :/images/folder_inbox64.png:/images/folder_inbox64.png + + + + 64 + 64 + + + + true + + - - - - 10 - 30 - 61 - 61 - - - - - 0 - 0 - - - - - - - :/images/folder_inbox64.png - - - Qt::AlignCenter - - @@ -280,7 +287,6 @@ border-radius: 10px } frame - imgVideoService messagelabel openmessagebtn lblTitle @@ -294,6 +300,7 @@ border-radius: 10px } +