Commit graph

474 commits

Author SHA1 Message Date
Luboš Luňák
25adb0541d Merging from old trunk:
r564551 | mkretz | 2006-07-20 15:12:03 +0200 (Thu, 20 Jul 2006) | 2 lines

that include is not needed


svn path=/trunk/KDE/kdebase/workspace/; revision=659259
2007-04-29 20:48:51 +00:00
Luboš Luňák
bb867a2213 Merging from old trunk:
r564550 | mkretz | 2006-07-20 15:11:46 +0200 (Thu, 20 Jul 2006) | 3 lines

toAscii() only returns a temporary QByteArray, the QPixmap ctor would crash for
me: keep the QByteArray until all three pixmaps are created


svn path=/trunk/KDE/kdebase/workspace/; revision=659258
2007-04-29 20:47:53 +00:00
Luboš Luňák
d8439e8543 Merging from old trunk:
r564549 | mlaurent | 2006-07-20 15:08:26 +0200 (Thu, 20 Jul 2006) | 2 lines

Replace all bin by ${BIN_INSTALL_DIR}


svn path=/trunk/KDE/kdebase/workspace/; revision=659256
2007-04-29 20:46:45 +00:00
Luboš Luňák
b201ca13e8 Merging from old trunk:
r559171 | bmeyer | 2006-07-06 20:08:14 +0200 (Thu, 06 Jul 2006) | 1 line

remove line that wasn't suppost to be there.


svn path=/trunk/KDE/kdebase/workspace/; revision=659221
2007-04-29 18:18:48 +00:00
Luboš Luňák
afb0e7f5eb Merging from old trunk:
r559169 | bmeyer | 2006-07-06 20:01:52 +0200 (Thu, 06 Jul 2006) | 1 line

fix link opening


svn path=/trunk/KDE/kdebase/workspace/; revision=659220
2007-04-29 18:18:08 +00:00
Luboš Luňák
3134929db3 merge from old trunk:
r558694 | bmeyer
port from KActiveLabel -> QLabel


svn path=/trunk/KDE/kdebase/workspace/; revision=659215
2007-04-29 18:11:44 +00:00
Luboš Luňák
f52b8e48cd branches/work/kwin_composite becomes new trunk kwin.
svn path=/trunk/KDE/kdebase/workspace/; revision=659202
2007-04-29 17:35:43 +00:00
Luboš Luňák
2b7e1f4993 Remove kwin, kwin_composite will become new trunk kwin, missing merges
from trunk will be merged in.


svn path=/trunk/KDE/kdebase/workspace/; revision=659200
2007-04-29 17:34:49 +00:00
Script Kiddy
fc27b480d8 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=657060

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/KDE34.png.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-04-23 05:35:29 +00:00
Laurent Montel
2178c6dc31 Include fix
svn path=/trunk/KDE/kdebase/workspace/; revision=656565
2007-04-21 18:28:47 +00:00
Robert Knight
a23a2fafa5 Use relative path to reference KWin build directory. Fixes compilation when 'kwin_composite' branch is checked out into local 'kdebase/workspace' folder with a name other than 'kwin'
svn path=/branches/work/kwin_composite/; revision=656442
2007-04-21 12:26:18 +00:00
Laurent Montel
1adecf7737 Fix install icons
Fix install lib under x86_64
Fix install include (remove deprecated cmake macro)
Cleanup

svn path=/branches/work/kwin_composite/; revision=655792
2007-04-19 11:52:53 +00:00
Script Kiddy
9f10a4aec0 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=654844

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/KDE34.png.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-04-17 05:21:55 +00:00
Script Kiddy
03da4e3ae5 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=654445

The following changes were in SVN, but were removed from git:

M	wallpapers/KDE34.png.desktop
M	wallpapers/kde_box.png.desktop
2007-04-16 05:08:30 +00:00
Luboš Luňák
6cae287d2a KWM::WindowInfo -> KWindowInfo
svn path=/branches/work/kwin_composite/; revision=653880
2007-04-14 13:35:00 +00:00
Dirk Mueller
561fdef0ff include cleanup
svn path=/trunk/KDE/kdebase/workspace/; revision=652987
2007-04-12 13:02:58 +00:00
Aaron J. Seigo
81f00aa8b8 KWindowInfo
svn path=/trunk/KDE/kdebase/workspace/; revision=651965
2007-04-09 18:30:03 +00:00
Luboš Luňák
2c928221a4 namespace KWinInternal -> KWin - shorter typing of names in gdb, yay
svn path=/trunk/KDE/kdebase/workspace/; revision=650773
2007-04-05 12:12:10 +00:00
Luboš Luňák
e3b865cd5f namespace KWinInternal -> KWin - shorter typing of names in gdb, yay
svn path=/branches/work/kwin_composite/; revision=650770
2007-04-05 12:07:35 +00:00
Script Kiddy
4793790b1b SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=650658

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/aurora.svgz.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-04-05 04:44:04 +00:00
Luboš Luňák
41a32a042b Electric borders are not a bool setting.
svn path=/branches/work/kwin_composite/; revision=649954
2007-04-03 13:44:47 +00:00
Luboš Luňák
faa14f2fe0 Link.
svn path=/branches/work/kwin_composite/; revision=649951
2007-04-03 13:27:51 +00:00
Luboš Luňák
3617d1bf8a Merge r649608, r649403, r649230 and r648582 from trunk (porting).
svn path=/branches/work/kwin_composite/; revision=649948
2007-04-03 13:24:05 +00:00
David Faure
dd549c3bfe Doesn't seem used anywhere, all was ported to KConfigGroup (checked the kde3 code).
svn path=/trunk/KDE/kdebase/workspace/; revision=649822
2007-04-03 08:21:11 +00:00
Laurent Montel
53fcddb43f link
svn path=/trunk/KDE/kdebase/workspace/; revision=649768
2007-04-03 07:01:23 +00:00
Luboš Luňák
10ea80a963 KWin/KWinModule -> KWM
svn path=/trunk/KDE/kdebase/workspace/; revision=649608
2007-04-02 21:30:50 +00:00
David Faure
6b75a015fb kde3support is now needed for anything that uses k3iconview/k3listview
svn path=/trunk/KDE/kdebase/workspace/; revision=649276
2007-04-02 13:07:20 +00:00
Stephan Kulow
9df321c98d merge in /branches/work/coolos_libloader:
returning void* for functions is bad - so introduce
resolveFunction() and resolveSymbol() to make this separation
clear.

