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

Rename additional KDE strings

Browse Source
pull/2/head
Timothy Pearson 13 years ago
parent 4e8df9c340
commit e81bdee8ae
14 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File

10
doc/userguide/kde-for-admins.docbook
Unescape View File

@ -64,7 +64,7 @@ class="directory">/etc/opt/trinity</filename>. (This was added by
<para>If you have the KIOSK Admin tool v0.7 or later installed you can <para>If you have the KIOSK Admin tool v0.7 or later installed you can
check which directory trees are used with the following command: check which directory trees are used with the following command:
<userinput><command>kiosktool-kdedirs</command> <userinput><command>kiosktool-tdedirs</command>
<option>--check</option></userinput></para> <option>--check</option></userinput></para>
</informalexample> </informalexample>
@ -148,7 +148,7 @@ Position=10,10
</seglistitem> </seglistitem>
<seglistitem> <seglistitem>
<seg><envar>KDEROOTHOME</envar></seg> <seg><envar>TDEROOTHOME</envar></seg>
<seg><filename class="directory">/root/.kde</filename></seg> <seg><filename class="directory">/root/.kde</filename></seg>
<seg>Different variable to prevent <seg>Different variable to prevent
root writing to $TDEHOME of the user after running root writing to $TDEHOME of the user after running
@ -184,7 +184,7 @@ colon. If not set, falls back to $<envar>TDEDIR</envar></seg>
settings:</para> settings:</para>
<programlisting> <programlisting>
TDEHOME='~/.trinity' TDEHOME='~/.trinity'
KDEROOTHOME='/root/.trinity' TDEROOTHOME='/root/.trinity'
TDEDIRS='/opt/kde_staff:/opt/trinity' TDEDIRS='/opt/kde_staff:/opt/trinity'
</programlisting> </programlisting>
@ -1171,7 +1171,7 @@ the directory where personal data is stored.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry><term>$<envar>KDEROOTHOME</envar></term><listitem><para>If <varlistentry><term>$<envar>TDEROOTHOME</envar></term><listitem><para>If
not set, &kde; uses <filename class="directory">~root/.kde</filename> not set, &kde; uses <filename class="directory">~root/.kde</filename>
as the directory for <systemitem class="username">root</systemitem>'s as the directory for <systemitem class="username">root</systemitem>'s
personal data. Was introduced to prevent &kde; from accidently personal data. Was introduced to prevent &kde; from accidently
@ -1195,7 +1195,7 @@ necessary files are installed.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry><term>$<envar>KDE_MULTIHEAD</envar></term><listitem><para>Set <varlistentry><term>$<envar>TDE_MULTIHEAD</envar></term><listitem><para>Set
this variable to <literal>true</literal> to indicate that &kde; is running this variable to <literal>true</literal> to indicate that &kde; is running
on a multi-head system.</para> on a multi-head system.</para>
</listitem> </listitem>

2
kcminit/main.cpp
Unescape View File

@ -180,7 +180,7 @@ KCMInit::KCMInit( KCmdLineArgs* args )
bool multihead = !config.readBoolEntry( "disableMultihead", false) && bool multihead = !config.readBoolEntry( "disableMultihead", false) &&
(ScreenCount(qt_xdisplay()) > 1); (ScreenCount(qt_xdisplay()) > 1);
// Pass env. var to tdeinit. // Pass env. var to tdeinit.
TQCString name = "KDE_MULTIHEAD"; TQCString name = "TDE_MULTIHEAD";
TQCString value = multihead ? "true" : "false"; TQCString value = multihead ? "true" : "false";
TQByteArray params; TQByteArray params;
TQDataStream stream(params, IO_WriteOnly); TQDataStream stream(params, IO_WriteOnly);

2
kcontrol/background/bgdialog.cpp
Unescape View File

@ -84,7 +84,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
m_numViewports = s.width() * s.height(); m_numViewports = s.width() * s.height();
m_numScreens = TQApplication::desktop()->numScreens(); m_numScreens = TQApplication::desktop()->numScreens();
TQCString multiHead = getenv("KDE_MULTIHEAD"); TQCString multiHead = getenv("TDE_MULTIHEAD");
if (multiHead.lower() == "true") if (multiHead.lower() == "true")
{ {
m_numScreens = 1; m_numScreens = 1;

4
kcontrol/input/core/themepage.cpp
Unescape View File

@ -173,8 +173,8 @@ void ThemePage::fixCursorFile()
// override dir. // override dir.
// //
// Next, if the user wants large cursors, copy the font // Next, if the user wants large cursors, copy the font
// cursor_large.pcf.gz to (localkdedir)/share/fonts/override/cursor.pcf.gz. // cursor_large.pcf.gz to (localtdedir)/share/fonts/override/cursor.pcf.gz.
// Else remove the font cursor.pcf.gz from (localkdedir)/share/fonts/override. // Else remove the font cursor.pcf.gz from (localtdedir)/share/fonts/override.
// //
// Run mkfontdir to update fonts.dir in that dir. // Run mkfontdir to update fonts.dir in that dir.

4
kcontrol/keys/shortcuts.cpp
Unescape View File

@ -104,7 +104,7 @@ TQString ShortcutsModule::quickHelp() const
void ShortcutsModule::initGUI() void ShortcutsModule::initGUI()
{ {
TQString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/"; TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/";
kdDebug(125) << "A-----------" << endl; kdDebug(125) << "A-----------" << endl;
KAccelActions* keys = &m_actionsGeneral; KAccelActions* keys = &m_actionsGeneral;
@ -458,7 +458,7 @@ void ShortcutsModule::slotRemoveScheme()
void ShortcutsModule::slotUseRmWinKeysClicked() void ShortcutsModule::slotUseRmWinKeysClicked()
{ {
TQString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/"; TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/";
// See if ~/.trinity/env/win-key.sh exists // See if ~/.trinity/env/win-key.sh exists
TQFile f( kde_winkeys_env_dir + "win-key.sh" ); TQFile f( kde_winkeys_env_dir + "win-key.sh" );

2
kdm/ChangeLog
Unescape View File

@ -527,7 +527,7 @@ if they affect the configuration.
1998-03-26 Stephan Kulow <coolo@kde.org> 1998-03-26 Stephan Kulow <coolo@kde.org>
* Nuke -kdedir cmdline option and Kdedir resource * Nuke -tdedir cmdline option and Kdedir resource
1997-09-09 Steffen Hansen <hansen@kde.org> 1997-09-09 Steffen Hansen <hansen@kde.org>

2
khotkeys/app/app.cpp
Unescape View File

@ -96,7 +96,7 @@ int KDE_EXPORT kdemain( int argc, char** argv )
{ {
{ {
// multiheaded hotkeys // multiheaded hotkeys
TQCString multiHead = getenv("KDE_MULTIHEAD"); TQCString multiHead = getenv("TDE_MULTIHEAD");
if (multiHead.lower() == "true") { if (multiHead.lower() == "true") {
Display *dpy = XOpenDisplay(NULL); Display *dpy = XOpenDisplay(NULL);
if (! dpy) { if (! dpy) {

2
khotkeys/kcontrol/init.cpp
Unescape View File

@ -31,7 +31,7 @@ extern "C"
// Non-xinerama multhead support in KDE is just a hack // Non-xinerama multhead support in KDE is just a hack
// involving forking apps per-screen. Don't bother with // involving forking apps per-screen. Don't bother with
// kded modules in such case. // kded modules in such case.
TQCString multiHead = getenv("KDE_MULTIHEAD"); TQCString multiHead = getenv("TDE_MULTIHEAD");
if (multiHead.lower() == "true") if (multiHead.lower() == "true")
kapp->tdeinitExec( "khotkeys" ); kapp->tdeinitExec( "khotkeys" );
else else

2
kicker/kicker/core/main.cpp
Unescape View File

@ -57,7 +57,7 @@ static void sighandler(int)
extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
{ {
{ {
TQCString multiHead = getenv("KDE_MULTIHEAD"); TQCString multiHead = getenv("TDE_MULTIHEAD");
if (multiHead.lower() == "true") { if (multiHead.lower() == "true") {
Display *dpy = XOpenDisplay(NULL); Display *dpy = XOpenDisplay(NULL);
if (! dpy) { if (! dpy) {

2
konqueror/konq_mainwindow.cc
Unescape View File

@ -5857,7 +5857,7 @@ bool KonqMainWindow::stayPreloaded()
if( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' ) if( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' )
return false; return false;
// not the same user like the one running the session (most likely we're run via sudo or something) // not the same user like the one running the session (most likely we're run via sudo or something)
if( getenv( "KDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "KDE_SESSION_UID" ))) != getuid()) if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid())
return false; return false;
if( KonqSettings::maxPreloadCount() == 0 ) if( KonqSettings::maxPreloadCount() == 0 )
return false; return false;

76
starttde
Unescape View File

@ -111,9 +111,9 @@ else
fi fi
# Run a quick test for root. # Run a quick test for root.
if [ -z "$KDEROOTHOME" ] && [ "$UID" = "0" ]; then if [ -z "$TDEROOTHOME" ] && [ "$UID" = "0" ]; then
echo "[starttde] User ID is $UID. Setting KDEROOTHOME to $TDEHOME." echo "[starttde] User ID is $UID. Setting TDEROOTHOME to $TDEHOME."
export KDEROOTHOME=$TDEHOME export TDEROOTHOME=$TDEHOME
fi fi
# Modify the following environment variables only as necessary. # Modify the following environment variables only as necessary.
@ -162,18 +162,18 @@ if [ -d /opt/trinity ]; then
fi fi
fi fi
test -n "$TDEHOME" && kdehome=`echo "$TDEHOME" | sed "s,^~/,$HOME/,"` test -n "$TDEHOME" && tdehome=`echo "$TDEHOME" | sed "s,^~/,$HOME/,"`
echo "[starttde] kdehome: $kdehome" 1>&2 echo "[starttde] tdehome: $tdehome" 1>&2
# Allow interested applications, such as the Plasma control wrapper, # Allow interested applications, such as the Plasma control wrapper,
# to know that this is a Trinity desktop and not a KDE one. # to know that this is a Trinity desktop and not a KDE one.
export DESKTOP_SESSION=trinity export DESKTOP_SESSION=trinity
# Please see kstartupconfig source for usage. # Please see kstartupconfig source for usage.
mkdir -m 700 -p $kdehome mkdir -m 700 -p $tdehome
mkdir -m 700 -p $kdehome/share mkdir -m 700 -p $tdehome/share
mkdir -m 700 -p $kdehome/share/config mkdir -m 700 -p $tdehome/share/config
cat >$kdehome/share/config/startupconfigkeys <<EOF cat >$tdehome/share/config/startupconfigkeys <<EOF
kcminputrc Mouse cursorTheme '' kcminputrc Mouse cursorTheme ''
kcminputrc Mouse cursorSize '' kcminputrc Mouse cursorSize ''
kpersonalizerrc General FirstLogin true kpersonalizerrc General FirstLogin true
@ -189,16 +189,16 @@ kstartupconfig
if test $? -ne 0; then if test $? -ne 0; then
xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation." xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation."
fi fi
# $kdehome/share/config/startupconfig should exist but avoid script failure if not. # $tdehome/share/config/startupconfig should exist but avoid script failure if not.
if [ -r $kdehome/share/config/startupconfig ]; then if [ -r $tdehome/share/config/startupconfig ]; then
. $kdehome/share/config/startupconfig . $tdehome/share/config/startupconfig
fi fi
# Make sure a default wallpaper is set. # Make sure a default wallpaper is set.
if [ ! -e $kdehome/share/config/kdesktoprc ]; then if [ ! -e $tdehome/share/config/kdesktoprc ]; then
# With Trinity KDE this file should exist, but test first. # With Trinity KDE this file should exist, but test first.
if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
cat >$kdehome/share/config/kdesktoprc <<EOF cat >$tdehome/share/config/kdesktoprc <<EOF
[Desktop0] [Desktop0]
Wallpaper=isadora.png Wallpaper=isadora.png
WallpaperMode=Scaled WallpaperMode=Scaled
@ -293,21 +293,21 @@ fi
# Configuration of the gtk_qt_engine if not already set. # Configuration of the gtk_qt_engine if not already set.
if test -n "$TDEDIRS"; then if test -n "$TDEDIRS"; then
kdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'` tdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'`
KGTK_RC_ENGINE=$kdedirs_first/share/kgtk/gtk-qt-engine.rc.sh KGTK_RC_ENGINE=$tdedirs_first/share/kgtk/gtk-qt-engine.rc.sh
KGTK_RC_KDE1=$kdedirs_first/share/kgtk/.gtkrc-2.0-kde4 KGTK_RC_KDE1=$tdedirs_first/share/kgtk/.gtkrc-2.0-kde4
KGTK_RC_KDE2=$kdedirs_first/share/kgtk/.gtkrc-2.0-kde-kde4 KGTK_RC_KDE2=$tdedirs_first/share/kgtk/.gtkrc-2.0-kde-kde4
else else
KGTK_RC_ENGINE=$TDEDIR/share/kgtk/gtk-qt-engine.rc.sh KGTK_RC_ENGINE=$TDEDIR/share/kgtk/gtk-qt-engine.rc.sh
KGTK_RC_KDE1=$TDEDIR/share/kgtk/.gtkrc-2.0-kde4 KGTK_RC_KDE1=$TDEDIR/share/kgtk/.gtkrc-2.0-kde4
KGTK_RC_KDE2=$TDEDIR/share/kgtk/.gtkrc-2.0-kde-kde4 KGTK_RC_KDE2=$TDEDIR/share/kgtk/.gtkrc-2.0-kde-kde4
fi fi
if [ ! -e $kdehome/env/gtk-qt-engine.rc.sh ] && [ -e $KGTK_RC_ENGINE ] if [ ! -e $tdehome/env/gtk-qt-engine.rc.sh ] && [ -e $KGTK_RC_ENGINE ]
then then
mkdir -p $kdehome/env mkdir -p $tdehome/env
cp -f $KGTK_RC_ENGINE $kdehome/env cp -f $KGTK_RC_ENGINE $tdehome/env
chmod 755 $kdehome/env/gtk-qt-engine.rc.sh chmod 755 $tdehome/env/gtk-qt-engine.rc.sh
fi fi
if [ ! -e $HOME/.gtkrc-2.0-kde4 ] && [ -e $KGTK_RC_KDE1 ] if [ ! -e $HOME/.gtkrc-2.0-kde4 ] && [ -e $KGTK_RC_KDE1 ]
@ -391,20 +391,20 @@ echo "[starttde] TDEDIR: $TDEDIR" 1>&2
echo "[starttde] TDEDIRS: $TDEDIRS" 1>&2 echo "[starttde] TDEDIRS: $TDEDIRS" 1>&2
if test -n "$TDEDIRS"; then if test -n "$TDEDIRS"; then
kdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'` tdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'`
sys_odir=$kdedirs_first/share/fonts/override sys_odir=$tdedirs_first/share/fonts/override
sys_fdir=$kdedirs_first/share/fonts sys_fdir=$tdedirs_first/share/fonts
else else
sys_odir=$TDEDIR/share/fonts/override sys_odir=$TDEDIR/share/fonts/override
sys_fdir=$TDEDIR/share/fonts sys_fdir=$TDEDIR/share/fonts
fi fi
if test -n "$TDEDIRS"; then if test -n "$TDEDIRS"; then
kdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'` tdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'`
echo "[starttde] kdedirs_first: $kdedirs_first" echo "[starttde] tdedirs_first: $tdedirs_first"
if [ -r $kdedirs_first/share/kgtk/preload ]; then if [ -r $tdedirs_first/share/kgtk/preload ]; then
echo "[starttde] Reading from $kdedirs_first/share/kgtk/preload" echo "[starttde] Reading from $tdedirs_first/share/kgtk/preload"
read -r KGTK_PRELOAD < $kdedirs_first/share/kgtk/preload read -r KGTK_PRELOAD < $tdedirs_first/share/kgtk/preload
fi fi
else else
if [ -r $TDEDIR/share/kgtk/preload ]; then if [ -r $TDEDIR/share/kgtk/preload ]; then
@ -498,9 +498,9 @@ if test "$kpersonalizerrc_general_firstlogin" = "true"; then
fi fi
# Remove moodin cache if we have a new wallpaper installed, jriddell. Distro-specific. # Remove moodin cache if we have a new wallpaper installed, jriddell. Distro-specific.
if [ -d $kdehome/share/apps/ksplash/cache/Moodin/kubuntu ]; then if [ -d $tdehome/share/apps/ksplash/cache/Moodin/kubuntu ]; then
if [ /usr/share/wallpapers/kubuntu-wallpaper.png -nt $kdehome/share/apps/ksplash/cache/Moodin/kubuntu/ ]; then if [ /usr/share/wallpapers/kubuntu-wallpaper.png -nt $tdehome/share/apps/ksplash/cache/Moodin/kubuntu/ ]; then
rm -rf $kdehome/share/apps/ksplash/cache/Moodin/kubuntu/ rm -rf $tdehome/share/apps/ksplash/cache/Moodin/kubuntu/
fi fi
fi fi
@ -534,7 +534,7 @@ fi
# xprop -root | grep "^TDE_FULL_SESSION" >/dev/null 2>/dev/null # xprop -root | grep "^TDE_FULL_SESSION" >/dev/null 2>/dev/null
# if test $? -eq 0; then ... whatever # if test $? -eq 0; then ... whatever
# #
# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid # Additionally there is (since KDE 3.5.7) $TDE_SESSION_UID with the uid
# of the user running the KDE session. It should be rarely needed (e.g. # of the user running the KDE session. It should be rarely needed (e.g.
# after sudo to prevent desktop-wide functionality in the new user's kded). # after sudo to prevent desktop-wide functionality in the new user's kded).
# #
@ -542,9 +542,9 @@ TDE_FULL_SESSION=true
export TDE_FULL_SESSION export TDE_FULL_SESSION
xprop -root -f TDE_FULL_SESSION 8t -set TDE_FULL_SESSION true xprop -root -f TDE_FULL_SESSION 8t -set TDE_FULL_SESSION true
echo "[starttde] TDE_FULL_SESSION: $TDE_FULL_SESSION" 1>&2 echo "[starttde] TDE_FULL_SESSION: $TDE_FULL_SESSION" 1>&2
KDE_SESSION_UID=$UID TDE_SESSION_UID=$UID
export KDE_SESSION_UID export TDE_SESSION_UID
echo "[starttde] KDE_SESSION_UID: $KDE_SESSION_UID" 1>&2 echo "[starttde] TDE_SESSION_UID: $TDE_SESSION_UID" 1>&2
# We set LD_BIND_NOW to increase the efficiency of tdeinit. # We set LD_BIND_NOW to increase the efficiency of tdeinit.
# tdeinit unsets this variable before loading applications. # tdeinit unsets this variable before loading applications.
@ -613,7 +613,7 @@ done
unset TDE_FULL_SESSION unset TDE_FULL_SESSION
xprop -root -remove TDE_FULL_SESSION xprop -root -remove TDE_FULL_SESSION
unset KDE_SESSION_UID unset TDE_SESSION_UID
# Initialize_Status_Header # Initialize_Status_Header
echo "[starttde] Trinity shutdown complete." 1>&2 echo "[starttde] Trinity shutdown complete." 1>&2

4
tdesu/tdesu/tdesu.cpp
Unescape View File

@ -285,10 +285,10 @@ static int startApp()
if (pw->pw_uid) if (pw->pw_uid)
{ {
// Only propagate TDEHOME for non-root users, // Only propagate TDEHOME for non-root users,
// root uses KDEROOTHOME // root uses TDEROOTHOME
// Translate the TDEHOME of this user to the new user. // Translate the TDEHOME of this user to the new user.
TQString kdeHome = KGlobal::dirs()->relativeLocation("home", KGlobal::dirs()->localkdedir()); TQString kdeHome = KGlobal::dirs()->relativeLocation("home", KGlobal::dirs()->localtdedir());
if (kdeHome[0] != '/') if (kdeHome[0] != '/')
kdeHome.prepend("~/"); kdeHome.prepend("~/");
else else

2
twin/events.cpp
Unescape View File

@ -431,7 +431,7 @@ bool Workspace::workspaceEvent( XEvent * e )
return FALSE; return FALSE;
break; break;
case FocusIn: case FocusIn:
if( e->xfocus.window == rootWin() && TQCString( getenv("KDE_MULTIHEAD")).lower() != "true" if( e->xfocus.window == rootWin() && TQCString( getenv("TDE_MULTIHEAD")).lower() != "true"
&& ( e->xfocus.detail == NotifyDetailNone || e->xfocus.detail == NotifyPointerRoot )) && ( e->xfocus.detail == NotifyDetailNone || e->xfocus.detail == NotifyPointerRoot ))
{ {
updateXTime(); // focusToNull() uses qt_x_time, which is old now (FocusIn has no timestamp) updateXTime(); // focusToNull() uses qt_x_time, which is old now (FocusIn has no timestamp)

2
twin/main.cpp
Unescape View File

@ -255,7 +255,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
// we only do the multihead fork if we are not restored by the session // we only do the multihead fork if we are not restored by the session
// manager, since the session manager will register multiple twins, // manager, since the session manager will register multiple twins,
// one for each screen... // one for each screen...
TQCString multiHead = getenv("KDE_MULTIHEAD"); TQCString multiHead = getenv("TDE_MULTIHEAD");
if (multiHead.lower() == "true") if (multiHead.lower() == "true")
{ {

Write Preview
Loading…
Cancel
Save