diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index b0a438930..e0e3d838e 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -121,8 +121,11 @@ #include #define IMAGE_QUIT ":/icons/png/exit.png" -#define IMAGE_PREFERENCES ":/icons/png/options.png" +#define IMAGE_PREFERENCES ":/icons/png/options2.png" #define IMAGE_ABOUT ":/icons/png/info.png" +#define IMAGE_STATS ":/icons/png/netgraph2.png" +#define IMAGE_CLOSE ":/icons/png/exit2.png" + #define IMAGE_ADDFRIEND ":/icons/png/invite.png" #define IMAGE_RETROSHARE ":/icons/logo_128.png" #define IMAGE_NOONLINE ":/icons/logo_0_connected_128.png" @@ -130,9 +133,8 @@ #define IMAGE_TWOONLINE ":/icons/logo_2_connected_128.png" #define IMAGE_OVERLAY ":/icons/star_overlay_128.png" -#define IMAGE_BWGRAPH ":/images/ksysguard.png" +#define IMAGE_BWGRAPH ":/icons/png/bandwidth.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" #define IMAGE_GAMES ":/images/kgames.png" @@ -146,7 +148,6 @@ #define IMAGE_PLUGINS ":/images/extension_32.png" #define IMAGE_BLOGS ":/images/kblogger.png" -#define IMAGE_DHT ":/images/dht16.png" /*static*/ bool MainWindow::hiddenmode = false; @@ -609,7 +610,7 @@ void MainWindow::createTrayIcon() trayMenu->addAction(QIcon(":/images/emblem-web.png"), tr("Show web interface"), this, SLOT(showWebinterface())); #endif // ENABLE_WEBUI trayMenu->addAction(QIcon(IMAGE_BWGRAPH), tr("Bandwidth Graph"), this, SLOT(showBandwidthGraph())); - trayMenu->addAction(QIcon(IMAGE_DHT), tr("Statistics"), this, SLOT(showStatisticsWindow())); + trayMenu->addAction(QIcon(IMAGE_STATS), tr("Statistics"), this, SLOT(showStatisticsWindow())); #ifdef UNFINISHED diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index abbdf8995..3e6b124fd 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -103,9 +103,10 @@ icons/png/microphone_mute.png icons/png/microphone.png icons/png/netgraph.png + icons/png/netgraph2.png icons/png/network-notify.png icons/png/network.png - icons/png/network2.png + icons/png/network2.png icons/png/network-puplic.png icons/png/newsfeed-notify.png icons/png/newsfeed.png @@ -271,12 +272,16 @@ icons/png/correct.png icons/png/comment.png icons/png/chats.png - icons/png/chats-private.png + icons/png/chats-private.png icons/png/fileshare.png icons/png/forum.png icons/png/message.png icons/png/newsfeed2.png icons/png/postedlinks.png icons/png/people2.png + icons/png/bandwidth.png + icons/png/netgraph2.png + icons/png/options2.png + icons/png/exit2.png diff --git a/retroshare-gui/src/gui/icons/png/bandwidth.png b/retroshare-gui/src/gui/icons/png/bandwidth.png new file mode 100644 index 000000000..e7032dbf6 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/bandwidth.png differ diff --git a/retroshare-gui/src/gui/icons/png/exit2.png b/retroshare-gui/src/gui/icons/png/exit2.png new file mode 100644 index 000000000..102927bec Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/exit2.png differ diff --git a/retroshare-gui/src/gui/icons/png/netgraph2.png b/retroshare-gui/src/gui/icons/png/netgraph2.png new file mode 100644 index 000000000..8ee18c4a1 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/netgraph2.png differ diff --git a/retroshare-gui/src/gui/icons/png/options2.png b/retroshare-gui/src/gui/icons/png/options2.png new file mode 100644 index 000000000..bd113e887 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/options2.png differ diff --git a/retroshare-gui/src/gui/icons/svg/netgraph2.svg b/retroshare-gui/src/gui/icons/svg/netgraph2.svg new file mode 100644 index 000000000..518258a58 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/netgraph2.svg @@ -0,0 +1,51 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/options-blank.svg b/retroshare-gui/src/gui/icons/svg/options-blank.svg new file mode 100644 index 000000000..fbb3f6bf9 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/options-blank.svg @@ -0,0 +1,59 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.h b/retroshare-gui/src/gui/msgs/MessagesDialog.h index 9eeb577f0..1671df268 100644 --- a/retroshare-gui/src/gui/msgs/MessagesDialog.h +++ b/retroshare-gui/src/gui/msgs/MessagesDialog.h @@ -26,7 +26,7 @@ #include "mainpage.h" #include "ui_MessagesDialog.h" -#define IMAGE_MESSAGES ":/icons/png/messages.png" +#define IMAGE_MESSAGES ":/icons/png/message.png" class RSTreeWidgetItemCompareRole; class MessageWidget;