svn path=/trunk/KDE/kdebase/workspace/; revision=649230
2007-04-02 11:07:11 +00:00
Nicolas Goutte
cacd4e8000 SVN_SILENT: xgettext does not like to have unbalanced quotes in a #warning
svn path=/trunk/KDE/kdebase/workspace/; revision=648646
2007-03-31 21:40:43 +00:00
Andreas Hartmetz
ee217245fb Ported/compile-fixed some code in khotkeys and kwin (that was not fun)
Small changes in other places, removed some unnecessary #include <kkeydialog.h> where they showed up.

Related to this kdelibs commit:
KKeyDialog: Renamed to KShortcutsDialog
KKeyChooser: Renamed to KShortcutsEditor
KKeyButton: Replaced by KKeySequenceWidget and KShortcutWidget. KKeySequenceWidget uses modified code from KKeyButton.
KShortcutDialog: Removed

svn path=/trunk/KDE/kdebase/workspace/; revision=648582
2007-03-31 19:04:28 +00:00
Rivo Laks
d809643245 Make it compile:
- KProcess -> K3Process rename
- fix KKeyServer::xEventToQt() argument

svn path=/branches/work/kwin_composite/; revision=647255
2007-03-27 19:59:04 +00:00
Oswald Buddenhagen
3ee016f50d KProcess -> K3Process
KShellProcess -> K3ShellProcess
KProcIO -> K3ProcIO
KProcessController -> K3ProcessController

not deprecating, as we don't have a replacement yet.
not moving yet, as kdelibs still has heavy dependencies on it.

agreed upon with dfaure.


svn path=/trunk/KDE/kdebase/workspace/; revision=646732
2007-03-26 15:07:10 +00:00
Script Kiddy
53d4ba68ed SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=645846

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/KDE34.png.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-03-23 18:33:20 +00:00
Dirk Mueller
85677f205f pedantic--
svn path=/trunk/KDE/kdebase/workspace/; revision=644597
2007-03-20 14:21:56 +00:00
Laurent Montel
a0133cb048 Now we don't install libtool file
svn path=/branches/work/kwin_composite/; revision=642555
2007-03-14 17:26:32 +00:00
Script Kiddy
8e5873c49a SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=640788

The following changes were in SVN, but were removed from git:

M	wallpapers/No-Ones-Laughing-3.jpg.desktop
2007-03-09 08:06:27 +00:00
Script Kiddy
3ae271ef3e SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=639986

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/alta-badia.jpg.desktop
M	wallpapers/andes-venezolanos.svgz.desktop
M	wallpapers/aurora.svgz.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/konqui.svgz.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/stelvio.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-03-06 13:53:59 +00:00
Luboš Luňák
edc6f0e75b Include path for config-kwin.h .
svn path=/branches/work/kwin_composite/; revision=636647
2007-02-23 18:04:23 +00:00
Luboš Luňák
8af21ee5b3 merge r635823 from trunk
svn path=/branches/work/kwin_composite/; revision=636609
2007-02-23 14:38:01 +00:00
Script Kiddy
181bd86790 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=636469
2007-02-23 09:12:55 +00:00
Barış Metin
12d1b8b0fd setGroup to KConfigGroup
svn path=/trunk/KDE/kdebase/workspace/; revision=635823
2007-02-21 02:59:04 +00:00
Dirk Mueller
249a84c5d9 merge in kconfig changes to make it compile
svn path=/branches/work/kwin_composite/; revision=635791
2007-02-20 22:31:26 +00:00
Stephan Kulow
ce11a2cd80 compile some more
svn path=/trunk/KDE/kdebase/workspace/; revision=635518
2007-02-20 08:18:28 +00:00
Stephan Kulow
ab1fe691d8 merged kconfiggroup_port branch
svn path=/trunk/KDE/kdebase/workspace/; revision=635490
2007-02-20 07:00:30 +00:00
Laurent Montel
8f8c6d049b Fix signal/slot
svn path=/trunk/KDE/kdebase/workspace/; revision=633290
2007-02-13 18:31:54 +00:00
Laurent Montel
43edad3e53 Compile++
svn path=/trunk/KDE/kdebase/workspace/; revision=633102
2007-02-13 08:03:40 +00:00
Dirk Mueller
6883415ff4 KListBox->K3ListBox
svn path=/branches/work/kwin_composite/; revision=633055
2007-02-13 00:27:24 +00:00
Robert Knight
f3fb636b33 * Port KListBox to KListWidget
* Port all usage of Q3ListBox / Q3ListBoxItem to QListWidget / QListWidgetItem


svn path=/trunk/KDE/kdebase/workspace/; revision=632958
2007-02-12 19:39:15 +00:00
Laurent Montel
c65b031e94 compile
svn path=/trunk/KDE/kdebase/workspace/; revision=632855
2007-02-12 14:28:50 +00:00
Luboš Luňák
36afaf2efc Merge r632199 from kwin_composite.
svn path=/trunk/KDE/kdebase/workspace/; revision=632843
2007-02-12 13:29:36 +00:00