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

remove :frameSvgItem()

Browse Source
This commit is contained in:
Marco Martin 2014-03-18 21:38:02 +01:00
parent beac07c97d
commit f412d1a9d0
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/declarativeimports/core/dialog.cpp
View File

@ -534,6 +534,12 @@ void Dialog::setType(WindowType type)
setFlags(Qt::FramelessWindowHint|flags()); setFlags(Qt::FramelessWindowHint|flags());
} }
if (type == Tooltip) {
d->frameSvgItem->setImagePath("widgets/tooltip");
} else {
d->frameSvgItem->setImagePath("dialogs/background");
}
if (type == Dock) { if (type == Dock) {
KWindowSystem::setOnAllDesktops(winId(), true); KWindowSystem::setOnAllDesktops(winId(), true);
} else { } else {
@ -548,11 +554,6 @@ Dialog::WindowType Dialog::type() const
return d->type; return d->type;
} }
Plasma::FrameSvgItem *Dialog::frameSvgItem()
{
return d->frameSvgItem;
}
void Dialog::focusInEvent(QFocusEvent *ev) void Dialog::focusInEvent(QFocusEvent *ev)
{ {
QQuickWindow::focusInEvent(ev); QQuickWindow::focusInEvent(ev);

2
src/declarativeimports/core/dialog.h
View File

@ -176,8 +176,6 @@ protected:
void hideEvent(QHideEvent *event); void hideEvent(QHideEvent *event);
bool event(QEvent *event); bool event(QEvent *event);
Plasma::FrameSvgItem *frameSvgItem();
virtual void classBegin(); virtual void classBegin();
virtual void componentComplete(); virtual void componentComplete();

1
src/declarativeimports/core/tooltipdialog.cpp
View File

@ -39,7 +39,6 @@ ToolTipDialog::ToolTipDialog(QQuickItem *parent)
setFlags(Qt::ToolTip); setFlags(Qt::ToolTip);
setLocation(Plasma::Types::Floating); setLocation(Plasma::Types::Floating);
setDirection(Plasma::Types::Up); setDirection(Plasma::Types::Up);
frameSvgItem()->setImagePath("widgets/tooltip");
m_animation = new QPropertyAnimation(this); m_animation = new QPropertyAnimation(this);
connect(m_animation, SIGNAL(valueChanged(QVariant)), connect(m_animation, SIGNAL(valueChanged(QVariant)),