From f452304b5c337f3fa0ed34d3cc03d059a61b08c2 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Wed, 7 Jul 2010 23:03:34 +0000 Subject: [PATCH] Change header of MessageComposer when title edit has modified - like ThunderBird git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3267 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/msgs/MessageComposer.cpp | 25 +++++++++++++------ retroshare-gui/src/gui/msgs/MessageComposer.h | 5 +++- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index f1b301761..350345a25 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -69,7 +69,8 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags) connect(ui.actionAttach, SIGNAL(triggered()), this, SLOT(attachFile())); connect(ui.filterPatternLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterRegExpChanged())); connect(ui.clearButton, SIGNAL(clicked()), this, SLOT(clearFilter())); - + connect(ui.titleEdit, SIGNAL(textChanged(const QString &)), this, SLOT(titleChanged())); + connect(ui.sizeincreaseButton, SIGNAL (clicked()), this, SLOT (fontSizeIncrease())); connect(ui.sizedecreaseButton, SIGNAL (clicked()), this, SLOT (fontSizeDecrease())); connect(ui.actionQuote, SIGNAL(triggered()), this, SLOT(blockQuote())); @@ -409,14 +410,21 @@ void MessageComposer::insertFileList(const std::list& files_info) tree->update(); /* update display */ } +/* title changed */ +void MessageComposer::titleChanged() +{ + calculateTitle(); + ui.msgText->document()->setModified(true); +} + +void MessageComposer::calculateTitle() +{ + setWindowTitle(tr("Compose: ") + ui.titleEdit->text()); +} + void MessageComposer::newMsg(std::string msgId /*= ""*/) { /* clear all */ - QString titlestring = ui.titleEdit->text(); - - setWindowTitle(tr("Compose: ") + titlestring ); - ui.titleEdit->setText("No Title"); - ui.msgText->setText(""); /* worker fns */ @@ -437,7 +445,6 @@ void MessageComposer::newMsg(std::string msgId /*= ""*/) m_nBox = msgInfo.msgflags & RS_MSG_BOXMASK; insertTitleText( QString::fromStdWString(msgInfo.title).toStdString()); - setWindowTitle( tr ("Compose: ") + QString::fromStdWString(msgInfo.title)); insertMsgText(QString::fromStdWString(msgInfo.msg).toStdString()); @@ -449,7 +456,11 @@ void MessageComposer::newMsg(std::string msgId /*= ""*/) } ui.msgText->document()->setModified(false); + } else { + insertTitleText(tr("No Title").toStdString()); } + + calculateTitle(); } void MessageComposer::insertTitleText(std::string title) diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h index e6555f587..87366bd7a 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.h +++ b/retroshare-gui/src/gui/msgs/MessageComposer.h @@ -123,7 +123,8 @@ private slots: void filterRegExpChanged(); void clearFilter(); - + void titleChanged(); + private: void setTextColor(const QColor& col) ; void setupFileActions(); @@ -147,6 +148,8 @@ private: void FilterItems(); bool FilterItem(QTreeWidgetItem *pItem, QString &sPattern); + void calculateTitle(); + /** Define the popup menus for the Context menu */ QMenu* contextMnu;