Added changes from braindead:

- simplified avatarwidget
- prepared property-dependend stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5176 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-05-19 22:18:15 +00:00
parent ce22ab5be9
commit b344aebbe6
6 changed files with 107 additions and 148 deletions

View file

@ -22,15 +22,16 @@
#ifndef AVATARWIDGET_H
#define AVATARWIDGET_H
#include <QWidget>
#include <QLabel>
namespace Ui {
class AvatarWidget;
}
class AvatarWidget : public QWidget
class AvatarWidget : public QLabel
{
Q_OBJECT
Q_PROPERTY(QString frameState READ frameState)
public:
enum FrameType {
@ -43,13 +44,13 @@ public:
AvatarWidget(QWidget *parent = 0);
~AvatarWidget();
QString frameState();
void setFrameType(FrameType type);
void setId(const std::string& id, bool isGpg);
void setOwnId();
void setDefaultAvatar(const QString &avatar);
protected:
void resizeEvent(QResizeEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
private slots:
@ -69,6 +70,7 @@ private:
bool isGpg : 1;
} mFlag;
FrameType mFrameType;
uint32_t mPeerState;
};
#endif // AVATARWIDGET_H