diff options
Diffstat (limited to 'kdeprint')
60 files changed, 141 insertions, 141 deletions
diff --git a/kdeprint/CMakeLists.txt b/kdeprint/CMakeLists.txt index 8cbe437bb..1065c69af 100644 --- a/kdeprint/CMakeLists.txt +++ b/kdeprint/CMakeLists.txt @@ -12,6 +12,6 @@ add_subdirectory( printmgr ) add_subdirectory( kjobviewer ) add_subdirectory( kprinter ) -add_subdirectory( kdeprintfax ) +add_subdirectory( tdeprintfax ) add_subdirectory( slave ) -add_subdirectory( kdeprint_part ) +add_subdirectory( tdeprint_part ) diff --git a/kdeprint/Makefile.am b/kdeprint/Makefile.am index 81364da3d..1bbc21ff7 100644 --- a/kdeprint/Makefile.am +++ b/kdeprint/Makefile.am @@ -1 +1 @@ -SUBDIRS = printmgr kjobviewer kprinter kdeprintfax slave kdeprint_part +SUBDIRS = printmgr kjobviewer kprinter tdeprintfax slave tdeprint_part diff --git a/kdeprint/kdeprint_part/CMakeLists.txt b/kdeprint/kdeprint_part/CMakeLists.txt index dbc3b1a42..6de7ddb91 100644 --- a/kdeprint/kdeprint_part/CMakeLists.txt +++ b/kdeprint/kdeprint_part/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES kdeprint_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdeprint_part ) -install( FILES kdeprint_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdeprint_part.rc DESTINATION ${DATA_INSTALL_DIR}/tdeprint_part ) +install( FILES tdeprint_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libtdeprint_part (module) ################# tde_add_kpart( libtdeprint_part AUTOMOC SOURCES printpart.cpp - LINK kdeprint_management-shared kparts-shared + LINK tdeprint_management-shared kparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/kdeprint_part/Makefile.am b/kdeprint/kdeprint_part/Makefile.am index 8f13f5692..e27404a0f 100644 --- a/kdeprint/kdeprint_part/Makefile.am +++ b/kdeprint/kdeprint_part/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdeprint_part.la libtdeprint_part_la_SOURCES = printpart.cpp libtdeprint_part_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -libtdeprint_part_la_LIBADD = -lkdeprint_management $(LIB_KPARTS) +libtdeprint_part_la_LIBADD = -ltdeprint_management $(LIB_KPARTS) noinst_HEADERS = printpart.h @@ -12,13 +12,13 @@ METASOURCES = AUTO INCLUDES = $(all_includes) # service -myservice_DATA = kdeprint_part.desktop +myservice_DATA = tdeprint_part.desktop myservicedir = $(kde_servicesdir) # UI file -myrcfile_DATA = kdeprint_part.rc -myrcfiledir = $(kde_datadir)/kdeprint_part +myrcfile_DATA = tdeprint_part.rc +myrcfiledir = $(kde_datadir)/tdeprint_part messages: rc.cpp - $(EXTRACTRC) kdeprint_part.rc >> rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kdeprint_part.pot + $(EXTRACTRC) tdeprint_part.rc >> rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/tdeprint_part.pot diff --git a/kdeprint/kdeprint_part/kdeprint_part.rc b/kdeprint/kdeprint_part/kdeprint_part.rc index bb1db8edf..a69e76490 100644 --- a/kdeprint/kdeprint_part/kdeprint_part.rc +++ b/kdeprint/kdeprint_part/kdeprint_part.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui name="kdeprint_part"> +<kpartgui name="tdeprint_part"> <ToolBar name="Kdeprint-Toolbar" newline="false"><text>Print Manager Toolbar</text> <Action name="printer_add" /> <Action name="printer_add_special" /> diff --git a/kdeprint/kdeprint_part/printpart.cpp b/kdeprint/kdeprint_part/printpart.cpp index d2f865e20..5d5d7b154 100644 --- a/kdeprint/kdeprint_part/printpart.cpp +++ b/kdeprint/kdeprint_part/printpart.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,8 +19,8 @@ #include "printpart.h" -#include <kdeprint/kmmainview.h> -#include <kdeprint/kiconselectaction.h> +#include <tdeprint/kmmainview.h> +#include <tdeprint/kiconselectaction.h> #include <kaction.h> #include <klocale.h> #include <kinstance.h> @@ -39,7 +39,7 @@ PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ , : KParts::ReadOnlyPart(parent, name) { setInstance(PrintPartFactory::instance()); - instance()->iconLoader()->addAppDir("kdeprint"); + instance()->iconLoader()->addAppDir("tdeprint"); m_extension = new PrintPartExtension(this); m_view = new KMMainView(parentWidget, "MainView", actionCollection()); @@ -56,7 +56,7 @@ PrintPart::~PrintPart() KAboutData *PrintPart::createAboutData() { - return new KAboutData(I18N_NOOP("kdeprint_part"), I18N_NOOP("A Konqueror Plugin for Print Management"), "0.1"); + return new KAboutData(I18N_NOOP("tdeprint_part"), I18N_NOOP("A Konqueror Plugin for Print Management"), "0.1"); } bool PrintPart::openFile() @@ -66,7 +66,7 @@ bool PrintPart::openFile() void PrintPart::initActions() { - setXMLFile("kdeprint_part.rc"); + setXMLFile("tdeprint_part.rc"); } PrintPartExtension::PrintPartExtension(PrintPart *parent) diff --git a/kdeprint/kdeprint_part/printpart.h b/kdeprint/kdeprint_part/printpart.h index c84fed1cc..df543b210 100644 --- a/kdeprint/kdeprint_part/printpart.h +++ b/kdeprint/kdeprint_part/printpart.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kdeprintfax/CMakeLists.txt b/kdeprint/kdeprintfax/CMakeLists.txt index 9c6e5095f..538719474 100644 --- a/kdeprint/kdeprintfax/CMakeLists.txt +++ b/kdeprint/kdeprintfax/CMakeLists.txt @@ -22,21 +22,21 @@ link_directories( ##### other data ################################ -tde_install_icons( kdeprintfax ) -tde_install_icons( abentry DESTINATION ${DATA_INSTALL_DIR}/kdeprintfax/icons ) -install( FILES kdeprintfax.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES kdeprintfaxui.rc faxfilters DESTINATION ${DATA_INSTALL_DIR}/kdeprintfax ) -install( PROGRAMS anytops DESTINATION ${DATA_INSTALL_DIR}/kdeprintfax ) +tde_install_icons( tdeprintfax ) +tde_install_icons( abentry DESTINATION ${DATA_INSTALL_DIR}/tdeprintfax/icons ) +install( FILES tdeprintfax.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tdeprintfaxui.rc faxfilters DESTINATION ${DATA_INSTALL_DIR}/tdeprintfax ) +install( PROGRAMS anytops DESTINATION ${DATA_INSTALL_DIR}/tdeprintfax ) -##### kdeprintfax (executable) ################## +##### tdeprintfax (executable) ################## -tde_add_executable( kdeprintfax AUTOMOC +tde_add_executable( tdeprintfax AUTOMOC SOURCES - main.cpp kdeprintfax.cpp faxab.cpp faxctrl.cpp + main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp - LINK kabc-shared kdeprint-shared + LINK kabc-shared tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdeprint/kdeprintfax/Makefile.am b/kdeprint/kdeprintfax/Makefile.am index 6685031cb..cd0d39900 100644 --- a/kdeprint/kdeprintfax/Makefile.am +++ b/kdeprint/kdeprintfax/Makefile.am @@ -1,23 +1,23 @@ INCLUDES= $(all_includes) -bin_PROGRAMS = kdeprintfax -kdeprintfax_SOURCES = main.cpp kdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \ +bin_PROGRAMS = tdeprintfax +tdeprintfax_SOURCES = main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \ conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp -kdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -kdeprintfax_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) -lkabc -kdeprintfax_METASOURCES = AUTO +tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdeprintfax_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) -lkabc +tdeprintfax_METASOURCES = AUTO -xdg_apps_DATA = kdeprintfax.desktop +xdg_apps_DATA = tdeprintfax.desktop -uidir = $(kde_datadir)/kdeprintfax -ui_DATA = kdeprintfaxui.rc faxfilters +uidir = $(kde_datadir)/tdeprintfax +ui_DATA = tdeprintfaxui.rc faxfilters private_SCRIPTS = anytops -privatedir = $(kde_datadir)/kdeprintfax +privatedir = $(kde_datadir)/tdeprintfax messages: rc.cpp - $(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/kdeprintfax.pot + $(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/tdeprintfax.pot -KDE_ICON = kdeprintfax +KDE_ICON = tdeprintfax pic_ICON = abentry -picdir = $(kde_datadir)/kdeprintfax/icons +picdir = $(kde_datadir)/tdeprintfax/icons diff --git a/kdeprint/kdeprintfax/anytops b/kdeprint/kdeprintfax/anytops index 4e67b49e9..9718831dc 100755 --- a/kdeprint/kdeprintfax/anytops +++ b/kdeprint/kdeprintfax/anytops @@ -29,8 +29,8 @@ while true; do shift ;; -v) - echo "Anytops v1.0: (c) 2001, Michael Goffioul <[email protected]>"; - echo "Small script to convert any file type into PS. Part of kdeprintfax." + echo "Anytops v1.0: (c) 2001, Michael Goffioul <[email protected]>"; + echo "Small script to convert any file type into PS. Part of tdeprintfax." exit 0 ;; *) diff --git a/kdeprint/kdeprintfax/conffax.cpp b/kdeprint/kdeprintfax/conffax.cpp index ca6b0d180..1f3b8c3c5 100644 --- a/kdeprint/kdeprintfax/conffax.cpp +++ b/kdeprint/kdeprintfax/conffax.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/conffax.h b/kdeprint/kdeprintfax/conffax.h index bf31c2990..cf76f2b71 100644 --- a/kdeprint/kdeprintfax/conffax.h +++ b/kdeprint/kdeprintfax/conffax.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/conffilters.cpp b/kdeprint/kdeprintfax/conffilters.cpp index 7f33136d9..d32f33ea8 100644 --- a/kdeprint/kdeprintfax/conffilters.cpp +++ b/kdeprint/kdeprintfax/conffilters.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -85,7 +85,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name) void ConfFilters::load() { - TQFile f(locate("data","kdeprintfax/faxfilters")); + TQFile f(locate("data","tdeprintfax/faxfilters")); if (f.exists() && f.open(IO_ReadOnly)) { TQTextStream t(&f); @@ -108,7 +108,7 @@ void ConfFilters::load() void ConfFilters::save() { TQListViewItem *item = m_filters->firstChild(); - TQFile f(locateLocal("data","kdeprintfax/faxfilters")); + TQFile f(locateLocal("data","tdeprintfax/faxfilters")); if (f.open(IO_WriteOnly)) { TQTextStream t(&f); diff --git a/kdeprint/kdeprintfax/conffilters.h b/kdeprint/kdeprintfax/conffilters.h index c4eb1f5c2..871b44bec 100644 --- a/kdeprint/kdeprintfax/conffilters.h +++ b/kdeprint/kdeprintfax/conffilters.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/confgeneral.cpp b/kdeprint/kdeprintfax/confgeneral.cpp index a7d8ac3e7..db3ef916a 100644 --- a/kdeprint/kdeprintfax/confgeneral.cpp +++ b/kdeprint/kdeprintfax/confgeneral.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/confgeneral.h b/kdeprint/kdeprintfax/confgeneral.h index e94ac7422..2962b0b0b 100644 --- a/kdeprint/kdeprintfax/confgeneral.h +++ b/kdeprint/kdeprintfax/confgeneral.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/configdlg.cpp b/kdeprint/kdeprintfax/configdlg.cpp index a3616cf54..526b767ff 100644 --- a/kdeprint/kdeprintfax/configdlg.cpp +++ b/kdeprint/kdeprintfax/configdlg.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -37,7 +37,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name) TQVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy")); m_fax = new ConfFax(page2, "Fax"); - TQVBox *page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("kdeprintfax")); + TQVBox *page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("tdeprintfax")); m_system = new ConfSystem(page3, "System"); TQVBox *page4 = addVBoxPage(i18n("Filters"), i18n("Filters Configuration"), DesktopIcon("filter")); diff --git a/kdeprint/kdeprintfax/configdlg.h b/kdeprint/kdeprintfax/configdlg.h index 1e312b57b..6fabd2011 100644 --- a/kdeprint/kdeprintfax/configdlg.h +++ b/kdeprint/kdeprintfax/configdlg.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/confsystem.cpp b/kdeprint/kdeprintfax/confsystem.cpp index 7410a0191..91c23adb6 100644 --- a/kdeprint/kdeprintfax/confsystem.cpp +++ b/kdeprint/kdeprintfax/confsystem.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/confsystem.h b/kdeprint/kdeprintfax/confsystem.h index 9306df9f3..0ce8971f0 100644 --- a/kdeprint/kdeprintfax/confsystem.h +++ b/kdeprint/kdeprintfax/confsystem.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/defcmds.cpp b/kdeprint/kdeprintfax/defcmds.cpp index 123956377..a2d58c17e 100644 --- a/kdeprint/kdeprintfax/defcmds.cpp +++ b/kdeprint/kdeprintfax/defcmds.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kdeprintfax/defcmds.h b/kdeprint/kdeprintfax/defcmds.h index f76094709..90d67b83f 100644 --- a/kdeprint/kdeprintfax/defcmds.h +++ b/kdeprint/kdeprintfax/defcmds.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/faxab.cpp b/kdeprint/kdeprintfax/faxab.cpp index a54375867..ad50ac9fb 100644 --- a/kdeprint/kdeprintfax/faxab.cpp +++ b/kdeprint/kdeprintfax/faxab.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/faxab.h b/kdeprint/kdeprintfax/faxab.h index f50748217..8b50c204a 100644 --- a/kdeprint/kdeprintfax/faxab.h +++ b/kdeprint/kdeprintfax/faxab.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp index eed9d5816..c1b1b1a0d 100644 --- a/kdeprint/kdeprintfax/faxctrl.cpp +++ b/kdeprint/kdeprintfax/faxctrl.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ */ #include "faxctrl.h" -#include "kdeprintfax.h" +#include "tdeprintfax.h" #include "defcmds.h" #include <ktextedit.h> @@ -486,11 +486,11 @@ void FaxCtrl::filter() } else { - TQString tmp = locateLocal("tmp","kdeprintfax_") + kapp->randomString(8); + TQString tmp = locateLocal("tmp","tdeprintfax_") + kapp->randomString(8); m_filteredfiles.prepend(tmp); m_tempfiles.append(tmp); m_process->clearArguments(); - *m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/faxfilters")) + *m_process << locate("data","tdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","tdeprintfax/faxfilters")) << TQString::tqfromLatin1("--mime=%1").arg(mimeType) << "-p" << pageSize() << KProcess::quote(m_files[0]) << KProcess::quote(tmp); diff --git a/kdeprint/kdeprintfax/faxctrl.h b/kdeprint/kdeprintfax/faxctrl.h index accbd6556..a7e16a850 100644 --- a/kdeprint/kdeprintfax/faxctrl.h +++ b/kdeprint/kdeprintfax/faxctrl.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include "kdeprintfax.h" +#include "tdeprintfax.h" class KProcess; class TQTextEdit; diff --git a/kdeprint/kdeprintfax/filterdlg.cpp b/kdeprint/kdeprintfax/filterdlg.cpp index 5e6f018a1..0324863bc 100644 --- a/kdeprint/kdeprintfax/filterdlg.cpp +++ b/kdeprint/kdeprintfax/filterdlg.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/filterdlg.h b/kdeprint/kdeprintfax/filterdlg.h index f0736bc88..ab4fd0406 100644 --- a/kdeprint/kdeprintfax/filterdlg.h +++ b/kdeprint/kdeprintfax/filterdlg.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/kdeprintfax.cpp b/kdeprint/kdeprintfax/kdeprintfax.cpp index 0b0e59b6b..24ad58a0e 100644 --- a/kdeprint/kdeprintfax/kdeprintfax.cpp +++ b/kdeprint/kdeprintfax/kdeprintfax.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ * */ -#include "kdeprintfax.h" +#include "tdeprintfax.h" #include "faxab.h" #include "faxctrl.h" #include "configdlg.h" @@ -106,7 +106,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) ); TQLabel *m_commentlabel = new TQLabel(i18n("&Comment:"), mainw); KSystemTray *m_tray = new KSystemTray(this); - m_tray->setPixmap(SmallIcon("kdeprintfax")); + m_tray->setPixmap(SmallIcon("tdeprintfax")); m_tray->show(); m_comment = new TQTextEdit(mainw); // I don't understand why anyone would want to turn off word wrap. It makes @@ -604,4 +604,4 @@ bool KdeprintFax::manualFaxDialog( TQString& number, TQString& name, TQString& e return false; } -#include "kdeprintfax.moc" +#include "tdeprintfax.moc" diff --git a/kdeprint/kdeprintfax/kdeprintfax.desktop b/kdeprint/kdeprintfax/kdeprintfax.desktop index a33f9292f..dc9c90bab 100644 --- a/kdeprint/kdeprintfax/kdeprintfax.desktop +++ b/kdeprint/kdeprintfax/kdeprintfax.desktop @@ -90,8 +90,8 @@ GenericName[zh_TW]=傳真工具 GenericName[zu]=Isisebenzi se-Fax Type=Application -Exec=kdeprintfax -caption "%c" %i %m %u -Icon=kdeprintfax +Exec=tdeprintfax -caption "%c" %i %m %u +Icon=tdeprintfax Terminal=false X-DCOP-ServiceType=Multi Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals; diff --git a/kdeprint/kdeprintfax/kdeprintfax.h b/kdeprint/kdeprintfax/kdeprintfax.h index ac54d8b61..fc1a02f7f 100644 --- a/kdeprint/kdeprintfax/kdeprintfax.h +++ b/kdeprint/kdeprintfax/kdeprintfax.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/kdeprintfaxui.rc b/kdeprint/kdeprintfax/kdeprintfaxui.rc index 09c2be6f2..ae233a6da 100644 --- a/kdeprint/kdeprintfax/kdeprintfaxui.rc +++ b/kdeprint/kdeprintfax/kdeprintfaxui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui name="kdeprintfax"> +<kpartgui name="tdeprintfax"> <MenuBar> <Menu name="file"><text>&File</text> <Action name="file_add" /> diff --git a/kdeprint/kdeprintfax/main.cpp b/kdeprint/kdeprintfax/main.cpp index c1a92fd12..4fe22a3b6 100644 --- a/kdeprint/kdeprintfax/main.cpp +++ b/kdeprint/kdeprintfax/main.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a interface to fax-packages + * tdeprintfax - a interface to fax-packages * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ * */ -#include "kdeprintfax.h" +#include "tdeprintfax.h" #include <tqfile.h> #include <kcmdlineargs.h> @@ -30,7 +30,7 @@ TQString debugFlag; int oneShotFlag = false; static const char description[] = - I18N_NOOP("A small fax utility to be used with kdeprint."); + I18N_NOOP("A small fax utility to be used with tdeprint."); // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE @@ -47,10 +47,10 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kdeprintfax", I18N_NOOP("KdeprintFax"), + KAboutData aboutData( "tdeprintfax", I18N_NOOP("KdeprintFax"), "1.0", description, KAboutData::License_GPL, "(c), 2001 Michael Goffioul", 0, "http://printing.kde.org"); - aboutData.addAuthor("Michael Goffioul",0, "[email protected]"); + aboutData.addAuthor("Michael Goffioul",0, "[email protected]"); KCmdLineArgs::init( argc, argv, &aboutData ); KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication::addCmdLineOptions(); diff --git a/kdeprint/kjobviewer/CMakeLists.txt b/kdeprint/kjobviewer/CMakeLists.txt index 1bba4ea65..332fa7fc4 100644 --- a/kdeprint/kjobviewer/CMakeLists.txt +++ b/kdeprint/kjobviewer/CMakeLists.txt @@ -29,9 +29,9 @@ install( FILES kjobviewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES kjobviewerui.rc DESTINATION ${DATA_INSTALL_DIR}/kjobviewer ) -##### kjobviewer (kdeinit) ###################### +##### kjobviewer (tdeinit) ###################### -tde_add_kdeinit_executable( kjobviewer AUTOMOC +tde_add_tdeinit_executable( kjobviewer AUTOMOC SOURCES kjobviewer.cpp main.cpp - LINK kdeprint_management-shared + LINK tdeprint_management-shared ) diff --git a/kdeprint/kjobviewer/Makefile.am b/kdeprint/kjobviewer/Makefile.am index 56be89334..5362ad033 100644 --- a/kdeprint/kjobviewer/Makefile.am +++ b/kdeprint/kjobviewer/Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) bin_PROGRAMS= lib_LTLIBRARIES= -kdeinit_LTLIBRARIES = kjobviewer.la +tdeinit_LTLIBRARIES = kjobviewer.la kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp kjobviewer_la_METASOURCES = AUTO -kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) +kjobviewer_la_LIBADD = -ltdeprint_management $(LIB_KDEUI) kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kjobviewer.h diff --git a/kdeprint/kjobviewer/kjobviewer.cpp b/kdeprint/kjobviewer/kjobviewer.cpp index fc251d664..0fb23e7ba 100644 --- a/kdeprint/kjobviewer/kjobviewer.cpp +++ b/kdeprint/kjobviewer/kjobviewer.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,9 +18,9 @@ **/ #include "kjobviewer.h" -#include <kdeprint/kmjobviewer.h> -#include <kdeprint/kmtimer.h> -#include <kdeprint/kmmanager.h> +#include <tdeprint/kmjobviewer.h> +#include <tdeprint/kmtimer.h> +#include <tdeprint/kmmanager.h> #include <stdlib.h> #include <tqpixmap.h> diff --git a/kdeprint/kjobviewer/kjobviewer.h b/kdeprint/kjobviewer/kjobviewer.h index 022194d1a..967262de2 100644 --- a/kdeprint/kjobviewer/kjobviewer.h +++ b/kdeprint/kjobviewer/kjobviewer.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,7 +21,7 @@ #define KJOBVIEWER_H #include <kuniqueapplication.h> -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> #include <tqdict.h> class KMJobViewer; diff --git a/kdeprint/kjobviewer/main.cpp b/kdeprint/kjobviewer/main.cpp index 47176d743..e75a00e13 100644 --- a/kdeprint/kjobviewer/main.cpp +++ b/kdeprint/kjobviewer/main.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -36,7 +36,7 @@ static KCmdLineOptions options[] = { extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) { KAboutData aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org"); - aboutData.addAuthor("Michael Goffioul",0,"[email protected]"); + aboutData.addAuthor("Michael Goffioul",0,"[email protected]"); KCmdLineArgs::init(argc,argv,&aboutData); KCmdLineArgs::addCmdLineOptions(options); KJobViewerApp::addCmdLineOptions(); diff --git a/kdeprint/kprinter/CMakeLists.txt b/kdeprint/kprinter/CMakeLists.txt index 121c97f5e..0849ebe12 100644 --- a/kdeprint/kprinter/CMakeLists.txt +++ b/kdeprint/kprinter/CMakeLists.txt @@ -26,9 +26,9 @@ link_directories( ) -##### kprinter (kdeinit) ######################## +##### kprinter (tdeinit) ######################## -tde_add_kdeinit_executable( kprinter AUTOMOC +tde_add_tdeinit_executable( kprinter AUTOMOC SOURCES main.cpp printwrapper.cpp - LINK kdeprint-shared + LINK tdeprint-shared ) diff --git a/kdeprint/kprinter/Makefile.am b/kdeprint/kprinter/Makefile.am index 83c78cb91..4cab98880 100644 --- a/kdeprint/kprinter/Makefile.am +++ b/kdeprint/kprinter/Makefile.am @@ -4,10 +4,10 @@ INCLUDES = $(all_includes) bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kprinter.la +tdeinit_LTLIBRARIES = kprinter.la kprinter_la_SOURCES = main.cpp printwrapper.cpp -kprinter_la_LIBADD = -lkdeprint +kprinter_la_LIBADD = -ltdeprint kprinter_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) kprinter_la_METASOURCES = AUTO diff --git a/kdeprint/kprinter/kprinter.desktop b/kdeprint/kprinter/kprinter.desktop index cd4a823e5..bb2de4735 100644 --- a/kdeprint/kprinter/kprinter.desktop +++ b/kdeprint/kprinter/kprinter.desktop @@ -3,7 +3,7 @@ Exec=kprinter Icon=kjobviewer Terminal=false Type=Application -DocPath=kdeprint/index.html +DocPath=tdeprint/index.html X-KDE-StartupNotify=true Name=KPrinter Name[af]=KDrukker diff --git a/kdeprint/kprinter/main.cpp b/kdeprint/kprinter/main.cpp index dd49103c5..5d1667cee 100644 --- a/kdeprint/kprinter/main.cpp +++ b/kdeprint/kprinter/main.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kprinter/printwrapper.cpp b/kdeprint/kprinter/printwrapper.cpp index f8fe1a46d..effa3dea3 100644 --- a/kdeprint/kprinter/printwrapper.cpp +++ b/kdeprint/kprinter/printwrapper.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -42,9 +42,9 @@ #include <ktempfile.h> #include <kprinter.h> -#include <kdeprint/kmmanager.h> -#include <kdeprint/kmprinter.h> -#include <kdeprint/kprintdialog.h> +#include <tdeprint/kmmanager.h> +#include <tdeprint/kmprinter.h> +#include <tdeprint/kprintdialog.h> void signal_handler(int); TQString tempFile; diff --git a/kdeprint/kprinter/printwrapper.h b/kdeprint/kprinter/printwrapper.h index 55ddcdf75..e34e8d964 100644 --- a/kdeprint/kprinter/printwrapper.h +++ b/kdeprint/kprinter/printwrapper.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/printmgr/CMakeLists.txt b/kdeprint/printmgr/CMakeLists.txt index 847996abf..af68abb3f 100644 --- a/kdeprint/printmgr/CMakeLists.txt +++ b/kdeprint/printmgr/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES printers.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_printmgr AUTOMOC SOURCES kcmprintmgr.cpp - LINK kdeprint_management-shared + LINK tdeprint_management-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/printmgr/Makefile.am b/kdeprint/printmgr/Makefile.am index b10f8359e..d0932829a 100644 --- a/kdeprint/printmgr/Makefile.am +++ b/kdeprint/printmgr/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_printmgr.la kcm_printmgr_la_SOURCES = kcmprintmgr.cpp kcm_printmgr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_printmgr_la_LIBADD = -lkdeprint_management +kcm_printmgr_la_LIBADD = -ltdeprint_management noinst_HEADERS = kcmprintmgr.h diff --git a/kdeprint/printmgr/kcmprintmgr.cpp b/kdeprint/printmgr/kcmprintmgr.cpp index 0d0f8b170..34b773070 100644 --- a/kdeprint/printmgr/kcmprintmgr.cpp +++ b/kdeprint/printmgr/kcmprintmgr.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,7 +18,7 @@ **/ #include "kcmprintmgr.h" -#include "kdeprint/kmmainview.h" +#include "tdeprint/kmmainview.h" #include <tqlayout.h> @@ -51,7 +51,7 @@ KCMPrintMgr::KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList new KAboutData(I18N_NOOP("kcmprintmgr"), I18N_NOOP("KDE Printing Management"), 0, 0, KAboutData::License_GPL, I18N_NOOP("(c) 2000 - 2002 Michael Goffioul")); - about->addAuthor("Michael Goffioul", 0, "[email protected]"); + about->addAuthor("Michael Goffioul", 0, "[email protected]"); setAboutData(about); } diff --git a/kdeprint/printmgr/kcmprintmgr.h b/kdeprint/printmgr/kcmprintmgr.h index 126930931..e82bc730f 100644 --- a/kdeprint/printmgr/kcmprintmgr.h +++ b/kdeprint/printmgr/kcmprintmgr.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/printmgr/printers.desktop b/kdeprint/printmgr/printers.desktop index 0b5d605e9..38820b20b 100644 --- a/kdeprint/printmgr/printers.desktop +++ b/kdeprint/printmgr/printers.desktop @@ -2,7 +2,7 @@ Exec=kcmshell printers Icon=printmgr Type=Application -DocPath=kdeprint/index.html +DocPath=tdeprint/index.html MimeType=print/manager; X-KDE-ModuleType=Library diff --git a/kdeprint/slave/CMakeLists.txt b/kdeprint/slave/CMakeLists.txt index cfac6d998..db9162a1b 100644 --- a/kdeprint/slave/CMakeLists.txt +++ b/kdeprint/slave/CMakeLists.txt @@ -34,6 +34,6 @@ install( FILES print.protocol printdb.protocol DESTINATION ${SERVICES_INSTALL_DI tde_add_kpart( kio_print AUTOMOC SOURCES kio_print.cpp - LINK kdeprint-shared + LINK tdeprint-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/slave/Makefile.am b/kdeprint/slave/Makefile.am index b4352d4d8..5e5e04123 100644 --- a/kdeprint/slave/Makefile.am +++ b/kdeprint/slave/Makefile.am @@ -7,7 +7,7 @@ INCLUDES= $(all_includes) kde_module_LTLIBRARIES = kio_print.la kio_print_la_SOURCES = kio_print.cpp -kio_print_la_LIBADD = $(LIB_KIO) -lkdeprint +kio_print_la_LIBADD = $(LIB_KIO) -ltdeprint kio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/kdeprint/slave/kio_print.cpp b/kdeprint/slave/kio_print.cpp index ebb6b859f..d8bb4cf6e 100644 --- a/kdeprint/slave/kio_print.cpp +++ b/kdeprint/slave/kio_print.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,11 +18,11 @@ **/ #include "kio_print.h" -#include <kdeprint/kmprinter.h> -#include <kdeprint/kmmanager.h> -#include <kdeprint/kmjobmanager.h> -#include <kdeprint/kmjob.h> -#include <kdeprint/driver.h> +#include <tdeprint/kmprinter.h> +#include <tdeprint/kmmanager.h> +#include <tdeprint/kmjobmanager.h> +#include <tdeprint/kmjob.h> +#include <tdeprint/driver.h> #include <tqfile.h> #include <tqtextstream.h> @@ -755,7 +755,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) { - TQFile f(locate("data", TQString::tqfromLatin1("kdeprint/template/")+filename)); + TQFile f(locate("data", TQString::tqfromLatin1("tdeprint/template/")+filename)); if (f.exists() && f.open(IO_ReadOnly)) { TQTextStream t(&f); @@ -789,12 +789,12 @@ void KIO_Print::showData(const TQString& pathname) /** * Locate a data in this order: - * - $KDEDIR/share/apps/kdeprint/template/ + * - $KDEDIR/share/apps/tdeprint/template/ * - as a desktop icon */ TQString KIO_Print::locateData(const TQString& item) { - TQString path = locate("data", "kdeprint/template/"+item); + TQString path = locate("data", "tdeprint/template/"+item); if (path.isEmpty()) path = KGlobal::iconLoader()->iconPath(item, KIcon::Desktop, true); return path; diff --git a/kdeprint/slave/kio_print.h b/kdeprint/slave/kio_print.h index 7f622cb6b..954a3045f 100644 --- a/kdeprint/slave/kio_print.h +++ b/kdeprint/slave/kio_print.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <[email protected]> + * Copyright (c) 2001 Michael Goffioul <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/slave/templates/CMakeLists.txt b/kdeprint/slave/templates/CMakeLists.txt index 31f11cf6a..f2344a0df 100644 --- a/kdeprint/slave/templates/CMakeLists.txt +++ b/kdeprint/slave/templates/CMakeLists.txt @@ -16,10 +16,10 @@ install( FILES box-top-middle.png bar-bottom-middle.png bar-top-right.png box-bottom-right.png box-top-right.png bar-bottom-right.png - bottom-left.png box-centre-kdeprint.png + bottom-left.png box-centre-tdeprint.png top-left.png bar-middle-left.png bottom-middle.png box-middle-left.png top-middle.png bar-middle-right.png - bottom-right.png box-middle-right.png top-right-kdeprint.png + bottom-right.png box-middle-right.png top-right-tdeprint.png bar-top-left.png box-bottom-left.png box-top-left.png htmlstyles.css - DESTINATION ${DATA_INSTALL_DIR}/kdeprint/template ) + DESTINATION ${DATA_INSTALL_DIR}/tdeprint/template ) diff --git a/kdeprint/slave/templates/Makefile.am b/kdeprint/slave/templates/Makefile.am index 7fde236a2..3f23f9d2d 100644 --- a/kdeprint/slave/templates/Makefile.am +++ b/kdeprint/slave/templates/Makefile.am @@ -13,7 +13,7 @@ template_DATA = class.template \ box-top-right.png \ bar-bottom-right.png \ bottom-left.png \ - box-centre-kdeprint.png \ + box-centre-tdeprint.png \ top-left.png \ bar-middle-left.png \ bottom-middle.png \ @@ -22,10 +22,10 @@ template_DATA = class.template \ bar-middle-right.png \ bottom-right.png \ box-middle-right.png \ - top-right-kdeprint.png \ + top-right-tdeprint.png \ bar-top-left.png \ box-bottom-left.png \ box-top-left.png \ htmlstyles.css -templatedir = $(kde_datadir)/kdeprint/template +templatedir = $(kde_datadir)/tdeprint/template diff --git a/kdeprint/slave/templates/class.template b/kdeprint/slave/templates/class.template index 4cbc075ab..b6a79a1fd 100644 --- a/kdeprint/slave/templates/class.template +++ b/kdeprint/slave/templates/class.template @@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;} <div style= "background-image: url(top-middle.png); width: 100%; height: 131px;"> <div style="position: absolute; right: 0px;"> - <img src="top-right-kdeprint.png" style="margin: 0px" alt="" /> + <img src="top-right-tdeprint.png" style="margin: 0px" alt="" /> </div> <div style="position: absolute; left: 0px;"> @@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;} <div style= "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center"> <div style= - "background-image: url(box-centre-kdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> + "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> <h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/> %1<!--Title--></h2> <table border="1" cellspacing="0" cellpadding="1" width="100%"> diff --git a/kdeprint/slave/templates/driver.template b/kdeprint/slave/templates/driver.template index d5c8af111..8ba428e74 100644 --- a/kdeprint/slave/templates/driver.template +++ b/kdeprint/slave/templates/driver.template @@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;} <div style= "background-image: url(top-middle.png); width: 100%; height: 131px;"> <div style="position: absolute; right: 0px;"> - <img src="top-right-kdeprint.png" style="margin: 0px" alt="" /> + <img src="top-right-tdeprint.png" style="margin: 0px" alt="" /> </div> <div style="position: absolute; left: 0px;"> @@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;} <div style= "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center"> <div style= - "background-image: url(box-centre-kdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> + "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> <h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/> %1<!--Title--></h2> <table border="1" cellspacing="0" cellpadding="1" width="100%"> diff --git a/kdeprint/slave/templates/jobs.template b/kdeprint/slave/templates/jobs.template index 6c326feec..684899aba 100644 --- a/kdeprint/slave/templates/jobs.template +++ b/kdeprint/slave/templates/jobs.template @@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;} <div style= "background-image: url(top-middle.png); width: 100%; height: 131px;"> <div style="position: absolute; right: 0px;"> - <img src="top-right-kdeprint.png" style="margin: 0px" alt="" /> + <img src="top-right-tdeprint.png" style="margin: 0px" alt="" /> </div> <div style="position: absolute; left: 0px;"> @@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;} <div style= "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center"> <div style= - "background-image: url(box-centre-kdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> + "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> <h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/> %1<!--Title--></h2> <table border="1" cellspacing="0" cellpadding="1" width="100%"> diff --git a/kdeprint/slave/templates/printer.template b/kdeprint/slave/templates/printer.template index 44d6ba82b..3bdfa8665 100644 --- a/kdeprint/slave/templates/printer.template +++ b/kdeprint/slave/templates/printer.template @@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;} <div style= "background-image: url(top-middle.png); width: 100%; height: 131px;"> <div style="position: absolute; right: 0px;"> - <img src="top-right-kdeprint.png" style="margin: 0px" alt="" /> + <img src="top-right-tdeprint.png" style="margin: 0px" alt="" /> </div> <div style="position: absolute; left: 0px;"> @@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;} <div style= "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center"> <div style= - "background-image: url(box-centre-kdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> + "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> <h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/> %1<!--Title--></h2> <table border="1" cellspacing="0" cellpadding="1" width="100%"> diff --git a/kdeprint/slave/templates/pseudo.template b/kdeprint/slave/templates/pseudo.template index d6dec46df..a5acc24d1 100644 --- a/kdeprint/slave/templates/pseudo.template +++ b/kdeprint/slave/templates/pseudo.template @@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;} <div style= "background-image: url(top-middle.png); width: 100%; height: 131px;"> <div style="position: absolute; right: 0px;"> - <img src="top-right-kdeprint.png" style="margin: 0px" alt="" /> + <img src="top-right-tdeprint.png" style="margin: 0px" alt="" /> </div> <div style="position: absolute; left: 0px;"> @@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;} <div style= "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center"> <div style= - "background-image: url(box-centre-kdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> + "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> <h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/> %1<!--Title--></h2> <table border="1" cellspacing="0" cellpadding="1" width="100%"> |