mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-23 14:41:04 -04:00
Enabled Messenger Window in system tray icon.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
249c827f95
commit
621abee8da
6 changed files with 6 additions and 4 deletions
|
@ -136,8 +136,7 @@
|
||||||
//#define IMAGE_STATISTIC ":/images/utilities-system-monitor.png"
|
//#define IMAGE_STATISTIC ":/images/utilities-system-monitor.png"
|
||||||
//#define IMAGE_MESSAGES ":/images/evolution.png"
|
//#define IMAGE_MESSAGES ":/images/evolution.png"
|
||||||
#define IMAGE_BWGRAPH ":/images/ksysguard.png"
|
#define IMAGE_BWGRAPH ":/images/ksysguard.png"
|
||||||
#define IMAGE_RSM32 ":/images/kdmconfig.png"
|
#define IMAGE_MESSENGER ":/images/rsmessenger48.png"
|
||||||
#define IMAGE_RSM16 ":/images/rsmessenger16.png"
|
|
||||||
#define IMAGE_CLOSE ":/images/close_normal.png"
|
#define IMAGE_CLOSE ":/images/close_normal.png"
|
||||||
#define IMAGE_BLOCK ":/images/blockdevice.png"
|
#define IMAGE_BLOCK ":/images/blockdevice.png"
|
||||||
#define IMAGE_COLOR ":/images/highlight.png"
|
#define IMAGE_COLOR ":/images/highlight.png"
|
||||||
|
@ -560,7 +559,7 @@ void MainWindow::createTrayIcon()
|
||||||
notifyMenu->menuAction()->setVisible(false);
|
notifyMenu->menuAction()->setVisible(false);
|
||||||
|
|
||||||
trayMenu->addSeparator();
|
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(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(":/images/emblem-web.png"), tr("Show web interface"), this, SLOT(showWebinterface()));
|
||||||
trayMenu->addAction(QIcon(IMAGE_BWGRAPH), tr("Bandwidth Graph"), _bandwidthGraph, SLOT(showWindow()));
|
trayMenu->addAction(QIcon(IMAGE_BWGRAPH), tr("Bandwidth Graph"), _bandwidthGraph, SLOT(showWindow()));
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
</property>
|
</property>
|
||||||
<property name="windowIcon">
|
<property name="windowIcon">
|
||||||
<iconset resource="images.qrc">
|
<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>
|
</property>
|
||||||
<widget class="QWidget" name="centralwidget">
|
<widget class="QWidget" name="centralwidget">
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
|
|
|
@ -719,5 +719,8 @@
|
||||||
<file>images/view-feeds.png</file>
|
<file>images/view-feeds.png</file>
|
||||||
<file>images/view-files.png</file>
|
<file>images/view-files.png</file>
|
||||||
<file>images/emblem-web.png</file>
|
<file>images/emblem-web.png</file>
|
||||||
|
<file>images/rsmessenger16.png</file>
|
||||||
|
<file>images/rsmessenger32.png</file>
|
||||||
|
<file>images/rsmessenger48.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
BIN
retroshare-gui/src/gui/images/rsmessenger16.png
Normal file
BIN
retroshare-gui/src/gui/images/rsmessenger16.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 807 B |
BIN
retroshare-gui/src/gui/images/rsmessenger32.png
Normal file
BIN
retroshare-gui/src/gui/images/rsmessenger32.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2 KiB |
BIN
retroshare-gui/src/gui/images/rsmessenger48.png
Normal file
BIN
retroshare-gui/src/gui/images/rsmessenger48.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.1 KiB |
Loading…
Add table
Add a link
Reference in a new issue