did not make it for 4.1, no suggestion of movement on it for 4.2. can be re-added if there is demand.
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=839794
This commit is contained in:
Aaron J. Seigo
parent
63bce9d1b4
commit
c6f99bd6d4
@ -35,8 +35,6 @@ set(plasma_LIB_SRCS
|
|||||||
dataenginemanager.cpp
|
dataenginemanager.cpp
|
||||||
delegate.cpp
|
delegate.cpp
|
||||||
dialog.cpp
|
dialog.cpp
|
||||||
#FOR FUTURE
|
|
||||||
#layouts/borderlayout.cpp
|
|
||||||
paintutils.cpp
|
paintutils.cpp
|
||||||
panelsvg.cpp
|
panelsvg.cpp
|
||||||
plasma.cpp
|
plasma.cpp
|
||||||
@ -179,11 +177,6 @@ install(FILES
|
|||||||
widgets/webcontent.h
|
widgets/webcontent.h
|
||||||
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel)
|
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel)
|
||||||
|
|
||||||
#For future
|
|
||||||
#install(FILES
|
|
||||||
# layouts/borderlayout.h
|
|
||||||
# DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/layouts)
|
|
||||||
|
|
||||||
install(FILES
|
install(FILES
|
||||||
scripting/appletscript.h
|
scripting/appletscript.h
|
||||||
scripting/dataenginescript.h
|
scripting/dataenginescript.h
|
||||||
|
|||||||
@ -1,249 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2007 Ivan Cukic <ivan.cukic+kde@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Library/Lesser General Public License
|
|
||||||
* version 2, or (at your option) any later version, as published by the
|
|
||||||
* Free Software Foundation
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library/Lesser General Public
|
|
||||||
* License along with this program; if not, write to the
|
|
||||||
* Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "borderlayout.h"
|
|
||||||
|
|
||||||
namespace Plasma {
|
|
||||||
|
|
||||||
class BorderLayoutPrivate {
|
|
||||||
public:
|
|
||||||
BorderLayout * q;
|
|
||||||
|
|
||||||
explicit BorderLayoutPrivate(BorderLayout * parent = 0)
|
|
||||||
: q(parent)
|
|
||||||
{
|
|
||||||
sizes[LeftPositioned] = -1;
|
|
||||||
sizes[RightPositioned] = -1;
|
|
||||||
sizes[TopPositioned] = -1;
|
|
||||||
sizes[BottomPositioned] = -1;
|
|
||||||
sizes[CenterPositioned] = -1;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ~BorderLayoutPrivate()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
QMap< Position, LayoutItem * > itemPositions;
|
|
||||||
QMap< Position, qreal > sizes;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
BorderLayout::BorderLayout(LayoutItem * parent) :
|
|
||||||
Layout(parent), d(new BorderLayoutPrivate(this))
|
|
||||||
{
|
|
||||||
if (parent) {
|
|
||||||
parent->setLayout(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
BorderLayout::~BorderLayout()
|
|
||||||
{
|
|
||||||
releaseManagedItems();
|
|
||||||
delete d;
|
|
||||||
}
|
|
||||||
|
|
||||||
Qt::Orientations BorderLayout::expandingDirections() const
|
|
||||||
{
|
|
||||||
return Qt::Horizontal | Qt::Vertical;
|
|
||||||
}
|
|
||||||
|
|
||||||
void BorderLayout::relayout()
|
|
||||||
{
|
|
||||||
QRectF rect = geometry();
|
|
||||||
rect.setTopLeft(rect.topLeft() + QPointF(margin(LeftMargin), margin(TopMargin)));
|
|
||||||
rect.setBottomRight(rect.bottomRight() - QPointF(margin(RightMargin), margin(BottomMargin)));
|
|
||||||
|
|
||||||
QPointF origin = rect.topLeft();
|
|
||||||
qreal top, bottom, left, right;
|
|
||||||
top = (d->sizes[TopPositioned] >= 0) ? d->sizes[TopPositioned] : 0;
|
|
||||||
left = (d->sizes[LeftPositioned] >= 0) ? d->sizes[LeftPositioned] : 0;
|
|
||||||
bottom = rect.height() - ((d->sizes[BottomPositioned] >= 0) ? d->sizes[BottomPositioned] : 0);
|
|
||||||
right = rect.width() - ((d->sizes[RightPositioned] >= 0) ? d->sizes[RightPositioned] : 0);
|
|
||||||
|
|
||||||
if (d->itemPositions[TopPositioned] /*&& d->itemPositions[TopPositioned]->isVisible()*/) {
|
|
||||||
top = (d->sizes[TopPositioned] >= 0) ? d->sizes[TopPositioned] : d->itemPositions[TopPositioned]->sizeHint().height();
|
|
||||||
d->itemPositions[TopPositioned]->setGeometry(QRectF(origin, QSizeF(
|
|
||||||
rect.width(), top)));
|
|
||||||
top += spacing();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (d->itemPositions[BottomPositioned] /*&& d->itemPositions[BottomPositioned]->isVisible()*/) {
|
|
||||||
bottom = (d->sizes[BottomPositioned] >= 0) ? d->sizes[BottomPositioned]
|
|
||||||
: d->itemPositions[BottomPositioned]->sizeHint().height();
|
|
||||||
d->itemPositions[BottomPositioned]->setGeometry(QRectF(origin + QPointF(0,
|
|
||||||
rect.height() - bottom), QSizeF(rect.width(),
|
|
||||||
bottom)));
|
|
||||||
bottom = rect.height() - bottom - spacing();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (d->itemPositions[LeftPositioned] /*&& d->itemPositions[LeftPositioned]->isVisible()*/) {
|
|
||||||
left = (d->sizes[LeftPositioned] >= 0) ? d->sizes[LeftPositioned] : d->itemPositions[LeftPositioned]->sizeHint().width();
|
|
||||||
d->itemPositions[LeftPositioned]->setGeometry(QRectF(origin + QPointF(0, top),
|
|
||||||
QSizeF(left, bottom - top)));
|
|
||||||
left += spacing();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (d->itemPositions[RightPositioned] /*&& d->itemPositions[RightPositioned]->isVisible()*/) {
|
|
||||||
right = (d->sizes[RightPositioned] >= 0) ? d->sizes[RightPositioned] : d->itemPositions[RightPositioned]->sizeHint().width();
|
|
||||||
d->itemPositions[RightPositioned]->setGeometry(QRectF(origin + QPointF(
|
|
||||||
rect.width() - right, top), QSizeF(right, bottom - top)));
|
|
||||||
right = rect.width() - right - spacing();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (d->itemPositions[CenterPositioned] /*&& d->itemPositions[CenterPositioned]->isVisible()*/) {
|
|
||||||
d->itemPositions[CenterPositioned]->setGeometry(QRectF(
|
|
||||||
origin + QPointF(left, top), QSizeF(right - left, bottom - top)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void BorderLayout::releaseManagedItems()
|
|
||||||
{
|
|
||||||
foreach (Plasma::LayoutItem *item, d->itemPositions) {
|
|
||||||
if (item) {
|
|
||||||
item->unsetManagingLayout(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
QSizeF BorderLayout::sizeHint() const
|
|
||||||
{
|
|
||||||
qreal hintHeight = 0.0;
|
|
||||||
qreal hintWidth = 0.0;
|
|
||||||
|
|
||||||
if (d->itemPositions[TopPositioned] /*&& d->itemPositions[TopPositioned]->isVisible()*/) {
|
|
||||||
hintHeight += d->itemPositions[TopPositioned]->sizeHint().height();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (d->itemPositions[BottomPositioned] /*&& d->itemPositions[BottomPositioned]->isVisible()*/) {
|
|
||||||
hintHeight += d->itemPositions[BottomPositioned]->sizeHint().height();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (d->itemPositions[LeftPositioned] /*&& d->itemPositions[LeftPositioned]->isVisible()*/) {
|
|
||||||
hintWidth += d->itemPositions[LeftPositioned]->sizeHint().width();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (d->itemPositions[RightPositioned] /*&& d->itemPositions[RightPositioned]->isVisible()*/) {
|
|
||||||
hintWidth += d->itemPositions[RightPositioned]->sizeHint().width();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (d->itemPositions[CenterPositioned] /*&& d->itemPositions[CenterPositioned]->isVisible()*/) {
|
|
||||||
hintHeight += d->itemPositions[CenterPositioned]->sizeHint().height();
|
|
||||||
hintWidth += d->itemPositions[CenterPositioned]->sizeHint().width();
|
|
||||||
}
|
|
||||||
|
|
||||||
return QSizeF(hintWidth + 2 + margin(LeftMargin) + margin(RightMargin), hintHeight + 2 + margin(TopMargin) + margin(BottomMargin));
|
|
||||||
}
|
|
||||||
|
|
||||||
void BorderLayout::addItem(Plasma::LayoutItem * item)
|
|
||||||
{
|
|
||||||
BorderLayout::addItem (item, CenterPositioned);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BorderLayout::addItem(Plasma::LayoutItem * item, Position position)
|
|
||||||
{
|
|
||||||
removeItem(item);
|
|
||||||
d->itemPositions[position] = item;
|
|
||||||
item->setManagingLayout(this);
|
|
||||||
updateGeometry();
|
|
||||||
}
|
|
||||||
|
|
||||||
void BorderLayout::removeItem(LayoutItem * item)
|
|
||||||
{
|
|
||||||
QMutableMapIterator< Position, Plasma::LayoutItem * > i(d->itemPositions);
|
|
||||||
while (i.hasNext()) {
|
|
||||||
i.next();
|
|
||||||
if (i.value() == item) {
|
|
||||||
i.remove();
|
|
||||||
item->unsetManagingLayout(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
updateGeometry();
|
|
||||||
}
|
|
||||||
|
|
||||||
int BorderLayout::count() const
|
|
||||||
{
|
|
||||||
int count = 0;
|
|
||||||
foreach (Plasma::LayoutItem * i, d->itemPositions) {
|
|
||||||
if (i) {
|
|
||||||
++count;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
int BorderLayout::indexOf(LayoutItem * item) const
|
|
||||||
{
|
|
||||||
int count = 0;
|
|
||||||
foreach (Plasma::LayoutItem * i, d->itemPositions) {
|
|
||||||
if (i) {
|
|
||||||
if (item == i) {
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
++count;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
LayoutItem * BorderLayout::itemAt(int index) const
|
|
||||||
{
|
|
||||||
int count = 0;
|
|
||||||
foreach (Plasma::LayoutItem * i, d->itemPositions) {
|
|
||||||
if (i) {
|
|
||||||
if (index == count) {
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
count++;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
Plasma::LayoutItem * BorderLayout::takeAt(int i)
|
|
||||||
{
|
|
||||||
Plasma::LayoutItem * item = itemAt(i);
|
|
||||||
removeItem(item);
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
void BorderLayout::setSize(qreal size, Position border)
|
|
||||||
{
|
|
||||||
d->sizes[border] = size;
|
|
||||||
updateGeometry();
|
|
||||||
}
|
|
||||||
|
|
||||||
void BorderLayout::setAutoSize(Position border)
|
|
||||||
{
|
|
||||||
d->sizes[border] = -1;
|
|
||||||
updateGeometry();
|
|
||||||
}
|
|
||||||
|
|
||||||
qreal BorderLayout::size(Position border)
|
|
||||||
{
|
|
||||||
if (border == CenterPositioned) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
return d->sizes[border];
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,99 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2007 Ivan Cukic <ivan.cukic+kde@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Library/Lesser General Public License
|
|
||||||
* version 2, or (at your option) any later version, as published by the
|
|
||||||
* Free Software Foundation
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library/Lesser General Public
|
|
||||||
* License along with this program; if not, write to the
|
|
||||||
* Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PLASMA_BORDER_LAYOUT
|
|
||||||
#define PLASMA_BORDER_LAYOUT
|
|
||||||
|
|
||||||
#include <QtCore/QMap>
|
|
||||||
|
|
||||||
#include <plasma/plasma_export.h>
|
|
||||||
#include <plasma/plasma.h>
|
|
||||||
#include <plasma/layouts/layout.h>
|
|
||||||
|
|
||||||
namespace Plasma {
|
|
||||||
|
|
||||||
class BorderLayoutPrivate;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A layout which lays one item per border (left, top, bottom, right)
|
|
||||||
* and one item in center.
|
|
||||||
*
|
|
||||||
* Similar to java.awt.BorderLayout from the Java's standard library
|
|
||||||
*/
|
|
||||||
class PLASMA_EXPORT BorderLayout : public Layout {
|
|
||||||
public:
|
|
||||||
|
|
||||||
explicit BorderLayout(LayoutItem * parent = 0);
|
|
||||||
virtual ~BorderLayout();
|
|
||||||
|
|
||||||
virtual Qt::Orientations expandingDirections() const;
|
|
||||||
|
|
||||||
QSizeF sizeHint() const;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds item in the center. Equal to:
|
|
||||||
* addItem(item, Plasma::CenterPositioned);
|
|
||||||
*/
|
|
||||||
void addItem(Plasma::LayoutItem * item);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds item at the specified position
|
|
||||||
*/
|
|
||||||
void addItem(Plasma::LayoutItem * item, Position position);
|
|
||||||
|
|
||||||
void removeItem(Plasma::LayoutItem * item);
|
|
||||||
|
|
||||||
virtual int count() const;
|
|
||||||
virtual int indexOf(LayoutItem * item) const;
|
|
||||||
virtual LayoutItem * itemAt(int i) const;
|
|
||||||
virtual LayoutItem * takeAt(int i);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deactivates the automatic sizing of a border widget,
|
|
||||||
* and sets it to the specified size.
|
|
||||||
*
|
|
||||||
* For left and right widgets, it sets the width; while
|
|
||||||
* for top and bottom ones, it sets the height.
|
|
||||||
*/
|
|
||||||
void setSize(qreal size, Position border);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Activates the automatic sizing of a border widget,
|
|
||||||
* according to it's sizeHint()
|
|
||||||
*/
|
|
||||||
void setAutoSize(Position border);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the size of the specified border widget. If
|
|
||||||
* automatic sizing for that border widget is activated,
|
|
||||||
* it will return a value less than zero.
|
|
||||||
*/
|
|
||||||
qreal size(Position border);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
void relayout();
|
|
||||||
void releaseManagedItems();
|
|
||||||
|
|
||||||
private:
|
|
||||||
BorderLayoutPrivate * const d;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* PLASMA_BORDER_LAYOUT */
|
|
||||||
Loading…
Reference in New Issue
Block a user