September 2008 - openSUSE Commits - openSUSE Mailing Lists

commit kdemultimedia4
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdemultimedia4 checked in at Mon Sep 1 15:02:05 CEST 2008. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2008-07-23 13:23:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2008-08-28 12:34:53.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 28 12:34:48 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- Old: ---- kdemultimedia-4.1.0.tar.bz2 New: ---- kdemultimedia-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.xL3872/_old 2008-09-01 15:01:56.000000000 +0200 +++ /var/tmp/diff_new_pack.xL3872/_new 2008-09-01 15:01:56.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package kdemultimedia4 (Version 4.1.0) +# spec file for package kdemultimedia4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,7 +25,7 @@ Group: System/GUI/KDE Summary: kdemultimedia base package Url: http://www.kde.org -Version: 4.1.0 +Version: 4.1.1 Release: 1 Source0: kdemultimedia-%version.tar.bz2 Source1: _upstream @@ -298,6 +305,9 @@ %doc COPYING COPYING.DOC README %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php * Wed Jul 23 2008 dmueller(a)suse.de - update to 4.1.0 * Fri Jul 18 2008 dmueller(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.xL3872/_old 2008-09-01 15:01:56.000000000 +0200 +++ /var/tmp/diff_new_pack.xL3872/_new 2008-09-01 15:01:56.000000000 +0200 @@ -1,8 +1,7 @@ -package: kdelibs-4.0.80.tar.bz2 -kdemod: kdelibs +package: kdemultimedia-4.1.1.tar.bz2 +kdemod: kdemultimedia --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: -+svn di between //tags/KDE/4.0.80/kdelibs and //trunk/KDE/kdelibs - ++current HEAD: 853806 ++svn di between //tags/KDE/4.1.1/kdemultimedia and //tags/KDE/4.1.1/kdemultimedia ++++++ kdemultimedia-4.1.0.tar.bz2 -> kdemultimedia-4.1.1.tar.bz2 ++++++ Files old/kdemultimedia-4.1.0/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.1.1/doc/dragonplayer/index.cache.bz2 differ Files old/kdemultimedia-4.1.0/doc/juk/index.cache.bz2 and new/kdemultimedia-4.1.1/doc/juk/index.cache.bz2 differ Files old/kdemultimedia-4.1.0/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.1.1/doc/kmix/index.cache.bz2 differ Files old/kdemultimedia-4.1.0/doc/kscd/index.cache.bz2 and new/kdemultimedia-4.1.1/doc/kscd/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer.desktop new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer.desktop --- old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer.desktop 2008-07-23 10:26:40.000000000 +0200 +++ new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -2,6 +2,7 @@ Type=Application Version=1.0 Name=Dragon Player +Name[bg]=Dragon Name[cs]=Přehrávač Dragon Name[el]=Αναπαραγωγέας Dragon Name[es]=Reproductor Dragón @@ -13,9 +14,11 @@ Name[sv]=Dragon videospelare Name[th]=โปรแกรมเล่นสื่อ Dragon Player Name[uk]=Програвач Dragon +Name[wa]=Djouweu Dragon Name[x-test]=xxDragon Playerxx Name[zh_TW]=神龍播放器 GenericName=Video Player +GenericName[bg]=Видео плеър GenericName[ca]=Reproductor de vídeo GenericName[cs]=Přehrávač videa GenericName[da]=Videoafspiller @@ -40,10 +43,12 @@ GenericName[pt]=Leitor de Vídeo GenericName[pt_BR]=Reprodutor de Vídeo GenericName[ru]=Видеопроигрыватель +GenericName[sl]=Predvajalnik videov GenericName[sv]=Videospelare GenericName[th]=โปรแกรมเล่นวิดีโอ GenericName[tr]=Video Oynatıcı GenericName[uk]=Відеопрогравач +GenericName[wa]=Djouweu d' videyos GenericName[x-test]=xxVideo Playerxx GenericName[zh_CN]=视频播放器 GenericName[zh_TW]=影像播放器 @@ -51,5 +56,5 @@ X-DocPath=dragonplayer/index.html TryExec=dragon Exec=dragon %u -MimeType=video/x-theora;video/x-theora+ogg;video/x-ogm;video/x-ogm+ogg;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;video/mp4; +MimeType=video/ogg;video/x-theora;video/x-theora+ogg;video/x-ogm;video/x-ogm+ogg;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;video/mp4; Categories=Qt;KDE;AudioVideo;Player; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer_part.desktop new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer_part.desktop --- old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer_part.desktop 2008-07-23 10:26:40.000000000 +0200 +++ new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer_part.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -2,6 +2,7 @@ Type=Service Icon=dragonplayer Name=Dragon Player Part +Name[bg]=Dragon (част) Name[ca]=Part del Dragon Player Name[cs]=Komponenta přehrávače Dragon Name[da]=Dragon Player-part @@ -25,13 +26,16 @@ Name[pl]=Moduł odtwarzacza Dragon Player Name[pt]=Componente do Dragon Player Name[pt_BR]=Parte do Dragon Player +Name[sl]=Komponeneta Dragon Player Name[sv]=Dragon videodelprogram Name[th]=ส่วนเล่นสื่อ Dragon Player Name[uk]=Складова програвача Dragon +Name[wa]=Pårt do Djouweu Dragon Name[x-test]=xxDragon Player Partxx Name[zh_CN]=Dragon Player 部件 Name[zh_TW]=神龍播放器部件 Comment=Embeddable Video Player +Comment[bg]=Вграден видео плеър Comment[ca]=Reproductor de vídeo encastat Comment[cs]=Vložený Video Přehrávač Comment[da]=Videoafspiller som kan indlejres @@ -56,14 +60,16 @@ Comment[pt]=Leitor de Vídeo Incorporado Comment[pt_BR]=Reprodutor de Vídeo Embutível Comment[ru]=Встраиваемый видеопроигрыватель +Comment[sl]=Vgradni predvajalnik videov Comment[sv]=Inbäddningsbar videospelare Comment[th]=โปรแกรมเล่นวิดีโอแบบฝังตัวได้ Comment[tr]=Gömülebilir Video Oynatıcı Comment[uk]=Програвач відео +Comment[wa]=Ravalåve djouweu videyo Comment[x-test]=xxEmbeddable Video Playerxx Comment[zh_CN]=嵌入的视频播放器 Comment[zh_TW]=嵌入式影像播放器 X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=dragonpart InitialPreference=9 -MimeType=video/x-theora;video/x-theora+ogg;video/x-ogm;video/x-ogm+ogg;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;video/mp4; +MimeType=video/ogg;video/x-theora;video/x-theora+ogg;video/x-ogm;video/x-ogm+ogg;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;video/mp4; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer_play_dvd.desktop new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer_play_dvd.desktop --- old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer_play_dvd.desktop 2008-07-23 10:26:40.000000000 +0200 +++ new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer_play_dvd.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -6,6 +6,7 @@ [Desktop Action Play] Name=Play DVD with Dragon Player +Name[bg]=Изпълнение на DVD с Dragon Name[ca]=Reprodueix DVD amb el Dragon Player Name[cs]=Přehrát DVD pomocí přehrávače Dragon Name[da]=Afspil dvd med Dragon Player @@ -17,7 +18,7 @@ Name[ga]=Seinn DVD le Dragon Player Name[gl]=Reproducir o DVD co Dragon Player Name[hu]=DVD-lejátszás a Dragon Playerrel -Name[it]=Visulizza DVD con Dragon Player +Name[it]=Riproduci DVD con Dragon Player Name[ja]=Dragon Player で DVD を再生 Name[km]=ចាក់ DVD ជាមួយកម្មវិធីចាក់ Dragon Name[ko]=Dragon 플레이어로 DVD 보기 @@ -30,10 +31,12 @@ Name[pt]=Reproduzir o DVD com o Dragon Player Name[pt_BR]=Reproduza um DVD com o Dragon Player Name[ru]=Воспроизведение DVD в Dragon Player +Name[sl]=Predvajaj DVD z Dragon Player Name[sv]=Spela dvd med Dragon videospelare Name[th]=เล่นแผ่นดีวีดีด้วยโปรแกรมเล่นสื่อ Dragon Player Name[tr]=DVDyi Dragon Player ile Oynat Name[uk]=Грати DVD програвачем Dragon +Name[wa]=Djouwer plake DVD avou l' Djouweu Dragon Name[x-test]=xxPlay DVD with Dragon Playerxx Name[zh_CN]=以 Dragon Player 播放 DVD Name[zh_TW]=用神龍播放器播放 DVD diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/collectionlist.cpp new/kdemultimedia-4.1.1/juk/collectionlist.cpp --- old/kdemultimedia-4.1.0/juk/collectionlist.cpp 2008-05-15 20:37:34.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/collectionlist.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -257,6 +257,12 @@ config.writeEntry("CollectionListSortColumn", sortColumn()); config.writeEntry("CollectionListSortAscending", sortOrder() == Qt::AscendingOrder); + // In some situations the dataChanged signal from clearItems will cause observers to + // subsequently try to access a deleted item. Since we're going away just remove all + // observers. + + clearObservers(); + // The CollectionListItems will try to remove themselves from the // m_columnTags member, so we must make sure they're gone before we // are. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/coverinfo.cpp new/kdemultimedia-4.1.1/juk/coverinfo.cpp --- old/kdemultimedia-4.1.0/juk/coverinfo.cpp 2008-07-15 21:51:03.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/coverinfo.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -72,7 +72,7 @@ m_hasCover(false), m_hasAttachedCover(false), m_haveCheckedForCover(false), - m_coverKey(CoverManager::NoMatch), + m_coverKey(CoverManager::idForTrack(file.absFilePath())), m_needsConverting(false) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/juk.desktop new/kdemultimedia-4.1.1/juk/juk.desktop --- old/kdemultimedia-4.1.0/juk/juk.desktop 2008-07-17 23:32:56.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/juk.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -4,6 +4,7 @@ Exec=juk -caption "%c" %i Icon=juk X-DocPath=juk/index.html +X-DBUS-StartupType=Unique Comment= Terminal=false Name=JuK @@ -14,7 +15,7 @@ Name[sv]=Juk Name[x-test]=xxJuKxx GenericName=Music Player -GenericName[bg]=Плеър за музикални файлове +GenericName[bg]=Музикален плеър GenericName[br]=C'hoarier ar sonerezh GenericName[ca]=Reproductor musical GenericName[cs]=Přehrávač hudby @@ -66,6 +67,7 @@ GenericName[uk]=Програвач музики GenericName[uz]=Musiqa pleyer GenericName[uz@cyrillic]=Мусиқа плейер +GenericName[wa]=Djoweu d' muzike GenericName[x-test]=xxMusic Playerxx GenericName[zh_CN]=音乐播放器 GenericName[zh_HK]=音樂播放器 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/jukservicemenu.desktop new/kdemultimedia-4.1.1/juk/jukservicemenu.desktop --- old/kdemultimedia-4.1.0/juk/jukservicemenu.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/jukservicemenu.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -5,6 +5,7 @@ [Desktop Action addToCollection] Name=Add to JuK Collection +Name[bg]=Добавяне към колекцията на JuK Name[bn]=জুক সংকলনে যোগ করো Name[br]=Ouzhpennañ d'an dastumad JuK Name[ca]=Afegeix a la col·lecció JuK @@ -56,6 +57,7 @@ Name[uk]=Додати до збірки JuK Name[uz]=JuK toʻplamiga qoʻshish Name[uz@cyrillic]=JuK тўпламига қўшиш +Name[wa]=Radjouter å ramexhnaedje di JuK Name[x-test]=xxAdd to JuK Collectionxx Name[zh_CN]=添加到 JuK 收藏 Name[zh_TW]=新增到 JuK 收藏清單 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/main.cpp new/kdemultimedia-4.1.1/juk/main.cpp --- old/kdemultimedia-4.1.0/juk/main.cpp 2008-05-29 13:20:13.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/main.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { KAboutData aboutData("juk", 0, ki18n("JuK"), - "3.1", ki18n(description), KAboutData::License_GPL, + "3.1.1", ki18n(description), KAboutData::License_GPL, ki18n("© 2002 - 2008, Scott Wheeler"), KLocalizedString(), "http://developer.kde.org/~wheeler/juk.html"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/playlist.cpp new/kdemultimedia-4.1.1/juk/playlist.cpp --- old/kdemultimedia-4.1.0/juk/playlist.cpp 2008-07-15 21:51:03.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/playlist.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -415,6 +415,12 @@ Playlist::~Playlist() { + // In some situations the dataChanged signal from clearItems will cause observers to + // subsequently try to access a deleted item. Since we're going away just remove all + // observers. + + clearObservers(); + // clearItem() will take care of removing the items from the history, // so call clearItems() to make sure it happens. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/playlistinterface.cpp new/kdemultimedia-4.1.1/juk/playlistinterface.cpp --- old/kdemultimedia-4.1.0/juk/playlistinterface.cpp 2008-01-05 01:02:04.000000000 +0100 +++ new/kdemultimedia-4.1.1/juk/playlistinterface.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -40,6 +40,11 @@ m_observers.remove(observer); } +void Watched::clearObservers() +{ + m_observers.clear(); +} + Watched::~Watched() { foreach(PlaylistObserver *observer, m_observers) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/playlistinterface.h new/kdemultimedia-4.1.1/juk/playlistinterface.h --- old/kdemultimedia-4.1.0/juk/playlistinterface.h 2008-01-05 01:02:04.000000000 +0100 +++ new/kdemultimedia-4.1.1/juk/playlistinterface.h 2008-08-28 10:08:27.000000000 +0200 @@ -33,6 +33,12 @@ void removeObserver(PlaylistObserver *observer); /** + * Call this to remove all objects observing this class unconditionally (for example, when + * you're being destructed). + */ + void clearObservers(); + + /** * This is triggered when the currently playing item has been changed. */ virtual void currentChanged(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/playlistitem.cpp new/kdemultimedia-4.1.1/juk/playlistitem.cpp --- old/kdemultimedia-4.1.0/juk/playlistitem.cpp 2008-05-21 10:34:17.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/playlistitem.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -371,9 +371,9 @@ return 0; break; case CoverColumn: - if(firstItem->d->fileHandle.coverInfo()->hasCover() == secondItem->d->fileHandle.coverInfo()->hasCover()) + if(firstItem->d->fileHandle.coverInfo()->coverId() == secondItem->d->fileHandle.coverInfo()->coverId()) return 0; - else if (firstItem->d->fileHandle.coverInfo()->hasCover()) + else if (firstItem->d->fileHandle.coverInfo()->coverId() != CoverManager::NoMatch) return -1; else return 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kioslave/audiocd/audiocd.cpp new/kdemultimedia-4.1.1/kioslave/audiocd/audiocd.cpp --- old/kdemultimedia-4.1.0/kioslave/audiocd/audiocd.cpp 2008-01-05 01:02:15.000000000 +0100 +++ new/kdemultimedia-4.1.1/kioslave/audiocd/audiocd.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -212,7 +212,8 @@ // Update our knowledge of the disc #if defined(HAVE_CDDA_IOCTL_DEVICE) - d->cd.setDevice(drive->ioctl_device_name, 50, false); + if (d->cd.deviceName() != drive->ioctl_device_name) + d->cd.setDevice(drive->ioctl_device_name, 50, false); #else // FreeBSD's cdparanoia as of january 5th 2006 has rather broken // support for non-SCSI devices. Although it finds ATA cdroms just diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kioslave/audiocd/data/audiocd.desktop new/kdemultimedia-4.1.1/kioslave/audiocd/data/audiocd.desktop --- old/kdemultimedia-4.1.0/kioslave/audiocd/data/audiocd.desktop 2008-07-23 10:26:40.000000000 +0200 +++ new/kdemultimedia-4.1.1/kioslave/audiocd/data/audiocd.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -3,6 +3,7 @@ URL=audiocd:/ Icon=media-optical-audio Name=Audio CD Browser +Name[bg]=Разглеждане на аудио дискове Name[ca]=Navegador de CD d'àudio Name[cs]=Prohlížeč zvukových CD Name[da]=Lyd-cd-browser @@ -27,10 +28,12 @@ Name[pt]=Navegador de CDs de Áudio Name[pt_BR]=Navegador de CDs de Áudio Name[ru]=Просмотр звуковых CD +Name[sl]=Brskalnik po glasbenih CD-jih Name[sv]=Bläddra ljud-cd Name[th]=เรียกดูซีดีเสียง Name[tr]=Ses CDsi Tarayıcı Name[uk]=Навігатор аудіо КД +Name[wa]=Foyteuse des plakes lazer odio Name[x-test]=xxAudio CD Browserxx Name[zh_CN]=音频 CD 浏览器 Name[zh_TW]=音樂光碟瀏覽器 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kioslave/audiocd/kcmaudiocd/audiocd.desktop new/kdemultimedia-4.1.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop --- old/kdemultimedia-4.1.0/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2008-07-17 23:32:56.000000000 +0200 +++ new/kdemultimedia-4.1.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -10,7 +10,7 @@ Name=Audio CDs Name[af]=Audio Cds -Name[bg]=Аудио диск +Name[bg]=Аудио дискове Name[bn]=অডিও সিডি Name[br]=CD klevet Name[ca]=CD d'àudio @@ -62,6 +62,7 @@ Name[uk]=Аудіо-КД Name[uz]=Audio kompakt-disklar Name[uz@cyrillic]=Аудио компакт-дисклар +Name[wa]=Plakes lazer odio Name[x-test]=xxAudio CDsxx Name[xh]=CDs Zokuvakalayo Name[zh_CN]=音频 CD @@ -120,13 +121,14 @@ Comment[th]=ปรับแต่ง Audiocd IO Slave Comment[tr]=Müzik CD Yapılandırması Comment[uk]=Налаштування підлеглого В/В "Audiocd" +Comment[wa]=Apontiaedje do vårlet d' I/R audiocd Comment[x-test]=xxAudiocd IO Slave Configurationxx Comment[xh]=Video-DVD IO Slave Uqwalaselo Comment[zh_CN]=音频 CD 输入输出模块配置 Comment[zh_HK]=音樂 CD IO Slave 設定 Comment[zh_TW]=音樂光碟 IO Slave 組態 Keywords=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate -Keywords[bg]=Keywords=аудио, диск, компактдиск, КД, кодек, музика, Audio CD, CD, Ogg, Vorbis, Encoding, CDDA, Bitrate +Keywords[bg]=Keywords=аудио,диск,компактдиск,КД,кодек,музика,Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Keywords[br]=CD klevet,CD,Ogg,Vorbis,Kodadur,CDDA,Feur Keywords[ca]=Àudio CD,CD,Ogg,Vorbis,Codificació,CDDA,Taxa de bits Keywords[cs]=Zvukové CD,CD,Ogg,Vorbis,Kódování,CDDA,Bitrate,CDDB @@ -171,6 +173,7 @@ Keywords[th]=ซีดีบันทึกเสียง, ซีดี,Ogg,Vorbis,เข้ารหัส,CDDA,บิตเรต Keywords[tr]=Ses CDsi,CD,Ogg,Vorbis,Kodlama,CDDA,Bitrate Keywords[uk]=Аудіо-КД,КД,Ogg,Vorbis,кодування,CDDA,частота вибірки +Keywords[wa]=plake lazer odio,CD,Ogg,Vorbis,Ecôdaedje,Encoding,CDDA,Bitrate,roedeur des bits Keywords[x-test]=xxAudio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitratexx Keywords[zh_CN]=Audio CD,音频 CD,CD,Ogg,Vorbis,Encding,编码,CDDA,Bitrate,码率 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kioslave/audiocd/plugins/flac/CMakeLists.txt new/kdemultimedia-4.1.1/kioslave/audiocd/plugins/flac/CMakeLists.txt --- old/kdemultimedia-4.1.0/kioslave/audiocd/plugins/flac/CMakeLists.txt 2008-01-05 01:02:15.000000000 +0100 +++ new/kdemultimedia-4.1.1/kioslave/audiocd/plugins/flac/CMakeLists.txt 2008-08-28 10:08:27.000000000 +0200 @@ -14,7 +14,7 @@ -target_link_libraries(audiocd_encoder_flac ${FLAC_LIBRARIES} ${KDE4_KIO_LIBS} audiocdplugins ) +target_link_libraries(audiocd_encoder_flac ${FLAC_LIBRARIES} ${KDE4_KIO_LIBS} audiocdplugins kcddb ) install(TARGETS audiocd_encoder_flac DESTINATION ${PLUGIN_INSTALL_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kioslave/audiocd/plugins/lame/encoderlame.cpp new/kdemultimedia-4.1.1/kioslave/audiocd/plugins/lame/encoderlame.cpp --- old/kdemultimedia-4.1.0/kioslave/audiocd/plugins/lame/encoderlame.cpp 2008-01-15 02:57:24.000000000 +0100 +++ new/kdemultimedia-4.1.1/kioslave/audiocd/plugins/lame/encoderlame.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -321,13 +321,11 @@ // Now copy the file out of the temp into kio QFile file( d->tempFile->fileName() ); if ( file.open( QIODevice::ReadOnly ) ) { - QByteArray output; char data[1024]; while ( !file.atEnd() ) { uint read = file.read(data, 1024); - output.fromRawData(data, read); + QByteArray output(data, read); ioslave->data(output); - output.clear(); } file.close(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kmix/kmixapplet.desktop new/kdemultimedia-4.1.1/kmix/kmixapplet.desktop --- old/kdemultimedia-4.1.0/kmix/kmixapplet.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/kmix/kmixapplet.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -95,6 +95,7 @@ Comment[th]=แสดงและอนุญาตให้คุณควบคุมระดับเสียง Comment[tr]=Ses seviyelerini gösterir ve onları kontrol etmenizi sağlar Comment[uk]=Показує і дає можливість керувати гучністю звуку +Comment[wa]=Vos mostere eyet vos leye controler les volumes do son Comment[x-test]=xxShows and let you control sound volumesxx Comment[zh_CN]=显示和控制音量 Comment[zh_TW]=顯示並讓您控制音量 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kmix/kmixdockwidget.cpp new/kdemultimedia-4.1.1/kmix/kmixdockwidget.cpp --- old/kdemultimedia-4.1.0/kmix/kmixdockwidget.cpp 2008-04-30 16:00:46.000000000 +0200 +++ new/kdemultimedia-4.1.1/kmix/kmixdockwidget.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -65,6 +65,7 @@ createMasterVolWidget(); createActions(); //connect(this, SIGNAL(quitSelected()), kapp, SLOT(quitExtended())); + connect(contextMenu(), SIGNAL(aboutToShow()), this, SLOT(contextMenuAboutToShow())); } KMixDockWidget::~KMixDockWidget() @@ -374,7 +375,7 @@ } void -KMixDockWidget::contextMenuAboutToShow( KMenu* /* menu */ ) +KMixDockWidget::contextMenuAboutToShow() { QAction* showAction = actionCollection()->action("minimizeRestore"); if ( parentWidget() && showAction ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kmix/kmixdockwidget.h new/kdemultimedia-4.1.1/kmix/kmixdockwidget.h --- old/kdemultimedia-4.1.0/kmix/kmixdockwidget.h 2008-01-05 01:02:14.000000000 +0100 +++ new/kdemultimedia-4.1.1/kmix/kmixdockwidget.h 2008-08-28 10:08:27.000000000 +0200 @@ -64,7 +64,6 @@ void moveVolumePopoup(); void trayWheelEvent(QWheelEvent *); // void trayToolTipEvent(QHelpEvent *e ); - void contextMenuAboutToShow( KMenu* menu ); void toggleMinimizeRestore(); bool event( QEvent *); @@ -80,6 +79,7 @@ void kmixSystrayAction(QSystemTrayIcon::ActivationReason); void selectMaster(); void handleNewMaster(QString& soundcard_id, QString& channel_id); + void contextMenuAboutToShow(); }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kmix/kmix.notifyrc new/kdemultimedia-4.1.1/kmix/kmix.notifyrc --- old/kdemultimedia-4.1.0/kmix/kmix.notifyrc 2008-07-17 23:32:56.000000000 +0200 +++ new/kdemultimedia-4.1.1/kmix/kmix.notifyrc 2008-08-28 10:08:27.000000000 +0200 @@ -36,6 +36,7 @@ Comment[th]=ปรับแต่งผสมเสียง Comment[tr]=Ses Karıştırıcı Comment[uk]=Аудіомікшер +Comment[wa]=Maxheu d' sons Comment[x-test]=xxSound Mixerxx Comment[zh_CN]=混音器 Comment[zh_TW]=音效混音器 @@ -75,6 +76,7 @@ Name[th]=แจ้งความล้มเหลวอุปกรณ์เสียง Name[tr]=Ses Aygıtı Değişimi Name[uk]=Другорядний аудіопристрій +Name[wa]=Tcheyåjhe d' éndjin son Name[x-test]=xxAudio Device Fallbackxx Name[zh_CN]=基本声音设备 Name[zh_TW]=預設音效裝置 @@ -112,6 +114,7 @@ Comment[th]=แจ้งเตือนความล้มเหลวอัตโนมัติ หากอุปกรณ์ที่ควรใช้ไม่มีอยู่ Comment[tr]=Tercih edilen aygıtlar erişilemez ise otomatik olarak yeni aygıta geçme bildirimi Comment[uk]=Сповіщення про автоматичне перемикання, якщо головний пристрій не наявний +Comment[wa]=Notifiaedje des tcheyåjhes otomatikes sel éndjin mî inmé n' est nén disponibe Comment[x-test]=xxNotification on automatic fallback if the preferred devices in unavailablexx Comment[zh_CN]=当首选设备无法使用时，通知会自动在基本设备上发出 Comment[zh_TW]=若是選用的裝置無法使用時，通知會自動使用預設的裝置 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kmix/restore_kmix_volumes.desktop new/kdemultimedia-4.1.1/kmix/restore_kmix_volumes.desktop --- old/kdemultimedia-4.1.0/kmix/restore_kmix_volumes.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/kmix/restore_kmix_volumes.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -53,6 +53,7 @@ Name[th]=เรียกคืนระดับเสียงของมิกเซอร์ Name[tr]=Karıştırıcı Seslerini Yenile Name[uk]=Відновити параметри мікшера +Name[wa]=Rimete come divant les apontiaedjes do maxheu d' sons Name[x-test]=xxRestore Mixer Volumesxx Name[zh_CN]=恢复混音器设置 Name[zh_HK]=回復混音器音量 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kscd/audiocd_play.desktop new/kdemultimedia-4.1.1/kscd/audiocd_play.desktop --- old/kdemultimedia-4.1.0/kscd/audiocd_play.desktop 2008-07-03 07:06:30.000000000 +0200 +++ new/kdemultimedia-4.1.1/kscd/audiocd_play.desktop 2008-08-28 10:08:26.000000000 +0200 @@ -53,6 +53,7 @@ Name[th]=เล่น Name[tr]=Çal Name[uk]=Пуск +Name[wa]=Djouwer Name[x-test]=xxPlayxx Name[zh_CN]=播放 Name[zh_HK]=播放 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kscd/kscd.desktop new/kdemultimedia-4.1.1/kscd/kscd.desktop --- old/kdemultimedia-4.1.0/kscd/kscd.desktop 2008-07-03 07:06:30.000000000 +0200 +++ new/kdemultimedia-4.1.1/kscd/kscd.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] GenericName=CD Player GenericName[af]=Cd Speler -GenericName[bg]=Плеър за аудио дискове +GenericName[bg]=Плеър за компактдискове GenericName[bn]=সিডি প্লেয়ার GenericName[br]=Ur c'hoarier CD GenericName[ca]=Reproductor de CD diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/libkcddb/kcmcddb/libkcddb.desktop new/kdemultimedia-4.1.1/libkcddb/kcmcddb/libkcddb.desktop --- old/kdemultimedia-4.1.0/libkcddb/kcmcddb/libkcddb.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/libkcddb/kcmcddb/libkcddb.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -59,6 +59,7 @@ Name[th]=ดึงข้อมูล CDDB Name[tr]=CDDB Erişimi Name[uk]=Звантаження CDDB +Name[wa]=Abaguaedje CDDB Name[x-test]=xxCDDB Retrievalxx Name[xh]=CDDB Ukukangela Name[zh_CN]=CDDB 检索 @@ -171,6 +172,7 @@ Comment[th]=ปรับแต่งการดึงข้อมูลจาก CDDB Comment[tr]=CDDB Erişimini Yapılandır Comment[uk]=Налаштування звантаження CDDB +Comment[wa]=Apontyî l' abaguadje CDDB Comment[x-test]=xxConfigure the CDDB Retrievalxx Comment[zh_CN]=CDDB 检索配置 Comment[zh_HK]=設定 CDDB 資訊擷取 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/avi/kfile_avi.desktop new/kdemultimedia-4.1.1/strigi-analyzer/avi/kfile_avi.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/avi/kfile_avi.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/avi/kfile_avi.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -55,6 +55,7 @@ Name[uk]=Інформація по AVI Name[uz]=AVI haqida maʼlumot Name[uz@cyrillic]=AVI ҳақида маълумот +Name[wa]=Informåcions AVI Name[x-test]=xxAVI Infoxx Name[xh]=Ulwazi lwe AVI Name[zh_CN]=AVI 信息 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/flac/kfile_flac.desktop new/kdemultimedia-4.1.1/strigi-analyzer/flac/kfile_flac.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/flac/kfile_flac.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/flac/kfile_flac.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -52,6 +52,7 @@ Name[uk]=Інформація по FLAC Name[uz]=FLAC haqida maʼlumot Name[uz@cyrillic]=FLAC ҳақида маълумот +Name[wa]=Informåcions FLAC Name[x-test]=xxFLAC Infoxx Name[zh_CN]=FLAC 信息 Name[zh_HK]=FLAC 資訊 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/mp3/kfile_mp3.desktop new/kdemultimedia-4.1.1/strigi-analyzer/mp3/kfile_mp3.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/mp3/kfile_mp3.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/mp3/kfile_mp3.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -56,6 +56,7 @@ Name[uk]=Інформація по MP3 Name[uz]=MP3 haqida maʼlumot Name[uz@cyrillic]=MP3 ҳақида маълумот +Name[wa]=Infôrmåcions MP3 Name[x-test]=xxMP3 Infoxx Name[xh]=MP3 ulwazi Name[zh_CN]=MP3 信息 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/mpc/kfile_mpc.desktop new/kdemultimedia-4.1.1/strigi-analyzer/mpc/kfile_mpc.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/mpc/kfile_mpc.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/mpc/kfile_mpc.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -46,6 +46,7 @@ Name[th]=ข้อมูล Musepack Name[tr]=MusePack Bilgisi Name[uk]=Інформація по Musepack +Name[wa]=Informåcions Musepack Name[x-test]=xxMusepack Infoxx Name[zh_CN]=Musepack 信息 Name[zh_HK]=Musepack 資訊 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/ogg/kfile_ogg.desktop new/kdemultimedia-4.1.1/strigi-analyzer/ogg/kfile_ogg.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/ogg/kfile_ogg.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/ogg/kfile_ogg.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -54,6 +54,7 @@ Name[uk]=Інформація по OGG Name[uz]=OGG haqida maʼlumot Name[uz@cyrillic]=OGG ҳақида маълумот +Name[wa]=Informåcions OGG Name[x-test]=xxOGG Infoxx Name[xh]=OGG Ulwazi Name[zh_CN]=OGG 信息 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/sid/kfile_sid.desktop new/kdemultimedia-4.1.1/strigi-analyzer/sid/kfile_sid.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/sid/kfile_sid.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/sid/kfile_sid.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -50,6 +50,7 @@ Name[th]=ข้อมูล SID Name[tr]=SID Bilgisi Name[uk]=Інформація по SID +Name[wa]=Informåcions SID Name[x-test]=xxSID Infoxx Name[zh_CN]=SID 信息 Name[zh_HK]=SID 資訊 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/theora/kfile_theora.desktop new/kdemultimedia-4.1.1/strigi-analyzer/theora/kfile_theora.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/theora/kfile_theora.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/theora/kfile_theora.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -14,7 +14,7 @@ Name[eu]=theora informazioa Name[fa]=اطلاعات theora Name[fi]=Theoran tiedot -Name[fr]=Informations theora +Name[fr]=Informations Theora Name[ga]=Eolas faoi theora Name[gl]=Información theora Name[he]=מידע theora @@ -47,6 +47,7 @@ Name[th]=ข้อมูล theora Name[tr]=theora Bilgisi Name[uk]=Інформація по theora +Name[wa]=Informåcions theora Name[x-test]=xxtheora Infoxx Name[zh_CN]=theora 信息 Name[zh_HK]=theora 資訊 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/wav/kfile_wav.desktop new/kdemultimedia-4.1.1/strigi-analyzer/wav/kfile_wav.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/wav/kfile_wav.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/wav/kfile_wav.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -53,6 +53,7 @@ Name[uk]=Інформація по WAV Name[uz]=WAV haqida maʼlumot Name[uz@cyrillic]=WAV ҳақида маълумот +Name[wa]=Informåcions WAV Name[x-test]=xxWAV Infoxx Name[xh]=MAV Ulwazi Name[zh_CN]=WAV 信息 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdelibs4 checked in at Mon Sep 1 15:01:50 CEST 2008. -------- --- KDE/kdelibs4/kdelibs4.changes 2008-08-16 16:39:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2008-08-28 12:16:21.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Aug 28 10:47:30 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- +Thu Aug 21 18:59:17 CEST 2008 - stbinner(a)suse.de + +- patch to build against Strigi 0.6 + +------------------------------------------------------------------- +Thu Aug 21 00:17:16 CEST 2008 - dmueller(a)suse.de + +- update branch diff + +------------------------------------------------------------------- Old: ---- kdelibs-4.1.0.tar.bz2 New: ---- kdelibs-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.qK2409/_old 2008-09-01 15:01:42.000000000 +0200 +++ /var/tmp/diff_new_pack.qK2409/_new 2008-09-01 15:01:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4 (Version 4.1.0) +# spec file for package kdelibs4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -32,8 +32,8 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 4.1.0 -Release: 15 +Version: 4.1.1 +Release: 1 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) @@ -363,6 +363,13 @@ /usr/share/mime/packages/kde.xml %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php +* Thu Aug 21 2008 stbinner(a)suse.de +- patch to build against Strigi 0.6 +* Thu Aug 21 2008 dmueller(a)suse.de +- update branch diff * Sat Aug 16 2008 stbinner(a)suse.de - 4_1_BRANCH update (fixes eg kde#167826) * Thu Jul 31 2008 dmueller(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ ++++ 4247 lines (skipped) ++++ between KDE/kdelibs4/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdelibs4/4_1_BRANCH.diff ++++++ kdelibs-4.1.0.tar.bz2 -> kdelibs-4.1.1.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-4.1.0.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-4.1.1.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics4
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdegraphics4 checked in at Mon Sep 1 15:01:45 CEST 2008. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2008-08-19 16:17:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2008-08-28 12:34:34.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 28 12:34:28 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- Old: ---- kdegraphics-4.1.0.tar.bz2 New: ---- kdegraphics-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.SA1881/_old 2008-09-01 15:01:33.000000000 +0200 +++ /var/tmp/diff_new_pack.SA1881/_new 2008-09-01 15:01:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 4.1.0) +# spec file for package kdegraphics4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,8 +33,8 @@ Group: Productivity/Graphics/Other Summary: kdegraphics base package Url: http://www.kde.org -Version: 4.1.0 -Release: 18 +Version: 4.1.1 +Release: 1 Source0: kdegraphics-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -521,6 +521,9 @@ %_kde_share_dir/services/ksane_scan_service.desktop %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php * Tue Aug 19 2008 stbinner(a)suse.de - branch diff update: several Okular fixes * Wed Jul 30 2008 dmueller(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ ++++ 774 lines (skipped) ++++ between KDE/kdegraphics4/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdegraphics4/4_1_BRANCH.diff ++++++ kdegraphics-4.1.0.tar.bz2 -> kdegraphics-4.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/cmake/modules/FindEPub.cmake new/kdegraphics-4.1.1/cmake/modules/FindEPub.cmake --- old/kdegraphics-4.1.0/cmake/modules/FindEPub.cmake 2008-04-10 11:29:56.000000000 +0200 +++ new/kdegraphics-4.1.1/cmake/modules/FindEPub.cmake 2008-08-28 10:06:53.000000000 +0200 @@ -20,7 +20,7 @@ else (EPUB_INCLUDE_DIR AND EPUB_LIBRARIES) find_library (EPUB_LIBRARIES - NAMES epub + NAMES epub libepub ) find_path (EPUB_INCLUDE_DIR diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/cmake/modules/FindLibSpectre.cmake new/kdegraphics-4.1.1/cmake/modules/FindLibSpectre.cmake --- old/kdegraphics-4.1.0/cmake/modules/FindLibSpectre.cmake 2008-05-07 11:05:17.000000000 +0200 +++ new/kdegraphics-4.1.1/cmake/modules/FindLibSpectre.cmake 2008-08-28 10:06:53.000000000 +0200 @@ -36,6 +36,13 @@ set(LIBSPECTRE_FOUND TRUE) endif(_return_VALUE STREQUAL "0") endif(_SpectreLinkFlags) +else(NOT WIN32) + # do not use pkg-config on windows + find_library(_SpectreLinkFlags NAMES libspectre spectre PATHS ${CMAKE_LIBRARY_PATH}) + + find_path(LIBSPECTRE_INCLUDE_DIR spectre.h PATH_SUFFIXES libspectre ) + + set(LIBSPECTRE_FOUND TRUE) endif(NOT WIN32) if (LIBSPECTRE_FOUND) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/doc/CMakeLists.txt new/kdegraphics-4.1.1/doc/CMakeLists.txt --- old/kdegraphics-4.1.0/doc/CMakeLists.txt 2008-01-05 00:53:46.000000000 +0100 +++ new/kdegraphics-4.1.1/doc/CMakeLists.txt 2008-08-28 10:06:53.000000000 +0200 @@ -1,8 +1,8 @@ if(Q_WS_X11) add_subdirectory(ksnapshot) - if (XVIDMODEEXTENSIONS_FOUND) + if (X11_xf86vmode_FOUND) add_subdirectory(kgamma) - endif (XVIDMODEEXTENSIONS_FOUND) + endif (X11_xf86vmode_FOUND) endif(Q_WS_X11) if(KDE4_GPHOTO2 AND GPHOTO2_FOUND) Files old/kdegraphics-4.1.0/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.1.1/doc/gwenview/index.cache.bz2 differ Files old/kdegraphics-4.1.0/doc/kamera/index.cache.bz2 and new/kdegraphics-4.1.1/doc/kamera/index.cache.bz2 differ Files old/kdegraphics-4.1.0/doc/kgamma/index.cache.bz2 and new/kdegraphics-4.1.1/doc/kgamma/index.cache.bz2 differ Files old/kdegraphics-4.1.0/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.1.1/doc/kolourpaint/index.cache.bz2 differ Files old/kdegraphics-4.1.0/doc/kruler/index.cache.bz2 and new/kdegraphics-4.1.1/doc/kruler/index.cache.bz2 differ Files old/kdegraphics-4.1.0/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.1.1/doc/ksnapshot/index.cache.bz2 differ Files old/kdegraphics-4.1.0/doc/okular/index.cache.bz2 and new/kdegraphics-4.1.1/doc/okular/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/gwenview/app/gwenview.desktop new/kdegraphics-4.1.1/gwenview/app/gwenview.desktop --- old/kdegraphics-4.1.0/gwenview/app/gwenview.desktop 2008-06-03 11:34:15.000000000 +0200 +++ new/kdegraphics-4.1.1/gwenview/app/gwenview.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -64,7 +64,7 @@ Comment=A simple image viewer Comment[ca]=Un visualitzador d'imatges senzill Comment[cs]=Jednoduchý prohlížeč obrázků -Comment[da]=Simpel biledfremviser +Comment[da]=Simpel billedfremviser Comment[de]=Ein einfacher Bildbetrachter Comment[el]=Ένας απλός προβολέας εικόνων Comment[eo]=Simpla bildorigardilo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/gwenview/app/imageopscontextmanageritem.cpp new/kdegraphics-4.1.1/gwenview/app/imageopscontextmanageritem.cpp --- old/kdegraphics-4.1.0/gwenview/app/imageopscontextmanageritem.cpp 2008-06-25 09:54:21.000000000 +0200 +++ new/kdegraphics-4.1.1/gwenview/app/imageopscontextmanageritem.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -36,6 +36,7 @@ #include "mainwindow.h" #include "sidebar.h" #include <lib/cropsidebar.h> +#include <lib/cropimageoperation.h> #include <lib/document/documentfactory.h> #include <lib/gwenviewconfig.h> #include <lib/imageviewpart.h> @@ -104,7 +105,7 @@ mCropAction = actionCollection->addAction("crop"); mCropAction->setText(i18n("Crop")); connect(mCropAction, SIGNAL(triggered()), - that, SLOT(crop()) ); + that, SLOT(showCropSideBar()) ); mActionList << mRotateLeftAction @@ -256,7 +257,7 @@ } -void ImageOpsContextManagerItem::crop() { +void ImageOpsContextManagerItem::showCropSideBar() { ImageViewPart* imageViewPart = d->mMainWindow->documentView()->imageViewPart(); if (!imageViewPart) { kError() << "No ImageViewPart available!"; @@ -266,9 +267,17 @@ CropSideBar* cropSideBar = new CropSideBar(d->mMainWindow, imageViewPart->imageView(), doc); connect(cropSideBar, SIGNAL(done()), d->mMainWindow, SLOT(hideTemporarySideBar()) ); + connect(cropSideBar, SIGNAL(cropRequested(const QRect&)), + SLOT(crop(const QRect&)) ); d->mMainWindow->showTemporarySideBar(cropSideBar); } +void ImageOpsContextManagerItem::crop(const QRect& rect) { + CropImageOperation* op = new CropImageOperation(rect); + d->applyImageOperation(op); +} + + } // namespace diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/gwenview/app/imageopscontextmanageritem.h new/kdegraphics-4.1.1/gwenview/app/imageopscontextmanageritem.h --- old/kdegraphics-4.1.0/gwenview/app/imageopscontextmanageritem.h 2008-05-15 20:37:11.000000000 +0200 +++ new/kdegraphics-4.1.1/gwenview/app/imageopscontextmanageritem.h 2008-08-28 10:06:53.000000000 +0200 @@ -29,6 +29,9 @@ #include "abstractcontextmanageritem.h" +class QRect; + + namespace Gwenview { @@ -51,7 +54,8 @@ void mirror(); void flip(); void resizeImage(); - void crop(); + void showCropSideBar(); + void crop(const QRect&); private: class Private; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/gwenview/app/main.cpp new/kdegraphics-4.1.1/gwenview/app/main.cpp --- old/kdegraphics-4.1.0/gwenview/app/main.cpp 2008-05-29 13:18:37.000000000 +0200 +++ new/kdegraphics-4.1.1/gwenview/app/main.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -36,7 +36,7 @@ "gwenview", /* appname */ 0, /* catalogName */ ki18n("Gwenview"), /* programName */ - "2.1"); /* version */ + "2.1.1"); /* version */ aboutData.setShortDescription(ki18n("An Image Viewer")); aboutData.setLicense(KAboutData::License_GPL); aboutData.setCopyrightStatement(ki18n("Copyright 2000-2008 Aurélien Gâteau")); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/gwenview/app/slideshow.desktop new/kdegraphics-4.1.1/gwenview/app/slideshow.desktop --- old/kdegraphics-4.1.0/gwenview/app/slideshow.desktop 2008-07-23 10:25:16.000000000 +0200 +++ new/kdegraphics-4.1.1/gwenview/app/slideshow.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -15,6 +15,7 @@ Name[fr]=Démarrer un diaporama Name[ga]=Rith Taispeántas Sleamhnán Name[gl]=Iniciar unha presentación +Name[hu]=Diabemutató indítása Name[is]=Hefja skyggnusýningu Name[it]=Avvia una presentazione Name[ja]=スライドショーを開始 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/gwenview/lib/cropsidebar.cpp new/kdegraphics-4.1.1/gwenview/lib/cropsidebar.cpp --- old/kdegraphics-4.1.0/gwenview/lib/cropsidebar.cpp 2008-05-07 11:05:18.000000000 +0200 +++ new/kdegraphics-4.1.1/gwenview/lib/cropsidebar.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -29,7 +29,6 @@ #include "klocale.h" // Local -#include "cropimageoperation.h" #include "croptool.h" #include "imageview.h" #include "ui_cropsidebar.h" @@ -136,7 +135,7 @@ SLOT(slotHeightChanged()) ); connect(d->buttonBox, SIGNAL(accepted()), - SLOT(crop()) ); + SLOT(slotAccepted()) ); connect(d->buttonBox, SIGNAL(rejected()), SIGNAL(done()) ); @@ -220,10 +219,8 @@ } -void CropSideBar::crop() { - CropImageOperation* op = new CropImageOperation(cropRect()); - op->setDocument(d->mDocument); - d->mDocument->undoStack()->push(op); +void CropSideBar::slotAccepted() { + emit cropRequested(cropRect()); emit done(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/gwenview/lib/cropsidebar.h new/kdegraphics-4.1.1/gwenview/lib/cropsidebar.h --- old/kdegraphics-4.1.0/gwenview/lib/cropsidebar.h 2008-05-07 11:05:18.000000000 +0200 +++ new/kdegraphics-4.1.1/gwenview/lib/cropsidebar.h 2008-08-28 10:06:53.000000000 +0200 @@ -46,6 +46,7 @@ Q_SIGNALS: void done(); + void cropRequested(const QRect&); private Q_SLOTS: void slotPositionChanged(); @@ -53,7 +54,7 @@ void slotHeightChanged(); void setCropRect(const QRect& rect); - void crop(); + void slotAccepted(); void applyRatioConstraint(); void setRatioConstraintFromComboBox(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/gwenview/lib/thumbnailview/thumbnailview.cpp new/kdegraphics-4.1.1/gwenview/lib/thumbnailview/thumbnailview.cpp --- old/kdegraphics-4.1.0/gwenview/lib/thumbnailview/thumbnailview.cpp 2008-07-15 21:48:47.000000000 +0200 +++ new/kdegraphics-4.1.1/gwenview/lib/thumbnailview/thumbnailview.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -48,7 +48,10 @@ static KFileItem fileItemForIndex(const QModelIndex& index) { - Q_ASSERT(index.isValid()); + if (!index.isValid()) { + kWarning() << "Invalid index"; + return KFileItem(); + } QVariant data = index.data(KDirModel::FileItemRole); return qvariant_cast<KFileItem>(data); } @@ -56,7 +59,7 @@ static KUrl urlForIndex(const QModelIndex& index) { KFileItem item = fileItemForIndex(index); - return item.url(); + return item.isNull() ? KUrl() : item.url(); } struct Thumbnail { @@ -281,9 +284,12 @@ QPixmap ThumbnailView::thumbnailForIndex(const QModelIndex& index) { - QVariant data = index.data(KDirModel::FileItemRole); - KFileItem item = qvariant_cast<KFileItem>(data); - QUrl url = item.url(); + KFileItem item = fileItemForIndex(index); + if (item.isNull()) { + kWarning() << "Invalid item"; + return QPixmap(); + } + KUrl url = item.url(); QPixmap pix; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/gwenview/part/gvpart.desktop new/kdegraphics-4.1.1/gwenview/part/gvpart.desktop --- old/kdegraphics-4.1.0/gwenview/part/gvpart.desktop 2008-06-03 11:34:15.000000000 +0200 +++ new/kdegraphics-4.1.1/gwenview/part/gvpart.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -43,7 +43,7 @@ Name[x-test]=xxGwenview Image Viewerxx Name[zh_CN]=Gwenview 图像查看器 Name[zh_TW]=Gwenview 影像檢視程式 -MimeType=image/gif;image/jpeg;image/jpeg2000;image/png;image/bmp;image/x-eps;image/x-ico;image/x-krl;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap; +MimeType=image/gif;image/jpeg;image/jp2;image/png;image/bmp;image/x-eps;image/x-ico;image/x-krl;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap; X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=gvpart InitialPreference=12 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/gwenview/tests/CMakeLists.txt new/kdegraphics-4.1.1/gwenview/tests/CMakeLists.txt --- old/kdegraphics-4.1.0/gwenview/tests/CMakeLists.txt 2008-05-07 11:05:18.000000000 +0200 +++ new/kdegraphics-4.1.1/gwenview/tests/CMakeLists.txt 2008-08-28 10:06:53.000000000 +0200 @@ -7,6 +7,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/.. ) +include_directories( ${EXIV2_INCLUDE_DIR} ) + set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/kamera/kcontrol/kamera.desktop new/kdegraphics-4.1.1/kamera/kcontrol/kamera.desktop --- old/kdegraphics-4.1.0/kamera/kcontrol/kamera.desktop 2008-06-03 11:34:16.000000000 +0200 +++ new/kdegraphics-4.1.1/kamera/kcontrol/kamera.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -38,7 +38,7 @@ Comment[nl]=Camera instellen Comment[nn]=Set opp Kamera Comment[pa]=ਕੈਮਰਾ ਸੰਰਚਨਾ -Comment[pl]=Konfiguracja Kamery +Comment[pl]=Konfiguracja aparatu cyfrowego Comment[pt]=Configuração do Kamera Comment[pt_BR]=Configurar o Kamera Comment[ro]=Configurează aparatul foto digital diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/kamera/kioslave/kamera.cpp new/kdegraphics-4.1.1/kamera/kioslave/kamera.cpp --- old/kdegraphics-4.1.0/kamera/kioslave/kamera.cpp 2008-01-05 00:53:46.000000000 +0100 +++ new/kdegraphics-4.1.1/kamera/kioslave/kamera.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -232,8 +232,7 @@ error(KIO::ERR_DOES_NOT_EXIST, url.path()); \ return; \ } \ - QByteArray chunkDataBuffer; \ - chunkDataBuffer.fromRawData(xx.text, strlen(xx.text)); \ + QByteArray chunkDataBuffer = QByteArray::fromRawData(xx.text, strlen(xx.text)); \ data(chunkDataBuffer); \ processedSize(strlen(xx.text)); \ chunkDataBuffer.clear(); \ @@ -345,7 +344,7 @@ if (towrite > fileSize-m_fileSize-written) towrite = fileSize-m_fileSize-written; - chunkDataBuffer.fromRawData(fileData + m_fileSize + written, towrite); + chunkDataBuffer = QByteArray::fromRawData(fileData + m_fileSize + written, towrite); processedSize(m_fileSize + written + towrite); data(chunkDataBuffer); chunkDataBuffer.clear(); @@ -919,8 +918,7 @@ if (fileSize > 0) { // XXX using assign() here causes segfault, prolly because // gp_file_free is called before chunkData goes out of scope - QByteArray chunkDataBuffer; - chunkDataBuffer.fromRawData(fileData + object->getFileSize(), fileSize - object->getFileSize()); + QByteArray chunkDataBuffer = QByteArray::fromRawData(fileData + object->getFileSize(), fileSize - object->getFileSize()); // Note: this will fail with sizes > 16MB ... object->data(chunkDataBuffer); object->processedSize(fileSize); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/kgamma/kcmkgamma/kgamma.desktop new/kdegraphics-4.1.1/kgamma/kcmkgamma/kgamma.desktop --- old/kdegraphics-4.1.0/kgamma/kcmkgamma/kgamma.desktop 2008-06-03 11:34:15.000000000 +0200 +++ new/kdegraphics-4.1.1/kgamma/kcmkgamma/kgamma.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -85,7 +85,7 @@ Name[xh]=Unobumba wesithathu konoobumba besiGrike Name[zh_HK]=伽馬（Gamma） -X-DocPath=kgamma +X-DocPath=kgamma/index.html Exec=kcmshell4 kgamma Icon=kgamma X-KDE-Keywords=KGamma, kgamma, Gamma, gamma diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/kgamma/kcmkgamma/Messages.sh new/kdegraphics-4.1.1/kgamma/kcmkgamma/Messages.sh --- old/kdegraphics-4.1.0/kgamma/kcmkgamma/Messages.sh 2008-01-05 00:53:45.000000000 +0100 +++ new/kdegraphics-4.1.1/kgamma/kcmkgamma/Messages.sh 2008-08-28 10:06:53.000000000 +0200 @@ -1,2 +1,2 @@ #! /bin/sh -$XGETTEXT *.cpp -o $podir/kgamma.pot +$XGETTEXT *.cpp -o $podir/kcmkgamma.pot diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/kolourpaint/kpViewScrollableContainer.cpp new/kdegraphics-4.1.1/kolourpaint/kpViewScrollableContainer.cpp --- old/kdegraphics-4.1.0/kolourpaint/kpViewScrollableContainer.cpp 2008-01-05 00:53:53.000000000 +0100 +++ new/kdegraphics-4.1.1/kolourpaint/kpViewScrollableContainer.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -605,10 +605,12 @@ if (m_resizeRoundedLastViewX < 0 || m_resizeRoundedLastViewY < 0) return QRect (); + QRect visibleArea = QRect(QPoint(contentsX(),contentsY()), viewport()->size()); + return QRect (QPoint (0, m_resizeRoundedLastViewY), QPoint (m_resizeRoundedLastViewX - 1, - m_resizeRoundedLastViewY + bottomResizeLineWidth () - 1)); + m_resizeRoundedLastViewY + bottomResizeLineWidth () - 1)).intersected(visibleArea); } // protected @@ -617,10 +619,12 @@ if (m_resizeRoundedLastViewX < 0 || m_resizeRoundedLastViewY < 0) return QRect (); + QRect visibleArea = QRect(QPoint(contentsX(),contentsY()), viewport()->size()); + return QRect (QPoint (m_resizeRoundedLastViewX, 0), QPoint (m_resizeRoundedLastViewX + rightResizeLineWidth () - 1, - m_resizeRoundedLastViewY - 1)); + m_resizeRoundedLastViewY - 1)).intersected(visibleArea); } // protected @@ -629,10 +633,12 @@ if (m_resizeRoundedLastViewX < 0 || m_resizeRoundedLastViewY < 0) return QRect (); + QRect visibleArea = QRect(QPoint(contentsX(),contentsY()), viewport()->size()); + return QRect (QPoint (m_resizeRoundedLastViewX, m_resizeRoundedLastViewY), QPoint (m_resizeRoundedLastViewX + rightResizeLineWidth () - 1, - m_resizeRoundedLastViewY + bottomResizeLineWidth () - 1)); + m_resizeRoundedLastViewY + bottomResizeLineWidth () - 1)).intersected(visibleArea); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/kruler/kruler.desktop new/kdegraphics-4.1.1/kruler/kruler.desktop --- old/kdegraphics-4.1.0/kruler/kruler.desktop 2008-06-03 11:34:16.000000000 +0200 +++ new/kdegraphics-4.1.1/kruler/kruler.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -23,7 +23,7 @@ GenericName[hu]=Képernyővonalzó GenericName[is]=Reglustika GenericName[it]=Righello per lo schermo -GenericName[ja]=スクリーン定規 +GenericName[ja]=スクリーンルーラー GenericName[kk]=Экран өлшегіші GenericName[km]=បន្ទាត់អេក្រង់ GenericName[ko]=화면 자 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/kruler/kruler.notifyrc new/kdegraphics-4.1.1/kruler/kruler.notifyrc --- old/kdegraphics-4.1.0/kruler/kruler.notifyrc 2008-06-03 11:34:16.000000000 +0200 +++ new/kdegraphics-4.1.1/kruler/kruler.notifyrc 2008-08-28 10:06:53.000000000 +0200 @@ -22,7 +22,7 @@ Comment[hu]=Képernyővonalzó Comment[is]=KDE skjáreglustika Comment[it]=Righello dello schermo -Comment[ja]=KDE スクリーン定規 +Comment[ja]=KDE スクリーンルーラー Comment[kk]=KDE экран өлшегіші Comment[km]=បន្ទាត់អេក្រង់ KDE Comment[ko]=KDE 화면 자 @@ -129,7 +129,7 @@ Comment[hu]=A vonalzó elmozgatva képpontonként a kurzorbillentyűkkel Comment[is]=Reglustikan hefur verið færð um nokkra díla með notkun Bendillykla Comment[it]=Il righello è stato spostato usando i tasti cursore -Comment[ja]=定規がカーソルキーによってピクセル単位で移動しました +Comment[ja]=ルーラーがカーソルキーによってピクセル単位で移動しました Comment[km]=បន្ទាត់ត្រូវបានផ្លាស់ទីតាមភីកសែល ដោយប្រើគ្រាប់ចុចទស្សន៍ទ្រនិច Comment[ko]=화면 자가 커서 키를 사용해서 픽셀 단위로 이동함 Comment[lt]=Liniuote buvo paslinkta kelis taškus naudojant klaviatūros rodykles. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/ksnapshot/kbackgroundsnapshot.cpp new/kdegraphics-4.1.1/ksnapshot/kbackgroundsnapshot.cpp --- old/kdegraphics-4.1.0/ksnapshot/kbackgroundsnapshot.cpp 2008-06-25 09:54:22.000000000 +0200 +++ new/kdegraphics-4.1.1/ksnapshot/kbackgroundsnapshot.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -88,7 +88,7 @@ void KBackgroundSnapshot::savePictureOnDesktop() { - filename = KUrl( KGlobalSettings::desktopPath()+i18n("snapshot")+"1.png" ); + filename = KUrl( KGlobalSettings::desktopPath()+'/'+i18n("snapshot")+"1.png" ); // Make sure the name is not already being used while(KIO::NetAccess::exists( filename, KIO::NetAccess::DestinationSide, 0L )) { autoincFilename(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/ksnapshot/ksnapshot.cpp new/kdegraphics-4.1.1/ksnapshot/ksnapshot.cpp --- old/kdegraphics-4.1.0/ksnapshot/ksnapshot.cpp 2008-06-03 11:34:16.000000000 +0200 +++ new/kdegraphics-4.1.1/ksnapshot/ksnapshot.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -396,6 +396,8 @@ KUrl url = filename; url.setPass( QString::null ); //krazy:exclude=nullstrassign for old broken gcc conf.writePathEntry("filename",url.url()); + + conf.sync(); e->accept(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/libs/libkdcraw/dcraw/CMakeLists.txt new/kdegraphics-4.1.1/libs/libkdcraw/dcraw/CMakeLists.txt --- old/kdegraphics-4.1.0/libs/libkdcraw/dcraw/CMakeLists.txt 2008-07-28 16:25:49.000000000 +0200 +++ new/kdegraphics-4.1.1/libs/libkdcraw/dcraw/CMakeLists.txt 2008-08-28 10:06:52.000000000 +0200 @@ -29,7 +29,7 @@ IF( NOT WIN32) FIND_LIBRARY(MATH_LIBRARY m) ENDIF( NOT WIN32 ) -KDE4_ADD_EXECUTABLE(kdcraw_bin ${kdcraw_SRCS}) +KDE4_ADD_EXECUTABLE(kdcraw_bin NOGUI ${kdcraw_SRCS}) TARGET_LINK_LIBRARIES(kdcraw_bin ${JPEG_LIBRARY} ${MATH_LIBRARY} ${LCMS_LIBRARIES}) IF( WIN32 ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/libs/libkexiv2/libkexiv2/kexiv2.cpp new/kdegraphics-4.1.1/libs/libkexiv2/libkexiv2/kexiv2.cpp --- old/kdegraphics-4.1.0/libs/libkexiv2/libkexiv2/kexiv2.cpp 2008-07-03 07:05:13.000000000 +0200 +++ new/kdegraphics-4.1.1/libs/libkexiv2/libkexiv2/kexiv2.cpp 2008-08-28 10:06:52.000000000 +0200 @@ -92,6 +92,15 @@ #endif // _XMP_SUPPORT_ } +bool KExiv2::supportTiffWritting() +{ +#if (EXIV2_TEST_VERSION(0,17,91)) + return true; +#else + return false; +#endif +} + QString KExiv2::Exiv2Version() { // Since 0.14.0 release, we can extract run-time version of Exiv2. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/libs/libkexiv2/libkexiv2/kexiv2.h new/kdegraphics-4.1.1/libs/libkexiv2/libkexiv2/kexiv2.h --- old/kdegraphics-4.1.0/libs/libkexiv2/libkexiv2/kexiv2.h 2008-07-03 07:05:13.000000000 +0200 +++ new/kdegraphics-4.1.1/libs/libkexiv2/libkexiv2/kexiv2.h 2008-08-28 10:06:52.000000000 +0200 @@ -122,6 +122,10 @@ */ static bool supportXmp(); + /** Return true if library can writte metadata to TIFF/DNG files + */ + static bool supportTiffWritting(); + /** Return a string version of Exiv2 release in format "major.minor.patch" */ static QString Exiv2Version(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/libs/libkipi/kipiplugin.desktop new/kdegraphics-4.1.1/libs/libkipi/kipiplugin.desktop --- old/kdegraphics-4.1.0/libs/libkipi/kipiplugin.desktop 2008-07-23 10:25:16.000000000 +0200 +++ new/kdegraphics-4.1.1/libs/libkipi/kipiplugin.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -25,6 +25,7 @@ Comment[fr]=Un module externe pour KIPI Comment[ga]=Breiseán KIPI Comment[gl]=Unha extension de KIPI +Comment[hu]=Egy KIPI-bővítmény Comment[is]=KIPI íforrit Comment[it]=Un plugin di KIPI Comment[ja]=Kipi プラグイン diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/libs/libksane/libksane/sane_widget.cpp new/kdegraphics-4.1.1/libs/libksane/libksane/sane_widget.cpp --- old/kdegraphics-4.1.0/libs/libksane/libksane/sane_widget.cpp 2008-06-10 13:40:55.000000000 +0200 +++ new/kdegraphics-4.1.1/libs/libksane/libksane/sane_widget.cpp 2008-08-28 10:06:52.000000000 +0200 @@ -822,10 +822,21 @@ } void KSaneWidget::handleSelection(float tl_x, float tl_y, float br_x, float br_y) { - float max_x, max_y; + + if ((d->optTl == 0) || (d->optTlY == 0) || (d->optBrX == 0) || (d->optBrY == 0)) { + // clear the selection since we can not set one + d->previewArea->setTLX(0); + d->previewArea->setTLY(0); + d->previewArea->setBRX(0); + d->previewArea->setBRY(0); + tl_x = tl_y = br_x = br_y = 0; + return; + } if ((d->previewImg->width()==0) || (d->previewImg->height()==0)) return; + float max_x, max_y; + d->optBrX->getMaxValue(&max_x); d->optBrY->getMaxValue(&max_y); float ftl_x = tl_x*max_x; @@ -833,10 +844,10 @@ float fbr_x = br_x*max_x; float fbr_y = br_y*max_y; - if (d->optTl != 0) d->optTl->setValue(ftl_x); - if (d->optTlY != 0) d->optTlY->setValue(ftl_y); - if (d->optBrX != 0) d->optBrX->setValue(fbr_x); - if (d->optBrY != 0) d->optBrY->setValue(fbr_y); + d->optTl->setValue(ftl_x); + d->optTlY->setValue(ftl_y); + d->optBrX->setValue(fbr_x); + d->optBrY->setValue(fbr_y); } void KSaneWidget::setTLX(float ftlx) @@ -1251,6 +1262,7 @@ } if (d->params.last_frame == SANE_TRUE) { // this is where it all ends well :) + sane_cancel(d->saneHandle); d->readStatus = READ_FINISHED; return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/core/area.cpp new/kdegraphics-4.1.1/okular/core/area.cpp --- old/kdegraphics-4.1.0/okular/core/area.cpp 2008-05-21 10:32:44.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/core/area.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -42,7 +42,11 @@ void NormalizedPoint::transform( const QMatrix &matrix ) { - matrix.map( x, y, &x, &y ); + qreal tmp_x = (qreal)x; + qreal tmp_y = (qreal)y; + matrix.map( tmp_x, tmp_y, &tmp_x, &tmp_y ); + x = tmp_x; + y = tmp_y; } QDebug operator<<( QDebug str, const Okular::NormalizedPoint& p ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/core/document.cpp new/kdegraphics-4.1.1/okular/core/document.cpp --- old/kdegraphics-4.1.0/okular/core/document.cpp 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/core/document.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -592,6 +592,9 @@ { // 1. Create DOM QDomDocument doc( "documentInfo" ); + QDomProcessingInstruction xmlPi = doc.createProcessingInstruction( + QString::fromLatin1( "xml" ), QString::fromLatin1( "version=\"1.0\" encoding=\"utf-8\"" ) ); + doc.appendChild( xmlPi ); QDomElement root = doc.createElement( "documentInfo" ); root.setAttribute( "url", m_url.pathOrUrl() ); doc.appendChild( root ); @@ -653,6 +656,7 @@ // 3. Save DOM to XML file QString xml = doc.toString(); QTextStream os( &infoFile ); + os.setCodec( "UTF-8" ); os << xml; } infoFile.close(); @@ -1365,7 +1369,7 @@ d->m_docFileName = docFile; if ( url.isLocalFile() ) { - QString fn = docFile.contains('/') ? docFile.section('/', -1, -1) : docFile; + QString fn = url.fileName(); document_size = fileReadTest.size(); fn = QString::number( document_size ) + '.' + fn + ".xml"; fileReadTest.close(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/core/okularGenerator.desktop new/kdegraphics-4.1.1/okular/core/okularGenerator.desktop --- old/kdegraphics-4.1.0/okular/core/okularGenerator.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/core/okularGenerator.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -12,6 +12,7 @@ Comment[fr]=Interface du format de fichier d'Okular Comment[ga]=Inneall formáide comhaid le haghaidh Okular Comment[gl]=Infraestrutura dun formato de ficheiro para Okular +Comment[hu]=Fájlformátumkezelő az Okularhoz Comment[is]=Skráasniðsstuðningur fyrir Okular Comment[it]=Backend per i formati di file di Okular Comment[ja]=Okular のファイル形式バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/core/version.h new/kdegraphics-4.1.1/okular/core/version.h --- old/kdegraphics-4.1.0/okular/core/version.h 2008-07-15 21:48:47.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/core/version.h 2008-08-28 10:06:53.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.7" +#define OKULAR_VERSION_STRING "0.7.1" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 7 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 1 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/chm/generator_chm.cpp new/kdegraphics-4.1.1/okular/generators/chm/generator_chm.cpp --- old/kdegraphics-4.1.0/okular/generators/chm/generator_chm.cpp 2008-05-21 10:32:44.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/chm/generator_chm.cpp 2008-08-28 10:06:52.000000000 +0200 @@ -36,7 +36,7 @@ "okular_chm", "okular_chm", ki18n( "CHM Backend" ), - "0.1", + "0.1.1", ki18n( "A Microsoft Windows help file renderer" ), KAboutData::License_GPL, ki18n( "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid" ) @@ -48,6 +48,23 @@ OKULAR_EXPORT_PLUGIN( CHMGenerator, createAboutData() ) +static QString absolutePath( const QString &baseUrl, const QString &path ) +{ + QString absPath; + if ( path.at( 0 ) == QLatin1Char( '/' ) ) + { + // already absolute + absPath = path; + } + else + { + KUrl url = KUrl::fromPath( baseUrl ); + url.setFileName( path ); + absPath = url.toLocalFile(); + } + return absPath; +} + CHMGenerator::CHMGenerator( QObject *parent, const QVariantList &args ) : Okular::Generator( parent, args ) { @@ -143,6 +160,7 @@ void CHMGenerator::preparePageForSyncOperation( int zoom , const QString & url) { KUrl pAddress= "ms-its:" + m_fileName + "::" + url; + m_chmUrl = url; m_syncGen->setZoomFactor(zoom); m_syncGen->openUrl(pAddress); m_syncGen->view()->layout(); @@ -177,6 +195,7 @@ } m_syncGen->closeUrl(); + m_chmUrl = QString(); userMutex()->unlock(); @@ -240,6 +259,7 @@ ) ) * 100; KUrl pAddress= "ms-its:" + m_fileName + "::" + url; + m_chmUrl = url; m_syncGen->setZoomFactor(zoom); m_syncGen->view()->resize(requestWidth,requestHeight); m_request=request; @@ -346,7 +366,7 @@ } else { - Okular::DocumentViewport viewport( metaData( "NamedViewport", '/' + url ).toString() ); + Okular::DocumentViewport viewport( metaData( "NamedViewport", absolutePath( m_chmUrl, url ) ).toString() ); objRects.push_back( new Okular::ObjectRect ( Okular::NormalizedRect(r,xScale,yScale), false, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/chm/generator_chm.h new/kdegraphics-4.1.1/okular/generators/chm/generator_chm.h --- old/kdegraphics-4.1.0/okular/generators/chm/generator_chm.h 2008-02-07 14:19:09.000000000 +0100 +++ new/kdegraphics-4.1.1/okular/generators/chm/generator_chm.h 2008-08-28 10:06:52.000000000 +0200 @@ -60,6 +60,7 @@ LCHMFile* m_file; KHTMLPart *m_syncGen; QString m_fileName; + QString m_chmUrl; Okular::PixmapRequest* m_request; int m_pixmapRequestZoom; Okular::DocumentInfo* m_docInfo; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/chm/libokularGenerator_chmlib.desktop new/kdegraphics-4.1.1/okular/generators/chm/libokularGenerator_chmlib.desktop --- old/kdegraphics-4.1.0/okular/generators/chm/libokularGenerator_chmlib.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/chm/libokularGenerator_chmlib.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -15,6 +15,7 @@ Comment[fr]=Interface d'Okular pour les fichiers d'aide Windows HTMLHelp Comment[ga]=Inneall HTMLHelp Windows le haghaidh Okular Comment[gl]=Infraestrutura de ficheiros Windows HTMLHelp para Okular +Comment[hu]=Windows HTML-es súgókezelő az Okularhoz Comment[is]=Windows HTMLHelp stuðningur fyrir Okular Comment[it]=Backend guida di Windows in HTML per Okular Comment[ja]=Okular の Windows HTML ヘルプ用バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/comicbook/libokularGenerator_comicbook.desktop new/kdegraphics-4.1.1/okular/generators/comicbook/libokularGenerator_comicbook.desktop --- old/kdegraphics-4.1.0/okular/generators/comicbook/libokularGenerator_comicbook.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/comicbook/libokularGenerator_comicbook.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -37,6 +37,7 @@ Comment[fr]=Interface d'Okular pour les bandes dessinés Comment[ga]=Inneall Comic Book le haghaidh Okular Comment[gl]=Infraestruturas de tebeos para Okular +Comment[hu]=Képregénybeolvasó az Okularhoz Comment[is]=ComicBook stuðningur fyrir Okular Comment[it]=Backend Comic book per Okular Comment[ja]=Okular のコミックブック用バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/djvu/generator_djvu.cpp new/kdegraphics-4.1.1/okular/generators/djvu/generator_djvu.cpp --- old/kdegraphics-4.1.0/okular/generators/djvu/generator_djvu.cpp 2008-03-13 08:47:47.000000000 +0100 +++ new/kdegraphics-4.1.1/okular/generators/djvu/generator_djvu.cpp 2008-08-28 10:06:52.000000000 +0200 @@ -66,7 +66,7 @@ "okular_djvu", "okular_djvu", ki18n( "DjVu Backend" ), - "0.1", + "0.1.1", ki18n( "A DjVu backend" ), KAboutData::License_GPL, ki18n( "© 2006-2007 Pino Toscano" ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/djvu/kdjvu.cpp new/kdegraphics-4.1.1/okular/generators/djvu/kdjvu.cpp --- old/kdegraphics-4.1.0/okular/generators/djvu/kdjvu.cpp 2008-03-13 08:47:47.000000000 +0100 +++ new/kdegraphics-4.1.1/okular/generators/djvu/kdjvu.cpp 2008-08-28 10:06:52.000000000 +0200 @@ -479,6 +479,9 @@ #endif handle_ddjvu_messages( m_djvu_cxt, false ); char* imagebuffer = new char[ realwidth * realheight * 4 + 1 ]; + // the following line workarounds a rare crash in djvulibre; + // it should be fixed with >= 3.5.21 + ddjvu_page_get_width( djvupage ); res = ddjvu_page_render( djvupage, DDJVU_RENDER_COLOR, &pagerect, &renderrect, m_format, realwidth * 4, imagebuffer ); #ifdef KDJVU_DEBUG diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/djvu/libokularGenerator_djvu.desktop new/kdegraphics-4.1.1/okular/generators/djvu/libokularGenerator_djvu.desktop --- old/kdegraphics-4.1.0/okular/generators/djvu/libokularGenerator_djvu.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/djvu/libokularGenerator_djvu.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -17,6 +17,7 @@ Comment[fr]=Interface d'Okular pour DjVu Comment[ga]=Inneall DjVu le haghaidh Okular Comment[gl]=Infraestrutura de DjVu para Okular +Comment[hu]=DjVu-beolvasó az Okularhoz Comment[is]=DjVu stuðningur fyrir Okular Comment[it]=Backend DjVu per Okular Comment[ja]=Okular の DjVu バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/dvi/libokularGenerator_dvi.desktop new/kdegraphics-4.1.1/okular/generators/dvi/libokularGenerator_dvi.desktop --- old/kdegraphics-4.1.0/okular/generators/dvi/libokularGenerator_dvi.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/dvi/libokularGenerator_dvi.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -16,6 +16,7 @@ Comment[fr]=Interface d'Okular pour le DVI Comment[ga]=Inneall DVI le haghaidh Okular Comment[gl]=Infraestrutura de DVI para Okular +Comment[hu]=DVI-beolvasó az Okularhoz Comment[is]=DVI stuðningur fyrir Okular Comment[it]=Backend DVI per Okular Comment[ja]=Okular の DVI バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/epub/libokularGenerator_epub.desktop new/kdegraphics-4.1.1/okular/generators/epub/libokularGenerator_epub.desktop --- old/kdegraphics-4.1.0/okular/generators/epub/libokularGenerator_epub.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/epub/libokularGenerator_epub.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -11,6 +11,7 @@ Name[fr]=Document EPub Name[ga]=Cáipéis EPub Name[gl]=Documento EPub +Name[hu]=EPub-dokumentum Name[is]=EPub skjal Name[it]=Documento EPub Name[ja]=EPub 文書 @@ -41,6 +42,7 @@ Comment[fr]=Interface d'Okular pour EPub Comment[ga]=Inneall EPub le haghaidh Okular Comment[gl]=Infraestrutura de EPub para Okular +Comment[hu]=EPub-beolvasó az Okularhoz Comment[is]=EPub stuðningur fyrir Okular Comment[it]=Backend EPub per Okular Comment[ja]=Okular の EPub バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/fictionbook/libokularGenerator_fb.desktop new/kdegraphics-4.1.1/okular/generators/fictionbook/libokularGenerator_fb.desktop --- old/kdegraphics-4.1.0/okular/generators/fictionbook/libokularGenerator_fb.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/fictionbook/libokularGenerator_fb.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -51,6 +51,7 @@ Comment[fr]=Interface d'Okular pour « FictionBook » Comment[ga]=Inneall FictionBook le haghaidh Okular Comment[gl]=Infraestrutura FictionBook para Okular +Comment[hu]=FictionBook-beolvasó az Okularhoz Comment[is]=FictionBook stuðningur fyrir Okular Comment[it]=Backend FictionBook per Okular Comment[ja]=Okular の FictionBook バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/kimgio/libokularGenerator_kimgio.desktop new/kdegraphics-4.1.1/okular/generators/kimgio/libokularGenerator_kimgio.desktop --- old/kdegraphics-4.1.0/okular/generators/kimgio/libokularGenerator_kimgio.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/kimgio/libokularGenerator_kimgio.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -52,6 +52,7 @@ Comment[fr]=Interface d'Okular pour les images Comment[ga]=Inneall íomhánna le haghaidh Okular Comment[gl]=Infraestrutura de imaxes para Okular +Comment[hu]=Képbeolvasó az Okularhoz Comment[is]=Myndmeðhöndlunarstuðningur fyrir Okular Comment[it]=Backend immagini per Okular Comment[ja]=Okular の画像用バックエンド @@ -72,7 +73,7 @@ Comment[zh_CN]=Okular 的图像格式后端 Comment[zh_TW]=Okular 影像後端 X-KDE-ServiceTypes=okular/Generator -MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jpeg2000;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap; +MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jp2;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap; X-KDE-Library=okularGenerator_kimgio X-KDE-Priority=1 X-KDE-okularAPIVersion=1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/kimgio/okularApplication_kimgio.desktop new/kdegraphics-4.1.1/okular/generators/kimgio/okularApplication_kimgio.desktop --- old/kdegraphics-4.1.0/okular/generators/kimgio/okularApplication_kimgio.desktop 2008-07-15 21:48:47.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/kimgio/okularApplication_kimgio.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -1,5 +1,5 @@ [Desktop Entry] -MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jpeg2000;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap; +MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jp2;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap; Terminal=false Name=Okular Name[x-test]=xxOkularxx diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/kimgio/okularKimgio.desktop new/kdegraphics-4.1.1/okular/generators/kimgio/okularKimgio.desktop --- old/kdegraphics-4.1.0/okular/generators/kimgio/okularKimgio.desktop 2008-06-18 14:41:07.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/kimgio/okularKimgio.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -5,4 +5,4 @@ X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart Type=Service -MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jpeg2000;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap; +MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jp2;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/ooo/libokularGenerator_ooo.desktop new/kdegraphics-4.1.1/okular/generators/ooo/libokularGenerator_ooo.desktop --- old/kdegraphics-4.1.0/okular/generators/ooo/libokularGenerator_ooo.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/ooo/libokularGenerator_ooo.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -52,6 +52,7 @@ Comment[fr]=Interface d'Okular pour le format OpenDocument Comment[ga]=Inneall OpenDocument le haghaidh Okular Comment[gl]=Infraestrutura de OpenDocument para Okular +Comment[hu]=OpenDocument-beolvasó az Okularhoz Comment[is]=OpenDocument stuðningur fyrir Okular Comment[it]=Backend OpenDocument per Okular Comment[ja]=Okular の OpenDocument バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/plucker/libokularGenerator_plucker.desktop new/kdegraphics-4.1.1/okular/generators/plucker/libokularGenerator_plucker.desktop --- old/kdegraphics-4.1.0/okular/generators/plucker/libokularGenerator_plucker.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/plucker/libokularGenerator_plucker.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -51,6 +51,7 @@ Comment[fr]=Interface d'Okular pour les fichiers Plucker Comment[ga]=Inneall Plucker le haghaidh Okular Comment[gl]=Infraestrutura de Plucker para Okular +Comment[hu]=Plucker-beolvasó az Okularhoz Comment[is]=Plucker stuðningur fyrir Okular Comment[it]=Backend Plucker per Okular Comment[ja]=Okular の Plucker バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp new/kdegraphics-4.1.1/okular/generators/poppler/generator_pdf.cpp --- old/kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp 2008-07-24 15:48:55.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/poppler/generator_pdf.cpp 2008-08-28 10:06:52.000000000 +0200 @@ -241,7 +241,7 @@ "okular_poppler", "okular_poppler", ki18n( "PDF Backend" ), - "0.1", + "0.1.1", ki18n( "A PDF file renderer" ), KAboutData::License_GPL, ki18n( "© 2005-2008 Albert Astals Cid" ) @@ -261,8 +261,6 @@ setFeature( FontInfo ); setFeature( PrintPostscript ); setFeature( ReadRawData ); - // update the configuration - reparseConfig(); // generate the pixmapGeneratorThread generatorThread = new PDFPixmapGeneratorThread( this ); connect(generatorThread, SIGNAL(finished()), this, SLOT(threadFinished()), Qt::QueuedConnection); @@ -392,7 +390,8 @@ loadPages(pagesVector, 0, false); - setAAOptions(); + // update the configuration + reparseConfig(); // the file has been loaded correctly return true; @@ -839,7 +838,11 @@ pstitle = document()->currentDocument().fileName(); } - bool forceRasterize = pdfOptionsPage->printForceRaster(); + bool forceRasterize = false; + if ( pdfOptionsPage ) + { + forceRasterize = pdfOptionsPage->printForceRaster(); + } Poppler::PSConverter *psConverter = pdfdoc->psConverter(); @@ -865,6 +868,9 @@ { userMutex()->unlock(); delete psConverter; +#ifdef HAVE_POPPLER_0_7 + tf.close(); +#endif int ret = Okular::FilePrinter::printFile( printer, tempfilename, Okular::FilePrinter::SystemDeletesFiles, Okular::FilePrinter::ApplicationSelectsPages, @@ -1538,7 +1544,9 @@ pdfConv->setPDFOptions( pdfConv->pdfOptions() | Poppler::PDFConverter::WithChanges ); QMutexLocker locker( userMutex() ); - return pdfConv->convert(); + bool success = pdfConv->convert(); + delete pdfConv; + return success; #else Q_UNUSED( fileName ) Q_UNUSED( options ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/poppler/libokularGenerator_poppler.desktop new/kdegraphics-4.1.1/okular/generators/poppler/libokularGenerator_poppler.desktop --- old/kdegraphics-4.1.0/okular/generators/poppler/libokularGenerator_poppler.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/poppler/libokularGenerator_poppler.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -17,6 +17,7 @@ Comment[fr]=Interface d'Okular pour les PDF (utilise poppler) Comment[ga]=Inneall PDF a úsáideann poppler le haghaidh Okular Comment[gl]=Infraestrutura de PDF mediante poppler para Okular +Comment[hu]=Poppler-alapú PDF-beolvasó az Okularhoz Comment[is]=PDF stuðningur fyrir Okular í gegnum Poppler Comment[it]=Backend PDF per Okular che utilizza poppler Comment[ja]=Okular の PDF バックエンド (poppler を使用) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/spectre/libokularGenerator_ghostview.desktop new/kdegraphics-4.1.1/okular/generators/spectre/libokularGenerator_ghostview.desktop --- old/kdegraphics-4.1.0/okular/generators/spectre/libokularGenerator_ghostview.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/spectre/libokularGenerator_ghostview.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -19,6 +19,7 @@ Comment[fr]=Interface d'Okular pour les fichiers Ghostscript PS/PDF Comment[ga]=Inneall PS/PDF Ghostscript le haghaidh Okular Comment[gl]=Infraestrutura Ghostscript PS/PDF para Okular +Comment[hu]=Ghostscript PS/PDF-beolvasó az Okularhoz Comment[is]=Ghostscript PS/PDF stuðningur fyrir Okular Comment[it]=Backend Ghostscript PS/PDF per Okular Comment[ja]=Okular の Ghostscript PS/PDF バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/tiff/libokularGenerator_tiff.desktop new/kdegraphics-4.1.1/okular/generators/tiff/libokularGenerator_tiff.desktop --- old/kdegraphics-4.1.0/okular/generators/tiff/libokularGenerator_tiff.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/tiff/libokularGenerator_tiff.desktop 2008-08-28 10:06:52.000000000 +0200 @@ -11,6 +11,7 @@ Name[fr]=Librairie d'Okular pour le format TIFF Name[ga]=Leabharlann TIFF Okular Name[gl]=Biblioteca TIFF de Okular +Name[hu]=Okular TIFF-programkönyvtár Name[is]=Okular TIFF skráasafn Name[it]=Libreria TIFF di Okular Name[ja]=Okular TIFF ライブラリ @@ -42,6 +43,7 @@ Comment[fr]=Interface d'Okular pour les fichiers TIFF Comment[ga]=Inneall TIFF le haghaidh Okular Comment[gl]=Infraestrutura de TIFF para Okular +Comment[hu]=TIFF-beolvasó az Okularhoz Comment[is]=TIFF stuðningur fyrir Okular Comment[it]=Backend TIFF per Okular Comment[ja]=Okular の TIFF バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/xps/generator_xps.cpp new/kdegraphics-4.1.1/okular/generators/xps/generator_xps.cpp --- old/kdegraphics-4.1.0/okular/generators/xps/generator_xps.cpp 2008-07-03 07:05:14.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/xps/generator_xps.cpp 2008-08-28 10:06:52.000000000 +0200 @@ -981,7 +981,7 @@ QVector<qreal> dashPattern( pieces.count() ); bool ok = false; for ( int i = 0; i < pieces.count(); ++i ) { - double value = pieces.at( i ).toInt( &ok ); + qreal value = pieces.at( i ).toInt( &ok ); if ( ok ) { dashPattern[i] = value; } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/generators/xps/libokularGenerator_xps.desktop new/kdegraphics-4.1.1/okular/generators/xps/libokularGenerator_xps.desktop --- old/kdegraphics-4.1.0/okular/generators/xps/libokularGenerator_xps.desktop 2008-07-23 10:25:17.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/generators/xps/libokularGenerator_xps.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -11,6 +11,7 @@ Name[fr]=Module externe XPS pour Okular Name[ga]=Breiseán XPS Okular Name[gl]=Extensión XPS para Okular +Name[hu]=Okular XPS-beolvasó Name[is]=Okular XPS íforritið Name[it]=Plugin XPF per Okular Name[ja]=Okular XPS プラグイン @@ -42,6 +43,7 @@ Comment[fr]=Interface d'Okular pour les fichiers XPS Comment[ga]=Inneall XPS le haghaidh Okular Comment[gl]=Infraestrutura de XPS para Okular +Comment[hu]=XPS-beolvasó az Okularhoz Comment[is]=XPS stuðningur fyrir Okular Comment[it]=Backend XPF per Okular Comment[ja]=Okular の XPS バックエンド diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/shell/shell.cpp new/kdegraphics-4.1.1/okular/shell/shell.cpp --- old/kdegraphics-4.1.0/okular/shell/shell.cpp 2008-03-13 08:47:46.000000000 +0100 +++ new/kdegraphics-4.1.1/okular/shell/shell.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -76,8 +76,8 @@ // tell the KParts::MainWindow that this is indeed the main widget setCentralWidget(m_part->widget()); // and integrate the part's GUI with the shell's - setupGUI(Keys | Save); createGUI(m_part); + setupGUI(Keys | Save); m_showToolBarAction = static_cast<KToggleAction*>(toolBarMenuAction()); m_doc = qobject_cast<KDocumentViewer*>(m_part); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/ui/pageview.cpp new/kdegraphics-4.1.1/okular/ui/pageview.cpp --- old/kdegraphics-4.1.0/okular/ui/pageview.cpp 2008-06-10 13:40:55.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/ui/pageview.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -153,6 +153,8 @@ KToggleAction * aViewContinuous; QAction * aPrevAction; KAction * aToggleForms; + KAction * aSpeakDoc; + KAction * aSpeakPage; KAction * aSpeakStop; KActionCollection * actionCollection; @@ -335,6 +337,8 @@ d->aViewContinuous = 0; d->aPrevAction = 0; d->aToggleForms = 0; + d->aSpeakDoc = 0; + d->aSpeakPage = 0; d->aSpeakStop = 0; d->actionCollection = 0; d->aPageSizes=0; @@ -519,16 +523,15 @@ ta->addAction( d->aMouseTextSelect ); // speak actions - const bool hasTTS = Okular::Settings::useKTTSD(); - KAction *speakDoc = new KAction( KIcon( "text-speak" ), i18n( "Speak Whole Document" ), this ); - ac->addAction( "speak_document", speakDoc ); - speakDoc->setEnabled( hasTTS ); - connect( speakDoc, SIGNAL( triggered() ), SLOT( slotSpeakDocument() ) ); - - KAction *speakPage = new KAction( KIcon( "text-speak" ), i18n( "Speak Current Page" ), this ); - ac->addAction( "speak_current_page", speakPage ); - speakPage->setEnabled( hasTTS ); - connect( speakPage, SIGNAL( triggered() ), SLOT( slotSpeakCurrentPage() ) ); + d->aSpeakDoc = new KAction( KIcon( "text-speak" ), i18n( "Speak Whole Document" ), this ); + ac->addAction( "speak_document", d->aSpeakDoc ); + d->aSpeakDoc->setEnabled( false ); + connect( d->aSpeakDoc, SIGNAL( triggered() ), SLOT( slotSpeakDocument() ) ); + + d->aSpeakPage = new KAction( KIcon( "text-speak" ), i18n( "Speak Current Page" ), this ); + ac->addAction( "speak_current_page", d->aSpeakPage ); + d->aSpeakPage->setEnabled( false ); + connect( d->aSpeakPage, SIGNAL( triggered() ), SLOT( slotSpeakCurrentPage() ) ); d->aSpeakStop = new KAction( KIcon( "media-playback-stop" ), i18n( "Stop Speaking" ), this ); ac->addAction( "speak_stop_all", d->aSpeakStop ); @@ -832,6 +835,12 @@ } d->aToggleAnnotator->setEnabled( allowAnnotations ); } + if ( d->aSpeakDoc ) + { + const bool enablettsactions = haspages ? Okular::Settings::useKTTSD() : false; + d->aSpeakDoc->setEnabled( enablettsactions ); + d->aSpeakPage->setEnabled( enablettsactions ); + } } void PageView::notifyViewportChanged( bool smoothMove ) @@ -2754,6 +2763,7 @@ // if viewport was auto-moving, stop it if ( d->viewportMoveActive ) { + center( d->viewportMoveDest.x(), d->viewportMoveDest.y() ); d->viewportMoveActive = false; d->viewportMoveTimer->stop(); verticalScrollBar()->setEnabled( true ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/ui/pageviewutils.cpp new/kdegraphics-4.1.1/okular/ui/pageviewutils.cpp --- old/kdegraphics-4.1.0/okular/ui/pageviewutils.cpp 2008-06-10 13:40:55.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/ui/pageviewutils.cpp 2008-08-28 10:06:53.000000000 +0200 @@ -102,12 +102,12 @@ return m_zoomFactor; } -qreal PageViewItem::absToPageX( qreal absX ) const +double PageViewItem::absToPageX( double absX ) const { return ( absX - m_uncroppedGeometry.left() ) / m_uncroppedGeometry.width(); } -qreal PageViewItem::absToPageY( qreal absY ) const +double PageViewItem::absToPageY( double absY ) const { return ( absY - m_uncroppedGeometry.top() ) / m_uncroppedGeometry.height(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/okular/VERSION new/kdegraphics-4.1.1/okular/VERSION --- old/kdegraphics-4.1.0/okular/VERSION 2008-07-15 21:48:48.000000000 +0200 +++ new/kdegraphics-4.1.1/okular/VERSION 2008-08-28 10:06:53.000000000 +0200 @@ -1 +1 @@ -okular v0.7 +Okular v0.7.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.0/strigi-analyzer/xps/kfile_xps.desktop new/kdegraphics-4.1.1/strigi-analyzer/xps/kfile_xps.desktop --- old/kdegraphics-4.1.0/strigi-analyzer/xps/kfile_xps.desktop 2008-06-11 10:33:11.000000000 +0200 +++ new/kdegraphics-4.1.1/strigi-analyzer/xps/kfile_xps.desktop 2008-08-28 10:06:53.000000000 +0200 @@ -12,7 +12,7 @@ Name[ga]=Sonraíocht Pháipéir XML Name[gl]=Información da especificación de artigo XML Name[hi]=एक्सएमएल पेपर विशेषता जानकारी -Name[hu]=XML papírmegadási jellemzők +Name[hu]=XML papírleíró jellemzők Name[is]=XML pappírar - skilgreiningar Name[it]=Informazioni PaperSpecification XML Name[ja]=XML 用紙仕様情報 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegames4
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdegames4 checked in at Mon Sep 1 15:01:28 CEST 2008. -------- --- KDE/kdegames4/kdegames4-carddecks.changes 2008-07-30 01:04:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegames4/kdegames4-carddecks.changes 2008-09-01 15:01:03.540819000 +0200 @@ -1,0 +2,11 @@ +Thu Aug 28 14:19:14 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- +Thu Jul 31 22:36:57 CEST 2008 - dmueller(a)suse.de + +- branch diff update + +------------------------------------------------------------------- kdegames4.changes: same change Old: ---- kdegames-4.1.0.tar.bz2 New: ---- kdegames-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegames4-carddecks.spec ++++++ --- /var/tmp/diff_new_pack.N32634/_old 2008-09-01 15:01:13.000000000 +0200 +++ /var/tmp/diff_new_pack.N32634/_new 2008-09-01 15:01:13.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package kdegames4-carddecks (Version 4.1.0) +# spec file for package kdegames4-carddecks (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -16,7 +23,7 @@ Group: System/GUI/KDE Summary: Default Card Decks for KDE Games Url: http://www.kde.org -Version: 4.1.0 +Version: 4.1.1 Release: 1 Source0: kdegames-%version.tar.bz2 Patch0: 4_1_BRANCH.diff @@ -96,6 +103,11 @@ %_kde_share_dir/apps/carddecks/svg-oxygen-white %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php +* Fri Aug 01 2008 dmueller(a)suse.de +- branch diff update * Wed Jul 23 2008 dmueller(a)suse.de - update to 4.1.0 * Fri Jul 18 2008 dmueller(a)suse.de ++++++ kdegames4.spec ++++++ --- /var/tmp/diff_new_pack.N32634/_old 2008-09-01 15:01:13.000000000 +0200 +++ /var/tmp/diff_new_pack.N32634/_new 2008-09-01 15:01:13.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package kdegames4 (Version 4.1.0) +# spec file for package kdegames4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,7 +26,7 @@ Group: System/GUI/KDE Summary: General Data for KDE Games Url: http://www.kde.org -Version: 4.1.0 +Version: 4.1.1 Release: 1 Source0: kdegames-%version.tar.bz2 Source1: _upstream @@ -972,6 +979,11 @@ #%doc %lang(en) /usr/share/doc/kde/HTML/en/kbackgammon %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php +* Fri Aug 01 2008 dmueller(a)suse.de +- branch diff update * Wed Jul 23 2008 dmueller(a)suse.de - update to 4.1.0 * Fri Jul 18 2008 dmueller(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.N32634/_old 2008-09-01 15:01:14.000000000 +0200 +++ /var/tmp/diff_new_pack.N32634/_new 2008-09-01 15:01:14.000000000 +0200 @@ -1,7 +1,7 @@ -package: kdegames-4.0.69.tar.bz2 +package: kdegames-4.1.1.tar.bz2 kdemod: kdegames --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 798435 -+svn di between //trunk/KDE/kdegames@798390 and //trunk/KDE/kdegames ++current HEAD: 853806 ++svn di between //tags/KDE/4.1.1/kdegames and //tags/KDE/4.1.1/kdegames ++++++ kdegames-4.1.0.tar.bz2 -> kdegames-4.1.1.tar.bz2 ++++++ KDE/kdegames4/kdegames-4.1.0.tar.bz2 /mounts/work_src_done/STABLE/kdegames4/kdegames-4.1.1.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeedu4
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdeedu4 checked in at Mon Sep 1 15:01:21 CEST 2008. -------- --- KDE/kdeedu4/kdeedu4.changes 2008-08-19 16:14:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4.changes 2008-08-28 12:33:43.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 28 12:33:17 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- kdeedu4-noarch.changes: same change Old: ---- kdeedu-4.1.0.tar.bz2 New: ---- kdeedu-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu4-noarch.spec ++++++ --- /var/tmp/diff_new_pack.J32014/_old 2008-09-01 15:01:07.000000000 +0200 +++ /var/tmp/diff_new_pack.J32014/_new 2008-09-01 15:01:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4-noarch (Version 4.1.0) +# spec file for package kdeedu4-noarch (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,8 +27,8 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications Url: http://edu.kde.org -Version: 4.1.0 -Release: 23 +Version: 4.1.1 +Release: 1 Source0: kdeedu-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -82,7 +82,7 @@ rm -rf filelists %package -n kde4-marble-data -License: GPL v2 or later +License: LGPL v2.1 or later Group: Amusements/Teaching/Other Summary: Generic map viewer data @@ -129,6 +129,9 @@ %doc COPYING COPYING.DOC README %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php * Tue Aug 19 2008 stbinner(a)suse.de - branch diff update: many Kalzium and Marble bug fixes * Wed Aug 13 2008 dmueller(a)suse.de ++++++ kdeedu4.spec ++++++ --- /var/tmp/diff_new_pack.J32014/_old 2008-09-01 15:01:07.000000000 +0200 +++ /var/tmp/diff_new_pack.J32014/_new 2008-09-01 15:01:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4 (Version 4.1.0) +# spec file for package kdeedu4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -35,8 +35,8 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications Url: http://edu.kde.org -Version: 4.1.0 -Release: 22 +Version: 4.1.1 +Release: 1 Source0: kdeedu-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -228,7 +228,7 @@ %doc COPYING COPYING.DOC README %package -n kde4-marble -License: GPL v2 or later +License: LGPL v2.1 or later Group: Amusements/Teaching/Other Summary: A generic map viewer %kde4_runtime_requires @@ -254,7 +254,7 @@ %dir %_kde4_modules/plugins/marble %package -n kde4-marble-devel -License: GPL v2 or later +License: LGPL v2.1 or later Group: Amusements/Teaching/Other Summary: A generic map viewer: Build Environment Requires: kde4-marble @@ -703,6 +703,9 @@ %dir %_kde_share_dir/apps/libkdeedu %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php * Tue Aug 19 2008 stbinner(a)suse.de - branch diff update: many Kalzium and Marble bug fixes * Wed Aug 13 2008 dmueller(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ ++++ 3392 lines (skipped) ++++ between KDE/kdeedu4/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdeedu4/4_1_BRANCH.diff ++++++ kdeedu-4.1.0.tar.bz2 -> kdeedu-4.1.1.tar.bz2 ++++++ KDE/kdeedu4/kdeedu-4.1.0.tar.bz2 /mounts/work_src_done/STABLE/kdeedu4/kdeedu-4.1.1.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdebase4-workspace checked in at Mon Sep 1 15:00:59 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-08-18 00:09:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-09-01 15:00:20.357857000 +0200 @@ -1,0 +2,17 @@ +Thu Aug 28 14:21:50 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- +Wed Aug 20 22:17:10 CEST 2008 - dmueller(a)suse.de + +- update branch diff +- rediff patch of last change entry to apply properly + +------------------------------------------------------------------- +Wed Aug 20 16:01:35 CEST 2008 - llunak(a)suse.cz + +- move WM selection option to a better place in systemsettings + +------------------------------------------------------------------- kdebase4-workspace.changes: same change Old: ---- kdebase-workspace-4.1.0.tar.bz2 New: ---- kdebase-workspace-4.1.1.tar.bz2 wm-switch-systemsettings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.P29492/_old 2008-09-01 15:00:44.000000000 +0200 +++ /var/tmp/diff_new_pack.P29492/_new 2008-09-01 15:00:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.1.0) +# spec file for package kdebase4-wallpapers (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.1.0 -Release: 19 +Version: 4.1.1 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -66,6 +66,14 @@ /usr/share/wallpapers %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php +* Thu Aug 21 2008 dmueller(a)suse.de +- update branch diff +- rediff patch of last change entry to apply properly +* Wed Aug 20 2008 llunak(a)suse.cz +- move WM selection option to a better place in systemsettings * Sat Aug 16 2008 stbinner(a)suse.de - branch diff update - fix debuginfo requires ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.P29492/_old 2008-09-01 15:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.P29492/_new 2008-09-01 15:00:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.1.0) +# spec file for package kdebase4-workspace (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,8 +33,8 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.1.0 -Release: 16 +Version: 4.1.1 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source2: titlebar_decor.png Source90: _upstream @@ -64,6 +64,7 @@ Patch87: klipperrc.diff Patch88: kde4-migrate.diff Patch89: no-kdefakes-link.diff +Patch90: wm-switch-systemsettings.diff %kde4_runtime_requires Conflicts: yast2-theme-NLD %if %suse_version > 1030 @@ -119,6 +120,7 @@ %patch87 %patch88 %patch89 +%patch90 %build %cmake_kde4 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE4_KCHECKPASS_PAM_SERVICE=xdm @@ -529,7 +531,6 @@ %_kde_share_dir/apps/kfontinst %_kde_share_dir/apps/kfontview %_kde_share_dir/apps/kmenuedit -%_kde_share_dir/apps/ksmserver %_kde_share_dir/apps/ksplash %_kde_share_dir/apps/ksysguard %_kde_share_dir/apps/kthememanager @@ -725,6 +726,14 @@ /usr/share/kde4/apps/kconf_update/plasma-add-shortcut-to-menu.upd %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php +* Thu Aug 21 2008 dmueller(a)suse.de +- update branch diff +- rediff patch of last change entry to apply properly +* Wed Aug 20 2008 llunak(a)suse.cz +- move WM selection option to a better place in systemsettings * Sat Aug 16 2008 stbinner(a)suse.de - branch diff update - fix debuginfo requires ++++++ 4_1_BRANCH.diff ++++++ ++++ 7580 lines (skipped) ++++ between KDE/kdebase4-workspace/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/4_1_BRANCH.diff ++++++ kdebase-workspace-4.1.0.tar.bz2 -> kdebase-workspace-4.1.1.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.1.0.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.1.1.tar.bz2 differ: byte 11, line 1 ++++++ plasma.diff ++++++ --- /var/tmp/diff_new_pack.P29492/_old 2008-09-01 15:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.P29492/_new 2008-09-01 15:00:45.000000000 +0200 @@ -1,7 +1,5 @@ -Index: libs/plasma/theme.cpp -=================================================================== ---- libs/plasma/theme.cpp (revision 832721) -+++ libs/plasma/theme.cpp (working copy) +--- libs/plasma/theme.cpp ++++ libs/plasma/theme.cpp @@ -50,7 +50,6 @@ public: ThemePrivate(Theme *theme) @@ -44,10 +42,8 @@ return fullPath; } -Index: plasma/applets/lock_logout/lockout.cpp -=================================================================== ---- plasma/applets/lock_logout/lockout.cpp (revision 832782) -+++ plasma/applets/lock_logout/lockout.cpp (working copy) +--- plasma/applets/lock_logout/lockout.cpp ++++ plasma/applets/lock_logout/lockout.cpp @@ -47,12 +47,14 @@ m_layout->setSpacing(0); @@ -64,10 +60,8 @@ } LockOut::~LockOut() -Index: plasma/applets/kickoff/simpleapplet/simpleapplet.cpp -=================================================================== ---- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (revision 832721) -+++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (working copy) +--- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp ++++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp @@ -30,6 +30,7 @@ #include <QMetaEnum> #include <QPointer> @@ -97,10 +91,8 @@ d->addItem(d->formatComboBox, i18nc("@item:inlistbox Format:", "Description (Name)"), MenuLauncherApplet::DescriptionName); l->addWidget(d->formatComboBox, 1, 1); -Index: plasma/applets/kickoff/applet/applet.cpp -=================================================================== ---- plasma/applets/kickoff/applet/applet.cpp (revision 832721) -+++ plasma/applets/kickoff/applet/applet.cpp (working copy) +--- plasma/applets/kickoff/applet/applet.cpp ++++ plasma/applets/kickoff/applet/applet.cpp @@ -29,6 +29,7 @@ #include <QVBoxLayout> #include <QLabel> @@ -121,10 +113,8 @@ d->icon->setFlag(ItemIsMovable, false); connect(d->icon, SIGNAL(pressed(bool)), this, SLOT(toggleMenu(bool))); connect(this, SIGNAL(activate()), this, SLOT(toggleMenu())); -Index: plasma/applets/kickoff/core/systemmodel.cpp -=================================================================== ---- plasma/applets/kickoff/core/systemmodel.cpp (revision 832725) -+++ plasma/applets/kickoff/core/systemmodel.cpp (working copy) +--- plasma/applets/kickoff/core/systemmodel.cpp ++++ plasma/applets/kickoff/core/systemmodel.cpp @@ -87,7 +87,7 @@ connect(placesModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), q, SLOT(sourceRowsRemoved(QModelIndex,int,int))); @@ -178,10 +168,8 @@ } } -Index: plasma/applets/kickoff/core/leavemodel.cpp -=================================================================== ---- plasma/applets/kickoff/core/leavemodel.cpp (revision 832725) -+++ plasma/applets/kickoff/core/leavemodel.cpp (working copy) +--- plasma/applets/kickoff/core/leavemodel.cpp ++++ plasma/applets/kickoff/core/leavemodel.cpp @@ -27,6 +27,8 @@ #include <KLocalizedString> #include <KIcon> @@ -282,10 +270,8 @@ // Shutdown QStandardItem *shutDownOption = createStandardItem("leave:/shutdown"); systemOptions->appendRow(shutDownOption); -Index: plasma/applets/kickoff/core/itemhandlers.cpp -=================================================================== ---- plasma/applets/kickoff/core/itemhandlers.cpp (revision 832725) -+++ plasma/applets/kickoff/core/itemhandlers.cpp (working copy) +--- plasma/applets/kickoff/core/itemhandlers.cpp ++++ plasma/applets/kickoff/core/itemhandlers.cpp @@ -29,6 +29,8 @@ #include <KToolInvocation> #include <KUrl> @@ -380,10 +366,8 @@ + if (job != 0) + job->start(); +} -Index: plasma/applets/kickoff/core/leavemodel.h -=================================================================== ---- plasma/applets/kickoff/core/leavemodel.h (revision 832725) -+++ plasma/applets/kickoff/core/leavemodel.h (working copy) +--- plasma/applets/kickoff/core/leavemodel.h ++++ plasma/applets/kickoff/core/leavemodel.h @@ -36,6 +36,8 @@ static QStandardItem* createStandardItem(const QString& url); @@ -393,10 +377,8 @@ private: class Private; Private * const d; -Index: plasma/applets/kickoff/core/models.cpp -=================================================================== ---- plasma/applets/kickoff/core/models.cpp (revision 832725) -+++ plasma/applets/kickoff/core/models.cpp (working copy) +--- plasma/applets/kickoff/core/models.cpp ++++ plasma/applets/kickoff/core/models.cpp @@ -155,7 +155,19 @@ { KConfigGroup appsGroup = componentData().config()->group("SystemApplications"); @@ -418,10 +400,8 @@ apps = appsGroup.readEntry("DesktopFiles", apps); return apps; } -Index: plasma/applets/kickoff/core/favoritesmodel.cpp -=================================================================== ---- plasma/applets/kickoff/core/favoritesmodel.cpp (revision 832725) -+++ plasma/applets/kickoff/core/favoritesmodel.cpp (working copy) +--- plasma/applets/kickoff/core/favoritesmodel.cpp ++++ plasma/applets/kickoff/core/favoritesmodel.cpp @@ -85,12 +85,14 @@ static QList<QString> defaultFavorites() { @@ -439,10 +419,8 @@ if (service) { desktopFiles << service->entryPath(); } -Index: plasma/applets/kickoff/core/itemhandlers.h -=================================================================== ---- plasma/applets/kickoff/core/itemhandlers.h (revision 832725) -+++ plasma/applets/kickoff/core/itemhandlers.h (working copy) +--- plasma/applets/kickoff/core/itemhandlers.h ++++ plasma/applets/kickoff/core/itemhandlers.h @@ -42,6 +42,10 @@ void logout(); void lock(); @@ -454,10 +432,8 @@ private: QString m_logoutAction; -Index: plasma/applets/kickoff/core/applicationmodel.cpp -=================================================================== ---- plasma/applets/kickoff/core/applicationmodel.cpp (revision 832725) -+++ plasma/applets/kickoff/core/applicationmodel.cpp (working copy) +--- plasma/applets/kickoff/core/applicationmodel.cpp ++++ plasma/applets/kickoff/core/applicationmodel.cpp @@ -110,6 +110,8 @@ static bool AppNodeLessThan(AppNode *n1, AppNode *n2); @@ -827,10 +803,8 @@ /** * FIXME This is a temporary workaround to map the icon names found * in the desktop directory files (from /usr/share/desktop-directories) -Index: plasma/applets/kickoff/core/applicationmodel.h -=================================================================== ---- plasma/applets/kickoff/core/applicationmodel.h (revision 832725) -+++ plasma/applets/kickoff/core/applicationmodel.h (working copy) +--- plasma/applets/kickoff/core/applicationmodel.h ++++ plasma/applets/kickoff/core/applicationmodel.h @@ -86,10 +86,15 @@ void slotReloadMenu(); void checkSycocaChange(); @@ -847,10 +821,8 @@ Q_DISABLE_COPY(ApplicationModel) }; -Index: plasma/applets/kickoff/ui/launcher.cpp -=================================================================== ---- plasma/applets/kickoff/ui/launcher.cpp (revision 832721) -+++ plasma/applets/kickoff/ui/launcher.cpp (working copy) +--- plasma/applets/kickoff/ui/launcher.cpp ++++ plasma/applets/kickoff/ui/launcher.cpp @@ -80,6 +80,7 @@ , urlLauncher(new UrlItemLauncher(launcher)) , resizeHandle(0) @@ -901,39 +873,8 @@ } void Launcher::resultsAvailable() -Index: plasma/applets/kickoff/CMakeLists.txt -=================================================================== ---- plasma/applets/kickoff/CMakeLists.txt (revision 832721) -+++ plasma/applets/kickoff/CMakeLists.txt (working copy) -@@ -33,6 +33,8 @@ - QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${screensaver_xml} screensaver_interface) - set(krunner_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/org.kde.krunner.Interface.xml) - QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${krunner_xml} krunner_interface) -+set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) -+QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${ksmserver_xml} ksmserver_interface) - - set ( Kickoff_LIBS - ${KDE4_KIO_LIBS} -@@ -60,13 +62,13 @@ - # Kickoff Plasma Applet - set ( Applet_SRCS ${Kickoff_SRCS} applet/applet.cpp ) - kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS}) --target_link_libraries(plasma_applet_launcher plasma ${Kickoff_LIBS}) -+target_link_libraries(plasma_applet_launcher plasma solidcontrol ${Kickoff_LIBS}) - install(TARGETS plasma_applet_launcher DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES applet/plasma-applet-launcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - - # Simple KMenu Plasma Applet - set ( SimpleApplet_SRCS ${Kickoff_SRCS} simpleapplet/menuview.cpp simpleapplet/simpleapplet.cpp ) - kde4_add_plugin(plasma_applet_simplelauncher ${SimpleApplet_SRCS}) --target_link_libraries(plasma_applet_simplelauncher plasma ${Kickoff_LIBS}) -+target_link_libraries(plasma_applet_simplelauncher plasma solidcontrol ${Kickoff_LIBS}) - install(TARGETS plasma_applet_simplelauncher DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES simpleapplet/plasma-applet-simplelauncher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -Index: plasma/plasma/desktopcorona.cpp -=================================================================== ---- plasma/plasma/desktopcorona.cpp (revision 832721) -+++ plasma/plasma/desktopcorona.cpp (working copy) +--- plasma/plasma/desktopcorona.cpp ++++ plasma/plasma/desktopcorona.cpp @@ -23,6 +23,7 @@ #include <QDesktopWidget> #include <QDir> @@ -975,3 +916,31 @@ foreach (Plasma::Applet* applet, panel->applets()) { applet->init(); applet->flushPendingConstraintsEvents(); +--- plasma/applets/kickoff/CMakeLists.txt ++++ plasma/applets/kickoff/CMakeLists.txt +@@ -33,6 +33,9 @@ set(screensaver_xml ${KDEBASE_WORKSPACE_ + QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${screensaver_xml} screensaver_interface) + set(krunner_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/org.kde.krunner.Interface.xml) + QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${krunner_xml} krunner_interface) ++set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${ksmserver_xml} ksmserver_interface) ++ + if(NOT WIN32) + set ( Kickoff_LIBS + ${KDE4_KIO_LIBS} +@@ -63,13 +66,13 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) + # Kickoff Plasma Applet + set ( Applet_SRCS ${Kickoff_SRCS} applet/applet.cpp ) + kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS}) +-target_link_libraries(plasma_applet_launcher plasma ${Kickoff_LIBS}) ++target_link_libraries(plasma_applet_launcher plasma solidcontrol ${Kickoff_LIBS}) + install(TARGETS plasma_applet_launcher DESTINATION ${PLUGIN_INSTALL_DIR}) + install(FILES applet/plasma-applet-launcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + + # Simple KMenu Plasma Applet + set ( SimpleApplet_SRCS ${Kickoff_SRCS} simpleapplet/menuview.cpp simpleapplet/simpleapplet.cpp ) + kde4_add_plugin(plasma_applet_simplelauncher ${SimpleApplet_SRCS}) +-target_link_libraries(plasma_applet_simplelauncher plasma ${Kickoff_LIBS}) ++target_link_libraries(plasma_applet_simplelauncher plasma solidcontrol ${Kickoff_LIBS}) + install(TARGETS plasma_applet_simplelauncher DESTINATION ${PLUGIN_INSTALL_DIR}) + install(FILES simpleapplet/plasma-applet-simplelauncher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) ++++++ systemsettings-desktop.diff ++++++ --- /var/tmp/diff_new_pack.P29492/_old 2008-09-01 15:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.P29492/_new 2008-09-01 15:00:45.000000000 +0200 @@ -1,6 +1,6 @@ ---- ./systemsettings/systemsettings.desktop 2008/02/18 09:32:23 1.2 -+++ ./systemsettings/systemsettings.desktop 2008/02/18 09:32:52 -@@ -5,7 +5,7 @@ +--- systemsettings/systemsettings.desktop ++++ systemsettings/systemsettings.desktop +@@ -5,7 +5,7 @@ Type=Application X-DocPath=systemsettings/index.html X-KDE-StartupNotify=true @@ -8,8 +8,8 @@ +GenericName=Configure Desktop GenericName[ar]=إعدادات النظام GenericName[bg]=Системни настройки - GenericName[ca]=Arranjament del sistema -@@ -54,7 +54,7 @@ + GenericName[bn_IN]=সিস্টেম সংক্রান্ত বৈশিষ্ট্য +@@ -65,7 +65,7 @@ GenericName[x-test]=xxSystem Settingsxx GenericName[zh_CN]=系统设置 GenericName[zh_TW]=系統設定 @@ -18,11 +18,9 @@ Name[ar]=إعدادات النظام Name[be]=Сістэмныя настаўленні Name[bg]=Системни настройки ---- systemsettings/systemsettings.desktop 2008/08/05 12:02:59 1.37 -+++ systemsettings/systemsettings.desktop 2008/08/05 12:05:21 -@@ -133,4 +133,3 @@ +@@ -132,4 +132,4 @@ Name[zh_CN]=系统设置 + Name[zh_TW]=系統設定 X-DBUS-StartupType=Unique -Categories=Qt;KDE;System; --NoDisplay=true +Categories=Qt;KDE;X-SuSE-core;Qt;Core; ++++++ wm-switch-systemsettings.diff ++++++ Subject: Move the window manager selection UI to 'default applications' control module From: Lubos Lunak Patch-upstream: r847440 Relates: kdebase4-workspace/wm-switch-systemsettings.diff Move the window manager selection UI option (i.e. mainly Compiz switch) to a more prominent and logical place, the 'default applications' control module. --- ksmserver/kcm/smserverconfigdlg.ui +++ ksmserver/kcm/smserverconfigdlg.ui @@ -6,7 +6,7 @@ <x>0</x> <y>0</y> <width>325</width> - <height>478</height> + <height>433</height> </rect> </property> <property name="windowTitle" > @@ -125,18 +125,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="windowManagerGroup" > - <property name="title" > - <string>Window Manager</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QComboBox" name="windowManagerCombo" /> - </item> - </layout> - </widget> - </item> - <item> <widget class="QGroupBox" name="advancedGroup" > <property name="title" > <string>Advanced</string> --- ksmserver/kcm/smserverconfigimpl.cpp +++ ksmserver/kcm/smserverconfigimpl.cpp @@ -28,7 +28,6 @@ connect(rebootRadio,SIGNAL(toggled(bool)), SLOT(configChanged())); connect(excludeLineedit,SIGNAL(textChanged(QString)),SLOT(configChanged())); connect(offerShutdownCheck,SIGNAL(toggled(bool)),SLOT(configChanged())); - connect(windowManagerCombo,SIGNAL(activated(int)),SLOT(configChanged())); } SMServerConfigImpl::~SMServerConfigImpl(){ } --- ksmserver/kcm/kcmsmserver.cpp +++ ksmserver/kcm/kcmsmserver.cpp @@ -63,8 +63,6 @@ connect(dialog, SIGNAL(changed()), SLOT(changed())); topLayout->addWidget(dialog); - - KGlobal::dirs()->addResourceType( "windowmanagers", "data", "ksmserver/windowmanagers" ); } void SMServerConfig::load() @@ -94,7 +92,6 @@ dialog->logoutRadio->setChecked(true); break; } - loadWMs(c.readEntry("windowManager", "kwin")); dialog->excludeLineedit->setText( c.readEntry("excludeApps")); emit changed(false); @@ -102,8 +99,8 @@ void SMServerConfig::save() { - KConfig *c = new KConfig("ksmserverrc", KConfig::NoGlobals); - KConfigGroup group = c->group("General"); + KConfig c("ksmserverrc", KConfig::NoGlobals); + KConfigGroup group = c.group("General"); group.writeEntry( "confirmLogout", dialog->confirmLogoutCheck->isChecked()); group.writeEntry( "offerShutdown", dialog->offerShutdownCheck->isChecked()); QString s = "restorePreviousLogout"; @@ -119,21 +116,13 @@ dialog->rebootRadio->isChecked() ? int(KWorkSpace::ShutdownTypeReboot) : int(KWorkSpace::ShutdownTypeNone)); - group.writeEntry("windowManager", currentWM()); group.writeEntry("excludeApps", dialog->excludeLineedit->text()); - c->sync(); - delete c; + c.sync(); # if 0 // update the k menu if necessary QDBusInterface kicker("org.kde.kicker", "/kicker", "org.kde.kicker"); kicker.call("configure"); #endif - if( oldwm != currentWM()) - { // TODO switch it already in the session instead and tell ksmserver - KMessageBox::information( this, - i18n( "The new window manager will be used when KDE is started the next time." ), - i18n( "Window manager change" ), "windowmanagerchange" ); - } } void SMServerConfig::defaults() @@ -143,55 +132,7 @@ dialog->offerShutdownCheck->setChecked(true); dialog->sdGroup->setEnabled(true); dialog->logoutRadio->setChecked(true); - dialog->windowManagerCombo->setCurrentIndex( 0 ); dialog->excludeLineedit->clear(); } -void SMServerConfig::loadWMs( const QString& current ) -{ - QString kwinname = i18n( "KWin (KDE default)" ); - dialog->windowManagerCombo->addItem( kwinname ); - dialog->windowManagerCombo->setCurrentIndex( 0 ); - wms[ kwinname ] = "kwin"; - oldwm = "kwin"; - QStringList list = KGlobal::dirs()->findAllResources( "windowmanagers", QString(), KStandardDirs::NoDuplicates ); - QRegExp reg( ".*/([^/\\.]*)\\.[^/\\.]*" ); - foreach( QString wmfile, list ) - { - KDesktopFile file( wmfile ); - if( file.noDisplay()) - continue; - if( !file.tryExec()) - continue; - QString testexec = file.desktopGroup().readEntry( "X-KDE-WindowManagerTestExec" ); - if( !testexec.isEmpty()) - { - KProcess proc; - proc.setShellCommand( testexec ); - if( proc.execute() != 0 ) - continue; - } - QString name = file.readName(); - if( name.isEmpty()) - continue; - if( !reg.exactMatch( wmfile )) - continue; - QString wm = reg.cap( 1 ); - if( wms.values().contains( wm )) - continue; - wms[ name ] = wm; - dialog->windowManagerCombo->addItem( name ); - if( wms[ name ] == current ) // make it selected - { - dialog->windowManagerCombo->setCurrentIndex( dialog->windowManagerCombo->count() - 1 ); - oldwm = wm; - } - } -} - -QString SMServerConfig::currentWM() const -{ - return wms[ dialog->windowManagerCombo->currentText() ]; -} - #include "kcmsmserver.moc" --- ksmserver/kcm/kcmsmserver.h +++ ksmserver/kcm/kcmsmserver.h @@ -40,10 +40,6 @@ void defaults(); private: - void loadWMs( const QString& current ); - QString currentWM() const; - QHash< QString, QString > wms; // i18n text -> internal name - QString oldwm; // the original value SMServerConfigImpl* dialog; }; --- ksmserver/CMakeLists.txt +++ ksmserver/CMakeLists.txt @@ -1,5 +1,4 @@ add_subdirectory( kcm ) -add_subdirectory( windowmanagers ) add_subdirectory( tests ) include_directories( ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebindings4
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdebindings4 checked in at Mon Sep 1 15:00:52 CEST 2008. -------- --- KDE/kdebindings4/kdebindings4.changes 2008-08-18 12:16:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.changes 2008-08-28 15:52:54.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 28 15:52:33 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.1 + +------------------------------------------------------------------- python-kde4.changes: same change ruby-kde4.changes: same change Old: ---- kdebindings-4.1.0.tar.bz2 New: ---- kdebindings-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings4.spec ++++++ --- /var/tmp/diff_new_pack.M27641/_old 2008-09-01 15:00:32.000000000 +0200 +++ /var/tmp/diff_new_pack.M27641/_new 2008-09-01 15:00:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebindings4 (Version 4.1.0) +# spec file for package kdebindings4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,8 +30,8 @@ License: LGPL v2.1 or later Group: Development/Libraries/KDE Summary: Bindings for KDE 4.x libraries -Version: 4.1.0 -Release: 5 +Version: 4.1.1 +Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -238,6 +238,8 @@ %endif %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 * Mon Aug 18 2008 stbinner(a)suse.de - fix build of ruby-kde4 * Thu Aug 07 2008 dmueller(a)suse.de ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.M27641/_old 2008-09-01 15:00:32.000000000 +0200 +++ /var/tmp/diff_new_pack.M27641/_new 2008-09-01 15:00:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-kde4 (Version 4.1.0) +# spec file for package python-kde4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,8 +30,8 @@ License: LGPL v2.1 or later Group: Development/Libraries/KDE Summary: Python Bindings for KDE 4.x Platform -Version: 4.1.0 -Release: 17 +Version: 4.1.1 +Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -238,6 +238,8 @@ %endif %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 * Mon Aug 18 2008 stbinner(a)suse.de - fix build of ruby-kde4 * Thu Aug 07 2008 dmueller(a)suse.de ++++++ ruby-kde4.spec ++++++ --- /var/tmp/diff_new_pack.M27641/_old 2008-09-01 15:00:32.000000000 +0200 +++ /var/tmp/diff_new_pack.M27641/_new 2008-09-01 15:00:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ruby-kde4 (Version 4.1.0) +# spec file for package ruby-kde4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,8 +30,8 @@ License: LGPL v2.1 or later Group: Development/Libraries/KDE Summary: Ruby bindings for KDE 4 -Version: 4.1.0 -Release: 5 +Version: 4.1.1 +Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -238,6 +238,8 @@ %endif %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 * Mon Aug 18 2008 stbinner(a)suse.de - fix build of ruby-kde4 * Thu Aug 07 2008 dmueller(a)suse.de ++++++ kdebindings-4.1.0.tar.bz2 -> kdebindings-4.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/akonadi/CMakeLists.txt new/kdebindings-4.1.1/csharp/akonadi/CMakeLists.txt --- old/kdebindings-4.1.0/csharp/akonadi/CMakeLists.txt 2008-07-24 14:56:34.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/akonadi/CMakeLists.txt 2008-08-28 10:06:45.000000000 +0200 @@ -18,7 +18,15 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES}) LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH}) ADD_LIBRARY(akonadi-sharp MODULE ${SRC_CPP}) -TARGET_LINK_LIBRARIES(akonadi-sharp smokeqt smokeakonadi qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) +TARGET_LINK_LIBRARIES(akonadi-sharp + smokeqt + smokekde + smokeakonadi + qyotoshared + akonadi-kde + akonadi-kmime + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY}) SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/kde-dotnet.dll -warn:0 -keyfile:${KEYFILE}) ADD_CS_LIBRARY(akonadi "${SRC_CS}" ALL) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/akonadi/src/Akonadi.cs new/kdebindings-4.1.1/csharp/akonadi/src/Akonadi.cs --- old/kdebindings-4.1.0/csharp/akonadi/src/Akonadi.cs 2008-07-23 10:25:00.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/akonadi/src/Akonadi.cs 2008-08-28 10:06:45.000000000 +0200 @@ -7,10 +7,10 @@ public class InitAkonadi { [DllImport("libakonadi-sharp", CharSet=CharSet.Ansi)] - static extern void Init_Akonadi(); + static extern void Init_akonadi(); public static void InitSmoke() { - Init_Akonadi(); + Init_akonadi(); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/akonadi/src/akonadihandlers.cpp new/kdebindings-4.1.1/csharp/akonadi/src/akonadihandlers.cpp --- old/kdebindings-4.1.0/csharp/akonadi/src/akonadihandlers.cpp 2008-07-23 10:25:00.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/akonadi/src/akonadihandlers.cpp 2008-08-28 10:06:45.000000000 +0200 @@ -28,11 +28,11 @@ #include <akonadi/item.h> DEF_LIST_MARSHALLER( AkonadiAttributeList, QList<Akonadi::Attribute*>, Akonadi::Attribute ) + DEF_VALUELIST_MARSHALLER( AkonadiAgentInstanceList, QList<Akonadi::AgentInstance>, Akonadi::AgentInstance ) DEF_VALUELIST_MARSHALLER( AkonadiAgentTypeList, QList<Akonadi::AgentType>, Akonadi::AgentType ) DEF_VALUELIST_MARSHALLER( AkonadiCollectionList, QList<Akonadi::Collection>, Akonadi::Collection ) DEF_VALUELIST_MARSHALLER( AkonadiItemList, QList<Akonadi::Item>, Akonadi::Item ) -DEF_VALUELIST_MARSHALLER( QModelIndexList, QList<QModelIndex>, QModelIndex ) TypeHandler Akonadi_handlers[] = { { "QList<Akonadi::AgentInstance>", marshall_AkonadiAgentInstanceList }, @@ -42,7 +42,5 @@ { "QList<Akonadi::Collection>&", marshall_AkonadiCollectionList }, { "QList<Akonadi::Item>", marshall_AkonadiItemList }, { "QList<Akonadi::Item>&", marshall_AkonadiItemList }, - { "QList<QModelIndex>", marshall_QModelIndexList }, - { "QList<QModelIndex>&", marshall_QModelIndexList }, { 0, 0 } }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/kimono/kde/KApplication.cs new/kdebindings-4.1.1/csharp/kimono/kde/KApplication.cs --- old/kdebindings-4.1.0/csharp/kimono/kde/KApplication.cs 2008-07-23 10:25:07.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/kimono/kde/KApplication.cs 2008-08-28 10:06:46.000000000 +0200 @@ -60,10 +60,12 @@ public KApplication(bool GUIenabled) : this((Type) null) { CreateProxy(); interceptor.Invoke("KApplication$", "KApplication(bool)", typeof(void), typeof(bool), GUIenabled); + qApp = this; } public KApplication() : this((Type) null) { CreateProxy(); interceptor.Invoke("KApplication", "KApplication()", typeof(void)); + qApp = this; } /// <remarks> /// Returns the application session config object. @@ -235,6 +237,7 @@ public KApplication(bool GUIenabled, KComponentData cData) : this((Type) null) { CreateProxy(); interceptor.Invoke("KApplication$#", "KApplication(bool, const KComponentData&)", typeof(void), typeof(bool), GUIenabled, typeof(KComponentData), cData); + qApp = this; } ~KApplication() { interceptor.Invoke("~KApplication", "~KApplication()", typeof(void)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/nepomuk/src/Nepomuk.cs new/kdebindings-4.1.1/csharp/nepomuk/src/Nepomuk.cs --- old/kdebindings-4.1.0/csharp/nepomuk/src/Nepomuk.cs 2008-07-23 10:25:08.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/nepomuk/src/Nepomuk.cs 2008-08-28 10:06:46.000000000 +0200 @@ -7,10 +7,10 @@ public class InitNepomuk { [DllImport("libnepomuk-sharp", CharSet=CharSet.Ansi)] - static extern void Init_Nepomuk(); + static extern void Init_nepomuk(); public static void InitSmoke() { - Init_Nepomuk(); + Init_nepomuk(); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/plasma/CMakeLists.txt new/kdebindings-4.1.1/csharp/plasma/CMakeLists.txt --- old/kdebindings-4.1.0/csharp/plasma/CMakeLists.txt 2008-07-24 14:56:34.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/plasma/CMakeLists.txt 2008-08-28 10:06:46.000000000 +0200 @@ -34,7 +34,7 @@ SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/qtwebkit.dll -r:${LIBRARY_OUTPUT_PATH}/kde-dotnet.dll -warn:0 -keyfile:${KEYFILE}) ADD_CS_LIBRARY(plasma "${SRC_CS}" ALL) -ADD_DEPENDENCIES(plasma qtwebkit) +ADD_DEPENDENCIES(plasma qtwebkit kde-dotnet) SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/kde-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/plasma.dll -warn:0 -keyfile:${KEYFILE}) ADD_CS_LIBRARY(PlasmaScriptengineKimono "${SRC_PLASMASCRIPTENGINEKIMONO}" ALL) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/plasma/examples/applets/tiger/contents/code/CMakeLists.txt new/kdebindings-4.1.1/csharp/plasma/examples/applets/tiger/contents/code/CMakeLists.txt --- old/kdebindings-4.1.0/csharp/plasma/examples/applets/tiger/contents/code/CMakeLists.txt 2008-07-08 11:27:40.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/plasma/examples/applets/tiger/contents/code/CMakeLists.txt 2008-08-28 10:06:46.000000000 +0200 @@ -3,3 +3,4 @@ -r:${LIBRARY_OUTPUT_PATH}/kde-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/plasma.dll -target:library -target:library ) ADD_CS_EXECUTABLE(main ${SRC_TIGER} ALL) +ADD_DEPENDENCIES(main kde-dotnet plasma) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/plasma/src/PlasmaScriptengineKimono_Applet.cs new/kdebindings-4.1.1/csharp/plasma/src/PlasmaScriptengineKimono_Applet.cs --- old/kdebindings-4.1.0/csharp/plasma/src/PlasmaScriptengineKimono_Applet.cs 2008-07-08 11:27:39.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/plasma/src/PlasmaScriptengineKimono_Applet.cs 2008-08-28 10:06:46.000000000 +0200 @@ -38,16 +38,40 @@ public Applet(QObject parent, List<QVariant> args) : base(parent) {} public override bool Init() { - Applet().Resize(200, 200); + QSizeF oldSize = Applet().Size; QFileInfo program = new QFileInfo(MainScript()); appletAssembly = Assembly.LoadFile(program.AbsoluteFilePath()); + + // the newly loaded assembly might contain reference other bindings that need to be initialized + foreach (AssemblyName an in appletAssembly.GetReferencedAssemblies()) { + // if the binding has already been initialized (e.g. in SmokeInvocation.InitRuntime()), continue. + Assembly a = Assembly.Load(an); + if (SmokeInvocation.InitializedAssemblies.Contains(a)) continue; + AssemblySmokeInitializer attr = (AssemblySmokeInitializer) Attribute.GetCustomAttribute(a, typeof(AssemblySmokeInitializer)); + if (attr != null) attr.CallInitSmoke(); + SmokeInvocation.InitializedAssemblies.Add(a); + } + string typeName = Camelize(Package().Metadata().PluginName()) + "."; // namespace typeName += Camelize(program.CompleteBaseName()); appletType = appletAssembly.GetType(typeName); + if (appletType == null) { + foreach (Type t in appletAssembly.GetTypes()) { + for (Type tmp = t.BaseType; tmp != null; tmp = tmp.BaseType) { + if (tmp == typeof(PlasmaScripting.Applet)) { + appletType = t; + break; + } + } + if (appletType != null) break; + } + } applet = (PlasmaScripting.Applet) Activator.CreateInstance(appletType, new object[] { this }); applet.Init(); + if (oldSize.Width() > 10 && oldSize.Height() > 10) + Applet().Size = oldSize; SetUpEventHandlers(); return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/qtuitools/src/QtUiTools.cs new/kdebindings-4.1.1/csharp/qtuitools/src/QtUiTools.cs --- old/kdebindings-4.1.0/csharp/qtuitools/src/QtUiTools.cs 2008-07-23 10:25:00.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/qtuitools/src/QtUiTools.cs 2008-08-28 10:06:45.000000000 +0200 @@ -7,10 +7,10 @@ public class InitQtUiTools { [DllImport("libqtuitools-sharp", CharSet=CharSet.Ansi)] - static extern void Init_QtUiTools(); + static extern void Init_qtuitools(); public static void InitSmoke() { - Init_QtUiTools(); + Init_qtuitools(); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/qtwebkit/src/QtWebKit.cs new/kdebindings-4.1.1/csharp/qtwebkit/src/QtWebKit.cs --- old/kdebindings-4.1.0/csharp/qtwebkit/src/QtWebKit.cs 2008-07-23 10:25:00.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/qtwebkit/src/QtWebKit.cs 2008-08-28 10:06:46.000000000 +0200 @@ -7,10 +7,10 @@ public class InitQtWebKit { [DllImport("libqtwebkit-sharp", CharSet=CharSet.Ansi)] - static extern void Init_QtWebKit(); + static extern void Init_qtwebkit(); public static void InitSmoke() { - Init_QtWebKit(); + Init_qtwebkit(); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/qyoto/core/QObjectExtras.cs new/kdebindings-4.1.1/csharp/qyoto/core/QObjectExtras.cs --- old/kdebindings-4.1.0/csharp/qyoto/core/QObjectExtras.cs 2008-05-21 10:32:32.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/qyoto/core/QObjectExtras.cs 2008-08-28 10:06:46.000000000 +0200 @@ -25,26 +25,33 @@ private static extern bool ConnectDelegate(IntPtr obj, string signal, Delegate d); public static bool Connect(QObject obj, string signal, NoArgDelegate d) { + // allocate a gchandle so the delegate won't be collected + GCHandle.Alloc(d); return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d); } public static bool Connect<T>(QObject obj, string signal, OneArgDelegate<T> d) { + GCHandle.Alloc(d); return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d); } public static bool Connect<T1, T2>(QObject obj, string signal, TwoArgDelegate<T1, T2> d) { + GCHandle.Alloc(d); return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d); } public static bool Connect<T1, T2, T3>(QObject obj, string signal, ThreeArgDelegate<T1, T2, T3> d) { + GCHandle.Alloc(d); return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d); } public static bool Connect<T1, T2, T3, T4>(QObject obj, string signal, FourArgDelegate<T1, T2, T3, T4> d) { + GCHandle.Alloc(d); return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d); } public static bool Connect<T1, T2, T3, T4, T5>(QObject obj, string signal, FiveArgDelegate<T1, T2, T3, T4, T5> d) { + GCHandle.Alloc(d); return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/qyoto/src/delegateinvocation.h new/kdebindings-4.1.1/csharp/qyoto/src/delegateinvocation.h --- old/kdebindings-4.1.0/csharp/qyoto/src/delegateinvocation.h 2008-07-23 10:25:01.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/qyoto/src/delegateinvocation.h 2008-08-28 10:06:46.000000000 +0200 @@ -45,6 +45,8 @@ } sig = ba; _mocargs = GetMocArguments(_o->smoke, "", mo->method(sigIndex).parameterTypes()); + _mocargs.removeFirst(); // junk the return type - we don't care about that at the moment. + _items = _mocargs.size(); _sp = new Smoke::StackItem[_items]; _stack = new Smoke::StackItem[_items]; } @@ -69,7 +71,7 @@ if (call == QMetaObject::InvokeMetaMethod) { if (id == 0) { - smokeStackFromQtStack(_stack, a + 1, _items, 1, _mocargs); + smokeStackFromQtStack(_stack, a + 1, 0, _items, _mocargs); next(); (*InvokeDelegate)(_delegate, _sp); } @@ -78,7 +80,7 @@ return id; } - inline const MocArgument &arg() { return *_mocargs[_cur + 1]; } + inline const MocArgument &arg() { return *_mocargs[_cur]; } inline SmokeType type() { return arg().st; } inline Marshall::Action action() { return Marshall::ToObject; } inline Smoke::StackItem &item() { return _stack[_cur]; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/qyoto/src/SmokeInvocation.cs new/kdebindings-4.1.1/csharp/qyoto/src/SmokeInvocation.cs --- old/kdebindings-4.1.0/csharp/qyoto/src/SmokeInvocation.cs 2008-07-08 11:27:33.000000000 +0200 +++ new/kdebindings-4.1.1/csharp/qyoto/src/SmokeInvocation.cs 2008-08-28 10:06:46.000000000 +0200 @@ -400,15 +400,6 @@ args[i] = stackPtr[i].s_float; } else if (parameters[i].ParameterType == typeof(double)) { args[i] = stackPtr[i].s_double; - } else if (parameters[i].ParameterType == typeof(string)) { - if (stackPtr[i].s_class != IntPtr.Zero) { - args[i] = (string) ((GCHandle) stackPtr[i].s_class).Target; -#if DEBUG - DebugGCHandle.Free((GCHandle) stackPtr[i].s_class); -#else - ((GCHandle) stackPtr[i].s_class).Free(); -#endif - } } else { if (stackPtr[i].s_class != IntPtr.Zero) { args[i] = ((GCHandle) stackPtr[i].s_class).Target; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/kalyptus/kalyptusCxxToKimono.pm new/kdebindings-4.1.1/kalyptus/kalyptusCxxToKimono.pm --- old/kdebindings-4.1.0/kalyptus/kalyptusCxxToKimono.pm 2008-07-24 14:56:35.000000000 +0200 +++ new/kdebindings-4.1.1/kalyptus/kalyptusCxxToKimono.pm 2008-08-28 10:06:47.000000000 +0200 @@ -2313,6 +2313,9 @@ $methodCode .= " public $csharpClassName($csharpparams) : this((Type) null) {\n"; $methodCode .= " CreateProxy();\n"; $methodCode .= smokeInvocation("interceptor", \@csharpArgTypeList, "void", $mungedMethod, $signature, $addImport); + if ($name eq 'KApplication') { + $methodCode .= " qApp = this;\n"; + } $methodCode .= " }\n"; } } elsif ( $mainClassNode->{Pure} && $isPure ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/kalyptus/kalyptusCxxToSmoke.pm new/kdebindings-4.1.1/kalyptus/kalyptusCxxToSmoke.pm --- old/kdebindings-4.1.0/kalyptus/kalyptusCxxToSmoke.pm 2008-07-24 14:56:35.000000000 +0200 +++ new/kdebindings-4.1.1/kalyptus/kalyptusCxxToSmoke.pm 2008-08-28 10:06:47.000000000 +0200 @@ -2144,7 +2144,7 @@ push @classlist, $className; push @moduleclasslist, $className unless (defined($excludeClasses{$className}) && !defined($externClasses{$className})); $enumclasslist{$className}++ if keys %{$classNode->{enumerations}}; - $classNode->{ClassIndex} = $#classlist; + $classNode->{ClassIndex} = $#moduleclasslist; addIncludeForClass( $classNode, \%allIncludes, undef ) unless (defined($excludeClasses{$className}) && !defined($externClasses{$className})); } ); Files old/kdebindings-4.1.0/python/pykde4/tools/cmake_project/sample_project/doc/en/index.cache.bz2 and new/kdebindings-4.1.1/python/pykde4/tools/cmake_project/sample_project/doc/en/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/ruby/akonadi/akonadihandlers.cpp new/kdebindings-4.1.1/ruby/akonadi/akonadihandlers.cpp --- old/kdebindings-4.1.0/ruby/akonadi/akonadihandlers.cpp 2008-06-10 13:40:53.000000000 +0200 +++ new/kdebindings-4.1.1/ruby/akonadi/akonadihandlers.cpp 2008-08-28 10:06:46.000000000 +0200 @@ -26,9 +26,7 @@ #include <akonadi/attribute.h> #include <akonadi/collection.h> #include <akonadi/item.h> -#include <akonadi/job.h> -DEF_LIST_MARSHALLER( AkonadiJobList, QList<Akonadi::Job*>, Akonadi::Job ) DEF_LIST_MARSHALLER( AkonadiAttributeList, QList<Akonadi::Attribute*>, Akonadi::Attribute ) DEF_VALUELIST_MARSHALLER( AkonadiAgentInstanceList, QList<Akonadi::AgentInstance>, Akonadi::AgentInstance ) @@ -44,7 +42,5 @@ { "Akonadi::Collection::List&", marshall_AkonadiCollectionList }, { "Akonadi::Item::List", marshall_AkonadiItemList }, { "Akonadi::Item::List&", marshall_AkonadiItemList }, - { "Akonadi::Job::List", marshall_AkonadiJobList }, - { "Akonadi::Job::List&", marshall_AkonadiJobList }, { 0, 0 } }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/ruby/akonadi/CMakeLists.txt new/kdebindings-4.1.1/ruby/akonadi/CMakeLists.txt --- old/kdebindings-4.1.0/ruby/akonadi/CMakeLists.txt 2008-06-25 09:53:37.000000000 +0200 +++ new/kdebindings-4.1.1/ruby/akonadi/CMakeLists.txt 2008-08-28 10:06:46.000000000 +0200 @@ -4,7 +4,15 @@ set(rubyakonadi_LIBRARY_SRC akonadi.cpp akonadihandlers.cpp) add_library(rubyakonadi MODULE ${rubyakonadi_LIBRARY_SRC}) -target_link_libraries(rubyakonadi ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokeakonadi qtruby4shared) +target_link_libraries(rubyakonadi + ${QT_QTCORE_LIBRARY} + ${RUBY_LIBRARY} + akonadi-kde + akonadi-kmime + smokeqt + smokekde + smokeakonadi + qtruby4shared) set_target_properties(rubyakonadi PROPERTIES PREFIX "" OUTPUT_NAME akonadi) install(TARGETS rubyakonadi DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR}) install(FILES akonadi.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/akonadi) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/ruby/plasma/src/applet.rb new/kdebindings-4.1.1/ruby/plasma/src/applet.rb --- old/kdebindings-4.1.0/ruby/plasma/src/applet.rb 2008-07-08 11:27:50.000000000 +0200 +++ new/kdebindings-4.1.1/ruby/plasma/src/applet.rb 2008-08-28 10:06:46.000000000 +0200 @@ -30,7 +30,7 @@ end def init - applet.resize(200, 200) + oldSize = applet.size puts "RubyAppletScript::Applet#init mainScript: #{mainScript}" program = Qt::FileInfo.new(mainScript) @@ -42,6 +42,9 @@ klass = Object.const_get(moduleName.to_sym).const_get(className.to_sym) @applet_script = klass.new(self) @applet_script.init + if oldSize.height > 10 && oldSize.width > 10 + applet.resize(oldSize) + end set_up_event_handlers return true ++++++ kdebindings4.spec.in ++++++ --- KDE/kdebindings4/kdebindings4.spec.in 2008-08-18 12:16:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.spec.in 2008-08-28 15:52:56.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL Group: System/GUI/KDE Summary: kdebindings build -Version: 4.1.0 +Version: 4.1.1 Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdebase4 checked in at Mon Sep 1 15:00:16 CEST 2008. -------- --- KDE/kdebase4/kdebase4.changes 2008-08-24 11:17:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2008-08-28 12:31:05.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 28 12:30:59 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- Old: ---- kdebase-4.1.0.tar.bz2 New: ---- kdebase-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.h23330/_old 2008-09-01 14:59:59.000000000 +0200 +++ /var/tmp/diff_new_pack.h23330/_new 2008-09-01 14:59:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4 (Version 4.1.0) +# spec file for package kdebase4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -32,8 +32,8 @@ Group: System/GUI/KDE Summary: The Base KDE Apps Url: http://www.kde.org/ -Version: 4.1.0 -Release: 27 +Version: 4.1.1 +Release: 1 Source0: kdebase-%version.tar.bz2 Source1: _upstream Source2: rpmlintrc @@ -460,6 +460,9 @@ /usr/share/kde4/services/plasma-applet-folderview.desktop %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php * Sun Aug 24 2008 stbinner(a)suse.de - build Konqueror kttsd plugin without webkitpart dependency * Sat Aug 16 2008 stbinner(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ ++++ 3705 lines (skipped) ++++ between KDE/kdebase4/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4/4_1_BRANCH.diff ++++++ kdebase-4.1.0.tar.bz2 -> kdebase-4.1.1.tar.bz2 ++++++ ++++ 4694 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdebase4-runtime checked in at Mon Sep 1 15:00:16 CEST 2008. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2008-08-16 16:43:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2008-08-20 17:52:58.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 20 16:01:07 CEST 2008 - llunak(a)suse.cz + +- move WM selection option to a better place in systemsettings + +------------------------------------------------------------------- oxygen-icon-theme.changes: same change Old: ---- kdebase-runtime-4.1.0.tar.bz2 New: ---- kdebase-runtime-4.1.1.tar.bz2 wm-switch-systemsettings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.T23131/_old 2008-09-01 14:59:58.000000000 +0200 +++ /var/tmp/diff_new_pack.T23131/_new 2008-09-01 14:59:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-runtime (Version 4.1.0) +# spec file for package kdebase4-runtime (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ Group: System/GUI/KDE Summary: The KDE Runtime Components Url: http://www.kde.org/ -Version: 4.1.0 -Release: 17 +Version: 4.1.1 +Release: 1 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu Source2: kde-settings.menu @@ -39,6 +39,7 @@ Patch3: hotplug-kde3.diff Patch4: kde4-wrapper.diff Patch5: kdesu-remember-keep-password.diff +Patch6: wm-switch-systemsettings.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: oxygen-icon-theme >= %version Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) @@ -83,6 +84,7 @@ %patch3 %patch4 %patch5 +%patch6 %build %cmake_kde4 -d build @@ -228,6 +230,7 @@ %_kde_share_dir/apps/kio_man %_kde_share_dir/apps/kio_thumbnail %_kde_share_dir/apps/konqueror/dirtree/remote/smb-network.desktop +%_kde_share_dir/apps/ksmserver %_kde_share_dir/apps/kstyle/themes/*.themerc %_kde_share_dir/apps/libphonon %_kde_share_dir/apps/phonon @@ -364,6 +367,8 @@ %_kde4_modules/kcm_phononxine.so %changelog +* Wed Aug 20 2008 llunak(a)suse.cz +- move WM selection option to a better place in systemsettings * Sat Aug 16 2008 stbinner(a)suse.de - branch diff update * Wed Aug 13 2008 coolo(a)suse.de ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.T23131/_old 2008-09-01 14:59:58.000000000 +0200 +++ /var/tmp/diff_new_pack.T23131/_new 2008-09-01 14:59:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package oxygen-icon-theme (Version 4.1.0) +# spec file for package oxygen-icon-theme (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,8 +26,8 @@ Group: System/GUI/KDE Summary: Oxygen Icon Theme Url: http://www.kde.org -Version: 4.1.0 -Release: 17 +Version: 4.1.1 +Release: 1 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable Source0: kdebase-runtime-%version.tar.bz2 @@ -126,6 +126,8 @@ /usr/share/icons/oxygen %changelog +* Wed Aug 20 2008 llunak(a)suse.cz +- move WM selection option to a better place in systemsettings * Sat Aug 16 2008 stbinner(a)suse.de - branch diff update * Wed Aug 13 2008 coolo(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ ++++ 3642 lines (skipped) ++++ between KDE/kdebase4-runtime/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-runtime/4_1_BRANCH.diff ++++++ kdebase-runtime-4.1.0.tar.bz2 -> kdebase-runtime-4.1.1.tar.bz2 ++++++ KDE/kdebase4-runtime/kdebase-runtime-4.1.0.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase-runtime-4.1.1.tar.bz2 differ: byte 11, line 1 ++++++ wm-switch-systemsettings.diff ++++++ Subject: Move the window manager selection UI to 'default applications' control module From: Lubos Lunak Patch-upstream: r847440 Relates: kdebase4-workspace/wm-switch-systemsettings.diff Move the window manager selection UI option (i.e. mainly Compiz switch) to a more prominent and logical place, the 'default applications' control module. Index: kcontrol/componentchooser/componentchooserwm.h =================================================================== --- kcontrol/componentchooser/componentchooserwm.h (revision 0) +++ kcontrol/componentchooser/componentchooserwm.h (revision 847440) @@ -0,0 +1,54 @@ +/*************************************************************************** + componentchooserwm.h - description + ------------------- + copyright : (C) 2002 by Joseph Wenninger + email : jowenn(a)kde.org + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License version 2 as * + * published by the Free Software Foundationi * + * * + ***************************************************************************/ + +#ifndef _COMPONENTCHOOSERWM_H_ +#define _COMPONENTCHOOSERWM_H_ + +#include "ui_wmconfig_ui.h" +#include "componentchooser.h" +class KConfig; +class CfgPlugin; + +class WmConfig_UI : public QWidget, public Ui::WmConfig_UI +{ +public: + WmConfig_UI( QWidget *parent ) : QWidget( parent ) { + setupUi( this ); + } +}; + +class CfgWm: public WmConfig_UI,public CfgPlugin +{ +Q_OBJECT +public: + CfgWm(QWidget *parent); + virtual ~CfgWm(); + virtual void load(KConfig *cfg); + virtual void save(KConfig *cfg); + virtual void defaults(); + +protected Q_SLOTS: + void configChanged(); + +Q_SIGNALS: + void changed(bool); +private: + void loadWMs( const QString& current ); + QString currentWM() const; + QHash< QString, QString > wms; // i18n text -> internal name + QString oldwm; // the original value +}; + +#endif Index: kcontrol/componentchooser/wmconfig_ui.ui =================================================================== --- kcontrol/componentchooser/wmconfig_ui.ui (revision 0) +++ kcontrol/componentchooser/wmconfig_ui.ui (revision 847440) @@ -0,0 +1,120 @@ +<ui version="4.0" > + <class>WmConfig_UI</class> + <widget class="QWidget" name="WmConfig_UI" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>447</width> + <height>188</height> + </rect> + </property> + <property name="sizePolicy" > + <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QGridLayout" > + <property name="margin" > + <number>0</number> + </property> + <item row="3" column="1" > + <spacer> + <property name="orientation" > + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType" > + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>0</width> + <height>87</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0" colspan="2" > + <widget class="QRadioButton" name="differentRB" > + <property name="text" > + <string>Use a different &window manager:</string> + </property> + </widget> + </item> + <item row="2" column="0" > + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType" > + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="0" colspan="2" > + <widget class="QRadioButton" name="kwinRB" > + <property name="text" > + <string>&Use the default KDE window manager (KWin)</string> + </property> + </widget> + </item> + <item row="2" column="1" > + <layout class="QHBoxLayout" > + <property name="margin" > + <number>0</number> + </property> + <item> + <widget class="QComboBox" name="wmCombo" > + <property name="enabled" > + <bool>false</bool> + </property> + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <layoutdefault spacing="3" margin="6" /> + <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" /> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>kwinRB</tabstop> + <tabstop>differentRB</tabstop> + <tabstop>wmCombo</tabstop> + </tabstops> + <includes> + <include location="local" >kdialog.h</include> + </includes> + <resources/> + <connections> + <connection> + <sender>differentRB</sender> + <signal>toggled(bool)</signal> + <receiver>wmCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + </connections> +</ui> Index: kcontrol/componentchooser/windowmanagers/compiz-custom.desktop =================================================================== --- kcontrol/componentchooser/windowmanagers/compiz-custom.desktop (revision 0) +++ kcontrol/componentchooser/windowmanagers/compiz-custom.desktop (revision 847440) @@ -0,0 +1,41 @@ +[Desktop Entry] +Name=Compiz custom (create wrapper script 'compiz-kde-launcher' to launch it) +Name[ca]=Compiz personalitzat (crea un script embolcall 'compiz-kde-launcher' per a engegar-lo) +Name[da]=Brugerdefineret Compiz (opret wrapper-scriptet 'compiz-kde-launcher' for at starte den) +Name[de]=Compiz benutzerdefiniert (erstellen Sie ein Mantel-Skript namens ‚compiz-kde-launcher‘, um es zu starten) +Name[el]=Προσαρμοσμένο Compiz (δημιουργία σεναρίου 'compiz-kde-launcher' για την εκκίνησή του) +Name[eo]=Compiz propra (kreu interfacan skripton 'compiz-kde-launcher' por lanĉi ĝin) +Name[es]=Compiz personalizado (crea un script 'compiz-kde-launcher' para ejecutarlo) +Name[et]=Kohandatud Compiz (käivitamiseks loo kohandav skript 'compiz-kde-launcher') +Name[fr]=Compiz personnalisé (utilisez un script d'enrobage « compiz-kde-launcher » pour le lancer) +Name[fy]=Compiz oanpast (wrapper script 'compiz-kde-launcher' oanmeitsje om it út te fieren) +Name[gl]=Compiz personalizado (crea un script "compiz-kde-launcher" para executalo) +Name[gu]=પોતાનું કોમ્પિઝ (તેને શરૂ કરવા માટે 'compiz-kde-launcher' સ્ક્રિપ્ટ બનાવો) +Name[hu]=Egyedi Compiz (indításához egy "compiz-kde-launcher" nevű szkript szükséges) +Name[it]=Compiz personalizzato (per lanciarlo crea uno script «compiz-kde-launcher» che prepara l'ambiente) +Name[km]=Compiz ផ្ទាល់ខ្លួន (បង្កើតស្គ្រីបរុំ 'compiz-kde-launcher' ដើម្បីចាប់ផ្ដើមវា) +Name[ko]=사용자 정의 컴피즈 ('compiz-kde-launcher' 래퍼 스크립트로 실행함) +Name[lv]=Pielāgots Compiz (lai to palaistu, izveidojiet palaišanas skriptu 'compiz-kde-launcher') +Name[ml]=ക്രമീകൃതകോമ്പിസ്(create wrapper script 'compiz-kde-launcher' to launch it) +Name[mr]=इच्छिक Compiz (दाखल करण्याकरीता 'compiz-kde-launcher' स्क्रिप्ट निर्माण करा) +Name[nds]=Egen Compiz (För't Opropen deit en Skript "compiz-kde-launcher" noot) +Name[nl]=Compiz custom (maak het script 'compiz-kde-launcher' aan om het te starten) +Name[nn]=Compiz sjølvvald (lag skriptet «compiz-kde-launcher» for å starta det) +Name[pl]=Compiz custom (utwórz skrypt "comiz-kde-launcher", aby go uruchomić) +Name[pt]=Personalizado do Compiz (criar um programa de interface 'compiz-kde-launcher' para o invocar) +Name[pt_BR]=Compiz personalizado (criar um script 'compiz-kde-launcher' para iniciá-lo) +Name[ro]=Compiz particularizat (creare script „compiz-kde-launcher” pentru a-l lansa) +Name[sl]=Prilagojen Compiz (za zagon ustvarite skript »compiz-kde-launcher«) +Name[sr]=Посебни Компиз (направите омотачку скрипту ‘compiz-kde-launcher’ за покретање) +Name[sr@latin]=Posebni Compiz (napravite omotačku skriptu ‘compiz-kde-launcher’ za pokretanje) +Name[sv]=Egen Compiz (skapa omgivande skript 'compiz-kde-launcher' för att starta den) +Name[te]=Compiz custom (దానిని దించుటకు వ్రాపర్ స్క్రిప్‍ట్‌ 'compiz-kde-launcher' ను సృష్టించుము) +Name[th]=Compiz custom (สร้างสคริปต์ครอบ 'compiz-kde-launcher' เพื่อเรียกใช้มัน) +Name[tr]=Compiz özel (çalıştırmak için sarıcı betik 'compiz-kde-launcher' oluştur) +Name[uk]=Нетиповий Compiz (створити скрипт-обгортку "compiz-kde-launcher" для його запуску) +Name[x-test]=xxCompiz custom (create wrapper script 'compiz-kde-launcher' to launch it)xx +Name[zh_CN]=Compiz 定制(创建执行用包装脚本“compiz-kde-launcher”) +Name[zh_TW]=Compiz 自訂（建立外包文稿 compiz-kde-launcher 來啟動） +Exec=compiz-kde-launcher +TryExec=compiz +X-KDE-WindowManagerId=compiz Index: kcontrol/componentchooser/windowmanagers/openbox.desktop =================================================================== --- kcontrol/componentchooser/windowmanagers/openbox.desktop (revision 0) +++ kcontrol/componentchooser/windowmanagers/openbox.desktop (revision 847440) @@ -0,0 +1,18 @@ +[Desktop Entry] +Name=Openbox +Name[bn]=ওপেনবক্স +Name[cy]=Blwchagored (Openbox) +Name[gu]=ઓપનબોક્સ +Name[hi]=ओपनबाक्स +Name[km]=បើកប្រអប់ +Name[ml]=ഓപ്പണ്‍ബോക്സ് +Name[mr]=ओपनबाक्स +Name[ne]=खुला बाकस +Name[pa]=ਓਪਨ-ਬਾਕਸੇ +Name[sr]=Опенбокс +Name[ta]=திறப்பு பெட்டி +Name[te]=ఒపెన్ బాక్స్ +Name[x-test]=xxOpenboxxx +Exec=openbox +TryExec=openbox + Index: kcontrol/componentchooser/windowmanagers/metacity.desktop =================================================================== --- kcontrol/componentchooser/windowmanagers/metacity.desktop (revision 0) +++ kcontrol/componentchooser/windowmanagers/metacity.desktop (revision 847440) @@ -0,0 +1,16 @@ +[Desktop Entry] +Name=Metacity (GNOME) +Name[cs]=Metacity (Gnome) +Name[gu]=મેટાસિટી (GNOME) +Name[ko]=Metacity (그놈) +Name[ml]=മെറ്റാസിറ്റി (ഗ്നോം) +Name[mr]=मेटासिटी (GNOME) +Name[pa]=ਮੈਟਾਸਿਟੀ (ਗਨੋਮ) +Name[sr]=Метасити (Гном) +Name[sr@latin]=Metacity (Gnome) +Name[te]=మెటాసిటి (GNOME) +Name[x-test]=xxMetacity (GNOME)xx +Name[zh_CN]=Metacity(GNOME) +Name[zh_TW]=Metacity（GNOME） +Exec=metacity +TryExec=metacity Index: kcontrol/componentchooser/windowmanagers/compiz.desktop =================================================================== --- kcontrol/componentchooser/windowmanagers/compiz.desktop (revision 0) +++ kcontrol/componentchooser/windowmanagers/compiz.desktop (revision 847440) @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Compiz +Name[gu]=કોમ્પિઝ +Name[ko]=컴피즈 +Name[ml]=കോമ്പിസ് +Name[mr]=कॉम्पीज +Name[pa]=ਕੰਪਿਜ਼ +Name[sr]=Компиз +Name[x-test]=xxCompizxx +Exec=compiz ccp +TryExec=compiz Index: kcontrol/componentchooser/windowmanagers/CMakeLists.txt =================================================================== --- kcontrol/componentchooser/windowmanagers/CMakeLists.txt (revision 0) +++ kcontrol/componentchooser/windowmanagers/CMakeLists.txt (revision 847440) @@ -0,0 +1,8 @@ +########### install files ############### + +install( FILES + openbox.desktop + metacity.desktop + compiz.desktop + compiz-custom.desktop + DESTINATION ${DATA_INSTALL_DIR}/ksmserver/windowmanagers ) Index: kcontrol/componentchooser/windowmanagers/README =================================================================== --- kcontrol/componentchooser/windowmanagers/README (revision 0) +++ kcontrol/componentchooser/windowmanagers/README (revision 847440) @@ -0,0 +1,20 @@ +The list of window managers that the config module offers for using. +The format is normal .desktop files: + +Name - required, name to display in the configuration dialog. + +Exec - required, the command to execute to launch the window manager. + If launching fails for any reason, it must quit with non-zero exit + value and not do anything else (show an error dialog, try to run + a fallback, etc.). + +TryExec - optional. + +X-KDE-WindowManagerTestExec - optional, a command that will be run and if + the exit code is not 0, the window manager won't be used (can be used + e.g. to detect that a window manager which requires compositing support + cannot be run on systems without such support). + +X-KDE-WindowManagerId - optional, the name under which the window manager + registers with the session manager (if different from the name + of the .desktop file) Property changes on: kcontrol/componentchooser/windowmanagers ___________________________________________________________________ Added: svn:mergeinfo Index: kcontrol/componentchooser/componentservices/kcm_wm.desktop =================================================================== --- kcontrol/componentchooser/componentservices/kcm_wm.desktop (revision 0) +++ kcontrol/componentchooser/componentservices/kcm_wm.desktop (revision 847440) @@ -0,0 +1,3 @@ +Name=Window Manager +Comment=Here you can select the window manager to be run in your KDE session. Note that KDE settings are often not followed when not using the default KDE window manager. +configurationType=internal_wm Index: kcontrol/componentchooser/componentservices/CMakeLists.txt =================================================================== --- kcontrol/componentchooser/componentservices/CMakeLists.txt (revision 847439) +++ kcontrol/componentchooser/componentservices/CMakeLists.txt (revision 847440) @@ -1,4 +1,4 @@ install( FILES kcm_kemail.desktop kcm_browser.desktop DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser ) if(NOT WIN32) - install( FILES kcm_terminal.desktop DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser) + install( FILES kcm_terminal.desktop kcm_wm.desktop DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser) endif(NOT WIN32) Index: kcontrol/componentchooser/componentchooser.cpp =================================================================== --- kcontrol/componentchooser/componentchooser.cpp (revision 847439) +++ kcontrol/componentchooser/componentchooser.cpp (revision 847440) @@ -20,6 +20,7 @@ #include "componentchooser.moc" #ifdef Q_OS_UNIX #include "componentchooserterminal.h" +#include "componentchooserwm.h" #endif #include <QCheckBox> @@ -385,6 +386,14 @@ } } + else if (cfgType=="internal_wm") + { + if (!(configWidget && qobject_cast<CfgWm*>(configWidget))) + { + newConfigWidget = new CfgWm(configContainer); + } + + } #endif else if (cfgType=="internal_browser") { Index: kcontrol/componentchooser/componentchooserwm.cpp =================================================================== --- kcontrol/componentchooser/componentchooserwm.cpp (revision 0) +++ kcontrol/componentchooser/componentchooserwm.cpp (revision 847440) @@ -0,0 +1,116 @@ +/*************************************************************************** + componentchooserwm.cpp - description + ------------------- + copyright : (C) 2002 by Joseph Wenninger + email : jowenn(a)kde.org + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License verstion 2 as * + * published by the Free Software Foundation * + * * + ***************************************************************************/ + +#include "componentchooserwm.h" +#include "componentchooserwm.moc" + +#include <kdesktopfile.h> +#include <kmessagebox.h> +#include <kprocess.h> +#include <kstandarddirs.h> + +CfgWm::CfgWm(QWidget *parent):WmConfig_UI(parent),CfgPlugin() +{ + connect(wmCombo,SIGNAL(activated(int)), this, SLOT(configChanged())); + connect(kwinRB,SIGNAL(toggled(bool)),this,SLOT(configChanged())); + connect(differentRB,SIGNAL(toggled(bool)),this,SLOT(configChanged())); + + KGlobal::dirs()->addResourceType( "windowmanagers", "data", "ksmserver/windowmanagers" ); +} + +CfgWm::~CfgWm() +{ +} + +void CfgWm::configChanged() +{ + emit changed(true); +} + +void CfgWm::defaults() +{ + wmCombo->setCurrentIndex( 0 ); +} + + +void CfgWm::load(KConfig *) +{ + KConfig cfg("ksmserverrc", KConfig::NoGlobals); + KConfigGroup c( &cfg, "General"); + loadWMs(c.readEntry("windowManager", "kwin")); + emit changed(false); +} + +void CfgWm::save(KConfig *) +{ + KConfig cfg("ksmserverrc", KConfig::NoGlobals); + KConfigGroup c( &cfg, "General"); + c.writeEntry("windowManager", currentWM()); + emit changed(false); + if( oldwm != currentWM()) + { // TODO switch it already in the session instead and tell ksmserver + KMessageBox::information( this, + i18n( "The new window manager will be used when KDE is started the next time." ), + i18n( "Window manager change" ), "windowmanagerchange" ); + } +} + +void CfgWm::loadWMs( const QString& current ) +{ + wms[ "KWin" ] = "kwin"; + oldwm = "kwin"; + kwinRB->setChecked( true ); + wmCombo->setEnabled( false ); + QStringList list = KGlobal::dirs()->findAllResources( "windowmanagers", QString(), KStandardDirs::NoDuplicates ); + QRegExp reg( ".*/([^/\\.]*)\\.[^/\\.]*" ); + foreach( const QString& wmfile, list ) + { + KDesktopFile file( wmfile ); + if( file.noDisplay()) + continue; + if( !file.tryExec()) + continue; + QString testexec = file.desktopGroup().readEntry( "X-KDE-WindowManagerTestExec" ); + if( !testexec.isEmpty()) + { + KProcess proc; + proc.setShellCommand( testexec ); + if( proc.execute() != 0 ) + continue; + } + QString name = file.readName(); + if( name.isEmpty()) + continue; + if( !reg.exactMatch( wmfile )) + continue; + QString wm = reg.cap( 1 ); + if( wms.values().contains( wm )) + continue; + wms[ name ] = wm; + wmCombo->addItem( name ); + if( wms[ name ] == current ) // make it selected + { + wmCombo->setCurrentIndex( wmCombo->count() - 1 ); + oldwm = wm; + differentRB->setChecked( true ); + wmCombo->setEnabled( true ); + } + } +} + +QString CfgWm::currentWM() const +{ + return kwinRB->isChecked() ? "kwin" : wms[ wmCombo->currentText() ]; +} Index: kcontrol/componentchooser/CMakeLists.txt =================================================================== --- kcontrol/componentchooser/CMakeLists.txt (revision 847439) +++ kcontrol/componentchooser/CMakeLists.txt (revision 847440) @@ -1,5 +1,6 @@ add_subdirectory( componentservices ) +add_subdirectory( windowmanagers ) @@ -8,14 +9,15 @@ set(kcm_componentchooser_PART_SRCS componentchooser.cpp kcm_componentchooser.cpp ) if(NOT WIN32) - set(kcm_componentchooser_PART_SRCS ${kcm_componentchooser_PART_SRCS} componentchooserterminal.cpp) + set(kcm_componentchooser_PART_SRCS ${kcm_componentchooser_PART_SRCS} + componentchooserterminal.cpp componentchooserwm.cpp) endif(NOT WIN32) kde4_add_ui_files(kcm_componentchooser_PART_SRCS browserconfig_ui.ui emailclientconfig_ui.ui componentchooser_ui.ui componentconfig_ui.ui) if(NOT WIN32) - kde4_add_ui_files(kcm_componentchooser_PART_SRCS terminalemulatorconfig_ui.ui) + kde4_add_ui_files(kcm_componentchooser_PART_SRCS terminalemulatorconfig_ui.ui wmconfig_ui.ui) endif(NOT WIN32) kde4_add_plugin(kcm_componentchooser ${kcm_componentchooser_PART_SRCS}) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeadmin4
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdeadmin4 checked in at Mon Sep 1 14:59:45 CEST 2008. -------- --- KDE/kdeadmin4/kdeadmin4.changes 2008-07-23 13:22:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeadmin4/kdeadmin4.changes 2008-08-28 12:30:10.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 28 12:30:05 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- Old: ---- kdeadmin-4.1.0.tar.bz2 New: ---- kdeadmin-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeadmin4.spec ++++++ --- /var/tmp/diff_new_pack.O21137/_old 2008-09-01 14:59:36.000000000 +0200 +++ /var/tmp/diff_new_pack.O21137/_new 2008-09-01 14:59:36.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package kdeadmin4 (Version 4.1.0) +# spec file for package kdeadmin4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -16,7 +23,7 @@ Group: System/GUI/KDE Summary: kdeadmin base package Url: http://www.kde.org -Version: 4.1.0 +Version: 4.1.1 Release: 1 Source0: kdeadmin-%version.tar.bz2 Source1: _upstream @@ -198,6 +205,9 @@ %doc COPYING COPYING.DOC README %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php * Wed Jul 23 2008 dmueller(a)suse.de - update to 4.1.0 * Fri Jul 18 2008 dmueller(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.O21137/_old 2008-09-01 14:59:36.000000000 +0200 +++ /var/tmp/diff_new_pack.O21137/_new 2008-09-01 14:59:36.000000000 +0200 @@ -1,7 +1,7 @@ -package: kdeadmin-4.0.82.tar.bz2 +package: kdeadmin-4.1.1.tar.bz2 kdemod: kdeadmin --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: -+svn di between //trunk/KDE/kdeadmin@819047 and //trunk/KDE/kdeadmin ++current HEAD: 853806 ++svn di between //tags/KDE/4.1.1/kdeadmin and //tags/KDE/4.1.1/kdeadmin ++++++ kdeadmin-4.1.0.tar.bz2 -> kdeadmin-4.1.1.tar.bz2 ++++++ Files old/kdeadmin-4.1.0/doc/kcron/index.cache.bz2 and new/kdeadmin-4.1.1/doc/kcron/index.cache.bz2 differ Files old/kdeadmin-4.1.0/doc/kdat/index.cache.bz2 and new/kdeadmin-4.1.1/doc/kdat/index.cache.bz2 differ Files old/kdeadmin-4.1.0/doc/knetworkconf/index.cache.bz2 and new/kdeadmin-4.1.1/doc/knetworkconf/index.cache.bz2 differ Files old/kdeadmin-4.1.0/doc/kpackage/index.cache.bz2 and new/kdeadmin-4.1.1/doc/kpackage/index.cache.bz2 differ Files old/kdeadmin-4.1.0/doc/ksystemlog/index.cache.bz2 and new/kdeadmin-4.1.1/doc/ksystemlog/index.cache.bz2 differ Files old/kdeadmin-4.1.0/doc/ksysv/index.cache.bz2 and new/kdeadmin-4.1.1/doc/ksysv/index.cache.bz2 differ Files old/kdeadmin-4.1.0/doc/kuser/index.cache.bz2 and new/kdeadmin-4.1.1/doc/kuser/index.cache.bz2 differ Files old/kdeadmin-4.1.0/doc/lilo-config/index.cache.bz2 and new/kdeadmin-4.1.1/doc/lilo-config/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.1.0/kcron/src/kcm_cron.desktop new/kdeadmin-4.1.1/kcron/src/kcm_cron.desktop --- old/kdeadmin-4.1.0/kcron/src/kcm_cron.desktop 2008-07-23 10:26:22.000000000 +0200 +++ new/kdeadmin-4.1.1/kcron/src/kcm_cron.desktop 2008-08-28 10:08:01.000000000 +0200 @@ -23,12 +23,15 @@ Name[fr]=Planificateur de tâches Name[ga]=Sceidealóir na dTascanna Name[gl]=Programador de tarefas +Name[hr]=Planer zadataka +Name[hu]=Feladatütemező Name[it]=Pianificatore di operazioni Name[ja]=タスクスケジューラ Name[ko]=작업 스케줄러 Name[lt]=Užduočių planuoklis Name[lv]=Uzdevumu plānotājs Name[ml]=കര്‍ത്തവ്യങ്ങള്‍ ആസൂത്രണം ചെയ്യുവാന്‍ +Name[nb]=Oppgavebehandler Name[nds]=Opgavenpleger Name[nl]=Takenplanner Name[nn]=Oppgåveplanleggjar @@ -54,12 +57,15 @@ Comment[fr]=Configurer et planifier les tâches Comment[ga]=Cumraigh agus sceideal tascanna Comment[gl]=Configura e planifica tarefas +Comment[hr]=Konfiguriranje i planiranje zadataka +Comment[hu]=Időzített feladatok beállítása Comment[it]=Configura e pianifica le operazioni Comment[ja]=タスクの設定とスケジュール Comment[ko]=작업을 설정하고 예약하기 Comment[lt]=Konfigūruoti ir planuoti užduotis Comment[lv]=Konfigurēt un plānot uzdevumus Comment[ml]=കര്‍ത്തവ്യങ്ങള്‍ ക്രമീകരിച്ചു് ആസൂത്രണം ചെയ്യുക +Comment[nb]=Sett opp og planlegg oppgaver Comment[nds]=Opgaven planen un plegen Comment[nl]=Taken instellen en plannen Comment[nn]=Planlegg og set opp oppgåver diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.1.0/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop new/kdeadmin-4.1.1/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop --- old/kdeadmin-4.1.0/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2008-06-03 11:34:47.000000000 +0200 +++ new/kdeadmin-4.1.1/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2008-08-28 10:08:01.000000000 +0200 @@ -10,7 +10,7 @@ Exec=kcmshell4 kcm_knetworkconfmodule Icon=knetworkconf -X-DocPath=knetworkconf/index.docbook +X-DocPath=knetworkconf/index.html X-KDE-ParentApp=kcontrol diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.1.0/ksystemlog/src/ksystemlog.desktop new/kdeadmin-4.1.1/ksystemlog/src/ksystemlog.desktop --- old/kdeadmin-4.1.0/ksystemlog/src/ksystemlog.desktop 2008-07-23 10:26:22.000000000 +0200 +++ new/kdeadmin-4.1.1/ksystemlog/src/ksystemlog.desktop 2008-08-28 10:08:01.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=KSystemLog +Name[hu]=Rendszernapló-megjelenítő Name[ml]=കെസിസ്റ്റംലോഗ് Name[nn]=KSystemlogg Name[sv]=Ksystemlog @@ -23,12 +24,15 @@ Comment[fr]=Consultation des journaux du système Comment[ga]=Amharcán ar logchomhaid an chórais Comment[gl]=Visor dos rexistos do sistema +Comment[hr]=Alat za pregledavanje zapisnika sustava +Comment[hu]=Rendszernapló-megjelenítő eszköz Comment[it]=Strumento di visione dei registri di sistema Comment[ja]=システムログビューア Comment[ko]=시스템 로그 뷰어 도구 Comment[lt]=Sistemos žurnalų žiūryklė Comment[lv]=Sistēmas žurnāla skatīšanas rīks Comment[ml]=സിസ്റ്റം ലോഗ് കാണാന്നുള്ള ടൂള്‍ +Comment[nb]=Verktøy for å vise systemlogger Comment[nds]=Kieker för Systeem-Logböker Comment[nl]=Programma voor het bekijken van systeemlogs Comment[nn]=Verktøy for vising av systemloggar @@ -55,12 +59,15 @@ GenericName[fr]=Consultation des journaux du système GenericName[ga]=Amharcán ar Logchomhaid an Chórais GenericName[gl]=Visor dos rexistos do sistema +GenericName[hr]=Preglednik zapisnika sustava +GenericName[hu]=Rendszernapló-nézegető GenericName[it]=Visore dei registri di sistema GenericName[ja]=システムログビューア GenericName[ko]=시스템 로그 뷰어 GenericName[lt]=Sistemos žurnalų žiūryklė GenericName[lv]=Sistēmas žurnālu skatītājs GenericName[ml]=സിസ്റ്റം ലോഗുകളുടെ ദര്‍ശിനി +GenericName[nb]=Systemloggviser GenericName[nds]=Systeemlogbook-Kieker GenericName[nl]=Systeemlogviewer GenericName[nn]=Systemloggvisar diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.1.0/ksysv/x-ksysv.desktop new/kdeadmin-4.1.1/ksysv/x-ksysv.desktop --- old/kdeadmin-4.1.0/ksysv/x-ksysv.desktop 2008-06-03 11:34:47.000000000 +0200 +++ new/kdeadmin-4.1.1/ksysv/x-ksysv.desktop 2008-08-28 10:08:01.000000000 +0200 @@ -24,7 +24,7 @@ Comment[he]=תצורת אתחול שמורה Comment[hi]=इनिट कॉन्फ़िगरेशन सहेजा Comment[hr]=Spremljena Init konfiguracija -Comment[hu]=Elmentett Init beállítás +Comment[hu]=Elmentett Init-beállítás Comment[is]=Vistaðar Init stillingar Comment[it]=Configurazione di Init salvata Comment[ja]=保存されている起動スクリプトの設定 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.1.0/ksysv/x-ksysv-log.desktop new/kdeadmin-4.1.1/ksysv/x-ksysv-log.desktop --- old/kdeadmin-4.1.0/ksysv/x-ksysv-log.desktop 2008-07-23 10:26:22.000000000 +0200 +++ new/kdeadmin-4.1.1/ksysv/x-ksysv-log.desktop 2008-08-28 10:08:01.000000000 +0200 @@ -22,7 +22,7 @@ Comment[he]=קובץ רישום של מנהל השירותים Comment[hi]=सिस-वी-इनिट संपादक लॉग फ़ाइल Comment[hr]=Datoteka zapisnika uređivača SysV-Init -Comment[hu]=SysV-Init (szolgáltatáskezelő) naplófájl +Comment[hu]=SysV-Init naplófájl Comment[is]=SysV-Init stjóra annáll Comment[it]=File di log dell'editor di SysV-Init Comment[ja]=SystemV 起動スクリプトエディタのログファイル diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.1.0/kuser/ku_adduser.cpp new/kdeadmin-4.1.1/kuser/ku_adduser.cpp --- old/kdeadmin-4.1.0/kuser/ku_adduser.cpp 2008-01-05 00:58:29.000000000 +0100 +++ new/kdeadmin-4.1.1/kuser/ku_adduser.cpp 2008-08-28 10:08:01.000000000 +0200 @@ -60,6 +60,8 @@ frontlayout->addWidget(group, frontrow, 0, 1, 3); if ( useprivategroup ) pbprigr->setEnabled( false ); + + mNewUser = user; } void KU_AddUser::accept() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.1.0/kuser/ku_selectconn.cpp new/kdeadmin-4.1.1/kuser/ku_selectconn.cpp --- old/kdeadmin-4.1.0/kuser/ku_selectconn.cpp 2008-01-05 00:58:29.000000000 +0100 +++ new/kdeadmin-4.1.1/kuser/ku_selectconn.cpp 2008-08-28 10:08:01.000000000 +0200 @@ -115,7 +115,7 @@ kDebug() << "slotUser2: " << connSelected(); KSharedConfig::Ptr config( KGlobal::config() ); - KU_PrefsBase kcfg( config, newconn ); + KU_PrefsBase kcfg( config, connSelected() ); kcfg.readConfig(); KU_ConfigDlg cfgdlg( &kcfg, this ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.1.0/lilo-config/kde/lilo.desktop new/kdeadmin-4.1.1/lilo-config/kde/lilo.desktop --- old/kdeadmin-4.1.0/lilo-config/kde/lilo.desktop 2008-06-03 11:34:47.000000000 +0200 +++ new/kdeadmin-4.1.1/lilo-config/kde/lilo.desktop 2008-08-28 10:08:01.000000000 +0200 @@ -97,8 +97,8 @@ Comment[gl]=Configurar LILO (O xestor de arranque de linux) Comment[he]=שינוי הגדרות LILO (מנהל האתחול של לינוקס) Comment[hi]=लिलो कॉन्फ़िगर करें (लिनक्स बूट प्रबंधक) -Comment[hr]=Konfigurirajte LILO (Linux upravitelj pokretanja sustava) -Comment[hu]=a LILO beállításai +Comment[hr]=Konfiguriranje Linux upravitelja pokretanja sustava LILO +Comment[hu]=A LILO rendszerindító beállításai Comment[is]=Stilla LILO (Linux ræsistjórann) Comment[it]=Configura LILO (il gestore dell'avvio di Linux) Comment[ja]=LILO (Linux ブートマネージャ) の設定 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.1.0/lilo-config/kde-qt-common/general.cpp new/kdeadmin-4.1.1/lilo-config/kde-qt-common/general.cpp --- old/kdeadmin-4.1.0/lilo-config/kde-qt-common/general.cpp 2008-01-05 00:58:30.000000000 +0100 +++ new/kdeadmin-4.1.1/lilo-config/kde-qt-common/general.cpp 2008-08-28 10:08:01.000000000 +0200 @@ -102,32 +102,33 @@ vga=new QComboBox(false, vgab); vlbl->setBuddy(vga); vgab->setWhatsThis( _("You can select the default graphics mode here. If you intend to use a VGA graphics mode, you must compile the kernel with support for framebuffer devices. The ask setting brings up a prompt at boot time. This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the Operating systems tab and select Details.")); - vga->insertItem(_("default")); - vga->insertItem(_("ask")); - vga->insertItem(_("text 80x25 (0)")); - vga->insertItem(_("text 80x50 (1)")); - vga->insertItem(_("text 80x43 (2)")); - vga->insertItem(_("text 80x28 (3)")); - vga->insertItem(_("text 80x30 (4)")); - vga->insertItem(_("text 80x34 (5)")); - vga->insertItem(_("text 80x60 (6)")); - vga->insertItem(_("text 40x25 (7)")); - vga->insertItem(_("VGA 640x480, 256 colors (769)")); - vga->insertItem(_("VGA 640x480, 32767 colors (784)")); - vga->insertItem(_("VGA 640x480, 65536 colors (785)")); - vga->insertItem(_("VGA 640x480, 16.7M colors (786)")); - vga->insertItem(_("VGA 800x600, 256 colors (771)")); - vga->insertItem(_("VGA 800x600, 32767 colors (787)")); - vga->insertItem(_("VGA 800x600, 65536 colors (788)")); - vga->insertItem(_("VGA 800x600, 16.7M colors (789)")); - vga->insertItem(_("VGA 1024x768, 256 colors (773)")); - vga->insertItem(_("VGA 1024x768, 32767 colors (790)")); - vga->insertItem(_("VGA 1024x768, 65536 colors (791)")); - vga->insertItem(_("VGA 1024x768, 16.7M colors (792)")); - vga->insertItem(_("VGA 1280x1024, 256 colors (775)")); - vga->insertItem(_("VGA 1280x1024, 32767 colors (793)")); - vga->insertItem(_("VGA 1280x1024, 65536 colors (794)")); - vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)")); + // WARNING Before adding translation _() to these texts see bug:57677 + vga->insertItem("default"); + vga->insertItem("ask"); + vga->insertItem("text 80x25 (0)"); + vga->insertItem("text 80x50 (1)"); + vga->insertItem("text 80x43 (2)"); + vga->insertItem("text 80x28 (3)"); + vga->insertItem("text 80x30 (4)"); + vga->insertItem("text 80x34 (5)"); + vga->insertItem("text 80x60 (6)"); + vga->insertItem("text 40x25 (7)"); + vga->insertItem("VGA 640x480, 256 colors (769)"); + vga->insertItem("VGA 640x480, 32767 colors (784)"); + vga->insertItem("VGA 640x480, 65536 colors (785)"); + vga->insertItem("VGA 640x480, 16.7M colors (786)"); + vga->insertItem("VGA 800x600, 256 colors (771)"); + vga->insertItem("VGA 800x600, 32767 colors (787)"); + vga->insertItem("VGA 800x600, 65536 colors (788)"); + vga->insertItem("VGA 800x600, 16.7M colors (789)"); + vga->insertItem("VGA 1024x768, 256 colors (773)"); + vga->insertItem("VGA 1024x768, 32767 colors (790)"); + vga->insertItem("VGA 1024x768, 65536 colors (791)"); + vga->insertItem("VGA 1024x768, 16.7M colors (792)"); + vga->insertItem("VGA 1280x1024, 256 colors (775)"); + vga->insertItem("VGA 1280x1024, 32767 colors (793)"); + vga->insertItem("VGA 1280x1024, 65536 colors (794)"); + vga->insertItem("VGA 1280x1024, 16.7M colors (795)"); connect( vga, SIGNAL(activated ( int )), SIGNAL(configChanged())); layout->addWidget(vgab); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.1.0/strigi-analyzer/rpm/kfile_rpm.desktop new/kdeadmin-4.1.1/strigi-analyzer/rpm/kfile_rpm.desktop --- old/kdeadmin-4.1.0/strigi-analyzer/rpm/kfile_rpm.desktop 2008-06-03 11:34:47.000000000 +0200 +++ new/kdeadmin-4.1.1/strigi-analyzer/rpm/kfile_rpm.desktop 2008-08-28 10:08:01.000000000 +0200 @@ -24,7 +24,7 @@ Name[he]=סטטיסטיקת RPM Name[hi]=आरपीएम स्टैट्स Name[hr]=RPM statistike -Name[hu]=RPM-információ +Name[hu]=RPM-jellemzők Name[it]=Statistiche RPM Name[kk]=RPM статистикасы Name[ko]=RPM 상태 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0