openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2007
- 1 participants
- 858 discussions
Hello community,
here is the log from the commit of package kdevelop4
checked in at Wed Nov 28 23:34:57 CET 2007.
--------
--- KDE/kdevelop4/kdevelop4.changes 2007-11-21 09:34:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdevelop4/kdevelop4.changes 2007-11-24 01:33:37.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Nov 24 01:33:37 CET 2007 - dmueller(a)suse.de
+
+- update to 3.96.0.svn740723
+
+-------------------------------------------------------------------
Old:
----
r738689.diff
+++++++++…
[View More]+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdevelop4.spec ++++++
--- /var/tmp/diff_new_pack.H26174/_old 2007-11-28 23:34:27.000000000 +0100
+++ /var/tmp/diff_new_pack.H26174/_new 2007-11-28 23:34:27.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdevelop4 (Version 3.96.0.svn738446)
+# spec file for package kdevelop4 (Version 3.96.0.svn740723)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,11 +15,10 @@
Group: Development/Tools/IDE
Summary: Integrated Development Environment for the X Window System, Qt, KDE, and GNOME
Url: http://www.kdevelop.org
-Version: 3.96.0.svn738446
+Version: 3.96.0.svn740723
Release: 1
Source0: kdevelop.tar.bz2
Source1: _upstream
-Patch0: r738689.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdebase4-runtime
@@ -46,7 +45,6 @@
%prep
%setup -q -n kdevelop
-%patch0
%build
%cmake_kde4 -d build
@@ -90,7 +88,6 @@
Walter Tasin <tasin(a)e-technik.fh-muenchen.de>
John Birch <jbb(a)ihug.co.nz>
-
%files devel
%defattr(-,root,root)
/usr/share/kde4/apps/cmake/modules/FindKDevelop.cmake
@@ -133,7 +130,10 @@
%_kde_share_dir/services/kcm_kdev*
%_kde_share_dir/services/kdev*
%_kde_share_dir/apps/kdevcmakebuilder
+
%changelog
+* Sat Nov 24 2007 - dmueller(a)suse.de
+- update to 3.96.0.svn740723
* Wed Nov 21 2007 - stbinner(a)suse.de
- update to 3.96.0.svn738446
* Sun Nov 18 2007 - dmueller(a)suse.de
++++++ kdevelop.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/builders/cmakebuilder/cmakebuilder.cpp new/kdevelop/buildtools/builders/cmakebuilder/cmakebuilder.cpp
--- old/kdevelop/buildtools/builders/cmakebuilder/cmakebuilder.cpp 2007-11-12 01:14:16.000000000 +0100
+++ new/kdevelop/buildtools/builders/cmakebuilder/cmakebuilder.cpp 2007-11-23 15:28:58.000000000 +0100
@@ -178,7 +178,7 @@
delete m_cmds[id];
}else
{
- id = view->registerView(i18n("CMake: %1", project->name() ) );
+ id = view->registerView(i18n("CMake: %1", project->name()), KDevelop::IOutputView::AllowUserClose | KDevelop::IOutputView::AutoScroll );
m_ids[project->projectItem()] = id;
m_models[id] = new KDevelop::OutputModel(this);
view->setModel( id, m_models[id] );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/builders/cmakebuilder/kdevcmakebuilder.desktop new/kdevelop/buildtools/builders/cmakebuilder/kdevcmakebuilder.desktop
--- old/kdevelop/buildtools/builders/cmakebuilder/kdevcmakebuilder.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/buildtools/builders/cmakebuilder/kdevcmakebuilder.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -8,6 +8,7 @@
Comment[el]=Κατασκευή έργων CMake
Comment[es]=Construye proyectos CMake
Comment[fa]=پروژههای CMake را میسازد
+Comment[fr]=Construit les projets CMake
Comment[ga]=Tóg Tionscadail CMake
Comment[it]=Compila i progetti CMake
Comment[ko]=CMake 프로젝트를 빌드합니다
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/builders/makebuilder/kcm_kdev_makebuilder.desktop new/kdevelop/buildtools/builders/makebuilder/kcm_kdev_makebuilder.desktop
--- old/kdevelop/buildtools/builders/makebuilder/kcm_kdev_makebuilder.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/buildtools/builders/makebuilder/kcm_kdev_makebuilder.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -19,6 +19,7 @@
Comment[el]=Ρύθμιση επιλογών Make
Comment[es]=Configurar las preferencias de make
Comment[fa]=پیکربندی تنظیمات Make
+Comment[fr]=Configurer les options de Make
Comment[ga]=Cumraigh socruithe Make
Comment[gl]=Configura os parámetros de Make
Comment[it]=Configura le impostazioni di Make
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/builders/makebuilder/kdevmakebuilder.desktop new/kdevelop/buildtools/builders/makebuilder/kdevmakebuilder.desktop
--- old/kdevelop/buildtools/builders/makebuilder/kdevmakebuilder.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/buildtools/builders/makebuilder/kdevmakebuilder.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -10,6 +10,7 @@
Comment[de]=Make Builder von KDevelop
Comment[el]=Κατασκευαστής Make του KDevelop
Comment[es]=Constructor make de KDevelop
+Comment[fr]=Constructeur Make pour KDevelop
Comment[ga]=Tógálaí Make le haghaidh KDevelop
Comment[gl]=Axudante para o Make de KDevelop
Comment[it]=Compilatore per Make di KDevelop
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/builders/makebuilder/makebuilder.cpp new/kdevelop/buildtools/builders/makebuilder/makebuilder.cpp
--- old/kdevelop/buildtools/builders/makebuilder/makebuilder.cpp 2007-11-12 00:22:36.000000000 +0100
+++ new/kdevelop/buildtools/builders/makebuilder/makebuilder.cpp 2007-11-23 15:28:58.000000000 +0100
@@ -304,7 +304,7 @@
{
item->text();
}
- id = view->registerView(i18n("Make: %1", target ) );
+ id = view->registerView(i18n("Make: %1", target), KDevelop::IOutputView::AllowUserClose | KDevelop::IOutputView::AutoScroll );
m_ids[item] = id;
m_models[id] = new MakeOutputModel(this, this);
m_delegates[id] = new MakeOutputDelegate(this);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/builders/qmakebuilder/kcm_kdev_qmakebuilder.desktop new/kdevelop/buildtools/builders/qmakebuilder/kcm_kdev_qmakebuilder.desktop
--- old/kdevelop/buildtools/builders/qmakebuilder/kcm_kdev_qmakebuilder.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/buildtools/builders/qmakebuilder/kcm_kdev_qmakebuilder.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -19,6 +19,7 @@
Comment[el]=Ρύθμιση επιλογών του QMake
Comment[es]=Configurar las preferencias de QMake
Comment[fa]=پیکربندی تنظیمات QMake
+Comment[fr]=Configurer les options de QMake
Comment[ga]=Cumraigh socruithe QMake
Comment[gl]=Configura os parámetros de QMake
Comment[it]=Configura le impostazioni di QMake
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/builders/qmakebuilder/kdevqmakebuilder.desktop new/kdevelop/buildtools/builders/qmakebuilder/kdevqmakebuilder.desktop
--- old/kdevelop/buildtools/builders/qmakebuilder/kdevqmakebuilder.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/buildtools/builders/qmakebuilder/kdevqmakebuilder.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -10,6 +10,7 @@
Comment[el]=Κατασκευή έργων QMake
Comment[es]=Construye proyectos QMake
Comment[fa]=پروژههای QMake را میسازد
+Comment[fr]=Construit les projets QMake
Comment[ga]=Tóg tionscadail QMake
Comment[gl]=Elabora proxectos de QMake
Comment[it]=Compila i progetti QMake
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/builders/qmakebuilder/qmakebuilder.cpp new/kdevelop/buildtools/builders/qmakebuilder/qmakebuilder.cpp
--- old/kdevelop/buildtools/builders/qmakebuilder/qmakebuilder.cpp 2007-11-12 00:23:12.000000000 +0100
+++ new/kdevelop/buildtools/builders/qmakebuilder/qmakebuilder.cpp 2007-11-23 20:13:23.000000000 +0100
@@ -81,7 +81,7 @@
connect( m_makeBuilder, SIGNAL( failed( KDevelop::ProjectBaseItem* ) ),
this, SIGNAL( failed( KDevelop::ProjectBaseItem* ) ) );
connect( m_makeBuilder, SIGNAL( makeTargetBuilt( KDevelop::ProjectBaseItem*, const QString& ) ),
- this, SIGNAL( distcleanCompleted( KDevelop::ProjectBaseItem*, const QString& ) ) );
+ this, SIGNAL( pruned( KDevelop::ProjectBaseItem* ) ) );
}
}
}
@@ -166,7 +166,7 @@
delete m_cmds[id];
}else
{
- id = view->registerView(i18n("QMake: %1", project->name() ) );
+ id = view->registerView(i18n("QMake: %1", project->name()), KDevelop::IOutputView::AllowUserClose | KDevelop::IOutputView::AutoScroll );
m_ids[project->projectItem()] = id;
m_models[id] = new KDevelop::OutputModel(this);
view->setModel( id, m_models[id] );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/managers/automake/kdevautomakeimporter.desktop new/kdevelop/buildtools/managers/automake/kdevautomakeimporter.desktop
--- old/kdevelop/buildtools/managers/automake/kdevautomakeimporter.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/buildtools/managers/automake/kdevautomakeimporter.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -6,6 +6,7 @@
Name[el]=Εισαγωγέας Autotools του KDevelop
Name[es]=Importador de Autotools de KDevelop
Name[fa]=واردکنندۀ ابزارهای خودکار KDevelop
+Name[fr]=Importation des « Autotools » pour KDevelop
Name[ga]=Iompórtálaí Autotools de chuid KDevelop
Name[gl]=Importador das Autotools de KDevelop
Name[it]=Importatore di Autotools per KDevelop
@@ -23,6 +24,7 @@
Comment[de]=Ermöglicht die Verwaltung von Projekten mit GNU-basiertem Erstellungssystem mit KDevelop
Comment[el]=Επιτρέπει στο KDevelop το χειρισμό έργων που χρησιμοποιούν ένα σύστημα κατασκευής GNU
Comment[es]=Permite que KDevelop gestione proyectos que usan un sistema de construcción basado en GNU
+Comment[fr]=Permet à KDevelop de gérer les projets utilisant un système de construction basé sur GNU
Comment[ga]=Ceadaigh do KDevelop tionscadail a bhainistiú le córas tógála atá bunaithe ar GNU
Comment[gl]=Permítelle a KDevelop xestionar proxectos usando un sistema de compilación baseado en GNU
Comment[it]=Permette a KDevelop di gestire progetti usando il sistema di compilazione basato su GNU
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/managers/cmake/kcm_kdevcmake_settings.desktop new/kdevelop/buildtools/managers/cmake/kcm_kdevcmake_settings.desktop
--- old/kdevelop/buildtools/managers/cmake/kcm_kdevcmake_settings.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/buildtools/managers/cmake/kcm_kdevcmake_settings.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -19,6 +19,7 @@
Comment[el]=Ρύθμιση επιλογών CMake
Comment[es]=Configurar las preferencias de CMake
Comment[fa]=پیکربندی تنظیمات CMake
+Comment[fr]=Configurer les options de CMake
Comment[ga]=Cumraigh socruithe CMake
Comment[gl]=Configura os parámetros de CMake
Comment[it]=Configura impostazioni CMake
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/managers/cmake/kdevcmakemanager.desktop new/kdevelop/buildtools/managers/cmake/kdevcmakemanager.desktop
--- old/kdevelop/buildtools/managers/cmake/kdevcmakemanager.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/buildtools/managers/cmake/kdevcmakemanager.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -6,6 +6,7 @@
Name[el]=Διαχειριστής CMake του KDevelop
Name[es]=Gestor CMake de KDevelop
Name[fa]=مدیر KDevelop CMake
+Name[fr]=Gestionnaire CMake pour KDevelop
Name[ga]=Bainisteoir CMake le haghaidh KDevelop
Name[gl]=Xestor de CMake de KDevelop
Name[it]=Gestore CMake di KDevelop
@@ -24,6 +25,7 @@
Comment[de]=Erlaubt das Erstellen CMake basierter Projekte mit KDevelop
Comment[el]=Επιτρέπει στο KDevelop το χειρισμό έργων με βάση το CMake
Comment[es]=Permite que KDevelop gestione proyectos basados en CMake
+Comment[fr]=Permet à KDevelop de gérer les projets basés sur CMake
Comment[ga]=Ceadaigh do KDevelop tionscadail CMake a bhainistiú
Comment[gl]=Permítelle a KDevelop xestionar proxectos baseados en CMake
Comment[it]=Permette a KDevelop di gestire i progetti basati su CMake
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/managers/custommake/kdevcustommakemanager.desktop new/kdevelop/buildtools/managers/custommake/kdevcustommakemanager.desktop
--- old/kdevelop/buildtools/managers/custommake/kdevcustommakemanager.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/buildtools/managers/custommake/kdevcustommakemanager.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -6,6 +6,7 @@
Name[el]=Διαχειριστής προσαρμοσμένης δημιουργίας του KDevelop
Name[es]=Gestor de Make personalizado de KDevelop
Name[fa]=مدیر KDevelop CustomMake
+Name[fr]=Gestionnaire Make personnalisé pour KDevelop
Name[ga]=Bainisteoir CustomMake le haghaidh KDevelop
Name[gl]=Xestor de CustomMake de KDevelop
Name[it]=Gestore personalizzato di Make per KDevelop
@@ -25,6 +26,7 @@
Comment[el]=Εισαγωγή και επεξεργασία έργων προσαρμοσμένου make
Comment[es]=Importa y edita proyectos make personalizados
Comment[fa]=پروژههای make سفارشی را وارد و ویرایش میکند
+Comment[fr]=Importe et modifie des projets Make personnalisés
Comment[ga]=Iompórtáil tionscadail shaincheaptha make agus cuir iad in eagar
Comment[gl]=Importa e edita proxectos que usen un sistema make personalizado
Comment[it]=Importa e modifica i progetti personalizzati di Make
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/managers/qmake/kdevqmakemanager.desktop new/kdevelop/buildtools/managers/qmake/kdevqmakemanager.desktop
--- old/kdevelop/buildtools/managers/qmake/kdevqmakemanager.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/buildtools/managers/qmake/kdevqmakemanager.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -6,6 +6,7 @@
Name[el]=Διαχειριστής QMake του KDevelop
Name[es]=Gestor QMake de KDevelop
Name[fa]=مدیر KDevelop QMake
+Name[fr]=Gestionnaire QMake pour KDevelop
Name[ga]=Bainisteoir QMake le haghaidh KDevelop
Name[gl]=Xestor de QMake de KDevelop
Name[it]=Gestore QMake di KDevelop
@@ -30,7 +31,7 @@
Comment[et]=QMake'i projektide import ja redigeerimine.
Comment[eu]=Qmake proiektuak inportatu eta editatzen ditu
Comment[fa]=پروژههای qmake را وارد و ویرایش میکند
-Comment[fr]=Importe et modifie des projets qmake
+Comment[fr]=Importe et modifie des projets Qmake
Comment[ga]=Iompórtáil tionscadail qmake agus cuir iad in eagar
Comment[gl]=Importa e edita proxectos baseados en qmake
Comment[hu]=Qmake-projektek importálása és szerkesztése
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/managers/qmake/parser/generated/qmake_parser.cpp new/kdevelop/buildtools/managers/qmake/parser/generated/qmake_parser.cpp
--- old/kdevelop/buildtools/managers/qmake/parser/generated/qmake_parser.cpp 2007-11-18 18:36:21.000000000 +0100
+++ new/kdevelop/buildtools/managers/qmake/parser/generated/qmake_parser.cpp 2007-11-19 14:12:35.000000000 +0100
@@ -8,6 +8,7 @@
#include <kdebug.h>
#include <QtCore/QString>
#include <cstddef>
+#include <limits>
namespace QMake
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/buildtools/managers/qmake/parser/qmake.g new/kdevelop/buildtools/managers/qmake/parser/qmake.g
--- old/kdevelop/buildtools/managers/qmake/parser/qmake.g 2007-11-18 18:36:21.000000000 +0100
+++ new/kdevelop/buildtools/managers/qmake/parser/qmake.g 2007-11-19 14:12:35.000000000 +0100
@@ -26,6 +26,7 @@
[:
#include <QtCore/QString>
+#include <limits>
namespace QMake
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/app_templates/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate new/kdevelop/languages/cpp/app_templates/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate
--- old/kdevelop/languages/cpp/app_templates/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/languages/cpp/app_templates/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate 2007-11-23 08:40:13.000000000 +0100
@@ -5,6 +5,7 @@
Name[el]=Εφαρμογή GUI της Qt4
Name[es]=Aplicación con interfaz gráfica Qt4
Name[fa]=کاربرد ونک Qt4
+Name[fr]=Application avec interface graphique Qtopia
Name[ga]=Feidhmchlár Grafach Qt4
Name[gl]=Aplicación Qt4 con GUI
Name[it]=Applicazione GUI Qt4
@@ -24,6 +25,7 @@
Comment[el]=Δημιουργία μιας εφαρμογής με βάση τα QMake/Qt4 με γραφικό περιβάλλον (συμβατή με πολλαπλές πλατφόρμες)
Comment[es]=Genera una aplicación basada en QMake/Qt4 con interfaz gráfica (compatible multiplataforma)
Comment[fa]=یک کاربرد بر مبنای QMake/Qt4 با واسط کاربر نگارهای تولید میکند )همساز بین سکویی(
+Comment[fr]=Générer une application basée sur QMake / Qt4 avec interface graphique (compatible multiplate-forme)
Comment[ga]=Cruthaigh feidhmchlár bunaithe ar QMake/Qt4 le comhéadan grafach (feidhmchlár trasardáin)
Comment[gl]=Xera un programa baseado en QMake/Qt4 con inteface gráfica para o usuario (compatíbel con multiplataforma)
Comment[it]=Genera un'applicazione basata su QMake/Qt4 con interfaccia utente grafica (compatibile multipiattaforma)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppcodecompletionmodel.cpp new/kdevelop/languages/cpp/cppcodecompletionmodel.cpp
--- old/kdevelop/languages/cpp/cppcodecompletionmodel.cpp 2007-11-16 15:16:30.000000000 +0100
+++ new/kdevelop/languages/cpp/cppcodecompletionmodel.cpp 2007-11-21 13:15:45.000000000 +0100
@@ -109,11 +109,11 @@
, m_mutex(new QMutex)
, m_worker(new CodeCompletionWorker(this))
{
- qRegisterMetaType<CompletionItem>("CppCodeCompletionModel::CompletionItem");
+ qRegisterMetaType<QList<CompletionItem> >("QList<CppCodeCompletionModel::CompletionItem>");
qRegisterMetaType<KTextEditor::Cursor>("KTextEditor::Cursor");
connect(this, SIGNAL(completionsNeeded(KDevelop::DUContextPointer, const KTextEditor::Cursor&, KTextEditor::View*)), m_worker, SLOT(computeCompletions(KDevelop::DUContextPointer, const KTextEditor::Cursor&, KTextEditor::View*)), Qt::QueuedConnection);
- connect(m_worker, SIGNAL(foundDeclaration(CppCodeCompletionModel::CompletionItem, void*)), this, SLOT(foundDeclaration(CppCodeCompletionModel::CompletionItem, void*)), Qt::QueuedConnection);
+ connect(m_worker, SIGNAL(foundDeclarations(QList<CppCodeCompletionModel::CompletionItem>, void*)), this, SLOT(foundDeclarations(QList<CppCodeCompletionModel::CompletionItem>, void*)), Qt::QueuedConnection);
m_worker->start();
}
@@ -182,12 +182,17 @@
}
}
-void CppCodeCompletionModel::foundDeclaration(CompletionItem item, void* completionContext)
+void CppCodeCompletionModel::foundDeclarations(QList<CompletionItem> items, void* completionContext)
{
if (completionContext == m_completionContext.data()) {
- beginInsertRows(QModelIndex(), m_declarations.count(), m_declarations.count());
- m_declarations << item;
- endInsertRows();
+ if( !m_declarations.isEmpty() ) {
+ beginInsertRows(QModelIndex(), m_declarations.count(), m_declarations.count() + items.count() - 1);
+ m_declarations += items;
+ endInsertRows();
+ } else {
+ m_declarations = items;
+ reset();
+ }
}
}
@@ -306,6 +311,8 @@
}
++num;
+ if( paramNameIt != paramNames.end() )
+ ++paramNameIt;
}
ret += ')';
if( functionType->isConstant() )
@@ -491,7 +498,7 @@
{
QString indentation;
int depth = item.inheritanceDepth;
- if( depth > 1000 )
+ if( depth >= 1000 )
depth-=1000;
for( int a = 0; a < depth; a++ )
indentation += " ";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppcodecompletionmodel.h new/kdevelop/languages/cpp/cppcodecompletionmodel.h
--- old/kdevelop/languages/cpp/cppcodecompletionmodel.h 2007-11-12 13:39:16.000000000 +0100
+++ new/kdevelop/languages/cpp/cppcodecompletionmodel.h 2007-11-21 13:05:35.000000000 +0100
@@ -85,7 +85,7 @@
void completionsNeeded(KDevelop::DUContextPointer context, const KTextEditor::Cursor& position, KTextEditor::View* view);
private Q_SLOTS:
- void foundDeclaration(CppCodeCompletionModel::CompletionItem item, void* completionContext);
+ void foundDeclarations(QList<CppCodeCompletionModel::CompletionItem> item, void* completionContext);
private:
KSharedPtr<Cpp::CodeCompletionContext> m_completionContext;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppcodecompletionworker.cpp new/kdevelop/languages/cpp/cppcodecompletionworker.cpp
--- old/kdevelop/languages/cpp/cppcodecompletionworker.cpp 2007-11-16 13:21:45.000000000 +0100
+++ new/kdevelop/languages/cpp/cppcodecompletionworker.cpp 2007-11-21 13:05:35.000000000 +0100
@@ -101,6 +101,8 @@
if (m_abort)
return;
+ QList<CppCodeCompletionModel::CompletionItem> items;
+
if( completionContext->memberAccessContainer().isValid() ||completionContext->memberAccessOperation() == Cpp::CodeCompletionContext::StaticMemberChoose )
{
QList<DUContext*> containers = completionContext->memberAccessContainers();
@@ -109,8 +111,8 @@
if (m_abort)
return;
- foreach( const DeclarationDepthPair& decl, Cpp::hideOverloadedDeclarations( ctx->allDeclarations(ctx->textRange().end(), false) ) )
- emit foundDeclaration(CppCodeCompletionModel::CompletionItem( DeclarationPointer(decl.first), completionContext, decl.second ), completionContext.data());
+ foreach( const DeclarationDepthPair& decl, Cpp::hideOverloadedDeclarations( ctx->allDeclarations(ctx->textRange().end(), context->topContext(), false ) ) )
+ items << CppCodeCompletionModel::CompletionItem( DeclarationPointer(decl.first), completionContext, decl.second ), completionContext.data();
}
} else {
kDebug(9007) << "CppCodeCompletionModel::setContext: no container-type";
@@ -125,17 +127,17 @@
CppCodeCompletionModel::CompletionItem completionItem;
completionItem.includeItem = includeItem;
- emit foundDeclaration(completionItem, completionContext.data());
+ items << completionItem;
++cnt;
}
kDebug(9007) << "Added " << cnt << " include-files to completion-list";
} else {
//Show all visible declarations
- foreach( const DeclarationDepthPair& decl, Cpp::hideOverloadedDeclarations( context->allDeclarations(context->type() == DUContext::Class ? context->textRange().end() : position) ) ) {
+ foreach( const DeclarationDepthPair& decl, Cpp::hideOverloadedDeclarations( context->allDeclarations(context->type() == DUContext::Class ? context->textRange().end() : position, context->topContext()) ) ) {
if (m_abort)
return;
- emit foundDeclaration(CppCodeCompletionModel::CompletionItem( DeclarationPointer(decl.first), completionContext, decl.second ), completionContext.data());
+ items << CppCodeCompletionModel::CompletionItem( DeclarationPointer(decl.first), completionContext, decl.second ), completionContext.data();
}
kDebug(9007) << "CppCodeCompletionModel::setContext: using all declarations visible";
@@ -152,7 +154,7 @@
if( parentContext->memberAccessOperation() == Cpp::CodeCompletionContext::FunctionCallAccess ) {
int num = 0;
foreach( Cpp::CodeCompletionContext::Function function, parentContext->functions() ) {
- emit foundDeclaration(CppCodeCompletionModel::CompletionItem( function.function.declaration(), parentContext, 0, num ), completionContext.data());
+ items << CppCodeCompletionModel::CompletionItem( function.function.declaration(), parentContext, 0, num ), completionContext.data();
++num;
}
} else {
@@ -160,6 +162,7 @@
}
}
} while( parentContext );
+ emit foundDeclarations( items, completionContext.data() );
} else {
kDebug(9007) << "CppCodeCompletionModel::setContext: Invalid code-completion context";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppcodecompletionworker.h new/kdevelop/languages/cpp/cppcodecompletionworker.h
--- old/kdevelop/languages/cpp/cppcodecompletionworker.h 2007-11-12 13:39:16.000000000 +0100
+++ new/kdevelop/languages/cpp/cppcodecompletionworker.h 2007-11-21 13:05:35.000000000 +0100
@@ -23,6 +23,7 @@
#define KDEVCPPCODECOMPLETIONWORKER_H
#include <QThread>
+#include <QList>
#include "cppcodecompletionmodel.h"
@@ -39,7 +40,7 @@
void abortCurrentCompletion();
Q_SIGNALS:
- void foundDeclaration(CppCodeCompletionModel::CompletionItem, void* completionContext);
+ void foundDeclarations(QList<CppCodeCompletionModel::CompletionItem>, void* completionContext);
protected:
virtual void run();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/contextbuilder.cpp new/kdevelop/languages/cpp/cppduchain/contextbuilder.cpp
--- old/kdevelop/languages/cpp/cppduchain/contextbuilder.cpp 2007-11-18 02:32:35.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/contextbuilder.cpp 2007-11-20 02:09:18.000000000 +0100
@@ -220,13 +220,17 @@
if( topLevelContext && !topLevelContext->smartRange() && m_editor->smart() ) {
lock.unlock();
+ kWarning() << "Smartening Context!";
smartenContext(topLevelContext);
lock.lock();
topLevelContext = updateContext.data(); //In case the context was deleted, updateContext as a DUChainPointer will have noticed it.
}
- if( topLevelContext && topLevelContext->smartRange() )
- Q_ASSERT(!topLevelContext->smartRange()->parentRange()); //Top-range must have no parent, else something is wrong with the structure
+ if( topLevelContext && topLevelContext->smartRange() && !(topLevelContext->flags() & TopDUContext::ProxyContextFlag))
+ if (topLevelContext->smartRange()->parentRange()) { //Top-range must have no parent, else something is wrong with the structure
+ kDebug() << *topLevelContext->smartRange() << "erroneously has a parent range" << *topLevelContext->smartRange()->parentRange();
+ Q_ASSERT(false);
+ }
if (topLevelContext) {
kDebug(9007) << "ContextBuilder::buildContexts: recompiling";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/cppducontext.h new/kdevelop/languages/cpp/cppduchain/cppducontext.h
--- old/kdevelop/languages/cpp/cppduchain/cppducontext.h 2007-11-18 05:13:12.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/cppducontext.h 2007-11-22 18:26:35.000000000 +0100
@@ -191,10 +191,9 @@
delayed->setQualifiedIdentifier( currentIdentifier.templateIdentifiers().at(a) );
Cpp::ExpressionEvaluationResult res;
- res.type = Cpp::resolveDelayedTypes( AbstractType::Ptr( delayed.data() ), this, trace, BaseContext::NoSearchFlags );
+ res.type = Cpp::resolveDelayedTypes( AbstractType::Ptr( delayed.data() ), this, trace, basicFlags & KDevelop::DUContext::NoUndefinedTemplateParams ? DUContext::NoUndefinedTemplateParams : DUContext::NoSearchFlags );
- if( (basicFlags & KDevelop::DUContext::NoUndefinedTemplateParams) && dynamic_cast<CppTemplateParameterType*>(res.type.data()) ) {
- kDebug() << "breaking because template involved";
+ if( (basicFlags & KDevelop::DUContext::NoUndefinedTemplateParams) && (dynamic_cast<CppTemplateParameterType*>(res.type.data()) || dynamic_cast<DelayedType*>(res.type.data())) ) {
return false;
}
@@ -225,12 +224,14 @@
prepend.pop();
}
allIdentifiers << currentLookup;
+
for( int a = trace.count()-1; a >= 0; --a ) {
const DUContext::ImportTraceItem& traceItem(trace[a]);
QList<Declaration*> decls;
///@todo Give a correctly modified trace(without the used items)
- traceItem.ctx->findDeclarationsInternal( allIdentifiers, traceItem.position.isValid() ? traceItem.position : traceItem.ctx->textRange().end(), AbstractType::Ptr(), tempDecls, trace.mid(0,a), KDevelop::DUContext::NoUndefinedTemplateParams );
+ traceItem.ctx->findDeclarationsInternal( allIdentifiers, traceItem.position.isValid() ? traceItem.position : traceItem.ctx->textRange().end(), AbstractType::Ptr(), decls, trace.mid(0,a), KDevelop::DUContext::NoUndefinedTemplateParams );
if( !decls.isEmpty() ) {
+ tempDecls = decls;
break;
}
}
@@ -271,19 +272,18 @@
Declaration* dec = instantiateDeclaration(decl, templateArgumentTypes, trace);
if( dec )
ret << dec;
- else
- kDebug(9007) << "Could not instantiate template-declaration";
+ ifDebug( else kDebug(9007) << "Could not instantiate template-declaration"; )
}
}
}else{
//Only a part of the scope found, keep on searching
//Handle normal found declarations
- currentLookup.clear();
if( tempDecls.size() == 1 ) {
} else {
- kDebug(9007) << "CppDUContext::findDeclarationsInternal: found " << tempDecls.size() << " multiple ambiguous declarations for scope " << currentLookup.toString();
+ kDebug(9007) << "CppDUContext::findDeclarationsInternal: found " << tempDecls.size() << " ambiguous declarations for scope " << currentLookup.toString();
}
+ currentLookup.clear();
//Extract a context, maybe it would be enough only testing the first found declaration
foreach( Declaration* decl, tempDecls ) {
Declaration* instanceDecl = decl;
@@ -473,7 +473,7 @@
TemplateDeclaration* templateDecl = dynamic_cast<TemplateDeclaration*>(decl);
if( !templateDecl ) {
- kDebug(9007) << "Tried to instantiate a non-template declaration";
+ ifDebug( kDebug(9007) << "Tried to instantiate a non-template declaration" << decl->toString(); )
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/declarationbuilder.cpp new/kdevelop/languages/cpp/cppduchain/declarationbuilder.cpp
--- old/kdevelop/languages/cpp/cppduchain/declarationbuilder.cpp 2007-11-18 02:32:35.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/declarationbuilder.cpp 2007-11-22 19:44:22.000000000 +0100
@@ -531,29 +531,11 @@
currentDeclaration()->setType(type);
}
-void DeclarationBuilder::closeDeclaration()
+void DeclarationBuilder::eventuallyAssignInternalContext()
{
- if (lastType() || m_lastContext) {
+ if (m_lastContext) {
DUChainWriteLocker lock(DUChain::lock());
- if(lastType()) {
- IdentifiedType* idType = dynamic_cast<IdentifiedType*>(lastType().data());
- DelayedType* delayed = dynamic_cast<DelayedType*>(lastType().data());
-
- //When the given type has no declaration yet, assume we are declaring it now.
- //If the type is a delayed type, it is a searched type, and not a declared one, so don't set the declaration then.
- if( idType && idType->declaration() == 0 && !delayed )
- idType->setDeclaration( currentDeclaration() );
-
- //If the type is not identified, it is an instance-declaration too, because those types have no type-declarations.
- if( (((!idType) || (idType && idType->declaration() != currentDeclaration())) && !currentDeclaration()->isTypeAlias() && !currentDeclaration()->isForwardDeclaration() ) )
- currentDeclaration()->setKind(Declaration::Instance);
- else
- currentDeclaration()->setKind(Declaration::Type);
-
- currentDeclaration()->setType(lastType());
- }
-
if( dynamic_cast<ClassFunctionDeclaration*>(currentDeclaration()) )
Q_ASSERT( !static_cast<ClassFunctionDeclaration*>(currentDeclaration())->isConstructor() || currentDeclaration()->context()->type() == DUContext::Class );
@@ -569,8 +551,31 @@
}
}
}
+}
+void DeclarationBuilder::closeDeclaration()
+{
+ if (lastType()) {
+ DUChainWriteLocker lock(DUChain::lock());
+ IdentifiedType* idType = dynamic_cast<IdentifiedType*>(lastType().data());
+ DelayedType* delayed = dynamic_cast<DelayedType*>(lastType().data());
+
+ //When the given type has no declaration yet, assume we are declaring it now.
+ //If the type is a delayed type, it is a searched type, and not a declared one, so don't set the declaration then.
+ if( idType && idType->declaration() == 0 && !delayed )
+ idType->setDeclaration( currentDeclaration() );
+
+ //If the type is not identified, it is an instance-declaration too, because those types have no type-declarations.
+ if( (((!idType) || (idType && idType->declaration() != currentDeclaration())) && !currentDeclaration()->isTypeAlias() && !currentDeclaration()->isForwardDeclaration() ) )
+ currentDeclaration()->setKind(Declaration::Instance);
+ else
+ currentDeclaration()->setKind(Declaration::Type);
+
+ currentDeclaration()->setType(lastType());
+ }
+
+ eventuallyAssignInternalContext();
//kDebug(9007) << "Mangled declaration:" << currentDeclaration()->mangledIdentifier();
@@ -621,6 +626,8 @@
DeclarationBuilderBase::visitClassSpecifier(node);
+ eventuallyAssignInternalContext();
+
if( node->name ) {
//Resolve forward-declarations
DUChainWriteLocker lock(DUChain::lock());
@@ -804,7 +811,7 @@
injectType(AbstractType::Ptr(declarations.first()->abstractType().data()), node);
return;
}else{
- kDebug() << "Error: Bad declaration";
+ kDebug(9007) << "Error: Bad declaration";
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/declarationbuilder.h new/kdevelop/languages/cpp/cppduchain/declarationbuilder.h
--- old/kdevelop/languages/cpp/cppduchain/declarationbuilder.h 2007-11-17 03:35:11.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/declarationbuilder.h 2007-11-22 19:44:22.000000000 +0100
@@ -95,6 +95,7 @@
KDevelop::Declaration* openDeclaration(NameAST* name, AST* range, bool isFunction = false, bool isForward = false, bool isDefinition = false, bool isNamespaceAlias = false, const Identifier& customName = Identifier());
/// Same as the above, but sets it as the definition too
KDevelop::Declaration* openDefinition(NameAST* name, AST* range, bool isFunction = false);
+ void eventuallyAssignInternalContext();
void closeDeclaration();
void abortDeclaration();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/expressionparser.cpp new/kdevelop/languages/cpp/cppduchain/expressionparser.cpp
--- old/kdevelop/languages/cpp/cppduchain/expressionparser.cpp 2007-11-18 02:32:35.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/expressionparser.cpp 2007-11-20 02:09:18.000000000 +0100
@@ -69,7 +69,7 @@
ast = parser.parseTypeOrExpression(session, forceExpression);
if(!ast) {
- kDebug() << "Failed to parse \"" << unit << "\"";
+ kDebug(9007) << "Failed to parse \"" << unit << "\"";
delete session;
return ExpressionEvaluationResult();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/expressionvisitor.cpp new/kdevelop/languages/cpp/cppduchain/expressionvisitor.cpp
--- old/kdevelop/languages/cpp/cppduchain/expressionvisitor.cpp 2007-11-18 05:13:12.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/expressionvisitor.cpp 2007-11-22 01:49:06.000000000 +0100
@@ -197,7 +197,7 @@
}
-ExpressionVisitor::ExpressionVisitor(ParseSession* session, const KDevelop::DUContext::ImportTrace& inclusionTrace, bool strict) : m_strict(strict), m_session(session), m_currentContext(0) {
+ExpressionVisitor::ExpressionVisitor(ParseSession* session, const KDevelop::DUContext::ImportTrace& inclusionTrace, bool strict) : m_strict(strict), m_inclusionTrace(inclusionTrace), m_session(session), m_currentContext(0) {
}
ExpressionVisitor::~ExpressionVisitor() {
@@ -1406,7 +1406,7 @@
PushPositiveContext pushContext( m_currentContext, node->ducontext );
clearLast();
visit(node->expression);
- kDebug() << "expression kind" << node->kind;
+ kDebug(9007) << "expression kind" << node->kind;
if( m_lastType )
expressionType( node, m_lastType, m_lastInstance );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/templatedeclaration.cpp new/kdevelop/languages/cpp/cppduchain/templatedeclaration.cpp
--- old/kdevelop/languages/cpp/cppduchain/templatedeclaration.cpp 2007-11-18 05:13:12.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/templatedeclaration.cpp 2007-11-23 15:54:40.000000000 +0100
@@ -125,7 +125,7 @@
const DelayedType* delayed = dynamic_cast<const DelayedType*>(base.baseClass.data());
if( delayed )
return delayed;
- else if( delayed = containsDelayedType( base.baseClass.data() ) )
+ else if( (delayed = containsDelayedType( base.baseClass.data() )) )
return delayed;
}
}
@@ -159,7 +159,7 @@
QList<Declaration*> decls;
if( !searchContext->findDeclarationsInternal( identifiers, searchContext->textRange().end(), AbstractType::Ptr(), decls, inclusionTrace, searchFlags ) ) {
- kDebug() << "stopping exchange because template involved";
+ kDebug(9007) << "stopping exchange because template involved";
return const_cast<AbstractType*>(type);
}
@@ -458,7 +458,7 @@
///@todo Use explicitly declared specializations
Declaration* TemplateDeclaration::instantiate( const QList<ExpressionEvaluationResult>& templateArguments, const DUContext::ImportTrace& inclusionTrace )
{
- foreach(const ExpressionEvaluationResult& res, templateArguments)
+ //foreach(const ExpressionEvaluationResult& res, templateArguments)
if( ForwardDeclaration* forward = dynamic_cast<ForwardDeclaration*>(this) ) {
TemplateDeclaration* resolvedTemplate = dynamic_cast<TemplateDeclaration*>(forward->resolved());
@@ -491,7 +491,7 @@
return clone;
}
-AbstractType::Ptr resolveDelayedTypes( AbstractType::Ptr type, const KDevelop::DUContext* context, const KDevelop::DUContext::ImportTrace& inclusionTrace , KDevelop::DUContext::SearchFlags searchFlags ) {
+AbstractType::Ptr resolveDelayedTypes( AbstractType::Ptr type, const KDevelop::DUContext* context, const KDevelop::DUContext::ImportTrace& inclusionTrace, KDevelop::DUContext::SearchFlags searchFlags ) {
if( !type )
return type;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/tests/test_duchain.cpp new/kdevelop/languages/cpp/cppduchain/tests/test_duchain.cpp
--- old/kdevelop/languages/cpp/cppduchain/tests/test_duchain.cpp 2007-11-18 05:10:46.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/tests/test_duchain.cpp 2007-11-22 18:28:34.000000000 +0100
@@ -1225,6 +1225,17 @@
release(top);
}
+void TestDUChain::testTemplateDependentClass() {
+ QByteArray method("class A {}; template<class T> class B { class Q{ typedef T Type; }; }; B<A>::Q::Type t;");
+
+ DUContext* top = parse(method, DumpNone);
+
+ DUChainWriteLocker lock(DUChain::lock());
+ Declaration* d = findDeclaration(top, QualifiedIdentifier("t"));
+ QVERIFY(d);
+ QCOMPARE(d->abstractType().data(), top->localDeclarations()[0]->abstractType().data());
+}
+
void TestDUChain::testTemplates() {
QByteArray method("template<class T> T test(const T& t) {}; template<class T, class T2> class A {T2 a; typedef T Template1; }; class B{int b;}; class C{int c;}; template<class T>class A<B,T>{}; typedef A<B,C> D;");
@@ -1391,9 +1402,8 @@
void TestDUChain::testTemplatesRebind() {
QByteArray method("struct A {}; struct S {typedef A Value;} ; template<class TT> class Base { template<class T> struct rebind { typedef Base<T> other; }; typedef TT Type; }; template<class T> class Class { typedef Base<T>::rebind<T>::other::Type MemberType; MemberType member; Base<T>::template rebind<T>::other::Type member2; T::Value value; }; };");
- //QByteArray method("struct A {}; struct S {typedef A Value;} ; template<class TT> class Base { template<class Q> struct rebind { typedef Base<Q> other; }; typedef TT Type; }; template<class T> class Class { typedef Base<T>::rebind<T>::other MemberType; MemberType member; Base<T>::template rebind<T>::other member2; T::Value value; }; };");
- DUContext* top = parse(method, DumpAll);
+ DUContext* top = parse(method, DumpNone);
DUChainWriteLocker lock(DUChain::lock());
@@ -1426,12 +1436,22 @@
}
void TestDUChain::testTemplatesRebind2() {
- QByteArray method("struct A {}; struct S {typedef A Value;} ;template<class T> class Class { T::Value value; }; };");
+ QByteArray method("struct A {}; struct S {typedef A Value;} ;template<class T> class Test { }; template<class T> class Class { typedef T::Value Value; T::Value value; typedef Test<Value> ValueClass; Test<const Value> ValueClass2;}; };");
- DUContext* top = parse(method, DumpNone);
+ DUContext* top = parse(method, DumpAll);
DUChainWriteLocker lock(DUChain::lock());
+ Declaration* member5Decl = findDeclaration(top, QualifiedIdentifier("Class<S>::ValueClass2"));
+ QVERIFY(member5Decl);
+ QVERIFY(member5Decl->abstractType());
+ QCOMPARE(member5Decl->abstractType()->toString(), QString("Test< A >")); ///@todo This will fail once we parse "const" correctly, change it to "Test< const A >" then
+
+ Declaration* member4Decl = findDeclaration(top, QualifiedIdentifier("Class<S>::ValueClass"));
+ QVERIFY(member4Decl);
+ QVERIFY(member4Decl->abstractType());
+ QCOMPARE(member4Decl->abstractType()->toString(), QString("Test< A >"));
+
Declaration* member3Decl = findDeclaration(top, QualifiedIdentifier("Class<S>::value"));
QVERIFY(member3Decl);
QVERIFY(member3Decl->abstractType());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/tests/test_duchain.h new/kdevelop/languages/cpp/cppduchain/tests/test_duchain.h
--- old/kdevelop/languages/cpp/cppduchain/tests/test_duchain.h 2007-11-18 02:26:09.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/tests/test_duchain.h 2007-11-22 17:24:21.000000000 +0100
@@ -73,6 +73,7 @@
void testTemplateEnums();
void testIntegralTemplates();
void testTypedef();
+ void testTemplateDependentClass();
void testTemplates();
void testTemplates2();
void testTemplatesRebind();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/tests/test_expressionparser.cpp new/kdevelop/languages/cpp/cppduchain/tests/test_expressionparser.cpp
--- old/kdevelop/languages/cpp/cppduchain/tests/test_expressionparser.cpp 2007-11-13 00:36:15.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/tests/test_expressionparser.cpp 2007-11-22 18:28:34.000000000 +0100
@@ -410,8 +410,23 @@
lock.unlock();
Cpp::ExpressionParser parser;
+ Cpp::ExpressionEvaluationResult result;
- Cpp::ExpressionEvaluationResult result = parser.evaluateExpression( "c.a", KDevelop::DUContextPointer(testContext));
+ result = parser.evaluateType( "const Cont", KDevelop::DUContextPointer(testContext));
+ lock.lock();
+ QVERIFY(result.isValid());
+ QCOMPARE(result.type->toString(), QString("Cont")); ///@todo Change this to "const Cont" once we parse const correctly
+ QVERIFY(!result.instance);
+ lock.unlock();
+
+ result = parser.evaluateExpression( "Cont", KDevelop::DUContextPointer(testContext));
+ lock.lock();
+ QVERIFY(result.isValid());
+ QCOMPARE(result.type->toString(), QString("Cont"));
+ QVERIFY(!result.instance);
+ lock.unlock();
+
+ result = parser.evaluateExpression( "c.a", KDevelop::DUContextPointer(testContext));
lock.lock();
QVERIFY(result.isValid());
QVERIFY(result.instance);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppduchain/typebuilder.cpp new/kdevelop/languages/cpp/cppduchain/typebuilder.cpp
--- old/kdevelop/languages/cpp/cppduchain/typebuilder.cpp 2007-11-18 02:32:35.000000000 +0100
+++ new/kdevelop/languages/cpp/cppduchain/typebuilder.cpp 2007-11-22 17:24:21.000000000 +0100
@@ -61,6 +61,33 @@
: TypeBuilderBase(editor), m_declarationHasInitDeclarators(false)
{
}
+///DUChain must be locked
+bool isTemplateDependent(Declaration* decl) {
+ ///@todo Store this information somewhere, instead of recomputing it for each item
+ if( !decl )
+ return false;
+ if( dynamic_cast<CppTemplateParameterType*>(decl->abstractType().data()) )
+ return true;
+
+ DUContext* ctx = decl->context();
+
+ while( ctx && ctx->type() != DUContext::Global && ctx->type() != DUContext::Namespace ) {
+ //Check if there is an imported template-context, which has an unresolved template-parameter
+ foreach( DUContextPointer importedCtx, ctx->importedParentContexts() ) {
+ if( !importedCtx )
+ continue;
+ if( importedCtx->type() == DUContext::Template ) {
+ foreach( Declaration* paramDecl, importedCtx->localDeclarations() ) {
+ CppTemplateParameterType* templateParamType = dynamic_cast<CppTemplateParameterType*>(paramDecl->abstractType().data());
+ if( templateParamType )
+ return true;
+ }
+ }
+ }
+ ctx = ctx->parentContext();
+ }
+ return false;
+}
void TypeBuilder::supportBuild(AST *node, DUContext* context)
{
@@ -151,28 +178,49 @@
Q_ASSERT( klass );
QualifiedIdentifier baseClassIdentifier = identifierForName(node->name);
- KTextEditor::Cursor pos = m_editor->findPosition(node->start_token, KDevelop::EditorIntegrator::FrontEdge);
-
- QList<Declaration*> declarations = searchContext()->findDeclarations(baseClassIdentifier, pos, AbstractType::Ptr(), DUContext::NoUndefinedTemplateParams);
+
+ bool delay = false;
bool openedType = false;
- if( !declarations.isEmpty() )
- {
- if( declarations.count() > 1 )
- kDebug(9007) << "found multiple declarations for" << baseClassIdentifier.toString();
+
+ if(!delay) {
+ KTextEditor::Cursor pos = m_editor->findPosition(node->start_token, KDevelop::EditorIntegrator::FrontEdge);
- foreach( Declaration* decl, declarations )
+ QList<Declaration*> declarations = searchContext()->findDeclarations(baseClassIdentifier, pos, AbstractType::Ptr(), 0, DUContext::NoUndefinedTemplateParams);
+ /**
+ * @todo If we somewhere within a template class/function declaration,
+ * we need to check here whether the found declaration is template-dependent.
+ * If it is, it needs to be delayed. Template-dependent means:
+ * - Does it contain any types that depend on an unresolved template-parameter?
+ *
+ * Until we correctly check for that, we need to make all types within template-classes delayed. This hurts.
+ * */
+ if( !declarations.isEmpty() )
{
- if( decl->kind() == Declaration::Type && decl->abstractType() && dynamic_cast<CppClassType*>(decl->abstractType().data()) )
+ if( declarations.count() > 1 )
+ kDebug(9007) << "found multiple declarations for" << baseClassIdentifier.toString();
+
+ foreach( Declaration* decl, declarations )
{
- openType( decl->abstractType(), node );
- openedType = true;
- break;
+ if( decl->kind() == Declaration::Type && decl->abstractType() && dynamic_cast<CppClassType*>(decl->abstractType().data()) )
+ {
+ if( !templateDeclarationDepth() || !isTemplateDependent(decl) ) {
+ openType( decl->abstractType(), node );
+ openedType = true;
+ } else {
+ delay = true;
+ }
+ break;
+ }
}
+ } else {
+ delay = true;
}
- } else {
+ }
+
+ if(delay) {
//We are in a template, and the searched type probably involves undefined template-parameters. So delay the resolution.
openedType = true;
- openDelayedType(baseClassIdentifier, node, (templateDeclarationDepth() != 0) ? DelayedType::Delayed : DelayedType::Unresolved );
+ openDelayedType( baseClassIdentifier, node, (templateDeclarationDepth() != 0) ? DelayedType::Delayed : DelayedType::Unresolved );
}
if( openedType ) {
@@ -231,39 +279,38 @@
Cpp::ExpressionEvaluationResult res;
- DUChainReadLocker lock(DUChain::lock());
- node->expression->ducontext = currentContext();
- res = parser.evaluateType( node->expression, m_editor->parseSession(), DUContext::ImportTrace() );
-
bool delay = false;
- //Delay the type-resolution of template-parameters
- if( !res.allDeclarations.isEmpty() && dynamic_cast<TemplateParameterDeclaration*>(res.allDeclarations.front()) )
- delay = true;
-
- if ( !delay && res.isValid() && res.instance ) {
- if( dynamic_cast<CppConstantIntegralType*>(res.type.data()) ) {
- CppConstantIntegralType* type = static_cast<CppConstantIntegralType*>(res.type.data());
- m_currentEnumeratorValue = (int)type->value<qint64>();
- } else if( dynamic_cast<DelayedType*>(res.type.data()) ) {
- DelayedType* type = static_cast<DelayedType*>(res.type.data());
- openType(AbstractType::Ptr(type), node); ///@todo Make this an enumerator-type that holds the same information
- openedType = true;
+ if(!delay) {
+ DUChainReadLocker lock(DUChain::lock());
+ node->expression->ducontext = currentContext();
+ res = parser.evaluateType( node->expression, m_editor->parseSession(), DUContext::ImportTrace() );
+
+ //Delay the type-resolution of template-parameters
+ if( !res.allDeclarations.isEmpty() && (dynamic_cast<TemplateParameterDeclaration*>(res.allDeclarations.front()) || isTemplateDependent(res.allDeclarations.front())) )
+ delay = true;
+
+ if ( !delay && res.isValid() && res.instance ) {
+ if( dynamic_cast<CppConstantIntegralType*>(res.type.data()) ) {
+ CppConstantIntegralType* type = static_cast<CppConstantIntegralType*>(res.type.data());
+ m_currentEnumeratorValue = (int)type->value<qint64>();
+ } else if( dynamic_cast<DelayedType*>(res.type.data()) ) {
+ DelayedType* type = static_cast<DelayedType*>(res.type.data());
+ openType(AbstractType::Ptr(type), node); ///@todo Make this an enumerator-type that holds the same information
+ openedType = true;
+ }
}
- } else {
- if( delay || templateDeclarationDepth() > 0 ) {
- QString str;
- ///Only record the strings, because these expressions may depend on template-parameters and thus must be evaluated later
- str += stringFromSessionTokens( m_editor->parseSession(), node->expression->start_token, node->expression->end_token );
+ }
+ if( delay || (!openedType && templateDeclarationDepth() != 0) ) {
+ QString str;
+ ///Only record the strings, because these expressions may depend on template-parameters and thus must be evaluated later
+ str += stringFromSessionTokens( m_editor->parseSession(), node->expression->start_token, node->expression->end_token );
- QualifiedIdentifier id( str.trimmed() );
- id.setIsExpression( true );
+ QualifiedIdentifier id( str.trimmed() );
+ id.setIsExpression( true );
- openDelayedType(id, node, DelayedType::Delayed);
- openedType = true;
- } else {
- ///@todo Report problem, bad expression
- }
+ openDelayedType(id, node, DelayedType::Delayed);
+ openedType = true;
}
}
@@ -422,27 +469,35 @@
bool TypeBuilder::openTypeFromName(NameAST* name) {
QualifiedIdentifier id = identifierForName(name);
- KTextEditor::Cursor pos = m_editor->findPosition(name->start_token, KDevelop::EditorIntegrator::FrontEdge);
- DUChainReadLocker lock(DUChain::lock());
bool openedType = false;
- QList<Declaration*> dec = searchContext()->findDeclarations(id, pos, AbstractType::Ptr(), DUContext::NoUndefinedTemplateParams);
+ bool delay = false;
+
+ if(!delay) {
+ KTextEditor::Cursor pos = m_editor->findPosition(name->start_token, KDevelop::EditorIntegrator::FrontEdge);
+ DUChainReadLocker lock(DUChain::lock());
+ QList<Declaration*> dec = searchContext()->findDeclarations(id, pos, AbstractType::Ptr(), 0, DUContext::NoUndefinedTemplateParams);
- if (!dec.isEmpty() && dec.front()->abstractType()) {
- ///@todo only functions may have multiple declarations here
- ifDebug( if( dec.count() > 1 ) kDebug(9007) << id.toString() << "was found" << dec.count() << "times" )
- //kDebug(9007) << "found for" << id.toString() << ":" << dec.front()->toString() << "type:" << dec.front()->abstractType()->toString() << "context:" << dec.front()->context();
- openedType = true;
- openType(dec.front()->abstractType(), name);
- } else {
+
+ if (!dec.isEmpty() && dec.front()->abstractType() && (!templateDeclarationDepth() || !isTemplateDependent(dec.front()))) {
+ ///@todo only functions may have multiple declarations here
+ ifDebug( if( dec.count() > 1 ) kDebug(9007) << id.toString() << "was found" << dec.count() << "times" )
+ //kDebug(9007) << "found for" << id.toString() << ":" << dec.front()->toString() << "type:" << dec.front()->abstractType()->toString() << "context:" << dec.front()->context();
+ openedType = true;
+ openType(dec.front()->abstractType(), name);
+ } else {
+ delay = true;
+ }
+ }
///@todo What about position?
+ if(delay) {
//Either delay the resolution for template-dependent types, or create an unresolved type that stores the name.
openedType = true;
- openDelayedType(id, name, (templateDeclarationDepth() != 0) ? DelayedType::Delayed : DelayedType::Unresolved );
+ openDelayedType(id, name, templateDeclarationDepth() ? DelayedType::Delayed : DelayedType::Unresolved );
- ifDebug( if(templateDeclarationDepth() != 0) kDebug(9007) << "no declaration found for" << id.toString() << "in context \"" << searchContext()->scopeIdentifier(true).toString() << "\"" << "" << searchContext() )
+ ifDebug( if(templateDeclarationDepth() == 0) kDebug(9007) << "no declaration found for" << id.toString() << "in context \"" << searchContext()->scopeIdentifier(true).toString() << "\"" << "" << searchContext() )
}
return openedType;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cpplanguagesupport.cpp new/kdevelop/languages/cpp/cpplanguagesupport.cpp
--- old/kdevelop/languages/cpp/cpplanguagesupport.cpp 2007-11-01 09:36:36.000000000 +0100
+++ new/kdevelop/languages/cpp/cpplanguagesupport.cpp 2007-11-20 02:09:18.000000000 +0100
@@ -205,6 +205,11 @@
core()->languageController()->backgroundParser()->addDocument(doc->url());
}
+void CppLanguageSupport::documentClosed(KDevelop::IDocument *)
+{
+ kDebug( 9007 ) << "CppLanguageSupport::documentClosed";
+}
+
KDevelop::ICodeHighlighting *CppLanguageSupport::codeHighlighting() const
{
return m_highlights;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cpplanguagesupport.h new/kdevelop/languages/cpp/cpplanguagesupport.h
--- old/kdevelop/languages/cpp/cpplanguagesupport.h 2007-10-21 16:34:03.000000000 +0200
+++ new/kdevelop/languages/cpp/cpplanguagesupport.h 2007-11-20 02:09:18.000000000 +0100
@@ -76,6 +76,7 @@
private slots:
void documentLoaded(KDevelop::IDocument*);
+ void documentClosed(KDevelop::IDocument*);
void projectOpened(KDevelop::IProject *project);
void projectClosing(KDevelop::IProject *project);
void documentChanged( KDevelop::IDocument* document );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppparsejob.cpp new/kdevelop/languages/cpp/cppparsejob.cpp
--- old/kdevelop/languages/cpp/cppparsejob.cpp 2007-11-17 03:35:11.000000000 +0100
+++ new/kdevelop/languages/cpp/cppparsejob.cpp 2007-11-23 16:54:30.000000000 +0100
@@ -275,8 +275,10 @@
ast->session = parentJob()->parseSession();
}
- foreach (const KDevelop::Problem& p, control.problems())
+ foreach (KDevelop::Problem p, control.problems()) {
+ p.setLocationStack(parentJob()->includeStack());
KDevelop::DUChain::problemEncountered(p);
+ }
parentJob()->setAST(ast);
}
@@ -287,7 +289,7 @@
return parentJob()->abortJob();
//If we are building a separate content-context
- TopDUContext* updating = parentJob()->updatingContext().data();
+ TopDUContextPointer updating = parentJob()->updatingContext();
Cpp::EnvironmentFilePointer environmentFile(parentJob()->environmentFile());
if( parentJob()->contentEnvironmentFile() )
@@ -354,8 +356,7 @@
kDebug( 9007 ) << "building duchain";
DeclarationBuilder declarationBuilder(&editor);
- TopDUContextPointer updatingptr(updating);
- topContext = declarationBuilder.buildDeclarations(environmentFile, ast, &chains, updatingptr, !(bool)parentJob()->contentContext());
+ topContext = declarationBuilder.buildDeclarations(environmentFile, ast, &chains, updating, !(bool)parentJob()->contentContext());
if(updating) {
DUChainWriteLocker l(DUChain::lock());
@@ -487,5 +488,15 @@
m_priority = priority;
}
+const QStack< DocumentCursor > & CPPParseJob::includeStack() const
+{
+ return m_includeStack;
+}
+
+void CPPParseJob::setIncludeStack(const QStack< DocumentCursor > & includeStack)
+{
+ m_includeStack = includeStack;
+}
+
#include "cppparsejob.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/cppparsejob.h new/kdevelop/languages/cpp/cppparsejob.h
--- old/kdevelop/languages/cpp/cppparsejob.h 2007-11-17 03:35:11.000000000 +0100
+++ new/kdevelop/languages/cpp/cppparsejob.h 2007-11-23 16:50:37.000000000 +0100
@@ -79,6 +79,9 @@
void addIncludedFile(KDevelop::TopDUContext* duChain, int sourceLine);
const IncludeFileList& includedFiles() const;
+ const QStack<DocumentCursor>& includeStack() const;
+ void setIncludeStack(const QStack<DocumentCursor>& includeStack);
+
///Returns the preprocessor-job that is parent of this job, or 0
PreprocessJob* parentPreprocessor() const;
@@ -114,11 +117,11 @@
void setContentContext( const KDevelop::TopDUContextPointer& context );
///If this is set, the contentContext should either be used without modification, or updated if it is outdated.
KDevelop::TopDUContextPointer contentContext() const;
-
+
///If this file was included from another, this contains the path within the search-paths that this file was found through
KUrl includedFromPath() const;
void setIncludedFromPath( const KUrl& path );
-
+
//Returns the master parse-job, which means the one that was not issued as an include-file
const CPPParseJob* masterJob() const;
CPPParseJob* masterJob();
@@ -140,11 +143,12 @@
//The following two members are used when simplified-matching is used, which means that one content-context and one specialized context will be used.
KDevelop::TopDUContextPointer m_contentContext;
KSharedPtr<Cpp::EnvironmentFile> m_contentEnvironmentFile;
-
+
KUrl m_includedFromPath;
mutable bool m_includePathsComputed;
mutable KUrl::List m_includePaths; //Only a master-job has this set
bool m_useContentContext;
+ QStack<DocumentCursor> m_includeStack;
};
class CPPInternalParseJob : public ThreadWeaver::Job
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/kdevcppsupport.desktop new/kdevelop/languages/cpp/kdevcppsupport.desktop
--- old/kdevelop/languages/cpp/kdevcppsupport.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/languages/cpp/kdevcppsupport.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -9,6 +9,7 @@
Comment[el]=Υποστήριξη γλώσσας C/C++
Comment[es]=Soporte para lenguaje C/C++
Comment[fa]=پشتیبانی زبان C/C++
+Comment[fr]=Prise en charge du langage C / C++
Comment[ga]=Tacaíocht C/C++
Comment[gl]=Soporte da linguaxe C/C++
Comment[it]=Supporto al linguaggio C/C++
@@ -38,6 +39,7 @@
GenericName[el]=Υποστήριξη C/C++
GenericName[es]=Soporte para C/C++
GenericName[fa]=پشتیبانی C/C++
+GenericName[fr]=Prise en charge du C / C++
GenericName[ga]=Tacaíocht C/C++
GenericName[gl]=Soporte de C/C++
GenericName[it]=Supporto C/C++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/parser/name_compiler.cpp new/kdevelop/languages/cpp/parser/name_compiler.cpp
--- old/kdevelop/languages/cpp/parser/name_compiler.cpp 2007-11-13 01:52:37.000000000 +0100
+++ new/kdevelop/languages/cpp/parser/name_compiler.cpp 2007-11-22 18:28:34.000000000 +0100
@@ -38,7 +38,7 @@
QString ret;
for( size_t a = ast->start_token; a < ast->end_token; a++ ) {
const Token &tk = m_session->token_stream->token(a);
- ret += tk.symbol();
+ ret += tk.symbol() + " ";
}
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/parser/rpp/pp-location.cpp new/kdevelop/languages/cpp/parser/rpp/pp-location.cpp
--- old/kdevelop/languages/cpp/parser/rpp/pp-location.cpp 2007-11-08 10:49:48.000000000 +0100
+++ new/kdevelop/languages/cpp/parser/rpp/pp-location.cpp 2007-11-20 02:09:18.000000000 +0100
@@ -113,9 +113,9 @@
void LocationTable::dump() const
{
QMapIterator<std::size_t, KTextEditor::Cursor> it = m_offsetTable;
- kDebug() << "Location Table:";
+ kDebug(9007) << "Location Table:";
while (it.hasNext()) {
it.next();
- kDebug() << it.key() << " => " << it.value();
+ kDebug(9007) << it.key() << " => " << it.value();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/languages/cpp/preprocessjob.cpp new/kdevelop/languages/cpp/preprocessjob.cpp
--- old/kdevelop/languages/cpp/preprocessjob.cpp 2007-11-17 03:35:11.000000000 +0100
+++ new/kdevelop/languages/cpp/preprocessjob.cpp 2007-11-23 16:50:37.000000000 +0100
@@ -194,8 +194,10 @@
QString result = preprocessor.processFile(parentJob()->document().prettyUrl(), rpp::pp::Data, contents);
- foreach (const KDevelop::Problem& p, preprocessor.problems())
+ foreach (KDevelop::Problem p, preprocessor.problems()) {
+ p.setLocationStack(parentJob()->includeStack());
KDevelop::DUChain::problemEncountered(p);
+ }
parentJob()->parseSession()->setContents( result.toUtf8(), m_currentEnvironment->takeLocationTable() );
parentJob()->parseSession()->setUrl( parentJob()->document() );
@@ -286,8 +288,13 @@
KUrl localPath(parentJob()->document());
localPath.setFileName(QString());
-
- QPair<KUrl, KUrl> included = parentJob()->cpp()->findInclude(parentJob()->includePaths(), localPath, fileName, type, skipCurrentPath ? parentJob()->includedFromPath() : KUrl() );
+ QStack<DocumentCursor> includeStack = parentJob()->includeStack();
+
+ KUrl from;
+ if (skipCurrentPath)
+ from = parentJob()->includedFromPath();
+
+ QPair<KUrl, KUrl> included = parentJob()->cpp()->findInclude(parentJob()->includePaths(), localPath, fileName, type, from );
KUrl includedFile = included.first;
if (includedFile.isValid()) {
kDebug(9007) << "PreprocessJob" << parentJob()->document() << "(" << m_currentEnvironment->environment().size() << "macros)" << ": found include-file" << fileName << ":" << includedFile;
@@ -314,6 +321,7 @@
}
} else {
kDebug(9007) << "PreprocessJob" << parentJob()->document() << ": no fitting entry in du-chain, parsing";
+
/// Why bother the threadweaver? We need the preprocessed text NOW so we simply parse the
/// included file right here. Parallel parsing cannot be used here, because we need the
/// macros before we can continue.
@@ -325,7 +333,12 @@
///The second parameter is zero because we are in a background-thread and we here
///cannot create a slave of the foreground cpp-support-part.
CPPParseJob slaveJob(includedFile, 0, this);
+
slaveJob.setIncludedFromPath(included.second);
+
+ includeStack.append(DocumentCursor(includedFile, KTextEditor::Cursor(sourceLine, 0)));
+ slaveJob.setIncludeStack(includeStack);
+
slaveJob.parseForeground();
// Add the included file.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/plugins/appwizard/kdevappwizard.desktop new/kdevelop/plugins/appwizard/kdevappwizard.desktop
--- old/kdevelop/plugins/appwizard/kdevappwizard.desktop 2007-09-27 11:34:46.000000000 +0200
+++ new/kdevelop/plugins/appwizard/kdevappwizard.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -12,7 +12,7 @@
Comment[et]=Rakenduse nõustaja
Comment[eu]=Aplikazio morroia
Comment[fa]=جادوگر کاربرد
-Comment[fr]=Un module externe pour la gestion de l'assistant de création d'applications.
+Comment[fr]=Assistant d'application
Comment[ga]=Treoraí Feidhmchláir
Comment[gl]=Asistente para aplicacións
Comment[hu]=Alkalmazásvarázsló
@@ -56,7 +56,7 @@
GenericName[et]=Rakenduse nõustaja
GenericName[eu]=Aplikazio morroia
GenericName[fa]=جادوگر کاربرد
-GenericName[fr]=Création d'applications
+GenericName[fr]=Assistant d'applications
GenericName[ga]=Treoraí Feidhmchláir
GenericName[gl]=Asistente para aplicacións
GenericName[hu]=Alkalmazásvarázsló
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/plugins/documentview/kdevdocumentview.desktop new/kdevelop/plugins/documentview/kdevdocumentview.desktop
--- old/kdevelop/plugins/documentview/kdevdocumentview.desktop 2007-11-05 09:13:37.000000000 +0100
+++ new/kdevelop/plugins/documentview/kdevdocumentview.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -6,6 +6,7 @@
Comment[de]=Dieses Modul zeigt eine graphische Darstellung aller gerade offenen Dokumente nach Mime-Typ getrennt an.
Comment[el]=Αυτό το πρόσθετο εμφανίζει μια γραφική προβολή όλων των φορτωμένων εγγράφων και τα διαχωρίζει κατά τον τύπο mime τους.
Comment[es]=Este complemento muestra una vista gráfica de todos los documentos cargados y los organiza por su tipo MIME.
+Comment[fr]=Ce module externe affiche une vue graphique de tous les documents actuellement chargés et les sépare par type MIME.
Comment[ga]=Taispeánann an breiseán seo amharc grafach ar gach cáipéis atá luchtaithe faoi láthair, agus dealaíonn sé iad de réir a gcineál MIME.
Comment[gl]=Esta extensión mostra unha vista gráfica de todos os documentos agora cargados e sepáraos segundo o seu tipo mime.
Comment[it]=Questo plugin mostra una vista grafica di tutti i documenti attualmente caricati e li separa dal tipo di MIME
@@ -23,6 +24,7 @@
Name[el]=Προβολή εγγράφου
Name[es]=Visor de documentos
Name[fa]=نمای مستندات
+Name[fr]=Vue du document
Name[ga]=Amharc Cáipéise
Name[gl]=Vista dos documentos
Name[it]=Visualizzatore documento
@@ -40,6 +42,7 @@
GenericName[el]=Προβολή εγγράφου
GenericName[es]=Visor de documentos
GenericName[fa]=نمای مستندات
+GenericName[fr]=Vue du document
GenericName[ga]=Amharc Cáipéise
GenericName[gl]=Vista dos documentos
GenericName[it]=Visualizzatore documento
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/plugins/documentview/settings/kcm_documentview_settings.desktop new/kdevelop/plugins/documentview/settings/kcm_documentview_settings.desktop
--- old/kdevelop/plugins/documentview/settings/kcm_documentview_settings.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/plugins/documentview/settings/kcm_documentview_settings.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -16,6 +16,7 @@
Name[el]=Προβολή εγγράφου
Name[es]=Visor de documentos
Name[fa]=نمای مستندات
+Name[fr]=Vue du document
Name[ga]=Amharc Cáipéise
Name[gl]=Vista dos documentos
Name[it]=Visualizzatore documento
@@ -32,6 +33,7 @@
Comment[de]=Dokumentansicht Einstellungen
Comment[el]=Ρύθμιση επιλογών προβολής εγγράφου
Comment[es]=Configurar las preferencias del visor de documentos
+Comment[fr]=Configurer les paramètres des vues du document
Comment[ga]=Cumraigh an tAmharc Cáipéise
Comment[gl]=Configura os parámetros da vista dos documentos
Comment[it]=Configura impostazioni di visualizzazione documento
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/plugins/grepview/grepviewpart.cpp new/kdevelop/plugins/grepview/grepviewpart.cpp
--- old/kdevelop/plugins/grepview/grepviewpart.cpp 2007-11-08 09:21:59.000000000 +0100
+++ new/kdevelop/plugins/grepview/grepviewpart.cpp 2007-11-23 15:28:58.000000000 +0100
@@ -347,7 +347,7 @@
connect( xargsProc, SIGNAL(error( QProcess::ProcessError )),
model, SLOT(slotFailed()) );
- int id = m_view->registerView( m_grepdlg->patternString() );
+ int id = m_view->registerView( m_grepdlg->patternString(), KDevelop::IOutputView::AllowUserClose );
m_view->setModel( id, model );
m_view->setDelegate( id, delegate );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/plugins/grepview/kdevgrepview.desktop new/kdevelop/plugins/grepview/kdevgrepview.desktop
--- old/kdevelop/plugins/grepview/kdevgrepview.desktop 2007-10-31 08:31:44.000000000 +0100
+++ new/kdevelop/plugins/grepview/kdevgrepview.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -8,7 +8,7 @@
Comment[es]=Integra «find|grep» en KDevelop (permite búsqueda rápida en múltiples archivos usando patrones o expresiones regulares).
Comment[et]=Integreerib KDevelopi programmi "Find|grep", mis lubab mustreid või regulaaravaldisi kasutades kiiresti paljudes failides teksti otsida.
Comment[eu]="find|grep" KDevelop-en txertatzen du - fitxategi anitzetan eredu edo espresio erregularrak erabiliz bilaketa azkarrak egiteko aukera ematen du.
-Comment[fr]=Intègre le programme « grep » à KDevelop. Il permet d'effectuer des recherches rapides dans des fichiers multiples en utilisant des motifs ou des expressions rationnelles.
+Comment[fr]=Intègre « find|grep » dans KDevelop - permet d'effectuer une recherche rapide dans des fichiers multiples en utilisant des motifs ou des expressions rationnelles.
Comment[ga]=Comhtháthaíonn sé seo "find|grep" i KDevelop - ceadaíonn sé duit il-comhaid a chuardach le patrúin nó sloinn ionadaíochta.
Comment[hu]=A "find|grep" programok integrálása a KDevelopba - lehetővé teszi szövegek fájlokban való gyors keresését minták és reguláris kifejezések felhasználásával
Comment[it]=Integra "find|grep" in KDevelop - permette la ricerca rapida di file multipli utilizzando motivi o espressioni regolari.
@@ -45,7 +45,7 @@
GenericName[es]=Interfaz para Grep
GenericName[et]=Programmi grep kasutajaliides
GenericName[eu]=Grep interfazea
-GenericName[fr]=Interface pour grep
+GenericName[fr]=Interface pour Ggrep
GenericName[ga]=Comhéadan Grep
GenericName[hu]=Grafikus felület a Grep-hez
GenericName[it]=Interfaccia a "grep"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/plugins/qtdesigner/kdevqtdesigner.desktop new/kdevelop/plugins/qtdesigner/kdevqtdesigner.desktop
--- old/kdevelop/plugins/qtdesigner/kdevqtdesigner.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/plugins/qtdesigner/kdevqtdesigner.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -6,6 +6,7 @@
Comment[de]=Oberflächengenerator von KDevelop, auf QT Designer basierend
Comment[el]=Κατασκευή GUI με βάση το σχεδιαστή Qt του KDevelop
Comment[es]=Constructor de interfaces de KDevelop basado en el Diseñador Qt
+Comment[fr]=Constructeur d'interfaces graphiques KDevelop basé sur Qt Designer
Comment[ga]=Tógálaí Comhéadan Grafach le haghaidh KDevelop, bunaithe ar Qt Designer
Comment[gl]=Construtor de GUIs de KDevelop baseado no Qt Designer
Comment[it]=Compilatore GUI di KDevelop basato su Designer di Qt
@@ -24,6 +25,7 @@
Name[el]=Υποστήριξη σχεδιαστή Qt
Name[es]=Soporte del Diseñador Qt
Name[fa]=پشتیبانی طراح Qt
+Name[fr]=Prise en charge de Qt Designer
Name[ga]=Tacaíocht do Qt Designer
Name[gl]=Soporte de Qt Designer
Name[it]=Supporto Designer Qt
@@ -42,6 +44,7 @@
GenericName[el]=Υποστήριξη σχεδιαστή Qt του KDevelop
GenericName[es]=Soporte del Diseñador Qt de KDevelop
GenericName[fa]=پشتیبانی طراح Qt KDevelop
+GenericName[fr]=Prise en charge de Qt Designer pour KDevelop
GenericName[ga]=Tacaíocht Qt Designer le haghaidh KDevelop
GenericName[gl]=Soporte de Qt Designer para KDevelop
GenericName[it]=Supporto Designer Qt di KDevelop
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/plugins/valgrind/kdevvalgrind.desktop new/kdevelop/plugins/valgrind/kdevvalgrind.desktop
--- old/kdevelop/plugins/valgrind/kdevvalgrind.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/plugins/valgrind/kdevvalgrind.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -7,6 +7,7 @@
Comment[el]=Το Valgrind είναι ένα εργαλείο που βοηθά στην εύρεση προβλημάτων διαχείρισης μνήμης στα προγράμματα. http://www.valgrind.org/
Comment[es]=Valgrind es una herramienta que le ayuda a encontrar problemas de gestión de memoria en los programas. http://www.valgrind.org/
Comment[fa]=Valgrind ابزاری است که به شما کمک میکند تا مسائل مدیریت حافظه را در برنامهها بیابید. http://www.valgrind.org/
+Comment[fr]=Valgrind est un outil qui vous aide à trouver les problèmes de gestion de la mémoire dans les programmes. http://valgrind.org/
Comment[ga]=Uirlis é Valgrind a chabhraíonn leat fadhbanna a aimsiú a bhaineann le bainisteoireacht chuimhne i do ríomhchláir. http://www.valgrind.org/
Comment[gl]=Valgrind é unha ferramenta que lle permite atopar problemas de xestión da memoria nos programas. http://www.valgrind.org/
Comment[it]=Valgrind è uno strumento che ti aiuta a trovare problemi di gestione della memoria nei programmi. http://www.valgrind.org/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/src/kdevelop.desktop new/kdevelop/src/kdevelop.desktop
--- old/kdevelop/src/kdevelop.desktop 2007-09-21 08:27:12.000000000 +0200
+++ new/kdevelop/src/kdevelop.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -7,6 +7,7 @@
X-DocPath=kdevelop/index.html
Terminal=false
Name=KDevelop 4
+Name[fr]=KDevelop 4
Name[ne]=केडीई विकास ४
Name[x-test]=xxKDevelop 4xx
GenericName=IDE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/src/kdevelopui.rc new/kdevelop/src/kdevelopui.rc
--- old/kdevelop/src/kdevelopui.rc 2007-11-15 13:25:51.000000000 +0100
+++ new/kdevelop/src/kdevelopui.rc 2007-11-22 02:45:38.000000000 +0100
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="42" name="kdevelop" >
+<kpartgui version="44" name="kdevelop" >
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="file_new"/>
@@ -117,6 +117,9 @@
<Action name="hide_all_docks"/>
<Action name="anchor_current_dock"/>
<Action name="maximize_current_dock"/>
+ <Action name="select_next_dock"/>
+ <Action name="select_previous_dock"/>
+ <Action name="docks_submenu"/>
<Separator/>
<Merge/>
</Menu>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdevelop/src/x-kdevelop.desktop new/kdevelop/src/x-kdevelop.desktop
--- old/kdevelop/src/x-kdevelop.desktop 2007-11-02 08:38:07.000000000 +0100
+++ new/kdevelop/src/x-kdevelop.desktop 2007-11-23 08:40:13.000000000 +0100
@@ -5,6 +5,7 @@
Comment[el]=Αρχείο έργου KDevelop 4
Comment[es]=Archivo de proyecto de KDevelop 4
Comment[fa]=پروندۀ پروژۀ KDevelop 4
+Comment[fr]=Fichier projet KDevelop 4
Comment[ga]=Comhad Tionscadail KDevelop 4
Comment[gl]=Ficheiro de proxecto de KDevelop 4
Comment[it]=File di progetto per KDevelop 4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
[View Less]
1
0
Hello community,
here is the log from the commit of package kdeutils4
checked in at Wed Nov 28 23:34:18 CET 2007.
--------
--- KDE/kdeutils4/kdeutils4.changes 2007-11-14 17:37:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes 2007-11-21 18:58:36.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 21 18:58:36 CET 2007 - dmueller(a)suse.de
+
+- update to 3.96.1
+
+-------------------------------------------------------------------
Old:
----
kdeutils-3.96.0.tar.bz2
New:
---…
[View More]-
kdeutils-3.96.1.tar.bz2
workaround-compiler-bugs.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.u23969/_old 2007-11-28 23:33:49.000000000 +0100
+++ /var/tmp/diff_new_pack.u23969/_new 2007-11-28 23:33:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeutils4 (Version 3.96.0)
+# spec file for package kdeutils4 (Version 3.96.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,14 +21,15 @@
Group: Productivity/Other
Summary: Base Package of KDE Utility Programs
Url: http://www.kde.org
-Version: 3.96.0
+Version: 3.96.1
Release: 1
-%define rversion 3.96.0
+%define rversion 3.96.1
Source0: kdeutils-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdebase4-runtime
Patch: desktop-files.diff
+Patch1: workaround-compiler-bugs.diff
Suggests: kde4-ark
Suggests: kde4-kcalc
Suggests: kde4-kcharselect
@@ -59,6 +60,7 @@
%prep
%setup -q -n kdeutils-%rversion
%patch
+%patch1
%build
%cmake_kde4 -d build
@@ -508,7 +510,10 @@
%files -f filelists/exclude
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING-DOCS README
+
%changelog
+* Wed Nov 21 2007 - dmueller(a)suse.de
+- update to 3.96.1
* Wed Nov 14 2007 - dmueller(a)suse.de
- update to 3.96.0
* Wed Nov 07 2007 - dmueller(a)suse.de
++++++ desktop-files.diff ++++++
--- /var/tmp/diff_new_pack.u23969/_old 2007-11-28 23:33:49.000000000 +0100
+++ /var/tmp/diff_new_pack.u23969/_new 2007-11-28 23:33:49.000000000 +0100
@@ -2,10 +2,8 @@
===================================================================
--- sweeper/sweeper.desktop (Revision 670622)
+++ sweeper/sweeper.desktop (Arbeitskopie)
-@@ -1,7 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
- DocPath=sweeper/index.html
+@@ -3,5 +3,4 @@
+ X-DocPath=sweeper/index.html
-Icon=trashcan_empty
Exec=sweeper
Type=Application
@@ -19,19 +17,17 @@
+OnlyShowIn=KDE;
--- kwallet/kwalletmanager.desktop 2007/06/23 07:59:49 1.1
+++ kwallet/kwalletmanager.desktop 2007/06/23 08:00:00
-@@ -56,3 +56,5 @@
+@@ -56,3 +56,4 @@
X-KDE-StartupNotify=false
Categories=Qt;KDE;Settings;
- DocPath=kwallet/index.html
+ X-DocPath=kwallet/index.html
+OnlyShowIn=KDE;
-+
--- ark/app/ark.desktop 2007/09/14 08:21:49 1.1
+++ ark/app/ark.desktop 2007/09/14 08:21:56
-@@ -64,7 +64,6 @@
+@@ -64,6 +64,5 @@
Name[ta]=ஆர்க்
Name[x-test]=xxArkxx
Exec=ark -caption "%c" %U
-Icon=ark
- Path=
- DocPath=ark/index.html
+ X-DocPath=ark/index.html
Type=Application
++++++ kdeutils-3.96.0.tar.bz2 -> kdeutils-3.96.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ark/app/ark.desktop new/kdeutils-3.96.1/ark/app/ark.desktop
--- old/kdeutils-3.96.0/ark/app/ark.desktop 2007-11-06 09:01:40.000000000 +0100
+++ new/kdeutils-3.96.1/ark/app/ark.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,6 +1,5 @@
[Desktop Entry]
-Encoding=UTF-8
-MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip;application/x-java-archive;application/x-deb;
+MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-java-archive;application/x-deb;
GenericName=Archiving Tool
GenericName[af]=Argiveer Program
GenericName[ar]=أداة أرشفة
@@ -68,12 +67,9 @@
Name[x-test]=xxArkxx
Exec=ark -caption "%c" %U
Icon=ark
-Path=
-DocPath=ark/index.html
+X-DocPath=ark/index.html
Type=Application
Terminal=false
-SwallowExec=
-SwallowTitle=
X-DBUS-StartupType=Unique
X-KDE-HasTempFileOption=true
Categories=Qt;KDE;Utility;X-KDE-Utilities-File;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ark/kerfuffle/kerfufflePlugin.desktop new/kdeutils-3.96.1/ark/kerfuffle/kerfufflePlugin.desktop
--- old/kdeutils-3.96.0/ark/kerfuffle/kerfufflePlugin.desktop 2007-11-06 09:01:40.000000000 +0100
+++ new/kdeutils-3.96.1/ark/kerfuffle/kerfufflePlugin.desktop 2007-11-20 23:00:52.000000000 +0100
@@ -1,15 +1,16 @@
[Desktop Entry]
-Encoding=UTF-8
Type=ServiceType
X-KDE-ServiceType=Kerfuffle/Plugin
Comment=Plugin for handling of archive formats for the Kerfuffle library
Comment[ar]=ملحق للتحكم بهيئات اﻷرشيف لمكتبة Kerfuffle
+Comment[ca]=Connector per gestionar els formats d'arxiu per la biblioteca Kerfuffle
Comment[el]=Πρόσθετο χειρισμού μορφών αρχειοθήκης για τη βιβλιοθήκη Kerfuffle
Comment[es]=Complemento para manejar formatos de archivo de la biblioteca Kerfuffle
Comment[et]=Kerfuffle'i teegi arhiivifailide haldamise plugin
Comment[he]=תוסף לניהול פורמטי ארכיונים לספריית Kerfuffle
Comment[ja]=Kerfuffle ライブラリのアーカイブ形式を扱うプラグイン
Comment[ko]=Kerfuffle 라이브러리를 위한 압축 파일 플러그인
+Comment[nds]=Archivformaten-Moduul för de Kerfuffle-Bibliotheek
Comment[nl]=Plugin voor het afhandelen van archiefformaten voor de Kerfuffle-bibliotheek
Comment[pt]='Plugin' para lidar com os formatos de pacotes da biblioteca Kerfuffle
Comment[pt_BR]=Plugin para a manipulação de formatos de arquivo, para a biblioteca Kerfuffle
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ark/part/ark_part.desktop new/kdeutils-3.96.1/ark/part/ark_part.desktop
--- old/kdeutils-3.96.0/ark/part/ark_part.desktop 2007-11-14 01:26:27.000000000 +0100
+++ new/kdeutils-3.96.1/ark/part/ark_part.desktop 2007-11-20 23:00:52.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Icon=ark
Name=Archiver
Name[af]=Argifeerder
@@ -113,6 +112,6 @@
Comment[xh]=Isixhobo sokuphatha i Archive
Comment[zh_CN]=压缩归档处理工具
Comment[zh_TW]=壓縮檔處理工具
-ServiceTypes=Browser/View
+X-KDE-ServiceTypes=Browser/View
X-KDE-Library=libarkpart
Type=Service
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ark/plugins/bk/kerfuffle_bk.desktop new/kdeutils-3.96.1/ark/plugins/bk/kerfuffle_bk.desktop
--- old/kdeutils-3.96.0/ark/plugins/bk/kerfuffle_bk.desktop 2007-11-06 09:01:40.000000000 +0100
+++ new/kdeutils-3.96.1/ark/plugins/bk/kerfuffle_bk.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=Kerfuffle/Plugin
+X-KDE-ServiceTypes=Kerfuffle/Plugin
X-KDE-Library=kerfuffle_bk
X-KDE-PluginInfo-Author=Henrique Pinto
X-KDE-PluginInfo-Email=henrique.pinto(a)kdemail.net
@@ -18,12 +17,14 @@
Name[x-test]=xxkerfuffle_bkxx
Comment=bkisofs plugin for Kerfuffle
Comment[ar]=bkisofs ملحق لـ Kerfuffle
+Comment[ca]=Connector del bkisofs pel Kerfuffle
Comment[el]=πρόσθετο bkisofs για τη Kerfuffle
Comment[es]=Complemento bkisofs para Kerfuffle
Comment[et]=Kerfuffle'i bkisofs'i plugin
Comment[he]=תוסף bkisofs עבור Kerfuffle
Comment[ja]=Kerfuffle のための bkisofs プラグイン
Comment[ko]=Kerfuffle을 위한 bkisofs 플러그인
+Comment[nds]=Bkisofs-Moduul för Kerfuffle
Comment[nl]=bkisofs-plugin voor Kerfuffle
Comment[pt]='Plugin' do bkisofs para o Kerfuffle
Comment[pt_BR]=Plugin bkisofs para a Kerfuffle
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop new/kdeutils-3.96.1/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop
--- old/kdeutils-3.96.0/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop 2007-11-06 09:01:40.000000000 +0100
+++ new/kdeutils-3.96.1/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=Kerfuffle/Plugin
+X-KDE-ServiceTypes=Kerfuffle/Plugin
X-KDE-Library=kerfuffle_karchive
X-KDE-PluginInfo-Author=Henrique Pinto
X-KDE-PluginInfo-Email=henrique.pinto(a)kdemail.net
@@ -17,12 +16,14 @@
Name[x-test]=xxkerfuffle_karchivexx
Comment=KArchive plugin for Kerfuffle
Comment[ar]=KArchive ملحق لـ Kerfuffle
+Comment[ca]=Connector del KArchive pel Kerfuffle
Comment[el]=πρόσθετο KArchive για τη Kerfuffle
Comment[es]=Complemento KArchive para Kerfuffle
Comment[et]=Kerfuffle'i KArchive plugin
Comment[he]=תוסף KArchive עבור Kerfuffle
Comment[ja]=Kerfuffle のための KArchive プラグイン
Comment[ko]=Kerfuffle을 위한 KArchive 플러그인
+Comment[nds]=KArchive-Moduul för Kerfuffle
Comment[nl]=KArchive-plugin voor Kerfuffle
Comment[pt]='Plugin' do KArchive para o Kerfuffle
Comment[pt_BR]=Plugin KArchive para a Kerfuffle
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ark/plugins/libarchive/kerfuffle_libarchive.desktop new/kdeutils-3.96.1/ark/plugins/libarchive/kerfuffle_libarchive.desktop
--- old/kdeutils-3.96.0/ark/plugins/libarchive/kerfuffle_libarchive.desktop 2007-11-06 09:01:40.000000000 +0100
+++ new/kdeutils-3.96.1/ark/plugins/libarchive/kerfuffle_libarchive.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=Kerfuffle/Plugin
+X-KDE-ServiceTypes=Kerfuffle/Plugin
X-KDE-Library=kerfuffle_libarchive
X-KDE-PluginInfo-Author=Henrique Pinto
X-KDE-PluginInfo-Email=henrique.pinto(a)kdemail.net
@@ -17,12 +16,14 @@
Name[x-test]=xxkerfuffle_libarchivexx
Comment=LibArchive Plugin for Kerfuffle
Comment[ar]=LibArchive ملحق لـ Kerfuffle
+Comment[ca]=Connector del LibArchive pel Kerfuffle
Comment[el]=πρόσθετο LibArchive για τη Kerfuffle
Comment[es]=Complemento LibArchive para Kerfuffle
Comment[et]=Kerfuffle'i LibArchive plugin
Comment[he]=תוסף LibArchive עבור Kerfuffle
Comment[ja]=Kerfuffle のための LibArchive プラグイン
Comment[ko]=Kerfuffle을 위한 LibArchive 플러그인
+Comment[nds]=LibArchive-Moduul för Kerfuffle
Comment[nl]=LibArchive-plugin voor Kerfuffle
Comment[pt]='Plugin' de LibArchive para o Kerfuffle
Comment[pt_BR]=Plugin LibArchive para a Kerfuffle
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ark/plugins/libzipplugin/kerfuffle_libzip.desktop new/kdeutils-3.96.1/ark/plugins/libzipplugin/kerfuffle_libzip.desktop
--- old/kdeutils-3.96.0/ark/plugins/libzipplugin/kerfuffle_libzip.desktop 2007-11-06 09:01:40.000000000 +0100
+++ new/kdeutils-3.96.1/ark/plugins/libzipplugin/kerfuffle_libzip.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=Kerfuffle/Plugin
+X-KDE-ServiceTypes=Kerfuffle/Plugin
X-KDE-Library=kerfuffle_libzip
X-KDE-PluginInfo-Author=Henrique Pinto
X-KDE-PluginInfo-Email=henrique.pinto(a)kdemail.net
@@ -18,12 +17,14 @@
Name[x-test]=xxkerfuffle_libzipxx
Comment=libzip plugin for Kerfuffle
Comment[ar]=libzip ملحق لـ Kerfuffle
+Comment[ca]=Connector del libzip pel Kerfuffle
Comment[el]=πρόσθετο libzip για τη Kerfuffle
Comment[es]=Complemento libzip para Kerfuffle
Comment[et]=Kerfuffle'i libzip'i plugin
Comment[he]=תוסף libzip עבור Kerfuffle
Comment[ja]=Kerfuffle のための libzip プラグイン
Comment[ko]=Kerfuffle을 위한 libzip 플러그인
+Comment[nds]=Libzip-Moduul för Kerfuffle
Comment[nl]=libzip-plugin voor Kerfuffle
Comment[pt]='Plugin' da 'libzip' para o Kerfuffle
Comment[pt_BR]=Plugin libzip para a Kerfuffle
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/charselectapplet/kcharselectapplet.desktop new/kdeutils-3.96.1/charselectapplet/kcharselectapplet.desktop
--- old/kdeutils-3.96.0/charselectapplet/kcharselectapplet.desktop 2007-11-14 01:26:10.000000000 +0100
+++ new/kdeutils-3.96.1/charselectapplet/kcharselectapplet.desktop 2007-11-20 23:00:49.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Character Selector
Name[ar]=مختار الرموز
Name[br]=Dibaber arouezenn
@@ -27,7 +26,7 @@
Name[km]=កម្មវិធីជ្រើសតួអក្សរ
Name[ko]=문자 선택기
Name[nb]=Tegnvelger
-Name[nds]=Tekenutwähler
+Name[nds]=Tekenköör
Name[ne]=क्यारेक्टर चयनकर्ता
Name[nl]=Speciale tekens
Name[nn]=Teiknveljar
@@ -61,6 +60,7 @@
Comment[gl]=Permite escoller caracteres para o portarretallos
Comment[ja]=文字を選択してクリップボードにコピーします
Comment[ko]=클립보드에 특수 문자를 복사합니다
+Comment[nds]=Wiest Sünnertekens, de Du na de Twischenaflaag koperen kannst
Comment[ne]=क्लिपबोर्डका लागि देखाएका क्यारेक्टरहरू टिप्न अनुमति दिन्छ
Comment[nl]=Maakt het mogelijk om getoonde lettertekens op het klembord te plaatsen
Comment[pt]=Permite escolher caracteres especiais e estrangeiros para a área de transferência
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/cmake/modules/FindGMP.cmake new/kdeutils-3.96.1/cmake/modules/FindGMP.cmake
--- old/kdeutils-3.96.0/cmake/modules/FindGMP.cmake 2007-10-03 13:47:41.000000000 +0200
+++ new/kdeutils-3.96.1/cmake/modules/FindGMP.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-# Try to find the GMP librairies
-# GMP_FOUND - system has GMP lib
-# GMP_INCLUDE_DIR - the GMP include directory
-# GMP_LIBRARIES - Libraries needed to use GMP
-
-# Copyright (c) 2006, Laurent Montel, <montel(a)kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-if (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
- # Already in cache, be silent
- set(GMP_FIND_QUIETLY TRUE)
-endif (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
-
-find_path(GMP_INCLUDE_DIR NAMES gmp.h )
-find_library(GMP_LIBRARIES NAMES gmp )
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG GMP_INCLUDE_DIR GMP_LIBRARIES)
-
-mark_as_advanced(GMP_INCLUDE_DIR GMP_LIBRARIES)
Files old/kdeutils-3.96.0/doc/ark/index.cache.bz2 and new/kdeutils-3.96.1/doc/ark/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/kcalc/index.cache.bz2 and new/kdeutils-3.96.1/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/kcharselect/index.cache.bz2 and new/kdeutils-3.96.1/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/kdelirc/irkick/index.cache.bz2 and new/kdeutils-3.96.1/doc/kdelirc/irkick/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/kdelirc/kcmlirc/index.cache.bz2 and new/kdeutils-3.96.1/doc/kdelirc/kcmlirc/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/kdf/index.cache.bz2 and new/kdeutils-3.96.1/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/kfloppy/index.cache.bz2 and new/kdeutils-3.96.1/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/kgpg/index.cache.bz2 and new/kdeutils-3.96.1/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/khexedit/index.cache.bz2 and new/kdeutils-3.96.1/doc/khexedit/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/kinfocenter/blockdevices/index.cache.bz2 and new/kdeutils-3.96.1/doc/kinfocenter/blockdevices/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/kjots/index.cache.bz2 and new/kdeutils-3.96.1/doc/kjots/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/KRegExpEditor/index.cache.bz2 and new/kdeutils-3.96.1/doc/KRegExpEditor/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/ksim/index.cache.bz2 and new/kdeutils-3.96.1/doc/ksim/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/ktimer/index.cache.bz2 and new/kdeutils-3.96.1/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/kwallet/index.cache.bz2 and new/kdeutils-3.96.1/doc/kwallet/index.cache.bz2 differ
Files old/kdeutils-3.96.0/doc/superkaramba/index.cache.bz2 and new/kdeutils-3.96.1/doc/superkaramba/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kcalc/kcalc.desktop new/kdeutils-3.96.1/kcalc/kcalc.desktop
--- old/kdeutils-3.96.0/kcalc/kcalc.desktop 2007-10-31 21:44:51.000000000 +0100
+++ new/kdeutils-3.96.1/kcalc/kcalc.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=KCalc
Name[af]=Kcalc
Name[ar]=حاسبة ك
@@ -16,7 +15,7 @@
Name[zh_TW]=KDE 計算機
Exec=kcalc -caption "%c"
Icon=kcalc
-DocPath=kcalc/index.html
+X-DocPath=kcalc/index.html
GenericName=Scientific Calculator
GenericName[af]=Wetenskaplike Sakrekenaar
GenericName[ar]=آلة حاسبة علمية
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kcharselect/KCharSelect.desktop new/kdeutils-3.96.1/kcharselect/KCharSelect.desktop
--- old/kdeutils-3.96.0/kcharselect/KCharSelect.desktop 2007-10-31 21:44:49.000000000 +0100
+++ new/kdeutils-3.96.1/kcharselect/KCharSelect.desktop 2007-11-20 23:00:49.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
GenericName=Character Selector
GenericName[af]=Karakter Kiesser
GenericName[ar]=أداة اختيار الرموز
@@ -59,10 +58,9 @@
GenericName[zh_TW]=字元選擇器
Exec=kcharselect -caption "%c"
Icon=kcharselect
-Path=
Type=Application
Terminal=false
-DocPath=kcharselect/index.html
+X-DocPath=kcharselect/index.html
Name=KCharSelect
Name[af]=Kcharselect
Name[ar]=كشارت سلكت
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kdelirc/irkick/irkick.desktop new/kdeutils-3.96.1/kdelirc/irkick/irkick.desktop
--- old/kdeutils-3.96.0/kdelirc/irkick/irkick.desktop 2007-10-31 21:44:51.000000000 +0100
+++ new/kdeutils-3.96.1/kdelirc/irkick/irkick.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -60,10 +60,10 @@
Exec=irkick
Icon=irkick
-DocPath=irkick/index.html
+X-DocPath=irkick/index.html
Comment=KDE Linux infrared remote control server.
Comment[ar]=خادم كدى للتحكّم عن بعد بالأشعة تحت الحمراء في لينكس.
-Comment[ca]=Servidor de control remot per infrarojos de Linux KDE.
+Comment[ca]=Servidor de control remot per infraroigs de Linux KDE.
Comment[cs]=Server dálkového ovládání pro KDE.
Comment[cy]=Gweinydd rheolydd pell isgoch Linux KDE
Comment[da]=KDE Linux infrarød fjernbetjeningsserver.
@@ -110,5 +110,4 @@
Comment[x-test]=xxKDE Linux infrared remote control server.xx
Comment[zh_CN]=KDE Linux 红外远程控制服务器。
Comment[zh_TW]=KDE Linux 紅外線遙控伺服器。
-Encoding=UTF-8
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kdelirc/kcmlirc/kcmlirc.desktop new/kdeutils-3.96.1/kdelirc/kcmlirc/kcmlirc.desktop
--- old/kdeutils-3.96.0/kdelirc/kcmlirc/kcmlirc.desktop 2007-11-14 01:26:26.000000000 +0100
+++ new/kdeutils-3.96.1/kdelirc/kcmlirc/kcmlirc.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Icon=irkick
Comment=Configure your remote controls for use with applications
Comment[ar]=إعداد التحكّم عن بعد لاستخدامه في التطبيقات
@@ -28,7 +27,6 @@
Comment[ko]=리모콘을 프로그램에서 사용할 수 있도록 설정합니다
Comment[lt]=Nuotolinio valdymo programomis konfigūravimas
Comment[mk]=Конфигурирајте ги вашите далечински управувачи за користење со апликации
-Comment[nb]=Konfigurer fjernkontroll for bruk mot programmer
Comment[nds]=Feernbedeners för den Bruuk mit Programmen instellen
Comment[ne]=अनुप्रयोगसँग प्रयोग गर्न तपाईंको टाढाको नियन्त्रण कन्फिगर गर्नुहोस्
Comment[nl]=Uw afstandsbedieningen instellen voor gebruik in KDE
@@ -52,12 +50,12 @@
Comment[zh_CN]=配置您的远程控制以供应用程序使用
Comment[zh_TW]=設定遙控按鍵與應用程式的關聯
Exec=kcmshell4 kcmlirc
-Keywords=KCMLirc,kcmlirc
-Keywords[nl]=kcmlirc,linux infrarood,infrarood,afstandsbediening
-Keywords[pl]=KCMLirc,kcmlirc,piloty,podczerwień
-Keywords[ta]= KCMLirc,kcmlirc
-Keywords[uz]=KCMLirc,kcmlirc,инфрақизил нур
-Keywords[x-test]=xxKCMLirc,kcmlircxx
+X-KDE-Keywords=KCMLirc,kcmlirc
+X-KDE-Keywords[nl]=kcmlirc,linux infrarood,infrarood,afstandsbediening
+X-KDE-Keywords[pl]=KCMLirc,kcmlirc,piloty,podczerwień
+X-KDE-Keywords[ta]= KCMLirc,kcmlirc
+X-KDE-Keywords[uz]=KCMLirc,kcmlirc,инфрақизил нур
+X-KDE-Keywords[x-test]=xxKCMLirc,kcmlircxx
Name=Remote Controls
Name[ar]=التحكّم عن بعد
Name[ca]=Controls remots
@@ -113,5 +111,5 @@
X-KDE-FactoryName=kcmlirc
X-KDE-Library=kcmlirc
X-KDE-ModuleType=Library
-DocPath=kcmlirc/index.html
+X-DocPath=kcmlirc/index.html
Categories=Qt;KDE;X-KDE-settings-peripherals;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kdf/kcmdf.desktop new/kdeutils-3.96.1/kdf/kcmdf.desktop
--- old/kdeutils-3.96.0/kdf/kcmdf.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/kdf/kcmdf.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
X-KDE-Library=kcm_kdf
X-KDE-ParentApp=kcontrol
@@ -11,7 +10,7 @@
Icon=kcmdf
Type=Service
-ServiceTypes=KCModule
+X-KDE-ServiceTypes=KCModule
Name=Storage Devices
Name[af]=Stoorplek Toestelle
@@ -68,7 +67,7 @@
Name[xh]=Amacebo Okugcina
Name[zh_CN]=存储设备
Name[zh_TW]=儲存裝置
-DocPath=kinfocenter/blockdevices/index.html
+X-DocPath=kinfocenter/blockdevices/index.html
Comment=Shows the disk usage of the mounted devices
Comment[af]=Vertoon die disket gebruik van die gekoppelde toestelle
Comment[ar]=يعرض المساحة المستخدمة من الأقراص المضمومة
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kdf/kdf.desktop new/kdeutils-3.96.1/kdf/kdf.desktop
--- old/kdeutils-3.96.0/kdf/kdf.desktop 2007-11-14 01:26:15.000000000 +0100
+++ new/kdeutils-3.96.1/kdf/kdf.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=KDiskFree
Name[af]=Kdiskfree
Name[lv]=KDiskāBrīvs
@@ -73,7 +72,7 @@
GenericName[zh_CN]=查看磁盘使用状况
GenericName[zh_TW]=檢視磁碟使用情形
Terminal=false
-DocPath=kdf/index.html
+X-DocPath=kdf/index.html
X-KDE-StartupNotify=true
X-DBUS-StartupType=Multi
Categories=Qt;KDE;System;X-KDE-More;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kdf/kwikdisk.desktop new/kdeutils-3.96.1/kdf/kwikdisk.desktop
--- old/kdeutils-3.96.0/kdf/kwikdisk.desktop 2007-10-23 10:37:05.000000000 +0200
+++ new/kdeutils-3.96.1/kdf/kwikdisk.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=KwikDisk
Name[af]=Kwikdisk
Name[et]=Ketaste ühendamine
@@ -12,7 +11,7 @@
Exec=kwikdisk -caption "%c"
Icon=kwikdisk
Type=Application
-DocPath=kdf/index.html
+X-DocPath=kdf/index.html
GenericName=Removable Media Utility
GenericName[af]=Verwyderbare Media Program
GenericName[ar]=أداة الوسائط القابلة للإزالة
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kfloppy/floppy_format.desktop new/kdeutils-3.96.1/kfloppy/floppy_format.desktop
--- old/kdeutils-3.96.0/kfloppy/floppy_format.desktop 2007-11-14 01:26:10.000000000 +0100
+++ new/kdeutils-3.96.1/kfloppy/floppy_format.desktop 2007-11-20 23:00:49.000000000 +0100
@@ -46,9 +46,8 @@
Name[zh_TW]=格式化
[Desktop Entry]
-Encoding=UTF-8
Actions=Format;
-ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted,KonqPopupMenu/Plugin
+X-KDE-ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted,KonqPopupMenu/Plugin
Type=Service
X-KDE-Priority=TopLevel
X-KDE-MediaNotifierHide=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kfloppy/KFloppy.desktop new/kdeutils-3.96.1/kfloppy/KFloppy.desktop
--- old/kdeutils-3.96.0/kfloppy/KFloppy.desktop 2007-10-31 21:44:49.000000000 +0100
+++ new/kdeutils-3.96.1/kfloppy/KFloppy.desktop 2007-11-20 23:00:49.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
GenericName=Floppy Formatter
GenericName[af]=Sagteskyf Formateerder
GenericName[ar]=مهئ الأقراص المرنة
@@ -75,10 +74,9 @@
Name[x-test]=xxKFloppyxx
Name[zh_TW]=KDE 軟碟
MimeType=
-DocPath=kfloppy/index.html
+X-DocPath=kfloppy/index.html
Exec=kfloppy -caption "%c"
Icon=kfloppy
-Path=
Type=Application
Terminal=false
X-KDE-StartupNotify=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kgpg/encryptfile.desktop new/kdeutils-3.96.1/kgpg/encryptfile.desktop
--- old/kdeutils-3.96.0/kgpg/encryptfile.desktop 2007-11-14 01:26:10.000000000 +0100
+++ new/kdeutils-3.96.1/kgpg/encryptfile.desktop 2007-11-20 23:00:49.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=all/allfiles,KonqPopupMenu/Plugin
+X-KDE-ServiceTypes=all/allfiles,KonqPopupMenu/Plugin
ExcludeServiceTypes=kdedevice/*
Actions=encrypt;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kgpg/encryptfolder.desktop new/kdeutils-3.96.1/kgpg/encryptfolder.desktop
--- old/kdeutils-3.96.0/kgpg/encryptfolder.desktop 2007-11-14 01:26:10.000000000 +0100
+++ new/kdeutils-3.96.1/kgpg/encryptfolder.desktop 2007-11-20 23:00:49.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=inode/directory,KonqPopupMenu/Plugin
+X-KDE-ServiceTypes=inode/directory,KonqPopupMenu/Plugin
Actions=encrypt;
[Desktop Action encrypt]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kgpg/kgpg.desktop new/kdeutils-3.96.1/kgpg/kgpg.desktop
--- old/kdeutils-3.96.0/kgpg/kgpg.desktop 2007-11-06 09:01:38.000000000 +0100
+++ new/kdeutils-3.96.1/kgpg/kgpg.desktop 2007-11-20 23:00:49.000000000 +0100
@@ -1,10 +1,9 @@
# KDE Config File
[Desktop Entry]
-Encoding=UTF-8
Type=Application
Exec=kgpg %U
Icon=kgpg
-DocPath=kgpg/index.html
+X-DocPath=kgpg/index.html
MimeType=application/pgp-encrypted;application/pgp-signature;application/pgp-keys;
GenericName=Encryption Tool
GenericName[ar]=أداة للتشفير
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kgpg/kgpginterface.cpp new/kdeutils-3.96.1/kgpg/kgpginterface.cpp
--- old/kdeutils-3.96.0/kgpg/kgpginterface.cpp 2007-11-06 09:01:38.000000000 +0100
+++ new/kdeutils-3.96.1/kgpg/kgpginterface.cpp 2007-11-20 23:00:49.000000000 +0100
@@ -2980,7 +2980,7 @@
QString passdlgmessage;
if (step < 3)
- passdlgmessage = i18n("<p><b>Bad passphrase</b>. you have %1 tries left.</p>", step);
+ passdlgmessage = i18n("<p><b>Bad passphrase</b>. You have %1 tries left.</p>", step);
passdlgmessage += i18n("Enter passphrase for <b>%1</b>", checkForUtf8bis(userIDs));
if (sendPassphrase(passdlgmessage, p))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kgpg/kgpgwizard.ui new/kdeutils-3.96.1/kgpg/kgpgwizard.ui
--- old/kdeutils-3.96.0/kgpg/kgpgwizard.ui 2007-10-23 10:37:04.000000000 +0200
+++ new/kdeutils-3.96.1/kgpg/kgpgwizard.ui 2007-11-21 15:56:30.000000000 +0100
@@ -21,6 +21,9 @@
<height>332</height>
</rect>
</property>
+ <attribute name="title">
+ <string></string>
+ </attribute>
<layout class="QGridLayout" >
<item rowspan="3" row="0" column="0" >
<widget class="QLabel" name="pixmapLabel1" >
@@ -101,6 +104,9 @@
<height>338</height>
</rect>
</property>
+ <attribute name="title">
+ <string></string>
+ </attribute>
<layout class="QGridLayout" >
<item row="1" column="1" >
<widget class="QLabel" name="text_optionsfound" >
@@ -199,6 +205,9 @@
<height>275</height>
</rect>
</property>
+ <attribute name="title">
+ <string></string>
+ </attribute>
<layout class="QGridLayout" >
<item row="0" column="1" >
<widget class="QCheckBox" name="checkBox2" >
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/khexedit/khexedit.desktop new/kdeutils-3.96.1/khexedit/khexedit.desktop
--- old/kdeutils-3.96.0/khexedit/khexedit.desktop 2007-11-14 01:26:16.000000000 +0100
+++ new/kdeutils-3.96.1/khexedit/khexedit.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
GenericName=Binary Editor
GenericName[af]=Binêre Redigeerder
GenericName[ar]=محرر ثنائى
@@ -68,9 +67,8 @@
Name[zh_TW]=KHex 編輯器
Exec=khexedit -caption "%c" %U
Icon=khexedit
-Path=
Type=Application
-DocPath=khexedit/index.html
+X-DocPath=khexedit/index.html
Terminal=false
X-KDE-StartupNotify=true
X-DBUS-StartupType=Multi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/khexedit/parts/kbytesedit/kbytearrayedit.desktop new/kdeutils-3.96.1/khexedit/parts/kbytesedit/kbytearrayedit.desktop
--- old/kdeutils-3.96.0/khexedit/parts/kbytesedit/kbytearrayedit.desktop 2007-11-14 01:26:16.000000000 +0100
+++ new/kdeutils-3.96.1/khexedit/parts/kbytesedit/kbytearrayedit.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=BytesEdit Widget
Name[ar]=كائن BytesEdit
@@ -48,5 +47,5 @@
Name[zh_TW]=位元編輯器元件
X-KDE-Library=libkbytearrayedit
InitialPreference=2
-ServiceTypes=KHexEdit/KBytesEdit
+X-KDE-ServiceTypes=KHexEdit/KBytesEdit
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/khexedit/parts/kpart/oktetapart.desktop new/kdeutils-3.96.1/khexedit/parts/kpart/oktetapart.desktop
--- old/kdeutils-3.96.0/khexedit/parts/kpart/oktetapart.desktop 2007-11-14 01:26:16.000000000 +0100
+++ new/kdeutils-3.96.1/khexedit/parts/kpart/oktetapart.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Icon=khexedit
Name=Embedded Binary Viewer
@@ -28,7 +27,7 @@
Name[km]=កម្មវិធីមើលគោលពីរដែលបានបង្កប់
Name[ko]=첨부된 바이너리 뷰어
Name[lt]=Įdedama dvejetainių duomenų žiūryklė
-Name[nb]=Innebygget Binærfremviser
+Name[nb]=Innebygget Binærframviser
Name[nds]=Inbett Bineerdaten-Kieker
Name[ne]=सम्मिलित बाइनरी दर्शक
Name[nl]=Ingebedde binaire viewer
@@ -74,7 +73,6 @@
Comment[km]=កម្មវិធីមើលគោលពីរដែលបានបង្កប់
Comment[ko]=첨부된 바이너리 뷰어
Comment[lt]=Įdedama dvejetainių duomenų žiūryklė
-Comment[nb]=Innebygget Binærfremviser
Comment[nds]=Inbett Bineerdaten-Kieker
Comment[ne]=सम्मिलित बाइनरी दर्शक
Comment[nl]=Ingebedde binaire viewer
@@ -96,6 +94,6 @@
Comment[zh_TW]=嵌入式二進位顯示器
MimeType=all/allfiles;
#MimeType=application/octet-stream
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-KDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
#,KParts/ReadWritePart
X-KDE-Library=liboktetapart
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kjots/Kjots.desktop new/kdeutils-3.96.1/kjots/Kjots.desktop
--- old/kdeutils-3.96.0/kjots/Kjots.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/kjots/Kjots.desktop 2007-11-20 23:00:49.000000000 +0100
@@ -1,6 +1,5 @@
[Desktop Entry]
-Encoding=UTF-8
-DocPath=kjots/index.html
+X-DocPath=kjots/index.html
Name=KJots
Name[af]=Kjots
Name[hr]=Bilješke
@@ -67,7 +66,6 @@
Icon=kjots
Exec=kjots -caption "%c"
Type=Application
-Path=
Terminal=false
X-KDE-StartupNotify=true
X-DBUS-StartupType=Multi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/klaptopdaemon/menus/.directory new/kdeutils-3.96.1/klaptopdaemon/menus/.directory
--- old/kdeutils-3.96.0/klaptopdaemon/menus/.directory 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/klaptopdaemon/menus/.directory 2007-11-20 23:00:50.000000000 +0100
@@ -14,6 +14,7 @@
Name[ja]=ラップトップ
Name[kk]=Ноутбуктің батареясы
Name[ko]=노트북
+Name[nds]=Klappreekner
Name[ne]=ल्यापटप
Name[nl]=Laptopaccu
Name[pa]=ਲੈਪਟਾਪ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/klaptopdaemon/menus/klaptopdaemon.desktop new/kdeutils-3.96.1/klaptopdaemon/menus/klaptopdaemon.desktop
--- old/kdeutils-3.96.0/klaptopdaemon/menus/klaptopdaemon.desktop 2007-11-14 01:26:11.000000000 +0100
+++ new/kdeutils-3.96.1/klaptopdaemon/menus/klaptopdaemon.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,15 +1,14 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KDEDModule
+X-KDE-ServiceTypes=KDEDModule
X-KDE-ModuleType=Library
X-KDE-Library=klaptopdaemon
X-KDE-Kded-autoload=false
X-KDE-Kded-load-on-demand=true
Icon=battery
-DocPath=kcontrol/battery-monitor.html
+X-DocPath=kcontrol/battery-monitor.html
Comment=Laptop battery monitor
Comment[ar]=مراقب بطّاريّة الحاسوب المحمول
Comment[ca]=Monitor de bateria de portàtils
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/klaptopdaemon/menus/laptop.desktop new/kdeutils-3.96.1/klaptopdaemon/menus/laptop.desktop
--- old/kdeutils-3.96.0/klaptopdaemon/menus/laptop.desktop 2007-11-14 01:26:11.000000000 +0100
+++ new/kdeutils-3.96.1/klaptopdaemon/menus/laptop.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,12 +1,11 @@
[Desktop Entry]
-Encoding=UTF-8
X-KDE-Library=laptop
X-KDE-FactoryName=laptop
X-KDE-Init=laptop
Exec=kcmshell4 laptop
Icon=battery
Type=Application
-DocPath=kcontrol/laptop/index.html
+X-DocPath=kcontrol/laptop/index.html
Categories=Qt;KDE;X-KDE-settings-power;
Comment=Laptop Battery
Comment[af]=Draagbare rekenaar Batery
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/klaptopdaemon/menus/pcmcia.desktop new/kdeutils-3.96.1/klaptopdaemon/menus/pcmcia.desktop
--- old/kdeutils-3.96.0/klaptopdaemon/menus/pcmcia.desktop 2007-10-16 16:49:26.000000000 +0200
+++ new/kdeutils-3.96.1/klaptopdaemon/menus/pcmcia.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,12 +1,11 @@
[Desktop Entry]
-Encoding=UTF-8
X-KDE-ModuleType=Library
X-KDE-Library=laptop
X-KDE-FactoryName=pcmcia
Exec=kcmshell4 pcmcia
Icon=laptop_pcmcia
Type=Application
-DocPath=kinfocenter/pcmcia/index.html
+X-DocPath=kinfocenter/pcmcia/index.html
Comment=PCMCIA status
Comment[af]=Pcmcia status
Comment[ar]=حالة بطاقة PCMCIA
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/asus/kmilo_asus.desktop new/kdeutils-3.96.1/kmilo/asus/kmilo_asus.desktop
--- old/kdeutils-3.96.0/kmilo/asus/kmilo_asus.desktop 2007-10-31 21:44:51.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/asus/kmilo_asus.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KMilo Plugin
+X-KDE-ServiceTypes=KMilo Plugin
X-KDE-ModuleType=Plugin
Name=Asus Laptop Plugin
Name[ar]=ملحق حاسوب Asus المحمول
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/delli8k/kmilo_delli8k.desktop new/kdeutils-3.96.1/kmilo/delli8k/kmilo_delli8k.desktop
--- old/kdeutils-3.96.0/kmilo/delli8k/kmilo_delli8k.desktop 2007-10-31 21:44:51.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/delli8k/kmilo_delli8k.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KMilo Plugin
+X-KDE-ServiceTypes=KMilo Plugin
X-KDE-ModuleType=Plugin
Name=Dell I8k Laptop Plugin
Name[ar]=ملحق حاسوب Dell I8k المحمول
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/demo/kmilo_demo.desktop new/kdeutils-3.96.1/kmilo/demo/kmilo_demo.desktop
--- old/kdeutils-3.96.0/kmilo/demo/kmilo_demo.desktop 2007-11-14 01:26:24.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/demo/kmilo_demo.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KMilo Plugin
+X-KDE-ServiceTypes=KMilo Plugin
X-KDE-ModuleType=Plugin
Name=Demo Plugin
Name[ar]=ملحق للعرض
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/generic/kmilo_generic.desktop new/kdeutils-3.96.1/kmilo/generic/kmilo_generic.desktop
--- old/kdeutils-3.96.0/kmilo/generic/kmilo_generic.desktop 2007-11-14 01:26:25.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/generic/kmilo_generic.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KMilo Plugin
+X-KDE-ServiceTypes=KMilo Plugin
X-KDE-ModuleType=Plugin
Name=Generic Keyboard Plugin
Name[ar]=ملحق عام للوحة المفاتيح
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/kmilod/kmilod.desktop new/kdeutils-3.96.1/kmilo/kmilod/kmilod.desktop
--- old/kdeutils-3.96.0/kmilo/kmilod/kmilod.desktop 2007-11-14 01:26:17.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/kmilod/kmilod.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KDEDModule
+X-KDE-ServiceTypes=KDEDModule
X-KDE-ModuleType=Library
X-KDE-Library=kmilod
X-KDE-Kded-autoload=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/kmilod/kmilopluginsvc.desktop new/kdeutils-3.96.1/kmilo/kmilod/kmilopluginsvc.desktop
--- old/kdeutils-3.96.0/kmilo/kmilod/kmilopluginsvc.desktop 2007-10-03 13:47:47.000000000 +0200
+++ new/kdeutils-3.96.1/kmilo/kmilod/kmilopluginsvc.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=ServiceType
X-KDE-ServiceType=KMilo Plugin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop new/kdeutils-3.96.1/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop
--- old/kdeutils-3.96.0/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,13 +1,12 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Exec=kcmshell4 kvaio
Icon=laptop
-DocPath=kcontrol/kvaio/index.html
+X-DocPath=kcontrol/kvaio/index.html
X-KDE-Library=kcm_kvaio
X-KDE-ParentApp=kcontrol
-ServiceTypes=KCModule
+X-KDE-ServiceTypes=KCModule
Name=Sony Vaio Laptop
Name[ar]=حاسوب سونى فايو المحمولة
@@ -83,7 +82,6 @@
Comment[ko]=소니 프로그래머블 인터럽트 컨트롤러 드라이버를 위한 KDE 인터페이스를 설정합니다.
Comment[lt]=KDE sąsaja Sony Programmable Interrupt Controller Driver konfigūravimui
Comment[ms]= Selaraskan Antaramuka KDE untuk Pemacu Pengawal Gangguan Boleh Aturcara Sony
-Comment[nb]=Konfigurer KDE-grensesnitt til Sony Programmable Interrupt Controller Driver
Comment[nds]=KDE-Koppelsteedinstellen för den programmeerboren Interrupt-Controller-Driever vun Sony
Comment[ne]=सोनी कार्यक्रमयोग्य अवरोध नियन्त्रक ड्राइभरमा KDE इन्टरफेस कन्फिगर गर्नुहोस्
Comment[nl]=Voor het instellen van KDE's communicatie met het stuurprogramma van de Sony Programmeerbare Interrupt Controller
@@ -104,46 +102,46 @@
Comment[x-test]=xxConfigure the KDE Interface to the Sony Programmable Interrupt Controller Driverxx
Comment[zh_CN]=配置 KDE 界面使用索尼可编程中断控制器驱动程序
Comment[zh_TW]=設定 Sony 可編程中斷控制器驅動程式的 KDE 介面
-Keywords=Sony, Vaio, kvaio, brightness, mute, Jog Dial
-Keywords[ca]=Sony, Vaio, kvaio, brillantor, silenci, Jog Dial
-Keywords[cs]=Sony,Vaio,kvaio,jas,ztlumení,Jog Dial
-Keywords[cy]=Sony, Vaio, kvaio, gloywder, mud, Jog Dial
-Keywords[da]=Sony, Vaio, kvaio, lysstyrke, stum, Jog Dial
-Keywords[de]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, stumm, hell, dunkel
-Keywords[el]=Sony, Vaio, kvaio, φωτεινότητα, κλείσιμο ήχου, Jog Dial
-Keywords[es]=Sony, Vaio, kvaio, brillo, mute, Jog Dial
-Keywords[et]=Sony, Vaio, kvaio, heledus, tumm, Jog Dial
-Keywords[eu]=Sony, Vaio, kvaio, distira, mutu, Jog Dial
-Keywords[fa]=Sony،Vaio، kvaio، روشنایی، بدون صدا، Jog Dial
-Keywords[fi]=Sony, Vaio, kvaio, kirkkaus, vaimenna, Jog Dial
-Keywords[fr]=Sony, Vaio, kvaio, luminosité, sourdine, mute, Jog Dial
-Keywords[ga]=Sony, Vaio, kvaio, gile, gan fuaim, Jog Dial
-Keywords[gl]=Sony, Vaio, kvaio, brillo, silencio, Jog Dial
-Keywords[hu]=Sony,Vaio,kvaio,fényerő,elnémítás,tárcsagomb
-Keywords[it]=Sony,Vaio,kvaio,luminosità,muto,Jog Dial
-Keywords[ja]=Sony, Vaio, kvaio, 明るさ, ミュート, ジョグダイアル
-Keywords[ko]=Sony, Vaio, 소니,바이오,밝기,음소거,조그 다이얼
-Keywords[mk]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, Сони, осветленост, пригушување
-Keywords[ms]= kecerahan,bisu,Sony, Vaio, kvaio, brightness, mute, Jog Dial
-Keywords[nb]=Sony, Vaio, kvaio, lysstyrke, lydsperre, Jog Dial
-Keywords[nds]=Sony, Vaio, kvaio, Helligkeit, stumm, Jog Dial
-Keywords[ne]=सोनी, भाइयो, केभाइयो, चम्किलोपना, चुप लाग्नु, जोग डायल
-Keywords[nl]=Sony,Vaio,kvaio,brightness,helderheid,mute,Jog Dial
-Keywords[nn]=Sony,vaio,kvaio,lysstyrke,lydsperre,hjul
-Keywords[pl]=Sony, Vaio, kvaio, jasność, Jog Dial,jog,jogdial
-Keywords[pt]=Sony, Vaio, kvaio, brilho, sem som, Jog Dial
-Keywords[pt_BR]=Sony, Vaio, kvaio, brilho, mudo, Jog Dial
-Keywords[ro]=Sony,Vaio,kvaio,strălucire,fără sunet,jog dial
-Keywords[ru]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, яркость, звук
-Keywords[sl]=Sony, Vaio, kvaio, svetlost, tiho, Jog Dial
-Keywords[sr]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, светлина
-Keywords[sr@latin]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, svetlina
-Keywords[sv]=Sony, Vaio, kvaio, ljusstyrka, tyst, rullhjul
-Keywords[ta]=சோனி, வையொ, வெளிச்சம்,சத்தமில்லாத,ஜோக் டயல்
-Keywords[tg]=Sony, Vaio, kvaio, равшанӣ, хомӯшӣ, Jog Dial
-Keywords[tr]=Sony, Vaio, kvaio, parlaklık, sessiz, gösterme itmesi
-Keywords[uk]=Sony, Vaio, kvaio, яскравість, вимкнення звуку
-Keywords[x-test]=xxSony, Vaio, kvaio, brightness, mute, Jog Dialxx
-Keywords[zh_CN]=Sony,Vaio,kvaio,brightness,mute,Jog Dial,索尼,亮度,静音
+X-KDE-Keywords=Sony, Vaio, kvaio, brightness, mute, Jog Dial
+X-KDE-Keywords[ca]=Sony, Vaio, kvaio, brillantor, silenci, Jog Dial
+X-KDE-Keywords[cs]=Sony,Vaio,kvaio,jas,ztlumení,Jog Dial
+X-KDE-Keywords[cy]=Sony, Vaio, kvaio, gloywder, mud, Jog Dial
+X-KDE-Keywords[da]=Sony, Vaio, kvaio, lysstyrke, stum, Jog Dial
+X-KDE-Keywords[de]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, stumm, hell, dunkel
+X-KDE-Keywords[el]=Sony, Vaio, kvaio, φωτεινότητα, κλείσιμο ήχου, Jog Dial
+X-KDE-Keywords[es]=Sony, Vaio, kvaio, brillo, mute, Jog Dial
+X-KDE-Keywords[et]=Sony, Vaio, kvaio, heledus, tumm, Jog Dial
+X-KDE-Keywords[eu]=Sony, Vaio, kvaio, distira, mutu, Jog Dial
+X-KDE-Keywords[fa]=Sony،Vaio، kvaio، روشنایی، بدون صدا، Jog Dial
+X-KDE-Keywords[fi]=Sony, Vaio, kvaio, kirkkaus, vaimenna, Jog Dial
+X-KDE-Keywords[fr]=Sony, Vaio, kvaio, luminosité, sourdine, mute, Jog Dial
+X-KDE-Keywords[ga]=Sony, Vaio, kvaio, gile, gan fuaim, Jog Dial
+X-KDE-Keywords[gl]=Sony, Vaio, kvaio, brillo, silencio, Jog Dial
+X-KDE-Keywords[hu]=Sony,Vaio,kvaio,fényerő,elnémítás,tárcsagomb
+X-KDE-Keywords[it]=Sony,Vaio,kvaio,luminosità,muto,Jog Dial
+X-KDE-Keywords[ja]=Sony, Vaio, kvaio, 明るさ, ミュート, ジョグダイアル
+X-KDE-Keywords[ko]=Sony, Vaio, 소니,바이오,밝기,음소거,조그 다이얼
+X-KDE-Keywords[mk]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, Сони, осветленост, пригушување
+X-KDE-Keywords[ms]= kecerahan,bisu,Sony, Vaio, kvaio, brightness, mute, Jog Dial
+X-KDE-Keywords[nb]=Sony, Vaio, kvaio, lysstyrke, lydsperre, Jog Dial
+X-KDE-Keywords[nds]=Sony, Vaio, kvaio, Helligkeit, stumm, Jog Dial
+X-KDE-Keywords[ne]=सोनी, भाइयो, केभाइयो, चम्किलोपना, चुप लाग्नु, जोग डायल
+X-KDE-Keywords[nl]=Sony,Vaio,kvaio,brightness,helderheid,mute,Jog Dial
+X-KDE-Keywords[nn]=Sony,vaio,kvaio,lysstyrke,lydsperre,hjul
+X-KDE-Keywords[pl]=Sony, Vaio, kvaio, jasność, Jog Dial,jog,jogdial
+X-KDE-Keywords[pt]=Sony, Vaio, kvaio, brilho, sem som, Jog Dial
+X-KDE-Keywords[pt_BR]=Sony, Vaio, kvaio, brilho, mudo, Jog Dial
+X-KDE-Keywords[ro]=Sony,Vaio,kvaio,strălucire,fără sunet,jog dial
+X-KDE-Keywords[ru]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, яркость, звук
+X-KDE-Keywords[sl]=Sony, Vaio, kvaio, svetlost, tiho, Jog Dial
+X-KDE-Keywords[sr]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, светлина
+X-KDE-Keywords[sr@latin]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, svetlina
+X-KDE-Keywords[sv]=Sony, Vaio, kvaio, ljusstyrka, tyst, rullhjul
+X-KDE-Keywords[ta]=சோனி, வையொ, வெளிச்சம்,சத்தமில்லாத,ஜோக் டயல்
+X-KDE-Keywords[tg]=Sony, Vaio, kvaio, равшанӣ, хомӯшӣ, Jog Dial
+X-KDE-Keywords[tr]=Sony, Vaio, kvaio, parlaklık, sessiz, gösterme itmesi
+X-KDE-Keywords[uk]=Sony, Vaio, kvaio, яскравість, вимкнення звуку
+X-KDE-Keywords[x-test]=xxSony, Vaio, kvaio, brightness, mute, Jog Dialxx
+X-KDE-Keywords[zh_CN]=Sony,Vaio,kvaio,brightness,mute,Jog Dial,索尼,亮度,静音
Categories=Qt;KDE;X-KDE-settings-system;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/kmilo_kvaio/kmilo_kvaio.desktop new/kdeutils-3.96.1/kmilo/kmilo_kvaio/kmilo_kvaio.desktop
--- old/kdeutils-3.96.0/kmilo/kmilo_kvaio/kmilo_kvaio.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/kmilo_kvaio/kmilo_kvaio.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KMilo Plugin
+X-KDE-ServiceTypes=KMilo Plugin
X-KDE-ModuleType=Plugin
Name=Sony Vaio Plugin
Name[ar]=ملحق سونى فايوة
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/powerbook/kmilo_powerbook.desktop new/kdeutils-3.96.1/kmilo/powerbook/kmilo_powerbook.desktop
--- old/kdeutils-3.96.0/kmilo/powerbook/kmilo_powerbook.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/powerbook/kmilo_powerbook.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KMilo Plugin
+X-KDE-ServiceTypes=KMilo Plugin
X-KDE-ModuleType=Plugin
Name=Apple (R) PowerBook (R) Plugin
Name[ar]=ملحق Apple (R) PowerBook (R)ة
@@ -80,7 +79,6 @@
Comment[ko]=이 플러그인은 pbbuttonsd를 통하여 Apple(R) PowerBook(R)에 달려 있는 특수 키를 지원합니다.
Comment[lt]=Šis priedas įgalina specialiųjų raktų Apple (R) PowerBook (R) nešiojamuose kompiuteriuose palaikymą per pbbuttonsd.
Comment[mk]=Овој приклучок дава поддршка за специјалните копчиња на лаптопите Apple (R) PowerBook (R) преку pbbuttonsd.
-Comment[nb]=Dette programtilleggmet muliggjør støtte for spesielle taster på Apple (R) PowerBook (R) bærbare maskiner via pbbuttonsd.
Comment[nds]=Dit Moduul maakt de Sünnertasten-Ünnerstütten för PowerBook(R)-Klappreekners vun Apple(R) via pbbuttonsd an.
Comment[ne]=यो प्लगइनले pbbuttonsd द्वारा एप्पल (R) पावरबुक (R) ल्यापटपका विशेष कुञ्जीका लागि समर्थन सक्षम पार्दछ ।
Comment[nl]=Maakt het mogelijk speciale toetsen op Apple (R) PowerBook (R) laptops te gebruiken via pbbuttonsd.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/powerbook2/kmilo_powerbook.desktop new/kdeutils-3.96.1/kmilo/powerbook2/kmilo_powerbook.desktop
--- old/kdeutils-3.96.0/kmilo/powerbook2/kmilo_powerbook.desktop 2007-10-31 21:44:51.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/powerbook2/kmilo_powerbook.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KMilo Plugin
+X-KDE-ServiceTypes=KMilo Plugin
X-KDE-ModuleType=Plugin
Name=Apple PowerBook Plugin
Name[ar]=ملحق Apple PowerBook
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop new/kdeutils-3.96.1/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop
--- old/kdeutils-3.96.0/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,11 +1,10 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KCModule
+X-KDE-ServiceTypes=KCModule
Exec=kcmshell4 thinkpad
Icon=laptop
-DocPath=kcontrol/thinkpad/index.html
+X-DocPath=kcontrol/thinkpad/index.html
X-KDE-Library=kcm_thinkpad
X-KDE-ParentApp=kcontrol
@@ -85,7 +84,6 @@
Comment[ko]=IBM ThinkPad 특수 제어를 위한 KDE 인터페이스를 설정합니다
Comment[lt]=IBM Thinkpad ypatingiems valdymo moduliams KDE sąsaja
Comment[mk]=Го конфигурира интерфејсот на KDE за спец. контроли на IBM Thinkpad
-Comment[nb]=Konfigurer KDE-grensesnitt til IBM Thinkpad spesial kontroller
Comment[nds]=KDE-Koppelsteedinstellen för de IBM Thinkpad-Sünnerfunkschonenkuntrull
Comment[ne]=IBM थिङ्कप्याड विशेष नियन्त्रणका लागि केडीई इन्टरफेस कन्फिगर गर्नुहोस्
Comment[nl]=Voor het instellen van KDE's communicatie met de IBM Thinkpad Special Controls
@@ -106,45 +104,45 @@
Comment[x-test]=xxConfigure the KDE Interface to the IBM Thinkpad Special Controlsxx
Comment[zh_CN]=配置 KDE 界面使用 IBM ThinkPad 特殊控制
Comment[zh_TW]=設定 IBM Thinkpad 特殊控制的 KDE 介面
-Keywords=IBM, Thinkpad, brightness, mute, Jog Dial
-Keywords[ca]=IBM, Thinkpad, brillantor, silenci, Jog Dial
-Keywords[cs]=IBM,Thinkpad,jas,ztlumení,Jog Dial
-Keywords[cy]=IBM,Thinkpad,gloywder, mud, Jog Dial
-Keywords[da]=IBM. Thinkpad, lysstyrke, stum, Jog Dial
-Keywords[de]=IBM, Thinkpad, Helligkeit, Abschalten, Jog Dial
-Keywords[el]=IBM, Thinkpad, φωτεινότητα, κλείσιμο ήχου, Jog Dial
-Keywords[es]=IBM, Thinkpad, brillo, mute, Jog Dial
-Keywords[et]=IDM, Thinkpad, heledus, tumm, Jog Dial
-Keywords[eu]=IBM, Thinkpad, distira, mutu, Jog Dial
-Keywords[fa]=IBM، Thinkpad، روشنایی، بدون صدا، Jog Dial
-Keywords[fi]=IBM, Thinkpad, kirkkaus, vaimenna, Jog Dial
-Keywords[fr]=IBM, Thinkpad, luminosité, sourdine, mute, Jog Dial
-Keywords[ga]=IBM, Thinkpad, gile, gan fuaim, Jog Dial
-Keywords[gl]=IBM, Thinkpad, brillo, silenciar, Jog Dial
-Keywords[hu]=IBM,Thinkpad,fényerő,elnémítás,tárcsagomb
-Keywords[it]=IBM,Thinkpad,luminosità,muto,Jog Dial
-Keywords[ja]=IBM, シンクパッド, 明るさ, ミュート, ジョグダイアル
-Keywords[ko]=IBM, Thinkpad, 씽크패드,밝기,음소거,조그 다이얼
-Keywords[mk]=IBM, Thinkpad, brightness, mute, Jog Dial, осветленост, пригушување
-Keywords[nb]=IBM, Thinkpad, lysstyrke, dempet, Jog Dial
-Keywords[nds]=IBM, Thinkpad, Helligkeit, stumm, Jog Dial
-Keywords[ne]=IBM, थिङ्कप्याड, चम्किलोपना, चुप लाग्नु, जोग डायल
-Keywords[nl]=IBM, Thinkpad, brightness, mute, Jog Dial, Helderheid, dempen
-Keywords[nn]=IBM,Thinkpad,lysstyrke,demping,snurrehjul
-Keywords[pa]=IBM, Thinkpad, brightness, mute, Jog Dial, ਲੈਪਟਾਪ
-Keywords[pl]=IBM, Thinkpad, jasność, wycisz, Jog Dial
-Keywords[pt]=IBM, Thinkpad, brilho, sem som, Jog Dial
-Keywords[pt_BR]=IBM, Thinkpad, brilho, mudo, Jog Dial
-Keywords[ro]=IBM,Thinkpad,strălucire,fără sunet,jog dial
-Keywords[ru]=IBM, Thinkpad, brightness, mute, Jog Dial, яркость, звук
-Keywords[sl]=IBM, Thinkpad, svetlost, tiho, Jog Dial
-Keywords[sr]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, светлина
-Keywords[sr@latin]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, svetlina
-Keywords[sv]=IBM, Thinkpad, ljusstyrka, tyst, rullhjul
-Keywords[ta]=ஐபிஎம், திங்க்பேட்,ஒளித்தன்மை,ஓசையற்ற,ஜோக் டையல்
-Keywords[tr]=IBM, Thinkpad, parlaklık, sessiz, gösterme itmesi
-Keywords[uk]=IBM, Thinkpad, яскравість, вимкнення звуку, Jog Dial
-Keywords[x-test]=xxIBM, Thinkpad, brightness, mute, Jog Dialxx
-Keywords[zh_CN]=IBM,Thinkpad,brightness,mute,Jog Dial,亮度,静音
+X-KDE-Keywords=IBM, Thinkpad, brightness, mute, Jog Dial
+X-KDE-Keywords[ca]=IBM, Thinkpad, brillantor, silenci, Jog Dial
+X-KDE-Keywords[cs]=IBM,Thinkpad,jas,ztlumení,Jog Dial
+X-KDE-Keywords[cy]=IBM,Thinkpad,gloywder, mud, Jog Dial
+X-KDE-Keywords[da]=IBM. Thinkpad, lysstyrke, stum, Jog Dial
+X-KDE-Keywords[de]=IBM, Thinkpad, Helligkeit, Abschalten, Jog Dial
+X-KDE-Keywords[el]=IBM, Thinkpad, φωτεινότητα, κλείσιμο ήχου, Jog Dial
+X-KDE-Keywords[es]=IBM, Thinkpad, brillo, mute, Jog Dial
+X-KDE-Keywords[et]=IDM, Thinkpad, heledus, tumm, Jog Dial
+X-KDE-Keywords[eu]=IBM, Thinkpad, distira, mutu, Jog Dial
+X-KDE-Keywords[fa]=IBM، Thinkpad، روشنایی، بدون صدا، Jog Dial
+X-KDE-Keywords[fi]=IBM, Thinkpad, kirkkaus, vaimenna, Jog Dial
+X-KDE-Keywords[fr]=IBM, Thinkpad, luminosité, sourdine, mute, Jog Dial
+X-KDE-Keywords[ga]=IBM, Thinkpad, gile, gan fuaim, Jog Dial
+X-KDE-Keywords[gl]=IBM, Thinkpad, brillo, silenciar, Jog Dial
+X-KDE-Keywords[hu]=IBM,Thinkpad,fényerő,elnémítás,tárcsagomb
+X-KDE-Keywords[it]=IBM,Thinkpad,luminosità,muto,Jog Dial
+X-KDE-Keywords[ja]=IBM, シンクパッド, 明るさ, ミュート, ジョグダイアル
+X-KDE-Keywords[ko]=IBM, Thinkpad, 씽크패드,밝기,음소거,조그 다이얼
+X-KDE-Keywords[mk]=IBM, Thinkpad, brightness, mute, Jog Dial, осветленост, пригушување
+X-KDE-Keywords[nb]=IBM, Thinkpad, lysstyrke, dempet, Jog Dial
+X-KDE-Keywords[nds]=IBM, Thinkpad, Helligkeit, stumm, Jog Dial
+X-KDE-Keywords[ne]=IBM, थिङ्कप्याड, चम्किलोपना, चुप लाग्नु, जोग डायल
+X-KDE-Keywords[nl]=IBM, Thinkpad, brightness, mute, Jog Dial, Helderheid, dempen
+X-KDE-Keywords[nn]=IBM,Thinkpad,lysstyrke,demping,snurrehjul
+X-KDE-Keywords[pa]=IBM, Thinkpad, brightness, mute, Jog Dial, ਲੈਪਟਾਪ
+X-KDE-Keywords[pl]=IBM, Thinkpad, jasność, wycisz, Jog Dial
+X-KDE-Keywords[pt]=IBM, Thinkpad, brilho, sem som, Jog Dial
+X-KDE-Keywords[pt_BR]=IBM, Thinkpad, brilho, mudo, Jog Dial
+X-KDE-Keywords[ro]=IBM,Thinkpad,strălucire,fără sunet,jog dial
+X-KDE-Keywords[ru]=IBM, Thinkpad, brightness, mute, Jog Dial, яркость, звук
+X-KDE-Keywords[sl]=IBM, Thinkpad, svetlost, tiho, Jog Dial
+X-KDE-Keywords[sr]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, светлина
+X-KDE-Keywords[sr@latin]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, svetlina
+X-KDE-Keywords[sv]=IBM, Thinkpad, ljusstyrka, tyst, rullhjul
+X-KDE-Keywords[ta]=ஐபிஎம், திங்க்பேட்,ஒளித்தன்மை,ஓசையற்ற,ஜோக் டையல்
+X-KDE-Keywords[tr]=IBM, Thinkpad, parlaklık, sessiz, gösterme itmesi
+X-KDE-Keywords[uk]=IBM, Thinkpad, яскравість, вимкнення звуку, Jog Dial
+X-KDE-Keywords[x-test]=xxIBM, Thinkpad, brightness, mute, Jog Dialxx
+X-KDE-Keywords[zh_CN]=IBM,Thinkpad,brightness,mute,Jog Dial,亮度,静音
Categories=Qt;KDE;X-KDE-settings-system;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kmilo/thinkpad/kmilo_thinkpad.desktop new/kdeutils-3.96.1/kmilo/thinkpad/kmilo_thinkpad.desktop
--- old/kdeutils-3.96.0/kmilo/thinkpad/kmilo_thinkpad.desktop 2007-11-14 01:26:17.000000000 +0100
+++ new/kdeutils-3.96.1/kmilo/thinkpad/kmilo_thinkpad.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,7 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
-ServiceTypes=KMilo Plugin
+X-KDE-ServiceTypes=KMilo Plugin
X-KDE-ModuleType=Plugin
Name=Thinkpad Plugin
Name[ar]=ملحق Thinkpad
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kregexpeditor/kregexpeditor.desktop new/kdeutils-3.96.1/kregexpeditor/kregexpeditor.desktop
--- old/kdeutils-3.96.0/kregexpeditor/kregexpeditor.desktop 2007-11-14 01:26:26.000000000 +0100
+++ new/kdeutils-3.96.1/kregexpeditor/kregexpeditor.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=KRegExpEditor
Name[cs]=Editor regulárních výrazů
Name[et]=Regulaaravaldiste redaktor
@@ -13,7 +12,7 @@
Name[x-test]=xxKRegExpEditorxx
Name[zh_TW]=正規表示式編輯器
Exec=kregexpeditor
-DocPath=KRegExpEditor/index.html
+X-DocPath=KRegExpEditor/index.html
GenericName=Regular Expression Editor
GenericName[ar]=محرّر التعابير النظامية
GenericName[br]=Aozer an troiennoù reolataet
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kregexpeditor/kregexpeditorgui.desktop new/kdeutils-3.96.1/kregexpeditor/kregexpeditorgui.desktop
--- old/kdeutils-3.96.0/kregexpeditor/kregexpeditorgui.desktop 2007-10-31 21:44:51.000000000 +0100
+++ new/kdeutils-3.96.1/kregexpeditor/kregexpeditorgui.desktop 2007-11-20 23:00:51.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=RegExp Editor Widget
Name[af]=Regexp Redigeerder Gui-element
@@ -57,4 +56,4 @@
Name[zh_TW]=正規表示式編輯小程式
X-KDE-Library=libkregexpeditorgui
InitialPreference=2
-ServiceTypes=KRegExpEditor/KRegExpEditor
+X-KDE-ServiceTypes=KRegExpEditor/KRegExpEditor
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ksim/ksim.desktop new/kdeutils-3.96.1/ksim/ksim.desktop
--- old/kdeutils-3.96.0/ksim/ksim.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/ksim/ksim.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
GenericName=System Monitor
GenericName[af]=Stelsel Monitor
GenericName[ar]=مراقب النظام
@@ -70,6 +69,7 @@
Comment[he]=צג מידע מערכת (נוסח GKrellM)
Comment[ja]=K システム情報モニタ (GKrellM スタイル)
Comment[ko]=K 시스템 정보 모니터 (GKrellM 스타일)
+Comment[nds]=KDE-Kieker för Systeeminformatschonen (GKrellM-Stil)
Comment[ne]=केडीई प्रणाली सूचना मोनिटर (GKrellM शैली)
Comment[nl]=Systeeminformatiemonitor (GKrellM-stijl)
Comment[pa]=K ਸਿਸਟਮ ਜਾਣਕਾਰੀ ਨਿਗਰਾਨ (GKrellM ਸਟਾਇਲ)
@@ -82,7 +82,7 @@
Comment[x-test]=xxK System Information Monitor (GKrellM style)xx
Comment[zh_CN]=系统信息监视器(GKrellM 风格)
Comment[zh_TW]=K 系統資訊監視器 (GKrellM 風格)
-DocPath=ksim/index.html
+X-DocPath=ksim/index.html
Icon=ksim
MimeType=
Name=KSim
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ksim/monitors/cpu/cpu.desktop new/kdeutils-3.96.1/ksim/monitors/cpu/cpu.desktop
--- old/kdeutils-3.96.0/ksim/monitors/cpu/cpu.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/ksim/monitors/cpu/cpu.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Icon=ksim_cpu
Name=CPU
Name[af]=Sve
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ksim/monitors/disk/disk.desktop new/kdeutils-3.96.1/ksim/monitors/disk/disk.desktop
--- old/kdeutils-3.96.0/ksim/monitors/disk/disk.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/ksim/monitors/disk/disk.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Comment=Disk Monitor Plugin
Comment[af]=Disket Monitor Inplak
Comment[ar]=ملحق مراقبة القرص
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ksim/monitors/filesystem/DFree.desktop new/kdeutils-3.96.1/ksim/monitors/filesystem/DFree.desktop
--- old/kdeutils-3.96.0/ksim/monitors/filesystem/DFree.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/ksim/monitors/filesystem/DFree.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Icon=hdd_unmount
Name=DFree
Name[af]=Dfree
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ksim/monitors/i8k/i8k.desktop new/kdeutils-3.96.1/ksim/monitors/i8k/i8k.desktop
--- old/kdeutils-3.96.0/ksim/monitors/i8k/i8k.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/ksim/monitors/i8k/i8k.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Comment=Dell I8K Hardware Monitor Plugin
Comment[ar]=ملحق لمراقبة عتاد Dell I8K
Comment[ca]=Connector per a controlar el maquinari Dell I8K
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ksim/monitors/lm_sensors/Lm_sensors.desktop new/kdeutils-3.96.1/ksim/monitors/lm_sensors/Lm_sensors.desktop
--- old/kdeutils-3.96.0/ksim/monitors/lm_sensors/Lm_sensors.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/ksim/monitors/lm_sensors/Lm_sensors.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Comment=Lm_sensors Status Monitor
Comment[ar]=مراقب حالة Lm_sensors
Comment[ca]=Monitor de l'estat de Lm_sensors
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ksim/monitors/mail/mail.desktop new/kdeutils-3.96.1/ksim/monitors/mail/mail.desktop
--- old/kdeutils-3.96.0/ksim/monitors/mail/mail.desktop 2007-11-06 09:01:40.000000000 +0100
+++ new/kdeutils-3.96.1/ksim/monitors/mail/mail.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Comment=Mail Monitor Plugin
Comment[af]=Pos Monitor Inplak
Comment[ar]=ملحق مراقبة البريد
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ksim/monitors/net/Net.desktop new/kdeutils-3.96.1/ksim/monitors/net/Net.desktop
--- old/kdeutils-3.96.0/ksim/monitors/net/Net.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/ksim/monitors/net/Net.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Comment=Net Status Monitor
Comment[ar]=مراقب حالة الشبكة
Comment[ca]=Monitor de l'estat de xarxa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ksim/monitors/snmp/Snmp.desktop new/kdeutils-3.96.1/ksim/monitors/snmp/Snmp.desktop
--- old/kdeutils-3.96.0/ksim/monitors/snmp/Snmp.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/ksim/monitors/snmp/Snmp.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Comment=Snmp Status Monitor
Comment[ar]=مراقب حالة Snmp
Comment[ca]=Monitor d'estat snmp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/ktimer/ktimer.desktop new/kdeutils-3.96.1/ktimer/ktimer.desktop
--- old/kdeutils-3.96.0/ktimer/ktimer.desktop 2007-10-23 10:37:04.000000000 +0200
+++ new/kdeutils-3.96.1/ktimer/ktimer.desktop 2007-11-20 23:00:49.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
GenericName=Countdown Launcher
GenericName[ar]=بادئ العدّ التنازلى
GenericName[ca]=Llançador amb compte enrere
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kwallet/konfigurator/kwalletconfig.desktop new/kdeutils-3.96.1/kwallet/konfigurator/kwalletconfig.desktop
--- old/kdeutils-3.96.0/kwallet/konfigurator/kwalletconfig.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/kwallet/konfigurator/kwalletconfig.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,12 +1,11 @@
[Desktop Entry]
-Encoding=UTF-8
Icon=kwalletmanager
Type=Service
-ServiceTypes=KCModule
+X-KDE-ServiceTypes=KCModule
Exec=kcmshell4 kwalletconfig
-DocPath=kwallet/index.html
+X-DocPath=kwallet/index.html
X-KDE-Library=kcm_kwallet
X-KDE-ParentApp=kcontrol
@@ -106,47 +105,47 @@
Comment[x-test]=xxKDE Wallet Configurationxx
Comment[zh_CN]=KDE 钱包配置
Comment[zh_TW]=KDE 錢包設定
-Keywords=Wallet,Form Fill,Passwords,Form Data
-Keywords[ar]=محفظة،ملأ نموذج،كلمات السرّ،بيانات نموذج
-Keywords[ca]=Cartera,Ompliment de formularis,Contrasentes,Dades de formularis
-Keywords[cs]=úschovna,vyplnění formuláře,hesla,data formuláře
-Keywords[cy]=Waled,Llenwi Ffurflen,Cyfrineiriau,Data Ffurflenni
-Keywords[da]=Tegnebog,Formularudfyldning,Kodeord,Formular-data
-Keywords[de]=Geheimfach,Formular,Passwort,Brieftasche,digitale Brieftasche
-Keywords[el]=Πορτοφόλι,Συμπλήρωση φόρμας,Κωδικοί πρόσβασης,Δεδομένα φόρμας
-Keywords[es]=Cartera,Rellenar formulario,Contraseña,Datos de formulario
-Keywords[et]=Turvalaegas,Vormi täitmine,Paroolid,Vormiandmed
-Keywords[eu]=Kartera,Formularioa Bete,Pasahitzak,Formulario Datuak
-Keywords[fa]=Wallet، پر کردن برگه، اسم رمزها، دادۀ برگه
-Keywords[fi]=Lompakko,Lomakkeen täyttö,Salasanat,Lomaketiedot
-Keywords[fr]=gestionnaire de comptes,remplissage de formulaire,Mots de passe,Données de formulaire
-Keywords[ga]=Wallet,Líonadh Foirmeacha,Focal Faire,Sonraí foirme
-Keywords[gl]=Carteira,Preencher formulario,Contrasinais,Wallet,Dados do formulario
-Keywords[hu]=digitális notesz,űrlapkitöltés,jelszavak,űrlapadatok
-Keywords[it]=portafogli,wallet,riempimento moduli,moduli,form,password,dati moduli
-Keywords[ja]=ウォレット,フォームフィル,パスワード,フォームデータ
-Keywords[km]=កាបូប,ការបំពេញសំណុំបែបបទ,ពាក្យសម្ងាត់,ទិន្នន័យសំណុំបែបបទ
-Keywords[ko]=지갑,자동 완성,비밀번호,폼 데이터
-Keywords[lt]=Wallet, slaptažodinė,Form Fill,Passwords,Form Data,formų pildymas,slaptažodžiai,formų duomenys
-Keywords[mk]=Wallet,Form Fill,Passwords,Form Data, Паричник, формулар, лозинки
-Keywords[nb]=Wallet,Skjemautfylling,Passord,Skjema
-Keywords[nds]=Knipp,Formulor,Passwöör,Formulordaten
-Keywords[ne]=वालेट,फारम भराइ,पासवर्ड,फारम डेटा
-Keywords[nl]=Wallet,gegevens,portefeuille,wachtwoorden,veilig bewaren van wachtwoorden,invulgegevens,formulieren
-Keywords[nn]=wallet,skjemautfylling,passord,skjema
-Keywords[pa]=Wallet,Form Fill,ਗੁਪਤ-ਕੋਡ,ਫਾਰਮ ਡਾਟਾ
-Keywords[pl]=portfel,wypełnianie formularzy,uzupełnianie formularzy, hasła, hasło,dane formularzy, formularze
-Keywords[pt]=Carteira,Preenchimento de Formulários,Senhas,Dados do Formulário
-Keywords[pt_BR]=Carteira,Preenchimento de Formulário,Senhas,Dados de Formulário
-Keywords[ro]=portofel,completare formulare,parole,date formular,formular
-Keywords[ru]=Wallet,Form Fill,Passwords,Form Data,Бумажник,Пароли,Формы
-Keywords[sl]=waller,denarnica,gesla,obrazec,podatki,geslo
-Keywords[sr]=Wallet,Form Fill,Passwords,Form Data,лозинке,новчаник
-Keywords[sr@latin]=Wallet,Form Fill,Passwords,Form Data,lozinke,novčanik
-Keywords[sv]=Plånbok,fyll i formulär,lösenord,formulärdata
-Keywords[ta]=வாலட், படிவ நிரப்பு, கடவுச் சொற்கள், படிவ தகவல்
-Keywords[tg]=Ҳамён,Пуркунии Варақа,Гузарвожаҳо,Варақаи Додаҳо
-Keywords[tr]=Cüzdan,Form Doldur,Şifreler,Form Verisi
-Keywords[uk]=Торбинка,Заповнення форм,Паролі,Дані форм
-Keywords[x-test]=xxWallet,Form Fill,Passwords,Form Dataxx
-Keywords[zh_CN]=Wallet,Form Fill,Passwords,Form Data,钱包,填充表单,密码,表单数据
+X-KDE-Keywords=Wallet,Form Fill,Passwords,Form Data
+X-KDE-Keywords[ar]=محفظة،ملأ نموذج،كلمات السرّ،بيانات نموذج
+X-KDE-Keywords[ca]=Cartera,Ompliment de formularis,Contrasentes,Dades de formularis
+X-KDE-Keywords[cs]=úschovna,vyplnění formuláře,hesla,data formuláře
+X-KDE-Keywords[cy]=Waled,Llenwi Ffurflen,Cyfrineiriau,Data Ffurflenni
+X-KDE-Keywords[da]=Tegnebog,Formularudfyldning,Kodeord,Formular-data
+X-KDE-Keywords[de]=Geheimfach,Formular,Passwort,Brieftasche,digitale Brieftasche
+X-KDE-Keywords[el]=Πορτοφόλι,Συμπλήρωση φόρμας,Κωδικοί πρόσβασης,Δεδομένα φόρμας
+X-KDE-Keywords[es]=Cartera,Rellenar formulario,Contraseña,Datos de formulario
+X-KDE-Keywords[et]=Turvalaegas,Vormi täitmine,Paroolid,Vormiandmed
+X-KDE-Keywords[eu]=Kartera,Formularioa Bete,Pasahitzak,Formulario Datuak
+X-KDE-Keywords[fa]=Wallet، پر کردن برگه، اسم رمزها، دادۀ برگه
+X-KDE-Keywords[fi]=Lompakko,Lomakkeen täyttö,Salasanat,Lomaketiedot
+X-KDE-Keywords[fr]=gestionnaire de comptes,remplissage de formulaire,Mots de passe,Données de formulaire
+X-KDE-Keywords[ga]=Wallet,Líonadh Foirmeacha,Focal Faire,Sonraí foirme
+X-KDE-Keywords[gl]=Carteira,Preencher formulario,Contrasinais,Wallet,Dados do formulario
+X-KDE-Keywords[hu]=digitális notesz,űrlapkitöltés,jelszavak,űrlapadatok
+X-KDE-Keywords[it]=portafogli,wallet,riempimento moduli,moduli,form,password,dati moduli
+X-KDE-Keywords[ja]=ウォレット,フォームフィル,パスワード,フォームデータ
+X-KDE-Keywords[km]=កាបូប,ការបំពេញសំណុំបែបបទ,ពាក្យសម្ងាត់,ទិន្នន័យសំណុំបែបបទ
+X-KDE-Keywords[ko]=지갑,자동 완성,비밀번호,폼 데이터
+X-KDE-Keywords[lt]=Wallet, slaptažodinė,Form Fill,Passwords,Form Data,formų pildymas,slaptažodžiai,formų duomenys
+X-KDE-Keywords[mk]=Wallet,Form Fill,Passwords,Form Data, Паричник, формулар, лозинки
+X-KDE-Keywords[nb]=Wallet,Skjemautfylling,Passord,Skjema
+X-KDE-Keywords[nds]=Knipp,Formulor,Passwöör,Formulordaten
+X-KDE-Keywords[ne]=वालेट,फारम भराइ,पासवर्ड,फारम डेटा
+X-KDE-Keywords[nl]=Wallet,gegevens,portefeuille,wachtwoorden,veilig bewaren van wachtwoorden,invulgegevens,formulieren
+X-KDE-Keywords[nn]=wallet,skjemautfylling,passord,skjema
+X-KDE-Keywords[pa]=Wallet,Form Fill,ਗੁਪਤ-ਕੋਡ,ਫਾਰਮ ਡਾਟਾ
+X-KDE-Keywords[pl]=portfel,wypełnianie formularzy,uzupełnianie formularzy, hasła, hasło,dane formularzy, formularze
+X-KDE-Keywords[pt]=Carteira,Preenchimento de Formulários,Senhas,Dados do Formulário
+X-KDE-Keywords[pt_BR]=Carteira,Preenchimento de Formulário,Senhas,Dados de Formulário
+X-KDE-Keywords[ro]=portofel,completare formulare,parole,date formular,formular
+X-KDE-Keywords[ru]=Wallet,Form Fill,Passwords,Form Data,Бумажник,Пароли,Формы
+X-KDE-Keywords[sl]=waller,denarnica,gesla,obrazec,podatki,geslo
+X-KDE-Keywords[sr]=Wallet,Form Fill,Passwords,Form Data,лозинке,новчаник
+X-KDE-Keywords[sr@latin]=Wallet,Form Fill,Passwords,Form Data,lozinke,novčanik
+X-KDE-Keywords[sv]=Plånbok,fyll i formulär,lösenord,formulärdata
+X-KDE-Keywords[ta]=வாலட், படிவ நிரப்பு, கடவுச் சொற்கள், படிவ தகவல்
+X-KDE-Keywords[tg]=Ҳамён,Пуркунии Варақа,Гузарвожаҳо,Варақаи Додаҳо
+X-KDE-Keywords[tr]=Cüzdan,Form Doldur,Şifreler,Form Verisi
+X-KDE-Keywords[uk]=Торбинка,Заповнення форм,Паролі,Дані форм
+X-KDE-Keywords[x-test]=xxWallet,Form Fill,Passwords,Form Dataxx
+X-KDE-Keywords[zh_CN]=Wallet,Form Fill,Passwords,Form Data,钱包,填充表单,密码,表单数据
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kwallet/konfigurator/kwalletmanager_show.desktop new/kdeutils-3.96.1/kwallet/konfigurator/kwalletmanager_show.desktop
--- old/kdeutils-3.96.0/kwallet/konfigurator/kwalletmanager_show.desktop 2007-11-06 09:01:40.000000000 +0100
+++ new/kdeutils-3.96.1/kwallet/konfigurator/kwalletmanager_show.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Wallet Management Tool
Name[ar]=أداة إدارة المحفظة
Name[br]=Merour an doug-paperoù
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kwallet/kwalletmanager.desktop new/kdeutils-3.96.1/kwallet/kwalletmanager.desktop
--- old/kdeutils-3.96.0/kwallet/kwalletmanager.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/kwallet/kwalletmanager.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Wallet Management Tool
Name[ar]=أداة إدارة المحفظة
Name[br]=Merour an doug-paperoù
@@ -60,4 +59,4 @@
Terminal=false
X-KDE-StartupNotify=false
Categories=Qt;KDE;Settings;
-DocPath=kwallet/index.html
+X-DocPath=kwallet/index.html
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/kwallet/kwalletmanager-kwalletd.desktop new/kdeutils-3.96.1/kwallet/kwalletmanager-kwalletd.desktop
--- old/kdeutils-3.96.0/kwallet/kwalletmanager-kwalletd.desktop 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.1/kwallet/kwalletmanager-kwalletd.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Wallet Management Tool
Name[ar]=أداة إدارة المحفظة
Name[br]=Merour an doug-paperoù
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/superkaramba/skapplet/plasma-skapplet-default.desktop new/kdeutils-3.96.1/superkaramba/skapplet/plasma-skapplet-default.desktop
--- old/kdeutils-3.96.0/superkaramba/skapplet/plasma-skapplet-default.desktop 2007-10-23 10:37:06.000000000 +0200
+++ new/kdeutils-3.96.1/superkaramba/skapplet/plasma-skapplet-default.desktop 2007-11-20 23:00:52.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=SuperKaramba
Name[ar]=سوبركارامبا
Name[is]=SúperKaramba
@@ -9,6 +8,7 @@
Name[x-test]=xxSuperKarambaxx
Comment=SuperKaramba Plasma Applet
Comment[ar]=بريمج بلازما سوبركارامبا
+Comment[ca]=Miniaplicació plasma del SuperKaramba
Comment[el]=Μικροεφαρμογή Plasma SuperKaramba
Comment[eo]=SuperKaramba Plasma apleto
Comment[es]=Applet de SuperKaramba para Plasma
@@ -16,6 +16,7 @@
Comment[he]=יישומון Plasma עבור Superkaramba
Comment[ja]=SuperKaramba Plasma アプレット
Comment[ko]=SuperKaramba Plasma 애플릿
+Comment[nds]=SuperKaramba-Lüttprogramm för Plasma
Comment[nl]=Superkaramba Plasma-applet
Comment[pt]='Applet' do Plasma para o SuperKaramba
Comment[pt_BR]=Mini-aplicativo Plasma do Superkaramba
@@ -25,7 +26,7 @@
Comment[zh_CN]=SuperKaramba Plasma 小程序
Comment[zh_TW]=SuperKaramba Plasma 小程式
Type=Service
-ServiceTypes=Plasma/Applet
+X-KDE-ServiceTypes=Plasma/Applet
X-KDE-Library=plasma_applet_skapplet
X-KDE-PluginInfo-Author=The SuperKaramba Team
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/superkaramba/skapplet/skapplet.cpp new/kdeutils-3.96.1/superkaramba/skapplet/skapplet.cpp
--- old/kdeutils-3.96.0/superkaramba/skapplet/skapplet.cpp 2007-11-14 01:26:28.000000000 +0100
+++ new/kdeutils-3.96.1/superkaramba/skapplet/skapplet.cpp 2007-11-20 23:00:52.000000000 +0100
@@ -119,7 +119,6 @@
kDebug() << "========================> SuperKarambaApplet Ctor" << args ;
setHasConfigurationInterface(true);
- setDrawStandardBackground(false);
if (args.count() < 3) {
KConfigGroup cg = config();
@@ -205,10 +204,11 @@
cg.config()->sync();
}
-void SuperKarambaApplet::constraintsUpdated(Plasma::Constraints contraints)
+void SuperKarambaApplet::constraintsUpdated(Plasma::Constraints constraints)
{
- kDebug() << "SuperKarambaApplet::constraintsUpdated" ;
- Plasma::Applet::constraintsUpdated(contraints);
+ Q_UNUSED(constraints)
+
+ setDrawStandardBackground(false);
}
QRectF SuperKarambaApplet::boundingRect() const
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/superkaramba/src/karamba.cpp new/kdeutils-3.96.1/superkaramba/src/karamba.cpp
--- old/kdeutils-3.96.0/superkaramba/src/karamba.cpp 2007-11-14 01:26:28.000000000 +0100
+++ new/kdeutils-3.96.1/superkaramba/src/karamba.cpp 2007-11-22 18:16:34.000000000 +0100
@@ -537,7 +537,7 @@
void Karamba::redrawWidget()
{
// Force the event loop to process the update() calls
- QCoreApplication::processEvents();
+ // QCoreApplication::processEvents();
}
bool Karamba::parseConfig()
@@ -1456,6 +1456,10 @@
newAC->setParent(this);
newAC->setVisible(false);
+ if (d->globalView) {
+ return;
+ }
+
d->toDesktopMenu = new KMenu();
d->toDesktopMenu->setTitle(i18n("To Des&ktop"));
d->popupMenu->addMenu(d->toDesktopMenu);
@@ -1486,6 +1490,10 @@
void Karamba::slotDesktopChanged(int desktop)
{
+ if (d->globalView) {
+ return;
+ }
+
QList<QAction*> actions = d->toDesktopMenu->actions();
for (int i = 0; i < actions.count(); i++) {
@@ -1495,12 +1503,10 @@
actions[i]->setChecked(false);
}
- if (!d->globalView) {
- if (desktop) {
- d->info->setDesktop(desktop);
- } else {
- d->info->setDesktop(NETWinInfo::OnAllDesktops);
- }
+ if (desktop) {
+ d->info->setDesktop(desktop);
+ } else {
+ d->info->setDesktop(NETWinInfo::OnAllDesktops);
}
}
@@ -1604,7 +1610,7 @@
int index = d->menuList.indexOf(menu);
d->menuList.takeAt(index);
- delete menu;
+ menu->deleteLater();
}
void Karamba::deleteMenuItem(QAction *action)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/superkaramba/src/superkaramba.desktop new/kdeutils-3.96.1/superkaramba/src/superkaramba.desktop
--- old/kdeutils-3.96.0/superkaramba/src/superkaramba.desktop 2007-11-14 01:26:29.000000000 +0100
+++ new/kdeutils-3.96.1/superkaramba/src/superkaramba.desktop 2007-11-20 23:00:53.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=SuperKaramba
Name[ar]=سوبركارامبا
Name[is]=SúperKaramba
@@ -97,7 +96,7 @@
GenericName[x-test]=xxDesktop Widgetsxx
GenericName[zh_CN]=桌面部件
GenericName[zh_TW]=桌面元件
-DocPath=superkaramba/index.html
+X-DocPath=superkaramba/index.html
Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;
OnlyShowIn=KDE;
X-DBUS-StartupType=Unique
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.0/sweeper/sweeper.desktop new/kdeutils-3.96.1/sweeper/sweeper.desktop
--- old/kdeutils-3.96.0/sweeper/sweeper.desktop 2007-10-23 10:37:05.000000000 +0200
+++ new/kdeutils-3.96.1/sweeper/sweeper.desktop 2007-11-20 23:00:50.000000000 +0100
@@ -1,6 +1,5 @@
[Desktop Entry]
-Encoding=UTF-8
-DocPath=sweeper/index.html
+X-DocPath=sweeper/index.html
Icon=trashcan_empty
Exec=sweeper
Type=Application
@@ -12,6 +11,7 @@
Name[ar]=الكناس
Name[fa]=جارو
Name[it]=Spazzino
+Name[nds]=Leuwagen
Name[ne]=स्वीपर
Name[pa]=ਸਵੀਪਰ
Name[pt_BR]=Limpador
@@ -34,6 +34,7 @@
GenericName[it]=Pulizia del sistema e riservatezza dei dati
GenericName[ja]=システムクリーナー
GenericName[ko]=시스템 청소기
+GenericName[nds]=Systeemreenmaken
GenericName[ne]=प्रणाली क्लीनर
GenericName[nl]=Systeemopruiming
GenericName[pa]=ਸਿਸਟਮ ਕਲੀਨਰ
++++++ workaround-compiler-bugs.diff ++++++
--- khexedit/gui/kdatacolumn.cpp
+++ khexedit/gui/kdatacolumn.cpp
@@ -599,7 +599,7 @@ void KDataColumn::paintCursor( QPainter
void KDataColumn::drawByte( QPainter *P, char /*Byte*/, KHECore::KChar ByteChar, const QColor &Color ) const
{
P->setPen( Color );
- P->drawText( 0, DigitBaseLine, ByteChar );
+ P->drawText( 0, DigitBaseLine, (QChar) ByteChar );
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
[View Less]
1
0
Hello community,
here is the log from the commit of package kdetoys4
checked in at Wed Nov 28 23:33:41 CET 2007.
--------
--- KDE/kdetoys4/kdetoys4.changes 2007-11-14 17:37:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdetoys4/kdetoys4.changes 2007-11-21 18:58:29.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 21 18:58:29 CET 2007 - dmueller(a)suse.de
+
+- update to 3.96.1
+
+-------------------------------------------------------------------
Old:
----
kdetoys-3.96.0.tar.bz2
New:
----
…
[View More]kdetoys-3.96.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdetoys4.spec ++++++
--- /var/tmp/diff_new_pack.I21778/_old 2007-11-28 23:31:40.000000000 +0100
+++ /var/tmp/diff_new_pack.I21778/_new 2007-11-28 23:31:40.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdetoys4 (Version 3.96.0)
+# spec file for package kdetoys4 (Version 3.96.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,9 +15,9 @@
Group: System/GUI/KDE
Summary: Kdetoys Base Package
Url: http://www.kde.org
-Version: 3.96.0
+Version: 3.96.1
Release: 1
-%define rversion 3.96.0
+%define rversion 3.96.1
Source0: kdetoys-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -227,7 +227,10 @@
%files -f filelists/exclude
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
+
%changelog
+* Wed Nov 21 2007 - dmueller(a)suse.de
+- update to 3.96.1
* Wed Nov 14 2007 - dmueller(a)suse.de
- update to 3.96.0
* Wed Nov 07 2007 - dmueller(a)suse.de
++++++ kdetoys-3.96.0.tar.bz2 -> kdetoys-3.96.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/amor/amor.desktop new/kdetoys-3.96.1/amor/amor.desktop
--- old/kdetoys-3.96.0/amor/amor.desktop 2007-10-03 13:10:19.000000000 +0200
+++ new/kdetoys-3.96.1/amor/amor.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=AMOR
Name[af]=Amor
Name[bg]=Amor
Files old/kdetoys-3.96.0/doc/amor/index.cache.bz2 and new/kdetoys-3.96.1/doc/amor/index.cache.bz2 differ
Files old/kdetoys-3.96.0/doc/kmoon/index.cache.bz2 and new/kdetoys-3.96.1/doc/kmoon/index.cache.bz2 differ
Files old/kdetoys-3.96.0/doc/kteatime/index.cache.bz2 and new/kdetoys-3.96.1/doc/kteatime/index.cache.bz2 differ
Files old/kdetoys-3.96.0/doc/kweather/index.cache.bz2 and new/kdetoys-3.96.1/doc/kweather/index.cache.bz2 differ
Files old/kdetoys-3.96.0/doc/kworldclock/index.cache.bz2 and new/kdetoys-3.96.1/doc/kworldclock/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/eyesapplet/eyesapplet.desktop new/kdetoys-3.96.1/eyesapplet/eyesapplet.desktop
--- old/kdetoys-3.96.0/eyesapplet/eyesapplet.desktop 2007-11-14 01:25:52.000000000 +0100
+++ new/kdetoys-3.96.1/eyesapplet/eyesapplet.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Plugin
-Encoding=UTF-8
Name=Eyes
Name[af]=Oë
Name[be]=Вочы
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/fifteenapplet/kfifteenapplet.desktop new/kdetoys-3.96.1/fifteenapplet/kfifteenapplet.desktop
--- old/kdetoys-3.96.0/fifteenapplet/kfifteenapplet.desktop 2007-10-03 13:10:19.000000000 +0200
+++ new/kdetoys-3.96.1/fifteenapplet/kfifteenapplet.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Plugin
-Encoding=UTF-8
Name=Fifteen Pieces
Name[af]=Vyftien Dele
Name[be]=Пятнаццаць чарапкоў
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kmoon/kmoonapplet.desktop new/kdetoys-3.96.1/kmoon/kmoonapplet.desktop
--- old/kdetoys-3.96.0/kmoon/kmoonapplet.desktop 2007-11-14 01:25:51.000000000 +0100
+++ new/kdetoys-3.96.1/kmoon/kmoonapplet.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Plugin
-Encoding=UTF-8
Icon=kmoon
Name=Moon Phase Display
Name[be]=Фаза луны
@@ -56,4 +55,4 @@
Comment[zh_TW]=KDE 月亮圓缺小程式
X-KDE-Library=kmoon_panelapplet
X-KDE-UniqueApplet=true
-DocPath=kmoon/index.html
+X-DocPath=kmoon/index.html
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kteatime/kteatime.desktop new/kdetoys-3.96.1/kteatime/kteatime.desktop
--- old/kdetoys-3.96.0/kteatime/kteatime.desktop 2007-10-03 13:10:19.000000000 +0200
+++ new/kdetoys-3.96.1/kteatime/kteatime.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=KTeaTime
Name[hr]=KVrijeme za čaj
Name[mk]=КЧајник
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/ktux/ktux.desktop new/kdetoys-3.96.1/ktux/ktux.desktop
--- old/kdetoys-3.96.0/ktux/ktux.desktop 2007-11-14 01:25:52.000000000 +0100
+++ new/kdetoys-3.96.1/ktux/ktux.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=KTux
Name[af]=Ktux
Name[bg]=Тюкс
@@ -12,7 +11,7 @@
Exec=ktux -caption "%c"
Icon=ktux
Type=Service
-ServiceTypes=ScreenSaver
+X-KDE-ServiceTypes=ScreenSaver
Actions=Setup;InWindow;Root;
X-KDE-Category=Flying Things
Terminal=false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kweather/kcmweather.desktop new/kdetoys-3.96.1/kweather/kcmweather.desktop
--- old/kdetoys-3.96.0/kweather/kcmweather.desktop 2007-11-14 01:25:52.000000000 +0100
+++ new/kdetoys-3.96.1/kweather/kcmweather.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,8 +1,7 @@
[Desktop Entry]
-Encoding=UTF-8
Icon=configure
Type=Service
-ServiceTypes=KCModule
+X-KDE-ServiceTypes=KCModule
X-KDE-ModuleType=Library
X-KDE-Library=kcm_weather
@@ -115,51 +114,51 @@
Comment[x-test]=xxDisplay Setupxx
Comment[zh_CN]=显示设置
Comment[zh_TW]=顯示設定
-Keywords=kweather, weather, configure, settings, display
-Keywords[bg]=Keywords=време, метеорологично, метеорология, показване, състояние, доклад, kweather, weather, configure, settings, display
-Keywords[br]=kweather, amzer, kefluniañ, dibarzhoù, diskwel
-Keywords[ca]=kweather, temps, configuració, paràmetres, pantalla
-Keywords[cs]=kweather,počasí,nastavení,zobrazení
-Keywords[cy]=kweather, ktywydd, tywydd, ffurfweddu, gosodiadau, ymddangosiad
-Keywords[da]=kweather, vejr, indstil, opsætning, visning
-Keywords[de]=kweather, kwetter, wetter, einrichten, einstellungen, anzeige
-Keywords[el]=kweather, καιρός, ρύθμιση, ρυθμίσεις, εμφάνιση
-Keywords[es]=kweather, clima, configurar, parámetros, visualización
-Keywords[et]=kweather, ilm, seadistamine, seadistused, vaade
-Keywords[eu]=kweather, eguraldia, configuratu, ezarpenak, pantaila
-Keywords[fa]=kweather، آب و هوا، پیکربندی، تنظیمات، نمایش
-Keywords[fi]=kweather, sää, aseta, asetukset, näyttö
-Keywords[fr]=kweather, temps, configurer, affichage, météo
-Keywords[ga]=kweather, aimsir, cumraigh, socruithe, taispeáint
-Keywords[gl]=kweather, clima, configurar, axustes, mostrar
-Keywords[he]=kweather, weather, configure, settings, display, מזג אוויר, הגדרות, הגדרות, תצוגה
-Keywords[hr]=kweather, weather service, configure, settings, prikazivanje, podešavanje, postavke, meteorologija, vrijeme, meteorološki izvještaj, prognoza, prikaz, kvrijeme
-Keywords[hu]=kweather,időjárás,beállítás,konfiguráció,képernyő
-Keywords[it]=kweather,tempo,meteo,configurazione,impostazioni,visualizzazione
-Keywords[ja]=kweather, 気象, 設定, 設定, 表示
-Keywords[km]=kweather, អាកាសធាតុ, កំណត់រចនាសម្ព័ន្ធ, ការកំណត់, បង្ហាញ
-Keywords[ko]=kweather, 날씨, 설정, 표시
-Keywords[lv]=kweather, laikapstākļi, konfigurēt, uzstādījumi, displejs
-Keywords[mk]=kweather, weather, configure, settings, display, време, конфигурација, поставувања, приказ
-Keywords[nb]=kweather, vær, oppsett, innstillinger, visning
-Keywords[nds]=kweather, kweder, weder, instellen, setten, Schirm
-Keywords[ne]=केमौसम, मौसम, कन्फिगर, सेटिङ, प्रदर्शन
-Keywords[nl]=kweather,weerbericht,configureren,instellen,display
-Keywords[nn]=kweather,vêr,oppsett,innstillingar,vising
-Keywords[pl]=kweather, pogoda, konfiguruj, konfiguracja, ustawienia, wyświetlanie
-Keywords[pt]=kweather, tempo, meteorologia, configurar, configuração, aparência
-Keywords[pt_BR]=kweather, tempo, configurar,configurações,tela
-Keywords[ro]=kweather,meteo,configurare,setări,ecran
-Keywords[ru]=kweather, weather, configure, settings, display, настройка, погода
-Keywords[sl]=kweather,kvreme,vreme,nastavi,prikaz
-Keywords[sr]=kweather, weather service, configure, settings, подеси, подешавања, поставке, прогноза, време, временска прогноза, приказ
-Keywords[sr@latin]=kweather, weather service, configure, settings, podesi, podešavanja, postavke, prognoza, vreme, vremenska prognoza, prikaz
-Keywords[sv]=kweather,väder,anpassa,inställningar,visning
-Keywords[ta]= k வானிலை, வானிலை, உள்ளமை,அமைப்புகள், காட்சி
-Keywords[tg]=kҳаво, ҳаво, дигаргуниҳо, танзимотҳо, намоиш
-Keywords[tr]=kweather, hava, ayar, seçenek, görünüm
-Keywords[uk]=kweather, погода, налаштування, установки, дисплей
-Keywords[wa]=kweather, meteyo, tins, apontyî, apontiaedjes, håyner, håynaedje
-Keywords[x-test]=xxkweather, weather, configure, settings, displayxx
-Keywords[zh_CN]=kweather, weather, configure, settings, display, 天气, 配置, 设置, 显示
-DocPath=kweather?anchor=configuring-kweather
+X-KDE-Keywords=kweather, weather, configure, settings, display
+X-KDE-Keywords[bg]=Keywords=време, метеорологично, метеорология, показване, състояние, доклад, kweather, weather, configure, settings, display
+X-KDE-Keywords[br]=kweather, amzer, kefluniañ, dibarzhoù, diskwel
+X-KDE-Keywords[ca]=kweather, temps, configuració, paràmetres, pantalla
+X-KDE-Keywords[cs]=kweather,počasí,nastavení,zobrazení
+X-KDE-Keywords[cy]=kweather, ktywydd, tywydd, ffurfweddu, gosodiadau, ymddangosiad
+X-KDE-Keywords[da]=kweather, vejr, indstil, opsætning, visning
+X-KDE-Keywords[de]=kweather, kwetter, wetter, einrichten, einstellungen, anzeige
+X-KDE-Keywords[el]=kweather, καιρός, ρύθμιση, ρυθμίσεις, εμφάνιση
+X-KDE-Keywords[es]=kweather, clima, configurar, parámetros, visualización
+X-KDE-Keywords[et]=kweather, ilm, seadistamine, seadistused, vaade
+X-KDE-Keywords[eu]=kweather, eguraldia, configuratu, ezarpenak, pantaila
+X-KDE-Keywords[fa]=kweather، آب و هوا، پیکربندی، تنظیمات، نمایش
+X-KDE-Keywords[fi]=kweather, sää, aseta, asetukset, näyttö
+X-KDE-Keywords[fr]=kweather, temps, configurer, affichage, météo
+X-KDE-Keywords[ga]=kweather, aimsir, cumraigh, socruithe, taispeáint
+X-KDE-Keywords[gl]=kweather, clima, configurar, axustes, mostrar
+X-KDE-Keywords[he]=kweather, weather, configure, settings, display, מזג אוויר, הגדרות, הגדרות, תצוגה
+X-KDE-Keywords[hr]=kweather, weather service, configure, settings, prikazivanje, podešavanje, postavke, meteorologija, vrijeme, meteorološki izvještaj, prognoza, prikaz, kvrijeme
+X-KDE-Keywords[hu]=kweather,időjárás,beállítás,konfiguráció,képernyő
+X-KDE-Keywords[it]=kweather,tempo,meteo,configurazione,impostazioni,visualizzazione
+X-KDE-Keywords[ja]=kweather, 気象, 設定, 設定, 表示
+X-KDE-Keywords[km]=kweather, អាកាសធាតុ, កំណត់រចនាសម្ព័ន្ធ, ការកំណត់, បង្ហាញ
+X-KDE-Keywords[ko]=kweather, 날씨, 설정, 표시
+X-KDE-Keywords[lv]=kweather, laikapstākļi, konfigurēt, uzstādījumi, displejs
+X-KDE-Keywords[mk]=kweather, weather, configure, settings, display, време, конфигурација, поставувања, приказ
+X-KDE-Keywords[nb]=kweather, vær, oppsett, innstillinger, visning
+X-KDE-Keywords[nds]=kweather, kweder, weder, instellen, setten, Schirm
+X-KDE-Keywords[ne]=केमौसम, मौसम, कन्फिगर, सेटिङ, प्रदर्शन
+X-KDE-Keywords[nl]=kweather,weerbericht,configureren,instellen,display
+X-KDE-Keywords[nn]=kweather,vêr,oppsett,innstillingar,vising
+X-KDE-Keywords[pl]=kweather, pogoda, konfiguruj, konfiguracja, ustawienia, wyświetlanie
+X-KDE-Keywords[pt]=kweather, tempo, meteorologia, configurar, configuração, aparência
+X-KDE-Keywords[pt_BR]=kweather, tempo, configurar,configurações,tela
+X-KDE-Keywords[ro]=kweather,meteo,configurare,setări,ecran
+X-KDE-Keywords[ru]=kweather, weather, configure, settings, display, настройка, погода
+X-KDE-Keywords[sl]=kweather,kvreme,vreme,nastavi,prikaz
+X-KDE-Keywords[sr]=kweather, weather service, configure, settings, подеси, подешавања, поставке, прогноза, време, временска прогноза, приказ
+X-KDE-Keywords[sr@latin]=kweather, weather service, configure, settings, podesi, podešavanja, postavke, prognoza, vreme, vremenska prognoza, prikaz
+X-KDE-Keywords[sv]=kweather,väder,anpassa,inställningar,visning
+X-KDE-Keywords[ta]= k வானிலை, வானிலை, உள்ளமை,அமைப்புகள், காட்சி
+X-KDE-Keywords[tg]=kҳаво, ҳаво, дигаргуниҳо, танзимотҳо, намоиш
+X-KDE-Keywords[tr]=kweather, hava, ayar, seçenek, görünüm
+X-KDE-Keywords[uk]=kweather, погода, налаштування, установки, дисплей
+X-KDE-Keywords[wa]=kweather, meteyo, tins, apontyî, apontiaedjes, håyner, håynaedje
+X-KDE-Keywords[x-test]=xxkweather, weather, configure, settings, displayxx
+X-KDE-Keywords[zh_CN]=kweather, weather, configure, settings, display, 天气, 配置, 设置, 显示
+X-DocPath=kweather?anchor=configuring-kweather
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kweather/kcmweatherservice.desktop new/kdetoys-3.96.1/kweather/kcmweatherservice.desktop
--- old/kdetoys-3.96.0/kweather/kcmweatherservice.desktop 2007-10-08 09:44:07.000000000 +0200
+++ new/kdetoys-3.96.1/kweather/kcmweatherservice.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,8 +1,7 @@
[Desktop Entry]
-Encoding=UTF-8
Icon=kweather
Type=Service
-ServiceTypes=KCModule
+X-KDE-ServiceTypes=KCModule
X-KDE-ModuleType=Library
X-KDE-Library=kcm_weatherservice
@@ -117,51 +116,51 @@
Comment[x-test]=xxWeather Service Setupxx
Comment[zh_CN]=气象服务设置
Comment[zh_TW]=氣象服務設定
-Keywords=kweather, weather service, configure, settings
-Keywords[bg]=Keywords=време, метеорологично, метеорология, показване, състояние, доклад, kweather, weather service, configure, settings
-Keywords[ca]=kweather, servei meteorològic, configuració, paràmetres
-Keywords[cs]=kweather,služba počasí,nastavení
-Keywords[cy]=kweather, ktywydd, tywydd, ffurfweddu, gosodiadau
-Keywords[da]=kweather, vejrtjeneste, indstilling, opsætning
-Keywords[de]=kweather, kwetter, wetterdienst, einrichten, einstellungen
-Keywords[el]=kweather, υπηρεσία καιρού, ρύθμιση, ρυθμίσεις
-Keywords[es]=kweather, servicio de meteorología, configurar, parámetros
-Keywords[et]=kweather, ilmateenistus, seadistamine, seadistused
-Keywords[eu]=kweather,eguraldi serbitzua, konfiguratu, ezarpenak
-Keywords[fa]=kweather، خدمت آب و هوا، پیکربندی، تنظیمات
-Keywords[fi]=kweather, sääpalvelu, aseta, asetukset
-Keywords[fr]=kweather, weather service, configurer, réglages
-Keywords[ga]=kweather, seirbhís aimsire, cumraigh, socruithe
-Keywords[gl]=kweather, servizo meteorolóxico, configurar, axustes
-Keywords[he]=kweather, weather service, configure, settings, שרות ה־DCOP של kweather, הגדרות, הגדרות, שרות ה-DCOP של kweather
-Keywords[hr]=kweather, weather service, configure, settings, podesi, podešavanja, postavke, meteorologija, vrijeme, vremenska prognoza, meteorološki izvještaj
-Keywords[hu]=kweather,időjárás-előrejelzés,beállítás,konfiguráció
-Keywords[it]=kweather,servizio meteorologico,meteo,configurazione,impostazioni
-Keywords[ja]=kweather, 気象サービス, 設定, 設定
-Keywords[km]=kweather, សេវាអាកាសធាតុ, កំណត់រចនាសម្ព័ន្ធ, ការកំណត់
-Keywords[ko]=kweather, 날씨 서비스, 설정
-Keywords[lv]=kweather, laikapstākļu serviss, konfigurēt, uzstādījumi
-Keywords[mk]=kweather, weather service, configure, settings, сервис за време, конфигурација, поставувања
-Keywords[nb]=kweather, værtjeneste, oppsett, innstillinger
-Keywords[nds]=KWeather, KWeder, Wederdeenst, Instellen
-Keywords[ne]=केमौसम, मौसम सेवा, कन्फिगर, सेटिङ
-Keywords[nl]=kweather,weerberichten,instellen,configureren
-Keywords[nn]=kweather,vêrteneste,oppsett,innstillingar
-Keywords[pl]=kweather, ustawienia, konfiguruj, konfiguracja, serwis pogodowy
-Keywords[pt]=kweather, serviço meteorológico, configurar, configuração
-Keywords[pt_BR]=kweather, serviço de tempo, configurar,configurações
-Keywords[ro]=kweather,serviciu,meteo,configurare,setări
-Keywords[ru]=kweather, weather service, configure, settings, настройки, погода
-Keywords[sl]=kweather,kvreme,vreme,nastavi,storit
-Keywords[sr]=kweather, weather service, configure, settings, подеси, подешавања, поставке, прогноза, време, временска прогноза
-Keywords[sr@latin]=kweather, weather service, configure, settings, podesi, podešavanja, postavke, prognoza, vreme, vremenska prognoza
-Keywords[sv]=kweather,väderlekstjänst,anpassa,inställningar
-Keywords[ta]=k வானிலை, வானிலை சேவை, உள்ளமை,அமைப்புகள்
-Keywords[tg]=kҳаво, хизмати ҳаво, дигаргуниҳо, танзимотҳо
-Keywords[tr]=kweather, hava servisi, ayar, seçenek
-Keywords[uk]=kweather, служба погоди, налаштування, установки
-Keywords[uz]=kweather, об-ҳаво хизмати, мослаш, мосламалар
-Keywords[wa]=kweather, meteyo, tins, siervice meteyo, apontyî, apontiaedjes
-Keywords[x-test]=xxkweather, weather service, configure, settingsxx
-Keywords[zh_CN]=kweather, weather service, configure, settings, 气象服务, 配置, 设置
-DocPath=kweather?anchor=weather-service
+X-KDE-Keywords=kweather, weather service, configure, settings
+X-KDE-Keywords[bg]=Keywords=време, метеорологично, метеорология, показване, състояние, доклад, kweather, weather service, configure, settings
+X-KDE-Keywords[ca]=kweather, servei meteorològic, configuració, paràmetres
+X-KDE-Keywords[cs]=kweather,služba počasí,nastavení
+X-KDE-Keywords[cy]=kweather, ktywydd, tywydd, ffurfweddu, gosodiadau
+X-KDE-Keywords[da]=kweather, vejrtjeneste, indstilling, opsætning
+X-KDE-Keywords[de]=kweather, kwetter, wetterdienst, einrichten, einstellungen
+X-KDE-Keywords[el]=kweather, υπηρεσία καιρού, ρύθμιση, ρυθμίσεις
+X-KDE-Keywords[es]=kweather, servicio de meteorología, configurar, parámetros
+X-KDE-Keywords[et]=kweather, ilmateenistus, seadistamine, seadistused
+X-KDE-Keywords[eu]=kweather,eguraldi serbitzua, konfiguratu, ezarpenak
+X-KDE-Keywords[fa]=kweather، خدمت آب و هوا، پیکربندی، تنظیمات
+X-KDE-Keywords[fi]=kweather, sääpalvelu, aseta, asetukset
+X-KDE-Keywords[fr]=kweather, weather service, configurer, réglages
+X-KDE-Keywords[ga]=kweather, seirbhís aimsire, cumraigh, socruithe
+X-KDE-Keywords[gl]=kweather, servizo meteorolóxico, configurar, axustes
+X-KDE-Keywords[he]=kweather, weather service, configure, settings, שרות ה־DCOP של kweather, הגדרות, הגדרות, שרות ה-DCOP של kweather
+X-KDE-Keywords[hr]=kweather, weather service, configure, settings, podesi, podešavanja, postavke, meteorologija, vrijeme, vremenska prognoza, meteorološki izvještaj
+X-KDE-Keywords[hu]=kweather,időjárás-előrejelzés,beállítás,konfiguráció
+X-KDE-Keywords[it]=kweather,servizio meteorologico,meteo,configurazione,impostazioni
+X-KDE-Keywords[ja]=kweather, 気象サービス, 設定, 設定
+X-KDE-Keywords[km]=kweather, សេវាអាកាសធាតុ, កំណត់រចនាសម្ព័ន្ធ, ការកំណត់
+X-KDE-Keywords[ko]=kweather, 날씨 서비스, 설정
+X-KDE-Keywords[lv]=kweather, laikapstākļu serviss, konfigurēt, uzstādījumi
+X-KDE-Keywords[mk]=kweather, weather service, configure, settings, сервис за време, конфигурација, поставувања
+X-KDE-Keywords[nb]=kweather, værtjeneste, oppsett, innstillinger
+X-KDE-Keywords[nds]=KWeather, KWeder, Wederdeenst, Instellen
+X-KDE-Keywords[ne]=केमौसम, मौसम सेवा, कन्फिगर, सेटिङ
+X-KDE-Keywords[nl]=kweather,weerberichten,instellen,configureren
+X-KDE-Keywords[nn]=kweather,vêrteneste,oppsett,innstillingar
+X-KDE-Keywords[pl]=kweather, ustawienia, konfiguruj, konfiguracja, serwis pogodowy
+X-KDE-Keywords[pt]=kweather, serviço meteorológico, configurar, configuração
+X-KDE-Keywords[pt_BR]=kweather, serviço de tempo, configurar,configurações
+X-KDE-Keywords[ro]=kweather,serviciu,meteo,configurare,setări
+X-KDE-Keywords[ru]=kweather, weather service, configure, settings, настройки, погода
+X-KDE-Keywords[sl]=kweather,kvreme,vreme,nastavi,storit
+X-KDE-Keywords[sr]=kweather, weather service, configure, settings, подеси, подешавања, поставке, прогноза, време, временска прогноза
+X-KDE-Keywords[sr@latin]=kweather, weather service, configure, settings, podesi, podešavanja, postavke, prognoza, vreme, vremenska prognoza
+X-KDE-Keywords[sv]=kweather,väderlekstjänst,anpassa,inställningar
+X-KDE-Keywords[ta]=k வானிலை, வானிலை சேவை, உள்ளமை,அமைப்புகள்
+X-KDE-Keywords[tg]=kҳаво, хизмати ҳаво, дигаргуниҳо, танзимотҳо
+X-KDE-Keywords[tr]=kweather, hava servisi, ayar, seçenek
+X-KDE-Keywords[uk]=kweather, служба погоди, налаштування, установки
+X-KDE-Keywords[uz]=kweather, об-ҳаво хизмати, мослаш, мосламалар
+X-KDE-Keywords[wa]=kweather, meteyo, tins, siervice meteyo, apontyî, apontiaedjes
+X-KDE-Keywords[x-test]=xxkweather, weather service, configure, settingsxx
+X-KDE-Keywords[zh_CN]=kweather, weather service, configure, settings, 气象服务, 配置, 设置
+X-DocPath=kweather?anchor=weather-service
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kweather/kweather.desktop new/kdetoys-3.96.1/kweather/kweather.desktop
--- old/kdetoys-3.96.0/kweather/kweather.desktop 2007-11-14 01:25:52.000000000 +0100
+++ new/kdetoys-3.96.1/kweather/kweather.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Plugin
-Encoding=UTF-8
Comment=A weather reporting panel applet
Comment[be]=Аплет, які паказвае прагноз надвор'я
Comment[bg]=Аплет за времето
@@ -78,6 +77,6 @@
Name[zh_CN]=气象报告
Name[zh_TW]=氣象報告
Icon=kweather
-DocPath=kweather/index.html
+X-DocPath=kweather/index.html
X-KDE-Library=weather_panelapplet
X-KDE-UniqueApplet=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kweather/kweatherreport.desktop new/kdetoys-3.96.1/kweather/kweatherreport.desktop
--- old/kdetoys-3.96.0/kweather/kweatherreport.desktop 2007-02-19 11:01:47.000000000 +0100
+++ new/kdetoys-3.96.1/kweather/kweatherreport.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,9 +1,7 @@
[Desktop Entry]
-Encoding=UTF-8
Exec=kweatherreport
Icon=kweatherreport
MimeType=
-Path=
Terminal=false
Type=Application
X-KDE-SubstituteUID=false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kweather/kweatherservice.desktop new/kdetoys-3.96.1/kweather/kweatherservice.desktop
--- old/kdetoys-3.96.0/kweather/kweatherservice.desktop 2007-11-14 01:25:52.000000000 +0100
+++ new/kdetoys-3.96.1/kweather/kweatherservice.desktop 2007-11-22 18:16:23.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=KWeatherService
Name[ca]=Servei KTemps
@@ -37,7 +36,7 @@
Comment[ca]=Un servei D-Bus per proporcionar dades del temps
Comment[cs]=Služba DBUS poskytující údaje o počasí.
Comment[de]=D-Bus-Dienst für Wetterdaten
-Comment[el]=Μια υπηρεσία D-Bus που προσφέρει μετεωρολογικά δεδομένα.
+Comment[el]=Μια υπηρεσία D-Bus που προσφέρει μετεωρολογικά δεδομένα
Comment[et]=D-Busi teenus ilmaandmete esitamiseks.
Comment[fa]=یک خدمت D-Bus رای فراهم کردن دادههای آب و هوا
Comment[ga]= Seirbhís DCOP chun faisnéis aimsire a chur ar fáil
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kweather/weatherbar_add.desktop new/kdetoys-3.96.1/kweather/weatherbar_add.desktop
--- old/kdetoys-3.96.0/kweather/weatherbar_add.desktop 2007-10-03 13:10:19.000000000 +0200
+++ new/kdetoys-3.96.1/kweather/weatherbar_add.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Link
URL=
Icon=weather_sidebar
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kweather/weatherbar.desktop new/kdetoys-3.96.1/kweather/weatherbar.desktop
--- old/kdetoys-3.96.0/kweather/weatherbar.desktop 2007-10-03 13:10:19.000000000 +0200
+++ new/kdetoys-3.96.1/kweather/weatherbar.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Link
URL=
Icon=weather_sidebar
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kworldwatch/kworldclock.desktop new/kdetoys-3.96.1/kworldwatch/kworldclock.desktop
--- old/kdetoys-3.96.0/kworldwatch/kworldclock.desktop 2007-10-03 13:10:19.000000000 +0200
+++ new/kdetoys-3.96.1/kworldwatch/kworldclock.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=KWorldClock
Name[de]=Weltzeituhr
Name[el]=Παγκόσμιο ρολόι
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.0/kworldwatch/kwwapplet.desktop new/kdetoys-3.96.1/kworldwatch/kwwapplet.desktop
--- old/kdetoys-3.96.0/kworldwatch/kwwapplet.desktop 2007-10-03 13:10:19.000000000 +0200
+++ new/kdetoys-3.96.1/kworldwatch/kwwapplet.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Plugin
Icon=kworldclock
Name=World Wide Watch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
[View Less]
1
0
Hello community,
here is the log from the commit of package kdesdk4
checked in at Wed Nov 28 23:31:33 CET 2007.
--------
--- KDE/kdesdk4/kdesdk4.changes 2007-11-14 17:37:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdesdk4/kdesdk4.changes 2007-11-21 18:58:20.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 21 18:58:20 CET 2007 - dmueller(a)suse.de
+
+- update to 3.96.1
+
+-------------------------------------------------------------------
Old:
----
kdesdk-3.96.0.tar.bz2
New:
----
kdesdk-…
[View More]3.96.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdesdk4.spec ++++++
--- /var/tmp/diff_new_pack.b20322/_old 2007-11-28 23:31:09.000000000 +0100
+++ /var/tmp/diff_new_pack.b20322/_new 2007-11-28 23:31:09.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdesdk4 (Version 3.96.0)
+# spec file for package kdesdk4 (Version 3.96.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,9 +15,9 @@
Group: System/GUI/KDE
Summary: KDE SDK Package
Url: http://www.kde.org/
-Version: 3.96.0
+Version: 3.96.1
Release: 1
-%define rversion 3.96.0
+%define rversion 3.96.1
Source0: kdesdk-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -179,7 +179,6 @@
--------
The KDE Team <kde(a)kde.org>
-
%files -n kde4-kate-devel -f filelists/kate.devel
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
@@ -414,7 +413,10 @@
/usr/%_lib/strigi/strigita_ts.so
/usr/%_lib/strigi/strigila_diff.so
/usr/include/kprofilemethod.h
+
%changelog
+* Wed Nov 21 2007 - dmueller(a)suse.de
+- update to 3.96.1
* Wed Nov 14 2007 - dmueller(a)suse.de
- update to 3.96.0
* Wed Nov 07 2007 - dmueller(a)suse.de
++++++ kdesdk-3.96.0.tar.bz2 -> kdesdk-3.96.1.tar.bz2 ++++++
++++ 2247 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
[View Less]
1
0
Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Wed Nov 28 23:31:00 CET 2007.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2007-11-14 17:37:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2007-11-21 18:58:12.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 21 18:58:12 CET 2007 - dmueller(a)suse.de
+
+- update to 3.96.1
+
+-------------------------------------------------------------------
Old:
----
kdepimlibs-3.96.0.tar.…
[View More]bz2
New:
----
kdepimlibs-3.96.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.p19420/_old 2007-11-28 23:30:18.000000000 +0100
+++ /var/tmp/diff_new_pack.p19420/_new 2007-11-28 23:30:18.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 3.96.0)
+# spec file for package kdepimlibs4 (Version 3.96.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,9 +15,9 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
Url: http://www.kde.org
-Version: 3.96.0
+Version: 3.96.1
Release: 1
-%define rversion 3.96.0
+%define rversion 3.96.1
Source0: kdepimlibs-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -110,7 +110,6 @@
--------
The KDE Team <kde(a)kde.org>
-
%files -n libkdepimlibs4-devel
%defattr(-,root,root)
%doc COPYING COPYING.BSD COPYING.LIB
@@ -136,9 +135,9 @@
%endif
%_libdir/libkpimidentities.so
%_libdir/libqgpgme.so
-%dir %_libdir/Gpgmepp
-%_libdir/Gpgmepp/GpgmeppConfig.cmake
-%_libdir/Gpgmepp/GpgmeppLibraryDepends.cmake
+%dir %_libdir/gpgmepp
+%_libdir/gpgmepp/GpgmeppConfig.cmake
+%_libdir/gpgmepp/GpgmeppLibraryDepends.cmake
%files
%defattr(-,root,root)
@@ -151,7 +150,10 @@
%_kde_share_dir/servicetypes
%_kde_share_dir/config.kcfg/pimemoticons.kcfg
%_kde_share_dir/config.kcfg/mailtransport.kcfg
+
%changelog
+* Wed Nov 21 2007 - dmueller(a)suse.de
+- update to 3.96.1
* Wed Nov 14 2007 - dmueller(a)suse.de
- update to 3.96.0
* Tue Nov 06 2007 - dmueller(a)suse.de
++++++ kdepimlibs-3.96.0.tar.bz2 -> kdepimlibs-3.96.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/gpgme++/CMakeLists.txt new/kdepimlibs-3.96.1/gpgme++/CMakeLists.txt
--- old/kdepimlibs-3.96.0/gpgme++/CMakeLists.txt 2007-10-16 16:49:25.000000000 +0200
+++ new/kdepimlibs-3.96.1/gpgme++/CMakeLists.txt 2007-11-20 23:00:44.000000000 +0100
@@ -38,11 +38,7 @@
OUTPUT_NAME gpgme++
)
get_target_property( GPGMEPP_VANILLA_LIBRARY gpgmepp LOCATION )
- install(TARGETS gpgmepp
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
+ install(TARGETS gpgmepp DESTINATION ${LIB_INSTALL_DIR} )
endif ( GPGME_VANILLA_FOUND )
if ( GPGME_GLIB_FOUND )
@@ -54,11 +50,7 @@
OUTPUT_NAME gpgme++-glib DEFINE_SYMBOL MAKE_GPGME___LIB
)
get_target_property( GPGMEPP_GLIB_LIBRARY gpgmepp LOCATION )
- install(TARGETS gpgmepp-glib
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
+ install(TARGETS gpgmepp-glib DESTINATION ${LIB_INSTALL_DIR} )
endif ( GPGME_GLIB_FOUND )
if ( GPGME_QT_FOUND )
@@ -70,11 +62,7 @@
OUTPUT_NAME gpgme++-qt DEFINE_SYMBOL MAKE_GPGME___LIB
)
get_target_property( GPGMEPP_QT_LIBRARY gpgmepp LOCATION )
- install(TARGETS gpgmepp-qt
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
+ install(TARGETS gpgmepp-qt DESTINATION ${LIB_INSTALL_DIR})
endif ( GPGME_QT_FOUND )
if ( GPGME_PTHREAD_FOUND )
@@ -86,11 +74,7 @@
OUTPUT_NAME gpgme++-pthread DEFINE_SYMBOL MAKE_GPGME___LIB
)
get_target_property( GPGMEPP_PTHREAD_LIBRARY gpgmepp LOCATION )
- install(TARGETS gpgmepp-pthread
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
+ install(TARGETS gpgmepp-pthread DESTINATION ${LIB_INSTALL_DIR} )
endif ( GPGME_PTHREAD_FOUND )
if ( GPGME_PTH_FOUND )
@@ -102,11 +86,7 @@
OUTPUT_NAME gpgme++-pth DEFINE_SYMBOL MAKE_GPGME___LIB
)
get_target_property( GPGMEPP_PTH_LIBRARY gpgmepp LOCATION )
- install(TARGETS gpgmepp-pth
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
+ install(TARGETS gpgmepp-pth DESTINATION ${LIB_INSTALL_DIR} )
endif ( GPGME_PTH_FOUND )
@@ -138,6 +118,6 @@
${CMAKE_CURRENT_BINARY_DIR}/GpgmeppConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/GpgmeppLibraryDepends.cmake
DESTINATION
- ${LIB_INSTALL_DIR}/Gpgmepp )
+ ${LIB_INSTALL_DIR}/gpgmepp )
endif ( GPGME_FOUND )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/addresseehelper.cpp new/kdepimlibs-3.96.1/kabc/addresseehelper.cpp
--- old/kdepimlibs-3.96.0/kabc/addresseehelper.cpp 2007-10-08 09:43:53.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/addresseehelper.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -45,7 +45,7 @@
{
initSettings();
- QDBusConnection::sessionBus().connect( QString(), QString(),
+ QDBusConnection::sessionBus().connect( QString(), "/KABC",
"org.kde.kabc.AddressBookConfig", "changed",
this, SLOT(initSettings()));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/errorhandler.cpp new/kdepimlibs-3.96.1/kabc/errorhandler.cpp
--- old/kdepimlibs-3.96.0/kabc/errorhandler.cpp 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/errorhandler.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -46,7 +46,7 @@
void ConsoleErrorHandler::error( const QString &msg )
{
// no debug area is ok here
- kError() << msg;
+ kError(5700) << msg;
}
class GuiErrorHandler::Private
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/formatfactory.cpp new/kdepimlibs-3.96.1/kabc/formatfactory.cpp
--- old/kdepimlibs-3.96.0/kabc/formatfactory.cpp 2007-10-25 11:32:03.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/formatfactory.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -60,14 +60,14 @@
QString path = KLibLoader::findLibrary( libName );
if ( path.isEmpty() ) {
- kDebug( 5700 ) << "No format plugin library was found!";
+ kDebug(5700) << "No format plugin library was found!";
return 0;
}
library = KLibLoader::self()->library( path );
if ( !library ) {
- kDebug( 5700 ) << "Could not load library '" << libName << "'";
+ kDebug(5700) << "Could not load library '" << libName << "'";
return 0;
}
@@ -187,7 +187,7 @@
format->setNameLabel( fi.nameLabel );
format->setDescriptionLabel( fi.descriptionLabel );
} else {
- kDebug( 5700 ) << "'" << libName << "' is not a format plugin.";
+ kDebug(5700) << "'" << libName << "' is not a format plugin.";
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/formats/binary.desktop new/kdepimlibs-3.96.1/kabc/formats/binary.desktop
--- old/kdepimlibs-3.96.0/kabc/formats/binary.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/kabc/formats/binary.desktop 2007-11-20 23:00:45.000000000 +0100
@@ -7,6 +7,7 @@
Name[de]=Binär
Name[el]=Δυαδικό
Name[es]=Binario
+Name[et]=Binaar
Name[ga]=Dénártha
Name[hu]=Bináris
Name[ja]=バイナリ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/formats/binaryformat.cpp new/kdepimlibs-3.96.1/kabc/formats/binaryformat.cpp
--- old/kdepimlibs-3.96.0/kabc/formats/binaryformat.cpp 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/formats/binaryformat.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -57,7 +57,7 @@
return true;
}
-bool BinaryFormat::loadAll( AddressBook*, Resource *resource, QFile *file )
+bool BinaryFormat::loadAll( AddressBook *, Resource *resource, QFile *file )
{
kDebug(5700) << "BinaryFormat::loadAll()";
@@ -95,7 +95,7 @@
saveAddressee( addressee, stream );
}
-void BinaryFormat::saveAll( AddressBook*, Resource *resource, QFile *file )
+void BinaryFormat::saveAll( AddressBook *, Resource *resource, QFile *file )
{
kDebug(5700) << "BinaryFormat::saveAll()";
@@ -136,17 +136,17 @@
QFile *file = dynamic_cast<QFile*>( stream.device() );
if ( !file ) {
- kError() << i18n( "Not a file?" );
+ kError(5700) << i18n( "Not a file?" );
return false;
}
if ( magic != 0x2e93e ) {
- kError() << i18n( "File '%1' is not binary format.", file->fileName() );
+ kError(5700) << i18n( "File '%1' is not binary format.", file->fileName() );
return false;
}
if ( version != BINARY_FORMAT_VERSION ) {
- kError() << i18n( "File '%1' is the wrong version.", file->fileName() );
+ kError(5700) << i18n( "File '%1' is the wrong version.", file->fileName() );
return false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/kabc_manager.desktop new/kdepimlibs-3.96.1/kabc/kabc_manager.desktop
--- old/kdepimlibs-3.96.0/kabc/kabc_manager.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/kabc/kabc_manager.desktop 2007-11-20 23:00:45.000000000 +0100
@@ -8,6 +8,7 @@
Name[de]=Kontakte
Name[el]=Επαφές
Name[es]=Contactos
+Name[et]=Kontaktid
Name[ga]=Teagmhálacha
Name[hu]=Partnerek
Name[ja]=コンタクト
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/ldifconverter.cpp new/kdepimlibs-3.96.1/kabc/ldifconverter.cpp
--- old/kdepimlibs-3.96.0/kabc/ldifconverter.cpp 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/ldifconverter.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -147,10 +147,11 @@
ldif_out( t, "organizationname", addr.organization() );
// Compatibility with older kabc versions.
- if ( !addr.department().isEmpty() )
+ if ( !addr.department().isEmpty() ) {
ldif_out( t, "department", addr.department() );
- else
- ldif_out( t, "department", addr.custom("KADDRESSBOOK", "X-Department") );
+ } else {
+ ldif_out( t, "department", addr.custom( "KADDRESSBOOK", "X-Department" ) );
+ }
ldif_out( t, "workurl", addr.url().prettyUrl() );
ldif_out( t, "homeurl", addr.url().prettyUrl() );
@@ -506,7 +507,7 @@
return true;
}
- kWarning() << QString( "LDIFConverter: Unknown field for '%1': '%2=%3'\n" ).
+ kWarning(5700) << QString( "LDIFConverter: Unknown field for '%1': '%2=%3'\n" ).
arg( a.formattedName() ).arg( fieldname ).arg( value );
return true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/locknull.cpp new/kdepimlibs-3.96.1/kabc/locknull.cpp
--- old/kdepimlibs-3.96.0/kabc/locknull.cpp 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/locknull.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -55,7 +55,7 @@
return false;
}
- kWarning() << "LockNull::lock() force success. Doesn't actually lock.";
+ kWarning(5700) << "LockNull::lock() force success. Doesn't actually lock.";
emit locked();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/plugins/dir/dir.desktop new/kdepimlibs-3.96.1/kabc/plugins/dir/dir.desktop
--- old/kdepimlibs-3.96.0/kabc/plugins/dir/dir.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/kabc/plugins/dir/dir.desktop 2007-11-20 23:00:45.000000000 +0100
@@ -7,6 +7,7 @@
Name[de]=Ordner
Name[el]=Κατάλογος
Name[es]=Directorio
+Name[et]=Kataloog
Name[ga]=Eolaire
Name[hu]=Könyvtár
Name[ja]=ディレクトリ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/plugins/file/file.desktop new/kdepimlibs-3.96.1/kabc/plugins/file/file.desktop
--- old/kdepimlibs-3.96.0/kabc/plugins/file/file.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/kabc/plugins/file/file.desktop 2007-11-20 23:00:45.000000000 +0100
@@ -7,6 +7,7 @@
Name[de]=Datei
Name[el]=Αρχείο
Name[es]=Archivo
+Name[et]=Fail
Name[ga]=Comhad
Name[hu]=Fájl
Name[ja]=ファイル
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/plugins/ldapkio/resourceldapkioconfig.cpp new/kdepimlibs-3.96.1/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
--- old/kdepimlibs-3.96.0/kabc/plugins/ldapkio/resourceldapkioconfig.cpp 2007-10-16 16:49:25.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/plugins/ldapkio/resourceldapkioconfig.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -296,7 +296,7 @@
i = 0;
j = 2;
}
- kDebug(7125) << "itkey:" << it.key() << "i:" << i;
+ kDebug(5700) << "itkey:" << it.key() << "i:" << i;
label = new QLabel( mNameDict[ it.key() ] + ':', page );
KLineEdit *lineedit = new KLineEdit( page );
mLineEditDict.insert( it.key(), lineedit );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/plugins/ldapkio/resourceldapkio.cpp new/kdepimlibs-3.96.1/kabc/plugins/ldapkio/resourceldapkio.cpp
--- old/kdepimlibs-3.96.0/kabc/plugins/ldapkio/resourceldapkio.cpp 2007-10-08 09:43:52.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/plugins/ldapkio/resourceldapkio.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -152,7 +152,7 @@
eventLoop.exec( QEventLoop::ExcludeUserInputEvents );
}
-void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list )
+void ResourceLDAPKIO::entries( KIO::Job *, const KIO::UDSEntryList &list )
{
KIO::UDSEntryList::ConstIterator it = list.begin();
KIO::UDSEntryList::ConstIterator end = list.end();
@@ -161,7 +161,7 @@
if ( !urlStr.isEmpty() ) {
KUrl tmpurl( urlStr );
d->mResultDn = tmpurl.path();
- kDebug(7125) << "findUid():" << d->mResultDn;
+ kDebug(5700) << "findUid():" << d->mResultDn;
if ( d->mResultDn.startsWith( '/' ) ) {
d->mResultDn.remove( 0, 1 );
}
@@ -193,7 +193,7 @@
url.setFilter( '(' + mAttributes[ "uid" ] + '=' + uid + ')' + mFilter );
url.setExtension( "x-dir", "one" );
- kDebug(7125) << "ResourceLDAPKIO::findUid() uid:" << uid << "url" <<
+ kDebug(5700) << "ResourceLDAPKIO::findUid() uid:" << uid << "url" <<
url.prettyUrl();
KIO::ListJob *listJob = KIO::listDir( url, KIO::HideProgressInfo );
@@ -346,7 +346,7 @@
}
tmp += '\n';
- kDebug(7125) << "ldif:" << QString::fromUtf8( tmp );
+ kDebug(5700) << "ldif:" << QString::fromUtf8( tmp );
ldif = tmp;
return true;
}
@@ -485,7 +485,7 @@
d->mReadOnly = readOnly();
- kDebug(7125) << "resource_ldapkio url:" << d->mLDAPUrl.prettyUrl();
+ kDebug(5700) << "resource_ldapkio url:" << d->mLDAPUrl.prettyUrl();
}
void ResourceLDAPKIO::writeConfig( KConfigGroup &group )
@@ -525,7 +525,7 @@
Ticket *ResourceLDAPKIO::requestSaveTicket()
{
if ( !addressBook() ) {
- kDebug(7125) << "no addressbook";
+ kDebug(5700) << "no addressbook";
return 0;
}
@@ -592,7 +592,7 @@
bool ResourceLDAPKIO::load()
{
- kDebug(7125) << "ResourceLDAPKIO::load()";
+ kDebug(5700) << "ResourceLDAPKIO::load()";
KIO::Job *job;
clear();
@@ -622,10 +622,10 @@
d->enter_loop();
}
if ( d->mErrorMsg.isEmpty() ) {
- kDebug(7125) << "ResourceLDAPKIO load ok!";
+ kDebug(5700) << "ResourceLDAPKIO load ok!";
return true;
} else {
- kDebug(7125) << "ResourceLDAPKIO load finished with error:" << d->mErrorMsg;
+ kDebug(5700) << "ResourceLDAPKIO load finished with error:" << d->mErrorMsg;
addressBook()->error( d->mErrorMsg );
return false;
}
@@ -674,7 +674,7 @@
ret = d->mLdif.nextItem();
switch ( ret ) {
case KLDAP::Ldif::NewEntry:
- kDebug(7125) << "new entry:" << d->mLdif.dn().toString();
+ kDebug(5700) << "new entry:" << d->mLdif.dn().toString();
break;
case KLDAP::Ldif::Item:
name = d->mLdif.attr().toLower();
@@ -805,7 +805,7 @@
bool ResourceLDAPKIO::save( Ticket *ticket )
{
Q_UNUSED( ticket );
- kDebug(7125) << "ResourceLDAPKIO save";
+ kDebug(5700) << "ResourceLDAPKIO save";
d->mSaveIt = begin();
KIO::Job *job = KIO::put( d->mLDAPUrl, -1, KIO::Overwrite | KIO::HideProgressInfo );
@@ -815,10 +815,10 @@
this, SLOT( syncLoadSaveResult( KJob* ) ) );
d->enter_loop();
if ( d->mErrorMsg.isEmpty() ) {
- kDebug(7125) << "ResourceLDAPKIO save ok!";
+ kDebug(5700) << "ResourceLDAPKIO save ok!";
return true;
} else {
- kDebug(7125) << "ResourceLDAPKIO finished with error:" << d->mErrorMsg;
+ kDebug(5700) << "ResourceLDAPKIO finished with error:" << d->mErrorMsg;
addressBook()->error( d->mErrorMsg );
return false;
}
@@ -827,7 +827,7 @@
bool ResourceLDAPKIO::asyncSave( Ticket *ticket )
{
Q_UNUSED( ticket );
- kDebug(7125) << "ResourceLDAPKIO asyncSave";
+ kDebug(5700) << "ResourceLDAPKIO asyncSave";
d->mSaveIt = begin();
KIO::Job *job = KIO::put( d->mLDAPUrl, -1, KIO::Overwrite | KIO::HideProgressInfo );
connect( job, SIGNAL( dataReq( KIO::Job*, QByteArray& ) ),
@@ -868,15 +868,15 @@
}
if ( d->mSaveIt == end() ) {
- kDebug(7125) << "ResourceLDAPKIO endData";
+ kDebug(5700) << "ResourceLDAPKIO endData";
data.resize( 0 );
return;
}
- kDebug(7125) << "ResourceLDAPKIO saveData:" << (*d->mSaveIt).assembledName();
+ kDebug(5700) << "ResourceLDAPKIO saveData:" << (*d->mSaveIt).assembledName();
d->AddresseeToLDIF( data, *d->mSaveIt, d->findUid( (*d->mSaveIt).uid() ) );
-// kDebug(7125) << "ResourceLDAPKIO save LDIF:" << QString::fromUtf8(data);
+// kDebug(5700) << "ResourceLDAPKIO save LDIF:" << QString::fromUtf8(data);
// mark as unchanged
(*d->mSaveIt).setChanged( false );
@@ -887,14 +887,14 @@
{
QString dn = d->findUid( addr.uid() );
- kDebug(7125) << "ResourceLDAPKIO: removeAddressee:" << dn;
+ kDebug(5700) << "ResourceLDAPKIO: removeAddressee:" << dn;
if ( !d->mErrorMsg.isEmpty() ) {
addressBook()->error( d->mErrorMsg );
return;
}
if ( !dn.isEmpty() ) {
- kDebug(7125) << "ResourceLDAPKIO: found uid:" << dn;
+ kDebug(5700) << "ResourceLDAPKIO: found uid:" << dn;
KLDAP::LdapUrl url( d->mLDAPUrl );
url.setPath( '/' + dn );
url.setExtension( "x-dir", "base" );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/plugins/net/net.desktop new/kdepimlibs-3.96.1/kabc/plugins/net/net.desktop
--- old/kdepimlibs-3.96.0/kabc/plugins/net/net.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/kabc/plugins/net/net.desktop 2007-11-20 23:00:45.000000000 +0100
@@ -7,6 +7,7 @@
Name[de]=Netzwerk
Name[el]=Δίκτυο
Name[es]=Red
+Name[et]=Võrk
Name[ga]=Líonra
Name[hu]=Hálózat
Name[ja]=ネットワーク
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/resourcecached.cpp new/kdepimlibs-3.96.1/kabc/resourcecached.cpp
--- old/kdepimlibs-3.96.0/kabc/resourcecached.cpp 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/resourcecached.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -59,7 +59,7 @@
file.remove();
} else {
if ( !file.open( QIODevice::WriteOnly ) ) {
- kError() << "Can't open changes cache file '" << file.fileName() << "' for saving.";
+ kError(5700) << "Can't open changes cache file '" << file.fileName() << "' for saving.";
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kblog/Mainpage.dox new/kdepimlibs-3.96.1/kblog/Mainpage.dox
--- old/kdepimlibs-3.96.0/kblog/Mainpage.dox 2007-10-03 13:30:06.000000000 +0200
+++ new/kdepimlibs-3.96.1/kblog/Mainpage.dox 2007-11-22 18:15:38.000000000 +0100
@@ -32,3 +32,4 @@
*/
// DOXYGEN_PROJECTNAME=KBlog Client Library
+// DOXYGEN_EXCLUDE=livejournal.*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kcal/kcal_manager.desktop new/kdepimlibs-3.96.1/kcal/kcal_manager.desktop
--- old/kdepimlibs-3.96.0/kcal/kcal_manager.desktop 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.1/kcal/kcal_manager.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -7,6 +7,7 @@
Name[de]=Kalender
Name[el]=Ημερολόγιο
Name[es]=Calendario
+Name[et]=Kalender
Name[fr]=Calendrier
Name[ga]=Féilire
Name[hu]=Naptár
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kcal/local.desktop new/kdepimlibs-3.96.1/kcal/local.desktop
--- old/kdepimlibs-3.96.0/kcal/local.desktop 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.1/kcal/local.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -6,6 +6,7 @@
Name[de]=Kalender in lokaler Datei
Name[el]=Ημερολόγιο σε τοπικό αρχείο
Name[es]=Calendario en archivo local
+Name[et]=Kalender kohalikus failis
Name[fr]=Calendrier dans un fichier local
Name[ga]=Féilire i gComhad Logánta
Name[hu]=Helyi naptárfájl
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kcal/localdir.desktop new/kdepimlibs-3.96.1/kcal/localdir.desktop
--- old/kdepimlibs-3.96.0/kcal/localdir.desktop 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.1/kcal/localdir.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -6,6 +6,7 @@
Name[de]=Kalender in lokalem Ordner
Name[el]=Ημερολόγιο σε τοπικό κατάλογο
Name[es]=Calendario en directorio local
+Name[et]=Kalender kohalikus kataloogis
Name[fr]=Calendrier dans un dossier local
Name[ga]=Féilire i gComhadlann Logánta
Name[hu]=Naptár helyi könyvtárban
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kioslave/sieve/sieve.protocol new/kdepimlibs-3.96.1/kioslave/sieve/sieve.protocol
--- old/kdepimlibs-3.96.0/kioslave/sieve/sieve.protocol 2007-10-31 21:36:03.000000000 +0100
+++ new/kdepimlibs-3.96.1/kioslave/sieve/sieve.protocol 2007-11-20 23:00:44.000000000 +0100
@@ -16,6 +16,7 @@
Description[de]=Ein Ein-/Ausgabemodul für das Mailfilter-Protokoll Sieve
Description[el]=Ένα ioslave για το πρωτόκολλο φιλτραρίσματος αλληλογραφίας Sieve
Description[es]=Un esclavo de E/S para el protocolo de filtrado de correo Sieve
+Description[et]=Sieve kirjade filtreerimise protokolli IO-moodul
Description[fr]=Un ioslave pour le protocole de filtrage de messagerie Sieve
Description[ga]=ioslave le haghaidh prótacail scagtha ríomhphoist Sieve
Description[hu]=KDE-protokoll a Sieve levélszűrő protokollhoz
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kresources/kresources.desktop new/kdepimlibs-3.96.1/kresources/kresources.desktop
--- old/kdepimlibs-3.96.0/kresources/kresources.desktop 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.1/kresources/kresources.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -15,6 +15,7 @@
Name[de]=KDE-Ressourcen
Name[el]=Πόροι του KDE
Name[es]=Recursos KDE
+Name[et]=KDE ressursid
Name[ga]=Acmhainní KDE
Name[hu]=KDE-erőforrások
Name[ja]=KDE リソース
@@ -37,6 +38,7 @@
Comment[de]=KDE-Ressourcen einrichten
Comment[el]=Ρύθμιση πόρων του KDE
Comment[es]=Configurar recursos de KDE
+Comment[et]=KDE ressursside seadistamine
Comment[ga]=Cumraigh Acmhainní KDE
Comment[hu]=A KDE-erőforrások beállítása
Comment[ja]=KDE リソースの設定
@@ -56,9 +58,11 @@
Keywords[de]=Ressourcen,Konnector-Ressource,Kontakt-Ressource,Kalender-Ressource,Notizen-Ressource,Alarm-Ressource,Imap
Keywords[el]=πόροι,πόροι του konnector,πόρος επαφής,πόρος ημερολογίου,πόρος σημειώσεων,πόρος ειδοποίησης,imap
Keywords[es]=recursos,recursos de konnector,recursos de contacto,recursos de calendario,recursos de notas,recurso de alarma,imap
+Keywords[et]=ressursid,konnektori ressurss,kontakti ressurss,kalendri ressurss,märkmete ressurss,häire ressurss,imap
Keywords[ga]=acmhainní,acmhainn konnector,acmhainn teagmhála,acmhainn fhéilire,acmhainn nótaí,acmhainn aláraim,imap
Keywords[hu]=erőforrások,Konnector-erőforrás,névjegy,naptár,feljegyzés,emlékeztető,imap
Keywords[ja]=リソース,konnector resource, コネクターリソース,コンタクトリソース,カレンダーリソース, メモリソース,アラームリソースimap
+Keywords[nds]=Ressourcen,konnector-Ressource,Kontakt-Ressource,Kalenner-Ressource,Notiz-Ressource,Alarm-Ressource,IMAP
Keywords[nl]=hulpbronnen,konnector-hulpbron,contactpersoonhulpbron,agendahulpbron,notitiehulpbron,herinneringhulpbron,imap
Keywords[pt]=recursos,recurso do konector,recurso de contactos,recurso de calendário,recurso de notas,recurso de alarme,imap
Keywords[sv]=resurser,konnector-resurs,kontaktresurs,kalenderresurs,anteckningsresurs,alarmresurs,IMAP
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kresources/kresources_manager.desktop new/kdepimlibs-3.96.1/kresources/kresources_manager.desktop
--- old/kdepimlibs-3.96.0/kresources/kresources_manager.desktop 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.1/kresources/kresources_manager.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -7,6 +7,7 @@
Comment[de]=KResource-Manager
Comment[el]=Διαχειριστής KResource
Comment[es]=Administrador KResource
+Comment[et]=KDE ressursside haldur
Comment[ga]=Bainisteoir KResource
Comment[hu]=Erőforráskezelő
Comment[ja]=K リソースマネージャ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kresources/kresources_plugin.desktop new/kdepimlibs-3.96.1/kresources/kresources_plugin.desktop
--- old/kdepimlibs-3.96.0/kresources/kresources_plugin.desktop 2007-10-23 10:36:59.000000000 +0200
+++ new/kdepimlibs-3.96.1/kresources/kresources_plugin.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -7,6 +7,7 @@
Comment[de]=Modul für KResource-Framework
Comment[el]=Μικροεφαρμογή πλαισίου εργασίας του KResource
Comment[es]=Extensión de estructura KResource
+Comment[et]=KDE ressursside raamistiku plugin
Comment[ga]=Breiseán Creatlaí KResource
Comment[hu]=Modul a KResource keretrendszerhez
Comment[ja]=K リソース・フレームワーク・プラグイン
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/mailtransport/kcm_mailtransport.desktop new/kdepimlibs-3.96.1/mailtransport/kcm_mailtransport.desktop
--- old/kdepimlibs-3.96.0/mailtransport/kcm_mailtransport.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/mailtransport/kcm_mailtransport.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -19,9 +19,11 @@
Name[de]=Versandart
Name[el]=Κύριος μεταφορέας
Name[es]=Transporte de correo
+Name[et]=Kirja saatmise viis
Name[ga]=Iompar Ríomhphoist
Name[hu]=Levéltovábbítás
Name[ja]=メール送信方法
+Name[nds]=Överdreegmetood
Name[nl]=E-mailtransport
Name[pt]=Transporte de Correio
Name[sl]=Prenos pošte
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/mailtransport/smtpsettings.ui new/kdepimlibs-3.96.1/mailtransport/smtpsettings.ui
--- old/kdepimlibs-3.96.0/mailtransport/smtpsettings.ui 2007-08-29 11:51:23.000000000 +0200
+++ new/kdepimlibs-3.96.1/mailtransport/smtpsettings.ui 2007-11-20 23:00:44.000000000 +0100
@@ -6,27 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
- <width>417</width>
- <height>488</height>
+ <width>425</width>
+ <height>472</height>
</rect>
</property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <item>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
<widget class="QLabel" name="titleLabel" >
<property name="font" >
<font>
@@ -39,10 +24,10 @@
</property>
</widget>
</item>
- <item>
+ <item row="1" column="0" >
<widget class="KSeparator" name="kseparator" />
</item>
- <item>
+ <item row="2" column="0" colspan="2" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
@@ -53,121 +38,137 @@
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" >
- <widget class="QLabel" name="nameLabel" >
- <property name="text" >
- <string>&Name:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>kcfg_name</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2" >
- <widget class="KLineEdit" name="kcfg_name" />
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="nameLabel" >
+ <property name="text" >
+ <string>&Name:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>kcfg_name</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="KLineEdit" name="kcfg_name" />
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="hostLabel" >
+ <property name="text" >
+ <string>&Host:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>kcfg_host</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="KLineEdit" name="kcfg_host" />
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="portLabel" >
+ <property name="text" >
+ <string>&Port:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>kcfg_port</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="KIntNumInput" name="kcfg_port" >
+ <property name="value" >
+ <number>25</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>231</width>
+ <height>23</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
</item>
<item row="1" column="0" >
- <widget class="QLabel" name="hostLabel" >
- <property name="text" >
- <string>&Host:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>kcfg_host</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2" >
- <widget class="KLineEdit" name="kcfg_host" />
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="KButtonGroup" name="kcfg_encryption" >
+ <property name="title" >
+ <string>Encryption</string>
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QRadioButton" name="none" >
+ <property name="text" >
+ <string>&None</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="ssl" >
+ <property name="text" >
+ <string>&SSL</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="tls" >
+ <property name="text" >
+ <string>&TLS</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0" >
+ <widget class="KPushButton" name="checkCapabilities" >
+ <property name="text" >
+ <string>Check &What the Server Supports</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
<item row="2" column="0" >
- <widget class="QLabel" name="portLabel" >
- <property name="text" >
- <string>&Port:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>kcfg_port</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="KIntNumInput" name="kcfg_port" >
- <property name="value" >
- <number>25</number>
- </property>
- <property name="minimum" >
- <number>0</number>
- </property>
- <property name="maximum" >
- <number>65536</number>
- </property>
- </widget>
- </item>
- <item row="2" column="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="1" colspan="2" >
- <widget class="KButtonGroup" name="kcfg_encryption" >
- <property name="title" >
- <string>Encryption</string>
- </property>
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QRadioButton" name="none" >
- <property name="text" >
- <string>&None</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="ssl" >
- <property name="text" >
- <string>&SSL</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="tls" >
- <property name="text" >
- <string>&TLS</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="4" column="0" colspan="2" >
- <widget class="QProgressBar" name="checkCapabilitiesProgress" >
- <property name="visible" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="4" column="2" >
- <widget class="KPushButton" name="checkCapabilities" >
- <property name="text" >
- <string>Check &What the Server Supports</string>
- </property>
- </widget>
- </item>
- <item row="5" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -175,12 +176,25 @@
<property name="sizeHint" >
<size>
<width>20</width>
- <height>111</height>
+ <height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
+ <widget class="QProgressBar" name="checkCapabilitiesProgress" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
+ <property name="visible" >
+ <bool>false</bool>
+ </property>
+ </widget>
</widget>
<widget class="QWidget" name="advancedTab" >
<attribute name="title" >
@@ -188,161 +202,147 @@
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="noAuthPossible" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="visible" >
- <bool>false</bool>
- </property>
- <property name="frameShape" >
- <enum>QFrame::Box</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Raised</enum>
- </property>
- <property name="text" >
- <string>This server does not support authentication</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="2" >
<widget class="QCheckBox" name="kcfg_requiresAuthentication" >
<property name="text" >
<string>Server &requires authentication</string>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="usernameLabel" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>&Login:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>kcfg_userName</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="KLineEdit" name="kcfg_userName" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="passwordLabel" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>P&assword:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>password</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="KLineEdit" name="password" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="whatsThis" >
- <string>The password to send to the server for authorization.</string>
- </property>
- <property name="echoMode" >
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="QCheckBox" name="kcfg_storePassword" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>&Store SMTP password</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1" >
- <widget class="KButtonGroup" name="kcfg_authenticationType" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="title" >
- <string>Authentication Method</string>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QRadioButton" name="login" >
- <property name="text" >
- <string>&LOGIN</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QRadioButton" name="plain" >
- <property name="text" >
- <string>&PLAIN</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QRadioButton" name="crammd5" >
- <property name="text" >
- <string>CRAM-MD&5</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QRadioButton" name="digestmd5" >
- <property name="text" >
- <string>&DIGEST-MD5</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QRadioButton" name="gssapi" >
- <property name="text" >
- <string>&GSSAPI</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QRadioButton" name="ntlm" >
- <property name="text" >
- <string>&NTLM</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ <item row="1" column="0" colspan="2" >
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="usernameLabel" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>&Login:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>kcfg_userName</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="KLineEdit" name="kcfg_userName" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="passwordLabel" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>P&assword:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>password</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="KLineEdit" name="password" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="whatsThis" >
+ <string>The password to send to the server for authorization.</string>
+ </property>
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QCheckBox" name="kcfg_storePassword" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>&Store SMTP password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="KButtonGroup" name="kcfg_authenticationType" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="title" >
+ <string>Authentication Method</string>
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QRadioButton" name="login" >
+ <property name="text" >
+ <string>&LOGIN</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QRadioButton" name="plain" >
+ <property name="text" >
+ <string>&PLAIN</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QRadioButton" name="crammd5" >
+ <property name="text" >
+ <string>CRAM-MD&5</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QRadioButton" name="digestmd5" >
+ <property name="text" >
+ <string>&DIGEST-MD5</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QRadioButton" name="gssapi" >
+ <property name="text" >
+ <string>&GSSAPI</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QRadioButton" name="ntlm" >
+ <property name="text" >
+ <string>&NTLM</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="6" column="0" colspan="2" >
+ <item row="2" column="0" colspan="2" >
<widget class="KSeparator" name="kseparator_3" />
</item>
- <item row="7" column="0" colspan="2" >
+ <item row="3" column="0" colspan="2" >
<widget class="QCheckBox" name="kcfg_specifyHostname" >
<property name="text" >
<string>Sen&d custom hostname to server</string>
</property>
</widget>
</item>
- <item row="8" column="0" >
+ <item row="4" column="0" >
<widget class="QLabel" name="hostnameLabel" >
<property name="enabled" >
<bool>false</bool>
@@ -358,17 +358,17 @@
</property>
</widget>
</item>
- <item row="8" column="1" >
+ <item row="4" column="1" >
<widget class="KLineEdit" name="kcfg_localHostname" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
- <item row="9" column="0" colspan="2" >
+ <item row="5" column="0" colspan="2" >
<widget class="KSeparator" name="kseparator_2" />
</item>
- <item row="10" column="0" >
+ <item row="6" column="0" >
<widget class="QLabel" name="precommandLabel" >
<property name="text" >
<string>Precommand:</string>
@@ -378,23 +378,38 @@
</property>
</widget>
</item>
- <item row="10" column="1" >
+ <item row="6" column="1" >
<widget class="KLineEdit" name="kcfg_precommand" />
</item>
- <item row="11" column="1" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>214</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
+ <widget class="QLabel" name="noAuthPossible" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
+ <property name="visible" >
+ <bool>false</bool>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Raised</enum>
+ </property>
+ <property name="text" >
+ <string>This server does not support authentication</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
</widget>
</widget>
</item>
@@ -433,7 +448,6 @@
<tabstop>tabWidget</tabstop>
<tabstop>kcfg_name</tabstop>
<tabstop>kcfg_host</tabstop>
- <tabstop>kcfg_port</tabstop>
</tabstops>
<resources/>
<connections>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
[View Less]
1
0
Hello community,
here is the log from the commit of package kdenetwork4
checked in at Wed Nov 28 23:30:09 CET 2007.
--------
--- KDE/kdenetwork4/kdenetwork4.changes 2007-11-14 17:36:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes 2007-11-21 18:57:42.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 21 18:57:42 CET 2007 - dmueller(a)suse.de
+
+- update to 3.96.1
+
+-------------------------------------------------------------------
Old:
----
dont-install-Variants.…
[View More]diff
kdenetwork-3.96.0.tar.bz2
New:
----
kdenetwork-3.96.1.tar.bz2
r738934.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdenetwork4.spec ++++++
--- /var/tmp/diff_new_pack.z17585/_old 2007-11-28 23:29:15.000000000 +0100
+++ /var/tmp/diff_new_pack.z17585/_new 2007-11-28 23:29:15.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdenetwork4 (Version 3.96.0)
+# spec file for package kdenetwork4 (Version 3.96.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,16 +16,16 @@
Group: Productivity/Networking/Other
Summary: KDE Network Base Package
Url: http://www.kde.org
-Version: 3.96.0
+Version: 3.96.1
Release: 1
-%define rversion 3.96.0
+%define rversion 3.96.1
Source0: kdenetwork-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdebase4-runtime
Patch2: desktop-files.diff
Patch4: FIXME.diff
-Patch5: dont-install-Variants.diff
+Patch6: r738934.diff
%define with_kopete 1
Suggests: kde4-kget
%if %with_kopete
@@ -53,7 +53,7 @@
%setup -q -n kdenetwork-%rversion
%patch2
#%patch4
-%patch5
+%patch6 -R
%build
%cmake_kde4 -d build
@@ -146,7 +146,6 @@
--------
The KDE Team <kde(a)kde.org>
-
%files -n kde4-kopete-devel -f filelists/kopete.devel
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
@@ -359,7 +358,10 @@
%files -f filelists/exclude
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
+
%changelog
+* Wed Nov 21 2007 - dmueller(a)suse.de
+- update to 3.96.1
* Wed Nov 14 2007 - dmueller(a)suse.de
- update to 3.96.0
* Wed Nov 07 2007 - dmueller(a)suse.de
++++++ desktop-files.diff ++++++
--- /var/tmp/diff_new_pack.z17585/_old 2007-11-28 23:29:15.000000000 +0100
+++ /var/tmp/diff_new_pack.z17585/_new 2007-11-28 23:29:15.000000000 +0100
@@ -1,9 +1,8 @@
--- kget/desktop/kget.desktop
+++ kget/desktop/kget.desktop
-@@ -3,7 +3,6 @@
- Encoding=UTF-8
+@@ -4,6 +4,5 @@
Type=Application
- Exec=kget -caption "%c" %i %m
+ Exec=kget -caption "%c" %i
-Icon=kget
Terminal=false
Name=KGet
++++++ kdenetwork-3.96.0.tar.bz2 -> kdenetwork-3.96.1.tar.bz2 ++++++
KDE/kdenetwork4/kdenetwork-3.96.0.tar.bz2 /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork-3.96.1.tar.bz2 differ: byte 11, line 1
++++++ r738934.diff ++++++
Index: kget/plasma/applet/errorgraph.cpp
===================================================================
--- kget/plasma/applet/errorgraph.cpp (revision 738933)
+++ kget/plasma/applet/errorgraph.cpp (revision 738934)
@@ -23,7 +23,7 @@
#include <plasma/widgets/icon.h>
#include <plasma/widgets/label.h>
-#include <plasma/widgets/boxlayout.h>
+#include <plasma/layouts/boxlayout.h>
#include <plasma/widgets/pushbutton.h>
#include <KIcon>
@@ -41,9 +41,12 @@
m_launchButton = new Plasma::PushButton(KIcon("kget"), "Launch KGet", m_applet);
//m_layout->addItem(m_errorLabel);
- m_layout->addItem(m_launchButton);
+ //m_layout->addItem(m_launchButton);
+ m_applet->updateGeometry();
+ m_errorLabel->updateGeometry();
+
connect(m_launchButton, SIGNAL(clicked()), SLOT(launchKGet()));
}
Index: kget/plasma/applet/barchart.cpp
===================================================================
--- kget/plasma/applet/barchart.cpp (revision 738933)
+++ kget/plasma/applet/barchart.cpp (revision 738934)
@@ -22,7 +22,7 @@
#include "transfergraph.h"
#include <plasma/widgets/label.h>
-#include <plasma/widgets/boxlayout.h>
+#include <plasma/layouts/boxlayout.h>
#include <plasma/widgets/progressbar.h>
//#include <plasma/widgets/layoutanimator.h>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
[View Less]
1
0
Hello community,
here is the log from the commit of package kdemultimedia4
checked in at Wed Nov 28 23:29:03 CET 2007.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2007-11-14 17:36:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2007-11-21 18:57:35.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 21 18:57:35 CET 2007 - dmueller(a)suse.de
+
+- update to 3.96.1
+
+-------------------------------------------------------------------
Old:
----
…
[View More]kdemultimedia-3.96.0.tar.bz2
New:
----
kdemultimedia-3.96.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.Q15446/_old 2007-11-28 23:28:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Q15446/_new 2007-11-28 23:28:31.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdemultimedia4 (Version 3.96.0)
+# spec file for package kdemultimedia4 (Version 3.96.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,9 +17,9 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 3.96.0
+Version: 3.96.1
Release: 1
-%define rversion 3.96.0
+%define rversion 3.96.1
Source0: kdemultimedia-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -214,7 +214,6 @@
--------
The KDE Team <kde(a)kde.org>
-
%files -n libkcddb4-devel -f filelists/libkcddb.devel
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
@@ -258,7 +257,6 @@
--------
The KDE Team <kde(a)kde.org>
-
%files -n libkcompactdisc4-devel -f filelists/libkcompactdisc.devel
%defattr(-,root,root)
%doc COPYING COPYING-DOCS
@@ -318,7 +316,10 @@
%files -f filelists/exclude
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
+
%changelog
+* Wed Nov 21 2007 - dmueller(a)suse.de
+- update to 3.96.1
* Wed Nov 14 2007 - dmueller(a)suse.de
- update to 3.96.0
* Wed Nov 07 2007 - dmueller(a)suse.de
++++++ kdemultimedia-3.96.0.tar.bz2 -> kdemultimedia-3.96.1.tar.bz2 ++++++
Files old/kdemultimedia-3.96.0/doc/juk/index.cache.bz2 and new/kdemultimedia-3.96.1/doc/juk/index.cache.bz2 differ
Files old/kdemultimedia-3.96.0/doc/kmix/index.cache.bz2 and new/kdemultimedia-3.96.1/doc/kmix/index.cache.bz2 differ
Files old/kdemultimedia-3.96.0/doc/kscd/index.cache.bz2 and new/kdemultimedia-3.96.1/doc/kscd/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/juk/juk.cpp new/kdemultimedia-3.96.1/juk/juk.cpp
--- old/kdemultimedia-3.96.0/juk/juk.cpp 2007-10-31 21:42:30.000000000 +0100
+++ new/kdemultimedia-3.96.1/juk/juk.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -256,7 +256,7 @@
act = new KToggleAction(i18n("Save &Play Queue on Exit"), collection);
collection->addAction("saveUpcomingTracks", act);
- connect(m_toggleSystemTrayAction, SIGNAL(toggled(bool)),
+ connect(m_toggleSystemTrayAction, SIGNAL(triggered(bool)),
this, SLOT(slotToggleSystemTray(bool)));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/juk/systemtray.cpp new/kdemultimedia-3.96.1/juk/systemtray.cpp
--- old/kdemultimedia-3.96.0/juk/systemtray.cpp 2007-10-08 09:42:17.000000000 +0200
+++ new/kdemultimedia-3.96.1/juk/systemtray.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -120,7 +120,7 @@
// This should be initialized to the number of labels that are used.
m_labels.fill(0, 3);
- m_appPix = loadIcon("juk_dock");
+ m_appPix = loadIcon("juk");
m_playPix = createPixmap("media-playback-start");
m_pausePix = createPixmap("media-playback-pause");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kioslave/audiocd/CMakeLists.txt new/kdemultimedia-3.96.1/kioslave/audiocd/CMakeLists.txt
--- old/kdemultimedia-3.96.0/kioslave/audiocd/CMakeLists.txt 2007-08-29 11:56:50.000000000 +0200
+++ new/kdemultimedia-3.96.1/kioslave/audiocd/CMakeLists.txt 2007-11-21 11:48:16.000000000 +0100
@@ -10,6 +10,7 @@
${CMAKE_BINARY_DIR}/libkcddb
${CMAKE_SOURCE_DIR}/libkcompactdisc
${CMAKE_BINARY_DIR}/libkcompactdisc
+ ${CDPARANOIA_INCLUDE_DIR}
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kioslave/audiocd/plugins/wav/CMakeLists.txt new/kdemultimedia-3.96.1/kioslave/audiocd/plugins/wav/CMakeLists.txt
--- old/kdemultimedia-3.96.0/kioslave/audiocd/plugins/wav/CMakeLists.txt 2007-07-26 12:44:48.000000000 +0200
+++ new/kdemultimedia-3.96.1/kioslave/audiocd/plugins/wav/CMakeLists.txt 2007-11-21 11:48:15.000000000 +0100
@@ -1,5 +1,5 @@
-include_directories( ${CMAKE_SOURCE_DIR}/libkcddb ${CMAKE_CURRENT_SOURCE_DIR}/.. )
+include_directories( ${CMAKE_SOURCE_DIR}/libkcddb ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CDPARANOIA_INCLUDE_DIR} )
########### next target ###############
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/guiprofile.cpp new/kdemultimedia-3.96.1/kmix/guiprofile.cpp
--- old/kdemultimedia-3.96.0/kmix/guiprofile.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/guiprofile.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -75,8 +75,9 @@
GUIProfile::~GUIProfile()
{
- // !!! must delete all std::map and std::set content and instances here.
- // QString content is reference counted and probably doesn't need to be deleted explicitly.
+ qDeleteAll(_controls);
+ qDeleteAll(_tabs);
+ qDeleteAll(_products);
}
bool GUIProfile::readProfile(QString& ref_fileName)
@@ -89,6 +90,7 @@
xmlReader->setContentHandler(gpp);
bool ok = xmlReader->parse( source );
delete gpp;
+ delete xmlReader;
//std::cout << "Raw Profile: " << *this;
if ( ok ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/KMixApp.cpp new/kdemultimedia-3.96.1/kmix/KMixApp.cpp
--- old/kdemultimedia-3.96.0/kmix/KMixApp.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/KMixApp.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -78,7 +78,7 @@
{
//kDebug(67100) << "KMixApp::newInstance() !m_kmix";
m_kmix = new KMixWindow;
- connect(this, SIGNAL(stopUpdatesOnVisibility()), m_kmix, SLOT(stopVisibilityUpdates()));
+ //connect(this, SIGNAL(stopUpdatesOnVisibility()), m_kmix, SLOT(stopVisibilityUpdates()));
if ( isSessionRestored() && KMainWindow::canBeRestored(0) )
{
m_kmix->restore(0, false);
@@ -94,7 +94,7 @@
_keepVisibility = val_keepVisibility;
}
-
+/*
void
KMixApp::quitExtended()
{
@@ -105,5 +105,6 @@
emit stopUpdatesOnVisibility();
quit();
}
+*/
#include "KMixApp.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/KMixApp.h new/kdemultimedia-3.96.1/kmix/KMixApp.h
--- old/kdemultimedia-3.96.0/kmix/KMixApp.h 2006-10-26 04:29:29.000000000 +0200
+++ new/kdemultimedia-3.96.1/kmix/KMixApp.h 2007-11-21 11:48:15.000000000 +0100
@@ -34,12 +34,12 @@
int newInstance ();
public slots:
- void quitExtended(); // For a hack on visibility()
+ //void quitExtended(); // For a hack on visibility()
static void keepVisibility(bool);
-
+/*
signals:
void stopUpdatesOnVisibility();
-
+*/
private:
KMixWindow *m_kmix;
static bool _keepVisibility;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/kmix.cpp new/kdemultimedia-3.96.1/kmix/kmix.cpp
--- old/kdemultimedia-3.96.0/kmix/kmix.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/kmix.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -56,6 +56,7 @@
#include "kmixprefdlg.h"
#include "kmixdockwidget.h"
#include "kmixtoolbox.h"
+//#include "osd.h" // Postponed to KDE4.1
/* KMixWindow
@@ -65,8 +66,8 @@
: KXmlGuiWindow(0),
m_showTicks( true ),
m_showMenubar(true),
- m_isVisible (false), // initialize, as we don't trigger a hideEvent()
- m_visibilityUpdateAllowed( true ),
+// m_isVisible (false), // initialize, as we don't trigger a hideEvent()
+// m_visibilityUpdateAllowed( true ),
m_multiDriverMode (false), // -<- I never-ever want the multi-drivermode to be activated by accident
m_dockWidget()
{
@@ -189,6 +190,9 @@
saveBaseConfig();
saveViewConfig();
saveVolumes();
+#ifdef __GNUC_
+#warn We must Sync here, or we will lose configuration data. The reson for that is unknown.
+#endif
KGlobal::config()->sync();
}
@@ -200,7 +204,8 @@
config.writeEntry( "Position", pos() );
// Cannot use isVisible() here, as in the "aboutToQuit()" case this widget is already hidden.
// (Please note that the problem was only there when quitting via Systray - esken).
- config.writeEntry( "Visible", m_isVisible );
+ // Using it again, as internal behaviour has changed with KDE4
+ config.writeEntry( "Visible", isVisible() );
config.writeEntry( "Menubar", _actionShowMenubar->isChecked() );
config.writeEntry( "AllowDocking", m_showDockWidget );
config.writeEntry( "TrayVolumeControl", m_volumeWidget );
@@ -359,19 +364,20 @@
void KMixWindow::plugged( const char* driverName, const QString& udi, QString& dev)
{
kDebug(67100) << "Plugged: dev=" << dev << "(" << driverName << ") udi=" << udi << "\n";
- QString driverNameString; driverNameString = driverName;
- if ( driverNameString == "ALSA" ) {
- int devNum = dev.toInt();
- kDebug(67100) << "Plugged: devNum=" << devNum << "\n";
- Mixer *mixer = new Mixer( driverNameString, devNum );
+ QString driverNameString;
+ driverNameString = driverName;
+ int devNum = dev.toInt();
+ Mixer *mixer = new Mixer( driverNameString, devNum );
+ if ( mixer != 0 ) {
+ kDebug(67100) << "Plugged: dev=" << dev << "\n";
MixerToolBox::instance()->possiblyAddMixer(mixer);
recreateGUI();
}
- else if ( driverNameString == "OSS" ) {
- }
- else {
- // Unknown driver
- }
+
+// Test code for OSD. But OSD is postponed to KDE4.1
+// OSDWidget* osd = new OSDWidget(0);
+// osd->volChanged(70, true);
+
}
void KMixWindow::unplugged( const QString& udi)
@@ -600,6 +606,7 @@
menuBar()->setVisible(_actionShowMenubar->isChecked());
}
+/*
void KMixWindow::showEvent( QShowEvent * )
{
if ( m_visibilityUpdateAllowed )
@@ -614,11 +621,11 @@
}
}
-
void KMixWindow::stopVisibilityUpdates()
{
m_visibilityUpdateAllowed = false;
}
+*/
void KMixWindow::slotHWInfo()
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/kmix.desktop new/kdemultimedia-3.96.1/kmix/kmix.desktop
--- old/kdemultimedia-3.96.0/kmix/kmix.desktop 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/kmix.desktop 2007-11-21 11:48:15.000000000 +0100
@@ -70,7 +70,6 @@
GenericName[zh_TW]=音效混音器
Name=KMix
Name[af]=Kmix
-Name[ca]=Kmix
Name[eo]=Miksilo
Name[lv]=KMiks
Name[ne]=केडीई मिक्स
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/kmixdevicemanager.cpp new/kdemultimedia-3.96.1/kmix/kmixdevicemanager.cpp
--- old/kdemultimedia-3.96.0/kmix/kmixdevicemanager.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/kmixdevicemanager.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -19,28 +19,19 @@
*/
#include "kmixdevicemanager.h"
+#include <kdebug.h>
#include <iostream>
-#include <QString>
#include <QObject>
+#include <QRegExp>
+#include <QString>
#include <solid/device.h>
#include <solid/devicenotifier.h>
#include <solid/audiointerface.h>
-/*
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-
-#include "version.h"
-
-static const char description[] =
-I18N_NOOP("kmixd - Soundcard Mixer Device Manager");
-*/
KMixDeviceManager* KMixDeviceManager::s_KMixDeviceManager = 0;
KMixDeviceManager::KMixDeviceManager()
@@ -136,19 +127,28 @@
Solid::AudioInterface *audiohw = device.as<Solid::AudioInterface>();
if (audiohw && (audiohw->deviceType() & ( Solid::AudioInterface::AudioControl))) {
QString dev;
- switch (audiohw->driver()) {
+ QRegExp devExpr("^\\D+(\\d+)$");
+ switch (audiohw->driver()) {
case Solid::AudioInterface::Alsa:
- dev = audiohw->driverHandle().toList().first().toString();
- std::cout << ">>> Plugged ALSA ='" << udi.toUtf8().data() << "'\n";
- emit plugged("ALSA", udi, dev);
+ if ( _hotpluggingBackend == "ALSA" || _hotpluggingBackend == "*" ) {
+ dev = audiohw->driverHandle().toList().first().toString();
+ emit plugged("ALSA", udi, dev);
+ }
break;
case Solid::AudioInterface::OpenSoundSystem:
- dev = audiohw->driverHandle().toString();
- std::cout << ">>> Plugged OSS ='" << udi.toUtf8().data() << "'\n";
- emit plugged("OSS", udi, dev);
+ if ( _hotpluggingBackend == "OSS" || _hotpluggingBackend == "*" ) {
+ dev = audiohw->driverHandle().toString();
+ if ( devExpr.indexIn(dev) > -1 ) {
+ dev = devExpr.cap(1); // Get device number from device name (e.g "/dev/mixer1" or "/dev/sound/mixer2")
+ }
+ else {
+ dev = "0"; // "/dev/mixer" or "/dev/sound/mixer"
+ }
+ emit plugged("OSS", udi, dev);
+ }
break;
default:
- std::cout << ">>> Plugged UNKNOWN (ignored)\n";
+ kError(67100) << "Plugged UNKNOWN Audio device (ignored)";
break;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/kmixdevicemanager.h new/kdemultimedia-3.96.1/kmix/kmixdevicemanager.h
--- old/kdemultimedia-3.96.0/kmix/kmixdevicemanager.h 2007-11-06 08:59:57.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/kmixdevicemanager.h 2007-11-21 11:48:15.000000000 +0100
@@ -30,6 +30,7 @@
public:
static KMixDeviceManager* instance();
void initHotplug();
+ void setHotpluggingBackends(QString& backendName) { _hotpluggingBackend = backendName; } ;
QString getUDI_ALSA(int num);
QString getUDI_OSS(QString& devname);
@@ -40,6 +41,8 @@
private:
KMixDeviceManager();
~KMixDeviceManager();
+ QString _hotpluggingBackend;
+
private slots:
void pluggedSlot(const QString&);
void unpluggedSlot(const QString&);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/kmixdockwidget.cpp new/kdemultimedia-3.96.1/kmix/kmixdockwidget.cpp
--- old/kdemultimedia-3.96.0/kmix/kmixdockwidget.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/kmixdockwidget.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -60,7 +60,7 @@
m_mixer = Mixer::getGlobalMasterMixer(); // ugly, but we'll live with that for now
createMasterVolWidget();
createActions();
- connect(this, SIGNAL(quitSelected()), kapp, SLOT(quitExtended()));
+ //connect(this, SIGNAL(quitSelected()), kapp, SLOT(quitExtended()));
}
KMixDockWidget::~KMixDockWidget()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/kmix.h new/kdemultimedia-3.96.1/kmix/kmix.h
--- old/kdemultimedia-3.96.0/kmix/kmix.h 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/kmix.h 2007-11-21 11:48:15.000000000 +0100
@@ -76,8 +76,6 @@
void clearMixerWidgets();
virtual bool queryClose();
- void showEvent( QShowEvent * );
- void hideEvent( QHideEvent * );
public slots:
void quit();
@@ -88,7 +86,10 @@
//void loadVolumes();
void saveVolumes();
virtual void applyPrefs( KMixPrefDlg *prefDlg );
- void stopVisibilityUpdates();
+
+ //void stopVisibilityUpdates();
+ //void showEvent( QShowEvent * );
+ //void hideEvent( QHideEvent * );
void newMixerShown(int tabIndex);
@@ -103,7 +104,7 @@
bool m_onLogin;
bool m_startVisible;
bool m_showMenubar;
- bool m_isVisible;
+// bool m_isVisible;
bool m_visibilityUpdateAllowed;
bool m_multiDriverMode; // Not officially supported.
Qt::Orientation m_toplevelOrientation;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/kmix.notifyrc new/kdemultimedia-3.96.1/kmix/kmix.notifyrc
--- old/kdemultimedia-3.96.0/kmix/kmix.notifyrc 2007-11-14 11:30:52.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/kmix.notifyrc 2007-11-21 11:48:15.000000000 +0100
@@ -1,6 +1,7 @@
[Global]
IconName=kmix
Comment=Sound Mixer
+Comment[ca]=Mesclador de so
Comment[de]=Lautstärkeregler
Comment[el]=Μείκτης ήχου
Comment[es]=Mezclador de sonido
@@ -12,12 +13,14 @@
Comment[nds]=Klangmischer
Comment[nl]=Geluidsmixer
Comment[pt]=Mistura de Som
-Comment[pt_BR]=Mistura de Som
+Comment[pt_BR]=Mixer de Som
Comment[sv]=Ljudmixer
+Comment[x-test]=xxSound Mixerxx
Comment[zh_TW]=音效混音器
[Event/MasterFallback]
Name=Audio Device Fallback
+Name[ca]=Dispositiu d'àudio alternatiu
Name[de]=Sicherungs-Audiogerät
Name[el]=Αναπληρωματική συσκευή ήχου
Name[es]=Dispositivo de audio alternativo
@@ -29,10 +32,12 @@
Name[nds]=Klang-Opbackreedschap
Name[nl]=Terugvalapparaat voor geluid
Name[pt]=Dispositivo Alternativo de Áudio:
-Name[pt_BR]=Dispositivo Alternativo de Áudio:
+Name[pt_BR]=Dispositivo de Áudio para "Fallback"
Name[sv]=Reservljudenhet
+Name[x-test]=xxAudio Device Fallbackxx
Name[zh_TW]=預設音效裝置
Comment=Notification on automatic fallback if the preferred devices in unavailable
+Comment[ca]=Notificació del funcionament automàtic del de reserva si els dispositius preferits no estan disponibles
Comment[de]=Benachrichtigung bei automatischem Wechsel zu der Sicherung, wenn das bevorzugte Gerät nicht verfügbar ist
Comment[el]=Ειδοποίηση αυτόματης χρήσης της αναπληρωματικής συσκευής ήχου, αν η προκαθορισμένη δεν είναι διαθέσιμη
Comment[es]=Notificación sobre la selección automática de un dispositivo de audio alternativo si no está disponible el dispositivo preferido
@@ -44,8 +49,9 @@
Comment[nds]=Bescheed, wenn de vörtrocken Reedschap nich verföögbor is un de Opbackreedschap bruukt warrt
Comment[nl]=Melding van automatische terugval als het apparaat van voorkeur niet beschikbaar is
Comment[pt]=Notificação de última instância se os dispositivos preferidos estiverem indisponíveis
-Comment[pt_BR]=Notificação de última instância se os dispositivos preferidos estiverem indisponíveis
+Comment[pt_BR]=Notificação de "fallback" automático se os dispositivos preferidos estiverem indisponíveis
Comment[sv]=Underrättelse vid automatisk återgång om önskade enheter inte är tillgängliga
+Comment[x-test]=xxNotification on automatic fallback if the preferred devices in unavailablexx
Comment[zh_TW]=若是選用的裝置無法使用時,通知會自動使用預設的裝置
Contexts=Application
Action=Popup
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/mdwenum.cpp new/kdemultimedia-3.96.1/kmix/mdwenum.cpp
--- old/kdemultimedia-3.96.0/kmix/mdwenum.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/mdwenum.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -119,10 +119,10 @@
void MDWEnum::showContextMenu()
{
- if( m_mixerwidget == NULL )
+ if( m_view == 0 )
return;
- KMenu *menu = m_mixerwidget->getPopup();
+ KMenu *menu = m_view->getPopup();
QPoint pos = QCursor::pos();
menu->popup( pos );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/mdwslider.cpp new/kdemultimedia-3.96.1/kmix/mdwslider.cpp
--- old/kdemultimedia-3.96.0/kmix/mdwslider.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/mdwslider.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -240,8 +240,7 @@
// --- LABEL -----------------------------------------------
if ( hasVolumeSliders ) {
- // When we have volume sliders, we but the label left of them (in an own layout). Otherwise see below
- kDebug(67100) << ">>> Adding the Default label at _layout (standard)";
+ // When we have volume sliders, we put the label left of them (in an own layout). Otherwise see below at "if ( ! hasVolumeSliders )"
addDefaultLabel( _layout, _orientation);
}
@@ -278,7 +277,6 @@
// -- SLIDERS, LEDS AND ICON
if ( ! hasVolumeSliders ) {
// When we don't have volume sliders, we but the label left of them (in an own layout). Otherwise see below
- kDebug(67100) << ">>> Adding the Default label at volLayout (Switch!)";
addDefaultLabel( volLayout, _orientation );
}
else {
@@ -310,7 +308,7 @@
m_iconLabelSimple = 0L;
if ( showMuteLED ) {
- //kDebug(67100) << ">>> MixDevice " << m_mixdevice->readableName() << " icon calculation:" << endl;
+ //kDebug(67100) << ">>> MixDevice " << m_mixdevice->readableName() << " icon calculation:";
setIcon( m_mixdevice->type() );
m_iconLayout->addWidget( m_iconLabelSimple );
QString muteTip( m_mixdevice->readableName() );
@@ -320,7 +318,7 @@
m_qcb = new QCheckBox(this);
m_iconLayout->addWidget( m_qcb );
m_qcb->installEventFilter(this);
- m_muteText = new QLabel("Mute", this);
+ m_muteText = new QLabel(i18n( "Mute"), this);
m_iconLayout->addWidget( m_muteText );
m_muteText->installEventFilter(this);
connect ( m_qcb, SIGNAL( toggled(bool) ), this, SLOT(toggleMuted() ) );
@@ -376,7 +374,7 @@
QString muteTip( i18n( "Capture/Uncapture %1", m_mixdevice->readableName() ) );
m_captureLED->setToolTip( muteTip ); // @todo: Whatsthis, explaining the device
- m_captureText = new QLabel("Capture", this);
+ m_captureText = new QLabel(i18n("Capture"), this);
reclayout->addWidget( m_captureText );
m_captureText->installEventFilter(this);
} // has capture LED
@@ -546,7 +544,7 @@
else
{
m_iconLabelSimple->setPixmap( miniDevPM );
- //kDebug(67100) << " > simple > icontype=" <<icontype<< "size=" << miniDevPM.size() << endl;
+ //kDebug(67100) << " > simple > icontype=" <<icontype<< "size=" << miniDevPM.size();
} // normal size
}
else
@@ -815,6 +813,7 @@
{
value ? hide() : show();
m_disabled = value;
+ m_view->configurationUpdate();
}
}
@@ -944,10 +943,10 @@
void MDWSlider::showContextMenu()
{
- if( m_mixerwidget == NULL )
+ if( m_view == 0 )
return;
- KMenu *menu = m_mixerwidget->getPopup();
+ KMenu *menu = m_view->getPopup();
menu->addTitle( SmallIcon( "kmix" ), m_mixdevice->readableName() );
if ( m_slidersPlayback.count()>1 || m_slidersCapture.count()>1) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/mdwswitch.cpp new/kdemultimedia-3.96.1/kmix/mdwswitch.cpp
--- old/kdemultimedia-3.96.0/kmix/mdwswitch.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/mdwswitch.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -161,10 +161,10 @@
void MDWSwitch::showContextMenu()
{
- if( m_mixerwidget == NULL )
+ if( m_view == 0 )
return;
- KMenu *menu = m_mixerwidget->getPopup();
+ KMenu *menu = m_view->getPopup();
QPoint pos = QCursor::pos();
menu->popup( pos );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/mixdevicewidget.cpp new/kdemultimedia-3.96.1/kmix/mixdevicewidget.cpp
--- old/kdemultimedia-3.96.0/kmix/mixdevicewidget.cpp 2007-06-27 12:59:22.000000000 +0200
+++ new/kdemultimedia-3.96.1/kmix/mixdevicewidget.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -60,7 +60,7 @@
MixDeviceWidget::MixDeviceWidget(MixDevice* md,
bool small, Qt::Orientation orientation,
QWidget* parent, ViewBase* mw) :
- QWidget( parent ), m_mixdevice( md ), m_mixerwidget( mw ),
+ QWidget( parent ), m_mixdevice( md ), m_view( mw ),
m_disabled( false ), _orientation( orientation ), m_small( small )
{
_mdwActions = new KActionCollection( this );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/mixdevicewidget.h new/kdemultimedia-3.96.1/kmix/mixdevicewidget.h
--- old/kdemultimedia-3.96.0/kmix/mixdevicewidget.h 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/mixdevicewidget.h 2007-11-21 11:48:15.000000000 +0100
@@ -77,7 +77,7 @@
protected:
MixDevice* m_mixdevice;
KActionCollection* _mdwActions;
- ViewBase* m_mixerwidget;
+ ViewBase* m_view;
bool m_disabled;
Qt::Orientation _orientation;
bool m_small;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/mixer_alsa9.cpp new/kdemultimedia-3.96.1/kmix/mixer_alsa9.cpp
--- old/kdemultimedia-3.96.0/kmix/mixer_alsa9.cpp 2007-11-06 08:59:57.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/mixer_alsa9.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -132,7 +132,7 @@
QString msg("No UDI found for '");
msg += devName;
msg += "'. Hotplugging not possible";
- kDebug(67100) << msg << endl;
+ kDebug(67100) << msg;
}
// Run a loop over all controls of the card
unsigned int idx = 0;
@@ -195,8 +195,10 @@
if ( volPlay != 0 ) md->addPlaybackVolume(*volPlay);
if ( volCapture != 0 ) md->addCaptureVolume (*volCapture);
if ( enumList.count() > 0 ) md->addEnums(enumList);
-
- m_mixDevices.append( md );
+
+ m_mixDevices.append( md );
+
+ qDeleteAll(enumList); // clear temporary list
// --- Recommended master ----------------------------------------
if ( mdID == "PCM:0" ) {
@@ -344,7 +346,7 @@
int ret = snd_mixer_selem_get_enum_item_name(elem, iEnum, 99, buffer);
buffer[99] = 0; // protect from overflow
if ( ret == 0 ) {
- QString* enumName = new QString(buffer);
+ QString* enumName = new QString(buffer); // these QString* items are deleted above (search fo "clear temporary list")
enumList.append( enumName);
} // enumName could be read successfully
} // for all enum items of this device
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/mixer_backend.cpp new/kdemultimedia-3.96.1/kmix/mixer_backend.cpp
--- old/kdemultimedia-3.96.0/kmix/mixer_backend.cpp 2007-08-29 11:56:50.000000000 +0200
+++ new/kdemultimedia-3.96.1/kmix/mixer_backend.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -25,7 +25,7 @@
#include "mixer.h"
Mixer_Backend::Mixer_Backend(Mixer *mixer, int device) :
- m_devnum (device) , m_isOpen(false), m_recommendedMaster(0), _mixer(mixer)
+ m_devnum (device) , m_isOpen(false), m_recommendedMaster(0), _mixer(mixer), _pollingTimer(0)
{
// In all cases create a QTimer. We will use it once as a singleShot(), even if something smart
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/mixer.cpp new/kdemultimedia-3.96.1/kmix/mixer.cpp
--- old/kdemultimedia-3.96.0/kmix/mixer.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/mixer.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -92,6 +92,7 @@
kDebug() << "=> Check Unregister DBUS object " << m_dbusName;
//QDBusConnection::sessionBus().unregisterObject(m_dbusName);
close();
+ delete _mixerBackend;
}
void Mixer::volumeSave( KConfig *config )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/mixer_oss.cpp new/kdemultimedia-3.96.1/kmix/mixer_oss.cpp
--- old/kdemultimedia-3.96.0/kmix/mixer_oss.cpp 2007-11-06 08:59:57.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/mixer_oss.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -119,7 +119,7 @@
QString msg("No UDI found for '");
msg += finalDeviceName;
msg += "'. Hotplugging not possible";
- kDebug(67100) << msg << endl;
+ kDebug(67100) << msg;
}
int devmask, recmask, i_recsrc, stereodevs;
// Mixer is open. Now define properties
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/mixertoolbox.cpp new/kdemultimedia-3.96.1/kmix/mixertoolbox.cpp
--- old/kdemultimedia-3.96.0/kmix/mixertoolbox.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/mixertoolbox.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -28,6 +28,7 @@
#include <kstandarddirs.h>
#include "guiprofile.h"
+#include "kmixdevicemanager.h"
#include "mixdevice.h"
#include "mixer.h"
@@ -185,6 +186,11 @@
{
// this will only be possible by hacking the config-file, as it will not be officially supported
ref_hwInfoString += "\nExperimental multiple-Driver mode activated";
+ QString allDrivermatch("*");
+ KMixDeviceManager::instance()->setHotpluggingBackends(allDrivermatch);
+ }
+ else {
+ KMixDeviceManager::instance()->setHotpluggingBackends(driverInfoUsed);
}
kDebug(67100) << ref_hwInfoString << endl << "Total number of detected Mixers: " << Mixer::mixers().count();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/TODO new/kdemultimedia-3.96.1/kmix/TODO
--- old/kdemultimedia-3.96.0/kmix/TODO 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/TODO 2007-11-21 11:48:15.000000000 +0100
@@ -1,20 +1,18 @@
TODO list
KDE4
-1) Remove ComboBox and replace it by a TabBar "corner widget" (like the konsole session menu)
-Status: OK (you can "cycle" through your soundcards now)
+1) Remove ComboBox and replace it by a TabBar "corner widget" (Postponed: Not for KDE4.0)
+(like the konsole session menu)
-2) Replace "confusing green LED" (Under work. 90% done)
-Uses now a checkbox. Open issue: Add a label to the left, telling the user this is a mute button)
+2) Replace "confusing green LED" (DONE)
-3) Replace "confusing red LED" (Pending)
+3) Replace "confusing red LED" (DONE)
-4) Change "id" of capture controls in mixer_alsa9.cpp.
+4) Change "id" of capture controls in mixer_alsa9.cpp. (DONE)
Rationale: We need this, so that no control id conflicts arise.
e.g. if there is a "PCM play" and a "PCM capture", everything will work strange.
Especially saving and restoring will fail. But there can also be a lot of runtime issues,
at ANY place that uses mixer ID's (and there are a lot!)
-Status: OK
5) Move balance slider out of bottom and make it a virtual control.
Status: Pending
@@ -26,13 +24,13 @@
7) Several bug reports, including the Audigy stuff. (DONE)
-8) Resolve show issue after starting KMix (Pending)
+8) Resolve show issue after starting KMix (DONE)
9) Get Global Keyboard Shurtcuts work again (Pending)
-10) Layout: KMix can be made so small that Labels are partially hidden (Pending)
+10) Layout: KMix can be made so small that Labels are partially hidden (DONE)
-11) Layout: MDWSwitch layout has to be redone
+11) Layout: MDWSwitch layout has to be redone (Pending)
------------------------------------------------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/viewbase.cpp new/kdemultimedia-3.96.1/kmix/viewbase.cpp
--- old/kdemultimedia-3.96.0/kmix/viewbase.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/viewbase.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -36,6 +36,7 @@
#include <kstandardaction.h>
// KMix
#include "dialogviewconfiguration.h"
+#include "guiprofile.h"
#include "kmixtoolbox.h"
#include "mixdevicewidget.h"
#include "mixer.h"
@@ -80,6 +81,7 @@
ViewBase::~ViewBase() {
delete _mixSet;
+ delete _guiprof;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/viewdockareapopup.cpp new/kdemultimedia-3.96.1/kmix/viewdockareapopup.cpp
--- old/kdemultimedia-3.96.0/kmix/viewdockareapopup.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/viewdockareapopup.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -44,7 +44,7 @@
// Users will not be able to close the Popup without opening the KMix main window then.
// See Bug #93443, #96332 and #96404 for further details. -- esken
ViewDockAreaPopup::ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KMixDockWidget *dockW )
- : ViewBase(parent, name, mixer, Qt::Popup | Qt::MSWindowsFixedSizeDialogHint , vflags, guiprof), _mdw(0), _dock(dockW)
+ : ViewBase(parent, name, mixer, Qt::Popup | Qt::MSWindowsFixedSizeDialogHint , vflags, guiprof), _mdw(0), _dock(dockW), _hideTimer(0)
{
QBoxLayout *layout = new QHBoxLayout( this );
_frame = new QFrame( this );
@@ -62,6 +62,7 @@
}
ViewDockAreaPopup::~ViewDockAreaPopup() {
+ delete _hideTimer;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/viewsliders.cpp new/kdemultimedia-3.96.1/kmix/viewsliders.cpp
--- old/kdemultimedia-3.96.0/kmix/viewsliders.cpp 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/viewsliders.cpp 2007-11-21 11:48:15.000000000 +0100
@@ -69,6 +69,7 @@
}
ViewSliders::~ViewSliders() {
+ qDeleteAll(_separators);
}
@@ -78,8 +79,8 @@
MixDeviceWidget *mdw;
Qt::Orientation orientation = (_vflags & ViewBase::Vertical) ? Qt::Horizontal : Qt::Vertical;
- /* Hint: We allow to put Enum's in the same View as sliders and switches.
- Normally you won't do this, but the creator of the Profile is at least free to do so if he wishes. */
+
+
if ( md->isEnum() ) {
mdw = new MDWEnum(
md, // MixDevice (parameter)
@@ -90,9 +91,14 @@
_layoutEnum->addWidget(mdw);
} // an enum
else {
- QFrame *_frm = new QFrame(this);
- _frm->setFrameStyle(QFrame::VLine | QFrame::Raised);
- _layoutSliders->addWidget(_frm);
+ // add a separator before the device
+ QFrame *_frm = new QFrame(this);
+ if ( orientation == Qt::Vertical)
+ _frm->setFrameStyle(QFrame::VLine | QFrame::Raised);
+ else
+ _frm->setFrameStyle(QFrame::HLine | QFrame::Raised);
+ _separators.insert(md->id(),_frm);
+ _layoutSliders->addWidget(_frm);
mdw = new MDWSlider(
md, // MixDevice (parameter)
true, // Show Mute LED
@@ -103,6 +109,8 @@
this ); // View widget
_layoutSliders->addWidget(mdw);
}
+
+
return mdw;
}
@@ -167,20 +175,30 @@
}
void ViewSliders::configurationUpdate() {
- // Adjust height of top part by setting it to the maximum of all mdw's
- int topPartExtent = 0;
- int bottomPartExtent = 0;
- for ( int i=0; i<_mdws.count(); i++ ) {
- MDWSlider* mdw = ::qobject_cast<MDWSlider*>(_mdws[i]);
- if ( mdw && mdw->playbackExtentHint() > topPartExtent ) topPartExtent = mdw->playbackExtentHint();
- if ( mdw && mdw->playbackExtentHint() > bottomPartExtent ) bottomPartExtent = mdw->playbackExtentHint();
- }
- kDebug(67100) << "topPartExtent is " << topPartExtent;
- for ( int i=0; i<_mdws.count(); i++ ) {
- MDWSlider* mdw = ::qobject_cast<MDWSlider*>(_mdws[i]);
- if ( mdw ) mdw->setPlaybackExtent(topPartExtent);
- if ( mdw ) mdw->setCaptureExtent(bottomPartExtent);
- }
+ // Adjust height of top part by setting it to the maximum of all mdw's
+ int topPartExtent = 0;
+ int bottomPartExtent = 0;
+ for ( int i=0; i<_mdws.count(); i++ ) {
+ MDWSlider* mdw = ::qobject_cast<MDWSlider*>(_mdws[i]);
+ if ( mdw && mdw->playbackExtentHint() > topPartExtent ) topPartExtent = mdw->playbackExtentHint();
+ if ( mdw && mdw->playbackExtentHint() > bottomPartExtent ) bottomPartExtent = mdw->playbackExtentHint();
+ }
+ kDebug(67100) << "topPartExtent is " << topPartExtent;
+ bool firstVisibleControlFound = false;
+ for ( int i=0; i<_mdws.count(); i++ ) {
+ MDWSlider* mdw = ::qobject_cast<MDWSlider*>(_mdws[i]);
+ if ( mdw ) {
+ mdw->setPlaybackExtent(topPartExtent);
+ mdw->setCaptureExtent(bottomPartExtent);
+ bool thisControlIsVisible = mdw->isVisibleTo(this);
+ bool showSeparator = ( firstVisibleControlFound && thisControlIsVisible);
+ if ( _separators.contains( mdw->mixDevice()->id() )) {
+ QFrame* sep = _separators[mdw->mixDevice()->id()];
+ sep->setVisible(showSeparator);
+ }
+ if ( thisControlIsVisible ) firstVisibleControlFound=true;
+ }
+ } // for all MDW's
_layoutMDW->activate();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.0/kmix/viewsliders.h new/kdemultimedia-3.96.1/kmix/viewsliders.h
--- old/kdemultimedia-3.96.0/kmix/viewsliders.h 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.1/kmix/viewsliders.h 2007-11-21 11:48:15.000000000 +0100
@@ -22,6 +22,8 @@
#define ViewSliders_h
class QBoxLayout;
+#include <QFrame>
+#include <QHash>
class QWidget;
class Mixer;
@@ -46,6 +48,7 @@
QBoxLayout* _layoutMDW;
QLayout* _layoutSliders;
QLayout* _layoutEnum;
+ QHash<QString,QFrame*> _separators;
};
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
[View Less]
1
0
Hello community,
here is the log from the commit of package kdemultimedia3
checked in at Wed Nov 28 23:28:20 CET 2007.
--------
--- KDE/kdemultimedia3/kdemultimedia3.changes 2007-10-23 11:49:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdemultimedia3/kdemultimedia3.changes 2007-11-28 14:01:38.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 28 14:01:32 CET 2007 - dmueller(a)suse.de
+
+- fix build against glibc 2.7
+
+-------------------------------------------------------------------
New:
----…
[View More]
3_5_BRANCH.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia3.spec ++++++
--- /var/tmp/diff_new_pack.f11097/_old 2007-11-28 23:24:31.000000000 +0100
+++ /var/tmp/diff_new_pack.f11097/_new 2007-11-28 23:24:31.000000000 +0100
@@ -21,7 +21,7 @@
Group: System/GUI/KDE
Summary: KDE Multimedia Libraries
Version: 3.5.8
-Release: 8
+Release: 24
Url: http://www.kde.org
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -29,7 +29,7 @@
Source1: kscdrc
Source2: yahoo_credit.png
Source3: %{name}-rpmlintrc
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch2: disable-examples.diff
Patch3: autorun-kmix.diff
Patch9: initial-preferences.diff
@@ -274,7 +274,7 @@
%prep
%setup -q -n kdemultimedia-%{version}
-#%patch0
+%patch0
%patch2
#%patch3
%patch9
@@ -687,7 +687,10 @@
/opt/kde3/%_lib/mcop/xine*.mcopclass
/opt/kde3/share/apps/videothumbnail
/opt/kde3/share/services/videothumbnail.desktop
+
%changelog
+* Wed Nov 28 2007 - dmueller(a)suse.de
+- fix build against glibc 2.7
* Tue Oct 23 2007 - stbinner(a)suse.de
- fix build with gcc 4.3
* Tue Oct 09 2007 - stbinner(a)suse.de
++++++ 3_5_BRANCH.diff ++++++
++++ 718 lines (skipped)
++++++ kdemultimedia-gcc43.diff ++++++
--- /var/tmp/diff_new_pack.f11097/_old 2007-11-28 23:24:32.000000000 +0100
+++ /var/tmp/diff_new_pack.f11097/_new 2007-11-28 23:24:32.000000000 +0100
@@ -1,113 +1,3 @@
---- arts/runtime/artsbuilderloader_impl.cc 2007/10/23 07:42:12 1.1
-+++ arts/runtime/artsbuilderloader_impl.cc 2007/10/23 07:42:25
-@@ -22,6 +22,7 @@
-
- #include "artsbuilder.h"
- #include "debug.h"
-+#include <stdlib.h>
- #include <fstream>
- #include <sys/types.h>
- #include <sys/stat.h>
---- arts/modules/synth/synth_noise_impl.cc 2007/10/23 08:10:11 1.1
-+++ arts/modules/synth/synth_noise_impl.cc 2007/10/23 08:10:23
-@@ -20,6 +20,8 @@
-
- */
-
-+#include <stdlib.h>
-+
- #include "artsmodulessynth.h"
- #include "stdsynthmodule.h"
-
---- arts/modules/synth/synth_osc_impl.cc 2007/10/23 08:39:06 1.1
-+++ arts/modules/synth/synth_osc_impl.cc 2007/10/23 08:39:17
-@@ -25,6 +25,7 @@
- #include "stdsynthmodule.h"
- #include <gsl/gsloscillator.h>
- #include <gsl/gslsignal.h>
-+#include <string.h>
-
- #include <math.h>
-
---- arts/modules/synth/synth_capture_wav_impl.cc 2007/10/23 08:57:05 1.1
-+++ arts/modules/synth/synth_capture_wav_impl.cc 2007/10/23 08:57:26
-@@ -25,6 +25,8 @@
- #include "stdsynthmodule.h"
- #include "debug.h"
- #include <fcntl.h>
-+#include <string.h>
-+#include <stdlib.h>
-
- using namespace std;
- namespace Arts {
---- arts/modules/synth/synth_play_pat_impl.cc 2007/10/23 08:58:22 1.1
-+++ arts/modules/synth/synth_play_pat_impl.cc 2007/10/23 08:58:38
-@@ -1,4 +1,4 @@
-- /*
-+# /*
-
- Copyright (C) 2001 Stefan Westerfeld
- stefan(a)space.twc.de
-@@ -28,6 +28,8 @@
- #include <debug.h>
- #include <cache.h>
- #include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-
- using namespace std;
-
---- arts/modules/synth/synth_sequence_impl.cc 2007/10/23 08:59:37 1.1
-+++ arts/modules/synth/synth_sequence_impl.cc 2007/10/23 08:59:55
-@@ -26,6 +26,8 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include "artsmodulessynth.h"
- #include "stdsynthmodule.h"
-
---- arts/modules/synth/synth_sequence_freq_impl.cc 2007/10/23 09:00:27 1.1
-+++ arts/modules/synth/synth_sequence_freq_impl.cc 2007/10/23 09:00:37
-@@ -18,6 +18,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include "artsmodulessynth.h"
- #include "stdsynthmodule.h"
- #include <debug.h>
---- arts/modules/synth/synth_midi_test_impl.cc 2007/10/23 09:00:58 1.1
-+++ arts/modules/synth/synth_midi_test_impl.cc 2007/10/23 09:01:08
-@@ -9,6 +9,7 @@
- #include "audiosubsys.h"
- #include <fstream>
- #include <math.h>
-+#include <stdlib.h>
-
- using namespace Arts;
- using namespace std;
---- arts/modules/effects/synth_stereo_fir_equalizer_impl.cc 2007/10/23 09:14:35 1.1
-+++ arts/modules/effects/synth_stereo_fir_equalizer_impl.cc 2007/10/23 09:14:46
-@@ -29,6 +29,7 @@
- #include "artsmoduleseffects.h"
-
- #include <stdio.h>
-+#include <stdlib.h>
-
- #include <kglobal.h>
- #include <klocale.h>
---- arts/builder/structure.cpp 2007/10/23 09:20:39 1.1
-+++ arts/builder/structure.cpp 2007/10/23 09:20:55
-@@ -23,6 +23,7 @@
- #include "soundserver.h"
- #include "kartsserver.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include <iostream>
- #include <fstream>
- #include <kdebug.h>
--- kdemmbackends/arts/artsplayer.cpp 2007/10/23 09:01:33 1.19
+++ kdemmbackends/arts/artsplayer.cpp 2007/10/23 09:30:45
@@ -25,6 +25,8 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
[View Less]
1
0
Hello community,
here is the log from the commit of package kdelibs4
checked in at Wed Nov 28 23:24:06 CET 2007.
--------
--- KDE/kdelibs4/kdelibs4.changes 2007-11-14 17:36:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2007-11-21 18:57:22.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 21 18:57:22 CET 2007 - dmueller(a)suse.de
+
+- update to 3.96.1
+
+-------------------------------------------------------------------
Old:
----
kdelibs-3.96.0.tar.bz2
kdelibs-fix-…
[View More]version.diff
New:
----
kde3-applications.diff
kdelibs-3.96.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.uh8817/_old 2007-11-28 23:23:42.000000000 +0100
+++ /var/tmp/diff_new_pack.uh8817/_new 2007-11-28 23:23:42.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs4 (Version 3.96.0)
+# spec file for package kdelibs4 (Version 3.96.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,15 +21,17 @@
Group: System/GUI/KDE
Summary: KDE Base Libraries
Url: http://www.kde.org
-Version: 3.96.0
+Version: 3.96.1
Release: 1
-%define rversion 3.96.0
+%define rversion 3.96.1
Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`)
-Requires: kdelibs4-core dbus-1-x11 shared-mime-info
+Requires: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi`)
+Requires: kdelibs4-core >= %version
+Requires: dbus-1-x11 shared-mime-info
Source0: kdelibs-%rversion.tar.bz2
Source1: _upstream
Patch0: dotkde4.diff
-Patch1: kdelibs-fix-version.diff
+Patch1: kde3-applications.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -69,6 +71,10 @@
%install
cd build
%makeinstall
+ %create_subdir_filelist -d kdecore -n kdelibs-%rversion -o devel
+ %create_subdir_filelist -d kpty -n kdelibs-%rversion -o devel -f kdecore
+ cd ..
+ cat filelists/* | while read line; do echo "%exclude $line";done >filelists/exclude
mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged
mv $RPM_BUILD_ROOT/usr/etc/xdg/menus/applications.menu \
$RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde4
@@ -88,6 +94,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
+ rm -rf filelists
%package doc
Group: System/GUI/KDE
@@ -107,7 +114,6 @@
--------
The KDE Team <kde(a)kde.org>
-
%files doc
%defattr(-,root,root)
/usr/bin/meinproc4
@@ -159,19 +165,17 @@
--------
The KDE Team <kde(a)kde.org>
-
-%files -n kdelibs4-core
+%files -n kdelibs4-core -f filelists/kdecore
%defattr(-,root,root)
%doc COPYING COPYING-DOCS COPYING.LIB README
-/usr/bin/kde4-config
-%_libdir/kde4/ktranscript.so
-%_libdir/kde4/libexec/kgrantpty
+%exclude %_libdir/libkdecore.so.*
+%exclude %_libdir/libkdefakes.so.*
+%exclude %_libdir/libkpty.so.*
+%exclude /usr/bin/kconfig_compiler
+%dir /usr/%_lib/kde4
+%dir /usr/share/kde4/servicetypes
%config %_kde_config_dir/kdebug.areas
%config %_kde_config_dir/kdebugrc
-%dir %_kde_share_dir
-%_kde_share_dir/servicetypes/kplugininfo.desktop
-%_kde_share_dir/servicetypes/sonnetspeller.desktop
-/usr/share/locale/all_languages
%package -n libkdecore4-devel
Group: System/GUI/KDE
@@ -189,106 +193,10 @@
--------
The KDE Team <kde(a)kde.org>
-
-%files -n libkdecore4-devel
+%files -n libkdecore4-devel -f filelists/kdecore.devel
%defattr(-,root,root)
%doc COPYING COPYING-DOCS COPYING.LIB README
/usr/bin/kconfig_compiler
-/usr/include/conversion_check.h
-/usr/include/k3bufferedsocket.h
-/usr/include/k3clientsocketbase.h
-/usr/include/k3datagramsocket.h
-/usr/include/k3httpproxysocketdevice.h
-/usr/include/k3processcontroller.h
-/usr/include/k3process.h
-/usr/include/k3procio.h
-/usr/include/k3resolver.h
-/usr/include/k3reverseresolver.h
-/usr/include/k3serversocket.h
-/usr/include/k3socketaddress.h
-/usr/include/k3socketbase.h
-/usr/include/k3socketdevice.h
-/usr/include/k3socks.h
-/usr/include/k3sockssocketdevice.h
-/usr/include/k3streamsocket.h
-/usr/include/k3staticdeleter.h
-/usr/include/kaboutdata.h
-/usr/include/kallocator.h
-/usr/include/kascii.h
-/usr/include/kauthorized.h
-/usr/include/kautosavefile.h
-/usr/include/kautostart.h
-/usr/include/kcalendarsystem.h
-/usr/include/kcharsets.h
-/usr/include/kcmdlineargs.h
-/usr/include/kcodecs.h
-/usr/include/kcomponentdata.h
-/usr/include/kcompositejob.h
-/usr/include/kconfigbase.h
-/usr/include/kconfiggroup.h
-/usr/include/kconfig.h
-/usr/include/kdatetime.h
-/usr/include/kdebug.h
-/usr/include/kdecore_export.h
-/usr/include/kdedmodule.h
-/usr/include/kdefakes.h
-/usr/include/kde_file.h
-/usr/include/kdesktopfile.h
-/usr/include/kdeversion.h
-/usr/include/kencodingdetector.h
-/usr/include/kfilterbase.h
-/usr/include/kfilterdev.h
-/usr/include/kgenericfactory.h
-/usr/include/kgenericfactory.tcc
-/usr/include/kglobal.h
-/usr/include/kjob.h
-/usr/include/kjobtrackerinterface.h
-/usr/include/kjobuidelegate.h
-/usr/include/klauncher_iface.h
-/usr/include/klibloader.h
-/usr/include/klocale.h
-/usr/include/klocalizedstring.h
-/usr/include/klocalsocket.h
-/usr/include/klockfile.h
-/usr/include/kmacroexpander.h
-/usr/include/kmessage.h
-/usr/include/kmimetype.h
-/usr/include/kmimetypetrader.h
-/usr/include/kmountpoint.h
-/usr/include/kplugininfo.h
-/usr/include/kprotocolinfo.h
-/usr/include/kpty.h
-/usr/include/krandom.h
-/usr/include/krandomsequence.h
-/usr/include/ksavefile.h
-/usr/include/kservice.h
-/usr/include/kservicetype.h
-/usr/include/kservicetypeprofile.h
-/usr/include/kservicetypetrader.h
-/usr/include/ksharedconfig.h
-/usr/include/ksharedptr.h
-/usr/include/kshell.h
-/usr/include/ksocketfactory.h
-/usr/include/ksortablelist.h
-/usr/include/kstandarddirs.h
-/usr/include/kstringhandler.h
-/usr/include/ksycocaentry.h
-/usr/include/ksycoca.h
-/usr/include/ksycocatype.h
-/usr/include/ksystemtimezone.h
-/usr/include/ktempdir.h
-/usr/include/ktemporaryfile.h
-/usr/include/ktoolinvocation.h
-/usr/include/ktypelist.h
-/usr/include/ktzfiletimezone.h
-/usr/include/kurl.h
-/usr/include/kuser.h
-/usr/include/qtest_kde.h
-/usr/include/sonnet/backgroundchecker.h
-/usr/include/sonnet/speller.h
-%_libdir/libkdecore.so
-%_libdir/libkpty.so
-%_libdir/libkdefakes.so
%package -n libkde4
Group: System/GUI/KDE
@@ -365,169 +273,48 @@
--------
The KDE Team <kde(a)kde.org>
-
-%files -n libkde4-devel
+%files -n libkde4-devel -f filelists/exclude
%defattr(-,root,root)
-%exclude /usr/include/conversion_check.h
-%exclude /usr/include/k3bufferedsocket.h
-%exclude /usr/include/k3clientsocketbase.h
-%exclude /usr/include/k3datagramsocket.h
-%exclude /usr/include/k3httpproxysocketdevice.h
-%exclude /usr/include/k3processcontroller.h
-%exclude /usr/include/k3process.h
-%exclude /usr/include/k3procio.h
-%exclude /usr/include/k3resolver.h
-%exclude /usr/include/k3reverseresolver.h
-%exclude /usr/include/k3serversocket.h
-%exclude /usr/include/k3socketaddress.h
-%exclude /usr/include/k3socketbase.h
-%exclude /usr/include/k3socketdevice.h
-%exclude /usr/include/k3socks.h
-%exclude /usr/include/k3sockssocketdevice.h
-%exclude /usr/include/k3streamsocket.h
-%exclude /usr/include/k3staticdeleter.h
-%exclude /usr/include/kaboutdata.h
-%exclude /usr/include/kallocator.h
-%exclude /usr/include/kascii.h
-%exclude /usr/include/kauthorized.h
-%exclude /usr/include/kautosavefile.h
-%exclude /usr/include/kautostart.h
-%exclude /usr/include/kcalendarsystem.h
-%exclude /usr/include/kcharsets.h
-%exclude /usr/include/kcmdlineargs.h
-%exclude /usr/include/kcodecs.h
-%exclude /usr/include/kcomponentdata.h
-%exclude /usr/include/kcompositejob.h
-%exclude /usr/include/kconfigbase.h
-%exclude /usr/include/kconfiggroup.h
-%exclude /usr/include/kconfig.h
-%exclude /usr/include/kdatetime.h
-%exclude /usr/include/kdebug.h
-%exclude /usr/include/kdecore_export.h
-%exclude /usr/include/kdedmodule.h
-%exclude /usr/include/kdefakes.h
-%exclude /usr/include/kde_file.h
-%exclude /usr/include/kdesktopfile.h
-%exclude /usr/include/kdeversion.h
-%exclude /usr/include/kencodingdetector.h
-%exclude /usr/include/kfilterbase.h
-%exclude /usr/include/kfilterdev.h
-%exclude /usr/include/kgenericfactory.h
-%exclude /usr/include/kgenericfactory.tcc
-%exclude /usr/include/kglobal.h
-%exclude /usr/include/kjob.h
-%exclude /usr/include/kjobtrackerinterface.h
-%exclude /usr/include/kjobuidelegate.h
-%exclude /usr/include/klauncher_iface.h
-%exclude /usr/include/klibloader.h
-%exclude /usr/include/klocale.h
-%exclude /usr/include/klocalizedstring.h
-%exclude /usr/include/klocalsocket.h
-%exclude /usr/include/klockfile.h
-%exclude /usr/include/kmacroexpander.h
-%exclude /usr/include/kmessage.h
-%exclude /usr/include/kmimetype.h
-%exclude /usr/include/kmimetypetrader.h
-%exclude /usr/include/kmountpoint.h
-%exclude /usr/include/kplugininfo.h
-%exclude /usr/include/kprotocolinfo.h
-%exclude /usr/include/kpty.h
-%exclude /usr/include/krandom.h
-%exclude /usr/include/krandomsequence.h
-%exclude /usr/include/ksavefile.h
-%exclude /usr/include/kservice.h
-%exclude /usr/include/kservicetype.h
-%exclude /usr/include/kservicetypeprofile.h
-%exclude /usr/include/kservicetypetrader.h
-%exclude /usr/include/ksharedconfig.h
-%exclude /usr/include/ksharedptr.h
-%exclude /usr/include/kshell.h
-%exclude /usr/include/ksocketfactory.h
-%exclude /usr/include/ksortablelist.h
-%exclude /usr/include/kstandarddirs.h
-%exclude /usr/include/kstringhandler.h
-%exclude /usr/include/ksycocaentry.h
-%exclude /usr/include/ksycoca.h
-%exclude /usr/include/ksycocatype.h
-%exclude /usr/include/ksystemtimezone.h
-%exclude /usr/include/ktempdir.h
-%exclude /usr/include/ktemporaryfile.h
-%exclude /usr/include/ktoolinvocation.h
-%exclude /usr/include/ktypelist.h
-%exclude /usr/include/ktzfiletimezone.h
-%exclude /usr/include/kurl.h
-%exclude /usr/include/kuser.h
-%exclude /usr/include/qtest_kde.h
-%exclude /usr/include/sonnet/backgroundchecker.h
-%exclude /usr/include/sonnet/speller.h
/usr/bin/kde4automoc
/usr/include/*
%_kde_share_dir/apps/cmake
-%_libdir/libkaudiodevicelist.so
-%_libdir/libkde3support.so
-%_libdir/libkdesu.so
-%_libdir/libkdeui.so
-%_libdir/libkdnssd.so
-%_libdir/libkhtml.so
-%_libdir/libkimproxy.so
-%_libdir/libkio.so
-%_libdir/libkjs.so
-%_libdir/libkjsembed.so
-%_libdir/libkmediaplayer.so
-%_libdir/libknotifyconfig.so
-%_libdir/libkntlm.so
-%_libdir/libkparts.so
-%_libdir/libkrosscore.so
-%_libdir/libktexteditor.so
-%_libdir/libkunittest.so
-%_libdir/libkutils.so
-%_libdir/libkrossui.so
-%_libdir/libkwalletbackend.so
-%_libdir/libsolid.so
-%_libdir/libthreadweaver.so
-%_libdir/libphononexperimental.so
-%_libdir/libkfile.so
-%_libdir/libknewstuff2.so
-%_libdir/libphonon.so
-%_libdir/libnepomuk.so
+%exclude %_libdir/libkdeinit4_*.so
+%_libdir/*.so
-%files
+%files -f filelists/exclude
%defattr(-,root,root)
%exclude /usr/bin/meinproc4
-%exclude /usr/bin/kde4automoc
%exclude %_kde_share_dir/apps/ksgmltools2
%exclude %_kde_share_dir/apps/cmake
-%exclude /usr/bin/kde4-config
-%exclude /usr/%_lib/kde4/ktranscript.so
-%exclude /usr/%_lib/kde4/libexec/kgrantpty
-%exclude %_kde_config_dir/kdebug.areas
-%exclude %_kde_config_dir/kdebugrc
-%exclude %_kde_share_dir/servicetypes/kplugininfo.desktop
-%exclude %_kde_share_dir/servicetypes/sonnetspeller.desktop
-%exclude /usr/share/locale/all_languages
-%exclude /usr/bin/kconfig_compiler
+%exclude /usr/bin/kde4automoc
/usr/bin/*
-%_libdir/kde4
-%_libdir/libkdeinit4_kconf_update.so
-%_libdir/libkdeinit4_kded4.so
-%_libdir/libkdeinit4_kio_http_cache_cleaner.so
-%_libdir/libkdeinit4_klauncher.so
-%_libdir/libkdeinit4_kbuildsycoca4.so
+%_libdir/kde4/*
+%_libdir/libkdeinit4_*.so
%_kde_share_dir/apps/*
%config %_kde_config_dir/*
-/usr/share/dbus-1
-/usr/share/doc/*
-/usr/share/locale/*
-%_kde_share_dir/services
-%_kde_share_dir/servicetypes
-/etc/xdg/menus
+/usr/share/dbus-1/interfaces/*
+/usr/share/doc/kde/HTML/en/common/*
+%_kde_share_dir/services/*
+%_kde_share_dir/servicetypes/*
+/etc/xdg/menus/applications.menu.kde4
/usr/share/mime/packages/kde.xml
/usr/share/icons/hicolor/*/actions/presence_away.*
/usr/share/icons/hicolor/*/actions/presence_offline.*
/usr/share/icons/hicolor/*/actions/presence_online.*
/usr/share/icons/hicolor/*/actions/presence_unknown.*
/usr/share/man/man*/*
+%doc %lang(en) /usr/share/doc/kde/HTML/en/sonnet
+%dir /etc/xdg/menus
+%dir /usr/%_lib/kde4
+%dir /usr/share/doc/kde
+%dir /usr/share/doc/kde/HTML
+%dir /usr/share/doc/kde/HTML/en
+%dir /usr/share/doc/kde/HTML/en/common
+%dir /usr/share/kde4/servicetypes
+
%changelog
+* Wed Nov 21 2007 - dmueller(a)suse.de
+- update to 3.96.1
* Wed Nov 14 2007 - dmueller(a)suse.de
- update to 3.96.0
* Tue Nov 06 2007 - dmueller(a)suse.de
++++++ kde3-applications.diff ++++++
Index: kdecore/services/kservice.cpp
===================================================================
--- kdecore/services/kservice.cpp (revision 741745)
+++ kdecore/services/kservice.cpp (working copy)
@@ -46,6 +46,7 @@
{
const QString entryPath = q->entryPath();
bool absPath = !QDir::isRelativePath(entryPath);
+ bool kde3application = config->fileName().startsWith("/opt/kde3/share/applications/kde/");
// TODO: it makes sense to have a KConstConfigGroup I guess
const KConfigGroup desktopGroup = const_cast<KDesktopFile*>(config)->desktopGroup();
@@ -73,6 +75,8 @@
if (i != -1)
m_strName = m_strName.left(i);
}
+ if (kde3application)
+ m_strName += "/KDE3";
m_strType = config->readType();
entryMap.remove("Type");
@@ -96,6 +100,18 @@
// NOT readPathEntry, it is not XDG-compliant. Path entries written by
// KDE4 will be still treated as such, though.
m_strExec = desktopGroup.readEntry( "Exec", QString() );
+ if (kde3application && !m_strExec.startsWith("/"))
+ m_strExec = "/opt/kde3/bin/"+m_strExec;
+ else if (desktopGroup.readEntry("X-KDE-SubstituteUID"), false) {
+ int space = m_strExec.indexOf(" ");
+ if (space==-1)
+ m_strExec = KStandardDirs::findExe(m_strExec);
+ else {
+ const QString command = m_strExec.left(space);
+ m_strExec.replace(command,KStandardDirs::findExe(command));
+ }
+ }
+
entryMap.remove("Exec");
if ( m_strType == "Application" ) {
@@ -179,7 +195,8 @@
entryMap.remove("ServiceTypes");
m_lstServiceTypes += desktopGroup.readEntry( "X-KDE-ServiceTypes", QStringList() );
entryMap.remove("X-KDE-ServiceTypes");
- m_lstServiceTypes += desktopGroup.readXdgListEntry( "MimeType" );
+ if (!kde3application)
+ m_lstServiceTypes += desktopGroup.readXdgListEntry( "MimeType" );
entryMap.remove("MimeType");
if ( m_strType == "Application" && !m_lstServiceTypes.contains("Application") )
@@ -208,6 +225,8 @@
m_DBUSStartusType = KService::DBusNone;
m_strDesktopEntryName = _name.toLower();
+ if (kde3application)
+ m_strDesktopEntryName = "kde-" + m_strDesktopEntryName;
m_bAllowAsDefault = desktopGroup.readEntry("AllowDefault", true);
entryMap.remove("AllowDefault");
@@ -221,7 +240,9 @@
// qDebug("Path = %s", entryPath.toLatin1().constData());
QMap<QString,QString>::ConstIterator it = entryMap.begin();
for( ; it != entryMap.end();++it) {
- const QString key = it.key();
+ QString key = it.key();
+ if (kde3application && key=="OnlyShowIn" && QVariant(*it)=="KDE;")
+ key = "NotShowIn";
// do not store other translations like Name[fr]; kbuildsycoca will rerun if we change languages anyway
if (!key.contains('[')) {
//kDebug(7012) << " Key =" << key << " Data =" << *it;
++++++ kdelibs-3.96.0.tar.bz2 -> kdelibs-3.96.1.tar.bz2 ++++++
KDE/kdelibs4/kdelibs-3.96.0.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-3.96.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
[View Less]
1
0
Hello community,
here is the log from the commit of package kdegraphics4
checked in at Wed Nov 28 23:23:34 CET 2007.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2007-11-14 17:35:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2007-11-21 18:57:10.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 21 18:57:10 CET 2007 - dmueller(a)suse.de
+
+- update to 3.96.1
+
+-------------------------------------------------------------------
Old:
----
kdegraphics-3.96.…
[View More]0.tar.bz2
New:
----
kdegraphics-3.96.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.eu8071/_old 2007-11-28 23:23:23.000000000 +0100
+++ /var/tmp/diff_new_pack.eu8071/_new 2007-11-28 23:23:23.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdegraphics4 (Version 3.96.0)
+# spec file for package kdegraphics4 (Version 3.96.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,7 +19,7 @@
%endif
BuildRequires: poppler-devel
%if %suse_version > 1030
-BuildRequires: ghostscript-devel libpoppler-devel libpoppler-qt4-devel
+BuildRequires: libpoppler-devel libpoppler-qt4-devel
%else
%if %suse_version > 1020
BuildRequires: poppler-devel poppler-qt4
@@ -29,9 +29,9 @@
Group: Productivity/Graphics/Other
Summary: kdegraphics base package
Url: http://www.kde.org
-Version: 3.96.0
+Version: 3.96.1
Release: 1
-%define rversion 3.96.0
+%define rversion 3.96.1
Source0: kdegraphics-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -278,7 +278,6 @@
--------
The KDE Team <kde(a)kde.org>
-
%files -n kde4-okular-devel -f filelists/okular.devel
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
@@ -320,7 +319,10 @@
/usr/%_lib/strigi/strigita_dvi.so
/usr/%_lib/strigi/strigita_ico.so
%_kde_share_dir/services/gsthumbnail.desktop
+
%changelog
+* Wed Nov 21 2007 - dmueller(a)suse.de
+- update to 3.96.1
* Wed Nov 14 2007 - dmueller(a)suse.de
- update to 3.96.0
* Wed Nov 07 2007 - dmueller(a)suse.de
++++++ kdegraphics-3.96.0.tar.bz2 -> kdegraphics-3.96.1.tar.bz2 ++++++
++++ 2316 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
[View Less]
1
0