diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index b65fe460a..ab5677e63 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -96,30 +96,19 @@ images/console-small-hover.png images/console-small-up.png images/contact_new128.png - images/dadd.png - images/dauthed.png - images/daway.png - images/dbrb.png - images/dbusy.png - images/dchat.png - images/ddeny.png images/delete.png images/deleteall.png images/deletemail-pressed.png images/deletemail24.png - images/dhidden.png images/directoryadd_24x24_shadow.png images/directoryremove_24x24_shadow.png images/directoryselect_24x24_shadow.png images/diskSave.png - images/dlunch.png images/document_save.png - images/donline.png images/down.png images/down_24x24.png images/download.png images/download16.png - images/dphone.png images/edit_add24.png images/edit-bold.png images/edit-italic.png @@ -219,7 +208,7 @@ images/im-user-offline.png images/im-user-away.png images/im-user-busy.png - images/im-user-inactive.png + images/im-user-inactive.png images/informations_24x24.png images/invite-friend24.png images/connect_friend.png diff --git a/retroshare-gui/src/gui/images/dadd.png b/retroshare-gui/src/gui/images/dadd.png deleted file mode 100644 index 60d066dc7..000000000 Binary files a/retroshare-gui/src/gui/images/dadd.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dask.png b/retroshare-gui/src/gui/images/dask.png deleted file mode 100644 index 3066a2693..000000000 Binary files a/retroshare-gui/src/gui/images/dask.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dauthed.png b/retroshare-gui/src/gui/images/dauthed.png deleted file mode 100644 index 106963d67..000000000 Binary files a/retroshare-gui/src/gui/images/dauthed.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/daway.png b/retroshare-gui/src/gui/images/daway.png deleted file mode 100644 index 59240c220..000000000 Binary files a/retroshare-gui/src/gui/images/daway.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dblocked.png b/retroshare-gui/src/gui/images/dblocked.png deleted file mode 100644 index 1a3392ebf..000000000 Binary files a/retroshare-gui/src/gui/images/dblocked.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dblocked_off.png b/retroshare-gui/src/gui/images/dblocked_off.png deleted file mode 100644 index 971d3a45a..000000000 Binary files a/retroshare-gui/src/gui/images/dblocked_off.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dbrb.png b/retroshare-gui/src/gui/images/dbrb.png deleted file mode 100644 index 59240c220..000000000 Binary files a/retroshare-gui/src/gui/images/dbrb.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dbusy.png b/retroshare-gui/src/gui/images/dbusy.png deleted file mode 100644 index 9eb448352..000000000 Binary files a/retroshare-gui/src/gui/images/dbusy.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dchat.png b/retroshare-gui/src/gui/images/dchat.png deleted file mode 100644 index 0102ab56d..000000000 Binary files a/retroshare-gui/src/gui/images/dchat.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/ddeny.png b/retroshare-gui/src/gui/images/ddeny.png deleted file mode 100644 index 140d45914..000000000 Binary files a/retroshare-gui/src/gui/images/ddeny.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dhidden.png b/retroshare-gui/src/gui/images/dhidden.png deleted file mode 100644 index 13035ad85..000000000 Binary files a/retroshare-gui/src/gui/images/dhidden.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dinactive.png b/retroshare-gui/src/gui/images/dinactive.png deleted file mode 100644 index 59240c220..000000000 Binary files a/retroshare-gui/src/gui/images/dinactive.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dlunch.png b/retroshare-gui/src/gui/images/dlunch.png deleted file mode 100644 index 59240c220..000000000 Binary files a/retroshare-gui/src/gui/images/dlunch.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/doffline.png b/retroshare-gui/src/gui/images/doffline.png deleted file mode 100644 index bc6e8c35a..000000000 Binary files a/retroshare-gui/src/gui/images/doffline.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/donline.png b/retroshare-gui/src/gui/images/donline.png deleted file mode 100644 index cc4539fb1..000000000 Binary files a/retroshare-gui/src/gui/images/donline.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/dphone.png b/retroshare-gui/src/gui/images/dphone.png deleted file mode 100644 index e1aa09ed0..000000000 Binary files a/retroshare-gui/src/gui/images/dphone.png and /dev/null differ diff --git a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp index 6ef45b4f3..8cce00a7f 100644 --- a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp @@ -44,8 +44,8 @@ #define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png" #define IMAGE_CHAT ":/images/chat.png" /* Images for Status icons */ -#define IMAGE_ONLINE ":/images/donline.png" -#define IMAGE_OFFLINE ":/images/dhidden.png" +#define IMAGE_ONLINE ":/images/im-user.png" +#define IMAGE_OFFLINE ":/images/im-user-offline.png" /** Constructor */ ExampleDialog::ExampleDialog(QWidget *parent) diff --git a/retroshare-gui/src/gui/unfinished/ExampleDialog.ui b/retroshare-gui/src/gui/unfinished/ExampleDialog.ui index 541050e46..c77a700c6 100644 --- a/retroshare-gui/src/gui/unfinished/ExampleDialog.ui +++ b/retroshare-gui/src/gui/unfinished/ExampleDialog.ui @@ -637,7 +637,7 @@ p, li { white-space: pre-wrap; } - + diff --git a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp index 4d30078d4..ba333fc66 100644 --- a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp @@ -57,8 +57,8 @@ const uint32_t GAME_PEER_ID = 4; #define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png" #define IMAGE_CHAT ":/images/chat.png" /* Images for Status icons */ -#define IMAGE_ONLINE ":/images/donline.png" -#define IMAGE_OFFLINE ":/images/dhidden.png" +#define IMAGE_ONLINE ":/images/im-user.png" +#define IMAGE_OFFLINE ":/images/im-user-offline.png" /** Constructor */ GamesDialog::GamesDialog(QWidget *parent) @@ -81,20 +81,20 @@ GamesDialog::GamesDialog(QWidget *parent) ui.peertreeWidget -> setRootIsDecorated( false ); /* Set header resize modes and initial section sizes */ -// QHeaderView * _header = ui.peertreeWidget->header () ; -// _header->setResizeMode (0, QHeaderView::Custom); -// _header->setResizeMode (1, QHeaderView::Interactive); +// QHeaderView * _header = ui.peertreeWidget->header () ; +// _header->setResizeMode (0, QHeaderView::Custom); +// _header->setResizeMode (1, QHeaderView::Interactive); // _header->setResizeMode (2, QHeaderView::Interactive); -// _header->setResizeMode (3, QHeaderView::Interactive); +// _header->setResizeMode (3, QHeaderView::Interactive); // _header->setResizeMode (4, QHeaderView::Interactive); -// _header->setResizeMode (5, QHeaderView::Interactive); +// _header->setResizeMode (5, QHeaderView::Interactive); // _header->setResizeMode (6, QHeaderView::Interactive); -// _header->setResizeMode (7, QHeaderView::Interactive); +// _header->setResizeMode (7, QHeaderView::Interactive); // _header->setResizeMode (8, QHeaderView::Interactive); -// _header->setResizeMode (9, QHeaderView::Interactive); +// _header->setResizeMode (9, QHeaderView::Interactive); // _header->setResizeMode (10, QHeaderView::Interactive); -// _header->setResizeMode (11, QHeaderView::Interactive); -// +// _header->setResizeMode (11, QHeaderView::Interactive); +// // _header->resizeSection ( 0, 25 ); // _header->resizeSection ( 1, 100 ); // _header->resizeSection ( 2, 100 ); @@ -106,13 +106,13 @@ GamesDialog::GamesDialog(QWidget *parent) // _header->resizeSection ( 8, 100 ); // _header->resizeSection ( 9, 100 ); // _header->resizeSection ( 10, 100 ); - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif -} + + + /* Hide platform specific features */ +#ifdef Q_WS_WIN + +#endif +} void GamesDialog::updateGameList() diff --git a/retroshare-gui/src/gui/unfinished/GamesDialog.ui b/retroshare-gui/src/gui/unfinished/GamesDialog.ui index bafce827b..074504d9d 100644 --- a/retroshare-gui/src/gui/unfinished/GamesDialog.ui +++ b/retroshare-gui/src/gui/unfinished/GamesDialog.ui @@ -268,7 +268,7 @@ p, li { white-space: pre-wrap; } - :/images/dadd.png:/images/dadd.png + :/images/dadd.png:/images/add_user24.png @@ -327,7 +327,7 @@ p, li { white-space: pre-wrap; } - + diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp index f50242c08..2cce1ea8a 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp @@ -47,8 +47,6 @@ #define IMAGE_REMOVE ":/images/cancel.png" #define IMAGE_CHAT ":/images/chat.png" /* Images for Status icons */ -#define IMAGE_ONLINE ":/images/donline.png" -#define IMAGE_OFFLINE ":/images/dhidden.png" #define IMAGE_PEER ":/images/user/identity16.png" #define IMAGE_PHOTOS ":/images/image16.png" diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.ui b/retroshare-gui/src/gui/unfinished/PhotoDialog.ui index 3db1f7efc..f52820f32 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoDialog.ui +++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.ui @@ -261,7 +261,7 @@ p, li { white-space: pre-wrap; } - +