mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-07 00:25:16 -04:00
Removed context help button from the dialogs (currently not used) and added minimize/maximize buttons to the "floating" dialogs.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
07d8db4505
commit
9b5ee85fd0
42 changed files with 86 additions and 189 deletions
|
@ -34,14 +34,10 @@
|
|||
#include "retroshare/rspeers.h"
|
||||
#include <retroshare/rshistory.h>
|
||||
|
||||
#ifndef RS_RELEASE_VERSION
|
||||
#include "channels/CreateChannel.h"
|
||||
#endif
|
||||
#include "common/Emoticons.h"
|
||||
#include "common/PeerDefs.h"
|
||||
#include "chat/ChatUserNotify.h"
|
||||
#include "connect/ConnectFriendWizard.h"
|
||||
#include "forums/CreateForum.h"
|
||||
#include "groups/CreateGroup.h"
|
||||
#include "im_history/ImHistoryBrowser.h"
|
||||
#include "MainWindow.h"
|
||||
|
@ -174,10 +170,6 @@ FriendsDialog::FriendsDialog(QWidget *parent)
|
|||
menu->addAction(ui.actionFriendRecommendations);
|
||||
|
||||
menu->addSeparator();
|
||||
menu->addAction(ui.actionCreate_New_Forum);
|
||||
#ifndef RS_RELEASE_VERSION
|
||||
menu->addAction(ui.actionCreate_New_Channel);
|
||||
#endif
|
||||
menu->addAction(ui.actionSet_your_Avatar);
|
||||
menu->addAction(ui.actionSet_your_Personal_Message);
|
||||
|
||||
|
@ -753,26 +745,6 @@ void FriendsDialog::getAvatar()
|
|||
}
|
||||
}
|
||||
|
||||
void FriendsDialog::on_actionCreate_New_Forum_activated()
|
||||
{
|
||||
MainWindow::activatePage (MainWindow::Forums);
|
||||
|
||||
CreateForum cf (this);
|
||||
cf.exec();
|
||||
|
||||
}
|
||||
|
||||
void FriendsDialog::on_actionCreate_New_Channel_activated()
|
||||
{
|
||||
#ifndef RS_RELEASE_VERSION
|
||||
MainWindow::activatePage (MainWindow::Channels);
|
||||
|
||||
CreateChannel cf (this);
|
||||
cf.exec();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
/** Loads own personal status */
|
||||
void FriendsDialog::loadmypersonalstatus()
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue