From a3b5ac40733523142094f6341d21945094790f51 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 4 Nov 2012 01:03:47 -0600 Subject: [PATCH] Fix references to user profile directory. --- doc/faq/tdeapps.docbook | 2 +- doc/kcontrol/screensaver/index.docbook | 2 +- doc/kicker/index.docbook | 4 ++-- doc/konqueror/browser.docbook | 2 +- doc/konqueror/faq.docbook | 16 ++++++------- doc/konqueror/filemanager.docbook | 2 +- doc/konqueror/plugins.docbook | 2 +- doc/konqueror/sidebar.docbook | 2 +- doc/ksplashml/index.docbook | 6 ++--- doc/tdeprint/getting-started.docbook | 2 +- doc/userguide/tde-for-admins.docbook | 32 +++++++++++++------------- kcontrol/keys/README | 2 +- kcontrol/krdb/ad/README | 2 +- kcontrol/krdb/krdb.cpp | 2 +- kdebugdialog/README | 2 +- kioslave/trash/testtrash.cpp | 2 +- konqueror/client/kfmclient.cc | 2 +- konqueror/convert_kdelnk.sh | 4 ++-- konsole/other/README.Desktop | 2 +- konsole/other/README.KeyTab | 2 +- konsole/other/README.Schema | 2 +- ksmserver/README | 4 ++-- libkonq/SERVICEMENUS | 2 +- twin/CONFIGURING | 2 +- 24 files changed, 51 insertions(+), 51 deletions(-) diff --git a/doc/faq/tdeapps.docbook b/doc/faq/tdeapps.docbook index 6f20acc69..441759054 100644 --- a/doc/faq/tdeapps.docbook +++ b/doc/faq/tdeapps.docbook @@ -69,7 +69,7 @@ for a dialup connection. Try changing it to a smaller value like 296 or 576. Check in your $HOME/.kde/share/config for the +class="directory">$HOME/.trinity/share/config for the kppprc. Ensure the correct modem speed is actually defined there. diff --git a/doc/kcontrol/screensaver/index.docbook b/doc/kcontrol/screensaver/index.docbook index e52173649..3d7d43cb5 100644 --- a/doc/kcontrol/screensaver/index.docbook +++ b/doc/kcontrol/screensaver/index.docbook @@ -169,7 +169,7 @@ no grace period. To alter the grace period setting, you need to manually edit the configuration file. To do so: -$ cd ~/.kde/share/config +$ cd ~/.trinity/share/config Now, using a text editor (the example uses &kate;, the &tde; text editor), diff --git a/doc/kicker/index.docbook b/doc/kicker/index.docbook index a4fe79ace..3645669d2 100644 --- a/doc/kicker/index.docbook +++ b/doc/kicker/index.docbook @@ -2328,8 +2328,8 @@ another picture? -Look for $HOME/.kde/share/apps/kicker/pics/go.png -and $HOME/.kde/share/apps/kicker/pics/mini/go.png +Look for $HOME/.trinity/share/apps/kicker/pics/go.png +and $HOME/.trinity/share/apps/kicker/pics/mini/go.png and replace them. Do not forget to flatten the replacements to one layer, or else you will not see anything. Create the folders if they do not already exist. Then restart &kicker;. diff --git a/doc/konqueror/browser.docbook b/doc/konqueror/browser.docbook index 02bb39a04..2c1e0fa17 100644 --- a/doc/konqueror/browser.docbook +++ b/doc/konqueror/browser.docbook @@ -448,7 +448,7 @@ OverridenPorts=CommaSeparatedListOfAllowedPorts to $TDEDIR/share/config/kio_httprc or -~/.kde/share/config/kio_httprc. +~/.trinity/share/config/kio_httprc. For example OverridenPorts=23,15 diff --git a/doc/konqueror/faq.docbook b/doc/konqueror/faq.docbook index 7d964b93a..0d7ce4ec2 100644 --- a/doc/konqueror/faq.docbook +++ b/doc/konqueror/faq.docbook @@ -37,7 +37,7 @@ helps. Where does &konqueror; keep all its configuration data? -Generally in the ~/.kde folder (this may +Generally in the ~/.trinity folder (this may be ~/.trinity on your system, depending on how &tde; 3 was installed). Don't alter these files unless you really know what you are doing. @@ -45,30 +45,30 @@ doing. The ~/.kde/share/apps/konqueror/profiles folder +class="directory">~/.trinity/share/apps/konqueror/profiles folder holds individual files containing settings for each of your profiles. Your bookmarks are held in ~/.kde/share/apps/konqueror/bookmarks.xml +class="directory">~/.trinity/share/apps/konqueror/bookmarks.xml Cookies are held in ~/.kde/share/apps/kcookiejar/cookies +class="directory">~/.trinity/share/apps/kcookiejar/cookies Your history, as used for the auto-completion feature, is in -~/.kde/share/config/konq_history +~/.trinity/share/config/konq_history In the folder ~/.kde/share/config/ the files +class="directory">~/.trinity/share/config/ the files konqiconviewrc, konqlistviewrc and konquerorrc hold a whole lot of general configuration settings. The folder -~/.kde/share/cache/http/ +~/.trinity/share/cache/http/ contains the browser cache. The Navigation Panel uses the files and subfolders in ~/.kde/share/apps/konqsidebartng +class="directory">~/.trinity/share/apps/konqsidebartng Any folder specific view settings are put into Go Applications. Then create a single icon on your desktop to open your Applications folder, which is usually in -~/.kde/share/applnk. +~/.trinity/share/applnk. To put an application link icon into the panel, first create it in the Applications folder then drag the icon onto a clear area of the diff --git a/doc/konqueror/plugins.docbook b/doc/konqueror/plugins.docbook index fa933d36c..4cb56795d 100644 --- a/doc/konqueror/plugins.docbook +++ b/doc/konqueror/plugins.docbook @@ -32,7 +32,7 @@ Plugins button or automatically each time &tde; starts up. role="extension">.so files containing plugin code. It examines every such file to find out which MIME types the plugin supports. It then creates MIME type definitions for &tde; in -the user's ~/.kde/share/mimelnk +the user's ~/.trinity/share/mimelnk folder to make other applications aware of them. The Plugins page shows you the &Netscape; plugins diff --git a/doc/konqueror/sidebar.docbook b/doc/konqueror/sidebar.docbook index e428c1f32..14e82bcd9 100644 --- a/doc/konqueror/sidebar.docbook +++ b/doc/konqueror/sidebar.docbook @@ -82,7 +82,7 @@ main view or right click to bring up a menu with a wider range of possibilities. The folders shown in the Network page are held in the folder -~/.kde/share/apps/konqsidebartng/virtual_folders/remote/, and you can make +~/.trinity/share/apps/konqsidebartng/virtual_folders/remote/, and you can make new ones just as you would make any other subfolder. The items within these folders are held as .desktop files and can be created with &konqueror;'s Create New diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook index ebef5fea5..b461e26c7 100644 --- a/doc/ksplashml/index.docbook +++ b/doc/ksplashml/index.docbook @@ -86,7 +86,7 @@ your tastes, you can learn how to customize the appearance of To use themes from KDE-Look, extract them to -~/.kde/share/apps/ksplash/Themes/ for a single user, or +~/.trinity/share/apps/ksplash/Themes/ for a single user, or to $TDEDIR/share/apps/ksplash/Themes/ to make them available to all users of your system. @@ -146,7 +146,7 @@ it. the theme to be recognized by &ksplash;, it should be stored in a folder called MyCoolTheme under ~/.kde/apps/ksplash/Themes/. It should +class="directory">~/.trinity/apps/ksplash/Themes/. It should have a file called Theme.rc, containing the settings of the theme. You can specify large numbers of special things to theme, change the plugin engine to use, and so on. You do not have @@ -178,7 +178,7 @@ by assigning key-value pairs as in the example file above. Ensure that the name of the directory that contains the theme files -(~/.kde/apps/ksplash/Themes/MyCoolTheme +(~/.trinity/apps/ksplash/Themes/MyCoolTheme in this example) and the identifier ([KSplash Theme: MyCoolTheme] in this example) of the theme in the Theme.rc file are identical. Otherwise, &ksplash; will not diff --git a/doc/tdeprint/getting-started.docbook b/doc/tdeprint/getting-started.docbook index 9ac3dec25..2e306c0d7 100644 --- a/doc/tdeprint/getting-started.docbook +++ b/doc/tdeprint/getting-started.docbook @@ -80,7 +80,7 @@ users may have different print subsystems in use, if those do exist on the computer and are compliant with each other. Their settings are stored in the tdeprintrc. This file is unique to every user, and is normally installed in -$HOME/.kde/share/config/tdeprintrc. +$HOME/.trinity/share/config/tdeprintrc. This file is not intended to be directly editable, and all diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook index 691ae691d..6a49a129a 100644 --- a/doc/userguide/tde-for-admins.docbook +++ b/doc/userguide/tde-for-admins.docbook @@ -25,7 +25,7 @@ stores all its files in a directory tree with a fixed structure. class="directory">/opt/trinity). One at the user level in the user's home directory (usually -~/.kde) +~/.trinity) As a system administrator you can create additional trees. Such @@ -36,7 +36,7 @@ linkend="user-profiles">profiles $HOME/.kde +class="directory">$HOME/.trinity /opt/trinity. (This is &SuSE;-specific; other distributions may use @@ -66,7 +66,7 @@ the following files are searched: $HOME/.kde/share/mimelnk/text/plain.desktop +class="directory">$HOME/.trinity/share/mimelnk/text/plain.desktop /opt/trinity/share/mimelnk/text/plain.desktop /etc/opt/trinity/share/mimelnk/text/plain.desktop If a user makes a change, the change is written to $HOME/.kde/share/mimelnk/text/plain.desktop +class="directory">$HOME/.trinity/share/mimelnk/text/plain.desktop For configuration files the story is slightly different. If @@ -87,7 +87,7 @@ which value is used for the key. For example, if the following two files exist, with these contents: -$HOME/.kde/share/config/foobar +$HOME/.trinity/share/config/foobar Color=red Shape=circle @@ -128,13 +128,13 @@ Position=10,10 TDEHOME -~/.kde +~/.trinity TDEROOTHOME -/root/.kde +/root/.trinity Different variable to prevent root writing to $TDEHOME of the user after running su. @@ -194,7 +194,7 @@ prefixes=/opt/kde_staff This creates a profile named staff that adds the /opt/kde_staff directory tree. (Note that &SuSE; &Linux; uses -/etc/trinityrc instead of +/etc/kde3rc instead of /etc/kderc. Now that we have a named profile it can be assigned to users. @@ -528,7 +528,7 @@ precedence. If a key in a certain group is defined multiple times in a single file, the value of the last entry is used. -If $HOME/.kde/share/config/foobar +If $HOME/.trinity/share/config/foobar contains: [MyGroup] @@ -553,7 +553,7 @@ Position=10,10 If - $HOME/.kde/share/config/foobar + $HOME/.trinity/share/config/foobar contains [MyGroup] @@ -607,7 +607,7 @@ Color[$i]=blue If - $HOME/.kde/share/config/foobar + $HOME/.trinity/share/config/foobar contains: [MyGroup] @@ -630,7 +630,7 @@ Position=10,10 If - $HOME/.kde/share/config/foobar + $HOME/.trinity/share/config/foobar contains: [MyGroup] @@ -1151,13 +1151,13 @@ or have to install some programs to a different prefix than the rest of $TDEHOMEIf -not set, &tde; uses ~/.kde as +not set, &tde; uses ~/.trinity as the directory where personal data is stored. $TDEROOTHOMEIf -not set, &tde; uses ~root/.kde +not set, &tde; uses ~root/.trinity as the directory for root's personal data. Was introduced to prevent &tde; from accidently overwriting user data with root permissions when the user runs a &tde; @@ -1815,7 +1815,7 @@ NoDisplay=true the directory structures in $TDEDIR/share/applnk (system wide) and $HOME/.kde/share/applnk +class="directory">$HOME/.trinity/share/applnk (user specific). This is observed unless the .desktop file has a Categories= line. In that case the categories determine the location in the menu. @@ -1945,7 +1945,7 @@ role="extension">.gif files. A user can change file association in the &kcontrolcenter;. These changes are stored in -$HOME/.kde/share/config/profilerc. +$HOME/.trinity/share/config/profilerc. To use the same settings for multiple users, store these settings in user profile directory or the global &tde; config directory to use as default for multiple users. diff --git a/kcontrol/keys/README b/kcontrol/keys/README index 14e09f73e..63964a1fe 100644 --- a/kcontrol/keys/README +++ b/kcontrol/keys/README @@ -1,5 +1,5 @@ CHANGES V0.2 -- Global keys stored by default in ~/.kde/share/config/kdeglobals +- Global keys stored by default in ~/.trinity/share/config/kdeglobals [Global Keys] group - KKeyDialog checks new key choices against exising bindings for the widget and against entries in .kderc [Global Keys] diff --git a/kcontrol/krdb/ad/README b/kcontrol/krdb/ad/README index 830ba77b4..9a5d836cb 100644 --- a/kcontrol/krdb/ad/README +++ b/kcontrol/krdb/ad/README @@ -39,7 +39,7 @@ $(TDEDIR)/share/apps/kdisplay/app-defaults or -$(HOME)/.kde/share/apps/kdisplay/app-defaults +$(HOME)/.trinity/share/apps/kdisplay/app-defaults so that it is available to krdb for reading. If you want to override a system file simply copy it to your user diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 88d24f801..3b88ec5b2 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -330,7 +330,7 @@ static TQString color( const TQColor& col ) static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version ) { - // lukas: why does it create in ~/.kde/share/config ??? + // lukas: why does it create in ~/.trinity/share/config ??? // pfeiffer: so that we don't overwrite the user's gtkrc. // it is found via the GTK_RC_FILES environment variable. KSaveFile saveFile( locateLocal( "config", 2==version?"gtkrc-2.0":"gtkrc" ) ); diff --git a/kdebugdialog/README b/kdebugdialog/README index e1d239223..59c9fcd9f 100644 --- a/kdebugdialog/README +++ b/kdebugdialog/README @@ -8,5 +8,5 @@ to it and never clearing it. So don't forget to empty it once in a while! Your configuration will of course be stored in - $HOME/.kde/share/config/kdebugrc + $HOME/.trinity/share/config/kdebugrc diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp index 94d33771a..c5c25d872 100644 --- a/kioslave/trash/testtrash.cpp +++ b/kioslave/trash/testtrash.cpp @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) TQString TestTrash::homeTmpDir() const { - return TQDir::homeDirPath() + "/.kde/testtrash/"; + return TQDir::homeDirPath() + "/.trinity/testtrash/"; } TQString TestTrash::readOnlyDirPath() const diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index dcb508dc8..f8533ef17 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -96,7 +96,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) puts(i18n(" kfmclient openProfile 'profile' ['url']\n" " # Opens a window using the given profile.\n" - " # 'profile' is a file under ~/.kde/share/apps/konqueror/profiles.\n" + " # 'profile' is a file under ~/.trinity/share/apps/konqueror/profiles.\n" " # 'url' is an optional URL to open.\n\n").local8Bit()); puts(i18n(" kfmclient openProperties 'url'\n" diff --git a/konqueror/convert_kdelnk.sh b/konqueror/convert_kdelnk.sh index 02ed247e6..0acc799ad 100755 --- a/konqueror/convert_kdelnk.sh +++ b/konqueror/convert_kdelnk.sh @@ -3,7 +3,7 @@ # Converts all user's .kdelnk files to .desktop # Necessary to avoid duplication when saving a mimetype or an applnk -find ~/.kde/share/mimelnk ~/.kde/share/applnk -name "*.kdelnk" -print | +find ~/.trinity/share/mimelnk ~/.trinity/share/applnk -name "*.kdelnk" -print | while read k; do d=`echo $k|sed -e 's/\.kdelnk/\.desktop/'` echo "Renaming $k to $d" @@ -11,7 +11,7 @@ find ~/.kde/share/mimelnk ~/.kde/share/applnk -name "*.kdelnk" -print | done # Convert user's bookmarks to .desktop and to remove .xpm from icons -find ~/.kde/share/apps/kfm/bookmarks -type f -print | +find ~/.trinity/share/apps/kfm/bookmarks -type f -print | while read k; do if echo $k | grep -q kdelnk; then # kdelnk file d=`echo $k|sed -e 's/\.kdelnk/\.desktop/'` diff --git a/konsole/other/README.Desktop b/konsole/other/README.Desktop index e87c88dc9..23bc81df8 100644 --- a/konsole/other/README.Desktop +++ b/konsole/other/README.Desktop @@ -3,4 +3,4 @@ The session offered to be created in the File menu are taken from from configurations files with a *.desktop pattern either located in $TDEDIR/share/apps/konsole -or ~/.kde/share/apps/konsole. +or ~/.trinity/share/apps/konsole. diff --git a/konsole/other/README.KeyTab b/konsole/other/README.KeyTab index 8eeb15423..75d6cfd79 100644 --- a/konsole/other/README.KeyTab +++ b/konsole/other/README.KeyTab @@ -3,7 +3,7 @@ The keytabs offered in the Options/Keyboard menu are taken from from configurations files with a *.keytab pattern either located in $TDEDIR/share/apps/konsole -or ~/.kde/share/apps/konsole. +or ~/.trinity/share/apps/konsole. Keytabs allow to configure the behavior of konsole on keyboard events, especially for functions keys. diff --git a/konsole/other/README.Schema b/konsole/other/README.Schema index a87f46f4d..bdc0599b5 100644 --- a/konsole/other/README.Schema +++ b/konsole/other/README.Schema @@ -3,7 +3,7 @@ The schemata offered in the Options/Schema menu are taken from from configurations files with a *.schema pattern either located in $TDEDIR/share/apps/konsole -or ~/.kde/share/apps/konsole. +or ~/.trinity/share/apps/konsole. Schemata allow to configure the color set that konsole uses, together with some more information on rendition diff --git a/ksmserver/README b/ksmserver/README index 710fede2a..452bf75f4 100644 --- a/ksmserver/README +++ b/ksmserver/README @@ -122,7 +122,7 @@ desparately trying to connect to something, try setting it to some bogus value. In addition, ksmserver propagates both its network address and its -process id in ~/.kde/socket-$HOSTNAME/KSMserver-$DISPLAY. A +process id in ~/.trinity/socket-$HOSTNAME/KSMserver-$DISPLAY. A utility function KApplication::propagateSessionManager() reads this setting and sets SESSION_MANAGER accordingly, so that child processes can pick it up. The function is called by clients that are started @@ -172,6 +172,6 @@ Troubleshooting If you experience trouble like 'logout does not work anymore' or 'I cannot start new applications', as a result of a previous crash, ensure that ksmserver is indeed not running anymore and remove the -file ~/.kde/socket-$HOSTNAME/KSMserver-$DISPLAY. Shouldn't be necessry, +file ~/.trinity/socket-$HOSTNAME/KSMserver-$DISPLAY. Shouldn't be necessry, but one never knows. diff --git a/libkonq/SERVICEMENUS b/libkonq/SERVICEMENUS index 127acd6de..12035388c 100644 --- a/libkonq/SERVICEMENUS +++ b/libkonq/SERVICEMENUS @@ -12,7 +12,7 @@ associate it with the relevant file types. How === -Create a file ~/.kde/share/apps/konqueror/servicemenus/something.desktop +Create a file ~/.trinity/share/apps/konqueror/servicemenus/something.desktop and write into it something like (without the comments) : [Desktop Entry] diff --git a/twin/CONFIGURING b/twin/CONFIGURING index ee5e21668..01b6696a5 100644 --- a/twin/CONFIGURING +++ b/twin/CONFIGURING @@ -36,7 +36,7 @@ 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 $TDEHOME/share/config/twinrulesrc ($TDEHOME usually being $HOME/.kde) +- Back up your $TDEHOME/share/config/twinrulesrc ($TDEHOME usually being $HOME/.trinity) and remove it - Run 'dcop twin default reconfigure' - Create manually all window-specific settings that should be included (see above)