TDE
/
kiosktool
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kiosktool
0
0
Fork 0
Code Issues Releases Wiki Activity

Additional kde to tde renaming

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 3c99afe25c
commit 5767aad945
7 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File

2
ChangeLog
Unescape View File

@ -56,7 +56,7 @@
* Release of v0.3 * Release of v0.3
* Fix grave problem of kiosktool terminating * Fix grave problem of kiosktool terminating
kdeinit/klauncher of the main session. (BR80436) tdeinit/klauncher of the main session. (BR80436)
2004-04-28 Waldo Bastian <bastian@kde.org> 2004-04-28 Waldo Bastian <bastian@kde.org>

24
acinclude.m4
Unescape View File

@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@ -705,7 +705,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir) AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)') AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir) AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir) AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
@ -2027,8 +2027,8 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
AC_REQUIRE([K_PATH_X]) AC_REQUIRE([K_PATH_X])
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
@ -2036,16 +2036,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_KDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
@ -2054,10 +2054,10 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@ -2431,7 +2431,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi fi
]) ])

24
aclocal.m4 vendored
Unescape View File

@ -383,7 +383,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@ -717,7 +717,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir) AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)') AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir) AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir) AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
@ -2039,8 +2039,8 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
AC_REQUIRE([K_PATH_X]) AC_REQUIRE([K_PATH_X])
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
@ -2048,16 +2048,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_KDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
@ -2066,10 +2066,10 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@ -2443,7 +2443,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi fi
]) ])

6
kiosktool/Makefile.am
Unescape View File

@ -12,10 +12,10 @@ bin_PROGRAMS = kiosktool kiosktool-kdedirs
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
# the library search path. # the library search path.
kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# the libraries to link against. # the libraries to link against.
kiosktool_LDADD = $(LIB_KFILE) -lkdeprint kiosktool_LDADD = $(LIB_KFILE) -ltdeprint
# which sources should be compiled for kiosktool # which sources should be compiled for kiosktool
kiosktool_SOURCES = main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \ kiosktool_SOURCES = main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \
@ -32,7 +32,7 @@ kiosktool_SOURCES = main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \
kiosksync.cpp kiosksync.cpp
# the library search path. # the library search path.
kiosktool_kdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kiosktool_kdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# the libraries to link against. # the libraries to link against.
kiosktool_kdedirs_LDADD = $(LIB_KDECORE) kiosktool_kdedirs_LDADD = $(LIB_KDECORE)

4
kiosktool/componentPage.cpp
Unescape View File

@ -204,7 +204,7 @@ void ComponentPage::slotSetupDone()
KioskRun::self()->flushConfigCache(); KioskRun::self()->flushConfigCache();
if (m_data->setup.hasOption("restart")) if (m_data->setup.hasOption("restart"))
KApplication::kdeinitExec(m_data->setup.exec); KApplication::tdeinitExec(m_data->setup.exec);
} }
void ComponentPage::slotSetupAppRegistered( const TQCString &appid) void ComponentPage::slotSetupAppRegistered( const TQCString &appid)
@ -288,7 +288,7 @@ void ComponentPage::slotPreviewDone()
delete m_process; delete m_process;
m_process = 0; m_process = 0;
if (m_data->preview.hasOption("restart")) if (m_data->preview.hasOption("restart"))
KApplication::kdeinitExec(m_data->preview.exec); KApplication::tdeinitExec(m_data->preview.exec);
} }
void ComponentPage::slotShowAction(TQListViewItem *item) void ComponentPage::slotShowAction(TQListViewItem *item)

20
kiosktool/kioskrun.cpp
Unescape View File

