diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-12-27 22:08:15 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-12-27 22:08:15 +0300 |
| commit | 4cf88f2330f52c126d2250e70214062af76557c6 (patch) | |
| tree | 32e0b8a87f71fdd9315524d814f54bd739a7ecf8 | |
| parent | 0803a0de6ae94425ea92a4cf2b7db7d10e969ea3 (diff) | |
retroshare: patch merged by upstream
| -rw-r--r-- | net-p2p/retroshare/files/chat_lobby_icon_cache_v1.patch | 49 | ||||
| -rw-r--r-- | net-p2p/retroshare/retroshare-scm.ebuild | 1 |
2 files changed, 0 insertions, 50 deletions
diff --git a/net-p2p/retroshare/files/chat_lobby_icon_cache_v1.patch b/net-p2p/retroshare/files/chat_lobby_icon_cache_v1.patch deleted file mode 100644 index cb03887..0000000 --- a/net-p2p/retroshare/files/chat_lobby_icon_cache_v1.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp -index 2be092d7f..93028d20c 100644 ---- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp -+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp -@@ -63,7 +63,9 @@ const static uint32_t timeToInactivity = 60 * 10; // in seconds - - /** Default constructor */ - ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::WindowFlags flags) -- : ChatDialog(parent, flags), lobbyId(lid) -+ : ChatDialog(parent, flags), lobbyId(lid), -+ bullet_red_128(":/icons/bullet_red_128.png"), bullet_grey_128(":/icons/bullet_grey_128.png"), -+ bullet_green_128(":/icons/bullet_green_128.png"), bullet_yellow_128(":/icons/bullet_yellow_128.png") - { - /* Invoke Qt Designer generated QObject setup routine */ - ui.setupUi(this); -@@ -556,16 +558,16 @@ void ChatLobbyDialog::updateParticipantsList() - - - if(isParticipantMuted(it2->first)) -- widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_red_128.png")); -+ widgetitem->setIcon(COLUMN_ICON, bullet_red_128); - else if (tLastAct + timeToInactivity < now) -- widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_grey_128.png")); -+ widgetitem->setIcon(COLUMN_ICON, bullet_grey_128); - else -- widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_green_128.png")); -+ widgetitem->setIcon(COLUMN_ICON, bullet_green_128); - - RsGxsId gxs_id; - rsMsgs->getIdentityForChatLobby(lobbyId, gxs_id); - -- if (RsGxsId(participant.toStdString()) == gxs_id) widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_yellow_128.png")); -+ if (RsGxsId(participant.toStdString()) == gxs_id) widgetitem->setIcon(COLUMN_ICON, bullet_yellow_128); - - widgetitem->updateBannedState(); - -diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h -index 420524f93..dbe178678 100644 ---- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h -+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h -@@ -120,6 +120,8 @@ private: - QAction *showinpeopleAct; - - GxsIdChooser *ownIdChooser ; -+ //icons cache -+ QIcon bullet_red_128, bullet_grey_128, bullet_green_128, bullet_yellow_128; - }; - - #endif diff --git a/net-p2p/retroshare/retroshare-scm.ebuild b/net-p2p/retroshare/retroshare-scm.ebuild index 2d77456..ac96b7b 100644 --- a/net-p2p/retroshare/retroshare-scm.ebuild +++ b/net-p2p/retroshare/retroshare-scm.ebuild @@ -83,7 +83,6 @@ PATCHES=( "${FILESDIR}/hidden_service.patch" "${FILESDIR}/cflags.patch" "${FILESDIR}/disable_key_array_redraw.patch" - "${FILESDIR}/chat_lobby_icon_cache_v1.patch" ) |