mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-04 23:25:32 -04:00
Significant changes to the GUI to introduce new display style.
* Completed much of General Msg Dialog. * Completed much of ChannelFeed. * Added Channel Messages to News Feed. * Connected Blog/Channels to GeneralMsgDialog. * Improved SubFileItem display. * Completed ChanGroup/Menu/MsgItems. * Added SubDestItem for use in GeneralMsgDialog. * Generalise CreateForum to cover Channels as well. * Restricted CreateForum to public forums/private channels. * Demo of Drag-N-Drop Files for Linux (filesystem->GenMsgDialog) * Updates to rsiface stuff (blog/channels/types) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@621 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
b9ccbd54e8
commit
c6a595c7db
26 changed files with 1489 additions and 206 deletions
|
@ -27,6 +27,10 @@
|
|||
|
||||
#include "gui/feeds/FeedHolder.h"
|
||||
|
||||
class ChanGroupItem;
|
||||
class ChanMenuItem;
|
||||
class ChanMsgItem;
|
||||
|
||||
class ChannelFeed : public MainPage, public FeedHolder, private Ui::ChannelFeed
|
||||
{
|
||||
Q_OBJECT
|
||||
|
@ -41,10 +45,49 @@ 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:
|
||||
|
||||
void selectChannel( std::string );
|
||||
|
||||
private slots:
|
||||
|
||||
void checkUpdate();
|
||||
|
||||
void createChannel();
|
||||
void sendMsg();
|
||||
|
||||
void channelSelection();
|
||||
|
||||
private:
|
||||
|
||||
/* lists of feedItems */
|
||||
//std::list<ChanMsgItem *> mChanMsgItems;
|
||||
void updateChannelList();
|
||||
void updateChannelListOwn(std::list<std::string> &ids);
|
||||
void updateChannelListSub(std::list<std::string> &ids);
|
||||
void updateChannelListPop(std::list<std::string> &ids);
|
||||
void updateChannelListOther(std::list<std::string> &ids);
|
||||
|
||||
void updateChannelMsgs();
|
||||
|
||||
std::string mChannelId; /* current Channel */
|
||||
|
||||
/* Layout Pointers */
|
||||
QBoxLayout *mGroupLayout;
|
||||
QBoxLayout *mMsgLayout;
|
||||
|
||||
/* Group Headers */
|
||||
ChanGroupItem *mGroupOwn;
|
||||
ChanGroupItem *mGroupSub;
|
||||
ChanGroupItem *mGroupPop;
|
||||
ChanGroupItem *mGroupOther;
|
||||
|
||||
/* lists of feedItems */
|
||||
std::list<ChanMenuItem *> mChannelListOwn;
|
||||
std::list<ChanMenuItem *> mChannelListSub;
|
||||
std::list<ChanMenuItem *> mChannelListPop;
|
||||
std::list<ChanMenuItem *> mChannelListOther;
|
||||
|
||||
std::list<ChanMsgItem *> mChanMsgItems;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue