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

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kio-umountwrapper

Browse Source 
Conflicts:
	admin
	cmake
pull/1/head
Darrell Anderson 11 years ago
parent b98e850ded 7048da84fc
commit bea6771031
10 changed files with 77 additions and 79 deletions
Show Stats Download Patch File Download Diff File

2
README
Unescape View File

@ -1,4 +1,4 @@
Simple unmount wrapper around 'kio_media_mounthelper -s <URL>' Simple unmount wrapper around 'tdeio_media_mounthelper -s <URL>'
It provides a progressbar which bounces back and forth. It provides a progressbar which bounces back and forth.
It takes one argument, which is the url to the mountpoint to safely remove. It takes one argument, which is the url to the mountpoint to safely remove.

72
acinclude.m4
Unescape View File

@ -602,11 +602,11 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity2ornewer"; then 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)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$trinity3ornewer"; then if test -n "$trinity3ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2070,41 +2070,41 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)

1
admin

@ -1 +0,0 @@
Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0

1
cmake

@ -1 +0,0 @@
Subproject commit d2f658ca47faefe569bcd1885b9238691fa13280

2
configure.in
Unescape View File

@ -40,7 +40,7 @@ dnl Perform program name transformation
AC_ARG_PROGRAM AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos) dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kio_umountwrapper, 0.2) dnl searches for some needed programs AM_INIT_AUTOMAKE(tdeio_umountwrapper, 0.2) dnl searches for some needed programs
KDE_SET_PREFIX KDE_SET_PREFIX

2
configure.in.in
Unescape View File

@ -1,6 +1,6 @@
#MIN_CONFIG(3.2.0) #MIN_CONFIG(3.2.0)
AM_INIT_AUTOMAKE(kio_umountwrapper, 0.2) AM_INIT_AUTOMAKE(tdeio_umountwrapper, 0.2)
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN AC_CHECK_KDEMAXPATHLEN

12
src/Makefile.am
Unescape View File

@ -2,14 +2,14 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = kio_umountwrapper.h noinst_HEADERS = tdeio_umountwrapper.h
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kio_umountwrapper.pot $(XGETTEXT) *.cpp -o $(podir)/tdeio_umountwrapper.pot
KDE_ICON = AUTO KDE_ICON = AUTO
@ -18,10 +18,10 @@ KDE_ICON = AUTO
######################################################################### #########################################################################
# this is the program that gets installed. it's name is used for all # this is the program that gets installed. it's name is used for all
# of the other Makefile.am variables # of the other Makefile.am variables
bin_PROGRAMS = kio_umountwrapper bin_PROGRAMS = tdeio_umountwrapper
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
kio_umountwrapper_SOURCES = main.cpp kio_umountwrapper.cpp tdeio_umountwrapper_SOURCES = main.cpp tdeio_umountwrapper.cpp
kio_umountwrapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor tdeio_umountwrapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kio_umountwrapper_LDADD = $(LIB_TDEUI) tdeio_umountwrapper_LDADD = $(LIB_TDEUI)

28
src/main.cpp
Unescape View File

@ -19,10 +19,10 @@
***************************************************************************/ ***************************************************************************/
#include "kio_umountwrapper.h" #include "tdeio_umountwrapper.h"
#include <kaboutdata.h> #include <tdeaboutdata.h>
#include <kcmdlineargs.h> #include <tdecmdlineargs.h>
#include <klocale.h> #include <tdelocale.h>
#include <kdebug.h> #include <kdebug.h>
@ -31,28 +31,28 @@ static const char description[] =
static const char version[] = "0.2"; static const char version[] = "0.2";
static KCmdLineOptions options[] = static TDECmdLineOptions options[] =
{ {
{ "+[URL]", I18N_NOOP( "URL to Safely Remove" ), 0 }, { "+[URL]", I18N_NOOP( "URL to Safely Remove" ), 0 },
KCmdLineLastOption TDECmdLineLastOption
}; };
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("kio_umountwrapper", I18N_NOOP("kio_umountwrapper"), version, description, TDEAboutData about("tdeio_umountwrapper", I18N_NOOP("tdeio_umountwrapper"), version, description,
KAboutData::License_GPL, "(C) 2007 Frode M. Døving", 0, 0, "frode@lnix.net"); TDEAboutData::License_GPL, "(C) 2007 Frode M. Døving", 0, 0, "frode@lnix.net");
about.addAuthor( "Frode M. Døving", 0, "frode@lnix.net" ); about.addAuthor( "Frode M. Døving", 0, "frode@lnix.net" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
kio_umountwrapper *app; tdeio_umountwrapper *app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
kdDebug() << "arg0: " << args->arg(0) << endl; kdDebug() << "arg0: " << args->arg(0) << endl;
if (args->count() == 0) if (args->count() == 0)
KCmdLineArgs::usage(i18n("No URL specified!")); TDECmdLineArgs::usage(i18n("No URL specified!"));
else app = new kio_umountwrapper(TQString(args->arg(0))); else app = new tdeio_umountwrapper(TQString(args->arg(0)));
args->clear(); args->clear();

28
src/kio_umountwrapper.cpp → src/tdeio_umountwrapper.cpp
Unescape View File

@ -19,20 +19,20 @@
***************************************************************************/ ***************************************************************************/
#include "kio_umountwrapper.h" #include "tdeio_umountwrapper.h"
#include <cstdlib> #include <cstdlib>
#include <tqtimer.h> #include <tqtimer.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <klocale.h> #include <tdelocale.h>
#include <kprogress.h> #include <kprogress.h>
#include <kprocess.h> #include <kprocess.h>
#include <kcmdlineargs.h> #include <tdecmdlineargs.h>
#include <kdebug.h> #include <kdebug.h>
kio_umountwrapper::kio_umountwrapper(const TQString& url) tdeio_umountwrapper::tdeio_umountwrapper(const TQString& url)
: KApplication() : TDEApplication()
{ {
m_progress = new KProgressDialog(); m_progress = new KProgressDialog();
setMainWidget(m_progress); setMainWidget(m_progress);
@ -47,22 +47,22 @@ kio_umountwrapper::kio_umountwrapper(const TQString& url)
connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(progressAdvance())); connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(progressAdvance()));
t->start(10, FALSE); t->start(10, FALSE);
KProcess *p = new KProcess(TQT_TQOBJECT(this)); TDEProcess *p = new TDEProcess(TQT_TQOBJECT(this));
*p << "kio_media_mounthelper"; *p << "tdeio_media_mounthelper";
*p << "-s"; *p << "-s";
*p << url; *p << url;
kdDebug() << "KProcess: " << url << endl; kdDebug() << "TDEProcess: " << url << endl;
connect(p, TQT_SIGNAL(processExited(KProcess *)), connect(p, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(processFinished(KProcess *))); this, TQT_SLOT(processFinished(TDEProcess *)));
p->start(); p->start();
} }
void kio_umountwrapper::progressAdvance() void tdeio_umountwrapper::progressAdvance()
{ {
m_progress->progressBar()->advance(1); m_progress->progressBar()->advance(1);
} }
void kio_umountwrapper::processFinished(KProcess* p) void tdeio_umountwrapper::processFinished(TDEProcess* p)
{ {
if (p->normalExit() && p->exitStatus() == 0) if (p->normalExit() && p->exitStatus() == 0)
{ {
@ -74,4 +74,4 @@ void kio_umountwrapper::processFinished(KProcess* p)
} }
} }
#include "kio_umountwrapper.moc" #include "tdeio_umountwrapper.moc"

8
src/kio_umountwrapper.h → src/tdeio_umountwrapper.h
Unescape View File

@ -26,23 +26,23 @@
#include <config.h> #include <config.h>
#endif #endif
#include <kapplication.h> #include <tdeapplication.h>
#include <kprogress.h> #include <kprogress.h>
#include <kprocess.h> #include <kprocess.h>
class kio_umountwrapper : public KApplication class tdeio_umountwrapper : public TDEApplication
{ {
Q_OBJECT Q_OBJECT
public: public:
kio_umountwrapper(const TQString&); tdeio_umountwrapper(const TQString&);
private: private:
KProgressDialog *m_progress; KProgressDialog *m_progress;
private slots: private slots:
void progressAdvance(); void progressAdvance();
void processFinished(KProcess* p); void processFinished(TDEProcess* p);
}; };
Write Preview
Loading…
Cancel
Save