From fcddf5de8b9b16b5226f8bbe0b1ef6410f888eb1 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sun, 17 Dec 2017 12:57:12 +0300 Subject: retroshare: simple icon cache for chat lobby --- .../files/chat_lobby_icon_cache_v1.patch | 49 ++++++++++++++++++++++ net-p2p/retroshare/retroshare-scm.ebuild | 1 + 2 files changed, 50 insertions(+) create mode 100644 net-p2p/retroshare/files/chat_lobby_icon_cache_v1.patch diff --git a/net-p2p/retroshare/files/chat_lobby_icon_cache_v1.patch b/net-p2p/retroshare/files/chat_lobby_icon_cache_v1.patch new file mode 100644 index 0000000..cb03887 --- /dev/null +++ b/net-p2p/retroshare/files/chat_lobby_icon_cache_v1.patch @@ -0,0 +1,49 @@ +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 ac96b7b..2d77456 100644 --- a/net-p2p/retroshare/retroshare-scm.ebuild +++ b/net-p2p/retroshare/retroshare-scm.ebuild @@ -83,6 +83,7 @@ PATCHES=( "${FILESDIR}/hidden_service.patch" "${FILESDIR}/cflags.patch" "${FILESDIR}/disable_key_array_redraw.patch" + "${FILESDIR}/chat_lobby_icon_cache_v1.patch" ) -- cgit v1.2.3