alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,601 Commits 1 Branch 0 Tags 40 MiB
8b627f8c01
Commit Graph

11601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Martin
8b627f8c01 fix build 2013-09-10 21:15:09 +02:00
Marco Martin
eccf797920 Merge branch 'plasmaview2' into plasmaview3 
Conflicts:
	src/plasmaview/shellpackage_p.cpp
	src/plasmaview/shellpackage_p.h
	src/plasmaview/view.cpp
	src/plasmaview/view.h
	src/shell/CMakeLists.txt
	src/shell/desktopcorona.cpp
	src/shell/shellcorona.cpp
	src/shell/shellpluginloader.cpp
 2013-09-10 20:59:47 +02:00
Giorgos Tsiapaliokas
70ab0cfc48 KF5::plasmaview -> KF5::PlasmaView 2013-09-10 20:47:34 +02:00
Giorgos Tsiapaliokas
bf2619a79a move shellpluginloader back to shell 
Conflicts:
	src/plasmaview/CMakeLists.txt
	src/shell/shellpluginloader.cpp
 2013-09-10 20:47:25 +02:00
Giorgos Tsiapaliokas
0235eb82d5 add the missing include 2013-09-10 20:44:59 +02:00
Giorgos Tsiapaliokas
94806e9e2b don't export ConfigCategory 2013-09-10 20:44:42 +02:00
Giorgos Tsiapaliokas
768d0c07a8 KF5::plasmaview -> KF5::PlasmaView 2013-09-10 20:44:36 +02:00
Giorgos Tsiapaliokas
2bb94a1aa0 use variable names instead of KF5:: 2013-09-10 20:44:31 +02:00
Giorgos Tsiapaliokas
bae445f795 don't include the file, we don't need it 
Conflicts:
	src/shell/shellcorona.cpp
 2013-09-10 20:44:02 +02:00
Giorgos Tsiapaliokas
b6db500fef add includes/PlasmaView/ShellPluginLoader 2013-09-10 20:41:57 +02:00
Giorgos Tsiapaliokas
dc26a8a3da add some more apidocs in the configview 2013-09-10 20:41:53 +02:00
Giorgos Tsiapaliokas
9faa53540a add apidocs for the shellpluginloader 2013-09-10 20:41:49 +02:00
Giorgos Tsiapaliokas
ff34152432 use d_ptr in shellpluginloader 2013-09-10 20:41:44 +02:00
Giorgos Tsiapaliokas
52e57cfdd5 build the shellpackage again 2013-09-10 20:41:39 +02:00
Giorgos Tsiapaliokas
854b956fbc shell/shellpackage.cpp -> plasmaview/shellpackage_p.cpp 
shell/shellpackage.h -> plasmaview/shellpackage_p.h
 2013-09-10 20:41:36 +02:00
Giorgos Tsiapaliokas
5714b65883 shell/shellpluginloader.cpp -> plasmaview/shellpluginloader.cpp 
shell/shellpluginloader.h -> plasmaview/shellpluginloader.h
 2013-09-10 20:41:31 +02:00
Giorgos Tsiapaliokas
f4d6c14ebc src/plasmaview/containmentconfigview.cpp -> src/plasmaview/containmentconfigview_p.cpp 
src/plasmaview/containmentconfigview.h -> src/plasmaview/containmentconfigview_p.h
 2013-09-10 20:41:27 +02:00
Giorgos Tsiapaliokas
426d34e6e2 add some apidocs 2013-09-10 20:41:23 +02:00
Giorgos Tsiapaliokas
39d2575ce2 don't install containmentconfigview.h 2013-09-10 20:41:18 +02:00
Giorgos Tsiapaliokas
4f435ccf85 Revert "use d pointer in containmentconfigview" 
This reverts commit 22fc5cebf449ec2a3d4f9ce8a40d11ffde1345f9.

There is no need to export it since only the View is using
it.

Conflicts:
	src/plasmaview/containmentconfigview.cpp
	src/plasmaview/containmentconfigview.h
 2013-09-10 20:41:13 +02:00
