diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp
index 949c59d6c..cd62c5e99 100644
--- a/retroshare-gui/src/gui/MessengerWindow.cpp
+++ b/retroshare-gui/src/gui/MessengerWindow.cpp
@@ -1015,7 +1015,7 @@ void MessengerWindow::getAvatar()
QString fileName = QFileDialog::getOpenFileName(this, "Load File", QDir::homePath(), "Pictures (*.png *.xpm *.jpg)");
if(!fileName.isEmpty())
{
- picture = QPixmap(fileName).scaled(82,82, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
+ picture = QPixmap(fileName).scaled(96,96, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
std::cerr << "Sending avatar image down the pipe" << std::endl ;
diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp
index 1a0dc9011..4caae931a 100644
--- a/retroshare-gui/src/gui/PeersDialog.cpp
+++ b/retroshare-gui/src/gui/PeersDialog.cpp
@@ -1567,7 +1567,7 @@ void PeersDialog::getAvatar()
if(!fileName.isEmpty())
{
QPixmap picture;
- picture = QPixmap(fileName).scaled(82,82, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
+ picture = QPixmap(fileName).scaled(96,96, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
#ifdef PEERS_DEBUG
std::cerr << "Sending avatar image down the pipe" << std::endl ;
diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
index 0122bf15a..e94916114 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
@@ -910,7 +910,7 @@ void PopupChatDialog::getAvatar()
if(!fileName.isEmpty())
{
- picture = QPixmap(fileName).scaled(82,82, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
+ picture = QPixmap(fileName).scaled(96,96, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
std::cerr << "Sending avatar image down the pipe" << std::endl ;
@@ -1170,34 +1170,34 @@ void PopupChatDialog::updateStatus(const QString &peer_id, int status)
switch (status) {
case RS_STATUS_OFFLINE:
- ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/mystatus_bg_offline.png); }");
+ ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/avatarstatus_bg_offline.png); }");
ui.avatarlabel->setEnabled(false);
ui.infoframe->setVisible(true);
ui.infolabel->setText( QString::fromStdString(dialogName) + " " + tr("apears to be Offline.") +"\n" + tr("Messages you send will be lost and not delivered, rs-Mail this contact instead."));
break;
case RS_STATUS_INACTIVE:
- ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/mystatus_bg_idle.png); }");
+ ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/avatarstatus_bg_away.png); }");
ui.avatarlabel->setEnabled(true);
ui.infoframe->setVisible(true);
ui.infolabel->setText( QString::fromStdString(dialogName) + " " + tr("is Idle and may not reply"));
break;
case RS_STATUS_ONLINE:
- ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/mystatus_bg_online.png); }");
+ ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/avatarstatus_bg_online.png); }");
ui.avatarlabel->setEnabled(true);
ui.infoframe->setVisible(false);
break;
case RS_STATUS_AWAY:
- ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/mystatus_bg_idle.png); }");
+ ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/avatarstatus_bg_away.png); }");
ui.avatarlabel->setEnabled(true);
ui.infolabel->setText( QString::fromStdString(dialogName) + " " + tr("is Away and may not reply"));
ui.infoframe->setVisible(true);
break;
case RS_STATUS_BUSY:
- ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/mystatus_bg_busy.png); }");
+ ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/avatarstatus_bg_busy.png); }");
ui.avatarlabel->setEnabled(true);
ui.infolabel->setText( QString::fromStdString(dialogName) + " " + tr("is Busy and may not reply"));
ui.infoframe->setVisible(true);
diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.ui b/retroshare-gui/src/gui/chat/PopupChatDialog.ui
index 53ec892c8..828a8639e 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui
@@ -9,7 +9,7 @@
0
0
- 558
+ 504
430
@@ -102,7 +102,7 @@
- 120
+ 132
16777215
@@ -140,8 +140,8 @@
- QLabel{
-border-image: url(:/images/mystatus_bg.png);
+ QLabel{
+border-image: url(:/images/avatarstatus_bg.png);
}
@@ -181,8 +181,8 @@ border-image: url(:/images/mystatus_bg.png);
- QLabel{
-border-image: url(:/images/mystatus_bg.png);
+ QLabel{
+border-image: url(:/images/avatarstatus_bg.png);
}
@@ -328,7 +328,7 @@ p, li { white-space: pre-wrap; }
false
-
+
1
@@ -375,7 +375,7 @@ background: white;}
- 16
+ 347
46
@@ -830,6 +830,9 @@ border: 1px solid #CCCCCC;
+
+
+
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index d852ca118..00fbddb4e 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -33,6 +33,11 @@
images/add_channel64.png
images/add_channel24.png
images/add_channel32.png
+ images/avatarstatus_bg.png
+ images/avatarstatus_bg_online.png
+ images/avatarstatus_bg_away.png
+ images/avatarstatus_bg_busy.png
+ images/avatarstatus_bg_offline.png
images/browse-looking.gif
images/back.png
images/backgroundl.png
diff --git a/retroshare-gui/src/gui/images/avatarstatus_bg.png b/retroshare-gui/src/gui/images/avatarstatus_bg.png
new file mode 100644
index 000000000..cf0744e29
Binary files /dev/null and b/retroshare-gui/src/gui/images/avatarstatus_bg.png differ
diff --git a/retroshare-gui/src/gui/images/avatarstatus_bg_away.png b/retroshare-gui/src/gui/images/avatarstatus_bg_away.png
new file mode 100644
index 000000000..6bc83175b
Binary files /dev/null and b/retroshare-gui/src/gui/images/avatarstatus_bg_away.png differ
diff --git a/retroshare-gui/src/gui/images/avatarstatus_bg_busy.png b/retroshare-gui/src/gui/images/avatarstatus_bg_busy.png
new file mode 100644
index 000000000..e0eaee6a4
Binary files /dev/null and b/retroshare-gui/src/gui/images/avatarstatus_bg_busy.png differ
diff --git a/retroshare-gui/src/gui/images/avatarstatus_bg_offline.png b/retroshare-gui/src/gui/images/avatarstatus_bg_offline.png
new file mode 100644
index 000000000..baa1088ed
Binary files /dev/null and b/retroshare-gui/src/gui/images/avatarstatus_bg_offline.png differ
diff --git a/retroshare-gui/src/gui/images/avatarstatus_bg_online.png b/retroshare-gui/src/gui/images/avatarstatus_bg_online.png
new file mode 100644
index 000000000..632a7ff09
Binary files /dev/null and b/retroshare-gui/src/gui/images/avatarstatus_bg_online.png differ