Stephen Kelly
4e581398e6
Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
...
Conflicts:
CMakeLists.txt
kdeui/kernel/kglobalsettings.cpp
kdeui/widgets/kmessagewidget.cpp
nepomuk/core/nepomukmainmodel.cpp
nepomuk/core/resourcedata.cpp
nepomuk/core/resourcewatcher.cpp
solid/solid/backends/fstab/fstabstorageaccess.cpp
solid/solid/backends/wmi/wmicdrom.cpp
solid/solid/backends/wmi/wmidevice.cpp
solid/solid/backends/wmi/wmimanager.cpp
solid/solid/backends/wmi/wmistorage.cpp
solid/solid/backends/wmi/wmistorageaccess.cpp
solid/solid/backends/wmi/wmivolume.cpp
2012-05-06 23:21:17 +02:00
Aaron Seigo
ab24ad4a6c
if we failed to get the appletdescription, then try to get the pluginName from the existing config
2012-04-30 13:09:51 +02:00
David Faure
af211f7c93
KIcon("foo") -> KDE::icon("foo")
...
include kicon.h -> kiconloader.h, or often, nothing at all.
2012-04-28 13:17:42 +02:00
Claus Christensen
658fad620a
Replaced KGlobal::config() by KSharedConfig::openConfig()
...
Remodified: kded/kdedadaptor.cpp
2012-03-24 19:33:54 +01:00
Marco Martin
2a909445bd
completely separe appletprivate
...
will be easier then to split with the qgraphicsview version
2012-02-20 16:38:00 +01:00
David Faure
083d157684
Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
...
Conflicts:
kdecore/network/k3datagramsocket.cpp
kdeui/actions/kstandardaction.cpp
kdeui/dialogs/kconfigdialogmanager.cpp
kdeui/icons/kicondialog.cpp
kdeui/itemviews/kviewstatesaver.h
kfile/knewfilemenu.cpp
kio/misc/kpac/downloader.cpp
kio/tests/kdirlistertest.cpp
kparts/browserextension.cpp
nepomuk/core/nepomukmainmodel.cpp
nepomuk/query/queryserviceclient.cpp
nepomuk/test/ratingpaintertestwidget.cpp
nepomuk/ui/kedittagsdialog.cpp
nepomuk/ui/ktagcloudwidget.cpp
nepomuk/ui/ktagdisplaywidget.cpp
nepomuk/ui/nepomukmassupdatejob.cpp
nepomuk/ui/tagwidget.cpp
nepomuk/utils/daterangeselectionwidget.cpp
nepomuk/utils/facetwidget.cpp
nepomuk/utils/searchwidget.cpp
plasma/containment.cpp
plasma/datacontainer.cpp
plasma/deprecated/animator.cpp
plasma/extenders/extender.cpp
plasma/plasma.h
plasma/scripting/wallpaperscript.cpp
tier1/solid/tests/networkingclient.cpp
(signal/slot normalization changes conflicted with KUrl->QUrl changes
and with other changes in frameworks)
2012-02-14 12:32:25 +01:00
Dawit Alemayehu
fb0b49af8c
Normalize all signal/slot connections.
...
REVIEW: 103728
2012-02-13 14:27:21 -05:00
David Faure
9057ce0c70
Fix compilation with the new cmake automoc stuff.
2012-02-08 23:34:07 +01:00
Stephen Kelly
8d37df4b8f
Remove moc includes that can be omitted.
...
Mostly these are "<name>.moc" style includes which are incorrect
compared to qmake and cmake automoc behaviour.
2012-01-31 22:44:36 +01:00
David Faure
6a01732860
Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
...
Conflicts:
CMakeLists.txt [version number]
kdecore/tests/kcharsetstest.cpp [deleted]
2012-01-13 11:29:36 +01:00
Aaron Seigo
c1a29b107f
only check for remote settings if we generated the dialog ourselves
2012-01-11 14:05:21 +01:00
David Faure
c7ab521ee7
Merge remote-tracking branch 'origin/KDE/4.7' into origin-frameworks
...
Conflicts:
experimental/libkactivities/
plasma/applet.h
plasma/theme.cpp
staging/libkcoreaddons/src/jobs/kjob.cpp
2011-12-08 19:06:24 +01:00
Aaron Seigo
5190b061d1
don't show help button; not appropriate from widget settings
...
BUG:254835
2011-12-06 22:55:57 +01:00
Aaron Seigo
6dd71f8120
configGroup(QString) is redundant with config()
2011-12-06 17:46:32 +01:00
Aaron Seigo
3f7859b557
if the shortcut hasn't changed, don't try and update it
2011-12-06 17:37:54 +01:00
Aaron Seigo
abd1d9ddba
make shortcuts and sharing settings enable Apply; use a QWeakPointer forthe shortcuts widget
2011-12-06 17:36:39 +01:00
Aaron Seigo
57f9668bd1
config changed is not only called by config dialogs anymore, so more the script forwarding into the public API implementation
2011-12-05 00:16:53 +01:00
Aaron Seigo
b556753ecd
constrained square makes sense for vertical but not horizontal panels
...
BUG:282706
2011-12-02 21:53:07 +01:00
Aaron Seigo
c546b3d47d
set the parent of the config skeleton object to be the dialog
...
BUG:287324
2011-12-02 21:49:24 +01:00
Aaron Seigo
e0cd24f83a
constrained square makes sense for vertical but not horizontal panels
...
BUG:282706
2011-12-02 17:30:59 +01:00
Aaron Seigo
ed31f2aaee
set the parent of the config skeleton object to be the dialog
...
BUG:287324
2011-12-01 17:13:30 +01:00
Aaron Seigo
90b02f3973
massive step towards QGraphicsView being separated from libplasma
...
* remove extenders (never panned out, used by exactly two components that we can find .. anywhere)
* move animations to libplasmagqv
* schedule js anims to be put into the js scriptengine
* move all QGraphicsProxyWidgets, except for IconWidget which is still used by PopupApplet, into libplasmaqgv
* create a subclass-able private class for Applet
TODO: move out icon widget, address FIXMES in graphicswidgetappletprivate.cpp and decide how to register the "right" private class for instantiation in Applet ctors
2011-11-17 14:43:37 +01:00
David Faure
bdf1f5c2dc
Merge remote-tracking branch 'origin/KDE/4.7' into origin-frameworks
...
Conflicts:
tier1/libkcoreaddons/src/io/kdirwatch.cpp
2011-11-16 14:44:08 +01:00
Aaron Seigo
67651e12bb
git rid of the shortcuts dialog on reduced functionality builds
2011-11-14 21:20:18 +01:00
David Faure
e2d14f15d1
Merge remote branch 'origin/KDE/4.7' into origin-frameworks
...
Conflicts:
kdeui/kernel/kglobalsettings.cpp
plasma/CMakeLists.txt
2011-11-03 20:40:26 +01:00
Aaron Seigo
f38425761a
a missing include
2011-11-03 12:15:52 +01:00
Aaron Seigo
9a4825380f
improve loading of system kcms
...
* don't use libkutils on reduced footprint profile builds
* load the kcms even if there isn't a configLoader for the package
2011-11-02 17:24:25 +01:00
Marco Martin
02eeddf931
correct type dekstop->desktop
...
please test before committing ;)
CCMAIL:viranch.mehta@gmail.com
2011-11-01 20:33:13 +01:00
Viranch Mehta
6c19c0b3c4
Aaron's patch for loading system KCMs in scripted plasmoids config dialog by specifying them in the plasmoid's .desktop file
2011-10-31 22:24:39 +05:30
Aaron Seigo
ca320eb0d4
clarity in variable naming
2011-08-17 13:12:45 +02:00
Aaron Seigo
82eee5c3b7
avoid compiling in debug strings when compiled without debug
2011-07-29 15:46:52 +02:00
Aaron Seigo
bd10c7175e
Merge remote-tracking branch 'origin/master' into libplasma2
...
Conflicts:
plasma/containment.cpp
plasma/package.cpp
plasma/packagestructure.cpp
plasma/private/package_p.h
plasma/scripting/scriptengine.cpp
2011-07-21 15:31:07 +02:00
Aaron Seigo
35898d57f1
get rid of all Class:load(..) methods, use PluginLoader directrly. --apiBloat;
2011-07-19 22:04:22 +02:00
Aaron Seigo
e40bb1bcdd
adapt to changes in PackageStructure api
2011-07-19 21:53:03 +02:00
Aaron Seigo
3fc19683fa
remove the event filter if we're a containment, don't return too early from the filter
2011-07-19 09:39:01 +02:00
Aaron Seigo
d65132f92f
don't remove the applet itself from the scenevent filter when deregistering as a drag handle
...
the event filter is also used for things like the applet handle
2011-07-19 09:39:01 +02:00
Aaron Seigo
b35d410deb
remove the event filter if we're a containment, don't return too early from the filter
2011-07-19 09:38:44 +02:00
Aaron Seigo
239b5a5d10
don't remove the applet itself from the scenevent filter when deregistering as a drag handle
...
the event filter is also used for things like the applet handle
2011-07-19 09:38:44 +02:00
Aaron Seigo
4b3b687088
no longer provide access to the package from the class, let Package do that; adapt to Package merge
2011-07-15 12:59:51 +02:00
Aaron Seigo
db0e72bf77
don't use Package for isPublished
2011-07-13 20:07:19 +02:00
Aaron Seigo
53085973b3
don't use Package for unpublishing
2011-07-13 20:05:56 +02:00
Aaron Seigo
d83433557e
stop relying on Package for Plasmoid publishing help
2011-07-13 20:04:13 +02:00
Aaron Seigo
bf17cc308a
move BackgroundHints to Plasma::, make it a plain enum
2011-06-24 16:35:09 +02:00
Aaron Seigo
49e64279f3
remove this no-longer-relevant FIXME
2011-06-03 11:16:51 +02:00
Aaron Seigo
c19238fdab
much more straightforward way of publishing
2011-05-31 01:02:08 +02:00
Aaron Seigo
acbe5b960e
const consistency in setupScript
2011-05-31 00:12:57 +02:00
Aaron Seigo
2b771e41ed
remove another usage of PackageMetadata
2011-05-31 00:06:12 +02:00
Aaron Seigo
b01348aa84
rely on AppletPrivate::remoteLocation (removing the need for PackageMetadata) and make it a proper KUrl
2011-05-31 00:04:03 +02:00
Aaron Seigo
cd32321b68
Merge branch 'libplasma2_signedpackages' into libplasma2
...
Conflicts:
plasma/package.cpp
2011-05-30 23:41:53 +02:00
Aaron Seigo
a4dbbf60ea
remove some empty reimplemented methods
2011-05-28 00:33:12 +02:00