Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 05:39:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1615 from csoler/v0.6-FriendList

Browse source 
V0.6 friend list
This commit is contained in:
csoler 2019-08-26 19:07:11 +02:00 • committed by GitHub
commit c28c193b7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 3272 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

11
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -31,10 +31,13 @@
#include <retroshare/rsplugin.h>
#include <retroshare/rsconfig.h>
#ifdef MESSENGER_WINDOW
#include "MessengerWindow.h"
#endif
#include "rshare.h"
#include "MainWindow.h"
#include "ui_MainWindow.h"
#include "MessengerWindow.h"
#include "HomePage.h"
#include "NetworkDialog.h"
#include "gui/FileTransfer/SearchDialog.h"
@ -369,7 +372,9 @@ MainWindow::~MainWindow()
delete soundStatus;
delete toasterDisable;
delete sysTrayStatus;
#ifdef MESSENGER_WINDOW
MessengerWindow::releaseInstance();
#endif
#ifdef UNFINISHED
delete applicationWindow;
#endif
@ -596,7 +601,9 @@ void MainWindow::createTrayIcon()
notifyMenu->menuAction()->setVisible(false);
trayMenu->addSeparator();
#ifdef MESSENGER_WINDOW
trayMenu->addAction(QIcon(IMAGE_MESSENGER), tr("Open Messenger"), this, SLOT(showMessengerWindow()));
#endif
trayMenu->addAction(QIcon(IMAGE_MESSAGES), tr("Open Messages"), this, SLOT(showMess()));
#ifdef ENABLE_WEBUI
trayMenu->addAction(QIcon(":/images/emblem-web.png"), tr("Show web interface"), this, SLOT(showWebinterface()));
@ -1095,11 +1102,13 @@ void MainWindow::showSettings()
showWindow(MainWindow::Options);
}
#ifdef MESSENGER_WINDOW
/** Shows Messenger window */
void MainWindow::showMessengerWindow()
{
MessengerWindow::showYourself();
}
#endif
/** Shows Statistics window */
void MainWindow::showStatisticsWindow()