Commit Graph

7288 Commits

Author SHA1 Message Date
Aaron Seigo
f8d94a98b8 use a hash instead of a map: the sorting was irrelevant and the API that uses this was ported to hashes as well 2011-09-19 11:27:54 +02:00
David Faure
00b0cc8085 oops, git rm didn't do what I thought during merge-conflict-resolving 2011-09-18 14:01:03 +02:00
David Faure
9cc86d27af Merge remote branch 'origin/KDE/4.7' into origin-frameworks
Conflicts:
	plasma/packagestructure.cpp (discarded the 4.7 patch)
	tier1/solid/solid/backends/wmi/wmidevice.cpp (Q_FOREACH)
2011-09-18 13:55:17 +02:00
Marco Martin
21d9d07e0b remove the static hash of packagestructure
unfortunately they are stateful with a state per-package, so sharing them leads to an incorrect state
2011-09-15 23:48:52 +02:00
Stephen Kelly
94e661c307 Only build plasma if kdepimlibs is found.
Plasma uses gpgme++ from there, which will be split out eventually.
2011-09-15 17:16:43 +02:00
Romain Perier
13c87efb26 Move kauth to tier1/libkauth (reviewed by dfaure) 2011-09-09 19:08:47 +02:00
Mario Bensi
21a64f4a57 Remove warning on deprecated KFilter::device* 2011-09-09 08:59:19 +02:00
Stephen Kelly
3a7a425344 Remove the exports targets from libraries in frameworks.
If there is no kdelibs, there is no kdelibs exports. This fixes some
cmake errors resulting from making it possible to build itemmodels
standalone.
2011-09-04 21:45:19 +02:00
Valentin Rusu
41299661c2 Merge branch 'master' of ../tmp/ksecretservice into ksecretsservice 2011-09-04 13:13:37 +02:00
Valentin Rusu
ed0b414450 Merge ../ksecretservice into ksecretsservice 2011-09-04 11:08:06 +02:00
David Faure
55240b8f31 Must include config-plasma.h *before* the #ifndefs... 2011-09-02 10:50:04 +02:00
David Faure
24bd3d69eb Merge remote branch 'origin/KDE/4.7' into origin-frameworks 2011-09-02 10:08:03 +02:00
Aaron Seigo
423ce0c356 don't emit addSource for a source being added in a sourceRequest event until the event is over 2011-09-01 19:07:22 +02:00
Aaron Seigo
9450a41618 Merge remote-tracking branch 'origin/KDE/4.7' into frameworks
Conflicts:
	plasma/package.cpp
	plasma/packagestructure.cpp
	plasma/private/package_p.h
	plasma/scripting/scriptengine.cpp
2011-09-01 18:23:09 +02:00
David Faure
f4f93336b6 include path fix (this will be simpler once fully separated...) 2011-08-31 18:17:11 +02:00
David Faure
4bb1ea7744 More include paths
Running grep would have been a good idea ;-)
2011-08-31 18:07:04 +02:00
Marco Martin
d09397673e correctly concatenate the path.
package is valid again (and passes plasmoidpackagetest)
2011-08-31 12:53:09 +02:00
Marco Martin
0e13cdcdf2 use plsmoidpackage for generic packages too 2011-08-31 12:53:09 +02:00
Marco Martin
37ac5105ab fix resolution of paths w/ only a packageRoot+name 2011-08-31 12:53:09 +02:00
Marco Martin
7e50fe0f40 a new PackageStructure type: GenericComponent
this component will be used for loading generic repositories of files,
usually will be repositories of QML files
2011-08-31 12:53:09 +02:00
David Faure
fe86c5ad35 Merge remote branch 'origin/KDE/4.7' into origin-frameworks 2011-08-30 12:09:06 +02:00
Sebastian Kügler
98da6feb68 focusChanged(bool) signal for LineEdit
(cherry picked from commit 5de5a43e00e2ff285492b5f7fb095f85c2cd9fd8)
2011-08-29 21:40:07 +02:00
Sebastian Kügler
98cb6e0a83 focusChanged(bool) signal for LineEdit 2011-08-29 21:09:08 +02:00
Chusslove Illich (Часлав Илић)
2c9d3c0a0e i18n: Contexts. 2011-08-28 10:38:09 +02:00
Alex Fiestas
9c4e522f8f Merge branch 'KDE/4.7' into frameworks 2011-08-27 18:43:04 +02:00
Stephen Kelly
6860d7fbbf Remove usage of macro_optional_find_package.
It is obsolete with CMake 2.8.6 which provides options to disable finding packages.
2011-08-27 18:19:37 +02:00
Script Kiddy
02338c2bca SVN_SILENT made messages (.desktop file) 2011-08-27 14:44:08 +02:00
Sebastian Sauer
e61e8be9ec compile++ 2011-08-26 15:00:57 +02:00
Stephen Kelly
e23c2dfbd6 Merge remote-tracking branch 'origin/KDE/4.7' into frameworks
Conflicts:
	CMakeLists.txt
	cmake/modules/FindNepomuk.cmake
	kdecore/tests/kstandarddirstest.cpp
	kdeui/util/kkeyserver.h
	kio/kio/accessmanagerreply_p.h
	kio/kio/hostinfo.cpp
	plasma/containment.cpp
	plasma/data/services/plasma.protocol
	plasma/popupapplet.cpp
	plasma/tooltipcontent.h
	plasma/widgets/videowidget.h
