From d796716f1dc9dd0b198863d974a03bf356f636e6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:52:05 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- ChangeLog | 2 +- FAQ | 2 +- Makefile.am | 2 +- acinclude.m4 | 8 +- configure.in | 12 +- k3bsetup/k3bsetup | 2 +- k3bsetup/k3bsetup2.cpp | 2 +- kfile-plugins/Makefile.am | 1 - kfile-plugins/k3bproject/Makefile.am | 27 -- kfile-plugins/k3bproject/kfile_k3b.desktop | 53 --- .../k3bproject/kfile_k3bprojectfileplugin.cpp | 135 ------- .../k3bproject/kfile_k3bprojectfileplugin.h | 38 -- kioslaves/Makefile.am | 1 - kioslaves/videodvd/Makefile.am | 19 - kioslaves/videodvd/videodvd.cpp | 407 --------------------- kioslaves/videodvd/videodvd.desktop | 48 --- kioslaves/videodvd/videodvd.h | 55 --- kioslaves/videodvd/videodvd.protocol | 52 --- libk3b/cddb/k3bcddb.cpp | 2 +- libk3b/cddb/k3bcddbhttpquery.cpp | 4 +- libk3b/core/k3bcore.cpp | 2 +- libk3b/core/k3bexternalbinmanager.cpp | 2 +- libk3b/core/k3bglobals.cpp | 6 +- libk3b/core/k3bglobals.h | 2 +- libk3b/core/k3bglobalsettings.cpp | 2 +- libk3b/jobs/k3bblankingjob.cpp | 6 +- libk3b/jobs/k3bcdcopyjob.cpp | 8 +- libk3b/jobs/k3bdvdcopyjob.cpp | 2 +- libk3b/jobs/k3biso9660imagewritingjob.cpp | 4 +- libk3b/jobs/k3breadcdreader.cpp | 2 +- libk3b/jobs/k3bverificationjob.cpp | 6 +- libk3b/plugin/k3baudiodecoder.cpp | 2 +- libk3b/projects/audiocd/k3baudiodoc.cpp | 4 +- libk3b/projects/audiocd/k3baudiotrack.h | 2 +- libk3b/projects/datacd/k3bdatadoc.cpp | 2 +- libk3b/projects/datacd/k3bdatadoc.h | 2 +- libk3b/projects/datacd/k3bdataitem.h | 2 +- libk3b/projects/datacd/k3bdatajob.cpp | 4 +- libk3b/projects/datacd/k3bdiritem.h | 2 +- .../datacd/k3bfilecompilationsizehandler.h | 2 +- libk3b/projects/datacd/k3bfileitem.h | 2 +- libk3b/projects/datacd/k3bisoimager.cpp | 6 +- libk3b/projects/datacd/k3bisooptions.cpp | 2 +- libk3b/projects/datacd/k3bspecialdataitem.h | 2 +- libk3b/projects/datadvd/k3bdvddoc.cpp | 2 +- libk3b/projects/k3bcdrdaowriter.cpp | 2 +- libk3b/projects/k3bdoc.h | 2 +- libk3b/projects/mixedcd/k3bmixeddoc.cpp | 2 +- libk3b/projects/mixedcd/k3bmixedjob.cpp | 4 +- libk3b/projects/movixcd/k3bmovixdoc.cpp | 2 +- libk3b/projects/movixcd/k3bmovixdocpreparer.cpp | 2 +- libk3b/projects/movixdvd/k3bmovixdvddoc.cpp | 2 +- libk3b/projects/videocd/k3bvcddoc.cpp | 4 +- libk3b/projects/videocd/k3bvcdjob.cpp | 4 +- libk3b/projects/videocd/k3bvcdoptions.cpp | 2 +- libk3b/projects/videocd/k3bvcdtrack.cpp | 2 +- libk3b/projects/videocd/k3bvcdtrack.h | 2 +- libk3b/projects/videodvd/k3bvideodvddoc.cpp | 2 +- libk3b/projects/videodvd/k3bvideodvdjob.cpp | 2 +- libk3b/tools/k3bdirsizejob.h | 2 +- libk3b/tools/k3bfilesplitter.h | 2 +- libk3b/tools/k3bmd5job.cpp | 2 +- libk3bdevice/configure.in.in | 2 +- libk3bdevice/k3bdevicemanager.cpp | 2 +- libk3bdevice/k3bdiskinfo.cpp | 2 +- libk3bdevice/k3bhalconnection.cpp | 10 +- libk3bdevice/k3bmsf.h | 2 +- plugins/audiooutput/alsa/k3balsaoutputplugin.cpp | 2 +- plugins/decoder/libsndfile/configure.in.in | 2 +- plugins/encoder/external/k3bexternalencoder.cpp | 2 +- .../encoder/external/k3bexternalencodercommand.cpp | 2 +- .../external/k3bexternalencoderconfigwidget.cpp | 2 +- plugins/encoder/lame/k3blameencoder.cpp | 2 +- plugins/encoder/ogg/k3boggvorbisencoder.cpp | 4 +- plugins/encoder/skeleton.cpp | 2 +- plugins/encoder/sox/k3bsoxencoder.cpp | 2 +- .../k3baudiometainforenamerplugin.cpp | 4 +- .../audioprojectcddb/k3baudioprojectcddbplugin.cpp | 2 +- src/k3b.cpp | 10 +- src/k3bappdevicemanager.cpp | 4 +- src/k3bapplication.cpp | 2 +- src/k3bdatamodewidget.cpp | 2 +- src/k3bdebuggingoutputdialog.cpp | 2 +- src/k3bdiroperator.cpp | 2 +- src/k3bdirview.cpp | 12 +- src/k3bdiskinfoview.cpp | 2 +- src/k3bemptydiscwaiter.cpp | 2 +- src/k3bfiletreeview.cpp | 4 +- src/k3bfiletreeview.h | 2 +- src/k3bfileview.cpp | 6 +- src/k3bfirstrun.cpp | 2 +- src/k3binteractiondialog.cpp | 2 +- src/k3bjobprogressdialog.cpp | 2 +- src/k3bjobprogressosd.cpp | 2 +- src/k3bmedium.cpp | 2 +- src/k3bprojectinterface.h | 2 +- src/k3bprojectmanager.cpp | 4 +- src/k3bservicemenuinstaller.cpp | 2 +- src/k3bstatusbarmanager.cpp | 4 +- src/k3bsystemproblemdialog.cpp | 4 +- src/k3btempdirselectionwidget.cpp | 8 +- src/k3btempdirselectionwidget.h | 2 +- src/k3bwelcomewidget.cpp | 2 +- src/k3bwriterselectionwidget.cpp | 2 +- src/k3bwritingmodewidget.cpp | 2 +- src/misc/k3bblankingdialog.cpp | 2 +- src/misc/k3bcdcopydialog.cpp | 2 +- src/misc/k3bcdcopydialog.h | 2 +- src/misc/k3bcdimagewritingdialog.cpp | 6 +- src/misc/k3bdvdcopydialog.cpp | 2 +- src/misc/k3bdvdcopydialog.h | 2 +- src/misc/k3bdvdformattingdialog.cpp | 2 +- src/misc/k3bisoimagewritingdialog.cpp | 6 +- src/option/k3bburningoptiontab.cpp | 2 +- src/option/k3bcddboptiontab.cpp | 2 +- src/option/k3bdeviceoptiontab.cpp | 2 +- src/option/k3bdevicewidget.cpp | 4 +- src/option/k3bmiscoptiontab.cpp | 2 +- src/option/k3boptiondialog.cpp | 2 +- src/option/k3bpluginoptiontab.cpp | 2 +- src/option/k3bthemeoptiontab.cpp | 8 +- src/projects/k3baudioburndialog.cpp | 2 +- src/projects/k3baudiotrackdialog.cpp | 2 +- src/projects/k3bbootimageview.cpp | 2 +- src/projects/k3bdataburndialog.cpp | 6 +- src/projects/k3bdatamultisessioncombobox.cpp | 2 +- src/projects/k3bdatapropertiesdialog.cpp | 4 +- src/projects/k3bdataurladdingdialog.cpp | 2 +- src/projects/k3bdataview.cpp | 4 +- src/projects/k3bdataviewitem.cpp | 2 +- src/projects/k3bdvdburndialog.cpp | 4 +- src/projects/k3bfillstatusdisplay.cpp | 4 +- src/projects/k3bmixedburndialog.cpp | 2 +- src/projects/k3bmovixburndialog.cpp | 4 +- src/projects/k3bmovixdvdburndialog.cpp | 4 +- src/projects/k3bmovixlistview.cpp | 2 +- src/projects/k3bmovixlistview.h | 2 +- src/projects/k3bmovixoptionswidget.cpp | 2 +- src/projects/k3bmovixview.cpp | 2 +- src/projects/k3bprojectburndialog.cpp | 2 +- src/projects/k3bvcdburndialog.cpp | 4 +- src/projects/k3bvcdlistviewitem.cpp | 2 +- src/projects/k3bvcdtrackdialog.cpp | 2 +- src/projects/k3bvideodvdburndialog.cpp | 4 +- src/projects/kostore/SPEC | 2 +- src/projects/kostore/koStore.cc | 2 +- src/projects/kostore/koZipStore.cc | 2 +- src/rip/k3baudiocdview.cpp | 2 +- src/rip/k3baudioconvertingoptionwidget.cpp | 4 +- src/rip/k3baudioconvertingoptionwidget.h | 2 +- src/rip/k3baudioprojectconvertingdialog.cpp | 6 +- src/rip/k3baudiorippingdialog.cpp | 6 +- src/rip/k3bcddbpatternwidget.cpp | 2 +- src/rip/k3bvideocdinfo.cpp | 2 +- src/rip/k3bvideocdrip.cpp | 4 +- src/rip/k3bvideocdrippingdialog.cpp | 2 +- src/rip/videodvd/k3bvideodvdrippingdialog.cpp | 4 +- src/rip/videodvd/k3bvideodvdrippingview.cpp | 2 +- src/rip/videodvd/k3bvideodvdrippingwidget.cpp | 2 +- src/rip/videodvd/k3bvideodvdrippingwidget.h | 2 +- subdirs | 4 +- tdefile-plugins/Makefile.am | 1 + tdefile-plugins/k3bproject/Makefile.am | 27 ++ tdefile-plugins/k3bproject/tdefile_k3b.desktop | 53 +++ .../k3bproject/tdefile_k3bprojectfileplugin.cpp | 135 +++++++ .../k3bproject/tdefile_k3bprojectfileplugin.h | 38 ++ tdeioslaves/Makefile.am | 1 + tdeioslaves/videodvd/Makefile.am | 19 + tdeioslaves/videodvd/videodvd.cpp | 407 +++++++++++++++++++++ tdeioslaves/videodvd/videodvd.desktop | 48 +++ tdeioslaves/videodvd/videodvd.h | 55 +++ tdeioslaves/videodvd/videodvd.protocol | 52 +++ 172 files changed, 1063 insertions(+), 1063 deletions(-) delete mode 100644 kfile-plugins/Makefile.am delete mode 100644 kfile-plugins/k3bproject/Makefile.am delete mode 100644 kfile-plugins/k3bproject/kfile_k3b.desktop delete mode 100644 kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp delete mode 100644 kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h delete mode 100644 kioslaves/Makefile.am delete mode 100644 kioslaves/videodvd/Makefile.am delete mode 100644 kioslaves/videodvd/videodvd.cpp delete mode 100644 kioslaves/videodvd/videodvd.desktop delete mode 100644 kioslaves/videodvd/videodvd.h delete mode 100644 kioslaves/videodvd/videodvd.protocol create mode 100644 tdefile-plugins/Makefile.am create mode 100644 tdefile-plugins/k3bproject/Makefile.am create mode 100644 tdefile-plugins/k3bproject/tdefile_k3b.desktop create mode 100644 tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.cpp create mode 100644 tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h create mode 100644 tdeioslaves/Makefile.am create mode 100644 tdeioslaves/videodvd/Makefile.am create mode 100644 tdeioslaves/videodvd/videodvd.cpp create mode 100644 tdeioslaves/videodvd/videodvd.desktop create mode 100644 tdeioslaves/videodvd/videodvd.h create mode 100644 tdeioslaves/videodvd/videodvd.protocol diff --git a/ChangeLog b/ChangeLog index 17cc977..92fc18b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,7 +64,7 @@ * K3b now warns if user parameters for external programs have been specified. This has been introduced because there were some bug report that were caused by faulty user parameters. * Cleaned up all the job classes: No job creates a widget anymore. This allows for non-GUI usage of libk3b. - For example in a kioslave. + For example in a tdeioslave. * New option in the data project to not cache the inodes. That means it is possible to have multiple actual copies of the same file on one CD/DVD. * K3b now tries to disable stuff that might influence the burning process. This includes the KDED module diff --git a/FAQ b/FAQ index 9149889..cb0a3a9 100644 --- a/FAQ +++ b/FAQ @@ -30,7 +30,7 @@ A: You need to install NAS. Q: Where can I find K3bSetup2? A: K3bSetup2 is a KControlCenter Module. You can find it in the System Administration section or start - it manually with "tdesu kcmshell k3bsetup2". + it manually with "tdesu tdecmshell k3bsetup2". There also is a script since K3b 0.11 called k3bsetup. diff --git a/Makefile.am b/Makefile.am index 6d2b67a..703ac80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,4 +8,4 @@ AUTOMAKE_OPTIONS = foreign 1.5 #include admin/deps.am -SUBDIRS = doc libk3bdevice libk3b src kioslaves plugins kfile-plugins $(K3BSETUPDIR) +SUBDIRS = doc libk3bdevice libk3b src tdeioslaves plugins tdefile-plugins $(K3BSETUPDIR) diff --git a/acinclude.m4 b/acinclude.m4 index 4be09b4..5d61873 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then @@ -1812,7 +1812,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2118,7 +2118,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2128,7 +2128,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/configure.in b/configure.in index 7a17863..14cea0f 100644 --- a/configure.in +++ b/configure.in @@ -371,7 +371,7 @@ dnl === check for resmgr - end ============ -# HAL check from tdebase/kioslave/media +# HAL check from tdebase/tdeioslave/media AC_ARG_WITH( hal, @@ -675,7 +675,7 @@ dnl dnl Don't use PKG_CHECK, since if there is no pkg-config installed, dnl then there is no auto* magic for it either. dnl -dnl Tests copied from tdebase/kioslave/thumbnail/ +dnl Tests copied from tdebase/tdeioslave/thumbnail/ dnl if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -951,10 +951,10 @@ KDE_CREATE_SUBDIRSLIST AC_CONFIG_FILES([ Makefile ]) AC_CONFIG_FILES([ doc/Makefile ]) AC_CONFIG_FILES([ k3bsetup/Makefile ]) -AC_CONFIG_FILES([ kfile-plugins/Makefile ]) -AC_CONFIG_FILES([ kfile-plugins/k3bproject/Makefile ]) -AC_CONFIG_FILES([ kioslaves/Makefile ]) -AC_CONFIG_FILES([ kioslaves/videodvd/Makefile ]) +AC_CONFIG_FILES([ tdefile-plugins/Makefile ]) +AC_CONFIG_FILES([ tdefile-plugins/k3bproject/Makefile ]) +AC_CONFIG_FILES([ tdeioslaves/Makefile ]) +AC_CONFIG_FILES([ tdeioslaves/videodvd/Makefile ]) AC_CONFIG_FILES([ libk3b/Makefile ]) AC_CONFIG_FILES([ libk3b/cddb/Makefile ]) AC_CONFIG_FILES([ libk3b/core/Makefile ]) diff --git a/k3bsetup/k3bsetup b/k3bsetup/k3bsetup index 9a85ccd..baed482 100644 --- a/k3bsetup/k3bsetup +++ b/k3bsetup/k3bsetup @@ -17,4 +17,4 @@ #TODO: if tdesu not found and not currently root use kdialog to display an error message -tdesu kcmshell k3bsetup2 +tdesu tdecmshell k3bsetup2 diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp index 8cd7e70..e0a8d89 100644 --- a/k3bsetup/k3bsetup2.cpp +++ b/k3bsetup/k3bsetup2.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/kfile-plugins/Makefile.am b/kfile-plugins/Makefile.am deleted file mode 100644 index c1ba442..0000000 --- a/kfile-plugins/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = k3bproject \ No newline at end of file diff --git a/kfile-plugins/k3bproject/Makefile.am b/kfile-plugins/k3bproject/Makefile.am deleted file mode 100644 index d3f53d4..0000000 --- a/kfile-plugins/k3bproject/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/../../libk3b/core \ - -I$(srcdir)/../../libk3b/core \ - -I$(srcdir)/../../libk3b/plugin \ - -I$(srcdir)/../../libk3b/tools \ - -I$(srcdir)/../../libk3b/projects \ - -I$(srcdir)/../../libk3b/projects/datacd \ - -I$(srcdir)/../../libk3bdevice \ - -I$(srcdir)/../../src/projects \ - $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_k3bprojectfileplugin.h - -kde_module_LTLIBRARIES = kfile_k3b.la - -kfile_k3b_la_SOURCES = kfile_k3bprojectfileplugin.cpp -kfile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) -kfile_k3b_la_LIBADD = $(LIB_KIO) ../../libk3b/libk3b.la ../../src/projects/kostore/libkostore.la - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -services_DATA = kfile_k3b.desktop -servicesdir = $(kde_servicesdir) - -messages: - $(XGETTEXT) *.cpp -o $(podir)/kfile_k3b.pot diff --git a/kfile-plugins/k3bproject/kfile_k3b.desktop b/kfile-plugins/k3bproject/kfile_k3b.desktop deleted file mode 100644 index 651124f..0000000 --- a/kfile-plugins/k3bproject/kfile_k3b.desktop +++ /dev/null @@ -1,53 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Service -Name=K3b Project Info -Name[af]=K3b Projek Informasie -Name[ar]= معلومات عن مشروع K3B -Name[bg]=Информация за K3b проект -Name[bn]=কে-থ্রি-বি প্রকল্প তথ্য -Name[br]=Titouroù raktres K3b -Name[ca]=Informació sobre el projecte de K3b -Name[cs]=Info o K3b projektu -Name[da]=K3b Projektinformation -Name[de]=K3b Projektinformationen -Name[el]=Πληροφορίες έργου K3b -Name[eo]=K3b projekta informo -Name[es]=Información de proyecto K3b -Name[et]=K3b projekti info -Name[fa]= اطلاعات پروژۀ K3b -Name[fi]=K3b-projektin kuvaus -Name[fr]=Information sur le projet K3b -Name[ga]=Eolas faoin Tionscadal K3b -Name[gl]=Informazón de Proxecto K3b -Name[hu]=K3b-projektinformáció -Name[is]=K3b verkefnisupplýsingar -Name[it]=Informazioni progetto K3b -Name[ja]=K3b プロジェクト情報 -Name[km]=ព័ត៌មាន​របស់​​គម្រោង K3b -Name[lt]=K3b projekto informacija -Name[mk]=Информации за проект од K3b -Name[nb]=K3b-prosjektinformasjon -Name[nds]=K3b-Projektinformatschonen -Name[nl]=K3b-projectinformatie -Name[nn]=K3b-prosjektinfo -Name[pa]=K3b ਪ੍ਰੋਜੈੱਕਟ ਜਾਣਕਾਰੀ -Name[pl]=Informacja dla projektu K3b -Name[pt]=Informação do Projecto do K3b -Name[pt_BR]=Informações do Projeto do K3b -Name[ru]=Свдения о проекте K3b -Name[sk]=K3b informácie o projekte -Name[sr]=Инфо о K3b пројекту -Name[sr@Latn]=Info o K3b projektu -Name[sv]=K3b-projektinformation -Name[tr]=K3b Proje Bilgisi -Name[uk]=Інформація проекту K3b -Name[uz]=K3b loyihasi haqida maʼlumot -Name[uz@cyrillic]=K3b лойиҳаси ҳақида маълумот -Name[zh_CN]=K3b 方案信息 -Name[zh_TW]=K3b 專案資訊 -ServiceTypes=KFilePlugin -X-TDE-Library=kfile_k3b -MimeType=application/x-k3b -PreferredGroups=General -PreferredItems=documenttype diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp deleted file mode 100644 index 953f0e7..0000000 --- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp +++ /dev/null @@ -1,135 +0,0 @@ -/* - * - * $Id: sourceheader,v 1.3 2005/01/19 13:03:46 trueg Exp $ - * Copyright (C) 2005 Sebastian Trueg - * - * This file is part of the K3b project. - * Copyright (C) 1998-2007 Sebastian Trueg - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * See the file "COPYING" for the exact licensing terms. - */ - - -#include - -#include "kfile_k3bprojectfileplugin.h" -#include "kostore/koStore.h" -#include "kostore/koStoreDevice.h" - -#include - -#include - -#include -#include -#include - - - -K_EXPORT_COMPONENT_FACTORY(kfile_k3b, KGenericFactory("kfile_k3b")) - - -K3bProjectFilePlugin::K3bProjectFilePlugin( TQObject *parent, const char *name, - const TQStringList &args) - : KFilePlugin(parent, name, args) -{ - KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-k3b" ); - - KFileMimeTypeInfo::GroupInfo* group = addGroupInfo( info, "General", i18n("General") ); - - addItemInfo( group, "documenttype", i18n("Document Type"), TQVariant::String ); -} - - -bool K3bProjectFilePlugin::readInfo( KFileMetaInfo& info, uint /*what*/) -{ - if( !info.url().isLocalFile() ) { - kdDebug() << "(K3bProjectFilePluginInfo) no local file." << endl; - return false; - } - - // open the file - bool success = false; - TQDomDocument xmlDoc; - - // try opening a store - KoStore* store = KoStore::createStore( info.url().path(), KoStore::Read ); - if( store && !store->bad() && store->open( "maindata.xml" ) ) { - TQIODevice* dev = store->device(); - dev->open( IO_ReadOnly ); - if( xmlDoc.setContent( dev ) ) - success = true; - dev->close(); - store->close(); - } - else - kdDebug() << "(K3bProjectFilePluginInfo) failed to open the store." << endl; - - if( success ) { - // check the documents DOCTYPE - K3bDoc::DocType type = K3bDoc::AUDIO; - if( xmlDoc.doctype().name() == "k3b_audio_project" ) - type = K3bDoc::AUDIO; - else if( xmlDoc.doctype().name() == "k3b_data_project" ) - type = K3bDoc::DATA; - else if( xmlDoc.doctype().name() == "k3b_vcd_project" ) - type = K3bDoc::VCD; - else if( xmlDoc.doctype().name() == "k3b_mixed_project" ) - type = K3bDoc::MIXED; - else if( xmlDoc.doctype().name() == "k3b_movix_project" ) - type = K3bDoc::MOVIX; - else if( xmlDoc.doctype().name() == "k3b_movixdvd_project" ) - type = K3bDoc::MOVIX_DVD; - else if( xmlDoc.doctype().name() == "k3b_dvd_project" ) - type = K3bDoc::DVD; - else if( xmlDoc.doctype().name() == "k3b_video_dvd_project" ) - type = K3bDoc::VIDEODVD; - else { - kdDebug() << "(K3bDoc) unknown doc type: " << xmlDoc.doctype().name() << endl; - success = false; - } - - TQString stringType; - switch( type ) { - case K3bDoc::AUDIO: - stringType = i18n("Audio CD"); - break; - case K3bDoc::DATA: - stringType = i18n("Data CD"); - break; - case K3bDoc::MIXED: - stringType = i18n("Mixed Mode CD"); - break; - case K3bDoc::VCD: - stringType = i18n("Video CD"); - break; - case K3bDoc::MOVIX: - stringType = i18n("eMovix CD"); - break; - case K3bDoc::MOVIX_DVD: - stringType = i18n("eMovix DVD"); - break; - case K3bDoc::DVD: - stringType = i18n("Data DVD"); - break; - case K3bDoc::VIDEODVD: - stringType = i18n("Video DVD"); - break; - } - - // and finally display it! - KFileMetaInfoGroup group = appendGroup(info, "General"); - appendItem( group, "documenttype", stringType ); - } - - delete store; - - return success; -} - -#include "kfile_k3bprojectfileplugin.moc" - diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h deleted file mode 100644 index e53ebce..0000000 --- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * - * $Id: sourceheader,v 1.3 2005/01/19 13:03:46 trueg Exp $ - * Copyright (C) 2005 Sebastian Trueg - * - * This file is part of the K3b project. - * Copyright (C) 1998-2007 Sebastian Trueg - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * See the file "COPYING" for the exact licensing terms. - */ - -#ifndef __KFILE_K3BPROJECTFILEPLUGIN_H__ -#define __KFILE_K3BPROJECTFILEPLUGIN_H__ - -/** - * Note: For further information look into <$TDEDIR/include/kfilemetainfo.h> - */ -#include - -class TQStringList; - -class K3bProjectFilePlugin: public KFilePlugin -{ - Q_OBJECT - - - public: - K3bProjectFilePlugin( TQObject *parent, const char *name, const TQStringList& args ); - - virtual bool readInfo( KFileMetaInfo& info, uint what); -}; - -#endif - diff --git a/kioslaves/Makefile.am b/kioslaves/Makefile.am deleted file mode 100644 index 55ab08d..0000000 --- a/kioslaves/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = videodvd diff --git a/kioslaves/videodvd/Makefile.am b/kioslaves/videodvd/Makefile.am deleted file mode 100644 index eccc0e9..0000000 --- a/kioslaves/videodvd/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libk3b/tools \ - -I$(srcdir)/../../libk3b/core \ - -I$(srcdir)/../../libk3bdevice \ - $(all_includes) - -kde_module_LTLIBRARIES = kio_videodvd.la - -kio_videodvd_la_SOURCES = videodvd.cpp -kio_videodvd_la_LIBADD = -lkio ../../libk3b/libk3b.la -kio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lkio -ltdecore -L../../libk3bdevice/.libs -lk3bdevice - -protocol_DATA = videodvd.protocol -protocoldir = $(kde_servicesdir) - -konq_sidebartree_init_services_data_DATA = videodvd.desktop -konq_sidebartree_init_services_datadir = $(kde_datadir)/konqsidebartng/virtual_folders/services - -messages: - $(XGETTEXT) *.cpp -o $(podir)/kio_videodvd.pot diff --git a/kioslaves/videodvd/videodvd.cpp b/kioslaves/videodvd/videodvd.cpp deleted file mode 100644 index c3398a1..0000000 --- a/kioslaves/videodvd/videodvd.cpp +++ /dev/null @@ -1,407 +0,0 @@ -/* - * - * $Id: sourceheader 380067 2005-01-19 13:03:46Z trueg $ - * Copyright (C) 2005 Sebastian Trueg - * - * This file is part of the K3b project. - * Copyright (C) 1998-2007 Sebastian Trueg - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * See the file "COPYING" for the exact licensing terms. - */ - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -#include "videodvd.h" - -using namespace TDEIO; - -extern "C" -{ - LIBK3B_EXPORT int kdemain( int argc, char **argv ) - { - TDEInstance instance( "kio_videodvd" ); - - kdDebug(7101) << "*** Starting kio_videodvd " << endl; - - if (argc != 4) - { - kdDebug(7101) << "Usage: kio_videodvd protocol domain-socket1 domain-socket2" << endl; - exit(-1); - } - - kio_videodvdProtocol slave(argv[2], argv[3]); - slave.dispatchLoop(); - - kdDebug(7101) << "*** kio_videodvd Done" << endl; - return 0; - } -} - - - -// FIXME: Does it really make sense to use a static device manager? Are all instances -// of videodvd started in another process? -K3bDevice::DeviceManager* kio_videodvdProtocol::s_deviceManager = 0; -int kio_videodvdProtocol::s_instanceCnt = 0; - -kio_videodvdProtocol::kio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket) - : SlaveBase("kio_videodvd", pool_socket, app_socket) -{ - kdDebug() << "kio_videodvdProtocol::kio_videodvdProtocol()" << endl; - if( !s_deviceManager ) - { - s_deviceManager = new K3bDevice::DeviceManager(); - s_deviceManager->setCheckWritingModes( false ); - s_deviceManager->scanBus(); - } - s_instanceCnt++; -} - - -kio_videodvdProtocol::~kio_videodvdProtocol() -{ - kdDebug() << "kio_videodvdProtocol::~kio_videodvdProtocol()" << endl; - s_instanceCnt--; - if( s_instanceCnt == 0 ) - { - delete s_deviceManager; - s_deviceManager = 0; - } -} - - -TDEIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) const -{ - TDEIO::UDSEntry uds; - TDEIO::UDSAtom a; - - a.m_uds = TDEIO::UDS_NAME; - a.m_str = e->name(); - uds.append( a ); - - a.m_uds = TDEIO::UDS_ACCESS; - a.m_long = e->permissions(); - uds.append( a ); - - a.m_uds = TDEIO::UDS_CREATION_TIME; - a.m_long = e->date(); - uds.append( a ); - - a.m_uds = TDEIO::UDS_MODIFICATION_TIME; - a.m_long = e->date(); - uds.append( a ); - - if( e->isDirectory() ) - { - a.m_uds = TDEIO::UDS_FILE_TYPE; - a.m_long = S_IFDIR; - uds.append( a ); - - a.m_uds = TDEIO::UDS_MIME_TYPE; - a.m_str = "inode/directory"; - uds.append( a ); - } - else - { - const K3bIso9660File* file = static_cast( e ); - - a.m_uds = TDEIO::UDS_SIZE; - a.m_long = file->size(); - uds.append( a ); - - a.m_uds = TDEIO::UDS_FILE_TYPE; - a.m_long = S_IFREG; - uds.append( a ); - - a.m_uds = TDEIO::UDS_MIME_TYPE; - if( e->name().endsWith( "VOB" ) ) - a.m_str = "video/mpeg"; - else - a.m_str = "unknown"; - uds.append( a ); - } - - return uds; -} - - -// FIXME: remember the iso instance for quicker something and search for the videodvd -// in the available devices. -K3bIso9660* kio_videodvdProtocol::openIso( const KURL& url, TQString& plainIsoPath ) -{ - // get the volume id from the url - TQString volumeId = url.path().section( '/', 1, 1 ); - - kdDebug() << "(kio_videodvdProtocol) searching for Video dvd: " << volumeId << endl; - - // now search the devices for this volume id - // FIXME: use the cache created in listVideoDVDs - for( TQPtrListIterator it( s_deviceManager->dvdReader() ); *it; ++it ) { - K3bDevice::Device* dev = *it; - K3bDevice::DiskInfo di = dev->diskInfo(); - - // we search for a DVD with a single track. - // this time let K3bIso9660 decide if we need dvdcss or not - // FIXME: check for encryption and libdvdcss and report an error - if( di.isDvdMedia() && di.numTracks() == 1 ) { - K3bIso9660* iso = new K3bIso9660( dev ); - iso->setPlainIso9660( true ); - if( iso->open() && iso->primaryDescriptor().volumeId == volumeId ) { - plainIsoPath = url.path().section( "/", 2, -1 ) + "/"; - kdDebug() << "(kio_videodvdProtocol) using iso path: " << plainIsoPath << endl; - return iso; - } - delete iso; - } - } - - error( ERR_SLAVE_DEFINED, i18n("No VideoDVD found") ); - return 0; -} - - -void kio_videodvdProtocol::get(const KURL& url ) -{ - kdDebug() << "kio_videodvd::get(const KURL& url)" << endl ; - - TQString isoPath; - if( K3bIso9660* iso = openIso( url, isoPath ) ) - { - const K3bIso9660Entry* e = iso->firstIsoDirEntry()->entry( isoPath ); - if( e && e->isFile() ) - { - const K3bIso9660File* file = static_cast( e ); - totalSize( file->size() ); - TQByteArray buffer( 10*2048 ); - int read = 0; - int cnt = 0; - TDEIO::filesize_t totalRead = 0; - while( (read = file->read( totalRead, buffer.data(), buffer.size() )) > 0 ) - { - buffer.resize( read ); - data(buffer); - ++cnt; - totalRead += read; - if( cnt == 10 ) - { - cnt = 0; - processedSize( totalRead ); - } - } - - delete iso; - - data(TQByteArray()); // empty array means we're done sending the data - - if( read == 0 ) - finished(); - else - error( ERR_SLAVE_DEFINED, i18n("Read error.") ); - } - else - error( ERR_DOES_NOT_EXIST, url.path() ); - } -} - - -void kio_videodvdProtocol::listDir( const KURL& url ) -{ - if( url.path() == "/" ) { - listVideoDVDs(); - } - else { - TQString isoPath; - K3bIso9660* iso = openIso( url, isoPath ); - if( iso ) { - const K3bIso9660Directory* mainDir = iso->firstIsoDirEntry(); - const K3bIso9660Entry* e = mainDir->entry( isoPath ); - if( e ) { - if( e->isDirectory() ) { - const K3bIso9660Directory* dir = static_cast(e); - TQStringList el = dir->entries(); - el.remove( "." ); - el.remove( ".." ); - UDSEntryList udsl; - for( TQStringList::const_iterator it = el.begin(); it != el.end(); ++it ) - udsl.append( createUDSEntry( dir->entry( *it ) ) ); - listEntries( udsl ); - finished(); - } - else { - error( ERR_CANNOT_ENTER_DIRECTORY, url.path() ); - } - } - else { - error( ERR_CANNOT_ENTER_DIRECTORY, url.path() ); - } - - // for testing we always do the whole thing - delete iso; - } - } -} - - -void kio_videodvdProtocol::listVideoDVDs() -{ - int cnt = 0; - - for( TQPtrListIterator it( s_deviceManager->dvdReader() ); *it; ++it ) { - K3bDevice::Device* dev = *it; - K3bDevice::DiskInfo di = dev->diskInfo(); - - // we search for a DVD with a single track. - if( di.isDvdMedia() && di.numTracks() == 1 ) { - // - // now do a quick check for VideoDVD. - // - no dvdcss for speed - // - only a check for the VIDEO_TS dir - // - K3bIso9660 iso( new K3bIso9660DeviceBackend(dev) ); - iso.setPlainIso9660( true ); - if( iso.open() && iso.firstIsoDirEntry()->entry( "VIDEO_TS" ) ) { - // FIXME: cache the entry for speedup - - UDSEntryList udsl; - TDEIO::UDSEntry uds; - TDEIO::UDSAtom a; - - a.m_uds = TDEIO::UDS_NAME; - a.m_str = iso.primaryDescriptor().volumeId; - uds.append( a ); - - a.m_uds = TDEIO::UDS_FILE_TYPE; - a.m_long = S_IFDIR; - uds.append( a ); - - a.m_uds = TDEIO::UDS_MIME_TYPE; - a.m_str = "inode/directory"; - uds.append( a ); - - a.m_uds = TDEIO::UDS_ICON_NAME; - a.m_str = "dvd_unmount"; - uds.append( a ); - - udsl.append( uds ); - - listEntries( udsl ); - - ++cnt; - } - } - } - - if( cnt ) - finished(); - else - error( ERR_SLAVE_DEFINED, i18n("No VideoDVD found") ); -} - - -void kio_videodvdProtocol::stat( const KURL& url ) -{ - if( url.path() == "/" ) { - // - // stat the root path - // - TDEIO::UDSEntry uds; - TDEIO::UDSAtom a; - - a.m_uds = TDEIO::UDS_NAME; - a.m_str = "/"; - uds.append( a ); - - a.m_uds = TDEIO::UDS_FILE_TYPE; - a.m_long = S_IFDIR; - uds.append( a ); - - a.m_uds = TDEIO::UDS_MIME_TYPE; - a.m_str = "inode/directory"; - uds.append( a ); - - statEntry( uds ); - finished(); - } - else { - TQString isoPath; - K3bIso9660* iso = openIso( url, isoPath ); - if( iso ) { - const K3bIso9660Entry* e = iso->firstIsoDirEntry()->entry( isoPath ); - if( e ) { - statEntry( createUDSEntry( e ) ); - finished(); - } - else - error( ERR_DOES_NOT_EXIST, url.path() ); - - delete iso; - } - } -} - - -// FIXME: when does this get called? It seems not to be used for the files. -void kio_videodvdProtocol::mimetype( const KURL& url ) -{ - if( url.path() == "/" ) { - error( ERR_UNSUPPORTED_ACTION, "mimetype(/)" ); - return; - } - - TQString isoPath; - K3bIso9660* iso = openIso( url, isoPath ); - if( iso ) - { - const K3bIso9660Entry* e = iso->firstIsoDirEntry()->entry( isoPath ); - if( e ) - { - if( e->isDirectory() ) - mimeType( "inode/directory" ); - else if( e->name().endsWith( ".VOB" ) ) - { - mimetype( "video/mpeg" ); - } - else - { - // send some data - const K3bIso9660File* file = static_cast( e ); - TQByteArray buffer( 10*2048 ); - int read = file->read( 0, buffer.data(), buffer.size() ); - if( read > 0 ) - { - buffer.resize( read ); - data(buffer); - data(TQByteArray()); - finished(); - // FIXME: do we need to emit finished() after emitting the end of data()? - } - else - error( ERR_SLAVE_DEFINED, i18n("Read error.") ); - } - } - delete iso; - } -} diff --git a/kioslaves/videodvd/videodvd.desktop b/kioslaves/videodvd/videodvd.desktop deleted file mode 100644 index 1454f40..0000000 --- a/kioslaves/videodvd/videodvd.desktop +++ /dev/null @@ -1,48 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Link -URL=videodvd:/ -Icon=dvd_unmount -Name=Video DVD Browser -Name[af]=Video DVD Blaaier -Name[ar]= قارىء القرص المدمج المرئي الرقمي DVD -Name[bg]=Браузър за видео DVD -Name[br]=Furcher DVD Video -Name[ca]=Navegador de DVDs de vídeo -Name[cs]=Prohlížeč Video DVD -Name[da]=Video-dvd browser -Name[de]=Video-DVD-Browser -Name[el]=Περιηγητής Video DVD -Name[eo]=Videa DVD foliumilo -Name[es]=Navegador de DVD de vídeo -Name[et]=Video DVD sirvija -Name[fa]= مرورگر دی وی دی ویدئویی -Name[fi]=Video-dvd selain -Name[fr]=Navigateur de DVD -Name[gl]=Explorador de Vídeo DVD -Name[hu]=Video DVD-böngésző -Name[is]=Vídeó DVD flakkari -Name[it]=Navigatore DVD video -Name[ja]=ビデオ DVD ブラウザ -Name[ka]=ვიდეო DVD-ის ბროუზერი -Name[km]=កម្មវិធី​រុករក​ឌីវីឌី​វីដេអូ -Name[lt]=Video DVD naršyklė -Name[nds]=Video-DVD-Kieker -Name[nn]=Film-DVD-lesar -Name[pa]=ਵੀਡਿਓ DVD ਝਲਕਾਰਾ -Name[pl]=Przeglądarka płyt DVD Video -Name[pt]=Navegador de DVD de Vídeo -Name[pt_BR]=Navegador de DVD de Vídeo -Name[sk]=Video DVD prehliadač -Name[sr]=Прегледач видео DVD-а -Name[sr@Latn]=Pregledač video DVD-a -Name[sv]=Video-dvd bläddrare -Name[tr]=Görüntü DVD'si Gezgini -Name[uk]=Навігатор відео-DVD -Name[uz]=Video-DVD brauzeri -Name[uz@cyrillic]=Видео-DVD браузери -Name[zh_CN]=视频 DVD 浏览器 -Name[zh_TW]=Video DVD 瀏覽器 -Open=false -X-TDE-TreeModule=Directory -X-TDE-KonqSidebarModule=konqsidebar_tree diff --git a/kioslaves/videodvd/videodvd.h b/kioslaves/videodvd/videodvd.h deleted file mode 100644 index d408931..0000000 --- a/kioslaves/videodvd/videodvd.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * - * $Id: sourceheader 380067 2005-01-19 13:03:46Z trueg $ - * Copyright (C) 2005 Sebastian Trueg - * - * This file is part of the K3b project. - * Copyright (C) 1998-2007 Sebastian Trueg - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * See the file "COPYING" for the exact licensing terms. - */ - - -#ifndef _videodvd_H_ -#define _videodvd_H_ - -#include -#include - -#include -#include -#include - -class TQCString; -class K3bIso9660Entry; -class K3bIso9660; -namespace K3bDevice -{ - class DeviceManager; -} - -class kio_videodvdProtocol : public TDEIO::SlaveBase -{ -public: - kio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket); - ~kio_videodvdProtocol(); - - void mimetype( const KURL& url ); - void stat( const KURL& url ); - void get( const KURL& url ); - void listDir( const KURL& url ); - -private: - K3bIso9660* openIso( const KURL&, TQString& plainIsoPath ); - TDEIO::UDSEntry createUDSEntry( const K3bIso9660Entry* e ) const; - void listVideoDVDs(); - - static K3bDevice::DeviceManager* s_deviceManager; - static int s_instanceCnt; -}; - -#endif diff --git a/kioslaves/videodvd/videodvd.protocol b/kioslaves/videodvd/videodvd.protocol deleted file mode 100644 index 6337443..0000000 --- a/kioslaves/videodvd/videodvd.protocol +++ /dev/null @@ -1,52 +0,0 @@ -[Protocol] -exec=kio_videodvd -protocol=videodvd -input=none -output=filesystem -reading=true -listing=Name,Type,Size,Date -Icon=dvd_unmount -Class=:local -Description=A kioslave that allows files to be copied from a Video DVD (including decryption) -Description[af]='n 'Kioslave' wat jou toelaat om lêers vanaf 'n Video DVD te kopiëer. Dit doen ook die nodige dekripsie. -Description[ar]= يسمح هذا ال-kioslave بنسخ الملفات من قرص مدمج مرئي رقمي DVD ( بما فيه فك التشفير ) -Description[bg]=kioslave, позволяващ ви да копирате файлове от видео DVD (включително разшифроването) -Description[bn]=একটি কে-আই-ও স্লেভ যেটি একটি ভিডিও ডিভিডি থেকে ফাইল কপি করতে অনুমতিদেয় (ডিক্রিপশন সহ) -Description[ca]=Un kioslave que permet que es copiïn fitxers des d'un DVD de vídeo (incloent el desxifrat) -Description[cs]=Kioslave umožňující kopírování video DVD (včetně dekódování) -Description[da]=En kioslave som gør det muligt at kopiere filer fra en video-dvd (inklusive afkodning) -Description[de]=Ein-/Ausgabemodul, mit dem man Dateien von einer Video-DVD kopieren kann (inkl. Entschlüsselung) -Description[el]=Ένα kioslave που επιτρέπει την αντιγραφή αρχείων από ένα DVD βίντεο (δυνατότητα αποκρυπτογράφησης) -Description[eo]=Kioslave kiu permesas kopii dosierojn el videa DVD (inklude malĉifro) -Description[es]=Un kioslave que permite copiar archivos de un DVD de vídeo (incluye descifrado) -Description[et]=KIO-moodul, mis võimaldab kopeerida faile video DVD-lt (vajadusel dekrüpteerib) -Description[fa]=یک kioslave که اجازه می‌دهد پرونده‌ها از یک دی وی دی ویدئویی )شامل سرگشایی( رونوشت شوند -Description[fi]=Kioslave-palvelu, joka mahdollistaa tiedostojen purkamisen dvd-levyltä. -Description[fr]=Un kioslave qui permet de copier des fichiers depuis un DVD Vidéo (incluant le déchiffrement) -Description[gl]=Un kioslave que permite copiar ficheiros dun Video DVD (incluindo descifrar) -Description[he]=עבד קלט/פלט של KDE המאפשר לקבצים להיות מועתקים מתקליטור וידאו של DVD (כולל פענוח) -Description[hu]=Kioslave, amellyel fájlokat lehet másolni Video DVD-ről (dekódolással együtt) -Description[is]=Kioslave sem leyfir afritun af skrám frá vídeó DVD (með afkóðun) -Description[it]=Un kioslave che permette ai file di essere copiati da un DVD video (incluso decifrazione) -Description[ja]=ビデオ DVD からファイルをコピーすることを可能にする kioslave (暗号解除も含む) -Description[ka]=Kioslave, რომელიც იძლევა Video DVD-დან ასლის ფაილების მიღების საშუელებას (გაშიფრვასთან ერთად) -Description[km]=​kioslave ដែល​អនុញ្ញាត​ឲ្យ​ចម្លង​​ឯកសារ​ពី​ឌីវីឌី​វីដេអូ(រួម​ទាំង​ការ​ឌិគ្រីប) -Description[lt]=Priedas (kioslave) leidžiantis kopijuoti bylas iš Video DVD (taip pat ir atšifruoti) -Description[ms]=kioslave yang membenarkan fail untuk disalin dari DVD Video (termasuk nyahenkripsi) -Description[nb]=En kioslave som gjør det mulig å kopiere filer fra en Video-DVD (medregnet dekryptering) -Description[nds]=En In-/Utgaavmoduul, mit dat sik Dateien vun en Video-DVD koperen laat (ok mit Opslöteln) -Description[nl]=Een kioslave waarmee u bestanden van een video-dvd kunt kopiëren (inclusief versleuteling) -Description[nn]=Ein kioslave som gjer det mogleg å kopiera filer frå ein film-DVD (inkludert kryptering) -Description[pa]=ਇੱਕ kioslave ਹੈ, ਜੋ ਕਿ ਫਾਇਲਾਂ ਨੂੰ ਇੱਕ DVD (ਡਿਸਕਰਿਪਸ਼ਨ ਸਮੇ) ਤੋਂ ਨਕਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ -Description[pl]=Wtyczka protokołu pozwalająca kopiować pliki z płyt DVD Video (łącznie z odszyfrowywaniem) -Description[pt]=Um 'kioslave' que permite copiar ficheiros de um DVD Vídeo (incluindo decifrar) -Description[pt_BR]=Um kioslave que permite que arquivos sejam copiados de um DVD de Vídeo (incluindo a quebra da proteção) -Description[ru]=Позволяет копировать файлы с Video DVD (с дешифровкой) -Description[sk]=kioslave, ktorý umožňuje kopírovať súbory z Video DVD (vrátane dešifrovania) -Description[sr]=kioslave који омогућава копирање фајлова са видео DVD-а (укључујући дешифровање) -Description[sr@Latn]=kioslave koji omogućava kopiranje fajlova sa video DVD-a (uključujući dešifrovanje) -Description[sv]=En I/O-slav som gör det möjligt att kopiera filer från en video-dvd (inklusive avkodning) -Description[tr]= Bir Görüntü DVD'sinden dosyaların kopyalanmasını (ve kodunun çözülmesini) sağlayan kioslave -Description[uk]=Підлеглий В/В, який дає змогу копіювати файли з Відео DVD (включаючи розшифрування) -Description[zh_CN]=允许从视频 DVD(包括加密影碟)中复制文件的 kioslave -Description[zh_TW]=允許直接從 Video DVD 複製檔案的 kioslave(會自動解密) diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp index d1852a8..9007455 100644 --- a/libk3b/cddb/k3bcddb.cpp +++ b/libk3b/cddb/k3bcddb.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp index 63e5581..20d92e5 100644 --- a/libk3b/cddb/k3bcddbhttpquery.cpp +++ b/libk3b/cddb/k3bcddbhttpquery.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include K3bCddbHttpQuery::K3bCddbHttpQuery( TQObject* parent, const char* name ) diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index 4af572f..dde6c95 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp index 83ec1b6..902025d 100644 --- a/libk3b/core/k3bexternalbinmanager.cpp +++ b/libk3b/core/k3bexternalbinmanager.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index 42ccebc..6001072 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -29,11 +29,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h index 0964258..1a31696 100644 --- a/libk3b/core/k3bglobals.h +++ b/libk3b/core/k3bglobals.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include "k3b_export.h" diff --git a/libk3b/core/k3bglobalsettings.cpp b/libk3b/core/k3bglobalsettings.cpp index 1301b8b..b4b4c20 100644 --- a/libk3b/core/k3bglobalsettings.cpp +++ b/libk3b/core/k3bglobalsettings.cpp @@ -15,7 +15,7 @@ #include "k3bglobalsettings.h" -#include +#include K3bGlobalSettings::K3bGlobalSettings() diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp index aeab621..d023b58 100644 --- a/libk3b/jobs/k3bblankingjob.cpp +++ b/libk3b/jobs/k3bblankingjob.cpp @@ -21,10 +21,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index 76bc7d3..91bcbcc 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -33,14 +33,14 @@ #include #include -#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index 6f36bf6..343f413 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp index e21e780..59a07c9 100644 --- a/libk3b/jobs/k3biso9660imagewritingjob.cpp +++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp @@ -31,10 +31,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index ed4aacd..afb9c9d 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp index e5333fe..b66ac89 100644 --- a/libk3b/jobs/k3bverificationjob.cpp +++ b/libk3b/jobs/k3bverificationjob.cpp @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/libk3b/plugin/k3baudiodecoder.cpp b/libk3b/plugin/k3baudiodecoder.cpp index b2d347b..915b8e7 100644 --- a/libk3b/plugin/k3baudiodecoder.cpp +++ b/libk3b/plugin/k3baudiodecoder.cpp @@ -21,7 +21,7 @@ #include "k3bpluginmanager.h" #include -#include +#include #include diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index c66e000..37fb7a8 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -45,10 +45,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/libk3b/projects/audiocd/k3baudiotrack.h b/libk3b/projects/audiocd/k3baudiotrack.h index 0970662..3f741be 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.h +++ b/libk3b/projects/audiocd/k3baudiotrack.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index c48650e..8f0fee9 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h index 00312b6..4d9b58e 100644 --- a/libk3b/projects/datacd/k3bdatadoc.h +++ b/libk3b/projects/datacd/k3bdatadoc.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include "k3b_export.h" class K3bDataItem; diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h index 1f68d68..7e59621 100644 --- a/libk3b/projects/datacd/k3bdataitem.h +++ b/libk3b/projects/datacd/k3bdataitem.h @@ -23,7 +23,7 @@ class K3bDataDoc; #include -#include +#include #include #include "k3b_export.h" diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index 8eb7d11..c13cf75 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -40,8 +40,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h index c33610f..ba88c21 100644 --- a/libk3b/projects/datacd/k3bdiritem.h +++ b/libk3b/projects/datacd/k3bdiritem.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include "k3bdataitem.h" #include "k3b_export.h" diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.h b/libk3b/projects/datacd/k3bfilecompilationsizehandler.h index 4745264..d754e09 100644 --- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.h +++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.h @@ -17,7 +17,7 @@ #define _K3B_FILECOMPILATION_SIZE_HANDLER_H_ -#include +#include #include class K3bDataItem; diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h index 45e5b08..cfa553d 100644 --- a/libk3b/projects/datacd/k3bfileitem.h +++ b/libk3b/projects/datacd/k3bfileitem.h @@ -21,7 +21,7 @@ #include "k3bdataitem.h" #include -#include +#include #include #include "k3b_export.h" diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index dea41b6..6420023 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -34,9 +34,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp index 91b6302..bd5167e 100644 --- a/libk3b/projects/datacd/k3bisooptions.cpp +++ b/libk3b/projects/datacd/k3bisooptions.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h index cb7f708..386f031 100644 --- a/libk3b/projects/datacd/k3bspecialdataitem.h +++ b/libk3b/projects/datacd/k3bspecialdataitem.h @@ -20,7 +20,7 @@ #include "k3bdataitem.h" #include "k3bdiritem.h" -#include +#include /** * This can be used to create fake items like the boot catalog diff --git a/libk3b/projects/datadvd/k3bdvddoc.cpp b/libk3b/projects/datadvd/k3bdvddoc.cpp index 2f8a87f..3eaeee4 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.cpp +++ b/libk3b/projects/datadvd/k3bdvddoc.cpp @@ -19,7 +19,7 @@ #include -#include +#include K3bDvdDoc::K3bDvdDoc( TQObject* parent ) diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index be7f38c..864fcae 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h index 9d7474a..11d97c0 100644 --- a/libk3b/projects/k3bdoc.h +++ b/libk3b/projects/k3bdoc.h @@ -29,7 +29,7 @@ // include files for KDE #include -#include +#include #include "k3b_export.h" // forward declaration of the K3b classes diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index 07e1fcf..39334c7 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index bcbe019..885aa92 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -50,8 +50,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index 06b1d31..69c296a 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index 3ff3997..f4c9f2d 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp index 1672043..e366bac 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp @@ -16,7 +16,7 @@ #include "k3bmovixdvddoc.h" #include "k3bmovixdvdjob.h" -#include +#include K3bMovixDvdDoc::K3bMovixDvdDoc( TQObject* parent ) diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index d28e942..2c5da16 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -28,10 +28,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index 7b2d4ff..e4ea8ee 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -14,11 +14,11 @@ */ #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index f963be8..e19e622 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -15,7 +15,7 @@ // Kde Includes #include -#include +#include #include #include #include diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp index 59d6387..0f458b6 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.cpp +++ b/libk3b/projects/videocd/k3bvcdtrack.cpp @@ -14,7 +14,7 @@ */ #include -#include +#include #include #include diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h index f36eb8c..f529275 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.h +++ b/libk3b/projects/videocd/k3bvcdtrack.h @@ -23,7 +23,7 @@ #include // Kde Includes -#include +#include // K3b Includes #include "mpeginfo/k3bmpeginfo.h" diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.cpp b/libk3b/projects/videodvd/k3bvideodvddoc.cpp index 7ea3666..49f2479 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.cpp +++ b/libk3b/projects/videodvd/k3bvideodvddoc.cpp @@ -21,7 +21,7 @@ #include -#include +#include K3bVideoDvdDoc::K3bVideoDvdDoc( TQObject* parent ) diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp index e261c77..2144a4c 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h index 2acce4b..b33ce5b 100644 --- a/libk3b/tools/k3bdirsizejob.h +++ b/libk3b/tools/k3bdirsizejob.h @@ -17,7 +17,7 @@ #define _K3B_DIR_SIZE_JOB_H_ #include -#include +#include #include diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h index 06cef32..7aaf25e 100644 --- a/libk3b/tools/k3bfilesplitter.h +++ b/libk3b/tools/k3bfilesplitter.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp index 1d3d04c..394f94d 100644 --- a/libk3b/tools/k3bmd5job.cpp +++ b/libk3b/tools/k3bmd5job.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/libk3bdevice/configure.in.in b/libk3bdevice/configure.in.in index 2a14f0f..42a8a62 100644 --- a/libk3bdevice/configure.in.in +++ b/libk3bdevice/configure.in.in @@ -62,7 +62,7 @@ dnl === check for resmgr - end ============ -# HAL check from tdebase/kioslave/media +# HAL check from tdebase/tdeioslave/media AC_ARG_WITH( hal, diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp index d5bf336..dc94c9b 100644 --- a/libk3bdevice/k3bdevicemanager.cpp +++ b/libk3bdevice/k3bdevicemanager.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/libk3bdevice/k3bdiskinfo.cpp b/libk3bdevice/k3bdiskinfo.cpp index 534e74b..0709d28 100644 --- a/libk3bdevice/k3bdiskinfo.cpp +++ b/libk3bdevice/k3bdiskinfo.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp index 6228922..dbb19a3 100644 --- a/libk3bdevice/k3bhalconnection.cpp +++ b/libk3bdevice/k3bhalconnection.cpp @@ -269,7 +269,7 @@ void K3bDevice::HalConnection::removeDevice( const char* udi ) int K3bDevice::HalConnection::lock( Device* dev ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck // DBusMessage* dmesg = 0; @@ -328,7 +328,7 @@ int K3bDevice::HalConnection::lock( Device* dev ) int K3bDevice::HalConnection::unlock( Device* dev ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck // DBusMessage* dmesg = 0; @@ -387,7 +387,7 @@ int K3bDevice::HalConnection::mount( K3bDevice::Device* dev, const TQStringList& options ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck // DBusMessage* dmesg = 0; @@ -467,7 +467,7 @@ int K3bDevice::HalConnection::unmount( K3bDevice::Device* dev, const TQStringList& options ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck // DBusMessage* dmesg = 0; @@ -538,7 +538,7 @@ int K3bDevice::HalConnection::eject( K3bDevice::Device* dev, const TQStringList& options ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck // DBusMessage* dmesg = 0; diff --git a/libk3bdevice/k3bmsf.h b/libk3bdevice/k3bmsf.h index 052cadd..ff4b0cc 100644 --- a/libk3bdevice/k3bmsf.h +++ b/libk3bdevice/k3bmsf.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include "k3bdevice_export.h" namespace K3b diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp index 8781401..afacdf6 100644 --- a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp +++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/plugins/decoder/libsndfile/configure.in.in b/plugins/decoder/libsndfile/configure.in.in index 5c17cca..6b50a68 100644 --- a/plugins/decoder/libsndfile/configure.in.in +++ b/plugins/decoder/libsndfile/configure.in.in @@ -3,7 +3,7 @@ dnl dnl Don't use PKG_CHECK, since if there is no pkg-config installed, dnl then there is no auto* magic for it either. dnl -dnl Tests copied from tdebase/kioslave/thumbnail/ +dnl Tests copied from tdebase/tdeioslave/thumbnail/ dnl if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp index f3a1716..76398fd 100644 --- a/plugins/encoder/external/k3bexternalencoder.cpp +++ b/plugins/encoder/external/k3bexternalencoder.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/plugins/encoder/external/k3bexternalencodercommand.cpp b/plugins/encoder/external/k3bexternalencodercommand.cpp index 5ab3b1c..16549e6 100644 --- a/plugins/encoder/external/k3bexternalencodercommand.cpp +++ b/plugins/encoder/external/k3bexternalencodercommand.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp index beec64b..7384ba6 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp index 200494c..c201465 100644 --- a/plugins/encoder/lame/k3blameencoder.cpp +++ b/plugins/encoder/lame/k3blameencoder.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp index 35294fa..bcf3903 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp +++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -521,7 +521,7 @@ long long K3bOggVorbisEncoder::fileSize( const TQString&, const K3b::Msf& msf ) TDEConfig* c = k3bcore->config(); c->setGroup( "K3bOggVorbisEncoderPlugin" ); - // the following code is based on the size estimation from the audiocd kioslave + // the following code is based on the size estimation from the audiocd tdeioslave // TODO: reimplement. if( !c->readBoolEntry( "manual bitrate", false ) ) { diff --git a/plugins/encoder/skeleton.cpp b/plugins/encoder/skeleton.cpp index 0fc3d1e..9321501 100644 --- a/plugins/encoder/skeleton.cpp +++ b/plugins/encoder/skeleton.cpp @@ -18,7 +18,7 @@ #include "k3bencoder.h" #include -#include +#include #include diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index 3cd7f08..b0f734d 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp index 3d30d29..24a21a6 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp @@ -29,9 +29,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp index 3699612..93b12f1 100644 --- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp +++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include diff --git a/src/k3b.cpp b/src/k3b.cpp index 038586c..95695ed 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -38,10 +38,10 @@ // include files for KDE #include #include -#include +#include #include #include -#include +#include #include #include #include @@ -58,8 +58,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -1291,7 +1291,7 @@ void K3bMainWindow::slotProjectAddFiles() void K3bMainWindow::slotK3bSetup() { TDEProcess p; - p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); + p << "tdesu" << "tdecmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); if( !p.start( TDEProcess::DontCare ) ) KMessageBox::error( 0, i18n("Could not find tdesu to run K3bSetup with root privileges. " "Please run it manually as root.") ); diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp index 50cde9c..4a9d346 100644 --- a/src/k3bappdevicemanager.cpp +++ b/src/k3bappdevicemanager.cpp @@ -25,9 +25,9 @@ #include #include #include -#include +#include #include -#include +#include #include diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index 09fbb30..1055961 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/k3bdatamodewidget.cpp b/src/k3bdatamodewidget.cpp index 96065a7..1cb4ab3 100644 --- a/src/k3bdatamodewidget.cpp +++ b/src/k3bdatamodewidget.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp index 426b652..86e4d20 100644 --- a/src/k3bdebuggingoutputdialog.cpp +++ b/src/k3bdebuggingoutputdialog.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include diff --git a/src/k3bdiroperator.cpp b/src/k3bdiroperator.cpp index 4504f7f..acf42dc 100644 --- a/src/k3bdiroperator.cpp +++ b/src/k3bdiroperator.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp index 2ad6a78..fe74f45 100644 --- a/src/k3bdirview.cpp +++ b/src/k3bdirview.cpp @@ -60,23 +60,23 @@ // KDE-includes #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp index d586c39..fd37b08 100644 --- a/src/k3bdiskinfoview.cpp +++ b/src/k3bdiskinfoview.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include // FIXME: use K3bListViewItem instead diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp index 7ec0286..6c906d0 100644 --- a/src/k3bemptydiscwaiter.cpp +++ b/src/k3bemptydiscwaiter.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index 6fb3d87..d6dfe91 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/k3bfiletreeview.h b/src/k3bfiletreeview.h index d40ca6e..a86a84e 100644 --- a/src/k3bfiletreeview.h +++ b/src/k3bfiletreeview.h @@ -18,7 +18,7 @@ #define K3BFILETREEVIEW_H -#include +#include class KFileTreeBranch; class KActionCollection; diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp index 2a087e8..314294a 100644 --- a/src/k3bfileview.cpp +++ b/src/k3bfileview.cpp @@ -28,16 +28,16 @@ #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/src/k3bfirstrun.cpp b/src/k3bfirstrun.cpp index f27d927..818eb82 100644 --- a/src/k3bfirstrun.cpp +++ b/src/k3bfirstrun.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp index 9f8327c..be88cef 100644 --- a/src/k3binteractiondialog.cpp +++ b/src/k3binteractiondialog.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index 215bc88..7e2f77f 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp index a6b95d2..79dae3b 100644 --- a/src/k3bjobprogressosd.cpp +++ b/src/k3bjobprogressosd.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/k3bmedium.cpp b/src/k3bmedium.cpp index 29ba46c..295ca2a 100644 --- a/src/k3bmedium.cpp +++ b/src/k3bmedium.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include /** * Internal class used by K3bMedium diff --git a/src/k3bprojectinterface.h b/src/k3bprojectinterface.h index 1459fd0..7a87922 100644 --- a/src/k3bprojectinterface.h +++ b/src/k3bprojectinterface.h @@ -18,7 +18,7 @@ #define _K3B_PROJECT_INTERFACE_H_ #include -#include +#include #include class K3bDoc; diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp index 965a160..b41820b 100644 --- a/src/k3bprojectmanager.cpp +++ b/src/k3bprojectmanager.cpp @@ -48,8 +48,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/k3bservicemenuinstaller.cpp b/src/k3bservicemenuinstaller.cpp index 13729c7..c2938bf 100644 --- a/src/k3bservicemenuinstaller.cpp +++ b/src/k3bservicemenuinstaller.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp index 4a4fd89..f23f785 100644 --- a/src/k3bstatusbarmanager.cpp +++ b/src/k3bstatusbarmanager.cpp @@ -30,9 +30,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp index de9d846..43c6d1c 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include @@ -608,7 +608,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent, void K3bSystemProblemDialog::slotK3bSetup() { TDEProcess p; - p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); + p << "tdesu" << "tdecmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); if( !p.start( TDEProcess::DontCare ) ) KMessageBox::error( 0, i18n("Unable to start K3bSetup2.") ); } diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp index 5ba3879..22b2750 100644 --- a/src/k3btempdirselectionwidget.cpp +++ b/src/k3btempdirselectionwidget.cpp @@ -27,15 +27,15 @@ #include #include -#include +#include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include diff --git a/src/k3btempdirselectionwidget.h b/src/k3btempdirselectionwidget.h index 639e7b6..52308b0 100644 --- a/src/k3btempdirselectionwidget.h +++ b/src/k3btempdirselectionwidget.h @@ -18,7 +18,7 @@ #define K3BTEMPDIRSELECTIONWIDGET_H #include -#include +#include class TQTimer; class TQLabel; diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index a998687..9d717fc 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp index 4c85c5a..6095ee3 100644 --- a/src/k3bwriterselectionwidget.cpp +++ b/src/k3bwriterselectionwidget.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/k3bwritingmodewidget.cpp b/src/k3bwritingmodewidget.cpp index 077c2e8..3097e92 100644 --- a/src/k3bwritingmodewidget.cpp +++ b/src/k3bwritingmodewidget.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index b9dc2a9..79c32db 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index 3245906..8e9dd36 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/misc/k3bcdcopydialog.h b/src/misc/k3bcdcopydialog.h index 4b17fa8..898a1de 100644 --- a/src/misc/k3bcdcopydialog.h +++ b/src/misc/k3bcdcopydialog.h @@ -21,7 +21,7 @@ #include -#include +#include namespace K3bDevice { class Device; diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index 5c73381..f134104 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -45,12 +45,12 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index 729c4c7..c80c1e3 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/misc/k3bdvdcopydialog.h b/src/misc/k3bdvdcopydialog.h index 390ee2e..aad39a3 100644 --- a/src/misc/k3bdvdcopydialog.h +++ b/src/misc/k3bdvdcopydialog.h @@ -19,7 +19,7 @@ #include -#include +#include namespace K3bDevice { diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index 6524d05..4f6d5ee 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index 32461df..e3eb2fc 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -36,12 +36,12 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp index 97a5aaf..02d680c 100644 --- a/src/option/k3bburningoptiontab.cpp +++ b/src/option/k3bburningoptiontab.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index 1db1ba2..b0d845e 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp index 1218c60..0b5784e 100644 --- a/src/option/k3bdeviceoptiontab.cpp +++ b/src/option/k3bdeviceoptiontab.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp index bcc890d..acaf3f2 100644 --- a/src/option/k3bdevicewidget.cpp +++ b/src/option/k3bdevicewidget.cpp @@ -25,11 +25,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index 884291f..1da6f17 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp index d222134..d6f2df3 100644 --- a/src/option/k3boptiondialog.cpp +++ b/src/option/k3boptiondialog.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include "k3bnotifyoptiontab.h" diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp index 37a66c8..6a7e4ec 100644 --- a/src/option/k3bpluginoptiontab.cpp +++ b/src/option/k3bpluginoptiontab.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp index ebb92be..edf3f64 100644 --- a/src/option/k3bthemeoptiontab.cpp +++ b/src/option/k3bthemeoptiontab.cpp @@ -20,13 +20,13 @@ #include #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 5c5634a..8274f3b 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -51,7 +51,7 @@ #include #include -#include +#include #include diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp index 14f3726..8e20636 100644 --- a/src/projects/k3baudiotrackdialog.cpp +++ b/src/projects/k3baudiotrackdialog.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include "k3baudiotrackdialog.h" diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index 52c32e2..9b4dd27 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp index eee70f0..3df6c2a 100644 --- a/src/projects/k3bdataburndialog.cpp +++ b/src/projects/k3bdataburndialog.cpp @@ -54,11 +54,11 @@ #include #include #include -#include +#include #include -#include +#include #include -#include +#include #include "k3bfilecompilationsizehandler.h" diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp index 5566ead..aa038eb 100644 --- a/src/projects/k3bdatamultisessioncombobox.cpp +++ b/src/projects/k3bdatamultisessioncombobox.cpp @@ -16,7 +16,7 @@ #include "k3bdatamultisessioncombobox.h" #include -#include +#include #include #include diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index d6d5075..c3648ca 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 842520e..9bf28db 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index 1ac59f8..d71d256 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index 7cfe576..f8dff4f 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -22,7 +22,7 @@ #include "k3bdatadoc.h" #include -#include +#include #include #include #include diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp index a393360..decfca8 100644 --- a/src/projects/k3bdvdburndialog.cpp +++ b/src/projects/k3bdvdburndialog.cpp @@ -28,9 +28,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 555348b..88d5ba9 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -43,10 +43,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 7d74a2f..3e4353b 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index c09f930..86a80d7 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -33,9 +33,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index 83d560b..6b6b706 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -34,9 +34,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index b3b7fb2..2f3fc31 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h index e175a61..be5750f 100644 --- a/src/projects/k3bmovixlistview.h +++ b/src/projects/k3bmovixlistview.h @@ -19,7 +19,7 @@ #define _K3B_MOVIX_LISTVIEW_H_ #include -#include +#include #include diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp index 0a2432d..9ede404 100644 --- a/src/projects/k3bmovixoptionswidget.cpp +++ b/src/projects/k3bmovixoptionswidget.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 58c6ba7..6e86212 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index 04e829b..2547fef 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 0a36668..1dd97f0 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -28,10 +28,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include "k3bvcdburndialog.h" diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp index b18ec30..363068c 100644 --- a/src/projects/k3bvcdlistviewitem.cpp +++ b/src/projects/k3bvcdlistviewitem.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -#include +#include #include diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 99eeb6c..007d20f 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -32,7 +32,7 @@ // Kde Includes #include -#include +#include #include #include #include diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp index 8a02e2b..1479ffc 100644 --- a/src/projects/k3bvideodvdburndialog.cpp +++ b/src/projects/k3bvideodvdburndialog.cpp @@ -27,9 +27,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/src/projects/kostore/SPEC b/src/projects/kostore/SPEC index 4010e33..9cbec59 100644 --- a/src/projects/kostore/SPEC +++ b/src/projects/kostore/SPEC @@ -21,7 +21,7 @@ The purpose of this document is to define a common KOffice Storage Structure. Torben, Reggie, and all the others agreed on storing embedded KOffice Parts and binary data (e.g. pictures, movies, sounds) via a simple tar.gz-structure. -The support class for the tar format is tdelibs/kio/ktar.*, written by Torben +The support class for the tar format is tdelibs/tdeio/ktar.*, written by Torben and finished by David. The obvious benefits of this type of storage are: diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc index 4f645e0..dcaf5d0 100644 --- a/src/projects/kostore/koStore.cc +++ b/src/projects/kostore/koStore.cc @@ -37,7 +37,7 @@ #include #include #include -#include +#include //#define DefaultFormat KoStore::Tar #define DefaultFormat KoStore::Zip diff --git a/src/projects/kostore/koZipStore.cc b/src/projects/kostore/koZipStore.cc index cd393eb..0bbecdc 100644 --- a/src/projects/kostore/koZipStore.cc +++ b/src/projects/kostore/koZipStore.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #if ! KDE_IS_VERSION( 3, 4, 1 ) #include #include diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp index 66b4820..7cdf686 100644 --- a/src/rip/k3baudiocdview.cpp +++ b/src/rip/k3baudiocdview.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp index 15fa9fd..34d1de7 100644 --- a/src/rip/k3baudioconvertingoptionwidget.cpp +++ b/src/rip/k3baudioconvertingoptionwidget.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h index 9352e3f..4c702aa 100644 --- a/src/rip/k3baudioconvertingoptionwidget.h +++ b/src/rip/k3baudioconvertingoptionwidget.h @@ -19,7 +19,7 @@ #include "base_k3baudiorippingoptionwidget.h" #include -#include +#include class K3bAudioEncoder; class TDEConfigBase; diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp index 03c7db3..43fe621 100644 --- a/src/rip/k3baudioprojectconvertingdialog.cpp +++ b/src/rip/k3baudioprojectconvertingdialog.cpp @@ -33,11 +33,11 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp index 4298532..aace387 100644 --- a/src/rip/k3baudiorippingdialog.cpp +++ b/src/rip/k3baudiorippingdialog.cpp @@ -32,11 +32,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp index ae1191f..e8b533a 100644 --- a/src/rip/k3bcddbpatternwidget.cpp +++ b/src/rip/k3bcddbpatternwidget.cpp @@ -15,7 +15,7 @@ #include "k3bcddbpatternwidget.h" -#include +#include #include #include #include diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp index af29a37..2dea3f7 100644 --- a/src/rip/k3bvideocdinfo.cpp +++ b/src/rip/k3bvideocdinfo.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "k3bvideocdinfo.h" diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp index b987e96..b6c033d 100644 --- a/src/rip/k3bvideocdrip.cpp +++ b/src/rip/k3bvideocdrip.cpp @@ -13,9 +13,9 @@ * See the file "COPYING" for the exact licensing terms. */ -#include +#include #include -#include +#include #include #include #include diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index eeec3d5..8fe85f5 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -17,7 +17,7 @@ // kde include #include #include -#include +#include #include #include #include diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index 4aa571e..b5deed5 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index 763cbe0..ca9e467 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * name ) diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp index 51b74a2..5a229bf 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h index 1642bbc..812a5d8 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.h +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h @@ -23,7 +23,7 @@ #include #include -#include +#include class TQTimer; diff --git a/subdirs b/subdirs index 85408f3..8ec30da 100644 --- a/subdirs +++ b/subdirs @@ -1,7 +1,7 @@ doc k3bsetup -kfile-plugins -kioslaves +tdefile-plugins +tdeioslaves libk3b libk3bdevice plugins diff --git a/tdefile-plugins/Makefile.am b/tdefile-plugins/Makefile.am new file mode 100644 index 0000000..c1ba442 --- /dev/null +++ b/tdefile-plugins/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = k3bproject \ No newline at end of file diff --git a/tdefile-plugins/k3bproject/Makefile.am b/tdefile-plugins/k3bproject/Makefile.am new file mode 100644 index 0000000..5d070e2 --- /dev/null +++ b/tdefile-plugins/k3bproject/Makefile.am @@ -0,0 +1,27 @@ +AM_CPPFLAGS = -I$(srcdir)/../../libk3b/core \ + -I$(srcdir)/../../libk3b/core \ + -I$(srcdir)/../../libk3b/plugin \ + -I$(srcdir)/../../libk3b/tools \ + -I$(srcdir)/../../libk3b/projects \ + -I$(srcdir)/../../libk3b/projects/datacd \ + -I$(srcdir)/../../libk3bdevice \ + -I$(srcdir)/../../src/projects \ + $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_k3bprojectfileplugin.h + +kde_module_LTLIBRARIES = tdefile_k3b.la + +tdefile_k3b_la_SOURCES = tdefile_k3bprojectfileplugin.cpp +tdefile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) +tdefile_k3b_la_LIBADD = $(LIB_KIO) ../../libk3b/libk3b.la ../../src/projects/kostore/libkostore.la + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +services_DATA = tdefile_k3b.desktop +servicesdir = $(kde_servicesdir) + +messages: + $(XGETTEXT) *.cpp -o $(podir)/tdefile_k3b.pot diff --git a/tdefile-plugins/k3bproject/tdefile_k3b.desktop b/tdefile-plugins/k3bproject/tdefile_k3b.desktop new file mode 100644 index 0000000..b93ae66 --- /dev/null +++ b/tdefile-plugins/k3bproject/tdefile_k3b.desktop @@ -0,0 +1,53 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Service +Name=K3b Project Info +Name[af]=K3b Projek Informasie +Name[ar]= معلومات عن مشروع K3B +Name[bg]=Информация за K3b проект +Name[bn]=কে-থ্রি-বি প্রকল্প তথ্য +Name[br]=Titouroù raktres K3b +Name[ca]=Informació sobre el projecte de K3b +Name[cs]=Info o K3b projektu +Name[da]=K3b Projektinformation +Name[de]=K3b Projektinformationen +Name[el]=Πληροφορίες έργου K3b +Name[eo]=K3b projekta informo +Name[es]=Información de proyecto K3b +Name[et]=K3b projekti info +Name[fa]= اطلاعات پروژۀ K3b +Name[fi]=K3b-projektin kuvaus +Name[fr]=Information sur le projet K3b +Name[ga]=Eolas faoin Tionscadal K3b +Name[gl]=Informazón de Proxecto K3b +Name[hu]=K3b-projektinformáció +Name[is]=K3b verkefnisupplýsingar +Name[it]=Informazioni progetto K3b +Name[ja]=K3b プロジェクト情報 +Name[km]=ព័ត៌មាន​របស់​​គម្រោង K3b +Name[lt]=K3b projekto informacija +Name[mk]=Информации за проект од K3b +Name[nb]=K3b-prosjektinformasjon +Name[nds]=K3b-Projektinformatschonen +Name[nl]=K3b-projectinformatie +Name[nn]=K3b-prosjektinfo +Name[pa]=K3b ਪ੍ਰੋਜੈੱਕਟ ਜਾਣਕਾਰੀ +Name[pl]=Informacja dla projektu K3b +Name[pt]=Informação do Projecto do K3b +Name[pt_BR]=Informações do Projeto do K3b +Name[ru]=Свдения о проекте K3b +Name[sk]=K3b informácie o projekte +Name[sr]=Инфо о K3b пројекту +Name[sr@Latn]=Info o K3b projektu +Name[sv]=K3b-projektinformation +Name[tr]=K3b Proje Bilgisi +Name[uk]=Інформація проекту K3b +Name[uz]=K3b loyihasi haqida maʼlumot +Name[uz@cyrillic]=K3b лойиҳаси ҳақида маълумот +Name[zh_CN]=K3b 方案信息 +Name[zh_TW]=K3b 專案資訊 +ServiceTypes=KFilePlugin +X-TDE-Library=tdefile_k3b +MimeType=application/x-k3b +PreferredGroups=General +PreferredItems=documenttype diff --git a/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.cpp b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.cpp new file mode 100644 index 0000000..e625465 --- /dev/null +++ b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.cpp @@ -0,0 +1,135 @@ +/* + * + * $Id: sourceheader,v 1.3 2005/01/19 13:03:46 trueg Exp $ + * Copyright (C) 2005 Sebastian Trueg + * + * This file is part of the K3b project. + * Copyright (C) 1998-2007 Sebastian Trueg + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * See the file "COPYING" for the exact licensing terms. + */ + + +#include + +#include "tdefile_k3bprojectfileplugin.h" +#include "kostore/koStore.h" +#include "kostore/koStoreDevice.h" + +#include + +#include + +#include +#include +#include + + + +K_EXPORT_COMPONENT_FACTORY(tdefile_k3b, KGenericFactory("tdefile_k3b")) + + +K3bProjectFilePlugin::K3bProjectFilePlugin( TQObject *parent, const char *name, + const TQStringList &args) + : KFilePlugin(parent, name, args) +{ + KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-k3b" ); + + KFileMimeTypeInfo::GroupInfo* group = addGroupInfo( info, "General", i18n("General") ); + + addItemInfo( group, "documenttype", i18n("Document Type"), TQVariant::String ); +} + + +bool K3bProjectFilePlugin::readInfo( KFileMetaInfo& info, uint /*what*/) +{ + if( !info.url().isLocalFile() ) { + kdDebug() << "(K3bProjectFilePluginInfo) no local file." << endl; + return false; + } + + // open the file + bool success = false; + TQDomDocument xmlDoc; + + // try opening a store + KoStore* store = KoStore::createStore( info.url().path(), KoStore::Read ); + if( store && !store->bad() && store->open( "maindata.xml" ) ) { + TQIODevice* dev = store->device(); + dev->open( IO_ReadOnly ); + if( xmlDoc.setContent( dev ) ) + success = true; + dev->close(); + store->close(); + } + else + kdDebug() << "(K3bProjectFilePluginInfo) failed to open the store." << endl; + + if( success ) { + // check the documents DOCTYPE + K3bDoc::DocType type = K3bDoc::AUDIO; + if( xmlDoc.doctype().name() == "k3b_audio_project" ) + type = K3bDoc::AUDIO; + else if( xmlDoc.doctype().name() == "k3b_data_project" ) + type = K3bDoc::DATA; + else if( xmlDoc.doctype().name() == "k3b_vcd_project" ) + type = K3bDoc::VCD; + else if( xmlDoc.doctype().name() == "k3b_mixed_project" ) + type = K3bDoc::MIXED; + else if( xmlDoc.doctype().name() == "k3b_movix_project" ) + type = K3bDoc::MOVIX; + else if( xmlDoc.doctype().name() == "k3b_movixdvd_project" ) + type = K3bDoc::MOVIX_DVD; + else if( xmlDoc.doctype().name() == "k3b_dvd_project" ) + type = K3bDoc::DVD; + else if( xmlDoc.doctype().name() == "k3b_video_dvd_project" ) + type = K3bDoc::VIDEODVD; + else { + kdDebug() << "(K3bDoc) unknown doc type: " << xmlDoc.doctype().name() << endl; + success = false; + } + + TQString stringType; + switch( type ) { + case K3bDoc::AUDIO: + stringType = i18n("Audio CD"); + break; + case K3bDoc::DATA: + stringType = i18n("Data CD"); + break; + case K3bDoc::MIXED: + stringType = i18n("Mixed Mode CD"); + break; + case K3bDoc::VCD: + stringType = i18n("Video CD"); + break; + case K3bDoc::MOVIX: + stringType = i18n("eMovix CD"); + break; + case K3bDoc::MOVIX_DVD: + stringType = i18n("eMovix DVD"); + break; + case K3bDoc::DVD: + stringType = i18n("Data DVD"); + break; + case K3bDoc::VIDEODVD: + stringType = i18n("Video DVD"); + break; + } + + // and finally display it! + KFileMetaInfoGroup group = appendGroup(info, "General"); + appendItem( group, "documenttype", stringType ); + } + + delete store; + + return success; +} + +#include "tdefile_k3bprojectfileplugin.moc" + diff --git a/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h new file mode 100644 index 0000000..dadb856 --- /dev/null +++ b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h @@ -0,0 +1,38 @@ +/* + * + * $Id: sourceheader,v 1.3 2005/01/19 13:03:46 trueg Exp $ + * Copyright (C) 2005 Sebastian Trueg + * + * This file is part of the K3b project. + * Copyright (C) 1998-2007 Sebastian Trueg + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * See the file "COPYING" for the exact licensing terms. + */ + +#ifndef __KFILE_K3BPROJECTFILEPLUGIN_H__ +#define __KFILE_K3BPROJECTFILEPLUGIN_H__ + +/** + * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h> + */ +#include + +class TQStringList; + +class K3bProjectFilePlugin: public KFilePlugin +{ + Q_OBJECT + + + public: + K3bProjectFilePlugin( TQObject *parent, const char *name, const TQStringList& args ); + + virtual bool readInfo( KFileMetaInfo& info, uint what); +}; + +#endif + diff --git a/tdeioslaves/Makefile.am b/tdeioslaves/Makefile.am new file mode 100644 index 0000000..55ab08d --- /dev/null +++ b/tdeioslaves/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = videodvd diff --git a/tdeioslaves/videodvd/Makefile.am b/tdeioslaves/videodvd/Makefile.am new file mode 100644 index 0000000..c20e773 --- /dev/null +++ b/tdeioslaves/videodvd/Makefile.am @@ -0,0 +1,19 @@ +INCLUDES = -I$(srcdir)/../../libk3b/tools \ + -I$(srcdir)/../../libk3b/core \ + -I$(srcdir)/../../libk3bdevice \ + $(all_includes) + +kde_module_LTLIBRARIES = kio_videodvd.la + +kio_videodvd_la_SOURCES = videodvd.cpp +kio_videodvd_la_LIBADD = -lkio ../../libk3b/libk3b.la +kio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lkio -ltdecore -L../../libk3bdevice/.libs -lk3bdevice + +protocol_DATA = videodvd.protocol +protocoldir = $(kde_servicesdir) + +konq_sidebartree_init_services_data_DATA = videodvd.desktop +konq_sidebartree_init_services_datadir = $(kde_datadir)/konqsidebartng/virtual_folders/services + +messages: + $(XGETTEXT) *.cpp -o $(podir)/tdeio_videodvd.pot diff --git a/tdeioslaves/videodvd/videodvd.cpp b/tdeioslaves/videodvd/videodvd.cpp new file mode 100644 index 0000000..c3398a1 --- /dev/null +++ b/tdeioslaves/videodvd/videodvd.cpp @@ -0,0 +1,407 @@ +/* + * + * $Id: sourceheader 380067 2005-01-19 13:03:46Z trueg $ + * Copyright (C) 2005 Sebastian Trueg + * + * This file is part of the K3b project. + * Copyright (C) 1998-2007 Sebastian Trueg + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * See the file "COPYING" for the exact licensing terms. + */ + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +#include "videodvd.h" + +using namespace TDEIO; + +extern "C" +{ + LIBK3B_EXPORT int kdemain( int argc, char **argv ) + { + TDEInstance instance( "kio_videodvd" ); + + kdDebug(7101) << "*** Starting kio_videodvd " << endl; + + if (argc != 4) + { + kdDebug(7101) << "Usage: kio_videodvd protocol domain-socket1 domain-socket2" << endl; + exit(-1); + } + + kio_videodvdProtocol slave(argv[2], argv[3]); + slave.dispatchLoop(); + + kdDebug(7101) << "*** kio_videodvd Done" << endl; + return 0; + } +} + + + +// FIXME: Does it really make sense to use a static device manager? Are all instances +// of videodvd started in another process? +K3bDevice::DeviceManager* kio_videodvdProtocol::s_deviceManager = 0; +int kio_videodvdProtocol::s_instanceCnt = 0; + +kio_videodvdProtocol::kio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket) + : SlaveBase("kio_videodvd", pool_socket, app_socket) +{ + kdDebug() << "kio_videodvdProtocol::kio_videodvdProtocol()" << endl; + if( !s_deviceManager ) + { + s_deviceManager = new K3bDevice::DeviceManager(); + s_deviceManager->setCheckWritingModes( false ); + s_deviceManager->scanBus(); + } + s_instanceCnt++; +} + + +kio_videodvdProtocol::~kio_videodvdProtocol() +{ + kdDebug() << "kio_videodvdProtocol::~kio_videodvdProtocol()" << endl; + s_instanceCnt--; + if( s_instanceCnt == 0 ) + { + delete s_deviceManager; + s_deviceManager = 0; + } +} + + +TDEIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) const +{ + TDEIO::UDSEntry uds; + TDEIO::UDSAtom a; + + a.m_uds = TDEIO::UDS_NAME; + a.m_str = e->name(); + uds.append( a ); + + a.m_uds = TDEIO::UDS_ACCESS; + a.m_long = e->permissions(); + uds.append( a ); + + a.m_uds = TDEIO::UDS_CREATION_TIME; + a.m_long = e->date(); + uds.append( a ); + + a.m_uds = TDEIO::UDS_MODIFICATION_TIME; + a.m_long = e->date(); + uds.append( a ); + + if( e->isDirectory() ) + { + a.m_uds = TDEIO::UDS_FILE_TYPE; + a.m_long = S_IFDIR; + uds.append( a ); + + a.m_uds = TDEIO::UDS_MIME_TYPE; + a.m_str = "inode/directory"; + uds.append( a ); + } + else + { + const K3bIso9660File* file = static_cast( e ); + + a.m_uds = TDEIO::UDS_SIZE; + a.m_long = file->size(); + uds.append( a ); + + a.m_uds = TDEIO::UDS_FILE_TYPE; + a.m_long = S_IFREG; + uds.append( a ); + + a.m_uds = TDEIO::UDS_MIME_TYPE; + if( e->name().endsWith( "VOB" ) ) + a.m_str = "video/mpeg"; + else + a.m_str = "unknown"; + uds.append( a ); + } + + return uds; +} + + +// FIXME: remember the iso instance for quicker something and search for the videodvd +// in the available devices. +K3bIso9660* kio_videodvdProtocol::openIso( const KURL& url, TQString& plainIsoPath ) +{ + // get the volume id from the url + TQString volumeId = url.path().section( '/', 1, 1 ); + + kdDebug() << "(kio_videodvdProtocol) searching for Video dvd: " << volumeId << endl; + + // now search the devices for this volume id + // FIXME: use the cache created in listVideoDVDs + for( TQPtrListIterator it( s_deviceManager->dvdReader() ); *it; ++it ) { + K3bDevice::Device* dev = *it; + K3bDevice::DiskInfo di = dev->diskInfo(); + + // we search for a DVD with a single track. + // this time let K3bIso9660 decide if we need dvdcss or not + // FIXME: check for encryption and libdvdcss and report an error + if( di.isDvdMedia() && di.numTracks() == 1 ) { + K3bIso9660* iso = new K3bIso9660( dev ); + iso->setPlainIso9660( true ); + if( iso->open() && iso->primaryDescriptor().volumeId == volumeId ) { + plainIsoPath = url.path().section( "/", 2, -1 ) + "/"; + kdDebug() << "(kio_videodvdProtocol) using iso path: " << plainIsoPath << endl; + return iso; + } + delete iso; + } + } + + error( ERR_SLAVE_DEFINED, i18n("No VideoDVD found") ); + return 0; +} + + +void kio_videodvdProtocol::get(const KURL& url ) +{ + kdDebug() << "kio_videodvd::get(const KURL& url)" << endl ; + + TQString isoPath; + if( K3bIso9660* iso = openIso( url, isoPath ) ) + { + const K3bIso9660Entry* e = iso->firstIsoDirEntry()->entry( isoPath ); + if( e && e->isFile() ) + { + const K3bIso9660File* file = static_cast( e ); + totalSize( file->size() ); + TQByteArray buffer( 10*2048 ); + int read = 0; + int cnt = 0; + TDEIO::filesize_t totalRead = 0; + while( (read = file->read( totalRead, buffer.data(), buffer.size() )) > 0 ) + { + buffer.resize( read ); + data(buffer); + ++cnt; + totalRead += read; + if( cnt == 10 ) + { + cnt = 0; + processedSize( totalRead ); + } + } + + delete iso; + + data(TQByteArray()); // empty array means we're done sending the data + + if( read == 0 ) + finished(); + else + error( ERR_SLAVE_DEFINED, i18n("Read error.") ); + } + else + error( ERR_DOES_NOT_EXIST, url.path() ); + } +} + + +void kio_videodvdProtocol::listDir( const KURL& url ) +{ + if( url.path() == "/" ) { + listVideoDVDs(); + } + else { + TQString isoPath; + K3bIso9660* iso = openIso( url, isoPath ); + if( iso ) { + const K3bIso9660Directory* mainDir = iso->firstIsoDirEntry(); + const K3bIso9660Entry* e = mainDir->entry( isoPath ); + if( e ) { + if( e->isDirectory() ) { + const K3bIso9660Directory* dir = static_cast(e); + TQStringList el = dir->entries(); + el.remove( "." ); + el.remove( ".." ); + UDSEntryList udsl; + for( TQStringList::const_iterator it = el.begin(); it != el.end(); ++it ) + udsl.append( createUDSEntry( dir->entry( *it ) ) ); + listEntries( udsl ); + finished(); + } + else { + error( ERR_CANNOT_ENTER_DIRECTORY, url.path() ); + } + } + else { + error( ERR_CANNOT_ENTER_DIRECTORY, url.path() ); + } + + // for testing we always do the whole thing + delete iso; + } + } +} + + +void kio_videodvdProtocol::listVideoDVDs() +{ + int cnt = 0; + + for( TQPtrListIterator it( s_deviceManager->dvdReader() ); *it; ++it ) { + K3bDevice::Device* dev = *it; + K3bDevice::DiskInfo di = dev->diskInfo(); + + // we search for a DVD with a single track. + if( di.isDvdMedia() && di.numTracks() == 1 ) { + // + // now do a quick check for VideoDVD. + // - no dvdcss for speed + // - only a check for the VIDEO_TS dir + // + K3bIso9660 iso( new K3bIso9660DeviceBackend(dev) ); + iso.setPlainIso9660( true ); + if( iso.open() && iso.firstIsoDirEntry()->entry( "VIDEO_TS" ) ) { + // FIXME: cache the entry for speedup + + UDSEntryList udsl; + TDEIO::UDSEntry uds; + TDEIO::UDSAtom a; + + a.m_uds = TDEIO::UDS_NAME; + a.m_str = iso.primaryDescriptor().volumeId; + uds.append( a ); + + a.m_uds = TDEIO::UDS_FILE_TYPE; + a.m_long = S_IFDIR; + uds.append( a ); + + a.m_uds = TDEIO::UDS_MIME_TYPE; + a.m_str = "inode/directory"; + uds.append( a ); + + a.m_uds = TDEIO::UDS_ICON_NAME; + a.m_str = "dvd_unmount"; + uds.append( a ); + + udsl.append( uds ); + + listEntries( udsl ); + + ++cnt; + } + } + } + + if( cnt ) + finished(); + else + error( ERR_SLAVE_DEFINED, i18n("No VideoDVD found") ); +} + + +void kio_videodvdProtocol::stat( const KURL& url ) +{ + if( url.path() == "/" ) { + // + // stat the root path + // + TDEIO::UDSEntry uds; + TDEIO::UDSAtom a; + + a.m_uds = TDEIO::UDS_NAME; + a.m_str = "/"; + uds.append( a ); + + a.m_uds = TDEIO::UDS_FILE_TYPE; + a.m_long = S_IFDIR; + uds.append( a ); + + a.m_uds = TDEIO::UDS_MIME_TYPE; + a.m_str = "inode/directory"; + uds.append( a ); + + statEntry( uds ); + finished(); + } + else { + TQString isoPath; + K3bIso9660* iso = openIso( url, isoPath ); + if( iso ) { + const K3bIso9660Entry* e = iso->firstIsoDirEntry()->entry( isoPath ); + if( e ) { + statEntry( createUDSEntry( e ) ); + finished(); + } + else + error( ERR_DOES_NOT_EXIST, url.path() ); + + delete iso; + } + } +} + + +// FIXME: when does this get called? It seems not to be used for the files. +void kio_videodvdProtocol::mimetype( const KURL& url ) +{ + if( url.path() == "/" ) { + error( ERR_UNSUPPORTED_ACTION, "mimetype(/)" ); + return; + } + + TQString isoPath; + K3bIso9660* iso = openIso( url, isoPath ); + if( iso ) + { + const K3bIso9660Entry* e = iso->firstIsoDirEntry()->entry( isoPath ); + if( e ) + { + if( e->isDirectory() ) + mimeType( "inode/directory" ); + else if( e->name().endsWith( ".VOB" ) ) + { + mimetype( "video/mpeg" ); + } + else + { + // send some data + const K3bIso9660File* file = static_cast( e ); + TQByteArray buffer( 10*2048 ); + int read = file->read( 0, buffer.data(), buffer.size() ); + if( read > 0 ) + { + buffer.resize( read ); + data(buffer); + data(TQByteArray()); + finished(); + // FIXME: do we need to emit finished() after emitting the end of data()? + } + else + error( ERR_SLAVE_DEFINED, i18n("Read error.") ); + } + } + delete iso; + } +} diff --git a/tdeioslaves/videodvd/videodvd.desktop b/tdeioslaves/videodvd/videodvd.desktop new file mode 100644 index 0000000..1454f40 --- /dev/null +++ b/tdeioslaves/videodvd/videodvd.desktop @@ -0,0 +1,48 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Link +URL=videodvd:/ +Icon=dvd_unmount +Name=Video DVD Browser +Name[af]=Video DVD Blaaier +Name[ar]= قارىء القرص المدمج المرئي الرقمي DVD +Name[bg]=Браузър за видео DVD +Name[br]=Furcher DVD Video +Name[ca]=Navegador de DVDs de vídeo +Name[cs]=Prohlížeč Video DVD +Name[da]=Video-dvd browser +Name[de]=Video-DVD-Browser +Name[el]=Περιηγητής Video DVD +Name[eo]=Videa DVD foliumilo +Name[es]=Navegador de DVD de vídeo +Name[et]=Video DVD sirvija +Name[fa]= مرورگر دی وی دی ویدئویی +Name[fi]=Video-dvd selain +Name[fr]=Navigateur de DVD +Name[gl]=Explorador de Vídeo DVD +Name[hu]=Video DVD-böngésző +Name[is]=Vídeó DVD flakkari +Name[it]=Navigatore DVD video +Name[ja]=ビデオ DVD ブラウザ +Name[ka]=ვიდეო DVD-ის ბროუზერი +Name[km]=កម្មវិធី​រុករក​ឌីវីឌី​វីដេអូ +Name[lt]=Video DVD naršyklė +Name[nds]=Video-DVD-Kieker +Name[nn]=Film-DVD-lesar +Name[pa]=ਵੀਡਿਓ DVD ਝਲਕਾਰਾ +Name[pl]=Przeglądarka płyt DVD Video +Name[pt]=Navegador de DVD de Vídeo +Name[pt_BR]=Navegador de DVD de Vídeo +Name[sk]=Video DVD prehliadač +Name[sr]=Прегледач видео DVD-а +Name[sr@Latn]=Pregledač video DVD-a +Name[sv]=Video-dvd bläddrare +Name[tr]=Görüntü DVD'si Gezgini +Name[uk]=Навігатор відео-DVD +Name[uz]=Video-DVD brauzeri +Name[uz@cyrillic]=Видео-DVD браузери +Name[zh_CN]=视频 DVD 浏览器 +Name[zh_TW]=Video DVD 瀏覽器 +Open=false +X-TDE-TreeModule=Directory +X-TDE-KonqSidebarModule=konqsidebar_tree diff --git a/tdeioslaves/videodvd/videodvd.h b/tdeioslaves/videodvd/videodvd.h new file mode 100644 index 0000000..3b02aff --- /dev/null +++ b/tdeioslaves/videodvd/videodvd.h @@ -0,0 +1,55 @@ +/* + * + * $Id: sourceheader 380067 2005-01-19 13:03:46Z trueg $ + * Copyright (C) 2005 Sebastian Trueg + * + * This file is part of the K3b project. + * Copyright (C) 1998-2007 Sebastian Trueg + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * See the file "COPYING" for the exact licensing terms. + */ + + +#ifndef _videodvd_H_ +#define _videodvd_H_ + +#include +#include + +#include +#include +#include + +class TQCString; +class K3bIso9660Entry; +class K3bIso9660; +namespace K3bDevice +{ + class DeviceManager; +} + +class kio_videodvdProtocol : public TDEIO::SlaveBase +{ +public: + kio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket); + ~kio_videodvdProtocol(); + + void mimetype( const KURL& url ); + void stat( const KURL& url ); + void get( const KURL& url ); + void listDir( const KURL& url ); + +private: + K3bIso9660* openIso( const KURL&, TQString& plainIsoPath ); + TDEIO::UDSEntry createUDSEntry( const K3bIso9660Entry* e ) const; + void listVideoDVDs(); + + static K3bDevice::DeviceManager* s_deviceManager; + static int s_instanceCnt; +}; + +#endif diff --git a/tdeioslaves/videodvd/videodvd.protocol b/tdeioslaves/videodvd/videodvd.protocol new file mode 100644 index 0000000..7efaf10 --- /dev/null +++ b/tdeioslaves/videodvd/videodvd.protocol @@ -0,0 +1,52 @@ +[Protocol] +exec=kio_videodvd +protocol=videodvd +input=none +output=filesystem +reading=true +listing=Name,Type,Size,Date +Icon=dvd_unmount +Class=:local +Description=A tdeioslave that allows files to be copied from a Video DVD (including decryption) +Description[af]='n 'Kioslave' wat jou toelaat om lêers vanaf 'n Video DVD te kopiëer. Dit doen ook die nodige dekripsie. +Description[ar]= يسمح هذا ال-tdeioslave بنسخ الملفات من قرص مدمج مرئي رقمي DVD ( بما فيه فك التشفير ) +Description[bg]=tdeioslave, позволяващ ви да копирате файлове от видео DVD (включително разшифроването) +Description[bn]=একটি কে-আই-ও স্লেভ যেটি একটি ভিডিও ডিভিডি থেকে ফাইল কপি করতে অনুমতিদেয় (ডিক্রিপশন সহ) +Description[ca]=Un tdeioslave que permet que es copiïn fitxers des d'un DVD de vídeo (incloent el desxifrat) +Description[cs]=Kioslave umožňující kopírování video DVD (včetně dekódování) +Description[da]=En tdeioslave som gør det muligt at kopiere filer fra en video-dvd (inklusive afkodning) +Description[de]=Ein-/Ausgabemodul, mit dem man Dateien von einer Video-DVD kopieren kann (inkl. Entschlüsselung) +Description[el]=Ένα tdeioslave που επιτρέπει την αντιγραφή αρχείων από ένα DVD βίντεο (δυνατότητα αποκρυπτογράφησης) +Description[eo]=Kioslave kiu permesas kopii dosierojn el videa DVD (inklude malĉifro) +Description[es]=Un tdeioslave que permite copiar archivos de un DVD de vídeo (incluye descifrado) +Description[et]=KIO-moodul, mis võimaldab kopeerida faile video DVD-lt (vajadusel dekrüpteerib) +Description[fa]=یک tdeioslave که اجازه می‌دهد پرونده‌ها از یک دی وی دی ویدئویی )شامل سرگشایی( رونوشت شوند +Description[fi]=Kioslave-palvelu, joka mahdollistaa tiedostojen purkamisen dvd-levyltä. +Description[fr]=Un tdeioslave qui permet de copier des fichiers depuis un DVD Vidéo (incluant le déchiffrement) +Description[gl]=Un tdeioslave que permite copiar ficheiros dun Video DVD (incluindo descifrar) +Description[he]=עבד קלט/פלט של KDE המאפשר לקבצים להיות מועתקים מתקליטור וידאו של DVD (כולל פענוח) +Description[hu]=Kioslave, amellyel fájlokat lehet másolni Video DVD-ről (dekódolással együtt) +Description[is]=Kioslave sem leyfir afritun af skrám frá vídeó DVD (með afkóðun) +Description[it]=Un tdeioslave che permette ai file di essere copiati da un DVD video (incluso decifrazione) +Description[ja]=ビデオ DVD からファイルをコピーすることを可能にする tdeioslave (暗号解除も含む) +Description[ka]=Kioslave, რომელიც იძლევა Video DVD-დან ასლის ფაილების მიღების საშუელებას (გაშიფრვასთან ერთად) +Description[km]=​tdeioslave ដែល​អនុញ្ញាត​ឲ្យ​ចម្លង​​ឯកសារ​ពី​ឌីវីឌី​វីដេអូ(រួម​ទាំង​ការ​ឌិគ្រីប) +Description[lt]=Priedas (tdeioslave) leidžiantis kopijuoti bylas iš Video DVD (taip pat ir atšifruoti) +Description[ms]=tdeioslave yang membenarkan fail untuk disalin dari DVD Video (termasuk nyahenkripsi) +Description[nb]=En tdeioslave som gjør det mulig å kopiere filer fra en Video-DVD (medregnet dekryptering) +Description[nds]=En In-/Utgaavmoduul, mit dat sik Dateien vun en Video-DVD koperen laat (ok mit Opslöteln) +Description[nl]=Een tdeioslave waarmee u bestanden van een video-dvd kunt kopiëren (inclusief versleuteling) +Description[nn]=Ein tdeioslave som gjer det mogleg å kopiera filer frå ein film-DVD (inkludert kryptering) +Description[pa]=ਇੱਕ tdeioslave ਹੈ, ਜੋ ਕਿ ਫਾਇਲਾਂ ਨੂੰ ਇੱਕ DVD (ਡਿਸਕਰਿਪਸ਼ਨ ਸਮੇ) ਤੋਂ ਨਕਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ +Description[pl]=Wtyczka protokołu pozwalająca kopiować pliki z płyt DVD Video (łącznie z odszyfrowywaniem) +Description[pt]=Um 'tdeioslave' que permite copiar ficheiros de um DVD Vídeo (incluindo decifrar) +Description[pt_BR]=Um tdeioslave que permite que arquivos sejam copiados de um DVD de Vídeo (incluindo a quebra da proteção) +Description[ru]=Позволяет копировать файлы с Video DVD (с дешифровкой) +Description[sk]=tdeioslave, ktorý umožňuje kopírovať súbory z Video DVD (vrátane dešifrovania) +Description[sr]=tdeioslave који омогућава копирање фајлова са видео DVD-а (укључујући дешифровање) +Description[sr@Latn]=tdeioslave koji omogućava kopiranje fajlova sa video DVD-a (uključujući dešifrovanje) +Description[sv]=En I/O-slav som gör det möjligt att kopiera filer från en video-dvd (inklusive avkodning) +Description[tr]= Bir Görüntü DVD'sinden dosyaların kopyalanmasını (ve kodunun çözülmesini) sağlayan tdeioslave +Description[uk]=Підлеглий В/В, який дає змогу копіювати файли з Відео DVD (включаючи розшифрування) +Description[zh_CN]=允许从视频 DVD(包括加密影碟)中复制文件的 tdeioslave +Description[zh_TW]=允許直接從 Video DVD 複製檔案的 tdeioslave(會自動解密) -- cgit v1.2.3