alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove group bindings again

Browse Source
This commit is contained in:
Marco Martin 2012-02-20 13:36:42 +01:00
parent d408978213
commit e6053a71dd
2 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
declarativeimports/qtextracomponents/qiconitem.cpp
View File

@ -28,7 +28,6 @@
QIconItem::QIconItem(QDeclarativeItem *parent) QIconItem::QIconItem(QDeclarativeItem *parent)
: QDeclarativeItem(parent), : QDeclarativeItem(parent),
m_smooth(false), m_smooth(false),
m_group(NoGroup),
m_state(DefaultState) m_state(DefaultState)
{ {
setFlag(QGraphicsItem::ItemHasNoContents, false); setFlag(QGraphicsItem::ItemHasNoContents, false);
@ -55,24 +54,6 @@ QIcon QIconItem::icon() const
return m_icon; return m_icon;
} }
void QIconItem::setGroup(QIconItem::Group group)
{
if (m_group == group) {
return;
}
m_group = group;
emit groupChanged(group);
emit implicitWidthChanged(implicitWidth());
emit implicitHeightChanged(implicitHeight());
update();
}
QIconItem::Group QIconItem::group() const
{
return m_group;
}
QIconItem::State QIconItem::state() const QIconItem::State QIconItem::state() const
{ {
return m_state; return m_state;
@ -91,12 +72,12 @@ void QIconItem::setState(QIconItem::State state)
int QIconItem::implicitWidth() const int QIconItem::implicitWidth() const
{ {
return KIconLoader::global()->currentSize((KIconLoader::Group)m_group); return KIconLoader::global()->currentSize(KIconLoader::Desktop);
} }
int QIconItem::implicitHeight() const int QIconItem::implicitHeight() const
{ {
return KIconLoader::global()->currentSize((KIconLoader::Group)m_group); return KIconLoader::global()->currentSize(KIconLoader::Desktop);
} }
void QIconItem::setSmooth(const bool smooth) void QIconItem::setSmooth(const bool smooth)

23
declarativeimports/qtextracomponents/qiconitem.h
View File

@ -29,25 +29,13 @@ class QIconItem : public QDeclarativeItem
Q_PROPERTY(QVariant icon READ icon WRITE setIcon) Q_PROPERTY(QVariant icon READ icon WRITE setIcon)
Q_PROPERTY(bool smooth READ smooth WRITE setSmooth) Q_PROPERTY(bool smooth READ smooth WRITE setSmooth)
Q_PROPERTY(int implicitWidth READ implicitWidth NOTIFY implicitWidthChanged) Q_PROPERTY(int implicitWidth READ implicitWidth CONSTANT)
Q_PROPERTY(int implicitHeight READ implicitHeight NOTIFY implicitHeightChanged) Q_PROPERTY(int implicitHeight READ implicitHeight CONSTANT)
Q_PROPERTY(Group group READ group WRITE setGroup NOTIFY groupChanged)
Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged) Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)
Q_ENUMS(Group)
Q_ENUMS(State) Q_ENUMS(State)
public: public:
enum Group {
NoGroup, ///No group.
Desktop, ///Desktop icons.
FirstGroup, ///First group.
Toolbar, ///Toolbar icons.
MainToolbar, ///Main toolbar icons.
Small, ///Small icons, e.g. for buttons.
Panel, ///Panel (Plasma Taskbar) icons.
Dialog, ///Icons for use in dialog titles, page lists, etc.
};
enum State { enum State {
DefaultState, ///The default state. DefaultState, ///The default state.
@ -61,9 +49,6 @@ public:
void setIcon(const QVariant &icon); void setIcon(const QVariant &icon);
QIcon icon() const; QIcon icon() const;
void setGroup(Group group);
Group group() const;
QIconItem::State state() const; QIconItem::State state() const;
void setState(State state); void setState(State state);
@ -76,15 +61,11 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
Q_SIGNALS: Q_SIGNALS:
void implicitWidthChanged(int implicitWidth);
void implicitHeightChanged(int implicitHeight);
void groupChanged(Group group);
void stateChanged(State state); void stateChanged(State state);
private: private:
QIcon m_icon; QIcon m_icon;
bool m_smooth; bool m_smooth;
Group m_group;
State m_state; State m_state;
}; };