Martin Gräßlin
969e6b85e7
Merge branch 'master' into frameworks-scratch
...
Conflicts:
CMakeLists.txt
kwin/client.cpp
kwin/effects/highlightwindow/highlightwindow.cpp
kwin/libkwineffects/kwingltexture.cpp
kwin/libkwineffects/kwinxrenderutils.cpp
kwin/scene_opengl.cpp
kwin/workspace.cpp
plasma/desktop/applets/kickoff/CMakeLists.txt
plasma/desktop/applets/taskmanager/package/contents/code/tools.js
plasma/desktop/applets/taskmanager/package/contents/ui/Task.qml
plasma/desktop/applets/taskmanager/package/contents/ui/main.qml
plasma/desktop/applets/taskmanager/package/metadata.desktop
plasma/desktop/applets/taskmanager/plugin/textlabel.h
plasma/desktop/applets/tasks/CMakeLists.txt
plasma/desktop/applets/tasks/package/metadata.desktop
plasma/desktop/applets/tasks/tasks.cpp
plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
plasma/generic/applets/activitybar/activitybar.cpp
plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
2013-09-24 11:28:38 +02:00
Thomas Lübking
c21de3191d
Merge branch 'KDE/4.11'
2013-08-21 21:55:29 +02:00
Thomas Lübking
4ba6764a57
make plastik use PlainText captions
...
BUG: 323798
FIXED-IN: 4.11
REVIEW: 112180
2013-08-21 21:54:28 +02:00
Martin Gräßlin
84a2f3020b
Use Qt5:: in target link libraries in KWin
2013-08-20 09:14:24 +02:00
Martin Gräßlin
5ca6654eb8
Fix linking
...
KDEUI is dead which caused collateral damage.
2013-08-20 08:47:47 +02:00
l10n daemon script
df17849412
SVN_SILENT made messages (.desktop file)
2013-08-13 04:19:10 +00:00
Rohan Garg
7ab317095d
explicitly compare latin1 strings in qassert (fixes build with debugfull)
2013-08-07 14:10:45 +05:30
Martin Gräßlin
9291b18cee
Merge branch 'master' into frameworks-scratch
...
Conflicts:
CMakeLists.txt
kwin/effects.cpp
kwin/effects/logout/logout.cpp
kwin/effects/presentwindows/main.qml
kwin/effects/presentwindows/presentwindows.cpp
kwin/effects/presentwindows/presentwindows.h
kwin/effects/zoom/zoom_config.cpp
kwin/libkwineffects/kwinglutils_funcs.cpp
kwin/libkwineffects/kwinxrenderutils.cpp
kwin/nvidiahack.cpp
kwin/xcbutils.h
plasma/desktop/containments/desktop/plasma-containment-desktop.desktop
plasma/generic/wallpapers/image/image.cpp
plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
2013-08-07 10:10:06 +02:00
Alex Richardson
4d10921548
fix build by including moc_plastikplugin.cpp, not plastikplugin.moc
2013-08-06 23:07:30 +02:00
Martin Gräßlin
f924be909b
Fix no cast from ASCII in Aurorae
2013-07-25 18:04:27 +02:00
Martin Gräßlin
e7f76f8736
Use Q_PLUGIN_METADATA for Aurorae's deco QML plugins
2013-07-25 18:00:27 +02:00
l10n daemon script
2fc1ae684b
SVN_SILENT made messages (.desktop file)
2013-07-14 06:59:57 +00:00
l10n daemon script
7bd89eb6ee
SVN_SILENT made messages (.desktop file)
2013-07-14 04:16:47 +00:00
l10n daemon script
34c8d6feb6
SVN_SILENT made messages (.desktop file)
2013-06-05 04:54:40 +00:00
l10n daemon script
020f6fd612
SVN_SILENT made messages (.desktop file)
2013-05-30 04:29:57 +00:00
Alexandr Akulich
cb3f1b7776
Polish Plastik theme.
...
Fixed caption and left buttons positions.
Added enphasizing line under titleRow. (like in 4.9.x version).
REVIEW: 109992
BUG: 317220
FIXED-IN: 4.11
2013-05-29 07:34:13 +02:00
l10n daemon script
a3b09b7ac4
SVN_SILENT made messages (.desktop file)
2013-05-22 03:36:01 +00:00
Martin Gräßlin
577a7030b6
Merge branch 'KDE/4.10'
...
Conflicts:
kwin/clients/aurorae/src/aurorae.cpp
2013-03-13 08:09:53 +01:00
Martin Gräßlin
25fa3aac8c
Disable animations in Plastik for native or non-compositing
...
Adding a new property on whether we want animations based on whether we
are on raster or with Compositing. The property is constant as the deco
gets recreated on compositing change state anyway.
REVIEW: 109456
BUG: 314532
FIXED-IN: 4.10.2
2013-03-13 08:07:21 +01:00
Script Kiddy
4cb53c8471
SVN_SILENT made messages (.desktop file)
2013-02-24 13:57:51 +01:00
Script Kiddy
6d97690042
SVN_SILENT made messages (.desktop file)
2013-02-24 08:18:21 +01:00
Martin Gräßlin
6ddcbed314
Fix typo in Plastik QML
2013-02-18 09:47:11 +01:00
Marco Martin
9bddaea08b
Merge branch 'KDE/4.10'
2013-02-07 17:59:07 +01:00
Script Kiddy
685e9368b1
SVN_SILENT made messages (.desktop file)
2013-02-07 13:30:14 +01:00
Script Kiddy
7d16cef10e
SVN_SILENT made messages (.desktop file)
2013-02-05 21:32:15 +01:00
Script Kiddy
d9191d1485
SVN_SILENT made messages (.desktop file)
2013-02-01 08:50:51 +01:00
Marco Martin
baf21f6b34
Merge branch 'KDE/4.10'
...
Conflicts:
plasma/generic/applets/batterymonitor/metadata.desktop
plasma/generic/applets/lock_logout/metadata.desktop
2013-01-31 17:00:02 +01:00
Script Kiddy
f193c56957
SVN_SILENT made messages (.desktop file)
2013-01-31 16:31:28 +01:00
Script Kiddy
ca2cf4d697
SVN_SILENT made messages (.desktop file)
2013-01-31 12:00:36 +01:00
Script Kiddy
1416c8d62c
SVN_SILENT made messages (.desktop file)
2013-01-30 16:27:26 +01:00
Martin Gräßlin
99e39c8654
Introduce a dedicated borders element in Aurorae
...
The Borders element provides the four properties:
* left
* right
* top
* bottom
And is used directly in Decoration for all the different kind of settings
following this pattern:
* normal borders
* maximized borders
* padding
* extended borders
These properties replace the existing used borderLeft & co. This makes
the code in the C++ side easier as the various border elements can now be
read with a shared implementation.
The Borders provide some convenient methods to set the sizes of the
borders. E.g. it's possible to just set the side borders to a specific
value. This should simplify the implementation of the no-side-borders
feature in new decoration.
The aurorae qml and plastik are adjusted to use the new way. Existing
3rd party decorations would break, but there's a good reason why there's
no documentation for QML based decorations ;-)
REVIEW: 108436
2013-01-23 07:36:41 +01:00
Martin Gräßlin
6acae45205
Support for new decoration border sizes BorderNoSides and BorderNone
...
BorderNoSides is what is known from Oxygen as "No Side Borders". The name
should indicate that there is only a border at the bottom. BorderNone is
a mode with no borders at all.
The new enums are added to KDecoration and the KCM so that all decos can
make use of it.
Aurorae is adjusted to support the new sizes for QML themes (it breaks
the old svg based themes) and Plastik makes use of it, by rendering a
one-pixel border around the window, which illustrates that it's still up
to the decoration to decide how to make use of the setting.
REVIEW: 108164
2013-01-15 15:07:22 +01:00
Script Kiddy
3035d220c0
SVN_SILENT made messages (.desktop file)
2013-01-11 08:17:14 +01:00
Weng Xuetian
0a699cf8ce
Merge remote-tracking branch 'origin/KDE/4.10'
2013-01-10 13:19:04 -05:00
Script Kiddy
d5a0dd56cf
SVN_SILENT made messages (.desktop file)
2013-01-10 12:23:23 +01:00
Script Kiddy
a2c44c29f4
SVN_SILENT made messages (.desktop file)
2013-01-08 22:37:02 +01:00
Script Kiddy
6e267063d8
SVN_SILENT made messages (.desktop file)
2013-01-08 17:21:50 +01:00
Martin Gräßlin
54479225a3
Application Menu button support for Plastik
...
New icon with three lines similar to the one used in Oxygen is added
for application menu support.
REVIEW: 107937
2013-01-07 09:46:33 +01:00
Weng Xuetian
6fd8db7af9
Merge branch 'KDE/4.10'
2013-01-06 23:25:01 -05:00
Script Kiddy
6e544c93ff
SVN_SILENT made messages (.desktop file)
2013-01-05 08:24:47 +01:00
Script Kiddy
d6dd4308db
SVN_SILENT made messages (.desktop file)
2013-01-03 07:40:00 +01:00
Martin Gräßlin
a9bec311c2
Extended Border support in Aurorae
...
Aurorae Themes can make use of the extended borders feature to allow
resizing outside the window decoration area. So far only Plastik makes
use of it in the Tiny border case.
This should be extended in future by adding generic NoSideBorders and
NoBorders sizes as used by Oxygen.
FEATURE: 308992
FIXED-IN: 4.11
REVIEW: 107936
2012-12-30 09:54:43 +01:00
Script Kiddy
12f341712c
SVN_SILENT made messages (.desktop file)
2012-12-24 09:05:36 +01:00
Script Kiddy
d7316b9fcb
SVN_SILENT made messages (.desktop file)
2012-12-23 08:01:50 +01:00
Script Kiddy
ef0cae8dab
SVN_SILENT made messages (.desktop file)
2012-12-18 15:28:22 +01:00
Script Kiddy
dda5cbea69
SVN_SILENT made messages (.desktop file)
2012-12-13 07:29:15 +01:00
Script Kiddy
974e0e9c7d
SVN_SILENT made messages (.desktop file)
2012-12-09 07:14:36 +01:00
Script Kiddy
a5bec484f6
SVN_SILENT made messages (.desktop file)
2012-12-05 07:19:24 +01:00
Script Kiddy
49a373b681
SVN_SILENT made messages (.desktop file)
2012-12-01 08:03:43 +01:00
Script Kiddy
5a9a6d3b8a
SVN_SILENT made messages (.desktop file)
2012-11-28 07:36:20 +01:00