From 84df5ac119bfe11204ea3d3f95c324e41b59fd1c Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 4 Nov 2012 01:33:53 -0600 Subject: [PATCH] Fix references to user profile directory. (cherry picked from commit a11c2ebfed5a31ec11eced6464eee54fa3d49034) --- doc/khangman/index.docbook | 6 +++--- doc/kstars/commands.docbook | 2 +- doc/kstars/config.docbook | 2 +- doc/kstars/faq.docbook | 2 +- doc/kstars/install.docbook | 2 +- kstars/README.ephemerides | 4 ++-- kstars/kstars/indidriver.cpp | 2 +- kstars/kstars/kstarsdata.cpp | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/khangman/index.docbook b/doc/khangman/index.docbook index 3abceae7..f2bc79ad 100644 --- a/doc/khangman/index.docbook +++ b/doc/khangman/index.docbook @@ -728,7 +728,7 @@ Please contact Anne-Marie by email if you need further information. What is stored by &khangman; and where -When you get a new language via Game Get Words in New Language..., the new language data is stored in $~/.kde/share/apps/khangman/data in the language code folder. The available language dir names are also stored in the &khangman; config file in ~/.kde/share/config/khangmanrc. +When you get a new language via Game Get Words in New Language..., the new language data is stored in $~/.trinity/share/apps/khangman/data in the language code folder. The available language dir names are also stored in the &khangman; config file in ~/.trinity/share/config/khangmanrc. The provider name (i.e. the address of the website where to download the new languages) is stored in $KDEDIR/share/apps/khangman/khangmanrc. @@ -737,7 +737,7 @@ The provider name (i.e. the address of the website where to download the new lan The English language (default) and the user language from his i18n package(s) (if available) are stored in $KDEDIR/share/apps/khangman. -In the configuration file, stored for each user in his ~/.kde/share/config/khangmanrc are saved all the game settings such as the background, last level played, ... plus the files that were downloaded from the KNewStuff dialog. +In the configuration file, stored for each user in his ~/.trinity/share/config/khangmanrc are saved all the game settings such as the background, last level played, ... plus the files that were downloaded from the KNewStuff dialog. @@ -785,7 +785,7 @@ you. -There might be a problem due to the change of the configuration file. Please remove the khangmanrc file in your $HOME/.kde/share/config folder. +There might be a problem due to the change of the configuration file. Please remove the khangmanrc file in your $HOME/.trinity/share/config folder. diff --git a/doc/kstars/commands.docbook b/doc/kstars/commands.docbook index 0efacac9..e95ef8a0 100644 --- a/doc/kstars/commands.docbook +++ b/doc/kstars/commands.docbook @@ -790,7 +790,7 @@ files on your local disk, so this feature could be used to attach observing logs or other custom information to objects in &kstars;. Your custom links are automatically loaded whenever &kstars; starts up, and they are stored in the folder ~/.kde/share/apps/kstars/, in files +class="directory">~/.trinity/share/apps/kstars/, in files myimage_url.dat and myinfo_url.dat. If you build an extensive list of custom links, consider submitting them to us, we would like to diff --git a/doc/kstars/config.docbook b/doc/kstars/config.docbook index 38389e65..9263cb22 100644 --- a/doc/kstars/config.docbook +++ b/doc/kstars/config.docbook @@ -67,7 +67,7 @@ location can be added to the list. &kstars; will automatically load your custom locations for all future sessions. Please note, at this point, the only way to remove a custom location is to remove the appropriate line from the file -~/.kde/share/apps/kstars/mycities.dat. +~/.trinity/share/apps/kstars/mycities.dat. If you add custom locations (or modify existing ones), please send us your mycities.dat file so that we can add your diff --git a/doc/kstars/faq.docbook b/doc/kstars/faq.docbook index e1ed1d23..8eb0625d 100644 --- a/doc/kstars/faq.docbook +++ b/doc/kstars/faq.docbook @@ -83,7 +83,7 @@ do I remove it from the program? You will have to edit the -~/.kde/share/apps/kstars/mycities.dat file, and +~/.trinity/share/apps/kstars/mycities.dat file, and remove the location's line from that file. diff --git a/doc/kstars/install.docbook b/doc/kstars/install.docbook index 94a1c1c3..d7b37990 100644 --- a/doc/kstars/install.docbook +++ b/doc/kstars/install.docbook @@ -99,7 +99,7 @@ all files in kstars/data/ to $(KDEDIR)/apps/kstars/ (If you do not have root privileges, copy them to -~/.kde/share/apps/kstars/.) +~/.trinity/share/apps/kstars/.) diff --git a/kstars/README.ephemerides b/kstars/README.ephemerides index 104deeaf..b9048848 100644 --- a/kstars/README.ephemerides +++ b/kstars/README.ephemerides @@ -39,7 +39,7 @@ http://ssd.jpl.nasa.gov/sb_elem.html Step 2: The Comets Under "ASCII Files", click on the "Comets" link, and save -this file as ~/.kde/share/apps/kstars/comets.dat (or as +this file as ~/.trinity/share/apps/kstars/comets.dat (or as $KDEDIR/share/apps/kstars/comets.dat for a system-wide install). @@ -73,6 +73,6 @@ out the first 2000 lines, like this: name ("van de Hulst"), which messes up the columns for that object. You may want to rename this object before sorting.]] -FInally, copy "asteroids.dat" to ~/.kde/share/apps/kstars/ (for +Finally, copy "asteroids.dat" to ~/.trinity/share/apps/kstars/ (for single-user install) or $KDEDIR/share/apps/kstars/ (for system install). diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 3715c763..9feb205d 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -570,7 +570,7 @@ bool INDIDriver::readXMLDriver() if ( !KSUtils::openDataFile( file, indiFile ) ) { - KMessageBox::error(0, i18n("Unable to find device driver file 'drivers.xml'. Please locate the file and place it in one of the following locations:\n\n \t$(KDEDIR)/share/apps/kstars/%1 \n\t~/.kde/share/apps/kstars/%1")); + KMessageBox::error(0, i18n("Unable to find device driver file 'drivers.xml'. Please locate the file and place it in one of the following locations:\n\n \t$(KDEDIR)/share/apps/kstars/%1 \n\t~/.trinity/share/apps/kstars/%1")); return false; } diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index df8f1196..7b0f21a3 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -1776,7 +1776,7 @@ void KStarsData::initError(TQString s, bool required = false) { "To continue loading, place the file in one of the " "following locations, then press Retry:\n\n" ).arg( s ) + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).arg( s ) - + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).arg( s ) + + TQString( "\t~/.trinity/share/apps/kstars/%1\n\n" ).arg( s ) + i18n( "Otherwise, press Cancel to shutdown." ); caption = i18n( "Critical File Not Found: %1" ).arg( s ); } else { @@ -1785,7 +1785,7 @@ void KStarsData::initError(TQString s, bool required = false) { "However, to avoid seeing this message in the future, you can " "place the file in one of the following locations, then press Retry:\n\n" ).arg( s ) + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).arg( s ) - + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).arg( s ) + + TQString( "\t~/.trinity/share/apps/kstars/%1\n\n" ).arg( s ) + i18n( "Otherwise, press Cancel to continue loading without this file." ).arg( s ); caption = i18n( "Non-Critical File Not Found: %1" ).arg( s ); }