Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-25 06:40:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added to check if attachments is ready for send Message

Browse source 
added for every new Message/Reply or Forward setWindowTitle beginning with always "Compose: " 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2106 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-01-21 16:35:00 +00:00
parent daee15776c
commit 9df7ac473f
3 changed files with 54 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/MessagesDialog.cpp
View file

@ -121,7 +121,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
ui.printbutton->setIcon(QIcon(QString(":/images/print24.png"))); ui.printbutton->setIcon(QIcon(QString(":/images/print24.png")));
ui.forwardmessageButton->setToolTip(tr("Forward selected Message")); ui.forwardmessageButton->setToolTip(tr("Forward selected Message"));
ui.replyallmessageButton->setToolTip(tr("Replay to All")); ui.replyallmessageButton->setToolTip(tr("Reply to All"));
QMenu * printmenu = new QMenu(); QMenu * printmenu = new QMenu();
printmenu->addAction(ui.actionPrint); printmenu->addAction(ui.actionPrint);
@ -260,7 +260,7 @@ void MessagesDialog::replytomessage()
nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ; nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
} }
nMsgDialog->setWindowTitle(tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ; nMsgDialog->setWindowTitle( tr ("Compose: ") + tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ;
QTextDocument doc ; QTextDocument doc ;
@ -305,7 +305,7 @@ void MessagesDialog::replyallmessage()
{ {
nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ; nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
} }
nMsgDialog->setWindowTitle(tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ; nMsgDialog->setWindowTitle( tr ("Compose: ") + tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ;
QTextDocument doc ; QTextDocument doc ;
@ -361,7 +361,7 @@ void MessagesDialog::forwardmessage()
nMsgDialog->insertTitleText( (QString("Fwd: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ; nMsgDialog->insertTitleText( (QString("Fwd: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
} }
nMsgDialog->setWindowTitle(tr("Fwd: ") + QString::fromStdWString(msgInfo.title) ) ; nMsgDialog->setWindowTitle( tr ("Compose: ") + tr("Fwd: ") + QString::fromStdWString(msgInfo.title) ) ;
QTextDocument doc ; QTextDocument doc ;

47
retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp
View file

@ -32,7 +32,7 @@
#include "util/misc.h" #include "util/misc.h"
#include <sstream> #include <sstream>
#include <QtGui>
#include <QContextMenuEvent> #include <QContextMenuEvent>
#include <QCloseEvent> #include <QCloseEvent>
#include <QColorDialog> #include <QColorDialog>
@ -59,7 +59,7 @@
/** Constructor */ /** Constructor */
ChanMsgDialog::ChanMsgDialog(bool msg, QWidget *parent, Qt::WFlags flags) ChanMsgDialog::ChanMsgDialog(bool msg, QWidget *parent, Qt::WFlags flags)
: mIsMsg(msg), QMainWindow(parent, flags) : mIsMsg(msg), QMainWindow(parent, flags), mCheckAttachment(true)
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this); ui.setupUi(this);
@ -493,7 +493,11 @@ void ChanMsgDialog::insertFileList(const std::list<DirDetails>& files_info)
void ChanMsgDialog::newMsg() void ChanMsgDialog::newMsg()
{ {
/* clear all */ /* clear all */
QString titlestring = ui.titleEdit->text();
setWindowTitle(tr("Compose: ") + titlestring );
ui.titleEdit->setText("No Title"); ui.titleEdit->setText("No Title");
ui.msgText->setText(""); ui.msgText->setText("");
/* worker fns */ /* worker fns */
@ -1126,6 +1130,13 @@ void ChanMsgDialog::addAttachment(std::string filePath) {
} else { } else {
QObject::connect(file,SIGNAL(fileFinished(AttachFileItem *)),this, SLOT(fileHashingFinished(AttachFileItem *))) ; QObject::connect(file,SIGNAL(fileFinished(AttachFileItem *)),this, SLOT(fileHashingFinished(AttachFileItem *))) ;
} }
mAttachments.push_back(file);
if (mCheckAttachment)
{
checkAttachmentReady();
}
} }
void ChanMsgDialog::fileHashingFinished(AttachFileItem* file) { void ChanMsgDialog::fileHashingFinished(AttachFileItem* file) {
@ -1170,3 +1181,35 @@ void ChanMsgDialog::fileHashingFinished(AttachFileItem* file) {
} }
void ChanMsgDialog::checkAttachmentReady()
{
std::list<AttachFileItem *>::iterator fit;
mCheckAttachment = false;
for(fit = mAttachments.begin(); fit != mAttachments.end(); fit++)
{
if (!(*fit)->isHidden())
{
if (!(*fit)->ready())
{
/*
*/
ui.actionSend->setEnabled(false);
break;
return;
}
}
}
if (fit == mAttachments.end())
{
ui.actionSend->setEnabled(true);
}
/* repeat... */
int msec_rate = 1000;
QTimer::singleShot( msec_rate, this, SLOT(checkAttachmentReady(void)));
}

5
retroshare-gui/src/gui/msgs/ChanMsgDialog.h
View file

@ -117,6 +117,7 @@ private slots:
void attachFile(); void attachFile();
void addAttachment(std::string); void addAttachment(std::string);
void checkAttachmentReady();
private: private:
@ -163,7 +164,11 @@ private:
QHash<QString, QString> autoLinkTitleDictionary; QHash<QString, QString> autoLinkTitleDictionary;
QHash<QString, int> autoLinkTargetDictionary; QHash<QString, int> autoLinkTargetDictionary;
/* maps of files */
std::list<AttachFileItem *> mAttachments;
bool mIsMsg; /* different behaviour for Msg or ChanMsg */ bool mIsMsg; /* different behaviour for Msg or ChanMsg */
bool mCheckAttachment;
/** Qt Designer generated object */ /** Qt Designer generated object */
Ui::ChanMsgDialog ui; Ui::ChanMsgDialog ui;