Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-21 11:26:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reworked design of the toaster and moved internal stylesheets to the file Standard.qss.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5506 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-09-03 10:58:11 +00:00
parent 1a8c9d9416
commit 2a460051e5
15 changed files with 733 additions and 886 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp
View file

@ -20,7 +20,6 @@
#include "FriendRequestToaster.h"
#include "gui/FriendsDialog.h"
#include "gui/connect/ConnectFriendWizard.h"
#include "util/WidgetBackgroundImage.h"
#include <retroshare/rspeers.h>
@ -37,9 +36,9 @@ FriendRequestToaster::FriendRequestToaster(const std::string &gpgId, const QStri
}
if (knownPeer) {
connect(ui.friendrequestButton, SIGNAL(clicked()), SLOT(friendrequestButtonSlot()));
connect(ui.toasterButton, SIGNAL(clicked()), SLOT(friendrequestButtonSlot()));
} else {
ui.friendrequestButton->setEnabled(false);
ui.toasterButton->setEnabled(false);
}
connect(ui.closeButton, SIGNAL(clicked()), SLOT(hide()));
@ -48,15 +47,12 @@ FriendRequestToaster::FriendRequestToaster(const std::string &gpgId, const QStri
/* set informations */
ui.avatarWidget->setFrameType(AvatarWidget::NORMAL_FRAME);
if (knownPeer) {
ui.messageLabel->setText( peerName + " " + tr("wants to be friend with you on RetroShare"));
ui.textLabel->setText( peerName + " " + tr("wants to be friend with you on RetroShare"));
ui.avatarWidget->setDefaultAvatar(":/images/avatar_request.png");
} else {
ui.messageLabel->setText( sslName + " " + tr("Unknown (Incoming) Connect Attempt"));
ui.textLabel->setText( sslName + " " + tr("Unknown (Incoming) Connect Attempt"));
ui.avatarWidget->setDefaultAvatar(":/images/avatar_request_unknown.png");
}
WidgetBackgroundImage::setBackgroundImage(ui.windowFrame, ":images/toaster/backgroundtoaster.png", WidgetBackgroundImage::AdjustNone);
}
void FriendRequestToaster::friendrequestButtonSlot()