diff --git a/admin b/admin index 4027b878f..307fab5fd 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 4027b878fb556a51ed29affd578e78aa70997480 +Subproject commit 307fab5fdad542247fa11a418be0e9635f4b5ebf 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 contained additional settings and applications for staff members. User Profiles allow you to add this directory only for certain users and not for others. Add the -following to /etc/kderc: +following to /etc/tderc: [Directories-staff] @@ -195,11 +195,11 @@ prefixes=/opt/kde_staff /opt/kde_staff directory tree. (Note that &SuSE; &Linux; uses /etc/kde3rc instead of -/etc/kderc. Now that we have a named profile it +/etc/tderc. Now that we have a named profile it can be assigned to users. To map profiles to users a mapping file needs to be specified in -/etc/kderc: +/etc/tderc: [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 @@ cbCommand - 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". + 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". @@ -550,7 +550,7 @@ - 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". + 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". diff --git a/khelpcenter/index.html.in b/khelpcenter/index.html.in index 9e2a44621..45cbd3dc7 100644 --- a/khelpcenter/index.html.in +++ b/khelpcenter/index.html.in @@ -2,7 +2,7 @@ %1 - + diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index 3c29e039e..f0151b3df 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -40,7 +40,7 @@ View::View( TQWidget *parentWidget, const char *widgetName, connect( this, TQT_SIGNAL( popupMenu( const TQString &, const TQPoint& ) ), this, TQT_SLOT( showMenu( const TQString &, const TQPoint& ) ) ); - TQString css = langLookup("common/kde-default.css"); + TQString css = langLookup("common/tde-default.css"); if (!css.isEmpty()) { TQFile css_file(css); @@ -48,7 +48,7 @@ View::View( TQWidget *parentWidget, const char *widgetName, { TQTextStream s(&css_file); TQString stylesheet = s.read(); - preloadStyleSheet("help:/common/kde-default.css", stylesheet); + preloadStyleSheet("help:/common/tde-default.css", stylesheet); } } 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 diff --git a/tdeioslave/info/kde-info2html b/tdeioslave/info/kde-info2html index b84d984f4..9ecebfb6d 100755 --- a/tdeioslave/info/kde-info2html +++ b/tdeioslave/info/kde-info2html @@ -52,7 +52,7 @@ delete $ENV{CDPATH}; delete $ENV{ENV}; require $config_file; #-- configuration settings -my $STYLESHEET_KDE = ""; +my $STYLESHEET_KDE = ""; my $LOGO_KDE = "\"TDE"; # the use of a query should make sure it never conflicts with a "real" path diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp index 577f7d53a..a2f8365cb 100644 --- a/tdeioslave/man/man2html.cpp +++ b/tdeioslave/man/man2html.cpp @@ -4083,7 +4083,7 @@ static char *scan_request(char *c) out_html( " Manpage\n"); out_html( "\n" ); + out_html("/tde-default.css\" type=\"text/css\">\n" ); out_html( "findResourceDir( "html", "en/common/kde-common.css" ); + const TQString common_dir = TDEGlobal::dirs()->findResourceDir( "html", "en/common/tde-common.css" ); const TQString strPath=TQString( "file:%1/en/common" ).arg( common_dir ); m_htmlPath=strPath.local8Bit(); // ### TODO encode for HTML m_cssPath=strPath.local8Bit(); // ### TODO encode for CSS diff --git a/tdm/TODO b/tdm/TODO index a36dd8edf..208863d9b 100644 --- a/tdm/TODO +++ b/tdm/TODO @@ -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