d9b054b3bc
Aseigo told me to use "git checkout --theirs applet.h" in order to "take the 4.10 version of the changes where there were conflicts", but it turns out that this was very bad advice: it loses ALL the changes ever made to the file in the frameworks branch. CCMAIL: aseigo@kde.org |
||
|---|---|---|
| data | ||
| design | ||
| intoDeclarativeEngine | ||
| private | ||
| remote | ||
| scripting | ||
| tests | ||
| .krazy | ||
| abstractdialogmanager.cpp | ||
| abstractdialogmanager.h | ||
| abstractrunner.cpp | ||
| abstractrunner.h | ||
| applet.cpp | ||
| applet.h | ||
| CMakeLists.txt | ||
| config-plasma.h.cmake | ||
| configloader.cpp | ||
| configloader.h | ||
| containment.cpp | ||
| containment.h | ||
| containmentactions.cpp | ||
| containmentactions.h | ||
| containmentactionspluginsconfig.cpp | ||
| containmentactionspluginsconfig.h | ||
| corona.cpp | ||
| corona.h | ||
| coronabase.h | ||
| datacontainer.cpp | ||
| datacontainer.h | ||
| dataengine.cpp | ||
| dataengine.h | ||
| dataengineconsumer.cpp | ||
| dataengineconsumer.h | ||
| framesvg.cpp | ||
| framesvg.h | ||
| Mainpage.dox | ||
| Messages.sh | ||
| package.cpp | ||
| package.h | ||
| packagestructure.cpp | ||
| packagestructure.h | ||
| paintutils.cpp | ||
| paintutils.h | ||
| plasma.cpp | ||
| plasma.h | ||
| pluginloader.cpp | ||
| pluginloader.h | ||
| querymatch.cpp | ||
| querymatch.h | ||
| README | ||
| runnercontext.cpp | ||
| runnercontext.h | ||
| runnermanager.cpp | ||
| runnermanager.h | ||
| runnersyntax.cpp | ||
| runnersyntax.h | ||
| service.cpp | ||
| service.h | ||
| servicejob.cpp | ||
| servicejob.h | ||
| svg.cpp | ||
| svg.h | ||
| theme.cpp | ||
| theme.h | ||
| version.cpp | ||
| version.h | ||
| view.cpp | ||
| view.h | ||
libplasma
This directory contains the classes making up libplasma, which provides the
core framework used by Plasma applications, such as the Plasma desktop shell
and its components. This includes applet and extension definitions and loading,
common GUI elements, data and service interaction, search system, etc.
Domain specific sets of functionality, e.g. for network awareness or sensors,
are not found here but as DataEngine, Service, Applet, Package, Wallpaper,
ContainmentActions, Containment and other plugins.
Commit Guidelines:
* If your patch is not an obvious or trivial bug fix, have it peer reviewed
by another Plasma developer; http://reviewboard.kde.org is your friend :)
* All code MUST follow the kdelibs coding style, as found at:
http://techbase.kde.org/Policies/Kdelibs_Coding_Style
* All new public API MUST have apidox written before committing and must go
through an API review with another Plasma developer. We have to maintain
binary compatibility, remember!
Unit tests are next to godliness. (Though as you can see, right now libplasma
is hellbound.)
Please refer to the Plasma website (http://plasma.kde.org) and Plasma wiki
(http://techbase.kde.org/Projects/Plasma) for API documentation and design
documents regarding this library.