diff options
| -rw-r--r-- | doc/userguide/tde-for-admins.docbook | 8 | ||||
| -rw-r--r-- | kcontrol/colors/colorscm.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/fonts/fonts.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/keys/README | 2 | ||||
| -rw-r--r-- | kcontrol/kthememanager/ktheme.cpp | 2 | ||||
| -rw-r--r-- | kdesktop/minicli_ui.ui | 4 | ||||
| -rw-r--r-- | kpersonalizer/kstylepage.cpp | 2 | ||||
| -rw-r--r-- | r14-xdg-update | 10 | ||||
| -rw-r--r-- | tdm/TODO | 2 |
9 files changed, 22 insertions, 12 deletions
diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook index 197dab390..aca6bb7d4 100644 --- a/doc/userguide/tde-for-admins.docbook +++ b/doc/userguide/tde-for-admins.docbook @@ -184,7 +184,7 @@ TDEDIRS='/opt/kde_staff:/opt/trinity' class="directory">/opt/kde_staff</filename> contained additional settings and applications for staff members. <quote>User Profiles</quote> allow you to add this directory only for certain users and not for others. Add the -following to <filename>/etc/kderc</filename>:</para> +following to <filename>/etc/tderc</filename>:</para> <programlisting> [Directories-staff] @@ -195,11 +195,11 @@ prefixes=/opt/kde_staff <filename class="directory">/opt/kde_staff</filename> directory tree. (Note that &SuSE; &Linux; uses <filename>/etc/kde3rc</filename> instead of -<filename>/etc/kderc</filename>. Now that we have a named profile it +<filename>/etc/tderc</filename>. Now that we have a named profile it can be assigned to users.</para> <para>To map profiles to users a mapping file needs to be specified in -<filename>/etc/kderc</filename>:</para> +<filename>/etc/tderc</filename>:</para> <programlisting> [Directories] @@ -2381,7 +2381,7 @@ Installing Software = AutoYaST = KickStart Maintaining Settings -= /etc/kderc, other settings += /etc/tderc, other settings = Use rsync to copy files around = Shared filesystem such as NFS o store profiles themselves on NFS diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 45e3932da..b1cc2616a 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -372,7 +372,7 @@ void KColorScheme::save() // KDE-1.x support KSimpleConfig *config = - new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); + new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" ); config->setGroup( "General" ); config->writeEntry("background", cs->back ); config->writeEntry("selectBackground", cs->select ); diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 2489b80c6..c5b4c3353 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -733,7 +733,7 @@ void TDEFonts::save() } // KDE-1.x support - KSimpleConfig* config = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); + KSimpleConfig* config = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" ); config->setGroup( "General" ); for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) { if("font"==i->rcKey()) diff --git a/kcontrol/keys/README b/kcontrol/keys/README index 63964a1fe..bbdc72537 100644 --- a/kcontrol/keys/README +++ b/kcontrol/keys/README @@ -2,6 +2,6 @@ CHANGES V0.2 - 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] +and against entries in .tderc [Global Keys] - kcmkeys now has two standard kcontrol pages - one for standard desktop accelerators and one for global keybindings. diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index 974ad88b6..d5a593727 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -655,7 +655,7 @@ void KTheme::apply() if ( !fontsElem.isNull() ) { TDEConfig * fontsConf = TDEGlobal::config(); - TDEConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); + TDEConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" ); kde1xConf->setGroup( "General" ); TQDomNodeList fontList = fontsElem.childNodes(); diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui index 4544ce093..daf5542e0 100644 --- a/kdesktop/minicli_ui.ui +++ b/kdesktop/minicli_ui.ui @@ -509,7 +509,7 @@ <cstring>cbCommand</cstring> </property> <property name="whatsThis" stdset="0"> - <string>Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.kde.org" or a local one like "~/.kderc".</string> + <string>Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.kde.org" or a local one like "~/.tderc".</string> </property> </widget> <widget class="TQLabel" row="0" column="0"> @@ -550,7 +550,7 @@ </size> </property> <property name="whatsThis" stdset="0"> - <string>Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.kde.org" or a local one like "~/.kderc".</string> + <string>Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.kde.org" or a local one like "~/.tderc".</string> </property> </widget> <widget class="TQLabel" row="0" column="1"> diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index 296131ee0..974ac0c9d 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -188,7 +188,7 @@ void TDEStylePage::saveColors(bool curSettings){ //////////////////////////////////////////////////// // KDE-1.x support KSimpleConfig *tdeconfig = - new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); + new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" ); tdeconfig->setGroup( "General" ); tdeconfig->writeEntry("background", toSave->background ); tdeconfig->writeEntry("selectBackground", toSave->selectBackground ); diff --git a/r14-xdg-update b/r14-xdg-update index 103d5dec3..627262ac4 100644 --- a/r14-xdg-update +++ b/r14-xdg-update @@ -624,6 +624,16 @@ if [ ! -f $PROFILE_DIR/share/config/tderadiorc ] && [ -f $PROFILE_DIR/share/conf mv $PROFILE_DIR/share/config/kradiorc $PROFILE_DIR/share/config/tderadiorc 2>/dev/null mv $PROFILE_DIR/share/apps/kradio $PROFILE_DIR/share/apps/tderadio 2>/dev/null fi +if [ ! -f $HOME/.tderc ] && [ -f $HOME/.kderc ]; then + # Do not blindly move $HOME/.kderc because that file might be from KDE4. + # The first test is from a Trinity .kderc and the second test is from a KDE4 .kderc. + if [ "`grep selectBackground $HOME/.kderc`" != "" ] && [ "`grep smallestReadableFont $HOME/.kderc`" = "" ]; then + # Both tests pass. Probably a Trinity .kderc. + Message_Prefix + echo " .kderc->.tderc" + mv $HOME/.kderc $HOME/.tderc 2>/dev/null + fi +fi # Disable some features new to R14, otherwise users will see an unfamiliar desktop. if [[ $($TDEDIR/bin/kreadconfig --file kickerrc --group "General" --key "ShowDeepButtons" --default false) == "false" ]]; then @@ -45,7 +45,7 @@ save these options to .dmrc? otherwise the GUI would become insanely complex. - make config position independent -- parse /etc/kderc? +- parse /etc/tderc? - merge multiple tdmrcs in the style of tdeconfig. how to set section priorities? - gentdmconf: treat backgroundrc as an ini file, not as a text blob - add proper quoting and dequoting to gentdmconf ini parser & writer |