alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,522 Commits 1 Branch 0 Tags 40 MiB
d9b054b3bc
Commit Graph

1140 Commits

Author SHA1 Message Date
David Faure
d9b054b3bc Fix build after bad merge, by restoring these files to their frameworks version. 
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
 2012-12-01 10:11:55 +01:00
David Faure
bdb7251250 Merge remote-tracking branch 'origin/KDE/4.10' into frameworks 
Conflicts:
	CMakeLists.txt [version]
	README [version]
	cmake/modules/CMakeLists.txt
	cmake/modules/FindKDE4Internal.cmake
	cmake/modules/FindNepomuk.cmake [git replaying an old conflict!]
	cmake/modules/KDE4Macros.cmake [automoc4 stuff, reverted]
	interfaces/ktexteditor/* [moved out]
	kdecore/services/kmimetype.cpp [hand-merged into kio/global.cpp]
	kdeui/util/kkeyserver.h
	kdeui/widgets/ktextedit.cpp
	kdewebkit/kwebwallet.cpp
	khtml/misc/enum.h [git got confused, me thinks]
	kio/kio/accessmanager.cpp
	kio/kio/hostinfo.cpp
	kio/kio/kprotocolmanager.cpp
	kio/kio/kprotocolmanager.h
	kioslave/http/http.cpp
	kioslave/http/http.h
	kioslave/http/tests/CMakeLists.txt
	kioslave/http/tests/httpheaderdispositiontest.cpp
	nepomuk/core/* [moved out]
	plasma/CMakeLists.txt
	plasma/applet.cpp
	plasma/applet.h
	plasma/dialog.cpp
	plasma/packagestructure.cpp
	plasma/popupapplet.cpp
	plasma/private/applethandle.cpp
	plasma/private/packages.cpp
	plasma/private/tooltip.cpp
	plasma/tooltipmanager.cpp
	plasma/widgets/videowidget.h
	staging/ki18n/src/klocalizedstring.cpp
	staging/kservice/autotests/kservicetest.cpp
	staging/kwidgets/src/utils/kglobalsettings.cpp
	tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.cpp
	tier1/solid/src/solid/backends/upower/upoweracadapter.cpp
	tier1/solid/src/solid/backends/upower/upowerbattery.cpp
 2012-12-01 00:57:38 +01:00
David Faure
c28900a1c0 Port EffectWatcher to QAbstractNativeEventFilter 2012-11-23 23:38:38 +01:00
Jan Grulich
6a16643bf3 Delete download dialog when it is closed 
When dialog is not deleted and you open it again, dialog is not re-downloaded

REVIEW:107413
 2012-11-23 12:53:33 +01:00
Marco Martin
d332669af8 call ChangeableMainScriptPackage::initPackage() 
call parent method in subclass this fixes packagestructuretest
 2012-11-21 18:10:51 +01:00
Marco Martin
9ad97e680a remove wallpaper files 2012-11-21 15:30:50 +01:00
Marco Martin
e15217f645 remove dependencies from WallPaper 2012-11-21 15:30:50 +01:00
Chusslove Illich (Часлав Илић)
d60e4e5a4a ki18n framework split out of kdecore. 2012-11-18 20:26:13 +01:00
Marco Martin
b5eacc597d dialogshadows belongs to tooltipmanager 
tooltips are created/destroyed too often, this saves same deletions and recreations
 2012-11-16 16:08:46 +01:00
Marco Martin
fef6c3b7f5 less debug, element prefix in ctor 2012-11-16 16:08:46 +01:00
Marco Martin
110561fae7 send smaller pixmaps for disabled borders 2012-11-16 16:08:46 +01:00
Marco Martin
8683a0c52c use kwin for dialog shadows if possible 
if the dialog svg has a separate element for shadows, use those and tell kwin to draw them
same method already used for panels
 2012-11-16 16:08:45 +01:00
Aaron Seigo
471e1b82f5 remove unused 2012-11-14 11:36:01 +01:00
Aaron Seigo
6662b81c58 get rid of ContainmentActions::isInitialized() 2012-11-09 18:55:23 +01:00
Marco Martin
b8ebd78cbc remove geometry functions from Applet 
size, size hints, transform and zValue
 2012-11-09 16:45:03 +01:00
Marco Martin
b828bcb578 remove acceptDrops/setAcceptDrops() 2012-11-09 16:12:05 +01:00
Marco Martin
1021ecf18f get rid of appletAt() 
still two uses commented out in conteinmentactions
 2012-11-09 15:46:12 +01:00
Marco Martin
798fc9271b remove AppletPrivate::selectItemToDestroy() 2012-11-09 15:20:42 +01:00
Aaron Seigo
8b72b0b3ef provide a containment package specialization 
this will allow containments to have a different qml file
 2012-11-09 14:07:34 +01:00
Marco Martin
81d2a33a0f remove classes that weren't built anymore 
PopupApplet
Dialog
ToolTip
ToolTipManager
ToolTipContent
 2012-11-09 14:00:01 +01:00
Marco Martin
4e08835046 build fix 2012-11-09 00:20:31 +01:00
Marco Martin
8e89ac742c Merge branch 'mart/qgvremoval2' into frameworks 2012-11-09 00:05:05 +01:00
Marco Martin
b270378122 add missing corona_p 2012-11-08 18:35:22 +01:00
Marco Martin
5323882c89 migrate some other events from qgraphicsevents 2012-11-08 18:34:17 +01:00
Marco Martin
fde2925c34 replace some qgraphics events with normal ones 2012-11-08 18:34:08 +01:00
Marco Martin
e463c4af4f QGraphicsSceneDropEvent -> QDropEvent 2012-11-08 18:33:56 +01:00
Marco Martin
f58711521e remove last dependencies of abstracttoolbox 2012-11-08 18:33:45 +01:00
Marco Martin
743c0f44a8 remove unused file 2012-11-08 18:33:32 +01:00
Marco Martin
1d520ac557 kill applet handles and some animations stuff 2012-11-08 18:28:37 +01:00
Marco Martin
390ec09558 get rid of mapfromview/maptoview 2012-11-08 18:24:25 +01:00
Marco Martin
3a8db22059 get rid of the background, we need only hints 2012-11-08 18:24:14 +01:00
Marco Martin
93bb58a9f3 get rid of handles 2012-11-08 18:23:55 +01:00
Marco Martin
16ee068aba coronabase becomes corona 
correctly build all files currently included in libplasma (some will
have to be enabled again)
 2012-11-08 18:23:36 +01:00
Marco Martin
64fde089f2 correctly build applet and containment 2012-11-08 18:23:28 +01:00
Marco Martin
cc21f6fcfe applet doesn't inherit from QGraphicsWidget 2012-11-08 18:23:00 +01:00
Aaron Seigo
4f3a52cec2 support setting a custom name from applets (e.g. a timezone for a clock ;) 2012-11-08 11:21:08 +01:00
Marco Martin
e74f60745a revert 1d167ffa8fe1e79aec2f7b94b78e6910fb7a42bf 2012-11-06 00:32:22 +01:00
David Faure
2857183e22 Merge remote-tracking branch 'origin/KDE/4.10' 2012-11-02 14:26:38 +01:00
Aaron Seigo
09cf013164 prepend platformcontents to prefixes 2012-10-31 16:02:23 +01:00
Aaron Seigo
259c155c9b prepend "platformcontents" as per the plan 2012-10-31 15:59:01 +01:00
Aaron Seigo
5f22041391 fix build of libplasma merged from 4.10 branch into frameworks 2012-10-31 12:19:38 +01:00
Christoph Feck
03a88c40c0 SVN_SILENT removed 2012-10-31 12:17:19 +01:00
Aaron Seigo
f024af5de1 use KDeclarative to determine the platform paths 2012-10-31 12:16:21 +01:00
Aaron Seigo
70e4734eda use KDeclarative to determine the platform paths 2012-10-30 21:32:01 +01:00
David Faure
3e623699ce Merge remote-tracking branch 'origin/KDE/4.10' into frameworks 
Conflicts:
	kdecore/services/kmimeglobsfileparser.cpp [whole file is gone]
	kdecore/sycoca/kprotocolinfo.cpp [rewritten in kio; hand-merged]
	kdeui/widgets/kmainwindow.cpp [geometry handling, code is gone]
	kfile/kfileplacesitem.cpp
	kio/kio/kfileitem.cpp [tons of kurl/qmimetype differences for the big if(!d) patch]
	kio/tests/kfileitemtest.cpp [kurl]
	plasma/private/applethandle.cpp [namespace]
	plasma/runnermanager.cpp
	staging/kservice/src/services/kservicetypetrader.h [i18n]
 2012-10-30 19:53:28 +01:00
David Faure
d38be6f572 Merge remote-tracking branch 'origin/KDE/4.10' 2012-10-30 17:00:29 +01:00
Aaron Seigo
d1140aca7d remove a number of unused variables 2012-10-25 21:17:01 +02:00
Christoph Feck
3f1e310891 Merge branch 'KDE/4.9' into KDE/4.10 2012-10-25 04:27:27 +02:00
Jon Severinsson
a6bcd52059 plasma: QPixmap platform integration has changed in Qt5, disable it for now. 
This essentially makes WindowShadows a no-op, but it is better than not compiling...

REVIEW: 106989
 2012-10-23 14:10:01 +02:00
Marco Martin
c91905047b check for applet 2012-10-22 16:39:32 +02:00