Doing some basic work on visual foundation for applets
and adding desktop stubs. svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=492502
This commit is contained in:
parent
148d563a44
commit
879fbb19a0
@ -2,7 +2,8 @@ INCLUDES = $(all_includes)
|
|||||||
KDE_CXXFLAGS = -UQT3_SUPPORT
|
KDE_CXXFLAGS = -UQT3_SUPPORT
|
||||||
lib_LTLIBRARIES = libplasma.la
|
lib_LTLIBRARIES = libplasma.la
|
||||||
|
|
||||||
libplasma_la_SOURCES = appletinfo.cpp plasma.cpp applet.cpp appletChain.cpp
|
libplasma_la_SOURCES = plasma.cpp applet.cpp \
|
||||||
|
appletChain.cpp appletLayout.cpp appletCompositor.cpp
|
||||||
|
|
||||||
libplasma_la_METASOURCES = AUTO
|
libplasma_la_METASOURCES = AUTO
|
||||||
|
|
||||||
@ -13,7 +14,8 @@ libplasma_la_includedir = $(includedir)/plasma
|
|||||||
|
|
||||||
noinst_HEADERS =
|
noinst_HEADERS =
|
||||||
|
|
||||||
libplasma_la_include_HEADERS = appletinfo.h applet.h plasma.h
|
libplasma_la_include_HEADERS = applet.h plasma.h \
|
||||||
|
appletCompositor.h appletLayout.h
|
||||||
|
|
||||||
#kde_kcfg_DATA = plasmaSettings.kcfg extensionSettings.kcfg
|
#kde_kcfg_DATA = plasmaSettings.kcfg extensionSettings.kcfg
|
||||||
|
|
||||||
|
18
appletCompositor.cpp
Normal file
18
appletCompositor.cpp
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
#include "appletCompositor.h"
|
||||||
|
|
||||||
|
namespace Plasma
|
||||||
|
{
|
||||||
|
|
||||||
|
AppletCompositor::AppletCompositor(QWidget *parent)
|
||||||
|
: QWidget(parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AppletCompositor::mergeTwoApplets()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
} // Plasma namespace
|
||||||
|
|
||||||
|
#include "appletCompositor.moc"
|
33
appletCompositor.h
Normal file
33
appletCompositor.h
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
#ifndef APPLETCOMPOSITOR_H
|
||||||
|
#define APPLETCOMPOSITOR_H
|
||||||
|
|
||||||
|
#include <kdelibs_export.h>
|
||||||
|
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
|
namespace Plasma
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is the visual representation of our applet container.
|
||||||
|
* Together with AppletLayout handles all GUI aspect of displaying
|
||||||
|
* applets. AppletCompositor is responsible for all the effects
|
||||||
|
* and animations that happen between applets.
|
||||||
|
*/
|
||||||
|
class KDE_EXPORT AppletCompositor : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
AppletCompositor(QWidget *parent);
|
||||||
|
|
||||||
|
protected slots:
|
||||||
|
virtual void mergeTwoApplets();
|
||||||
|
|
||||||
|
private:
|
||||||
|
class Private;
|
||||||
|
Private *d;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
13
appletLayout.cpp
Normal file
13
appletLayout.cpp
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
#include "appletLayout.h"
|
||||||
|
|
||||||
|
namespace Plasma
|
||||||
|
{
|
||||||
|
|
||||||
|
AppletLayout::AppletLayout(QWidget *parent)
|
||||||
|
: QLayout(parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#include "appletLayout.moc"
|
33
appletLayout.h
Normal file
33
appletLayout.h
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
#ifndef APPLEYLAYOUT_H
|
||||||
|
#define APPLEYLAYOUT_H
|
||||||
|
|
||||||
|
#include "kdelibs_export.h"
|
||||||
|
|
||||||
|
#include <QLayout>
|
||||||
|
|
||||||
|
namespace Plasma
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AppletLayout is our custom layouting engine
|
||||||
|
* for applets. It reacts to state transition (removal,addition
|
||||||
|
* of applets) by emitting corresponding signals which AppletCompositor
|
||||||
|
* can intercept and respond with some nice animation/effect.
|
||||||
|
*/
|
||||||
|
class KDE_EXPORT AppletLayout : public QLayout
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
AppletLayout(QWidget *parent);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void mergeTwoApplets();
|
||||||
|
void splitTwoApplets();
|
||||||
|
private:
|
||||||
|
class Private;
|
||||||
|
Private *d;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue
Block a user