@ -672,7 +672,7 @@ KioskRun::makeMutable(bool bMutable)
config->writeEntry("kiosk_exception", TQString()); config->writeEntry("kiosk_exception", TQString());
} }
} }
// Propagate to kdeinit // Propagate to tdeinit
dcopRef("klauncher", "klauncher").call("setLaunchEnv", dcopRef("klauncher", "klauncher").call("setLaunchEnv",
TQCString("KDE_KIOSK_NO_RESTRICTIONS"), TQCString(m_noRestrictions ? "true" : "")); TQCString("KDE_KIOSK_NO_RESTRICTIONS"), TQCString(m_noRestrictions ? "true" : ""));
@ -759,15 +759,15 @@ KioskRun::setupRuntimeEnv()
TQString dcopServerFile = m_homeDir+"/.kde/DCOPserver"; TQString dcopServerFile = m_homeDir+"/.kde/DCOPserver";
KProcess kdeinit; KProcess tdeinit;
applyEnvironment(&kdeinit); applyEnvironment(&tdeinit);
kdeinit << "kdeinit"; tdeinit << "tdeinit";
connect(&kdeinit, TQT_SIGNAL(processExited(KProcess *)), &dlg, TQT_SLOT(slotFinished())); connect(&tdeinit, TQT_SIGNAL(processExited(KProcess *)), &dlg, TQT_SLOT(slotFinished()));
kdeinit.start(KProcess::NotifyOnExit); tdeinit.start(KProcess::NotifyOnExit);
dlg.exec(); dlg.exec();
@ -811,12 +811,12 @@ KioskRun::shutdownRuntimeEnv()
delete m_dcopClient; delete m_dcopClient;
m_dcopClient = 0; m_dcopClient = 0;
KProcess kdeinit; KProcess tdeinit;
applyEnvironment(&kdeinit); applyEnvironment(&tdeinit);
kdeinit << "kdeinit_shutdown"; tdeinit << "tdeinit_shutdown";
kdeinit.start(KProcess::Block); tdeinit.start(KProcess::Block);
KProcess dcopserver; KProcess dcopserver;
applyEnvironment(&dcopserver); applyEnvironment(&dcopserver);

8
po/lt/kiosktool.po
Unescape View File

@ -551,7 +551,7 @@ msgstr ""
"Bendra\n" "Bendra\n"
"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n" "#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n"
"Bendros\n" "Bendros\n"
"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n" "#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"Bendros\n" "Bendros\n"
"#-#-#-#-# noatun.po (noatun) #-#-#-#-#\n" "#-#-#-#-# noatun.po (noatun) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
@ -1276,7 +1276,7 @@ msgstr ""
"&Pridėti\n" "&Pridėti\n"
"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n" "#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n"
"&Pridėti\n" "&Pridėti\n"
"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n" "#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"&Pridėti\n" "&Pridėti\n"
"#-#-#-#-# kio.po (kio) #-#-#-#-#\n" "#-#-#-#-# kio.po (kio) #-#-#-#-#\n"
"&Pridėti\n" "&Pridėti\n"
@ -1354,7 +1354,7 @@ msgid "&Abort"
msgstr "" msgstr ""
"#-#-#-#-# kdat.po (kdat) #-#-#-#-#\n" "#-#-#-#-# kdat.po (kdat) #-#-#-#-#\n"
"&Atšaukti\n" "&Atšaukti\n"
"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n" "#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"&Nutraukti" "&Nutraukti"
#: kioskrun.cpp:946 #: kioskrun.cpp:946
@ -1633,7 +1633,7 @@ msgstr ""
"Aprašymas\n" "Aprašymas\n"
"#-#-#-#-# kfile_png.po (kfile_png) #-#-#-#-#\n" "#-#-#-#-# kfile_png.po (kfile_png) #-#-#-#-#\n"
"Aprašymas\n" "Aprašymas\n"
"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n" "#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"Aprašymas:\n" "Aprašymas:\n"
"#-#-#-#-# kio.po (kio) #-#-#-#-#\n" "#-#-#-#-# kio.po (kio) #-#-#-#-#\n"
"Aprašymas:\n" "Aprašymas:\n"

Write Preview
Loading…
Cancel
Save