diff options
| author | Timothy Pearson <[email protected]> | 2011-12-07 19:07:19 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-07 19:07:19 -0600 |
| commit | 6723d581f9777be5206619112a30122439c0ee95 (patch) | |
| tree | d835c452bc1081f1d58a7c209654e345ebf0fbe8 | |
| parent | deba8145ea74eac9c43b8aef4642357d72f7d0c0 (diff) | |
| download | tdebase-6723d581f9777be5206619112a30122439c0ee95.tar.gz tdebase-6723d581f9777be5206619112a30122439c0ee95.zip | |
Rename KDEHOME and KDEDIR
53 files changed, 212 insertions, 212 deletions
@@ -169,7 +169,7 @@ toothofthehoundthatbitcha, vegetative_fog, wavetron, woodcheck Common Mistakes --------------- -IMPORTANT: most applications need KDEDIR as the directory where KDE is +IMPORTANT: most applications need TDEDIR as the directory where KDE is installed. Please set this in your login file. If XPM support wasn't configured, it may be that configure has no idea where @@ -278,7 +278,7 @@ Removal/Uninstallation ---------------------- You can use 'make uninstall' if you want to remove the kde from the dirs. This feature has not been tested completely, and is depreciated. On a system -where KDEDIR is specific to KDE (i.e. not /usr), rm -rf $KDEDIR does it as +where TDEDIR is specific to KDE (i.e. not /usr), rm -rf $TDEDIR does it as well. diff --git a/doc/faq/configkde.docbook b/doc/faq/configkde.docbook index f0cb4d2be..f1393d829 100644 --- a/doc/faq/configkde.docbook +++ b/doc/faq/configkde.docbook @@ -191,12 +191,12 @@ url="http://www.koffice.org/kword/euro.php">http://www.koffice.org/kword/euro.ph <answer><para>There are many ways to do that. If what you want to do is to run some scripts that would set some environment variables (for example, to start <command>gpg-agent</command>, <command>ssh-agent</command> and others), you can put -these scripts into <filename class="directory">$<envar>KDEHOME</envar>/env/</filename> and make sure their names end in -<literal role="extension">.sh</literal>. $<envar>KDEHOME</envar> is +these scripts into <filename class="directory">$<envar>TDEHOME</envar>/env/</filename> and make sure their names end in +<literal role="extension">.sh</literal>. $<envar>TDEHOME</envar> is usually a folder named <filename class="directory">.kde</filename> (note the period at the beginning) in your home folder. If you want scripts to be executed for all &kde; users, you can -put them under <filename class="directory">$<envar>KDEDIR</envar>/env/</filename>, where $<envar>KDEDIR</envar> is the prefix &kde; was +put them under <filename class="directory">$<envar>TDEDIR</envar>/env/</filename>, where $<envar>TDEDIR</envar> is the prefix &kde; was installed to (you can find this out using the command <userinput><command>kde-config</command> --prefix</userinput>).</para> <para>If you wish to start a program after &kde; has started, you may want to use the diff --git a/doc/faq/desktop.docbook b/doc/faq/desktop.docbook index da3de1608..e31f7a8ce 100644 --- a/doc/faq/desktop.docbook +++ b/doc/faq/desktop.docbook @@ -45,7 +45,7 @@ use the &RMB; on the desktop and choose <menuchoice><guimenuitem>Create New</gui </question> <answer> <para>The icons can be found only in <filename -class="directory">$<envar>KDEDIRS</envar>/share/icons</filename> or <filename +class="directory">$<envar>TDEDIRS</envar>/share/icons</filename> or <filename class="directory">$<envar>HOME</envar>/.kde/share/icons</filename> or <filename class="directory">$<envar>HOME</envar>/.kde2/share/icons</filename>. To use icons stored in other locations, you must either copy them into one of the diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook index 8dc1227ea..5548d2f24 100644 --- a/doc/faq/install.docbook +++ b/doc/faq/install.docbook @@ -360,7 +360,7 @@ necessary on systems that do not support rpath; on &Linux; &ELF;, it should work without). This environment variable may be called differently on some systems, ⪚ it is called <envar>SHLIB_PATH</envar> on &IRIX;. Then set the environment variable -<envar>KDEDIR</envar> to the base of your &kde; tree, ⪚ <filename +<envar>TDEDIR</envar> to the base of your &kde; tree, ⪚ <filename class="directory">/usr/local/kde</filename>. <caution> <para>Please bear in mind that it is unwise to set @@ -378,7 +378,7 @@ features if you use the &kde; window manager and its helper programs.</para> <para>In order to make it easy for you, we have provided a simple script called <filename>starttde</filename> which gets installed in <filename -class="directory">$<envar>KDEDIR</envar>/bin</filename> and is therefore in your +class="directory">$<envar>TDEDIR</envar>/bin</filename> and is therefore in your path.</para> <para>Edit the file <filename>.xinitrc</filename> in your home folder (make a backup copy first!), remove everything that looks like calling a window @@ -451,9 +451,9 @@ machine until the password is entered.</para></caution></para> <title>Setting the suid bit on the screensavers</title> <step performance="required"><para>become root</para></step> <step performance="required"><para><command>chown root -$<envar>KDEDIR</envar>/bin/*.kss</command></para></step> +$<envar>TDEDIR</envar>/bin/*.kss</command></para></step> <step performance="required"><para><command>chmod u+s -$<envar>KDEDIR</envar>/bin/*.kss</command></para></step> +$<envar>TDEDIR</envar>/bin/*.kss</command></para></step> </procedure> <para>Alternatively, if you compile &kde; from source, you can use <command>./configure <option>with-shadow</option></command> to @@ -480,12 +480,12 @@ is better to leave it out.</para> <para>For csh or tcsh:</para> <programlisting> -setenv KDEDIR /home/me +setenv TDEDIR /home/me if ( $?LD_LIBRARY_PATH ) then - setenv LD_LIBRARY_PATH $KDEDIR/lib:$LD_LIBRARY_PATH + setenv LD_LIBRARY_PATH $TDEDIR/lib:$LD_LIBRARY_PATH else - setenv LD_LIBRARY_PATH $KDEDIR/lib + setenv LD_LIBRARY_PATH $TDEDIR/lib endif if ( ! $?LIBRARY_PATH ) then @@ -494,11 +494,11 @@ endif </programlisting> <para>For <application>bash</application>:</para> <programlisting> -KDEDIR=/home/me -PATH=$KDEDIR/bin:$PATH -LD_LIBRARY_PATH=$KDEDIR/lib:$LD_LIBRARY_PATH +TDEDIR=/home/me +PATH=$TDEDIR/bin:$PATH +LD_LIBRARY_PATH=$TDEDIR/lib:$LD_LIBRARY_PATH LIBRARY_PATH=$LD_LIBRARY_PATH -export KDEDIR PATH LD_LIBRARY_PATH LIBRARY_PATH +export TDEDIR PATH LD_LIBRARY_PATH LIBRARY_PATH </programlisting></step> </procedure> <procedure><title><acronym>RPM</acronym> packages</title> @@ -641,7 +641,7 @@ removing the old <filename class="directory">.kde</filename> folder, without a hitch.</para> <para>You can override the use of <filename class="directory">$<envar>HOME</envar>/.kde</filename> by setting the -$<envar>KDEHOME</envar> variable.</para> +$<envar>TDEHOME</envar> variable.</para> </answer> </qandaentry> @@ -703,7 +703,7 @@ source?</para> uninstall</command> in the folder where you did <command>make install</command>. If you have already deleted that folder, then there is only one way, and it is not good: go to <filename -class="directory">$<envar>KDEDIR</envar>/bin</filename> and start deleting files +class="directory">$<envar>TDEDIR</envar>/bin</filename> and start deleting files one by one.</para> <para>If you expect to find yourself in this situation, you might want to consider a program such as &GNU; <application>stow</application>, found at diff --git a/doc/faq/kdeapps.docbook b/doc/faq/kdeapps.docbook index ff11d80c2..68b1fd2cc 100644 --- a/doc/faq/kdeapps.docbook +++ b/doc/faq/kdeapps.docbook @@ -120,7 +120,7 @@ paste by clicking with the &MMB; (or both buttons if you are using a <para><application>FontConfig</application> must find the three fonts installed in: <filename -class="directory">$<envar>KDEDIR</envar>/share/fonts</filename>. +class="directory">$<envar>TDEDIR</envar>/share/fonts</filename>. If the &kde; install does not install these fonts in a directory that already exists (⪚ <filename diff --git a/doc/faq/panel.docbook b/doc/faq/panel.docbook index 5814dc613..6c9a1d3a2 100644 --- a/doc/faq/panel.docbook +++ b/doc/faq/panel.docbook @@ -40,7 +40,7 @@ you prefer from install it using the &kcontrolcenter;.</para> <para>In order to change only the &kmenu; icon you can overwrite the <filename>kmenu.png</filename> image for every size in an icon theme set. -So, for &kde; default icons this would be <filename>$<envar>KDEDIR</envar>/share/icons/default.kde/<replaceable>size</replaceable>/apps/kmenu.png</filename>, +So, for &kde; default icons this would be <filename>$<envar>TDEDIR</envar>/share/icons/default.kde/<replaceable>size</replaceable>/apps/kmenu.png</filename>, where <replaceable>size</replaceable> is one of the sizes included in the &kde; icon theme. </para> @@ -85,9 +85,9 @@ action="simul">&Alt;<keycap>F2</keycap> </keycombo> and entering <para>If the panel continues to disappear, you may wish to either remove or edit by hand your -<filename>$<envar>KDEHOME</envar>/share/config/kickerrc</filename> +<filename>$<envar>TDEHOME</envar>/share/config/kickerrc</filename> file, where <filename -class="directory">$<envar>KDEHOME</envar></filename> is usually +class="directory">$<envar>TDEHOME</envar></filename> is usually <filename class="directory">~/.kde</filename>. If you choose to edit it by hand, start by removing the applet entry groups.</para> diff --git a/doc/faq/sound.docbook b/doc/faq/sound.docbook index d7db604bc..af41375ab 100644 --- a/doc/faq/sound.docbook +++ b/doc/faq/sound.docbook @@ -44,7 +44,7 @@ conjunction with using <command>artsplay</command> in a second terminal can give <question><para> I've upgraded to the latest version of &kde; keeping my old configuration, and my system sounds don't work anymore!</para></question> <answer><para> -Assuming you've installed &arts; correctly and you still have the codecs installed your previous &kde; installation needed, chances are this is a small problem with your <filename>knotifyrc</filename>. To confirm this, try creating an entirely new user and seeing if system notifications work under the new account. If they do, try moving your <filename>$<envar>KDEHOME</envar>/share/config/knotifyrc</filename> out of the way for your original user to see if this solves the problem. +Assuming you've installed &arts; correctly and you still have the codecs installed your previous &kde; installation needed, chances are this is a small problem with your <filename>knotifyrc</filename>. To confirm this, try creating an entirely new user and seeing if system notifications work under the new account. If they do, try moving your <filename>$<envar>TDEHOME</envar>/share/config/knotifyrc</filename> out of the way for your original user to see if this solves the problem. </para></answer> </qandaentry> diff --git a/doc/kate/highlighting.docbook b/doc/kate/highlighting.docbook index 76952d26a..3a64d9d2c 100644 --- a/doc/kate/highlighting.docbook +++ b/doc/kate/highlighting.docbook @@ -212,7 +212,7 @@ the highlight detection rules.</para> <para>The formal definition, aka the <acronym>DTD</acronym> is stored in the file <filename>language.dtd</filename> which should be installed on your system in the folder -<filename>$<envar>KDEDIR</envar>/share/apps/katepart/syntax</filename>. +<filename>$<envar>TDEDIR</envar>/share/apps/katepart/syntax</filename>. </para> <variablelist> diff --git a/doc/kcontrol/background/index.docbook b/doc/kcontrol/background/index.docbook index 5241462c0..809350754 100644 --- a/doc/kcontrol/background/index.docbook +++ b/doc/kcontrol/background/index.docbook @@ -354,7 +354,7 @@ url="http://www.kde-look.org">KDE-Look</ulink> website. You can of course select any image you have available to use as wallpaper, and it may be stored in any location on your hard drive. To have a wallpaper show up in the list automatically for all users, you should save it to the <filename -class="directory">$<envar>KDEDIR</envar>/share/wallpapers</filename> +class="directory">$<envar>TDEDIR</envar>/share/wallpapers</filename> folder.</para> <para>A pattern is a picture file which &kde; uses as a template to @@ -364,7 +364,7 @@ can add new patterns.</para> <para>To add a new pattern that is available to every user on your computer, simply place the file in <filename -class="directory">$<envar>KDEDIR</envar>/share/apps/kdesktop/patterns/</filename>.</para> +class="directory">$<envar>TDEDIR</envar>/share/apps/kdesktop/patterns/</filename>.</para> <para>Copy a <literal role="extension">.desktop</literal> file from this folder, and name it the same as your new pattern image file. @@ -372,7 +372,7 @@ Modify the contents to suit your new pattern.</para> <para>To add a new pattern for a single user, add the files to <filename -class="directory">$<envar>KDEHOME</envar>/share/apps/kdesktop/patterns/</filename>.</para> +class="directory">$<envar>TDEHOME</envar>/share/apps/kdesktop/patterns/</filename>.</para> <para>For best results, the pattern should be a grayscale PNG file.</para> diff --git a/doc/kcontrol/kdm/index.docbook b/doc/kcontrol/kdm/index.docbook index 8f00db2f3..090b78225 100644 --- a/doc/kcontrol/kdm/index.docbook +++ b/doc/kcontrol/kdm/index.docbook @@ -87,7 +87,7 @@ dialog.</para> </itemizedlist> <para>If you do not specify a logo the default -<filename>$<envar>KDEDIR</envar>/share/apps/kdm/pics/kdelogo.png</filename> +<filename>$<envar>TDEDIR</envar>/share/apps/kdm/pics/kdelogo.png</filename> will be displayed.</para> <para>While &kde;'s style depends on the settings of the user logged in, @@ -422,9 +422,9 @@ effect.</para></note> <para>Every user on the system can be represented by a image. The image for the user is kept in a file called -<filename>$<envar>KDEDIR</envar>/share/apps/kdm/pics/users/$<envar>USER</envar>.xpm.</filename> +<filename>$<envar>TDEDIR</envar>/share/apps/kdm/pics/users/$<envar>USER</envar>.xpm.</filename> If the user doesn't have such a file the file -<filename>$<envar>KDEDIR</envar>/share/apps/kdm/pics/users/default.xpm</filename> +<filename>$<envar>TDEDIR</envar>/share/apps/kdm/pics/users/default.xpm</filename> will be used instead.</para> <para>To assign a new image to a user just select the user in one of the diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook index 0a47cec36..ca427e926 100644 --- a/doc/kcontrol/proxy/index.docbook +++ b/doc/kcontrol/proxy/index.docbook @@ -172,7 +172,7 @@ ask for a username or password if it needs to.</para> <para>The other option is <guilabel>Use automatic login</guilabel>. Select this option if you have already set up a login entry for your proxy server in the -<filename>$<envar>KDEDIR</envar>/share/config/kionetrc</filename> +<filename>$<envar>TDEDIR</envar>/share/config/kionetrc</filename> file.</para> </sect2> diff --git a/doc/kcontrol/screensaver/index.docbook b/doc/kcontrol/screensaver/index.docbook index 67cb99411..73ad996de 100644 --- a/doc/kcontrol/screensaver/index.docbook +++ b/doc/kcontrol/screensaver/index.docbook @@ -121,7 +121,7 @@ directions</para></caution> <screen> <prompt>bash$</prompt> <command>cd -$KDEDIR/share/applnk/System/ScreenSavers</command> +$TDEDIR/share/applnk/System/ScreenSavers</command> <prompt>bash$</prompt> <command>ls</command> </screen> @@ -134,7 +134,7 @@ file to a name which does not end in <para>Example:</para> <screen> <prompt>bash$</prompt> <command>cd -$KDEDIR/share/applnk/System/ScreenSavers</command> +$TDEDIR/share/applnk/System/ScreenSavers</command> <prompt>bash$</prompt> <command>mv KSpace.desktop KSpace.backup</command> </screen> @@ -148,7 +148,7 @@ original name:</para> <screen> <prompt>bash$</prompt> <command>cd -$KDEDIR/share/applnk/System/ScreenSavers</command> +$TDEDIR/share/applnk/System/ScreenSavers</command> <prompt>bash$</prompt> <command>mv KSpace.backup KSpace.desktop</command> </screen> diff --git a/doc/kdm/index.docbook b/doc/kdm/index.docbook index ee73b16a6..43cec1bde 100644 --- a/doc/kdm/index.docbook +++ b/doc/kdm/index.docbook @@ -297,7 +297,7 @@ main &kdm; dialog box. </para> system, and that you simply want to change its behavior in some way.</para> <para>When &kdm; starts up, it reads its configuration from the folder -<filename class="directory">$KDEDIR/share/config/kdm/</filename> (this may +<filename class="directory">$TDEDIR/share/config/kdm/</filename> (this may be <filename class="directory">/etc/trinity/kdm/</filename> or something else on your system).</para> @@ -314,7 +314,7 @@ associated with any particular user. Therefore, it is not possible to have user-specific configuration files; all users share the common &kdmrc;. It follows from this that the configuration of &kdm; can only be altered by those users that have write access to -<filename>$<envar>KDEDIR</envar>/share/config/kdm/kdmrc</filename> (normally +<filename>$<envar>TDEDIR</envar>/share/config/kdm/kdmrc</filename> (normally restricted to system administrators logged in as <systemitem class="username">root</systemitem>).</para> @@ -414,7 +414,7 @@ dialog.</para> </itemizedlist> <para>If you do not specify a logo the default -<filename>$<envar>KDEDIR</envar>/share/apps/kdm/pics/kdelogo.xpm</filename> +<filename>$<envar>TDEDIR</envar>/share/apps/kdm/pics/kdelogo.xpm</filename> will be displayed.</para> <para>Normally the login box is centered on the screen. Use the @@ -870,13 +870,13 @@ libraries.</para> <para>For example:</para> <screen><command>export -<option>KDEDIR=<replaceable>/opt/kde</replaceable></option></command> +<option>TDEDIR=<replaceable>/opt/kde</replaceable></option></command> <command>export <option>QTDIR=<replaceable>/usr/lib/qt2</replaceable></option></command> <command>export -<option>PATH=<replaceable>$KDEDIR/bin:$QTDIR/bin:$PATH</replaceable></option></command> +<option>PATH=<replaceable>$TDEDIR/bin:$QTDIR/bin:$PATH</replaceable></option></command> <command>export -<option>LD_LIBRARY_PATH=<replaceable>$KDEDIR/lib:$QTDIR/lib</replaceable></option></command> +<option>LD_LIBRARY_PATH=<replaceable>$TDEDIR/lib:$QTDIR/lib</replaceable></option></command> </screen> <para>If you are still unsuccessful, try starting &xdm; instead, to @@ -981,7 +981,7 @@ by &kdm;, you can quite simply add a new session.</para> <para>The sessions are defined in <firstterm>.desktop</firstterm> files in <filename -class="directory">$<envar>KDEDIR</envar>/share/apps/kdm/sessions</filename>. +class="directory">$<envar>TDEDIR</envar>/share/apps/kdm/sessions</filename>. You can simply add an appropriately named <literal role="extension">.desktop</literal> file in this directory. The fields are:</para> diff --git a/doc/kicker/man-kicker.1.docbook b/doc/kicker/man-kicker.1.docbook index 99f984670..448fe4202 100644 --- a/doc/kicker/man-kicker.1.docbook +++ b/doc/kicker/man-kicker.1.docbook @@ -42,7 +42,7 @@ starters, applets, and a clock.</para> <variablelist> <varlistentry> -<term><filename>$<envar>KDEHOME</envar>/share/apps/kickerrc</filename></term> +<term><filename>$<envar>TDEHOME</envar>/share/apps/kickerrc</filename></term> <listitem> <para>User specific configuration file. This file is not normally intended to be edited directly; Most configuration items can be controlled from diff --git a/doc/kioslave/thumbnail.docbook b/doc/kioslave/thumbnail.docbook index 1dec888ed..62d5c3c4e 100644 --- a/doc/kioslave/thumbnail.docbook +++ b/doc/kioslave/thumbnail.docbook @@ -21,7 +21,7 @@ create file previews.</para> <para>See the documentation in the sources for more information. You will find these at -<filename>$<envar>KDEDIR</envar>/include/kio/thumbcreator.h</filename> or +<filename>$<envar>TDEDIR</envar>/include/kio/thumbcreator.h</filename> or in the source folder <filename class="directory">tdebase/kioslave/thumbnail</filename></para> diff --git a/doc/klipper/index.docbook b/doc/klipper/index.docbook index 577b7f29e..b33ee6f15 100644 --- a/doc/klipper/index.docbook +++ b/doc/klipper/index.docbook @@ -472,7 +472,7 @@ small handle to the left of the &klipper; icon).</para> --> <!-- <para>To disable this, simply remove the file -<filename>$<envar>KDEDIR</envar>/share/autostart/klipper.desktop</filename> +<filename>$<envar>TDEDIR</envar>/share/autostart/klipper.desktop</filename> or create a file <filename>$<envar>HOME</envar>/share/autostart/klipper.desktop</filename> with the following contents: diff --git a/doc/konqueror/browser.docbook b/doc/konqueror/browser.docbook index 01ef1057b..b1cc0a0b2 100644 --- a/doc/konqueror/browser.docbook +++ b/doc/konqueror/browser.docbook @@ -446,7 +446,7 @@ just add a key line <screen><userinput> OverridenPorts=CommaSeparatedListOfAllowedPorts </userinput></screen> -to <filename>$KDEDIR/share/config/kio_httprc +to <filename>$TDEDIR/share/config/kio_httprc </filename> or <filename>~/.kde/share/config/kio_httprc</filename>.</para> <para>For example diff --git a/doc/konsole/index.docbook b/doc/konsole/index.docbook index 22bb2fb0d..32a48af2b 100644 --- a/doc/konsole/index.docbook +++ b/doc/konsole/index.docbook @@ -941,11 +941,11 @@ combination of font, size and style.</para> <guimenuitem>Keyboard</guimenuitem></menuchoice></term> <listitem><para><action>Choose desired keymapping</action>.</para> <para>The list of these keymappings is taken from -<filename>$KDEDIR/share/apps/konsole/*.keytab</filename>. The file -<filename>$KDEDIR/share/apps/konsole/README.KeyTab</filename> +<filename>$TDEDIR/share/apps/konsole/*.keytab</filename>. The file +<filename>$TDEDIR/share/apps/konsole/README.KeyTab</filename> describes the <literal role="extension">*.keytab</literal> format in more detail. Add to or modify these files to match your needs. The default keytab is taken from -<filename>$KDEDIR/share/apps/konsole/README.default.Keytab</filename>.</para> +<filename>$TDEDIR/share/apps/konsole/README.default.Keytab</filename>.</para> </listitem> </varlistentry> @@ -954,8 +954,8 @@ Add to or modify these files to match your needs. The default keytab is taken fr <guimenuitem>Schema</guimenuitem></menuchoice></term> <listitem><para><action>Set colors of text and background</action>.</para> <para>The list is taken from -<filename>$KDEDIR/share/apps/konsole/*.schema</filename>. The file -<filename>$KDEDIR/share/apps/konsole/README.Schema</filename> +<filename>$TDEDIR/share/apps/konsole/*.schema</filename>. The file +<filename>$TDEDIR/share/apps/konsole/README.Schema</filename> describes the <literal role="extension">*.schema</literal> format in more detail. Add to or modify these files to match your needs. You can also create custom schemas through the preferences dialog at <menuchoice><guisubmenu>Settings</guisubmenu> diff --git a/doc/kpager/index.docbook b/doc/kpager/index.docbook index d2a2617dd..692c0558a 100644 --- a/doc/kpager/index.docbook +++ b/doc/kpager/index.docbook @@ -299,7 +299,7 @@ dialog</link></para> <para>Currently, you cannot turn that option off within the config dialog, but you can do it manually like this:</para> -<para>Open the file <filename>$KDEHOME/share/config/kpagerrc</filename> with any +<para>Open the file <filename>$TDEHOME/share/config/kpagerrc</filename> with any text editor like &kedit; or <application>vi</application>. If you have no rights to write that file, you may need to do it as root or contact your system administrator. In this file you will have to add a new key with the name diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook index 57b39c2a9..247b7fd87 100644 --- a/doc/ksplashml/index.docbook +++ b/doc/ksplashml/index.docbook @@ -88,7 +88,7 @@ your tastes, you can learn how to customize the appearance of url="http://www.kde-look.org">KDE-Look</ulink>, extract them to <filename>~/.kde/share/apps/ksplash/Themes/</filename> for a single user, or to -<filename>$<envar>KDEDIR</envar>/share/apps/ksplash/Themes/</filename> +<filename>$<envar>TDEDIR</envar>/share/apps/ksplash/Themes/</filename> to make them available to all users of your system.</para> <para>You can also use the <guilabel>Splash Screen</guilabel> module under diff --git a/doc/userguide/customizing-desktop.docbook b/doc/userguide/customizing-desktop.docbook index 4d095cbdc..8089725d1 100644 --- a/doc/userguide/customizing-desktop.docbook +++ b/doc/userguide/customizing-desktop.docbook @@ -153,7 +153,7 @@ while this may be unnoticeable on very fast systems.</para> <para>To add an IceWM theme, select IceWM as the window decoration and click on the <guilabel>Open &kde;'s IceWM theme folder</guilabel> link in the window decoration description area. This will open a &konqueror; window -to <filename>$<envar>KDEHOME</envar>/share/apps/twin/icewm-themes</filename>. +to <filename>$<envar>TDEHOME</envar>/share/apps/twin/icewm-themes</filename>. Extract your IceWM theme to this folder. The theme will then be added to the list of IceWM themes. Select the theme you want to use and click on <guibutton>Apply</guibutton>.</para> diff --git a/doc/userguide/index.docbook b/doc/userguide/index.docbook index 66e312069..e9fb63f47 100644 --- a/doc/userguide/index.docbook +++ b/doc/userguide/index.docbook @@ -218,14 +218,14 @@ we're referring to: <term>&kde; prefix</term> <listitem><para>&kde; installs into its own folder tree, which you can find by running the command <userinput><command>kde-config</command> <option>--prefix</option></userinput>. This folder is referred to -by the environment variables $<envar>KDEDIRS</envar> and possibly -$<envar>KDEDIR</envar>.</para> +by the environment variables $<envar>TDEDIRS</envar> and possibly +$<envar>TDEDIR</envar>.</para> </listitem> </varlistentry> <varlistentry> <term>&kde; user-specific settings</term> -<listitem><para>The environment variable $<envar>KDEHOME</envar> +<listitem><para>The environment variable $<envar>TDEHOME</envar> points to the folder where &kde; should find user-specific settings. If it is not set, the default value of <filename class="directory">~/.kde</filename> is used.</para> diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook index 47195f284..12bdd50c5 100644 --- a/doc/userguide/kde-for-admins.docbook +++ b/doc/userguide/kde-for-admins.docbook @@ -142,7 +142,7 @@ Position=10,10 <segtitle>Comment</segtitle> <seglistitem> -<seg><envar>KDEHOME</envar></seg> +<seg><envar>TDEHOME</envar></seg> <seg><filename class="directory">~/.kde</filename></seg> <seg></seg> </seglistitem> @@ -151,12 +151,12 @@ Position=10,10 <seg><envar>KDEROOTHOME</envar></seg> <seg><filename class="directory">/root/.kde</filename></seg> <seg>Different variable to prevent -root writing to $KDEHOME of the user after running +root writing to $TDEHOME of the user after running <command>su</command>.</seg> </seglistitem> <seglistitem> -<seg><envar>KDEDIR</envar></seg> +<seg><envar>TDEDIR</envar></seg> <seg><filename class="directory">/opt/trinity</filename>, <filename class="directory">/usr</filename>, <filename class="directory">/usr/trinity</filename></seg> @@ -165,27 +165,27 @@ compiled-in default.</seg> </seglistitem> <seglistitem> -<seg><envar>KDEDIRS</envar></seg> +<seg><envar>TDEDIRS</envar></seg> <seg><filename class="directory">/opt/trinity</filename>, <filename class="directory">/usr</filename>, <filename class="directory">/usr/trinity</filename></seg> <seg>New in &kde;3. Can list multiple locations separated by a -colon. If not set, falls back to $<envar>KDEDIR</envar></seg> +colon. If not set, falls back to $<envar>TDEDIR</envar></seg> </seglistitem> </segmentedlist> </para> <para>Don't <emphasis>need</emphasis> to be set, defaults work just fine.</para> -<para>Running &kde;2 next to &kde;3? Point $<envar>KDEDIR</envar> to -&kde; 2 and $<envar>KDEDIRS</envar> to &kde; 3.</para> +<para>Running &kde;2 next to &kde;3? Point $<envar>TDEDIR</envar> to +&kde; 2 and $<envar>TDEDIRS</envar> to &kde; 3.</para> <informalexample> <para>A staff member at a university could have the following settings:</para> <programlisting> -KDEHOME='~/.trinity' +TDEHOME='~/.trinity' KDEROOTHOME='/root/.trinity' -KDEDIRS='/opt/kde_staff:/opt/trinity' +TDEDIRS='/opt/kde_staff:/opt/trinity' </programlisting> </informalexample> @@ -251,7 +251,7 @@ bastian=staff Directories that are not relevant for a certain tree, or simply not used can be left out though. For example, directories used for temporary files are usually only found under <filename -class="directory">$<envar>KDEHOME</envar></filename> but not in any other +class="directory">$<envar>TDEHOME</envar></filename> but not in any other directory tree.</para> </sect1> @@ -323,7 +323,7 @@ This file is read by all &kde; applications.</para></listitem> class="directory">share/config/session</filename></term> <listitem><para>This directory is used by session management and is normally only available under <filename -class="directory">$<envar>KDEHOME</envar></filename>. At the end of a +class="directory">$<envar>TDEHOME</envar></filename>. At the end of a session &kde; applications store their state here. The file names consist of the name of the application followed by a number. The session manager <command>ksmserver</command> stores references to @@ -418,7 +418,7 @@ the following symlinks and directories will be created using the <variablelist> <varlistentry> -<term><filename>$<envar>KDEHOME</envar>/socket-$<envar>HOSTNAME</envar></filename></term> +<term><filename>$<envar>TDEHOME</envar>/socket-$<envar>HOSTNAME</envar></filename></term> <listitem><para>Usually <filename class="directory">/tmp/ksocket-$<envar>USER</envar>/</filename>, this is used for various &UNIX; sockets.</para> @@ -426,14 +426,14 @@ is used for various &UNIX; sockets.</para> </varlistentry> <varlistentry> -<term><filename>$<envar>KDEHOME</envar>/tmp-$<envar>HOSTNAME</envar></filename></term> +<term><filename>$<envar>TDEHOME</envar>/tmp-$<envar>HOSTNAME</envar></filename></term> <listitem><para>Usually <filename class="directory">/tmp/kde-$<envar>USER</envar>/</filename>, this is used for temporary files.</para> </listitem> </varlistentry> <varlistentry> -<term><filename>$<envar>KDEHOME</envar>/cache-$<envar>HOSTNAME</envar></filename></term> +<term><filename>$<envar>TDEHOME</envar>/cache-$<envar>HOSTNAME</envar></filename></term> <listitem><para>Usually <filename class="directory">/var/tmp/kdecache-$<envar>USER</envar>/</filename>, this is used for cached files.</para> @@ -538,7 +538,7 @@ configuration files is combined on a key-by-key basis. If the same key within a certain group is defined in more than one place, the key value read from the directory tree with the highest precedence will be used. Configuration files under <filename -class="directory">$<envar>KDEHOME</envar></filename> always have the highest +class="directory">$<envar>TDEHOME</envar></filename> always have the highest precedence. If a key in a certain group is defined multiple times in a single file, the value of the last entry is used.</para> @@ -741,7 +741,7 @@ Caption[fr]=Ma Légende <para>In general the entries that can appear in a configuration file are not documented. With &kde; 3.2 a start has been made to change this. In <filename -class="directory">$<envar>KDEDIR</envar>/share/config.kcfg</filename>, files +class="directory">$<envar>TDEDIR</envar>/share/config.kcfg</filename>, files can be found that provide a formal description of the possible entries in a configuration file. These are used by the new &kde; Configuration Editor when available.</para> @@ -785,7 +785,7 @@ Auto Save Interval=25 <title>&kdm;</title> <para>Always runs as <systemitem class="username">root</systemitem>! Uses -<filename>$<envar>KDEDIR</envar>/share/config/kdmrc</filename> and +<filename>$<envar>TDEDIR</envar>/share/config/kdmrc</filename> and <filename>/etc/X11/xdm/Xservers</filename>. The latter contains entries like:</para> @@ -918,7 +918,7 @@ as well as <command>tdeinit</command> loadable modules (<acronym>KLM</acronym>s). <acronym>KLM</acronym>s work just like binary program files but can be started more efficiently. <acronym>KLM</acronym>s live in <filename -class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para> +class="directory">$<envar>TDEDIR</envar>/lib/trinity</filename></para> <para>The drawback is that programs started this way appear as <computeroutput><command>tdeinit</command></computeroutput> in the output of @@ -1031,7 +1031,7 @@ that <command>klauncher</command> crashed.</para> <para><command>klauncher</command> can be restarted by restarting <command>tdeinit</command> from a console window. Make sure that $<envar>HOME</envar>, $<envar>DISPLAY</envar> and the various -$<envar>KDEDIR(S)</envar> are set correctly when doing so!</para> +$<envar>TDEDIR(S)</envar> are set correctly when doing so!</para> </sect2> @@ -1055,7 +1055,7 @@ the session manager launches auto-start applications and restores applications from the previous session. The applications to auto-start are indicated by <literal role="extension">.desktop</literal> files in the <filename -class="directory">$<envar>KDEDIR</envar>/share/autostart</filename> +class="directory">$<envar>TDEDIR</envar>/share/autostart</filename> directory. Whether or not to auto-start an application can be made conditional upon some configuration entry determined by the <varname>X-KDE-autostart-condition</varname> entry in the <literal @@ -1122,7 +1122,7 @@ are:</para> <para><command>kdesktop</command> in its turn automatically starts applications stored in <filename -class="directory">$<envar>KDEHOME</envar>/Autostart</filename>. <command>kdesktop</command> +class="directory">$<envar>TDEHOME</envar>/Autostart</filename>. <command>kdesktop</command> will automatically open any files stored in this directory including documents, binary files or applications in the form of <literal role="extension">.desktop</literal> files.</para> @@ -1134,7 +1134,7 @@ at the time the session was saved. Sessions are stored in the <filename>ksmserverrc</filename> configuration file which contains references to application-specific state information. The application-specific state information is saved in <filename -class="directory">$<envar>KDEHOME</envar>/share/config/session</filename>. +class="directory">$<envar>TDEHOME</envar>/share/config/session</filename>. The state information of &twin; contains the location of the application windows of all the other applications in the session. </para> @@ -1149,23 +1149,23 @@ windows of all the other applications in the session. <variablelist> <varlistentry> -<term>$<envar>KDEDIR</envar></term> +<term>$<envar>TDEDIR</envar></term> <listitem><para>Has to be set if -<envar>KDEDIRS</envar> is not set and has to point to the root of the +<envar>TDEDIRS</envar> is not set and has to point to the root of the &kde; installation tree. Allows &kde; to find its data like icons, menus and libraries.</para> </listitem> </varlistentry> -<varlistentry><term>$<envar>KDEDIRS</envar></term> -<listitem><para>Overrides <envar>KDEDIR</envar> and allows you to specify +<varlistentry><term>$<envar>TDEDIRS</envar></term> +<listitem><para>Overrides <envar>TDEDIR</envar> and allows you to specify multiple directories where &kde; searches for its data. Useful if you want or have to install some programs to a different prefix than the rest of &kde;.</para> </listitem> </varlistentry> -<varlistentry><term><envar>$KDEHOME</envar></term><listitem><para>If +<varlistentry><term><envar>$TDEHOME</envar></term><listitem><para>If not set, &kde; uses <filename class="directory">~/.kde</filename> as the directory where personal data is stored.</para> </listitem> @@ -1282,7 +1282,7 @@ class="directory">$<envar>XDG_DATA_HOME</envar></filename> base directory. Default is <literal>/usr/local/share/:/usr/share/</literal></para> -<para>&kde; adds locations from $<envar>KDEDIRS</envar> and profiles +<para>&kde; adds locations from $<envar>TDEDIRS</envar> and profiles as well. Used for <literal role="extension">.desktop</literal> and <literal role="extension">.directory</literal> menu files. <literal role="extension">.desktop</literal> files under <filename @@ -1305,7 +1305,7 @@ specific configuration files should be stored. Default is (&kde; 3.2) - Defines the preference-ordered set of base directories to search for configuration files in addition to the $<envar>XDG_CONFIG_HOME</envar> base directory. The default is <filename class="directory">/etc/xdg</filename> &kde; adds locations from -$<envar>KDEDIRS</envar> and profiles as well. Used by <literal role="extension">.menu</literal> descriptions in +$<envar>TDEDIRS</envar> and profiles as well. Used by <literal role="extension">.menu</literal> descriptions in <filename class="directory">$<envar>XDG_CONFIG_DIRS</envar>/menus</filename>. </para> </listitem> @@ -1325,7 +1325,7 @@ as well as <command>tdeinit</command> loadable modules (<acronym>KLM</acronym>s). <acronym>KLM</acronym>s work just like binary program files but can be started more efficiently. <acronym>KLM</acronym>s live in <filename -class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para> +class="directory">$<envar>TDEDIR</envar>/lib/trinity</filename></para> <para>The drawback is that programs started this way appear as <computeroutput><command>tdeinit</command></computeroutput> in the @@ -1615,11 +1615,11 @@ copied from <filename class="directory">/etc/skel/Desktop</filename></para></listitem> <listitem><para><filename -class="directory">$<envar>KDEDIR</envar>/apps/kdesktop/Desktop</filename> +class="directory">$<envar>TDEDIR</envar>/apps/kdesktop/Desktop</filename> (merged)</para></listitem> <listitem><para><filename -class="directory">$<envar>KDEDIR</envar>/apps/kdesktop/DesktopLinks</filename> +class="directory">$<envar>TDEDIR</envar>/apps/kdesktop/DesktopLinks</filename> (copied)</para></listitem> <listitem><para>Device Icons (dynamically @@ -1704,7 +1704,7 @@ Reader.desktop</filename></para></listitem> <para><literal role="extension">.menu</literal> files describing the menu structure. The files are stored in <filename -class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus</filename> and +class="directory">$<envar>TDEDIR</envar>/etc/xdg/menus</filename> and <filename class="directory">/etc/xdg/menus</filename>. These store the system-wide menu structure and are controlled by $<envar>XDG_CONFIG_DIRS</envar>. <filename @@ -1715,7 +1715,7 @@ url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.o <para><literal role="extension">.desktop</literal> files describe the applications and are stored in: <filename -class="directory">$<envar>KDEDIR</envar>/share/applications</filename>, +class="directory">$<envar>TDEDIR</envar>/share/applications</filename>, <filename class="directory">/usr/share/applications</filename>, <filename class="directory">/usr/local/share/applications</filename>. These are @@ -1733,7 +1733,7 @@ url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.o <para><literal role="extension">.directory</literal> files describing the sub-menus are stored in: <filename -class="directory">$<envar>KDEDIR</envar>/share/desktop-directories</filename>, +class="directory">$<envar>TDEDIR</envar>/share/desktop-directories</filename>, <filename class="directory">/usr/share/desktop-directories</filename>, <filename class="directory">/usr/local/share/desktop-directories</filename>. These are the system-wide menu <literal @@ -1795,7 +1795,7 @@ role="extension">.directory</literal> file</para> <title>Essential Menus</title> <para><filename -class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/applications-merged/</filename> +class="directory">$<envar>TDEDIR</envar>/etc/xdg/menus/applications-merged/</filename> contains <filename>kde-essential.menu</filename> which includes some essential menus that are normally not shown in the &kde; menu itself: <itemizedlist> @@ -1813,7 +1813,7 @@ whose contents are defined by <filename>kde-screensavers.menu</filename> and whose icon and name are defined by <filename>kde-system-screensavers.directory</filename>. -<filename>$<envar>KDEDIR</envar>/share/desktop-directories/kde-system-screensavers.directory</filename> +<filename>$<envar>TDEDIR</envar>/share/desktop-directories/kde-system-screensavers.directory</filename> contains: <programlisting> NoDisplay=true @@ -1828,7 +1828,7 @@ NoDisplay=true <para>&kde; continues to support old-style menus that are defined by the directory structures in <filename -class="directory">$<envar>KDEDIR</envar>/share/applnk</filename> +class="directory">$<envar>TDEDIR</envar>/share/applnk</filename> (system wide) and <filename class="directory">$<envar>HOME</envar>/.kde/share/applnk</filename> (user specific). This is observed unless the <literal role="extension">.desktop</literal> file has a <varname>Categories</varname>= line. In that case the categories determine the location in the menu.</para> @@ -1854,7 +1854,7 @@ CheckSycoca=false </programlisting> </para> -<para>To force regeneration, run <userinput><command>touch $<envar>KDEDIR</envar>/share/services/update_ksycoca</command></userinput>.</para> +<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_ksycoca</command></userinput>.</para> </sect2> @@ -1918,7 +1918,7 @@ and the following special buttons: <para>File associations associate a file type with an application or applications. The type of a file is established by determining its &MIME; type. &MIME; types known by &kde; are stored in <filename -class="directory">$<envar>KDEDIR</envar>/share/mimelnk</filename> and +class="directory">$<envar>TDEDIR</envar>/share/mimelnk</filename> and each application's <literal role="extension">.desktop</literal> file contains a list of &MIME; types supported by that application.</para> @@ -2046,7 +2046,7 @@ shell_access=false</screen> <para>Since this affects the &kde; menu and the available applications, we must force an update of the sycoca database:</para> -<screen><userinput><command>touch</command> <filename>$<envar>KDEDIR</envar>/share/services/update_ksycoca</filename></userinput></screen> +<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_ksycoca</filename></userinput></screen> <para>Now re-login to &kde; and check the following points:</para> @@ -2263,12 +2263,12 @@ ftp</para></listitem> <para>Information about protocols is stored in <literal role="extension">*.protocol</literal> files stored in <filename -class="directory">$<envar>KDEDIR</envar>/share/services</filename>.</para> +class="directory">$<envar>TDEDIR</envar>/share/services</filename>.</para> <para>The <option>Class</option>= entry defines the group a protocol is part of: <userinput><command>grep</command> <option>Class=</option> -<filename>$<envar>KDEDIR</envar>/share/services/*.protocol</filename></userinput></para> +<filename>$<envar>TDEDIR</envar>/share/services/*.protocol</filename></userinput></para> <para>General rules:</para> @@ -2317,7 +2317,7 @@ menu.</para> <listitem> <para>The modules that are visible in the Control Center normally have a <literal role="extension">.desktop</literal> file in <filename -class="directory">$<envar>KDEDIR</envar>/share/applications/kde</filename> +class="directory">$<envar>TDEDIR</envar>/share/applications/kde</filename> and are sorted under the hidden <guimenu>Settings-Modules</guimenu> menu by the <filename>kde-settings.menu</filename>, included from <filename>kde-essential.menu</filename></para> @@ -2325,7 +2325,7 @@ the <filename>kde-settings.menu</filename>, included from </listitem> <listitem> <para>Application specific modules normally have a <literal role="extension">.desktop</literal> file under -<filename>$<envar>KDEDIR</envar>/share/applnk/.hidden</filename> which +<filename>$<envar>TDEDIR</envar>/share/applnk/.hidden</filename> which corresponds to the hidden .hidden menu, included as a result of <markup><KDELegacyDirs/></markup></para> <screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2> /dev/null | <command>grep</command> .hidden</userinput></screen> @@ -2356,7 +2356,7 @@ there.</para> <title>Making it Work</title> Making It Work -KDE 3.2: Set $KDEDIRS from starttde script +KDE 3.2: Set $TDEDIRS from starttde script Distribute profiles to all clients </para> @@ -2604,7 +2604,7 @@ of &UNIX; shell scripting with the ease of use of &kde;.</para> <screen><userinput><command>kdialog</command> <option>--title 'New Mail'</option> <option>--msgbox 'You have new mail!'</option> <option>--dontagain myfile:mykey</option></userinput></screen> <para>Saves whether to show again in -<filename>$<envar>KDEHOME</envar>/share/config/myfile</filename> (by writing +<filename>$<envar>TDEHOME</envar>/share/config/myfile</filename> (by writing into this file the following lines:</para> <screen>[Notification Messages] diff --git a/doc/userguide/under-the-hood.docbook b/doc/userguide/under-the-hood.docbook index 13cd52877..9b08bf449 100644 --- a/doc/userguide/under-the-hood.docbook +++ b/doc/userguide/under-the-hood.docbook @@ -42,7 +42,7 @@ LastFile=/var/tmp/test.txt</programlisting> <para>The user-specific configuration files are stored in <filename class="directory">.kde/share/config</filename> (replace -<filename>.kde</filename> with your $<envar>KDEHOME</envar> setting) and +<filename>.kde</filename> with your $<envar>TDEHOME</envar> setting) and the global ones are in the <filename class="directory">share/config</filename> sub-directory of &kde;'s installation path. (You can find this path by running the command @@ -64,7 +64,7 @@ crash.</para></warning> <para>So the first rule is to make a backup of your file before modifying it. The backup is better stored outside any <filename class="directory">.kde</filename> subdirectory -(or the corresponding $<envar>KDEHOME</envar> directory). Backups are anyway +(or the corresponding $<envar>TDEHOME</envar> directory). Backups are anyway a good idea in case of a major failure of &kde; that would destroy important configuration files (for example your &kmail; settings, which are in in the file <filename>kmailrc</filename>). diff --git a/doc/userguide/your-kde-account.docbook b/doc/userguide/your-kde-account.docbook index aa37dddac..2864eb4ba 100644 --- a/doc/userguide/your-kde-account.docbook +++ b/doc/userguide/your-kde-account.docbook @@ -29,21 +29,21 @@ applications which should start each time you start &kde;; and <filename>.kde/share/apps/kabc</filename>, where your address book is stored.</para> </listitem> -<!-- FIXME: Apparently KDEDIR and KDEDIRS are deprecated. I need to --> +<!-- FIXME: Apparently TDEDIR and TDEDIRS are deprecated. I need to --> <!-- get the truth on this --> -<listitem><para>The environment variables <envar>KDEDIR</envar> and -<envar>KDEDIRS</envar> tell &kde; where its files are stored. You will -usually only need to set <envar>KDEDIR</envar> to the directory in which +<listitem><para>The environment variables <envar>TDEDIR</envar> and +<envar>TDEDIRS</envar> tell &kde; where its files are stored. You will +usually only need to set <envar>TDEDIR</envar> to the directory in which &kde; is installed, but sometimes you might have other &kde; programs installed elsewhere: in this case, you can use the -<envar>KDEDIRS</envar> environment variable. Set -<envar>KDEDIRS</envar> to a list of all the directories containing +<envar>TDEDIRS</envar> environment variable. Set +<envar>TDEDIRS</envar> to a list of all the directories containing &kde; programs, separated by commas. For example, if you have &kde; programs in both <filename>/usr/local/kde</filename> and <filename>/home/phil/kde</filename>, you can use <userinput>export -KDEDIR=/usr/local/kde,/home/phil/kde</userinput> if you use +TDEDIR=/usr/local/kde,/home/phil/kde</userinput> if you use <application>bash</application> or <userinput>setenv -KDEDIR=/usr/local/kde,/home/phil/kde</userinput> if you use sh. +TDEDIR=/usr/local/kde,/home/phil/kde</userinput> if you use sh. </para> </listitem> </itemizedlist> diff --git a/drkonqi/README b/drkonqi/README index 34839e214..dffebe5b8 100644 --- a/drkonqi/README +++ b/drkonqi/README @@ -1,6 +1,6 @@ How to activate the developer mode for DrKonqi: -$KDEHOME/share/config/drkonqirc: +$TDEHOME/share/config/drkonqirc: [drkonqi] ConfigName=developer diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 9ab122771..484f57410 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -648,7 +648,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &) "<p>The use of this option is generally discouraged. For selecting proper DPI" " value a better option is explicitly configuring it for the whole X server if" " possible (e.g. DisplaySize in xorg.conf or adding <i>-dpi value</i> to" - " ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not render" + " ServerLocalArgs= in $TDEDIR/share/config/kdm/kdmrc). When fonts do not render" " properly with real DPI value better fonts should be used or configuration" " of font hinting should be checked.</p>" ); TQWhatsThis::add(comboForceDpi, whatsthis); diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog index cdd37c6b6..0c2de0ed1 100644 --- a/kcontrol/kfontinst/ChangeLog +++ b/kcontrol/kfontinst/ChangeLog @@ -54,7 +54,7 @@ KDE3.1 -> KDE3.2 ================ 1. Re-designed (yet again...) to be a kio slave. As a user, starting fonts:/ will display - Personal Lists contents of $HOME/.fonts and $KDEHOME/share/fonts (where previous installer installed to) + Personal Lists contents of $HOME/.fonts and $TDEHOME/share/fonts (where previous installer installed to) Fonts are installed to $HOME/.fonts System Lists contents of /usr/local/share/fonts, /usr/share/fonts, and /usr/X11R6/lib/X11/fonts @@ -250,10 +250,10 @@ KDE3.1 -> KDE3.2 8. Removed some memory leaks 10. Default folders changed for non-root users. KFontinst will now (upon initial start-up) select the following: - X fonts dir: $KDEHOME/share/fonts - XConfig file: $KDEHOME/share/fonts/fontpaths + X fonts dir: $TDEHOME/share/fonts + XConfig file: $TDEHOME/share/fonts/fontpaths XftConfig file: $HOME/.xftconfig - Fontmap file: $KDEHOME/share/fonts/Fontmap + Fontmap file: $TDEHOME/share/fonts/Fontmap ...This should make it possible for users to install fonts without being root. However, problems may arrise when configuring StarOffice - as this requires some other files to be modified, which won't be possible if SO has been installed @@ -262,7 +262,7 @@ KDE3.1 -> KDE3.2 ...Also to accomplish this, some changes are needed to 'starttde' - see file README.starttde 11. Because of the above, when started as non-root, KFontinst will create Type1 and TrueType sub-folders in - $KDEHOME/share/fonts - if they do not already exist. + $TDEHOME/share/fonts - if they do not already exist. 12. Moved XftConfig stuff from a sub-page of settings tab into its own tab. 13. Added question dialog if module is unloaded before system has been configured. 14. Added ability to "touch" a X font folder - marking it as being modified, so that a re-configure of the that folder @@ -403,7 +403,7 @@ KDE3.1 -> KDE3.2 5. Removed kfontinst-cp1252.enc, kfontinst-cp1252.xpp -- these were hacks anyway, and seing as Qt2 is going to support cp1252 by a hard-coded codec, there's no real point... 6. Rearranged the Configure System dialog - so that Force AFM regeneration is grouped next to the Generate AFMs option. -7. Encoding files now stored in <KDEDIR>/share/apps/kfontinst/Encodings +7. Encoding files now stored in <TDEDIR>/share/apps/kfontinst/Encodings 0.6.1->0.7 ========== diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index b24573f67..fad4f859a 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -184,7 +184,7 @@ <property name="whatsThis" stdset="0"> <string><qt>When this option is selected an image will appear down the left-hand side of the K Menu. The image will be tinted according to your color settings. - <p><b>Tip</b>: You can customize the image that appears in the K Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $KDEHOME/share/apps/kicker/pics.</qt></string> + <p><b>Tip</b>: You can customize the image that appears in the K Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $TDEHOME/share/apps/kicker/pics.</qt></string> </property> </widget> <spacer> diff --git a/kcontrol/krdb/ad/README b/kcontrol/krdb/ad/README index 7dfbcbd8f..a051becc7 100644 --- a/kcontrol/krdb/ad/README +++ b/kcontrol/krdb/ad/README @@ -35,7 +35,7 @@ Their meaning should be obvious to anyone familiar with KDE's desktop wide resources. Install your application default file either in -$(KDEDIR)/share/apps/kdisplay/app-defaults +$(TDEDIR)/share/apps/kdisplay/app-defaults or diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN index c670e7346..193207fee 100644 --- a/khelpcenter/DESIGN +++ b/khelpcenter/DESIGN @@ -417,7 +417,7 @@ Font Configuration ### Help pages already make heavy use of the cascading feature of CSS, we ### ought to be able to leverage that by writing to perhaps the -### kde-localized.css file or a copy of it in $KDEHOME. There is already +### kde-localized.css file or a copy of it in $TDEHOME. There is already ### code in KControl to create a user CSS stylesheet, and we probably only ### need to configure the size and the face for KHC. diff --git a/khelpcenter/README.metadata b/khelpcenter/README.metadata index 733bb5ef2..ea2750423 100644 --- a/khelpcenter/README.metadata +++ b/khelpcenter/README.metadata @@ -101,9 +101,9 @@ Meta File Location A list of directories given by the config entry "MetaInfoDirs" in the "General" group of the help center configuration file "khelpcenterrc" (at -$KDEDIRS/share/config) is scanned for desktop files. They are merged to a common +$TDEDIRS/share/config) is scanned for desktop files. They are merged to a common hierarchy. If the "MetaInfoDirs" entry is empty the directory at -$KDEDIRS/share/apps/khelpcenter/plugins is used. +$TDEDIRS/share/apps/khelpcenter/plugins is used. Document Hierarchy ------------------ diff --git a/khotkeys/README b/khotkeys/README index 1b181aa43..b087105cb 100644 --- a/khotkeys/README +++ b/khotkeys/README @@ -45,17 +45,17 @@ the config file ), so you will be able to go back in case there will be a serious problem with this version. The files you should remove and backup before installing the new version are : - - $KDEDIR/bin/khotkeys - - $KDEDIR/lib/libkcm_khotkeys.la - - $KDEDIR/lib/libkcm_khotkeys.so - - $KDEDIR/lib/trinity/libkcm_khotkeys.la - - $KDEDIR/lib/trinity/libkcm_khotkeys.so - - $KDEDIR/lib/khotkeys.la - - $KDEDIR/lib/khotkeys.so - - $KDEDIR/lib/libkhotkeys.la - - $KDEDIR/lib/libkhotkeys.so - - $KDEDIR/share/autostart/khotkeys.desktop - - $KDEHOME/share/config/khotkeysrc + - $TDEDIR/bin/khotkeys + - $TDEDIR/lib/libkcm_khotkeys.la + - $TDEDIR/lib/libkcm_khotkeys.so + - $TDEDIR/lib/trinity/libkcm_khotkeys.la + - $TDEDIR/lib/trinity/libkcm_khotkeys.so + - $TDEDIR/lib/khotkeys.la + - $TDEDIR/lib/khotkeys.so + - $TDEDIR/lib/libkhotkeys.la + - $TDEDIR/lib/libkhotkeys.so + - $TDEDIR/share/autostart/khotkeys.desktop + - $TDEHOME/share/config/khotkeysrc Not all these files exist, depending on your KDE and OS version. It's simply all files having 'khotkeys' in their name. Ok, now the standard install ( ./configure && make && make install ), and @@ -121,7 +121,7 @@ EXAMPLES : Ok, as I guess the things written above aren't that good explanation, I've - included a sample configuration file. Put it in $KDEHOME/share/config/khotkeysrc. + included a sample configuration file. Put it in $TDEHOME/share/config/khotkeysrc. Every action is explained in its comment field. Note that all the actions are disabled, so you'll have to enable them in order to use them. diff --git a/khotkeys/configure.in.in b/khotkeys/configure.in.in index ad9ab0c55..4f170eb1e 100644 --- a/khotkeys/configure.in.in +++ b/khotkeys/configure.in.in @@ -48,7 +48,7 @@ dnl check for arts for speech recognition dnl --------------------------------------------------------------------------- -artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH +artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$TDEDIR/bin:$PATH AC_PATH_PROG(ARTSCCONFIG, artsc-config, no, $artsc_config_test_path) if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then diff --git a/kicker/menuext/tom/README b/kicker/menuext/tom/README index 2616c76c5..9a7dd64a1 100644 --- a/kicker/menuext/tom/README +++ b/kicker/menuext/tom/README @@ -35,8 +35,8 @@ Populate and track Recent Applications menu entries Recent Documents Writing out of config files to reflect runtime changes (deleted entries, etc) o This requires keeping track of the config files used in creating the menu -KDEDIR merging - o KDEDIRS are already consulted for taskgroups, but groups of the same name +TDEDIR merging + o TDEDIRS are already consulted for taskgroups, but groups of the same name should be merged Sane merging of menuext entries o "Recent" items should go into the recent section diff --git a/kioslave/DEBUG.howto b/kioslave/DEBUG.howto index d4873e021..a1d4925a5 100644 --- a/kioslave/DEBUG.howto +++ b/kioslave/DEBUG.howto @@ -65,7 +65,7 @@ How to get debug output It is useful to redirect the debug output of your particular slave to a file instead of stderr. E.g. I myself use the following lines in -$KDEDIR/share/config/kdebugrc. +$TDEDIR/share/config/kdebugrc. [7113] InfoOutput=0 diff --git a/konsole/README.keyboard b/konsole/README.keyboard index 93a0ac20f..cb9e79a4a 100644 --- a/konsole/README.keyboard +++ b/konsole/README.keyboard @@ -1,6 +1,6 @@ [README.keyboard] -The *.keytab files (located in $KDEDIR/share/apps/konsole) allow +The *.keytab files (located in $TDEDIR/share/apps/konsole) allow to configure the keyboard due to your specific environment. Beside that you can use them to make the keyboard emit virtually diff --git a/konsole/doc/Konsole2.Requirements b/konsole/doc/Konsole2.Requirements index 19cbd72fc..66f419039 100644 --- a/konsole/doc/Konsole2.Requirements +++ b/konsole/doc/Konsole2.Requirements @@ -22,7 +22,7 @@ This file is to collect requirements and ideas for this. - connection/disconnect session to/from individual windows -- gui style configuration for $KDEDIR/share/apps/konsole/* +- gui style configuration for $TDEDIR/share/apps/konsole/* - improved history algorithm diff --git a/konsole/other/README.Desktop b/konsole/other/README.Desktop index b9600ace3..e87c88dc9 100644 --- a/konsole/other/README.Desktop +++ b/konsole/other/README.Desktop @@ -2,5 +2,5 @@ The session offered to be created in the File menu are taken from from configurations files with a *.desktop -pattern either located in $KDEDIR/share/apps/konsole +pattern either located in $TDEDIR/share/apps/konsole or ~/.kde/share/apps/konsole. diff --git a/konsole/other/README.KeyTab b/konsole/other/README.KeyTab index 4e94e5e50..8eeb15423 100644 --- a/konsole/other/README.KeyTab +++ b/konsole/other/README.KeyTab @@ -2,7 +2,7 @@ The keytabs offered in the Options/Keyboard menu are taken from from configurations files with a *.keytab -pattern either located in $KDEDIR/share/apps/konsole +pattern either located in $TDEDIR/share/apps/konsole or ~/.kde/share/apps/konsole. Keytabs allow to configure the behavior of konsole diff --git a/konsole/other/README.Schema b/konsole/other/README.Schema index f737c1439..a87f46f4d 100644 --- a/konsole/other/README.Schema +++ b/konsole/other/README.Schema @@ -2,7 +2,7 @@ The schemata offered in the Options/Schema menu are taken from from configurations files with a *.schema -pattern either located in $KDEDIR/share/apps/konsole +pattern either located in $TDEDIR/share/apps/konsole or ~/.kde/share/apps/konsole. Schemata allow to configure the color set that konsole diff --git a/ksmserver/README b/ksmserver/README index dc99a3f1c..ba6ac79f4 100644 --- a/ksmserver/README +++ b/ksmserver/README @@ -75,7 +75,7 @@ modules kcminit returns and waits. When ksmserver is launched, the first thing it does is launching the window manager, as the WM is necessary before any windows are possibly shown. When the WM is ready, ksmserver tells klauncher to perform autostart -phase 0 ($KDEHOME/share/autostart). There are 3 autostart phases, 0, 1 and 2, +phase 0 ($TDEHOME/share/autostart). There are 3 autostart phases, 0, 1 and 2, defined by X-KDE-autostart-phase, defaulting to 2. Phase 0 is reserved only for the actual visible base components of KDE, i.e. KDesktop and Kicker, in order to make the startup appear visually faster. Both KDesktop and Kicker diff --git a/ksmserver/ksmserver.upd b/ksmserver/ksmserver.upd index 22ae5beb2..3416ed856 100644 --- a/ksmserver/ksmserver.upd +++ b/ksmserver/ksmserver.upd @@ -1,4 +1,4 @@ -# Move session config files from $KDEHOME/share/config to $KDEHOME/share/config/session +# Move session config files from $TDEHOME/share/config to $TDEHOME/share/config/session Id=trinity File=ksmserverrc Group=Session diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h index 504fe2860..090b39220 100644 --- a/ksplashml/themeengine/objkstheme.h +++ b/ksplashml/themeengine/objkstheme.h @@ -21,7 +21,7 @@ class KConfig; /** * @short Theme reader. * A Theme is read in from the file - * <KDEDIR>/share/apps/ksplash/Themes/<theme>/Theme.rc + * <TDEDIR>/share/apps/ksplash/Themes/<theme>/Theme.rc * This controls the behavior, graphics, and appearance * of KSplash completely, and offers a friendlier way * of installing custom splash screens. diff --git a/libkonq/favicons/favicons.upd b/libkonq/favicons/favicons.upd index 5c952b22a..853a87d8f 100644 --- a/libkonq/favicons/favicons.upd +++ b/libkonq/favicons/favicons.upd @@ -1,3 +1,3 @@ -# Move favicons from $KDEHOME/share/icons and $KDEHOME/share/cache to $KDEHOME/cache-$HOST +# Move favicons from $TDEHOME/share/icons and $TDEHOME/share/cache to $TDEHOME/cache-$HOST Id=trinity_2 Script=move_favicons.sh,sh diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index 6b318c988..35f528318 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -308,7 +308,7 @@ void KNewMenu::slotFillTemplates() this, TQT_SLOT ( slotFillTemplates() ) ); connect ( s_pDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), this, TQT_SLOT ( slotFillTemplates() ) ); - // Ok, this doesn't cope with new dirs in KDEDIRS, but that's another story + // Ok, this doesn't cope with new dirs in TDEDIRS, but that's another story } s_templatesVersion++; s_filesParsed = false; diff --git a/nsplugins/HOWTO.DEBUG b/nsplugins/HOWTO.DEBUG index d00b4a5a6..94b43cfd5 100644 --- a/nsplugins/HOWTO.DEBUG +++ b/nsplugins/HOWTO.DEBUG @@ -5,7 +5,7 @@ Want to run nspluginviewer in valgrind? It's not easy. Here's how: - Record the commandline, then kill -11 the process - close drkonqi - in a konsole, export ARTSDSP_MMAP=1 - - run LD_PRELOAD=$KDEDIR/lib/libartsdsp.so.0:$KDEDIR/lib/libartsc.so.0 valgrind -v --num-callers=15 --error-limit=no nspluginviewer <commandline that you saved> + - run LD_PRELOAD=$TDEDIR/lib/libartsdsp.so.0:$TDEDIR/lib/libartsc.so.0 valgrind -v --num-callers=15 --error-limit=no nspluginviewer <commandline that you saved> - WAIT for four lines to be printed to the screen that start with: 5 ............ @@ -63,57 +63,57 @@ fi # * Then ksmserver is started which takes control of the rest of the startup sequence # The user's personal KDE directory usually is $HOME/.kde or $HOME/.trinity. -# This setting may be overridden by setting $KDEHOME. +# This setting may be overridden by setting $TDEHOME. # Must be careful here because $HOME/.kde was used commonly in the pre-KDE4 # days for the user's KDE3 profile, but now with KDE4 common on systems, # $HOME/.kde might point to KDE4 profile settings. Further, the existence # of KDE4 does not mean all people have KDE4 installed and might want to keep # $HOME/.kde as their preferred profile location for Trinity KDE. -if [ -n "$KDEHOME" ]; then - echo "[starttde] KDEHOME is preset to $KDEHOME." 1>&2 - export KDEHOME=$KDEHOME +if [ -n "$TDEHOME" ]; then + echo "[starttde] TDEHOME is preset to $TDEHOME." 1>&2 + export TDEHOME=$TDEHOME else - # $KDEHOME is NOT already preset in the environment. Try to help. + # $TDEHOME is NOT already preset in the environment. Try to help. # This might be overkill but does provide flexibility. - echo "[starttde] KDEHOME is not set." 1>&2 + echo "[starttde] TDEHOME is not set." 1>&2 if [ -d $HOME/.trinity ]; then # OK, this one is obvious. - export KDEHOME=$HOME/.trinity + export TDEHOME=$HOME/.trinity elif [ -d $HOME/.trinity ]; then # Looks like the user had an old version of Trinity installed at last login echo "[starttde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2 mv $HOME/.trinity $HOME/.trinity - export KDEHOME=$HOME/.trinity + export TDEHOME=$HOME/.trinity elif [ -f /usr/bin/kde4-config ]; then # Looks like KDE4 is installed. if [ -d $HOME/.kde ] && [ ! -d $HOME/.trinity ]; then # Presume $HOME/.kde is being used for KDE4 as it already exists. - export KDEHOME=$HOME/.trinity + export TDEHOME=$HOME/.trinity else # Presume $HOME/.kde is being used for KDE4 to be on the safe side. - export KDEHOME=$HOME/.trinity + export TDEHOME=$HOME/.trinity fi elif [ -f /opt/trinity/bin/kde-config ]; then # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4. - export KDEHOME=$HOME/.trinity + export TDEHOME=$HOME/.trinity elif [ -f /opt/trinity/bin/kde-config ]; then # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4. - export KDEHOME=$HOME/.trinity + export TDEHOME=$HOME/.trinity elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then # Looks like KDE3 or Trinity is installed and not playing second fiddle to KDE4. - export KDEHOME=$HOME/.kde + export TDEHOME=$HOME/.kde else # Resort to this and hope for the best! - export KDEHOME=$HOME/.trinity + export TDEHOME=$HOME/.trinity fi - echo "[starttde] Set KDEHOME to $KDEHOME." 1>&2 + echo "[starttde] Set TDEHOME to $TDEHOME." 1>&2 fi # Run a quick test for root. if [ -z "$KDEROOTHOME" ] && [ "$UID" = "0" ]; then - echo "[starttde] User ID is $UID. Setting KDEROOTHOME to $KDEHOME." - export KDEROOTHOME=$KDEHOME + echo "[starttde] User ID is $UID. Setting KDEROOTHOME to $TDEHOME." + export KDEROOTHOME=$TDEHOME fi # Modify the following environment variables only as necessary. @@ -148,21 +148,21 @@ if [ -d /opt/trinity/share/man ]; then export MANPATH=/opt/trinity/share/man:$MANPATH fi if [ -d /opt/trinity ]; then - if [ -n "$KDEDIRS" ]; then - export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/ + if [ -n "$TDEDIRS" ]; then + export TDEDIRS=$TDEDIRS:/opt/trinity/:/usr/ else - export KDEDIRS=/opt/trinity/:/usr/ + export TDEDIRS=/opt/trinity/:/usr/ fi fi if [ -d /opt/trinity ]; then - if [ -n "$KDEDIRS" ]; then - export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/ + if [ -n "$TDEDIRS" ]; then + export TDEDIRS=$TDEDIRS:/opt/trinity/:/usr/ else - export KDEDIRS=/opt/trinity/:/usr/ + export TDEDIRS=/opt/trinity/:/usr/ fi fi -test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"` +test -n "$TDEHOME" && kdehome=`echo "$TDEHOME" | sed "s,^~/,$HOME/,"` echo "[starttde] kdehome: $kdehome" 1>&2 # Allow interested applications, such as the Plasma control wrapper, @@ -292,15 +292,15 @@ fi # Configuration of the gtk_qt_engine if not already set. -if test -n "$KDEDIRS"; then - kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'` +if test -n "$TDEDIRS"; then + kdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'` KGTK_RC_ENGINE=$kdedirs_first/share/kgtk/gtk-qt-engine.rc.sh KGTK_RC_KDE1=$kdedirs_first/share/kgtk/.gtkrc-2.0-kde4 KGTK_RC_KDE2=$kdedirs_first/share/kgtk/.gtkrc-2.0-kde-kde4 else - KGTK_RC_ENGINE=$KDEDIR/share/kgtk/gtk-qt-engine.rc.sh - KGTK_RC_KDE1=$KDEDIR/share/kgtk/.gtkrc-2.0-kde4 - KGTK_RC_KDE2=$KDEDIR/share/kgtk/.gtkrc-2.0-kde-kde4 + KGTK_RC_ENGINE=$TDEDIR/share/kgtk/gtk-qt-engine.rc.sh + KGTK_RC_KDE1=$TDEDIR/share/kgtk/.gtkrc-2.0-kde4 + KGTK_RC_KDE2=$TDEDIR/share/kgtk/.gtkrc-2.0-kde-kde4 fi if [ ! -e $kdehome/env/gtk-qt-engine.rc.sh ] && [ -e $KGTK_RC_ENGINE ] @@ -321,7 +321,7 @@ then fi # Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh -# (where <localprefix> is $KDEHOME or ~/.trinity, and <prefixes> is where KDE is installed) +# (where <localprefix> is $TDEHOME or ~/.trinity, and <prefixes> is where KDE is installed) # # This is where you can define environment variables that will be available to # all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` @@ -383,32 +383,32 @@ if test -r "$kde_fontpaths" ; then IFS=$savifs fi -if [ ! -n "$KDEDIR" ]; then - export KDEDIR=`echo "$KDEDIRS" | sed -e 's/:.*//'` +if [ ! -n "$TDEDIR" ]; then + export TDEDIR=`echo "$TDEDIRS" | sed -e 's/:.*//'` fi -echo "[starttde] KDEDIR: $KDEDIR" 1>&2 -echo "[starttde] KDEDIRS: $KDEDIRS" 1>&2 +echo "[starttde] TDEDIR: $TDEDIR" 1>&2 +echo "[starttde] TDEDIRS: $TDEDIRS" 1>&2 -if test -n "$KDEDIRS"; then - kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'` +if test -n "$TDEDIRS"; then + kdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'` sys_odir=$kdedirs_first/share/fonts/override sys_fdir=$kdedirs_first/share/fonts else - sys_odir=$KDEDIR/share/fonts/override - sys_fdir=$KDEDIR/share/fonts + sys_odir=$TDEDIR/share/fonts/override + sys_fdir=$TDEDIR/share/fonts fi -if test -n "$KDEDIRS"; then - kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'` +if test -n "$TDEDIRS"; then + kdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'` echo "[starttde] kdedirs_first: $kdedirs_first" if [ -r $kdedirs_first/share/kgtk/preload ]; then echo "[starttde] Reading from $kdedirs_first/share/kgtk/preload" read -r KGTK_PRELOAD < $kdedirs_first/share/kgtk/preload fi else - if [ -r $KDEDIR/share/kgtk/preload ]; then - read -r KGTK_PRELOAD < $KDEDIR/share/kgtk/preload + if [ -r $TDEDIR/share/kgtk/preload ]; then + read -r KGTK_PRELOAD < $TDEDIR/share/kgtk/preload fi fi @@ -457,9 +457,9 @@ fi # Link "tmp" "socket" and "cache" resources to directory in /tmp # Creates: -# - a directory /tmp/kde-$USER and links $KDEHOME/tmp-$HOSTNAME to it. -# - a directory /tmp/ksocket-$USER and links $KDEHOME/socket-$HOSTNAME to it. -# - a directory /var/tmp/kdecache-$USER and links $KDEHOME/cache-$HOSTNAME to it. +# - a directory /tmp/kde-$USER and links $TDEHOME/tmp-$HOSTNAME to it. +# - a directory /tmp/ksocket-$USER and links $TDEHOME/socket-$HOSTNAME to it. +# - a directory /var/tmp/kdecache-$USER and links $TDEHOME/cache-$HOSTNAME to it. # Note: temporary locations can be overriden through the KDETMP and KDEVARTMP # environment variables. for resource in tmp cache socket; do @@ -476,11 +476,11 @@ dcopserver_shutdown echo '[starttde] Starting Trinity...' 1>&2 # Detect any running Xorg composition managers -$KDEDIR/bin/kdetcompmgr +$TDEDIR/bin/kdetcompmgr # Run KPersonalizer before the session if this is the first login. if test "$kpersonalizerrc_general_firstlogin" = "true"; then - if [ ! -x $KDEDIR/bin/kpersonalizer ]; then + if [ ! -x $TDEDIR/bin/kpersonalizer ]; then echo "[starttde] kpersonalizer not found! Please install it in order to properly configure your user profile." 1>&2 else # start only dcopserver, don't start whole tdeinit (takes too long) @@ -601,7 +601,7 @@ fi echo '[starttde] Running Trinity shutdown scripts...' 1>&2 -# Run scripts found in $KDEDIRS/shutdown +# Run scripts found in $TDEDIRS/shutdown for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do if [ -x "${prefix}${file}" ]; then diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp index d8bb4cf6e..71c8779ef 100644 --- a/tdeprint/slave/kio_print.cpp +++ b/tdeprint/slave/kio_print.cpp @@ -789,7 +789,7 @@ void KIO_Print::showData(const TQString& pathname) /** * Locate a data in this order: - * - $KDEDIR/share/apps/tdeprint/template/ + * - $TDEDIR/share/apps/tdeprint/template/ * - as a desktop icon */ TQString KIO_Print::locateData(const TQString& item) diff --git a/tdeprint/tdeprintfax/anytops b/tdeprint/tdeprintfax/anytops index 9718831dc..f29c996fb 100755 --- a/tdeprint/tdeprintfax/anytops +++ b/tdeprint/tdeprintfax/anytops @@ -47,7 +47,7 @@ if [ -z "$INFILE" -o -z "$OUTFILE" -o ! -f "$INFILE" ]; then fi if [ -z "$MIMETYPE" ]; then - MAGIC=$KDEDIR + MAGIC=$TDEDIR if [ -z "$MAGIC" ]; then MAGIC=/usr fi diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index 682661d54..a91c6936a 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -284,17 +284,17 @@ static int startApp() if (pw->pw_uid) { - // Only propagate KDEHOME for non-root users, + // Only propagate TDEHOME for non-root users, // root uses KDEROOTHOME - // Translate the KDEHOME 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()); if (kdeHome[0] != '/') kdeHome.prepend("~/"); else kdeHome=TQString::null; // Use default - env << ("KDEHOME="+ TQFile::encodeName(kdeHome)); + env << ("TDEHOME="+ TQFile::encodeName(kdeHome)); } KUser u; diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp index 8f9942400..d2ae3bd36 100644 --- a/tdesu/tdesud/tdesud.cpp +++ b/tdesu/tdesud/tdesud.cpp @@ -6,7 +6,7 @@ * * tdesud.cpp: KDE su daemon. Offers "keep password" functionality to kde su. * - * The socket $KDEHOME/socket-$(HOSTNAME)/tdesud_$(display) is used for communication with + * The socket $TDEHOME/socket-$(HOSTNAME)/tdesud_$(display) is used for communication with * client programs. * * The protocol: Client initiates the connection. All commands and responses diff --git a/twin/CONFIGURING b/twin/CONFIGURING index c2c1e74da..ee5e21668 100644 --- a/twin/CONFIGURING +++ b/twin/CONFIGURING @@ -36,14 +36,14 @@ To create such window-specific setting automatically without a need of doing it manually for every user (for example when doing a large deployment), follow these steps: -- Back up your $KDEHOME/share/config/twinrulesrc ($KDEHOME usually being $HOME/.kde) +- Back up your $TDEHOME/share/config/twinrulesrc ($TDEHOME usually being $HOME/.kde) and remove it - Run 'dcop twin default reconfigure' - Create manually all window-specific settings that should be included (see above) - When done, check in Window-specific settings configuration module (Alt+F3/Configure window behavior/Window-specific settings) that all rules are included -- Create a copy of $KDEHOME/share/config/twinrulesrc and restore the original one +- Create a copy of $TDEHOME/share/config/twinrulesrc and restore the original one - Rename the copy (i.e. the newly created twinrulesrc) to have its unique name (e.g. foobar_fix_maxsize in this example case) - Be careful with manual modifications of the file, especially make sure the count= @@ -62,9 +62,9 @@ Script=twin_update_default_rules # twin_foobar_fix_maxsize.upd end # - The kconfig_file (twin_foobar_fix_maxsize.upd) is to be placed - in $KDEDIR/share/apps/kconf_update/ + in $TDEDIR/share/apps/kconf_update/ - The file with the window-specific settings (foobar_fix_maxsize) is to be placed - in $KDEDIR/share/apps/twin/default_rules/ + in $TDEDIR/share/apps/twin/default_rules/ All KDE user accounts should have these new window-specific settings added |