Browse Source

Convert remaining references to kde3 (e.g. in paths) to trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 11 years ago
parent
commit
549c7e4d63
  1. 2
      Makefile.am.in
  2. 2
      doc/faq/install.docbook
  3. 2
      doc/faq/kdeapps.docbook
  4. 2
      doc/kdm/index.docbook
  5. 2
      doc/konqueror/faq.docbook
  6. 52
      doc/userguide/kde-for-admins.docbook
  7. 6
      kcontrol/colors/colorscm.cpp
  8. 2
      kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.upd
  9. 2
      kcontrol/input/mouse_cursor_theme.upd
  10. 2
      kcontrol/keys/CMakeLists.txt
  11. 2
      kcontrol/keys/Makefile.am
  12. 2
      kcontrol/keys/kaccel.upd
  13. 2
      kcontrol/keys/keyconfig.cpp
  14. 4
      kcontrol/keys/shortcuts.cpp
  15. 2
      kcontrol/kio/socks.upd
  16. 2
      kcontrol/krdb/kcmdisplayrc.upd
  17. 8
      kdm/config.def
  18. 12
      kdm/kfrontend/genkdmconf.c
  19. 4
      khotkeys/README
  20. 4
      khotkeys/data/CMakeLists.txt
  21. 4
      khotkeys/data/Makefile.am
  22. 2
      khotkeys/data/kde32b1.khotkeys
  23. 4
      khotkeys/data/khotkeys_32b1_update.upd
  24. 2
      khotkeys/data/konqueror_gestures_kde321.khotkeys
  25. 4
      khotkeys/data/konqueror_gestures_kde321_update.upd
  26. 2
      klipper/CMakeLists.txt
  27. 2
      klipper/Makefile.am
  28. 4
      klipper/klipperrc.upd
  29. 2
      konsole/konsole.upd
  30. 6
      kpersonalizer/kospage.cpp
  31. 4
      kpersonalizer/kstylepage.cpp
  32. 2
      kpersonalizer/kstylepage.h
  33. 2
      ksmserver/ksmserver.upd
  34. 2
      ktip/tips
  35. 2
      kwin/clients/b2/b2client.h
  36. 2
      kwin/clients/laptop/laptopclient.h
  37. 4
      kwin/data/kwin.upd
  38. 2
      kwin/data/kwin3_plugin.upd
  39. 2
      kwin/data/kwin_fsp_workarounds_1.upd
  40. 2
      kwin/data/kwinupdatewindowsettings.upd
  41. 2
      libkonq/favicons/favicons.upd
  42. 32
      startkde

2
Makefile.am.in

@ -9,7 +9,7 @@ COMPILE_AFTER_kcontrol = kdm kdesktop
AUTOMAKE_OPTIONS = foreign 1.6.1
bin_SCRIPTS = startkde kde3
bin_SCRIPTS = startkde trinity
EXTRA_DIST = admin bsd-port debian kdebase.spec.in README.pam kde.pamd kscreensaver.pamd mkpamserv

2
doc/faq/install.docbook

@ -413,7 +413,7 @@ should take care of all dependencies.</para>
<para>If you compile the source code yourself, you should take more care.
Instructions for running two different versions of &kde; on the same system are
given at <ulink
url="http://developer.kde.org/build/kde2-and-kde3.html">http://developer.kde.org/build/kde2-and-kde3.html</ulink>.
url="http://developer.kde.org/build/kde2-and-trinity.html">http://developer.kde.org/build/kde2-and-trinity.html</ulink>.
However, please note that running two different versions of &kde; from source
can lead to problems if you are not careful. </para>
</answer>

2
doc/faq/kdeapps.docbook

@ -130,7 +130,7 @@ class="directory">/etc/fonts/local.conf</filename>. This should be
the first line after <quote>&lt;fontconfig&gt;</quote>. For example:
<programlisting>
&lt;fontconfig&gt;
&lt;dir&gt;/usr/kde3/share/fonts&lt;/dir&gt;
&lt;dir&gt;/usr/trinity/share/fonts&lt;/dir&gt;
&lt;/fontconfig&gt;
</programlisting>
After adding the directory, run (as root):

2
doc/kdm/index.docbook

