diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 6ccaff099..785915044 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -219,7 +219,6 @@ HEADERS += rshare.h \ gui/channels/CreateChannel.h \ gui/channels/ChannelDetails.h \ gui/channels/CreateChannelMsg.h \ - gui/connect/ConnectDialog.h \ gui/connect/ConfCertDialog.h \ gui/msgs/MessageComposer.h \ gui/msgs/textformat.h \ @@ -265,7 +264,6 @@ HEADERS += rshare.h \ gui/elastic/node.h \ gui/NewsFeed.h \ gui/ChannelFeed.h \ - gui/GeneralMsgDialog.h \ gui/ChanGroupDelegate.h \ gui/feeds/FeedHolder.h \ gui/feeds/ForumNewItem.h \ @@ -319,7 +317,6 @@ FORMS += gui/StartDialog.ui \ gui/channels/CreateChannelMsg.ui \ gui/channels/ChannelDetails.ui \ gui/chat/PopupChatDialog.ui \ - gui/connect/ConnectDialog.ui \ gui/connect/ConfCertDialog.ui \ gui/msgs/MessageComposer.ui \ gui/settings/settings.ui \ @@ -342,7 +339,6 @@ FORMS += gui/StartDialog.ui \ gui/advsearch/expressionwidget.ui \ gui/NewsFeed.ui \ gui/ChannelFeed.ui \ - gui/GeneralMsgDialog.ui \ gui/feeds/ForumNewItem.ui \ gui/feeds/ForumMsgItem.ui \ gui/feeds/PeerItem.ui \ @@ -428,7 +424,6 @@ SOURCES += main.cpp \ gui/channels/ChannelDetails.cpp \ gui/chat/PopupChatDialog.cpp \ gui/chat/HandleRichText.cpp \ - gui/connect/ConnectDialog.cpp \ gui/connect/ConfCertDialog.cpp \ gui/msgs/MessageComposer.cpp \ gui/common/vmessagebox.cpp \ @@ -467,7 +462,6 @@ SOURCES += main.cpp \ gui/elastic/node.cpp \ gui/NewsFeed.cpp \ gui/ChannelFeed.cpp \ - gui/GeneralMsgDialog.cpp \ gui/ChanGroupDelegate.cpp \ gui/feeds/ForumNewItem.cpp \ gui/feeds/ForumMsgItem.cpp \ diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp index 4f9fca81e..35835484e 100644 --- a/retroshare-gui/src/gui/ChannelFeed.cpp +++ b/retroshare-gui/src/gui/ChannelFeed.cpp @@ -34,8 +34,6 @@ #include "gui/channels/CreateChannelMsg.h" #include "gui/ChanGroupDelegate.h" -#include "GeneralMsgDialog.h" - #define CHAN_DEFAULT_IMAGE ":/images/channels.png" @@ -217,22 +215,6 @@ void ChannelFeed::openChat(std::string peerId) return; } -void ChannelFeed::openMsg(uint32_t type, std::string grpId, std::string inReplyTo) -{ -#ifdef CHAN_DEBUG - std::cerr << "ChannelFeed::openMsg()"; - std::cerr << std::endl; -#endif - GeneralMsgDialog *msgDialog = new GeneralMsgDialog(NULL); - - - msgDialog->addDestination(type, grpId, inReplyTo); - - msgDialog->show(); - - /* window will destroy itself! */ -} - void ChannelFeed::createMsg() { if (mChannelId == "") diff --git a/retroshare-gui/src/gui/ChannelFeed.h b/retroshare-gui/src/gui/ChannelFeed.h index 9c6779978..1a9da4f2f 100644 --- a/retroshare-gui/src/gui/ChannelFeed.h +++ b/retroshare-gui/src/gui/ChannelFeed.h @@ -48,7 +48,6 @@ public: virtual void deleteFeedItem(QWidget *item, uint32_t type); virtual void openChat(std::string peerId); -virtual void openMsg(uint32_t type, std::string grpId, std::string inReplyTo); public slots: diff --git a/retroshare-gui/src/gui/GeneralMsgDialog.cpp b/retroshare-gui/src/gui/GeneralMsgDialog.cpp deleted file mode 100644 index 9f7ab1333..000000000 --- a/retroshare-gui/src/gui/GeneralMsgDialog.cpp +++ /dev/null @@ -1,664 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2008 Robert Fernie - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ -#include - -#include "GeneralMsgDialog.h" -#include "gui/feeds/FeedHolder.h" - -#include "gui/feeds/AttachFileItem.h" -#include "gui/feeds/SubDestItem.h" - -#include "rsiface/rstypes.h" -#include "rsiface/rspeers.h" -#include "rsiface/rsforums.h" -#include "rsiface/rschannels.h" -#include "rsiface/rsmsgs.h" -#include "rsiface/rsfiles.h" - -#include - -/** Constructor */ -GeneralMsgDialog::GeneralMsgDialog(QWidget *parent, uint32_t type) -: QDialog (parent), mCheckAttachment(true) -{ - /* Invoke the Qt Designer generated object setup routine */ - setupUi(this); - - setAttribute ( Qt::WA_DeleteOnClose, true ); - - connect(addButton, SIGNAL(clicked()), this, SLOT(newDestination())); - connect(typeComboBox, SIGNAL(currentIndexChanged( int )), this, SLOT(updateGroupId())); - - connect(buttonBox, SIGNAL(accepted()), this, SLOT(sendMsg())); - connect(buttonBox, SIGNAL(rejected()), this, SLOT(cancelMsg())); - - connect(addFileButton, SIGNAL(clicked() ), this , SLOT(addExtraFile())); - - /* set the type to ... - * const uint32_t GMD_TYPE_MESSAGE_IDX = 0; - * const uint32_t GMD_TYPE_FORUM_IDX = 1; - * const uint32_t GMD_TYPE_CHANNEL_IDX = 2; - * const uint32_t GMD_TYPE_BLOG_IDX = 3; - * */ - - typeComboBox->clear(); - typeComboBox->addItem(QIcon(QString(":/images/evolution.png")),tr("Message")); - typeComboBox->addItem(QIcon(QString(":/images/konversation16.png")),tr("Forum")); - typeComboBox->addItem(QIcon(QString(":/images/channels16.png")),tr("Channel")); - typeComboBox->addItem(QIcon(QString(":/images/kblogger.png")),tr("Blog")); - - typeComboBox->setCurrentIndex(type); - - setAcceptDrops(true); -} - -/* Dropping */ - -void GeneralMsgDialog::dragEnterEvent(QDragEnterEvent *event) -{ - /* print out mimeType */ - std::cerr << "GeneralMsgDialog::dragEnterEvent() Formats"; - std::cerr << std::endl; - QStringList formats = event->mimeData()->formats(); - QStringList::iterator it; - for(it = formats.begin(); it != formats.end(); it++) - { - std::cerr << "Format: " << (*it).toStdString(); - std::cerr << std::endl; - } - - if (event->mimeData()->hasFormat("text/plain")) - { - std::cerr << "GeneralMsgDialog::dragEnterEvent() Accepting PlainText"; - std::cerr << std::endl; - event->acceptProposedAction(); - } - else if (event->mimeData()->hasUrls()) - { - std::cerr << "GeneralMsgDialog::dragEnterEvent() Accepting Urls"; - std::cerr << std::endl; - event->acceptProposedAction(); - } - else if (event->mimeData()->hasFormat("application/x-rsfilelist")) - { - std::cerr << "GeneralMsgDialog::dragEnterEvent() accepting Application/x-qabs..."; - std::cerr << std::endl; - event->acceptProposedAction(); - } - else - { - std::cerr << "GeneralMsgDialog::dragEnterEvent() No PlainText/Urls"; - std::cerr << std::endl; - } -} - -void GeneralMsgDialog::dropEvent(QDropEvent *event) -{ - if (!(Qt::CopyAction & event->possibleActions())) - { - std::cerr << "GeneralMsgDialog::dropEvent() Rejecting uncopyable DropAction"; - std::cerr << std::endl; - - /* can't do it */ - return; - } - - std::cerr << "GeneralMsgDialog::dropEvent() Formats"; - std::cerr << std::endl; - QStringList formats = event->mimeData()->formats(); - QStringList::iterator it; - for(it = formats.begin(); it != formats.end(); it++) - { - std::cerr << "Format: " << (*it).toStdString(); - std::cerr << std::endl; - } - - if (event->mimeData()->hasText()) - { - std::cerr << "GeneralMsgDialog::dropEvent() Plain Text:"; - std::cerr << std::endl; - std::cerr << event->mimeData()->text().toStdString(); - std::cerr << std::endl; - } - - if (event->mimeData()->hasUrls()) - { - std::cerr << "GeneralMsgDialog::dropEvent() Urls:"; - std::cerr << std::endl; - - QList urls = event->mimeData()->urls(); - QList::iterator uit; - for(uit = urls.begin(); uit != urls.end(); uit++) - { - std::string localpath = uit->toLocalFile().toStdString(); - std::cerr << "Whole URL: " << uit->toString().toStdString(); - std::cerr << std::endl; - std::cerr << "or As Local File: " << localpath; - std::cerr << std::endl; - - if (localpath.size() > 0) - { - - addAttachment(localpath); - } - } - } - else if (event->mimeData()->hasFormat("application/x-rsfilelist")) - { - std::cerr << "GeneralMsgDialog::dropEvent() Application/x-rsfilelist"; - std::cerr << std::endl; - - - QByteArray data = event->mimeData()->data("application/x-rsfilelist"); - std::cerr << "Data Len:" << data.length(); - std::cerr << std::endl; - std::cerr << "Data is:" << data.data(); - std::cerr << std::endl; - - std::string newattachments(data.data()); - parseRsFileListAttachments(newattachments); - } - - - event->setDropAction(Qt::CopyAction); - event->accept(); -} - -void GeneralMsgDialog::parseRsFileListAttachments(std::string attachList) -{ - /* split into lines */ - QString input = QString::fromStdString(attachList); - - QStringList attachItems = input.split("\n"); - QStringList::iterator it; - QStringList::iterator it2; - - for(it = attachItems.begin(); it != attachItems.end(); it++) - { - std::cerr << "GeneralMsgDialog::parseRsFileListAttachments() Entry: "; - - QStringList parts = (*it).split("/"); - - bool ok = false; - quint64 qsize = 0; - - std::string fname; - std::string hash; - uint64_t size = 0; - std::string source; - - int i = 0; - for(it2 = parts.begin(); it2 != parts.end(); it2++, i++) - { - std::cerr << "\"" << it2->toStdString() << "\" "; - switch(i) - { - case 0: - fname = it2->toStdString(); - break; - case 1: - hash = it2->toStdString(); - break; - case 2: - qsize = it2->toULongLong(&ok, 10); - size = qsize; - break; - case 3: - source = it2->toStdString(); - break; - } - } - - std::cerr << std::endl; - - std::cerr << "\tfname: " << fname << std::endl; - std::cerr << "\thash: " << hash << std::endl; - std::cerr << "\tsize: " << size << std::endl; - std::cerr << "\tsource: " << source << std::endl; - - /* basic error checking */ - if ((ok) && (hash.size() == 40)) - { - std::cerr << "Item Ok" << std::endl; - if (source == "Local") - { - addAttachment(hash, fname, size, true, ""); - } - else - { - // TEMP NOT ALLOWED UNTIL FT WORKING. - addAttachment(hash, fname, size, false, source); - } - - } - else - { - std::cerr << "Error Decode: Hash size: " << hash.size() << std::endl; - } - - } -} - - -void GeneralMsgDialog::addAttachment(std::string hash, std::string fname, uint64_t size, bool local, std::string srcId) -{ - /* add a AttachFileItem to the attachment section */ - std::cerr << "GeneralMsgDialog::addAttachment()"; - std::cerr << std::endl; - - /* add widget in for new destination */ - - uint32_t flags = AFI_TYPE_ATTACH; - if (local) - { - flags |= AFI_STATE_LOCAL; - } - else - { - flags |= AFI_STATE_REMOTE; - // TMP REMOVED REMOTE ADD FOR DEMONSTRATOR - return; - } - - AttachFileItem *file = new AttachFileItem(hash, fname, size, flags, srcId); - - mAttachments.push_back(file); - verticalLayout_2->addWidget(file); - - if (mCheckAttachment) - { - checkAttachmentReady(); - } - - return; -} - - -void GeneralMsgDialog::addExtraFile() -{ - /* add a AttachFileItem to the attachment section */ - std::cerr << "GeneralMsgDialog::addExtraFile() opening file dialog"; - std::cerr << std::endl; - - // select a file - QString qfile = QFileDialog::getOpenFileName(this, tr("Add Extra File"), "", "", 0, - QFileDialog::DontResolveSymlinks); - std::string filePath = qfile.toStdString(); - if (filePath != "") - { - addAttachment(filePath); - } -} - - -void GeneralMsgDialog::addAttachment(std::string path) -{ - /* add a AttachFileItem to the attachment section */ - std::cerr << "GeneralMsgDialog::addAttachment()"; - std::cerr << std::endl; - - /* add to ExtraList here, - * use default TIMEOUT of 30 days (time to fetch it). - */ - //uint32_t period = 30 * 24 * 60 * 60; - //uint32_t flags = 0; - //rsFiles->ExtraFileHash(localpath, period, flags); - - /* add widget in for new destination */ - AttachFileItem *file = new AttachFileItem(path); - - mAttachments.push_back(file); - verticalLayout_2->addWidget(file); - - if (mCheckAttachment) - { - checkAttachmentReady(); - } - - return; - -} - -void GeneralMsgDialog::checkAttachmentReady() -{ - std::list::iterator fit; - - mCheckAttachment = false; - - for(fit = mAttachments.begin(); fit != mAttachments.end(); fit++) - { - if (!(*fit)->isHidden()) - { - if (!(*fit)->ready()) - { - /* - */ - buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); - break; - - - return; - } - } - } - - if (fit == mAttachments.end()) - { - buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); - } - - /* repeat... */ - int msec_rate = 1000; - QTimer::singleShot( msec_rate, this, SLOT(checkAttachmentReady(void))); -} - - -void GeneralMsgDialog::cancelMsg() -{ - std::cerr << "GeneralMsgDialog::cancelMsg()"; - std::cerr << std::endl; - return; -} - -void GeneralMsgDialog::addDestination(uint32_t type, std::string grpId, std::string inReplyTo) -{ - std::cerr << "GeneralMsgDialog::addDestination()"; - std::cerr << std::endl; - - /* add widget in for new destination */ - SubDestItem *dest = new SubDestItem(type, grpId, inReplyTo); - - mDestinations.push_back(dest); - //QLayout *layout = destFrame->layout(); - verticalLayout->addWidget(dest); - - return; -} - -void GeneralMsgDialog::setMsgType(uint32_t type) -{ - switch(type) - { - default: - case FEEDHOLDER_MSG_MESSAGE: - typeComboBox->setCurrentIndex(GMD_TYPE_MESSAGE_IDX); - break; - case FEEDHOLDER_MSG_FORUM: - typeComboBox->setCurrentIndex(GMD_TYPE_FORUM_IDX); - break; - case FEEDHOLDER_MSG_CHANNEL: - typeComboBox->setCurrentIndex(GMD_TYPE_CHANNEL_IDX); - break; - case FEEDHOLDER_MSG_BLOG: - typeComboBox->setCurrentIndex(GMD_TYPE_BLOG_IDX); - break; - } -} - - -void GeneralMsgDialog::updateGroupId() -{ - std::cerr << "GeneralMsgDialog::updateGroupId()"; - std::cerr << std::endl; - - int idx = typeComboBox->currentIndex(); - - destIdComboBox->clear(); - switch(idx) - { - case GMD_TYPE_MESSAGE_IDX: - { - /* add a list of friends */ - if (rsPeers) - { - std::list friends; - std::list::iterator it; - - rsPeers->getFriendList(friends); - for(it = friends.begin(); it != friends.end(); it++) - { - QString id = QString::fromStdString(*it); - QString name = QString::fromStdString(rsPeers->getPeerName(*it)); - - destIdComboBox->addItem(name, id); - } - } - } - break; - case GMD_TYPE_FORUM_IDX: - { - /* add a list of publishable forums */ - if (rsForums) - { - std::list forumList; - std::list::iterator it; - - rsForums->getForumList(forumList); - for(it = forumList.begin(); it != forumList.end(); it++) - { - if (it->forumFlags & RS_DISTRIB_PUBLISH) - { - QString id = QString::fromStdString(it->forumId); - QString name = QString::fromStdWString(it->forumName); - - destIdComboBox->addItem(name, id); - } - } - } - } - break; - case GMD_TYPE_CHANNEL_IDX: - { - /* add a list of publishable channels */ - if (rsChannels) - { - std::list channelList; - std::list::iterator it; - - rsChannels->getChannelList(channelList); - for(it = channelList.begin(); it != channelList.end(); it++) - { - if (it->channelFlags & RS_DISTRIB_PUBLISH) - { - QString id = QString::fromStdString(it->channelId); - QString name = QString::fromStdWString(it->channelName); - - destIdComboBox->addItem(name, id); - } - } - } - } - break; - default: - case GMD_TYPE_BLOG_IDX: - { - /* empty list */ - } - break; - } - -} - -void GeneralMsgDialog::newDestination() -{ - /* get details from uint32_t type, std::string grpId, std::string inReplyTo) - */ - - std::cerr << "GeneralMsgDialog::newDestination()"; - std::cerr << std::endl; - - int idx = typeComboBox->currentIndex(); - std::string grpId; - - if (destIdComboBox->currentIndex() >= 0) - { - QVariant qv = destIdComboBox->itemData(destIdComboBox->currentIndex()); - grpId = qv.toString().toStdString(); - } - - switch(idx) - { - case GMD_TYPE_MESSAGE_IDX: - addDestination(FEEDHOLDER_MSG_MESSAGE, grpId, ""); - break; - case GMD_TYPE_FORUM_IDX: - addDestination(FEEDHOLDER_MSG_FORUM, grpId, ""); - break; - case GMD_TYPE_CHANNEL_IDX: - addDestination(FEEDHOLDER_MSG_CHANNEL, grpId, ""); - break; - case GMD_TYPE_BLOG_IDX: - addDestination(FEEDHOLDER_MSG_BLOG, "", ""); - break; - default: - break; - } -} - - -void GeneralMsgDialog::sendMsg() -{ - std::cerr << "GeneralMsgDialog::sendMsg()"; - std::cerr << std::endl; - - /* construct message bits */ - std::wstring subject = subjectEdit->text().toStdWString(); - std::wstring msg = msgEdit->toPlainText().toStdWString(); - - std::list files; - - std::list::iterator it; - std::list::iterator fit; - - for(fit = mAttachments.begin(); fit != mAttachments.end(); fit++) - { - if (!(*fit)->isHidden()) - { - FileInfo fi; - fi.hash = (*fit)->FileHash(); - fi.fname = (*fit)->FileName(); - fi.size = (*fit)->FileSize(); - - files.push_back(fi); - - /* commence downloads - if we don't have the file */ - if (!(*fit)->done()) - { - if ((*fit)->ready()) - { - //(*fit)->download(); - } - // Skips unhashed files. - } - } - } - - /* iterate through each mDestinations that is visible, and send */ - for(it = mDestinations.begin(); it != mDestinations.end(); it++) - { - if (!(*it)->isHidden()) - { - sendMessage((*it)->DestType(), (*it)->DestGroupId(), - (*it)->DestInReplyTo(), subject, msg, files); - } - } -} - -void GeneralMsgDialog::sendMessage(uint32_t type, std::string grpId, std::string inReplyTo, - std::wstring subject, std::wstring msg, std::list &files) -{ - std::cerr << "GeneralMsgDialog::sendMessage() Type: " << type << " GroupId: " << grpId; - std::cerr << std::endl; - - /* construct specific messages */ - switch(type) - { - case FEEDHOLDER_MSG_MESSAGE: - { - if (rsMsgs) - { - /* construct a message */ - MessageInfo mi; - - mi.title = subject; - mi.msg = msg; - mi.files = files; - mi.msgto.push_back(grpId); - - rsMsgs->MessageSend(mi); - } - } - break; - case FEEDHOLDER_MSG_FORUM: - { - /* rsForum */ - if (rsForums) - { - ForumMsgInfo msgInfo; - - msgInfo.forumId = grpId; - msgInfo.threadId = ""; - msgInfo.parentId = inReplyTo; - msgInfo.msgId = ""; - - msgInfo.title = subject; - msgInfo.msg = msg; - - rsForums->ForumMessageSend(msgInfo); - } - } - break; - case FEEDHOLDER_MSG_CHANNEL: - { - /* rsChannels */ - if (rsChannels) - { - ChannelMsgInfo msgInfo; - - msgInfo.channelId = grpId; - msgInfo.msgId = ""; - - msgInfo.subject = subject; - msgInfo.msg = msg; - msgInfo.files = files; - - rsChannels->ChannelMessageSend(msgInfo); - } - } - - break; - case FEEDHOLDER_MSG_BLOG: - - - break; - default: - - break; - } -} - - - - - - - - diff --git a/retroshare-gui/src/gui/GeneralMsgDialog.h b/retroshare-gui/src/gui/GeneralMsgDialog.h deleted file mode 100644 index 252eec262..000000000 --- a/retroshare-gui/src/gui/GeneralMsgDialog.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2008 Robert Fernie - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - -#ifndef _GENERAL_MSG_DIALOG_H -#define _GENERAL_MSG_DIALOG_H - -#include "ui_GeneralMsgDialog.h" -#include - -class SubDestItem; -class AttachFileItem; -class FileInfo; - -const uint32_t GMD_TYPE_MESSAGE_IDX = 0; -const uint32_t GMD_TYPE_FORUM_IDX = 1; -const uint32_t GMD_TYPE_CHANNEL_IDX = 2; -const uint32_t GMD_TYPE_BLOG_IDX = 3; - -class GeneralMsgDialog : public QDialog, private Ui::GeneralMsgDialog -{ - Q_OBJECT - -public: - /** Default Constructor */ - GeneralMsgDialog(QWidget *parent = 0, uint32_t type = 0); - /** Default Destructor */ - - void addAttachment(std::string path); - void addAttachment(std::string hash, std::string fname, uint64_t size, - bool local, std::string srcId); - - void addDestination(uint32_t type, std::string grpId, std::string inReplyTo); - void setMsgType(uint32_t type); - -protected: -virtual void dragEnterEvent(QDragEnterEvent *event); -virtual void dropEvent(QDropEvent *event); - -private slots: - void addExtraFile(); - void checkAttachmentReady(); - void updateGroupId(); - void newDestination(); - void cancelMsg(); - void sendMsg(); - -private: - -void parseRsFileListAttachments(std::string attachList); - -void sendMessage(uint32_t type, std::string grpId, std::string inReplyTo, - std::wstring subject, std::wstring msg, std::list &files); - - - /* maps of files and destinations */ - std::list mDestinations; - std::list mAttachments; - - bool mCheckAttachment; -}; - - - -#endif - diff --git a/retroshare-gui/src/gui/GeneralMsgDialog.ui b/retroshare-gui/src/gui/GeneralMsgDialog.ui deleted file mode 100644 index 58ca7d4fa..000000000 --- a/retroshare-gui/src/gui/GeneralMsgDialog.ui +++ /dev/null @@ -1,508 +0,0 @@ - - - GeneralMsgDialog - - - - 0 - 0 - 548 - 458 - - - - true - - - General Message - - - - :/images/rstray3.png:/images/rstray3.png - - - - 0 - - - 0 - - - - - 9 - - - 9 - - - - - true - - - - Friend - - - - - Channel - - - - - Forum - - - - - Blog - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Add Message Destination - - - Add Message Destination - - - - :/images/edit_add24.png:/images/edit_add24.png - - - - 24 - 24 - - - - - - - - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);} - - - - QFrame::NoFrame - - - QFrame::Raised - - - - - - - 32 - 32 - - - - - - - :/images/new-mail-alert.png - - - true - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:18pt; font-weight:600; color:#ffffff;">General Message</span></p></body></html> - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - - - 0 - - - - Message - - - - - - - - - - - :/images/contacts24.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - 75 - true - - - - Message Destination - - - - - - - Qt::Horizontal - - - - 271 - 20 - - - - - - - - - - Qt::ScrollBarAlwaysOn - - - true - - - - - 0 - 0 - 485 - 60 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - Message - - - - - - - - - 75 - true - - - - Subject : - - - - - - - - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - Attachments - - - - - - - - - - - :/images/attachment.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 13 - 20 - - - - - - - - - 75 - true - - - - Attachments - - - - - - - Qt::Horizontal - - - - 218 - 20 - - - - - - - - - 0 - 0 - - - - - 24 - 0 - - - - - - - - :/images/add-share24.png:/images/add-share24.png - - - - 24 - 24 - - - - - - - - - - Qt::ScrollBarAlwaysOn - - - true - - - - - 0 - 0 - 485 - 270 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - - - - - - - - - - - - buttonBox - accepted() - GeneralMsgDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - GeneralMsgDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index b79bab75e..481d46451 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -28,7 +28,6 @@ #include "NetworkDialog.h" #include "NetworkView.h" #include "TrustView.h" -#include "connect/ConnectDialog.h" #include "GenCertDialog.h" #include "rsiface/rsiface.h" #include "rsiface/rspeers.h" diff --git a/retroshare-gui/src/gui/NetworkDialog.h b/retroshare-gui/src/gui/NetworkDialog.h index bde203f67..a8b5a5fda 100644 --- a/retroshare-gui/src/gui/NetworkDialog.h +++ b/retroshare-gui/src/gui/NetworkDialog.h @@ -30,9 +30,6 @@ #include "ui_NetworkDialog.h" #include "RsAutoUpdatePage.h" -#include "connect/ConnectDialog.h" - - class NetworkDialog : public RsAutoUpdatePage { Q_OBJECT diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index db728e846..bf1797f17 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -37,9 +37,6 @@ #include "settings/rsharesettings.h" -#include "GeneralMsgDialog.h" - - const uint32_t NEWSFEED_PEERLIST = 0x0001; const uint32_t NEWSFEED_FORUMNEWLIST = 0x0002; const uint32_t NEWSFEED_FORUMMSGLIST = 0x0003; @@ -418,20 +415,4 @@ void NewsFeed::openChat(std::string peerId) #endif } -void NewsFeed::openMsg(uint32_t type, std::string grpId, std::string inReplyTo) -{ -#ifdef NEWS_DEBUG - std::cerr << "NewsFeed::openMsg()"; - std::cerr << std::endl; -#endif - GeneralMsgDialog *msgDialog = new GeneralMsgDialog(NULL); - - - msgDialog->addDestination(type, grpId, inReplyTo); - - msgDialog->show(); - - /* window will destroy itself! */ -} - diff --git a/retroshare-gui/src/gui/NewsFeed.h b/retroshare-gui/src/gui/NewsFeed.h index aa1611537..b78e5db0a 100644 --- a/retroshare-gui/src/gui/NewsFeed.h +++ b/retroshare-gui/src/gui/NewsFeed.h @@ -43,7 +43,6 @@ public: /* FeedHolder Functions (for FeedItem functionality) */ virtual void deleteFeedItem(QWidget *item, uint32_t type); virtual void openChat(std::string peerId); - virtual void openMsg(uint32_t type, std::string grpId, std::string inReplyTo); private slots: // void toggleChanMsgItems(bool on); diff --git a/retroshare-gui/src/gui/connect/ConnectDialog.cpp b/retroshare-gui/src/gui/connect/ConnectDialog.cpp deleted file mode 100644 index 3a81381b6..000000000 --- a/retroshare-gui/src/gui/connect/ConnectDialog.cpp +++ /dev/null @@ -1,184 +0,0 @@ -/**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - - - -#include -#include "ConnectDialog.h" - -#include "rsiface/rsiface.h" -#include "rsiface/rspeers.h" -#include -#include - -/** Default constructor */ -ConnectDialog::ConnectDialog(QWidget *parent, Qt::WFlags flags) - : QMainWindow(parent, flags) -{ - /* Invoke Qt Designer generated QObject setup routine */ - ui.setupUi(this); - - // Create the status bar - statusBar()->showMessage("Peer Informations"); - - //setFixedSize(QSize(330, 412)); - - connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg())); - connect(ui.okButton, SIGNAL(clicked()), this, SLOT(authAttempt())); - connect(ui.Ledit_name, SIGNAL(textChanged ( const QString & ) ), this, SLOT(checkAuthCode( const QString & ))); - -} - -/** Destructor. */ -ConnectDialog::~ConnectDialog() -{ -} - -/** - Overloads the default show() slot so we can set opacity*/ - -void -ConnectDialog::show() -{ - //loadSettings(); - if(!this->isVisible()) { - QMainWindow::show(); - - } -} - -void ConnectDialog::closeEvent (QCloseEvent * event) -{ - - - QWidget::closeEvent(event); -} - -void ConnectDialog::closeinfodlg() -{ - close(); -} - - -void ConnectDialog::setInfo(std::string name, - std::string trust, - std::string org, - std::string loc, - std::string country, - std::string signers) -{ - ui.name->setText(QString::fromStdString(name)); - ui.trust->setText(QString::fromStdString(trust)); - ui.org->setText(QString::fromStdString(org)); - ui.loc->setText(QString::fromStdString(loc)); - ui.country->setText(QString::fromStdString(country)); - ui.signers->setText(QString::fromStdString(signers)); -} - - -void ConnectDialog::setAuthCode(std::string id, std::string code) -{ - authId = id; - authCode = code; - ui.Ledit_name->setText(QString::fromStdString(code)); - //ui.okButton ->setEnabled(true); -} - -void ConnectDialog::checkAuthCode(const QString &txt) -{ - - //std::cerr << "AuthCode:" << authCode << std::endl; - //std::cerr << "Entered:" << ui.Ledit_name -> text().toStdString() << std::endl; - //std::cerr << "Entered:" << txt.toStdString() << std::endl; - - if (authCode == txt.toStdString()) - { - /* enable ok button */ - ui.okButton ->setEnabled(true); - } - else - { - /* disable ok button */ - ui.okButton ->setEnabled(false); - } -} - -void ConnectDialog::authAttempt() -{ - - /* well lets do it ! */ - std::cerr << "Attempting AuthCode:" << authCode << std::endl; - //rsPeers->AuthCertificate(authId, authCode); - rsPeers->addDummyFriend(authId); - - rsicontrol->getNotify().notifyListChange(NOTIFY_LIST_NEIGHBOURS,1) ; - /* close it up! */ - closeinfodlg(); -} - -bool ConnectDialog::loadPeer(std::string id) -{ - RsPeerDetails detail; - if (!rsPeers->getPeerDetails(id, detail)) - { - rsiface->unlockData(); /* UnLock Interface */ - return false; - } - - std::string trustString; - - switch(detail.trustLvl) - { - case RS_TRUST_LVL_ULTIMATE: - trustString = "Ultimate"; - break; - case RS_TRUST_LVL_FULL: - trustString = "Full"; - break; - case RS_TRUST_LVL_MARGINAL: - trustString = "Marginal"; - break; - case RS_TRUST_LVL_NONE: - trustString = "None"; - break; - default: - trustString = "Unknown"; - break; - } - - std::ostringstream out; - - std::list::iterator it; - for(it = detail.gpgSigners.begin(); it != detail.gpgSigners.end(); it++) - { - out << rsPeers->getPeerName(*it) << " <" << *it << ">"; - out << std::endl; - } - - /* setup the gui */ - setInfo(detail.name, trustString, detail.org, - detail.location, detail.email, out.str()); - - setAuthCode(id, detail.authcode); - - return true; -} - diff --git a/retroshare-gui/src/gui/connect/ConnectDialog.h b/retroshare-gui/src/gui/connect/ConnectDialog.h deleted file mode 100644 index 8f0d4ac00..000000000 --- a/retroshare-gui/src/gui/connect/ConnectDialog.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - - -#ifndef _CONNECTDIALOG_H -#define _CONNECTDIALOG_H - -#include "ui_ConnectDialog.h" - - -class ConnectDialog : public QMainWindow -{ - Q_OBJECT - -public: - /** Default constructor */ - ConnectDialog(QWidget *parent = 0, Qt::WFlags flags = 0); - /** Default destructor */ - ~ConnectDialog(); - -bool loadPeer(std::string id); - -public slots: - /** Overloaded QWidget.show */ - void checkAuthCode( const QString &txt ); - void show(); - -protected: - void closeEvent (QCloseEvent * event); - -private slots: - - void closeinfodlg(); - void authAttempt(); - - -private: - - -void setInfo(std::string name, - std::string trust, - std::string org, - std::string loc, - std::string country, - std::string signers); - -void setAuthCode(std::string id, std::string code); - - std::string authCode; - std::string authId; - - /** Qt Designer generated object */ - Ui::ConnectDialog ui; -}; - -#endif - - diff --git a/retroshare-gui/src/gui/connect/ConnectDialog.ui b/retroshare-gui/src/gui/connect/ConnectDialog.ui deleted file mode 100644 index cf81c69d7..000000000 --- a/retroshare-gui/src/gui/connect/ConnectDialog.ui +++ /dev/null @@ -1,740 +0,0 @@ - - ConnectDialog - - - - 0 - 0 - 462 - 475 - - - - - - - - - 16 - 16 - 16 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 160 - 160 - 160 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - - 16 - 16 - 16 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 160 - 160 - 160 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - - 104 - 104 - 104 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 160 - 160 - 160 - - - - - - - 104 - 104 - 104 - - - - - - - 255 - 255 - 255 - - - - - - - 104 - 104 - 104 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - - Arial - 8 - 50 - false - false - false - false - - - - Qt::NoContextMenu - - - Make Friend - - - - :/images/rstray3.png:/images/rstray3.png - - - - - 0 - 0 - 462 - 453 - - - - - - - - 0 - 70 - - - - background-image: url(:/images/addfriendlabel.png) - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; font-weight:600; color:#000000;"> Make Friend</span></p></body></html> - - - - - - - Peer Details - - - - - - Trust: - - - - - - - true - - - - - - - Name: - - - - - - - true - - - - - - - Org: - - - - - - - true - - - - - - - Loc: - - - - - - - true - - - - - - - Country: - - - - - - - true - - - - - - - signers: - - - - - - - - - - - - - AUTH CODE: - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 235 - 18 - - - - - - - - 6 - - - 0 - - - - - Qt::Horizontal - - - - 131 - 31 - - - - - - - - - 77 - 0 - - - - Cancel - - - - :/images/cancel.png:/images/cancel.png - - - - - - - false - - - - 77 - 0 - - - - Make Friend - - - - :/images/user/add_user16.png:/images/user/add_user16.png - - - - - - - - - - - 0 - 453 - 462 - 22 - - - - - - trust - name - org - loc - country - signers - Ledit_name - - - - - - diff --git a/retroshare-gui/src/gui/feeds/FeedHolder.h b/retroshare-gui/src/gui/feeds/FeedHolder.h index 4a9b977b6..67b658749 100644 --- a/retroshare-gui/src/gui/feeds/FeedHolder.h +++ b/retroshare-gui/src/gui/feeds/FeedHolder.h @@ -36,7 +36,6 @@ class FeedHolder virtual void deleteFeedItem(QWidget *item, uint32_t type) = 0; virtual void openChat(std::string peerId) = 0; -virtual void openMsg(uint32_t type, std::string grpId, std::string inReplyTo) = 0; }; #endif diff --git a/retroshare-gui/src/gui/feeds/ForumNewItem.cpp b/retroshare-gui/src/gui/feeds/ForumNewItem.cpp index ac4f53e25..4b11a5826 100644 --- a/retroshare-gui/src/gui/feeds/ForumNewItem.cpp +++ b/retroshare-gui/src/gui/feeds/ForumNewItem.cpp @@ -208,7 +208,7 @@ void ForumNewItem::postToForum() #endif if (mParent) { - mParent->openMsg(FEEDHOLDER_MSG_FORUM, mForumId, ""); + //mParent->openMsg(FEEDHOLDER_MSG_FORUM, mForumId, ""); } } diff --git a/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp b/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp index decd80872..74f219330 100644 --- a/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp @@ -38,7 +38,6 @@ #include "BlogDetails.h" #include "gui/ChanGroupDelegate.h" -#include "gui/GeneralMsgDialog.h" #define BLOG_DEFAULT_IMAGE ":/images/hi64-app-kblogger.png" @@ -196,22 +195,6 @@ void BlogsDialog::openChat(std::string peerId) return; } -void BlogsDialog::openMsg(uint32_t type, std::string grpId, std::string inReplyTo) -{ -#ifdef BLOG_DEBUG - std::cerr << "BlogsDialog::openMsg()"; - std::cerr << std::endl; -#endif - GeneralMsgDialog *msgDialog = new GeneralMsgDialog(NULL); - - - msgDialog->addDestination(type, grpId, inReplyTo); - - msgDialog->show(); - - /* window will destroy itself! */ -} - void BlogsDialog::createMsg() { if (mBlogId == "") diff --git a/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.h b/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.h index 283b69af7..cc3d9da63 100644 --- a/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.h +++ b/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.h @@ -49,7 +49,6 @@ public: virtual void deleteFeedItem(QWidget *item, uint32_t type); virtual void openChat(std::string peerId); -virtual void openMsg(uint32_t type, std::string grpId, std::string inReplyTo); public slots: