Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enabled Messenger Window in system tray icon.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-07-09 21:36:32 +00:00
parent 249c827f95
commit 621abee8da
6 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -136,8 +136,7 @@
//#define IMAGE_STATISTIC ":/images/utilities-system-monitor.png"
//#define IMAGE_MESSAGES ":/images/evolution.png"
#define IMAGE_BWGRAPH ":/images/ksysguard.png"
#define IMAGE_RSM32 ":/images/kdmconfig.png"
#define IMAGE_RSM16 ":/images/rsmessenger16.png"
#define IMAGE_MESSENGER ":/images/rsmessenger48.png"
#define IMAGE_CLOSE ":/images/close_normal.png"
#define IMAGE_BLOCK ":/images/blockdevice.png"
#define IMAGE_COLOR ":/images/highlight.png"
@ -560,7 +559,7 @@ void MainWindow::createTrayIcon()
notifyMenu->menuAction()->setVisible(false);
trayMenu->addSeparator();
//trayMenu->addAction(QIcon(IMAGE_RSM16), tr("Open Messenger"), this, SLOT(showMessengerWindow()));
trayMenu->addAction(QIcon(IMAGE_MESSENGER), tr("Open Messenger"), this, SLOT(showMessengerWindow()));
trayMenu->addAction(QIcon(IMAGE_MESSAGES), tr("Open Messages"), this, SLOT(showMess()));
trayMenu->addAction(QIcon(":/images/emblem-web.png"), tr("Show web interface"), this, SLOT(showWebinterface()));
trayMenu->addAction(QIcon(IMAGE_BWGRAPH), tr("Bandwidth Graph"), _bandwidthGraph, SLOT(showWindow()));

2
retroshare-gui/src/gui/MessengerWindow.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
<normaloff>:/images/rsmessenger48.png</normaloff>:/images/rsmessenger48.png</iconset>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">

3
retroshare-gui/src/gui/images.qrc
View File

@ -719,5 +719,8 @@
<file>images/view-feeds.png</file>
<file>images/view-files.png</file>
<file>images/emblem-web.png</file>
<file>images/rsmessenger16.png</file>
<file>images/rsmessenger32.png</file>
<file>images/rsmessenger48.png</file>
</qresource>
</RCC>

BIN
retroshare-gui/src/gui/images/rsmessenger16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 807 B

BIN
retroshare-gui/src/gui/images/rsmessenger32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
retroshare-gui/src/gui/images/rsmessenger48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB