Browse Source

Rename kdeeject -> tdeeject

tags/r14.0.0
Darrell Anderson 5 years ago
parent
commit
a4a54d1ee3

+ 2
- 2
CMakeLists.txt View File

@@ -160,7 +160,7 @@ option( BUILD_TDEPRINT "Build tdeprint" ${BUILD_ALL} )
option( BUILD_KPERSONALIZER "Build kpersonalizer" ${BUILD_ALL} )
option( BUILD_TDEPASSWD "Build tdepasswd" ${BUILD_ALL} )
option( BUILD_KTIP "Build ktip" ${BUILD_ALL} )
option( BUILD_KDEEJECT "Build kdeeject" ${BUILD_ALL} )
option( BUILD_TDEEJECT "Build tdeeject" ${BUILD_ALL} )
option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} )
option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} )
option( BUILD_TDESU "Build tdesu" ${BUILD_ALL} )
@@ -240,7 +240,7 @@ tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprint )
tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer )
tde_conditional_add_subdirectory( BUILD_TDEPASSWD tdepasswd )
tde_conditional_add_subdirectory( BUILD_KTIP ktip )
tde_conditional_add_subdirectory( BUILD_KDEEJECT kdeeject )
tde_conditional_add_subdirectory( BUILD_TDEEJECT tdeeject )
tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog )
tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig )
tde_conditional_add_subdirectory( BUILD_TDESU tdesu )

+ 0
- 1
kdeeject/Makefile.am View File

@@ -1 +0,0 @@
bin_SCRIPTS = kdeeject

+ 1
- 1
kdesktop/init/Templates/CDROM-Device.desktop View File

@@ -89,4 +89,4 @@ Name[xh]=Khuphela ngaphandle
Name[zh_CN]=弹出
Name[zh_TW]=退出
Name[zu]=Khipha
Exec=kdeeject %v
Exec=tdeeject %v

+ 1
- 1
kdesktop/init/Templates/CDWRITER-Device.desktop View File

@@ -89,4 +89,4 @@ Name[xh]=Khuphela ngaphandle
Name[zh_CN]=弹出
Name[zh_TW]=退出
Name[zu]=Khipha
Exec=kdeeject %v
Exec=tdeeject %v

+ 1
- 1
kdesktop/init/Templates/DVDROM-Device.desktop View File

@@ -89,4 +89,4 @@ Name[xh]=Khuphela ngaphandle
Name[zh_CN]=弹出
Name[zh_TW]=退出
Name[zu]=Khipha
Exec=kdeeject %v
Exec=tdeeject %v

+ 1
- 1
kdesktop/init/Templates/ZIP-Device.desktop View File

@@ -89,4 +89,4 @@ Name[xh]=Khuphela ngaphandle
Name[zh_CN]=弹出
Name[zh_TW]=退出
Name[zu]=Khipha
Exec=kdeeject %v
Exec=tdeeject %v

kdeeject/CMakeLists.txt → tdeeject/CMakeLists.txt View File

@@ -9,4 +9,4 @@
#
#################################################

install( PROGRAMS kdeeject DESTINATION ${BIN_INSTALL_DIR} )
install( PROGRAMS tdeeject DESTINATION ${BIN_INSTALL_DIR} )

+ 1
- 0
tdeeject/Makefile.am View File

@@ -0,0 +1 @@
bin_SCRIPTS = tdeeject

kdeeject/kdeeject → tdeeject/tdeeject View File

@@ -37,7 +37,7 @@ if test -n "$udi"; then
fi

# Checking for stuff in the PATH is ugly with sh.
# I guess this is the reason for making this a kde app...
# I guess this is the reason for making this a TDE app...
OS=`uname -s`
case "$OS" in
OpenBSD)
@@ -58,6 +58,6 @@ if test $? -eq 0; then
#dcop kdesktop default refreshIcons
exit 0
elif test $quiet -eq 0; then
kdialog --title "KDE Eject" --error "Eject $device failed!"
kdialog --title "TDE Eject" --error "Eject $device failed!"
fi
exit 1

+ 3
- 3
tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp View File

@@ -198,9 +198,9 @@ void MountHelper::invokeEject(const TQString &device, bool quiet)
}
}

// Then fall back to kdeeject if needed
// Then fall back to tdeeject if needed
TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << "kdeeject";
*proc << "tdeeject";
if (quiet)
{
*proc << "-q";
@@ -271,7 +271,7 @@ static TDECmdLineOptions options[] =
{ "d", I18N_NOOP("Decrypt given URL"), 0 },
{ "u", I18N_NOOP("Unmount given URL"), 0 },
{ "m", I18N_NOOP("Mount given URL (default)"), 0 },
{ "e", I18N_NOOP("Eject given URL via kdeeject"), 0},
{ "e", I18N_NOOP("Eject given URL via tdeeject"), 0},
{ "s", I18N_NOOP("Unmount and Eject given URL (necessary for some USB devices)"), 0},
{"!+URL", I18N_NOOP("media:/ URL to mount/unmount/eject/remove"), 0 },
TDECmdLineLastOption

Loading…
Cancel
Save