Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added new higher resolution bullet icons with better quality

Browse Source
This commit is contained in:
defnax 2015-11-04 17:05:39 +01:00
parent 3c70c5cc82
commit 2a998c1e71
12 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View File

@ -452,16 +452,16 @@ void ChatLobbyDialog::updateParticipantsList()
time_t now = time(NULL); time_t now = time(NULL);
if(isParticipantMuted(it2->first)) if(isParticipantMuted(it2->first))
widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_red_64.png")); widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_red_128.png"));
else if (tLastAct + timeToInactivity < now) else if (tLastAct + timeToInactivity < now)
widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_grey_64.png")); widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_grey_128.png"));
else else
widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_green_64.png")); widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_green_128.png"));
RsGxsId gxs_id; RsGxsId gxs_id;
rsMsgs->getIdentityForChatLobby(lobbyId, gxs_id); rsMsgs->getIdentityForChatLobby(lobbyId, gxs_id);
if (RsGxsId(participant.toStdString()) == gxs_id) widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_yellow_64.png")); if (RsGxsId(participant.toStdString()) == gxs_id) widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_yellow_128.png"));
QTime qtLastAct=QTime(0,0,0).addSecs(now-tLastAct); QTime qtLastAct=QTime(0,0,0).addSecs(now-tLastAct);
widgetitem->setToolTip(COLUMN_ICON,tr("Right click to mute/unmute participants<br/>Double click to address this person<br/>") widgetitem->setToolTip(COLUMN_ICON,tr("Right click to mute/unmute participants<br/>Double click to address this person<br/>")

9
retroshare-gui/src/gui/icons.qrc
View File

@ -7,10 +7,10 @@
<file>icons/blank_green_128.png</file> <file>icons/blank_green_128.png</file>
<file>icons/browsable_blue_128.png</file> <file>icons/browsable_blue_128.png</file>
<file>icons/browsable_green_128.png</file> <file>icons/browsable_green_128.png</file>
<file>icons/bullet_green_64.png</file> <file>icons/bullet_green_128.png</file>
<file>icons/bullet_grey_64.png</file> <file>icons/bullet_grey_128.png</file>
<file>icons/bullet_red_64.png</file> <file>icons/bullet_red_128.png</file>
<file>icons/bullet_yellow_64.png</file> <file>icons/bullet_yellow_128.png</file>
<file>icons/channels_128.png</file> <file>icons/channels_128.png</file>
<file>icons/channels_red_128.png</file> <file>icons/channels_red_128.png</file>
<file>icons/chat_128.png</file> <file>icons/chat_128.png</file>
@ -68,5 +68,6 @@
<file>icons/yandex.png</file> <file>icons/yandex.png</file>
<file>icons/tor-on.png</file> <file>icons/tor-on.png</file>
<file>icons/tor-logo.png</file> <file>icons/tor-logo.png</file>
<file>icons/tor-off.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
retroshare-gui/src/gui/icons/bullet_green_128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
retroshare-gui/src/gui/icons/bullet_green_64.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.9 KiB

BIN
retroshare-gui/src/gui/icons/bullet_grey_128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
retroshare-gui/src/gui/icons/bullet_grey_64.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.9 KiB

BIN
retroshare-gui/src/gui/icons/bullet_red_128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
retroshare-gui/src/gui/icons/bullet_red_64.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.9 KiB

BIN
retroshare-gui/src/gui/icons/bullet_yellow_128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
retroshare-gui/src/gui/icons/bullet_yellow_64.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.4 KiB

6
retroshare-gui/src/gui/statusbar/dhtstatus.cpp
View File

@ -79,7 +79,7 @@ void DHTStatus::getDHTStatus()
if (!(config.DHTActive)) if (!(config.DHTActive))
{ {
// GRAY. // GRAY.
dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_grey_64.png").scaledToHeight(S,Qt::SmoothTransformation)); dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation));
dhtstatusLabel->setToolTip( text + tr("DHT Off")); dhtstatusLabel->setToolTip( text + tr("DHT Off"));
spaceLabel->setVisible(false); spaceLabel->setVisible(false);
@ -97,7 +97,7 @@ void DHTStatus::getDHTStatus()
// YELLOW or GREEN. // YELLOW or GREEN.
if (config.netDhtRsNetSize < MIN_RS_NET_SIZE) if (config.netDhtRsNetSize < MIN_RS_NET_SIZE)
{ {
dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_yellow_64.png").scaledToHeight(S,Qt::SmoothTransformation)); dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation));
dhtstatusLabel->setToolTip( text + tr("DHT Searching for RetroShare Peers")); dhtstatusLabel->setToolTip( text + tr("DHT Searching for RetroShare Peers"));
spaceLabel->setVisible(true); spaceLabel->setVisible(true);
@ -109,7 +109,7 @@ void DHTStatus::getDHTStatus()
} }
else else
{ {
dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_green_64.png").scaledToHeight(S,Qt::SmoothTransformation)); dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation));
dhtstatusLabel->setToolTip( text + tr("DHT Good")); dhtstatusLabel->setToolTip( text + tr("DHT Good"));
spaceLabel->setVisible(true); spaceLabel->setVisible(true);

18
retroshare-gui/src/gui/statusbar/natstatus.cpp
View File

@ -63,14 +63,14 @@ void NATStatus::getNATStatus()
default: default:
case RSNET_NETSTATE_BAD_UNKNOWN: case RSNET_NETSTATE_BAD_UNKNOWN:
{ {
iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_64.png").scaledToHeight(S,Qt::SmoothTransformation)) ; iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Network Status Unknown")) ; iconLabel->setToolTip( text + tr("Network Status Unknown")) ;
} }
break ; break ;
case RSNET_NETSTATE_BAD_OFFLINE: case RSNET_NETSTATE_BAD_OFFLINE:
{ {
iconLabel->setPixmap(QPixmap(":/icons/bullet_grey_64.png").scaledToHeight(S,Qt::SmoothTransformation)) ; iconLabel->setPixmap(QPixmap(":/icons/bullet_grey_129.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Offline")) ; iconLabel->setToolTip( text + tr("Offline")) ;
} }
break ; break ;
@ -78,14 +78,14 @@ void NATStatus::getNATStatus()
// BAD. (RED) // BAD. (RED)
case RSNET_NETSTATE_BAD_NATSYM: case RSNET_NETSTATE_BAD_NATSYM:
{ {
iconLabel->setPixmap(QPixmap(":/icons/bullet_red_64.png").scaledToHeight(S,Qt::SmoothTransformation)) ; iconLabel->setPixmap(QPixmap(":/icons/bullet_red_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Nasty Firewall")) ; iconLabel->setToolTip( text + tr("Nasty Firewall")) ;
} }
break ; break ;
case RSNET_NETSTATE_BAD_NODHT_NAT: case RSNET_NETSTATE_BAD_NODHT_NAT:
{ {
iconLabel->setPixmap(QPixmap(":/icons/bullet_red_64.png").scaledToHeight(S,Qt::SmoothTransformation)) ; iconLabel->setPixmap(QPixmap(":/icons/bullet_red_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("DHT Disabled and Firewalled")) ; iconLabel->setToolTip( text + tr("DHT Disabled and Firewalled")) ;
} }
break ; break ;
@ -93,21 +93,21 @@ void NATStatus::getNATStatus()
// CAUTION. (ORANGE) // CAUTION. (ORANGE)
case RSNET_NETSTATE_WARNING_RESTART: case RSNET_NETSTATE_WARNING_RESTART:
{ {
iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_64.png").scaledToHeight(S,Qt::SmoothTransformation)) ; iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Network Restarting")) ; iconLabel->setToolTip( text + tr("Network Restarting")) ;
} }
break ; break ;
case RSNET_NETSTATE_WARNING_NATTED: case RSNET_NETSTATE_WARNING_NATTED:
{ {
iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_64.png").scaledToHeight(S,Qt::SmoothTransformation)) ; iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Behind Firewall")) ; iconLabel->setToolTip( text + tr("Behind Firewall")) ;
} }
break ; break ;
case RSNET_NETSTATE_WARNING_NODHT: case RSNET_NETSTATE_WARNING_NODHT:
{ {
iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_64.png").scaledToHeight(S,Qt::SmoothTransformation)) ; iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("DHT Disabled")) ; iconLabel->setToolTip( text + tr("DHT Disabled")) ;
} }
break ; break ;
@ -115,14 +115,14 @@ void NATStatus::getNATStatus()
// GOOD (GREEN) // GOOD (GREEN)
case RSNET_NETSTATE_GOOD: case RSNET_NETSTATE_GOOD:
{ {
iconLabel->setPixmap(QPixmap(":/icons/bullet_green_64.png").scaledToHeight(S,Qt::SmoothTransformation)) ; iconLabel->setPixmap(QPixmap(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("RetroShare Server")) ; iconLabel->setToolTip( text + tr("RetroShare Server")) ;
} }
break ; break ;
case RSNET_NETSTATE_ADV_FORWARD: case RSNET_NETSTATE_ADV_FORWARD:
{ {
iconLabel->setPixmap(QPixmap(":/icons/bullet_green_64.png").scaledToHeight(S,Qt::SmoothTransformation)) ; iconLabel->setPixmap(QPixmap(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Forwarded Port")) ; iconLabel->setToolTip( text + tr("Forwarded Port")) ;
} }
break ; break ;