diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 7646c43bb..d66421243 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -142,7 +142,6 @@
#define IMAGE_BWGRAPH ":/icons/png/bandwidth.png"
#define IMAGE_MESSENGER ":/images/rsmessenger48.png"
#define IMAGE_COLOR ":/images/highlight.png"
-#define IMAGE_GAMES ":/images/kgames.png"
#define IMAGE_NEWRSCOLLECTION ":/images/library.png"
#define IMAGE_ADDSHARE ":/images/directoryadd_24x24_shadow.png"
#define IMAGE_OPTIONS ":/images/settings.png"
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.h b/retroshare-gui/src/gui/TheWire/WireDialog.h
index e50823ffd..2433516a1 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.h
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.h
@@ -33,7 +33,7 @@
#include "util/TokenQueue.h"
-#define IMAGE_WIRE ":/images/kgames.png"
+#define IMAGE_WIRE ":/icons/wire.png"
class WireDialog : public MainPage, public TokenResponse, public PulseHolder
{
diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
index f9fcaca21..6c6977eca 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
@@ -249,13 +249,13 @@ void GxsIdTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
if(id.isNull())
{
str = tr("[Notification]");
- icon = QIcon(":/icons/logo_128.png");
+ icon = QIcon(":/icons/notification.png");
}
else if(! computeNameIconAndComment(id,str,icon,comment))
if(mReloadPeriod > 3)
{
str = tr("[Unknown]");
- icon = QIcon();
+ icon = QIcon(":/icons/anonymous.png");
}
else
{
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 6422b36ac..4709087c8 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -55,6 +55,7 @@
icons/outlook.png
icons/question.png
icons/plugins_128.png
+ icons/wire.png
icons/png/add.png
icons/png/anonymous.png
icons/png/attach-image.png
@@ -320,5 +321,6 @@
icons/png/arrow-right.png
icons/png/arrow-left.png
icons/png/next-unread.png
+ icons/notification.png
diff --git a/retroshare-gui/src/gui/icons/notification.png b/retroshare-gui/src/gui/icons/notification.png
new file mode 100644
index 000000000..88f837051
Binary files /dev/null and b/retroshare-gui/src/gui/icons/notification.png differ
diff --git a/retroshare-gui/src/gui/icons/wire.png b/retroshare-gui/src/gui/icons/wire.png
new file mode 100644
index 000000000..ed0c82334
Binary files /dev/null and b/retroshare-gui/src/gui/icons/wire.png differ
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 6efa327c9..5676c0e7b 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -114,13 +114,11 @@
images/add-share24.png
images/avatar_background.png
images/button_cancel.png
- images/calendar.png
images/chat.png
images/chat_24.png
images/cancel.png
images/close-down.png
images/close_normal.png
- images/contact_new128.png
images/copy.png
images/delete.png
images/deleteall.png
@@ -192,7 +190,6 @@
images/folder-outbox.png
images/folder-sent.png
images/folder-trash.png
- images/kgames.png
images/go-down.png
images/go-top.png
images/go-up.png
diff --git a/retroshare-gui/src/gui/images/calendar.png b/retroshare-gui/src/gui/images/calendar.png
deleted file mode 100644
index e91b13d73..000000000
Binary files a/retroshare-gui/src/gui/images/calendar.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/contact_new128.png b/retroshare-gui/src/gui/images/contact_new128.png
deleted file mode 100644
index ff60d9b48..000000000
Binary files a/retroshare-gui/src/gui/images/contact_new128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/kgames.png b/retroshare-gui/src/gui/images/kgames.png
deleted file mode 100644
index 2ec077b76..000000000
Binary files a/retroshare-gui/src/gui/images/kgames.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 902c364b3..6fc76ed79 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -60,6 +60,7 @@
#define IMAGE_SYSTEM ":/images/user/user_request16.png"
#define IMAGE_DECRYPTMESSAGE ":/images/decrypt-mail.png"
#define IMAGE_AUTHOR_INFO ":/images/info16.png"
+#define IMAGE_NOTFICATION ":/icons/notification.png"
#define IMAGE_INBOX ":/images/folder-inbox.png"
#define IMAGE_OUTBOX ":/images/folder-outbox.png"
@@ -420,7 +421,7 @@ void MessagesDialog::fillQuickView()
}
item = new QListWidgetItem(tr("System"), ui.quickViewWidget);
- item->setIcon(QIcon(IMAGE_SYSTEM));
+ item->setIcon(QIcon(IMAGE_NOTFICATION));
item->setData(ROLE_QUICKVIEW_TYPE, QUICKVIEW_TYPE_STATIC);
item->setData(ROLE_QUICKVIEW_ID, QUICKVIEW_STATIC_ID_SYSTEM);
item->setData(ROLE_QUICKVIEW_TEXT, item->text()); // for updateMessageSummaryList
diff --git a/retroshare-gui/src/gui/profile/ProfileManager.cpp b/retroshare-gui/src/gui/profile/ProfileManager.cpp
index cf5c6a2b5..0a8a80df6 100644
--- a/retroshare-gui/src/gui/profile/ProfileManager.cpp
+++ b/retroshare-gui/src/gui/profile/ProfileManager.cpp
@@ -50,7 +50,7 @@ ProfileManager::ProfileManager(QWidget *parent)
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
- ui.headerFrame->setHeaderImage(QPixmap(":/images/contact_new128.png"));
+ ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/profile.png"));
ui.headerFrame->setHeaderText(tr("Profile Manager"));
connect(ui.identityTreeWidget, SIGNAL( customContextMenuRequested(QPoint)), this, SLOT( identityTreeWidgetCostumPopupMenu(QPoint)));
diff --git a/retroshare-gui/src/gui/profile/ProfileManager.ui b/retroshare-gui/src/gui/profile/ProfileManager.ui
index b5a49cff2..9ec918e89 100644
--- a/retroshare-gui/src/gui/profile/ProfileManager.ui
+++ b/retroshare-gui/src/gui/profile/ProfileManager.ui
@@ -134,7 +134,7 @@ p, li { white-space: pre-wrap; }
-
+
diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
index 2238b4962..9db4326a4 100644
--- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
+++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
@@ -49,11 +49,7 @@
/* Images for toolbar icons */
#define IMAGE_RETROSHARE ":/images/RetroShare16.png"
#define IMAGE_ABOUT ":/images/informations_24x24.png"
-#define IMAGE_GAMES ":/images/kgames.png"
-#define IMAGE_PHOTO ":/images/lphoto.png"
-#define IMAGE_BWGRAPH ":/images/ksysguard.png"
#define IMAGE_CLOSE ":/images/close_normal.png"
-#define IMAGE_CALENDAR ":/images/calendar.png"
#define IMAGE_LIBRARY ":/icons/collections.png"
#define IMAGE_PLUGINS ":/images/extension_32.png"
#define IMAGE_WIKI ":/images/wikibook_32.png"
@@ -82,11 +78,11 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
//GamesDialog *gamesDialog = NULL;
//ui.stackPages->add(gamesDialog = new GamesDialog(ui.stackPages),
- // createPageAction(QIcon(IMAGE_GAMES), tr("Games Launcher"), grp));
+ // createPageAction(QIcon(), tr("Games Launcher"), grp));
//CalDialog *calDialog = NULL;
//ui.stackPages->add(calDialog = new CalDialog(ui.stackPages),
- // createPageAction(QIcon(IMAGE_CALENDAR), tr("Shared Calendars"), grp));
+ // createPageAction(QIcon(), tr("Shared Calendars"), grp));
#if 0
IdDialog *idDialog = NULL;
ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
@@ -103,7 +99,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
#ifdef RS_USE_PHOTOSHARE
PhotoShare *photoShare = NULL;
ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
- action = createPageAction(QIcon(IMAGE_PHOTO), tr("Photos"), grp));
+ action = createPageAction(QIcon(), tr("Photos"), grp));
mNotify.push_back(QPair(photoShare, action));
#endif
@@ -122,7 +118,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
#if USE_VEG_SERVICE
WireDialog *wireDialog = NULL;
ui.stackPages->add(wireDialog = new WireDialog(ui.stackPages),
- action = createPageAction(QIcon(IMAGE_BWGRAPH), tr("The Wire"), grp));
+ action = createPageAction(QIcon(), tr("The Wire"), grp));
mNotify.push_back(QPair(wireDialog, action));
#endif