Rename kderc -> tderc in support of bug report 1447.

pull/2/head
Darrell Anderson 12 years ago
parent c6c2468b38
commit 9f795192a5

@ -184,7 +184,7 @@ TDEDIRS='/opt/kde_staff:/opt/trinity'
class="directory">/opt/kde_staff</filename> contained additional settings class="directory">/opt/kde_staff</filename> contained additional settings
and applications for staff members. <quote>User Profiles</quote> allow you 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 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> <programlisting>
[Directories-staff] [Directories-staff]
@ -195,11 +195,11 @@ prefixes=/opt/kde_staff
<filename class="directory">/opt/kde_staff</filename> directory <filename class="directory">/opt/kde_staff</filename> directory
tree. (Note that &SuSE; &Linux; uses tree. (Note that &SuSE; &Linux; uses
<filename>/etc/kde3rc</filename> instead of <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> can be assigned to users.</para>
<para>To map profiles to users a mapping file needs to be specified in <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> <programlisting>
[Directories] [Directories]
@ -2381,7 +2381,7 @@ Installing Software
= AutoYaST = AutoYaST
= KickStart = KickStart
Maintaining Settings Maintaining Settings
= /etc/kderc, other settings = /etc/tderc, other settings
= Use rsync to copy files around = Use rsync to copy files around
= Shared filesystem such as NFS = Shared filesystem such as NFS
o store profiles themselves on NFS o store profiles themselves on NFS

@ -372,7 +372,7 @@ void KColorScheme::save()
// KDE-1.x support // KDE-1.x support
KSimpleConfig *config = KSimpleConfig *config =
new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
config->setGroup( "General" ); config->setGroup( "General" );
config->writeEntry("background", cs->back ); config->writeEntry("background", cs->back );
config->writeEntry("selectBackground", cs->select ); config->writeEntry("selectBackground", cs->select );

@ -733,7 +733,7 @@ void TDEFonts::save()
} }
// KDE-1.x support // KDE-1.x support
KSimpleConfig* config = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); KSimpleConfig* config = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
config->setGroup( "General" ); config->setGroup( "General" );
for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) { for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) {
if("font"==i->rcKey()) if("font"==i->rcKey())

@ -2,6 +2,6 @@ CHANGES V0.2
- Global keys stored by default in ~/.trinity/share/config/kdeglobals - Global keys stored by default in ~/.trinity/share/config/kdeglobals
[Global Keys] group [Global Keys] group
- KKeyDialog checks new key choices against exising bindings for the widget - 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 - kcmkeys now has two standard kcontrol pages - one for standard desktop
accelerators and one for global keybindings. accelerators and one for global keybindings.

@ -655,7 +655,7 @@ void KTheme::apply()
if ( !fontsElem.isNull() ) if ( !fontsElem.isNull() )
{ {
TDEConfig * fontsConf = TDEGlobal::config(); TDEConfig * fontsConf = TDEGlobal::config();
TDEConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); TDEConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
kde1xConf->setGroup( "General" ); kde1xConf->setGroup( "General" );
TQDomNodeList fontList = fontsElem.childNodes(); TQDomNodeList fontList = fontsElem.childNodes();

@ -509,7 +509,7 @@
<cstring>cbCommand</cstring> <cstring>cbCommand</cstring>
</property> </property>
<property name="whatsThis" stdset="0"> <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> </property>
</widget> </widget>
<widget class="TQLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
@ -550,7 +550,7 @@
</size> </size>
</property> </property>
<property name="whatsThis" stdset="0"> <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> </property>
</widget> </widget>
<widget class="TQLabel" row="0" column="1"> <widget class="TQLabel" row="0" column="1">

@ -188,7 +188,7 @@ void TDEStylePage::saveColors(bool curSettings){
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
// KDE-1.x support // KDE-1.x support
KSimpleConfig *tdeconfig = KSimpleConfig *tdeconfig =
new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
tdeconfig->setGroup( "General" ); tdeconfig->setGroup( "General" );
tdeconfig->writeEntry("background", toSave->background ); tdeconfig->writeEntry("background", toSave->background );
tdeconfig->writeEntry("selectBackground", toSave->selectBackground ); tdeconfig->writeEntry("selectBackground", toSave->selectBackground );

@ -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/config/kradiorc $PROFILE_DIR/share/config/tderadiorc 2>/dev/null
mv $PROFILE_DIR/share/apps/kradio $PROFILE_DIR/share/apps/tderadio 2>/dev/null mv $PROFILE_DIR/share/apps/kradio $PROFILE_DIR/share/apps/tderadio 2>/dev/null
fi 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. # 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 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. otherwise the GUI would become insanely complex.
- make config position independent - make config position independent
- parse /etc/kderc? - parse /etc/tderc?
- merge multiple tdmrcs in the style of tdeconfig. how to set section priorities? - 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 - gentdmconf: treat backgroundrc as an ini file, not as a text blob
- add proper quoting and dequoting to gentdmconf ini parser & writer - add proper quoting and dequoting to gentdmconf ini parser & writer

Loading…
Cancel
Save