2011-08-25 19:43:08 +02:00
Aaron Seigo
79ad385f41 give applets with no qwidget or graphicswidget a chance to do something 2011-08-25 17:35:07 +02:00
Script Kiddy
cd912280a0 SVN_SILENT made messages (.desktop file) 2011-08-25 14:16:14 +02:00
Marco Martin
2212629e18 support minimumSize
if the root object has a minimumSize set, set it as minimum size for the declarative widget, and keep it in sync
2011-08-20 17:35:30 +02:00
Marco Martin
c12af537e4 support minimumSize
if the root object has a minimumSize set, set it as minimum size for the declarative widget, and keep it in sync
2011-08-20 17:34:36 +02:00
Aaron Seigo
db97a9b6cb add missing smallest font support for qml and js widgets 2011-08-17 18:08:00 +02:00
Aaron Seigo
ca320eb0d4 clarity in variable naming 2011-08-17 13:12:45 +02:00
Aaron Seigo
d82144b609 small change that makes a huge visible difference
also removes the unneeded ternary op given the above if()
2011-08-16 16:26:24 +02:00
Aaron Seigo
6df8dc58dc small change that makes a huge visible difference
also removes the unneeded ternary op given the above if()
2011-08-16 16:22:16 +02:00
Aaron Seigo
ee57550909 really don't show when there is no content 2011-08-16 14:57:36 +02:00
Aaron Seigo
78cfff2f3c if there are no widgets, don't create a dialog 2011-08-16 14:57:36 +02:00
Aaron Seigo
7cf7bea6c2 really don't show when there is no content 2011-08-16 14:57:15 +02:00
Aaron Seigo
4999f427dd if there are no widgets, don't create a dialog 2011-08-16 14:57:14 +02:00
Mario Bensi
a461ade68c Build fix 2011-08-14 19:02:25 +02:00
Marco Martin
d9b8860784 ensure the frame is resized 2011-08-13 18:46:10 +02:00
Marco Martin
b4c5e52c0f ensure the frame is resized 2011-08-12 16:06:09 +02:00
Marco Martin
33e9192346 Merge branch 'libplasma2' into frameworks
Conflicts:
	plasma/CMakeLists.txt
	plasma/popupapplet.cpp
2011-08-12 11:45:49 +02:00
David Faure
1dad38f08c fix build 2011-08-11 01:35:19 +02:00
Mario Bensi
19ee3c1a56 Build fix
Add karchive missing include
2011-08-11 01:28:13 +02:00
Aaron Seigo
f285745318 make extender applets freel resize 2011-08-11 00:15:05 +02:00
Mario Bensi
ad67c6ed92 Move KArchive in a library
Move the base class for the view state maintenance to the karchive
library.
2011-08-10 00:42:28 +02:00
Aaron Seigo
858abd8243 allow popups to be freely resized when they aren't the applet 2011-08-08 14:48:57 +02:00