mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-13 19:42:28 -04:00
Added a new CreateChannelMsg Dialog as replacement for GeneralMessage for Channels.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2070 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
15fc60903d
commit
a44d28d7de
8 changed files with 995 additions and 27 deletions
|
@ -33,8 +33,8 @@
|
|||
#include "gui/forums/CreateForum.h"
|
||||
|
||||
#include "gui/ChanGroupDelegate.h"
|
||||
|
||||
#include "GeneralMsgDialog.h"
|
||||
#include "gui/channels/CreateChannelMsg.h"
|
||||
|
||||
/****
|
||||
* #define CHAN_DEBUG
|
||||
|
@ -48,7 +48,7 @@ ChannelFeed::ChannelFeed(QWidget *parent)
|
|||
setupUi(this);
|
||||
|
||||
connect(actionCreate_Channel, SIGNAL(triggered()), this, SLOT(createChannel()));
|
||||
connect(postButton, SIGNAL(clicked()), this, SLOT(sendMsg()));
|
||||
connect(postButton, SIGNAL(clicked()), this, SLOT(createMsg()));
|
||||
connect(subscribeButton, SIGNAL( clicked( void ) ), this, SLOT( subscribeChannel ( void ) ) );
|
||||
connect(unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeChannel ( void ) ) );
|
||||
|
||||
|
@ -205,26 +205,6 @@ void ChannelFeed::channelSelection()
|
|||
updateChannelMsgs();
|
||||
}
|
||||
|
||||
void ChannelFeed::sendMsg()
|
||||
{
|
||||
#ifdef CHAN_DEBUG
|
||||
std::cerr << "ChannelFeed::sendMsg()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
if (mChannelId != "")
|
||||
{
|
||||
openMsg(FEEDHOLDER_MSG_CHANNEL, mChannelId, "");
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef CHAN_DEBUG
|
||||
std::cerr << "ChannelFeed::sendMsg() no Channel Selected!";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*************************************************************************************/
|
||||
|
@ -241,7 +221,6 @@ void ChannelFeed::openChat(std::string peerId)
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
void ChannelFeed::openMsg(uint32_t type, std::string grpId, std::string inReplyTo)
|
||||
{
|
||||
#ifdef CHAN_DEBUG
|
||||
|
@ -257,6 +236,20 @@ void ChannelFeed::openMsg(uint32_t type, std::string grpId, std::string inReplyT
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
void ChannelFeed::createMsg()
|
||||
{
|
||||
if (mChannelId == "")
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
CreateChannelMsg *msgDialog = new CreateChannelMsg(mChannelId);
|
||||
|
||||
msgDialog->show();
|
||||
return;
|
||||
}
|
||||
|
||||
void ChannelFeed::selectChannel( std::string cId)
|
||||
{
|
||||
mChannelId = cId;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue