Kevin Ottens
cf98377101
Remove unused include
2013-01-03 08:55:29 +01:00
Kevin Ottens
7676a7142c
Port away from KDialog to unbreak the build
...
I couldn't reach this code before from the Qt4 build, sorry for the
temporary breakage.
2013-01-03 08:54:16 +01:00
Christophe Giboudeaux
6a3903262c
Merge branch 'master' into frameworks
...
Conflicts:
CMakeLists.txt
dnssd/CMakeLists.txt
kdecore/CMakeLists.txt
kdecore/auth/ConfigureChecks.cmake
kdecore/compression/ConfigureChecks.cmake
kdeui/tests/proxymodeltestsuite/CMakeLists.txt
kimgio/CMakeLists.txt
kioslave/http/CMakeLists.txt
kioslave/http/http.cpp
kjs/CMakeLists.txt
mimetypes/CMakeLists.txt
plasma/popupapplet.cpp
plasma/private/dialogshadows.cpp
plasma/tooltipmanager.cpp
solid/solid/CMakeLists.txt
sonnet/plugins/CMakeLists.txt
2012-12-31 15:39:47 +01:00
David Faure
72b848ede7
Fix compilation after recent header changes
2012-12-29 01:36:40 +01:00
Marco Martin
8db20e64c7
consider also declarative items for parentSize
...
this fixes applets collapse in the new qml systray
2012-12-28 18:45:37 +01:00
David Faure
cb466490b0
Fix compilation with Qt5
2012-12-27 11:25:00 +01:00
Weng Xuetian
cc24f1839a
fix tooltip shadow problem.
...
avoid confusations between the deleted window size and the "dirty" area.
BUG: 311502
REVIEW: 107905
2012-12-26 11:28:35 -05:00
Till Adam
4a2ed6f47e
Fix the non-x11 build.
2012-12-24 17:03:09 +01:00
David Faure
d40a5bbcdd
Merge remote-tracking branch 'origin/master' into frameworks
...
Conflicts:
interfaces/ktexteditor/kcm_ktexteditor.desktop [and other desktop files, gone]
kdecore/tests/kmimeglobsfileparsertest.cpp [gone]
kdecore/tests/kprocesstest.cpp [already fixed here]
kio/tests/krununittest.cpp [already fixed here]
solid/solid/backends/udisks2/udisksdevicebackend.cpp [doesn't exist here]
staging/kservice/autotests/ksycocathreadtest.cp [already fixed here]
staging/kwidgets/tests/kmessageboxtest.cpp [no such ",0" argument here]
2012-12-24 10:44:28 +01:00
Script Kiddy
5fb13bf6a3
SVN_SILENT made messages (.desktop file)
2012-12-24 09:00:41 +01:00
David Faure
9d7aedfcd4
Fix test for the case where the plasma src dir contains a symlink
2012-12-23 21:23:44 +01:00
Script Kiddy
94cc720c8e
SVN_SILENT made messages (.desktop file)
2012-12-23 07:56:22 +01:00
David Faure
026c185eb1
Actually with Qt5, we're back to the initial kde4 behavior here...
...
I submitted https://codereview.qt-project.org/43518 though, to fix it.
2012-12-21 19:08:00 +01:00
Marco Martin
97817f0474
close the connection as soon the app is closing
...
if the connection is closing on thread deletion, the sql plugin is already unloaded, resulting in a crash
2012-12-21 18:56:00 +01:00
Aaron Seigo
f5cc98dc8a
make all containment delayed init
...
allows us to remove another method from the public API
2012-12-20 10:48:33 +01:00
Aaron Seigo
f413d7c388
build
2012-12-20 10:48:33 +01:00
Sebastian Kügler
dbcc7edb37
Add Qt5Quick and Qt5Qml CMake foo for testshell
2012-12-19 20:11:04 +01:00
Sebastian Kügler
246d9a7eac
use lowercase headers, we\'re in kdelibs now
2012-12-19 19:40:33 +01:00
Marco Martin
627ff32f44
add a barebone shell executable
...
used to test painting and containment loading
2012-12-19 15:45:08 +01:00
Marco Martin
5cb3712bc6
containments children of corona
...
so Containment::corona() works again
2012-12-19 15:45:08 +01:00
David Faure
643df96f63
Port away from qtest_kde.h (and from ~/.kde-unit-test)
...
Fix missing mkpath before creating sqlite db.
2012-12-18 12:18:08 +01:00
David Faure
eb992ce047
Merge remote-tracking branch 'origin/KDE/4.10' into frameworks
...
"4e03e90 - (origin/KDE/4.10) Use non-deprecated types and methods"
(rerunning the perl scripts rather than solving every conflict by hand)
2012-12-13 13:23:44 +01:00
David Faure
806f2c887c
Merge commit '163b64072778fc5289f53a0502c0a5e2ed930a03' into frameworks
...
Conflicts:
kioslave/http/http.cpp
plasma/pluginloader.cpp
2012-12-13 13:10:36 +01:00
David Faure
c8734602b8
Use non-deprecated types and methods:
...
WFlags -> WindowFlags (it's a typedef, and it's BC, nm says QFlags<Qt::WindowType>)
toAscii -> toLatin1
fromAscii -> fromLatin1
as suggested by Treeve Jelbert on kde-frameworks-devel
2012-12-13 11:58:53 +01:00
Aurélien Gâteau
aaa7ea1580
Not being able to load an applet is worth a kWarning()
...
Especially since the error message is not exposed anywhere else.
2012-12-11 16:50:12 +01:00
Sebastian Kügler
ed54091b61
fix build of tests
2012-12-09 14:33:24 +01:00
Sebastian Kügler
e0fe19e5fb
Implementation for async non-static package installation
2012-12-09 14:16:25 +01:00
Sebastian Kügler
8b6a248033
Package install and uninstall are now non-static async
...
Installation and uninstallation of packages is now done in an instance
of the package. The methods return a KJob* which can be used to track
progress and result. The real work is done in a thread in order to make
it possible to not block the UI.
2012-12-09 14:12:55 +01:00
David Faure
eaa9afe7e6
Merge remote-tracking branch 'origin/KDE/4.10' into origin-frameworks
...
Conflicts:
kdeui/colors/kcolorbutton.cpp [ported to QColorDialog, let's hope it handle double-click...]
kdeui/xmlgui/kxmlguiclient.cpp
kio/kio/kprotocolmanager.cpp [reverted...]
kioslave/file/file_unix.cpp [minor]
plasma/dialog.cpp [gone -> changes ignored]
plasma/tooltipmanager.cpp [gone -> changes ignored]
2012-12-07 16:04:32 +01:00
Marco Martin
d113473c2d
don't look for kdewebkit
...
get rid of dialogshadows
2012-12-07 14:45:40 +01:00
Aaron Seigo
f0ccabbc42
remove the windows when we know they can be removed
...
the destroyed() connection in shadows is really just a failsafe
2012-12-03 16:57:48 +01:00
David Faure
83ef1a3a3b
Remove unused QX11Info includes
2012-12-02 13:06:32 +01:00
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
Kevin Ottens
c9da84f2cd
Moving KLocalizedString and friends in a ki18n framework
...
The KTranscript plugin is for now shipped with the framework, but it'll
move with the integration plugin.
2012-11-28 17:14:13 +01:00
Aurélien Gâteau
2a72e7efad
Merge remote-tracking branch 'origin/KDE/4.9' into KDE/4.10
2012-11-26 18:15:23 +01:00
David Faure
bb64955b1c
Oops, the "cache" resource is actually GenericCacheLocation
...
Fix porting docu and already ported code.
2012-11-23 23:38:38 +01:00
David Faure
c28900a1c0
Port EffectWatcher to QAbstractNativeEventFilter
2012-11-23 23:38:38 +01:00
Marco Martin
b0bae5596c
Application FormFactor
2012-11-23 17:07:48 +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
Jan Grulich
ad15739641
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:45:22 +01:00
Marco Martin
8b313a1b79
ignore own events
...
only steal events of objects that are explicitely filtered
fixes the handle when is under the shadow
2012-11-22 18:58:17 +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
Aaron Seigo
f297f1fee6
if the *target* is 2x the size of the popup, then left align
2012-11-19 15:19:09 +01:00
Aaron Seigo
a265864a30
note properties that are constant
2012-11-19 13:31:14 +01:00
Marco Martin
3a307ee465
if popup is more than double icon, center align
...
in vertical panels, align center when the popup height is > than double the icon height
otherwise, center when is more then icon width
2012-11-19 10:57:54 +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