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

added systray menu in status bar. Helps people without a systray (Patch form Phenom)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-11-02 20:29:06 +00:00
parent d07a26f96d
commit a3736a02d2
7 changed files with 143 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,6 +84,7 @@
#include "statusbar/OpModeStatus.h"
#include "statusbar/SoundStatus.h"
#include "statusbar/ToasterDisable.h"
#include "statusbar/SysTrayStatus.h"
#include <retroshare/rsstatus.h>
#include <retroshare/rsiface.h>
@ -274,6 +275,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
toasterDisable->setHidden(Settings->valueFromGroup("StatusBar", "HideToaster", QVariant(false)).toBool());
statusBar()->addPermanentWidget(toasterDisable);
sysTrayStatus = new SysTrayStatus();
sysTrayStatus->setVisible(Settings->valueFromGroup("StatusBar", "ShowSysTrayOnStatusBar", QVariant(false)).toBool());
statusBar()->addPermanentWidget(sysTrayStatus);
setCompactStatusMode(Settings->valueFromGroup("StatusBar", "CompactMode", QVariant(false)).toBool());
/** Status Bar end ******/
@ -322,6 +328,7 @@ MainWindow::~MainWindow()
delete opModeStatus;
delete soundStatus;
delete toasterDisable;
delete sysTrayStatus;
MessengerWindow::releaseInstance();
#ifdef UNFINISHED
delete applicationWindow;
@ -596,8 +603,10 @@ void MainWindow::createTrayIcon()
{
/** Tray icon Menu **/
QMenu *trayMenu = new QMenu(this);
if (sysTrayStatus) sysTrayStatus->trayMenu = trayMenu;
QObject::connect(trayMenu, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
toggleVisibilityAction = trayMenu->addAction(QIcon(IMAGE_RETROSHARE), tr("Show/Hide"), this, SLOT(toggleVisibilitycontextmenu()));
if (sysTrayStatus) sysTrayStatus->toggleVisibilityAction = toggleVisibilityAction;
/* Create status menu */
QMenu *statusMenu = trayMenu->addMenu(tr("Status"));
@ -802,6 +811,7 @@ void MainWindow::updateFriends()
}
if (trayIcon) trayIcon->setIcon(icon);
if (sysTrayStatus) sysTrayStatus->setIcon(icon);
}
void MainWindow::postModDirectories(bool update_local)
@ -1483,6 +1493,11 @@ ToasterDisable *MainWindow::toasterDisableInstance()
return toasterDisable;
}
SysTrayStatus *MainWindow::sysTrayStatusInstance()
{
return sysTrayStatus;
}
void MainWindow::setCompactStatusMode(bool compact)
{
//statusComboBox: TODO Show only icon