@ -298,7 +298,7 @@ system, and that you simply want to change its behavior in some way.</para>
<para>When &kdm; starts up, it reads its configuration from the folder
<filename class="directory">$KDEDIR/share/config/kdm/</filename> (this may
be <filename class="directory">/etc/kde3/kdm/</filename> or something else
be <filename class="directory">/etc/trinity/kdm/</filename> or something else
on your system).</para>
<para>The main configuration file is &kdmrc;; all other files are

2
doc/konqueror/faq.docbook

@ -38,7 +38,7 @@ helps.</para></answer>
<question><para>Where does &konqueror; keep all its configuration
data?</para></question>
<answer><para>Generally in the <filename>~/.kde</filename> folder (this may
be <filename>~/.kde3</filename> on your system, depending on how &kde; 3
be <filename>~/.trinity</filename> on your system, depending on how &kde; 3
was installed). Don't alter these files unless you really know what you are
doing.</para>

52
doc/userguide/kde-for-admins.docbook

@ -37,7 +37,7 @@ stores all its files in a directory tree with a fixed structure.
<itemizedlist>
<listitem><para>One at the system level (for example <filename
class="directory">/opt/kde3</filename>).</para></listitem>
class="directory">/opt/trinity</filename>).</para></listitem>
<listitem><para>One at the user level in the user's home directory
(usually <filename class="directory">
~/.kde</filename>)</para></listitem>
@ -53,12 +53,12 @@ linkend="user-profiles">profiles</link></para>
<listitem><para><filename
class="directory">$<envar>HOME</envar>/.kde</filename></para></listitem>
<listitem><para><filename
class="directory">/opt/kde3</filename>. (This is
class="directory">/opt/trinity</filename>. (This is
&SuSE;-specific; other distributions may use
<filename class="directory">/usr</filename> or <filename
class="directory">/usr/kde3</filename>)</para></listitem>
class="directory">/usr/trinity</filename>)</para></listitem>
<listitem><para><filename
class="directory">/etc/opt/kde3</filename>. (This was added by
class="directory">/etc/opt/trinity</filename>. (This was added by
&SuSE;).</para></listitem>
</itemizedlist>
@ -83,9 +83,9 @@ the following files are searched:</para>
<listitem><para><filename
class="directory">$<envar>HOME</envar>/.kde/share/mimelnk/text/plain.desktop</filename></para></listitem>
<listitem><para><filename
class="directory">/opt/kde3/share/mimelnk/text/plain.desktop</filename></para></listitem>
class="directory">/opt/trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
<listitem><para><filename
class="directory">/etc/opt/kde3/share/mimelnk/text/plain.desktop</filename></para></listitem>
class="directory">/etc/opt/trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
</itemizedlist>
<para>If a user makes a change, the change is written to <filename
@ -111,7 +111,7 @@ Shape=circle
</varlistentry>
<varlistentry>
<term><filename>/etc/opt/kde3/share/config/foobar</filename></term>
<term><filename>/etc/opt/trinity/share/config/foobar</filename></term>
<listitem><programlisting>
Color=blue
Position=10,10
@ -157,18 +157,18 @@ root writing to $KDEHOME of the user after running
<seglistitem>
<seg><envar>KDEDIR</envar></seg>
<seg><filename class="directory">/opt/kde3</filename>, <filename
<seg><filename class="directory">/opt/trinity</filename>, <filename
class="directory">/usr</filename>, <filename
class="directory">/usr/kde3</filename></seg>
class="directory">/usr/trinity</filename></seg>
<seg>Vendor dependent. Used by &kde; 2. If not set, falls back to
compiled-in default.</seg>
</seglistitem>
<seglistitem>
<seg><envar>KDEDIRS</envar></seg>
<seg><filename class="directory">/opt/kde3</filename>, <filename
<seg><filename class="directory">/opt/trinity</filename>, <filename
class="directory">/usr</filename>, <filename
class="directory">/usr/kde3</filename></seg>
class="directory">/usr/trinity</filename></seg>
<seg>New in &kde;3. Can list multiple locations separated by a
colon. If not set, falls back to $<envar>KDEDIR</envar></seg>
</seglistitem>
@ -183,9 +183,9 @@ colon. If not set, falls back to $<envar>KDEDIR</envar></seg>
<para>A staff member at a university could have the following
settings:</para>
<programlisting>
KDEHOME='~/.kde3'
KDEROOTHOME='/root/.kde3'
KDEDIRS='/opt/kde_staff:/opt/kde3'
KDEHOME='~/.trinity'
KDEROOTHOME='/root/.trinity'
KDEDIRS='/opt/kde_staff:/opt/trinity'
</programlisting>
</informalexample>
@ -209,7 +209,7 @@ prefixes=/opt/kde_staff
<para>This creates a profile named <quote>staff</quote> that adds the
<filename class="directory">/opt/kde_staff</filename> directory
tree. (Note that &SuSE; &Linux; uses
<filename>/etc/kde3rc</filename> instead of
<filename>/etc/trinityrc</filename> instead of
<filename>/etc/kderc</filename>. Now that we have a named profile it
can be assigned to users.</para>
@ -274,7 +274,7 @@ directory tree.</para>
</varlistentry>
<varlistentry>
<term><filename class="directory">lib/kde3</filename></term>
<term><filename class="directory">lib/trinity</filename></term>
<listitem><para>This directory contains components, plugins, and other
runtime loadable objects for use by &kde; 3.<replaceable>x</replaceable>
applications.</para></listitem>
@ -550,7 +550,7 @@ contains:
Color=red
Shape=circle
</programlisting>
and <filename>/etc/opt/kde3/share/config/foobar</filename> contains
and <filename>/etc/opt/trinity/share/config/foobar</filename> contains
<programlisting>
[MyGroup]
Color=blue
@ -583,7 +583,7 @@ and <filename>/opt/kde_staff/share/config/foobar</filename> contains
Color=purple
Position=20,20
</programlisting>
and <filename>/etc/opt/kde3/share/config/foobar</filename> contains
and <filename>/etc/opt/trinity/share/config/foobar</filename> contains
<programlisting>
[MyGroup]
Color=blue
@ -629,7 +629,7 @@ Color[$i]=blue
Color=red
Shape=circle
</programlisting>
and <filename>/etc/opt/kde3/share/config/foobar</filename> contains:
and <filename>/etc/opt/trinity/share/config/foobar</filename> contains:
<programlisting>
[MyGroup][$i]
Color=blue
@ -658,7 +658,7 @@ and <filename>/opt/kde_staff/share/config/foobar</filename> contains
Color=purple
Shape=rectangle
</programlisting>
and <filename>/etc/opt/kde3/share/config/foobar</filename> contains
and <filename>/etc/opt/trinity/share/config/foobar</filename> contains
<programlisting>
[MyGroup][$i]
Color=blue
@ -918,7 +918,7 @@ as well as <command>kdeinit</command> loadable modules
(<acronym>KLM</acronym>s). <acronym>KLM</acronym>s work just like binary
program files but can be started more efficiently. <acronym>KLM</acronym>s
live in <filename
class="directory">$<envar>KDEDIR</envar>/lib/kde3</filename></para>
class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para>
<para>The drawback is that programs started this way appear as
<computeroutput><command>kdeinit</command></computeroutput> in the output of
@ -1325,7 +1325,7 @@ as well as <command>kdeinit</command> loadable modules
(<acronym>KLM</acronym>s). <acronym>KLM</acronym>s work just like binary
program files but can be started more efficiently. <acronym>KLM</acronym>s
live in <filename
class="directory">$<envar>KDEDIR</envar>/lib/kde3</filename></para>
class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para>
<para>The drawback is that programs started this way appear as
<computeroutput><command>kdeinit</command></computeroutput> in the
@ -1409,7 +1409,7 @@ role="extension">.desktop</literal> file:
<programlisting>
[Desktop Entry]
Encoding=UTF-8
Icon=/opt/kde3/share/apps/kdesktop/pics/ksslogo.png
Icon=/opt/trinity/share/apps/kdesktop/pics/ksslogo.png
Type=Link
URL=http://www.kde.org/
</programlisting>
@ -1627,7 +1627,7 @@ merged)</para></listitem>
<listitem><para>Distribution Specific SUSE Linux copies certain icons
in startkde.theme from <filename
class="directory">/opt/kde3/share/config/SuSE/default/</filename></para></listitem>
class="directory">/opt/trinity/share/config/SuSE/default/</filename></para></listitem>
</itemizedlist>
</para>
@ -1690,9 +1690,9 @@ new menu format:
<listitem><para><filename>/usr/share/applications/Acrobat
Reader.desktop</filename></para></listitem>
<listitem><para><filename>/opt/kde3/share/applications/kde/kpresenter.desktop</filename></para></listitem>
<listitem><para><filename>/opt/trinity/share/applications/kde/kpresenter.desktop</filename></para></listitem>
<listitem><para><filename>/opt/kde3/share/applications/kde/kword.desktop</filename></para></listitem>
<listitem><para><filename>/opt/trinity/share/applications/kde/kword.desktop</filename></para></listitem>
</itemizedlist>
</para>

6
kcontrol/colors/colorscm.cpp

@ -737,7 +737,7 @@ void KColorScheme::readScheme( int index )
KConfigBase* config;
TQColor widget(239, 239, 239);
TQColor kde34Blue(103,141,178);
TQColor trinity4Blue(103,141,178);
TQColor inactiveBackground(157,170,186);
TQColor activeBackground(65,142,220);
TQColor inactiveForeground(221,221,221);
@ -761,7 +761,7 @@ void KColorScheme::readScheme( int index )
sCurrentScheme = "<default>";
cs->txt = black;
cs->back = widget;
cs->select = kde34Blue;
cs->select = trinity4Blue;
cs->selectTxt = white;
cs->window = white;
cs->windowTxt = black;
@ -810,7 +810,7 @@ void KColorScheme::readScheme( int index )
// note: defaults should be the same as the KDE default
cs->txt = config->readColorEntry( "foreground", &black );
cs->back = config->readColorEntry( "background", &widget );
cs->select = config->readColorEntry( "selectBackground", &kde34Blue );
cs->select = config->readColorEntry( "selectBackground", &trinity4Blue );
cs->selectTxt = config->readColorEntry( "selectForeground", &white );
cs->window = config->readColorEntry( "windowBackground", &white );
cs->windowTxt = config->readColorEntry( "windowForeground", &black );

2
kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.upd

@ -1,4 +1,4 @@
Id=post-kde3.1/cvs
Id=post-trinity.1/cvs
File=kuriikwsfilterrc
Group=General
Key=SearchEngineShortcutsEnabled,EnableWebShortcuts

2
kcontrol/input/mouse_cursor_theme.upd

@ -1,4 +1,4 @@
Id=kde3.4.99
Id=trinity.4.99
File=kdeglobals,kcminputrc
Group=KDE,Mouse
Options=overwrite

2
kcontrol/keys/CMakeLists.txt

@ -27,7 +27,7 @@ install( FILES kaccel.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS convertShortcuts.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( FILES
wm3.kksrc kde3.kksrc kde4.kksrc win3.kksrc
wm3.kksrc trinity.kksrc kde4.kksrc win3.kksrc
win4.kksrc mac4.kksrc unix3.kksrc
DESTINATION ${DATA_INSTALL_DIR}/kcmkeys )

2
kcontrol/keys/Makefile.am

@ -18,5 +18,5 @@ updatedir = $(kde_datadir)/kconf_update
xdg_apps_DATA = keys.desktop
scheme_DATA = wm3.kksrc kde3.kksrc kde4.kksrc win3.kksrc win4.kksrc mac4.kksrc unix3.kksrc
scheme_DATA = wm3.kksrc trinity.kksrc kde4.kksrc win3.kksrc win4.kksrc mac4.kksrc unix3.kksrc
schemedir = $(kde_datadir)/kcmkeys

2
kcontrol/keys/kaccel.upd

@ -1,3 +1,3 @@
Id=kde3.3/r1
Id=trinity.3/r1
File=kdeglobals
Script=convertShortcuts.pl,perl

2
kcontrol/keys/keyconfig.cpp

@ -428,7 +428,7 @@ void KKeyModule::readScheme( int index )
{
TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
//TQRegExp r( "-kde[34].kksrc$" );
TQRegExp r( "-kde3.kksrc$" );
TQRegExp r( "-trinity.kksrc$" );
sList->clear();
sFileList->clear();

4
kcontrol/keys/shortcuts.cpp

@ -177,7 +177,7 @@ void ShortcutsModule::initGUI()
m_pTab->setMargin( KDialog::marginHint() );
pVLayout->addWidget( m_pTab );
// See if ~/.kde3/env/win-key.sh exists
// See if ~/.trinity/env/win-key.sh exists
TQFile f( kde_winkeys_env_dir + "win-key.sh" );
if ( f.exists() == false ) {
// No, it does not, so Win is a modifier
@ -460,7 +460,7 @@ void ShortcutsModule::slotUseRmWinKeysClicked()
{
TQString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/";
// See if ~/.kde3/env/win-key.sh exists
// See if ~/.trinity/env/win-key.sh exists
TQFile f( kde_winkeys_env_dir + "win-key.sh" );
if ( f.exists() == false ) {
// No, it does not, so Win is currently a modifier

2
kcontrol/kio/socks.upd

@ -1,5 +1,5 @@
# Hello world
Id=kde3.0/r1
Id=trinity.0/r1
File=ksocksrc,kdeglobals
Group=<default>,Socks
Key=Custom Lib,SOCKS_lib

2
kcontrol/krdb/kcmdisplayrc.upd

@ -1,5 +1,5 @@
# This is comment
Id=kde3
Id=trinity
File=kcmdisplayrc
Group=X11
Options=copy

8
kdm/config.def

@ -48,11 +48,11 @@
#endif
#if defined(BSD) || defined(__linux__)
# define DEF_USER_PATH "/usr/local/bin:/opt/kde3/bin:/usr/bin:/bin:/opt/kde3/games:/usr/games"
# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/opt/kde3/sbin:/usr/sbin:/opt/kde3/bin:/usr/bin:/sbin:/bin"
# define DEF_USER_PATH "/usr/local/bin:/opt/trinity/bin:/usr/bin:/bin:/opt/trinity/games:/usr/games"
# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin"
#else
# define DEF_USER_PATH "/usr/local/bin:/opt/kde3/bin:/usr/bin:/bin:/opt/kde3/games:/usr/games:/usr/ucb"
# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/opt/kde3/sbin:/usr/sbin:/opt/kde3/bin:/usr/bin:/sbin:/bin:/etc:/usr/ucb"
# define DEF_USER_PATH "/usr/local/bin:/opt/trinity/bin:/usr/bin:/bin:/opt/trinity/games:/usr/games:/usr/ucb"
# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin:/etc:/usr/ucb"
#endif
#if 0 /*def HASXDMAUTH*/

12
kdm/kfrontend/genkdmconf.c

@ -594,12 +594,12 @@ static const char def_startup[] =
" xmessage -file /etc/nologin -geometry 640x480\n"
" fi\n"
" if [ \"$(id -u)\" != \"0\" ] && \\\n"
" ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n"
" ! grep -qs '^ignore-nologin' /etc/trinity/kdm/kdm.options; then\n"
" exit 1\n"
" fi\n"
"fi\n"
"\n"
"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n"
"if grep -qs '^use-sessreg' /etc/trinity/kdm/kdm.options && \\\n"
" which sessreg > /dev/null 2>&1; then\n"
" exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n"
" -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
@ -620,7 +620,7 @@ static const char def_reset[] =
"#devname=`echo $DISPLAY | cut -c1-8`\n"
"#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
#else
"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n"
"if grep -qs '^use-sessreg' /etc/trinity/kdm/kdm.options && \\\n"
" which sessreg > /dev/null 2>&1; then\n"
" exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n"
" -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
@ -2527,8 +2527,8 @@ fwrapprintf( FILE *f, const char *msg, ... )
static const char *oldkdes[] = {
KDE_CONFDIR,
"/opt/kde3/share/config",
"/usr/local/kde3/share/config",
"/opt/trinity/share/config",
"/usr/local/trinity/share/config",
"/opt/kde/share/config",
"/usr/local/kde/share/config",
@ -2581,7 +2581,7 @@ int main( int argc, char **argv )
" --old-kde /path/to/old/kde-config-dir\n"
" Where to look for the kdmrc of an older kdm.\n"
" Default is to scan " KDE_CONFDIR " and\n"
" {/usr,/usr/local,{/opt,/usr/local}/{kde3,kde,kde2,kde1}}/share/config.\n"
" {/usr,/usr/local,{/opt,/usr/local}/{trinity,kde,kde2,kde1}}/share/config.\n"
" --no-old\n"
" Don't look at older xdm/kdm configurations, just create default config.\n"
" --no-old-xdm\n"

4
khotkeys/README

@ -48,8 +48,8 @@
- $KDEDIR/bin/khotkeys
- $KDEDIR/lib/libkcm_khotkeys.la
- $KDEDIR/lib/libkcm_khotkeys.so
- $KDEDIR/lib/kde3/libkcm_khotkeys.la
- $KDEDIR/lib/kde3/libkcm_khotkeys.so
- $KDEDIR/lib/trinity/libkcm_khotkeys.la
- $KDEDIR/lib/trinity/libkcm_khotkeys.so
- $KDEDIR/lib/khotkeys.la
- $KDEDIR/lib/khotkeys.so
- $KDEDIR/lib/libkhotkeys.la

4
khotkeys/data/CMakeLists.txt

@ -10,11 +10,11 @@
#################################################
install( FILES
kde32b1.khotkeys konqueror_gestures_kde321.khotkeys
trinity2b1.khotkeys konqueror_gestures_trinity21.khotkeys
printscreen.khotkeys
DESTINATION ${DATA_INSTALL_DIR}/khotkeys )
install( FILES
khotkeys_32b1_update.upd khotkeys_printscreen.upd
konqueror_gestures_kde321_update.upd
konqueror_gestures_trinity21_update.upd
DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )

4
khotkeys/data/Makefile.am

@ -1,7 +1,7 @@
khotkeys_data_DATA = kde32b1.khotkeys konqueror_gestures_kde321.khotkeys printscreen.khotkeys
khotkeys_data_DATA = trinity2b1.khotkeys konqueror_gestures_trinity21.khotkeys printscreen.khotkeys
khotkeys_datadir = $(kde_datadir)/khotkeys
khotkeys_update_DATA = khotkeys_32b1_update.upd konqueror_gestures_kde321_update.upd khotkeys_printscreen.upd
khotkeys_update_DATA = khotkeys_32b1_update.upd konqueror_gestures_trinity21_update.upd khotkeys_printscreen.upd
khotkeys_updatedir = $(kde_datadir)/kconf_update
EXTRA_DIST = $(khotkeys_data_DATA) $(khotkeys_update_DATA)

2
khotkeys/data/kde32b1.khotkeys

@ -1743,4 +1743,4 @@ Timeout=1000
Autostart=true
Disabled=false
Version=2
ImportId=kde32b1
ImportId=trinity2b1

4
khotkeys/data/khotkeys_32b1_update.upd

@ -1,8 +1,8 @@
Id=kde32b1
Id=trinity2b1
# the file is intentionally a dummy, as the binary will update khotkeysrc,
# the khotkeys_update will just remember it has been done
File=khotkeys_update
Group=Dummy
Options=overwrite
ScriptArguments=--id kde32b1
ScriptArguments=--id trinity2b1
Script=khotkeys_update

2
khotkeys/data/konqueror_gestures_kde321.khotkeys

@ -2039,4 +2039,4 @@ Type=GESTURE
[Main]
Version=2
ImportId=konqueror_gestures_kde321
ImportId=konqueror_gestures_trinity21

4
khotkeys/data/konqueror_gestures_kde321_update.upd

@ -1,8 +1,8 @@
Id=kde321
Id=trinity21
# the file is intentionally a dummy, as the binary will update khotkeysrc,
# the khotkeys_update will just remember it has been done
File=khotkeys_update
Group=Dummy
Options=overwrite
ScriptArguments=--id konqueror_gestures_kde321
ScriptArguments=--id konqueror_gestures_trinity21
Script=khotkeys_update

2
klipper/CMakeLists.txt

@ -29,7 +29,7 @@ install( FILES klipper.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES klipper.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
install( FILES klipper.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME klipperrc )
install( FILES klipperrc.upd klippershortcuts.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS klipper-1-2.pl klipper-kde31.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS klipper-1-2.pl klipper-trinity1.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
##### klipper (executable) ######################

2
klipper/Makefile.am

@ -47,5 +47,5 @@ dummy.cpp:
# update script:
updatedir = $(kde_datadir)/kconf_update
update_DATA = klipperrc.upd klippershortcuts.upd
update_SCRIPTS = klipper-1-2.pl klipper-kde31.sh
update_SCRIPTS = klipper-1-2.pl klipper-trinity1.sh

4
klipper/klipperrc.upd

@ -1,7 +1,7 @@
Id=25082001
File=klipperrc
Script=klipper-1-2.pl,perl
Id=kde3.1
Id=trinity.1
File=klipperrc
Group=General
Script=klipper-kde31.sh,sh
Script=klipper-trinity1.sh,sh

2
konsole/konsole.upd

@ -7,7 +7,7 @@ Key=schema
Key=defaultfont
Key=MenuBar
Key=scrollbar
Id=kde3.0/r1
Id=trinity.0/r1
File=konsolerc
Options=overwrite
Script=schemaStrip.pl,perl

6
kpersonalizer/kospage.cpp

@ -171,7 +171,7 @@ void KOSPage::writeKDE(){
cklipper->setGroup("General");
cklipper->writeEntry("Synchronize", false);
writeKeyEntrys(locate("keys", "kde3.kksrc"));
writeKeyEntrys(locate("keys", "trinity.kksrc"));
}
@ -311,7 +311,7 @@ void KOSPage::writeKeyEntrys(TQString keyfile){
// load the given .kksrc - file
KSimpleConfig* scheme = new KSimpleConfig(keyfile, true);
// load the default .kksrc - file
KSimpleConfig* defScheme = new KSimpleConfig(locate("keys", "kde3.kksrc"), true);
KSimpleConfig* defScheme = new KSimpleConfig(locate("keys", "trinity.kksrc"), true);
// we need the entries from the default - file, so we can compare with them
TQMap<TQString, TQString> defMap = defScheme->entryMap("Global Shortcuts");
@ -335,7 +335,7 @@ void KOSPage::writeKeyEntrys(TQString keyfile){
cglobal->setGroup("Shortcuts");
givenMap = scheme->entryMap("Shortcuts");
for ( TQMap<TQString, TQString>::Iterator it = givenMap.begin(); it != givenMap.end(); ++it ) {
// only write the entry, if it defers from kde3.kksrc
// only write the entry, if it defers from trinity.kksrc
if ( defMap[it.key()] != it.data() ) {
cglobal->writeEntry(it.key(), it.data(), true, true);
}

4
kpersonalizer/kstylepage.cpp

@ -390,7 +390,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){
set->windowForeground=config->readColorEntry( "windowForeground", &black );
set->windowBackground=config->readColorEntry( "windowBackground", &white );
set->selectForeground=config->readColorEntry( "selectForeground", &white );
set->selectBackground=config->readColorEntry( "selectBackground", &kde34Blue );
set->selectBackground=config->readColorEntry( "selectBackground", &trinity4Blue );
set->buttonForeground=config->readColorEntry( "buttonForeground", &black );
set->buttonBackground=config->readColorEntry( "buttonBackground", &button );
set->linkColor=config->readColorEntry( "linkColor", &link );
@ -493,7 +493,7 @@ void KStylePage::getUserDefaults() {
/** initialize KDE default color values */
void KStylePage::initColors() {
widget.setRgb(239, 239, 239);
kde34Blue.setRgb(103,141,178);
trinity4Blue.setRgb(103,141,178);
inactiveBackground.setRgb(157,170,186);
activeBackground.setRgb(65,142,220);
inactiveForeground.setRgb(221,221,221);

2
kpersonalizer/kstylepage.h

@ -71,7 +71,7 @@ private:
} usrColors, currentColors;
// first, the KDE 2 default color values
TQColor widget;
TQColor kde34Blue;
TQColor trinity4Blue;
TQColor inactiveBackground;
TQColor activeBackground;
TQColor button;

2
ksmserver/ksmserver.upd

@ -1,5 +1,5 @@
# Move session config files from $KDEHOME/share/config to $KDEHOME/share/config/session
Id=kde3
Id=trinity
File=ksmserverrc
Group=Session
Options=overwrite

2
ktip/tips

@ -631,7 +631,7 @@ You may specify print files and/or name a printer from the command line:
kprinter -d infotec \
/home/kurt/paragliding.jpg \
../kdeprint-handbook.pdf \
/opt/kde3/flyer.ps
/opt/trinity/flyer.ps
</pre>
This prints 3 different files (from different folders) to printer "infotec".
</p>

2
kwin/clients/b2/b2client.h

@ -3,7 +3,7 @@
*
* Changes:
* Customizable button positions by Karol Szwed <gallium@kde.org>
* Ported to the kde3.2 API by Luciano Montanaro <mikelima@cirulla.net>
* Ported to the trinity.2 API by Luciano Montanaro <mikelima@cirulla.net>
*/
#ifndef __B2CLIENT_H

2
kwin/clients/laptop/laptopclient.h

@ -2,7 +2,7 @@
* Laptop KWin Client
*
* Copyright (c) 2005 Sandro Giessl <sandro@giessl.com>
* Ported to the kde3.2 API by Luciano Montanaro <mikelima@cirulla.net>
* Ported to the trinity.2 API by Luciano Montanaro <mikelima@cirulla.net>
*/
#ifndef __KDECLIENT_H
#define __KDECLIENT_H

4
kwin/data/kwin.upd

@ -1,10 +1,10 @@
Id=kde3.0r1
Id=trinity.0r1
File=kwinrc
Options=overwrite
Script=pluginlibFix.pl,perl
# Xinerama fixups
Id=kde3.2Xinerama
Id=trinity.2Xinerama
File=kwinrc,kdeglobals
Group=Windows
Key=XineramaEnabled

2
kwin/data/kwin3_plugin.upd

@ -1,4 +1,4 @@
Id=kde3.2
Id=trinity.2
File=kwinrc
Options=overwrite
Script=kwin3_plugin.pl,perl

2
kwin/data/kwin_fsp_workarounds_1.upd

@ -1,4 +1,4 @@
Id=kde351
Id=trinity51
# the file is intentionally a dummy, as the binary will update kwinrulesrc,
# file kwinrules_update will just remember it has been done
File=kwinrules_update

2
kwin/data/kwinupdatewindowsettings.upd

@ -1,4 +1,4 @@
Id=kde33b1
Id=trinity3b1
# the file is intentionally a dummy, as the binary will update kwinrc and kwinrulesrc
# the kwin_update will just remember it has been done
File=kwin_update

2
libkonq/favicons/favicons.upd

@ -1,3 +1,3 @@
# Move favicons from $KDEHOME/share/icons and $KDEHOME/share/cache to $KDEHOME/cache-$HOST
Id=kde3_2
Id=trinity_2
Script=move_favicons.sh,sh

32
startkde

@ -80,10 +80,10 @@ else
if [ -d $HOME/.trinity ]; then
# OK, this one is obvious.
export KDEHOME=$HOME/.trinity
elif [ -d $HOME/.kde3 ]; then
elif [ -d $HOME/.trinity ]; then
# Looks like the user had an old version of Trinity installed at last login
echo "[startkde] Migrating old ~/.kde3 directory to new ~/.trinity name." 1>&2
mv $HOME/.kde3 $HOME/.trinity
echo "[startkde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2
mv $HOME/.trinity $HOME/.trinity
export KDEHOME=$HOME/.trinity
elif [ -f /usr/bin/kde4-config ]; then
# Looks like KDE4 is installed.
@ -117,11 +117,11 @@ if [ -z "$KDEROOTHOME" ] && [ "$UID" = "0" ]; then
fi
# Modify the following environment variables only as necessary.
if [ -d /opt/kde3/games ]; then
export PATH=/opt/kde3/games:$PATH
if [ -d /opt/trinity/games ]; then
export PATH=/opt/trinity/games:$PATH
fi
if [ -d /opt/kde3/bin ]; then
export PATH=/opt/kde3/bin:$PATH
if [ -d /opt/trinity/bin ]; then
export PATH=/opt/trinity/bin:$PATH
fi
if [ -d /opt/trinity/games ]; then
export PATH=/opt/trinity/games:$PATH
@ -129,29 +129,29 @@ fi
if [ -d /opt/trinity/bin ]; then
export PATH=/opt/trinity/bin:$PATH
fi
if [ -d /opt/kde3/share ]; then
export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde3/share/:/usr/share/
if [ -d /opt/trinity/share ]; then
export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
fi
if [ -d /opt/trinity/share ]; then
export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
fi
if [ -d /opt/kde3/etc/xdg ]; then
export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/kde3/etc/xdg/:/etc/xdg/
if [ -d /opt/trinity/etc/xdg ]; then
export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
fi
if [ -d /opt/trinity/etc/xdg ]; then
export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
fi
if [ -d /opt/kde3/share/man ]; then
export MANPATH=/opt/kde3/share/man:$MANPATH
if [ -d /opt/trinity/share/man ]; then
export MANPATH=/opt/trinity/share/man:$MANPATH
fi
if [ -d /opt/trinity/share/man ]; then
export MANPATH=/opt/trinity/share/man:$MANPATH
fi
if [ -d /opt/kde3 ]; then
if [ -d /opt/trinity ]; then
if [ -n "$KDEDIRS" ]; then
export KDEDIRS=$KDEDIRS:/opt/kde3/:/usr/
export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
else
export KDEDIRS=/opt/kde3/:/usr/
export KDEDIRS=/opt/trinity/:/usr/
fi
fi
if [ -d /opt/trinity ]; then

Loading…
Cancel
Save