diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp index 8a8ea4d15..ebec76d1d 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp @@ -452,16 +452,16 @@ void ChatLobbyDialog::updateParticipantsList() time_t now = time(NULL); 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) - widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_grey_64.png")); + widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_grey_128.png")); else - widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_green_64.png")); + widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_green_128.png")); RsGxsId 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); widgetitem->setToolTip(COLUMN_ICON,tr("Right click to mute/unmute participants
Double click to address this person
") diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 2a7a4ca26..8967f1670 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -7,10 +7,10 @@ icons/blank_green_128.png icons/browsable_blue_128.png icons/browsable_green_128.png - icons/bullet_green_64.png - icons/bullet_grey_64.png - icons/bullet_red_64.png - icons/bullet_yellow_64.png + icons/bullet_green_128.png + icons/bullet_grey_128.png + icons/bullet_red_128.png + icons/bullet_yellow_128.png icons/channels_128.png icons/channels_red_128.png icons/chat_128.png @@ -68,5 +68,6 @@ icons/yandex.png icons/tor-on.png icons/tor-logo.png + icons/tor-off.png diff --git a/retroshare-gui/src/gui/icons/bullet_green_128.png b/retroshare-gui/src/gui/icons/bullet_green_128.png new file mode 100644 index 000000000..72427d3cf Binary files /dev/null and b/retroshare-gui/src/gui/icons/bullet_green_128.png differ diff --git a/retroshare-gui/src/gui/icons/bullet_green_64.png b/retroshare-gui/src/gui/icons/bullet_green_64.png deleted file mode 100644 index f5f95da4a..000000000 Binary files a/retroshare-gui/src/gui/icons/bullet_green_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/bullet_grey_128.png b/retroshare-gui/src/gui/icons/bullet_grey_128.png new file mode 100644 index 000000000..a1c3dc798 Binary files /dev/null and b/retroshare-gui/src/gui/icons/bullet_grey_128.png differ diff --git a/retroshare-gui/src/gui/icons/bullet_grey_64.png b/retroshare-gui/src/gui/icons/bullet_grey_64.png deleted file mode 100644 index 3b9f2c65e..000000000 Binary files a/retroshare-gui/src/gui/icons/bullet_grey_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/bullet_red_128.png b/retroshare-gui/src/gui/icons/bullet_red_128.png new file mode 100644 index 000000000..507f4851e Binary files /dev/null and b/retroshare-gui/src/gui/icons/bullet_red_128.png differ diff --git a/retroshare-gui/src/gui/icons/bullet_red_64.png b/retroshare-gui/src/gui/icons/bullet_red_64.png deleted file mode 100644 index 2b18d7ff0..000000000 Binary files a/retroshare-gui/src/gui/icons/bullet_red_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/bullet_yellow_128.png b/retroshare-gui/src/gui/icons/bullet_yellow_128.png new file mode 100644 index 000000000..bc4270683 Binary files /dev/null and b/retroshare-gui/src/gui/icons/bullet_yellow_128.png differ diff --git a/retroshare-gui/src/gui/icons/bullet_yellow_64.png b/retroshare-gui/src/gui/icons/bullet_yellow_64.png deleted file mode 100644 index 52a6e41e2..000000000 Binary files a/retroshare-gui/src/gui/icons/bullet_yellow_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/statusbar/dhtstatus.cpp b/retroshare-gui/src/gui/statusbar/dhtstatus.cpp index da80730c4..7efcbe5b1 100644 --- a/retroshare-gui/src/gui/statusbar/dhtstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/dhtstatus.cpp @@ -79,7 +79,7 @@ void DHTStatus::getDHTStatus() if (!(config.DHTActive)) { // 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")); spaceLabel->setVisible(false); @@ -97,7 +97,7 @@ void DHTStatus::getDHTStatus() // YELLOW or GREEN. 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")); spaceLabel->setVisible(true); @@ -109,7 +109,7 @@ void DHTStatus::getDHTStatus() } 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")); spaceLabel->setVisible(true); diff --git a/retroshare-gui/src/gui/statusbar/natstatus.cpp b/retroshare-gui/src/gui/statusbar/natstatus.cpp index f5bd7930d..9f80369db 100644 --- a/retroshare-gui/src/gui/statusbar/natstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/natstatus.cpp @@ -63,14 +63,14 @@ void NATStatus::getNATStatus() default: 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")) ; } break ; 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")) ; } break ; @@ -78,14 +78,14 @@ void NATStatus::getNATStatus() // BAD. (RED) 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")) ; } break ; 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")) ; } break ; @@ -93,21 +93,21 @@ void NATStatus::getNATStatus() // CAUTION. (ORANGE) 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")) ; } break ; 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")) ; } break ; 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")) ; } break ; @@ -115,14 +115,14 @@ void NATStatus::getNATStatus() // GOOD (GREEN) 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")) ; } break ; 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")) ; } break ;