Giorgos Tsiapaliokas
23ec4639c5 remove unneeded code 2013-09-10 20:41:09 +02:00
Giorgos Tsiapaliokas
ff79662287 add apidocs for the View 2013-09-10 20:41:05 +02:00
Giorgos Tsiapaliokas
e4810b9e95 make it protected again 2013-09-10 20:41:01 +02:00
Giorgos Tsiapaliokas
efc9356b71 include the right header 2013-09-10 20:40:56 +02:00
Giorgos Tsiapaliokas
59aaee1278 remove configview.cpp 2013-09-10 20:40:52 +02:00
Giorgos Tsiapaliokas
cba8948fa2 use d_ptr in configview 2013-09-10 20:40:47 +02:00
Giorgos Tsiapaliokas
ef865b9f45 shell/configview.cpp -> plasmaview/configview.cpp 
shell/configview.h -> plasmaview/configview.h
 2013-09-10 20:40:42 +02:00
Giorgos Tsiapaliokas
52fa3113e5 currentcontainmentactionsmodel.cpp -> currentcontainmentactionsmodel_p.cpp 2013-09-10 20:40:38 +02:00
Giorgos Tsiapaliokas
38afa72e8d use d pointer in containmentconfigview 2013-09-10 20:40:34 +02:00
Giorgos Tsiapaliokas
8c4bbf10c2 don't install currentcontainmentactionsmodel.h 2013-09-10 20:40:29 +02:00
Giorgos Tsiapaliokas
e58ee74ff9 use d pointer in view 2013-09-10 20:40:24 +02:00
Giorgos Tsiapaliokas
4fc23e7eb8 add plasmaview/includes/ 2013-09-10 20:40:20 +02:00
Giorgos Tsiapaliokas
2699ff1826 add plasmaview/PlasmaViewConfig.cmake.in 2013-09-10 20:40:16 +02:00
Giorgos Tsiapaliokas
0567075f9c add plasmaview/CMakeLists.txt 2013-09-10 20:39:33 +02:00
Giorgos Tsiapaliokas
ba5a92a132 add the plasmaview subdir 2013-09-10 20:39:27 +02:00
Giorgos Tsiapaliokas
caa2d738fa make use of the plasmaview 2013-09-10 20:39:15 +02:00
Giorgos Tsiapaliokas
9e4e6e2444 shell/containmentconfigview.cpp -> plasmaview/containmentconfigview.cpp 
shell/containmentconfigview.h -> plasmaview/containmentconfigview.h
shell/currentcontainmentactionsmodel.cpp -> plasmaview/currentcontainmentactionsmodel_p.cpp
shell/currentcontainmentactionsmodel.h -> plasmaview/currentcontainmentactionsmodel_p.h
shell/view.cpp -> plasmaview/view.cpp
shell/view.h -> plasmaview/view.h
 2013-09-10 20:39:10 +02:00
Marco Martin
33dae6b18c support for setting a wallpaper trough drag and drop 2013-09-10 17:57:51 +02:00
Marco Martin
d101966f91 use a dynamic property 
so qml doesn't see it
 2013-09-10 16:38:16 +02:00
Marco Martin
52c3a27e18 support for wallpaper actions 2013-09-10 15:51:22 +02:00
Marco Martin
6f8c32fad7 Revert "add kdeqt5staging dependency" 
This reverts commit 6c27cc0963.
 2013-09-10 13:23:57 +02:00
Marco Martin
bfbeae9969 propagate containmentTypeChanged 2013-09-10 12:43:25 +02:00
Marco Martin
6bbc8cb420 propagate drawWallpaperChanged 2013-09-10 12:38:41 +02:00
Marco Martin
e5b2907b53 documentation in ContainmentInterface 2013-09-10 12:25:37 +02:00
Marco Martin
6c27cc0963 add kdeqt5staging dependency 2013-09-10 12:04:26 +02:00
Marco Martin
075395e6d1 more documentation 2013-09-10 11:58:55 +02:00
Marco Martin
bde39854d3 remove unused method 2013-09-10 11:48:34 +02:00
Marco Martin
27c9c859ef documentation++ 2013-09-10 11:45:02 +02:00
Wojciech Kapuscinski
ea835ccdb1 remove all links to kdeqt5staging 
QCommandLineParser is now in qt5

REVIEW: 112558
 2013-09-10 10:13:05 +02:00
Martin Gräßlin
97ce3dc808 Rework finding of XCB 
Uses the new components syntax of FindXCB. So far plasma frameworks
only need the XCB component and that one is optional just like XLib.

The find xcb is moved to the toplevel CMakeLists.txt together with
the find x11 and HAVE_X11 gets set only if both X11 and XCB are found.

REVIEW: 112499
 2013-09-09 06:14:35 +02:00