standard naming
svn path=/trunk/KDE/kdelibs/; revision=976575
This commit is contained in:
parent
3454a5ddc6
commit
25b34778ce
16
dialog.cpp
16
dialog.cpp
@ -75,7 +75,7 @@ public:
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void themeUpdated();
|
void themeChanged();
|
||||||
void adjustView();
|
void adjustView();
|
||||||
void updateResizeCorners();
|
void updateResizeCorners();
|
||||||
void progressHide(qreal amount);
|
void progressHide(qreal amount);
|
||||||
@ -98,7 +98,7 @@ public:
|
|||||||
int hideAnimId;
|
int hideAnimId;
|
||||||
};
|
};
|
||||||
|
|
||||||
void DialogPrivate::themeUpdated()
|
void DialogPrivate::themeChanged()
|
||||||
{
|
{
|
||||||
qreal topHeight;
|
qreal topHeight;
|
||||||
qreal leftWidth;
|
qreal leftWidth;
|
||||||
@ -106,6 +106,7 @@ void DialogPrivate::themeUpdated()
|
|||||||
qreal bottomHeight;
|
qreal bottomHeight;
|
||||||
|
|
||||||
background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight);
|
background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight);
|
||||||
|
//kDebug() << leftWidth << topHeight << rightWidth << bottomHeight;
|
||||||
|
|
||||||
FrameSvg::EnabledBorders borders = FrameSvg::AllBorders;
|
FrameSvg::EnabledBorders borders = FrameSvg::AllBorders;
|
||||||
|
|
||||||
@ -244,8 +245,8 @@ Dialog::Dialog(QWidget *parent, Qt::WindowFlags f)
|
|||||||
|
|
||||||
connect(d->background, SIGNAL(repaintNeeded()), this, SLOT(update()));
|
connect(d->background, SIGNAL(repaintNeeded()), this, SLOT(update()));
|
||||||
|
|
||||||
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), this, SLOT(themeUpdated()));
|
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), this, SLOT(themeChanged()));
|
||||||
d->themeUpdated();
|
d->themeChanged();
|
||||||
|
|
||||||
setMouseTracking(true);
|
setMouseTracking(true);
|
||||||
}
|
}
|
||||||
@ -457,7 +458,7 @@ void Dialog::setGraphicsWidget(QGraphicsWidget *widget)
|
|||||||
lay->setSpacing(0);
|
lay->setSpacing(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
d->themeUpdated();
|
d->themeChanged();
|
||||||
|
|
||||||
if (!d->view) {
|
if (!d->view) {
|
||||||
d->view = new QGraphicsView(this);
|
d->view = new QGraphicsView(this);
|
||||||
@ -506,7 +507,7 @@ void Dialog::showEvent(QShowEvent * event)
|
|||||||
Q_UNUSED(event);
|
Q_UNUSED(event);
|
||||||
|
|
||||||
//check if the widget size is still synced with the view
|
//check if the widget size is still synced with the view
|
||||||
d->themeUpdated();
|
d->themeChanged();
|
||||||
|
|
||||||
if (d->graphicsWidget && d->view && d->graphicsWidget->size().toSize() != d->view->size()) {
|
if (d->graphicsWidget && d->view && d->graphicsWidget->size().toSize() != d->view->size()) {
|
||||||
d->adjustView();
|
d->adjustView();
|
||||||
@ -530,8 +531,9 @@ void Dialog::moveEvent(QMoveEvent *event)
|
|||||||
if (!d->moveTimer) {
|
if (!d->moveTimer) {
|
||||||
d->moveTimer = new QTimer(this);
|
d->moveTimer = new QTimer(this);
|
||||||
d->moveTimer->setSingleShot(true);
|
d->moveTimer->setSingleShot(true);
|
||||||
connect(d->moveTimer, SIGNAL(timeout()), this, SLOT(themeUpdated()));
|
connect(d->moveTimer, SIGNAL(timeout()), this, SLOT(themeChanged()));
|
||||||
}
|
}
|
||||||
|
|
||||||
d->moveTimer->start(200);
|
d->moveTimer->start(200);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
dialog.h
2
dialog.h
@ -140,7 +140,7 @@ class PLASMA_EXPORT Dialog : public QWidget
|
|||||||
/**
|
/**
|
||||||
* React to theme changes
|
* React to theme changes
|
||||||
*/
|
*/
|
||||||
Q_PRIVATE_SLOT(d, void themeUpdated())
|
Q_PRIVATE_SLOT(d, void themeChanged())
|
||||||
Q_PRIVATE_SLOT(d, void progressHide(qreal))
|
Q_PRIVATE_SLOT(d, void progressHide(qreal))
|
||||||
Q_PRIVATE_SLOT(d, void progressShow(qreal))
|
Q_PRIVATE_SLOT(d, void progressShow(qreal))
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user