TDE
/
kmymoney
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmymoney
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 416b853408
commit 52226ceb7d
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
ChangeLog
Unescape View File

@ -8680,7 +8680,7 @@
* Adding institution in the account dialog now works. * Adding institution in the account dialog now works.
* The edit account dialog now loads nearly all the 'fields' * The edit account dialog now loads nearly all the 'fields'
properly. properly.
* Integrated the date input widget changes from the 0-4-kde3-branch. * Integrated the date input widget changes from the 0-4-trinity-branch.
2002-06-06 Michael Edwardes <mte@users.sourceforge.net> 2002-06-06 Michael Edwardes <mte@users.sourceforge.net>
* Selecting the four root accounts in the parent account widget * Selecting the four root accounts in the parent account widget

2
README
Unescape View File

@ -50,7 +50,7 @@ from.
2) Run configure to tell the project about your local environment 2) Run configure to tell the project about your local environment
./configure --with-qt-dir=[your location of qt3] \ ./configure --with-qt-dir=[your location of qt3] \
--prefix=[your location of kde3] --prefix=[your location of trinity]
Debian/Ubuntu/Kubuntu/... users have to prepend the call to Debian/Ubuntu/Kubuntu/... users have to prepend the call to
configure with a variable setting to be able to view the online configure with a variable setting to be able to view the online

40
acinclude.m4
Unescape View File

@ -479,14 +479,14 @@ if test "$1" = "default"; then
if test "$kde_qtver" = "2"; then if test "$kde_qtver" = "2"; then
kde_moduledir='\${libdir}/kde2' kde_moduledir='\${libdir}/kde2'
else else
kde_moduledir='\${libdir}/kde3' kde_moduledir='\${libdir}/trinity'
fi fi
fi fi
if test -z "$kde_styledir"; then if test -z "$kde_styledir"; then
kde_styledir='\${libdir}/kde3/plugins/styles' kde_styledir='\${libdir}/trinity/plugins/styles'
fi fi
if test -z "$kde_widgetdir"; then if test -z "$kde_widgetdir"; then
kde_widgetdir='\${libdir}/kde3/plugins/designer' kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi fi
if test -z "$xdg_appsdir"; then if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications/kde' xdg_appsdir='\${datadir}/applications/kde'
@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[ [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$KDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
kde32ornewer=1 trinity2ornewer=1
kde33ornewer=1 trinity3ornewer=1
if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
kde32ornewer= trinity2ornewer=
kde33ornewer= trinity3ornewer=
else else
if test "$kde_qtver" = "3"; then if test "$kde_qtver" = "3"; then
if test "$kde_qtsubver" -le 1; then if test "$kde_qtsubver" -le 1; then
kde32ornewer= trinity2ornewer=
fi fi
if test "$kde_qtsubver" -le 2; then if test "$kde_qtsubver" -le 2; then
kde33ornewer= trinity3ornewer=
fi fi
if test "$KDECONFIG" != "compiled"; then if test "$KDECONFIG" != "compiled"; then
if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
kde33ornewer= trinity3ornewer=
fi fi
fi fi
fi fi
fi fi
if test -n "$kde32ornewer"; then if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$kde33ornewer"; then if test -n "$trinity3ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share `kde-config --prefix`/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share `kde-config --prefix`/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
DCOP_DEPENDENCIES='$(DCOPIDL)' DCOP_DEPENDENCIES='$(DCOPIDL)'
if test -n "$kde32ornewer"; then if test -n "$trinity2ornewer"; then
KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
AC_SUBST(KCONFIG_COMPILER) AC_SUBST(KCONFIG_COMPILER)
@ -1793,7 +1793,7 @@ fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@ -1805,7 +1805,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@ -1813,7 +1813,7 @@ ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO kde_widgetdir=NO
dnl this might be somewhere else dnl this might be somewhere else
AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
@ -1821,14 +1821,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs]) by kdelibs])
fi fi
if test -n "$kde_widgetdir"; then if test -n "$kde_widgetdir"; then
kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
fi fi

2
contrib/splitup-kde-chunk-online
Unescape View File

@ -2,7 +2,7 @@
# #
# split up an HTML file generated with e.g. # split up an HTML file generated with e.g.
# #
# /opt/kde3/bin/meinproc --check \ # /opt/trinity/bin/meinproc --check \
# --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-chunk-online.xsl \ # --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-chunk-online.xsl \
# $(srcdir)/index.docbook -o index.xml; # $(srcdir)/index.docbook -o index.xml;
# #

2
developer-doc/phb/rel-mgmt.docbook
Unescape View File

@ -177,7 +177,7 @@ Before doing this, check that all desktop files conform to the freedesktop speci
<programlisting> <programlisting>
<prompt>thb: ~&gt; </prompt><userinput>find ./kmymoney2 -name '*.desktop' -exec desktop-file-validate {} \;</userinput> <prompt>thb: ~&gt; </prompt><userinput>find ./kmymoney2 -name '*.desktop' -exec desktop-file-validate {} \;</userinput>
</programlisting> </programlisting>
N.B. Any errors in file x-kmymoney2.desktop can be ignored since kde3 does not conform to the specification for this file type. N.B. Any errors in file x-kmymoney2.desktop can be ignored since trinity does not conform to the specification for this file type.
</para> </para>
<para> <para>
Note: desktop-file-validate is part of the desktop-file-utils package, which may be installed from your distribution repository, or downloaded from Note: desktop-file-validate is part of the desktop-file-utils package, which may be installed from your distribution repository, or downloaded from

8
developer-doc/phb/rpm-example.docbook
Unescape View File

@ -30,7 +30,7 @@ This appendix contains an example of an RPM SPEC file.
%if %is_suse %if %is_suse
%define dist suse %define dist suse
%define disttag suse %define disttag suse
%define kde_path /opt/kde3 %define kde_path /opt/trinity
%endif %endif
%if %is_fedora %if %is_fedora
%define dist fedora %define dist fedora
@ -209,14 +209,14 @@ ln -s ../common common
# %_datadir/apps/kmm_kbanking/*rc # %_datadir/apps/kmm_kbanking/*rc
# plugin related files # plugin related files
# %kde_path/%_lib/kde3/*.so # %kde_path/%_lib/trinity/*.so
%files ofx %files ofx
%_datadir/services/kmm_ofximport.desktop %_datadir/services/kmm_ofximport.desktop
%kde_path/%_lib/kde3/kmm_ofximport.so %kde_path/%_lib/trinity/kmm_ofximport.so
%files devel %files devel
@ -224,7 +224,7 @@ ln -s ../common common
%kde_path/%_lib/*.la %kde_path/%_lib/*.la
# plugin related files # plugin related files
%kde_path/%_lib/kde3/*.la %kde_path/%_lib/trinity/*.la
%changelog %changelog
* Mon May 26 2005 - ipwizard (at) users.sourceforge.net * Mon May 26 2005 - ipwizard (at) users.sourceforge.net

2
developer-doc/phb/translation.docbook
Unescape View File

@ -180,7 +180,7 @@ Now run as root the command
The mo file is the language file you need for your program. You just need The mo file is the language file you need for your program. You just need
to replace the original mo file of &app; with this one (perform a backup of to replace the original mo file of &app; with this one (perform a backup of
the original file before). The location of your mo file depends on your the original file before). The location of your mo file depends on your
distro, for SuSE it is <filename>/opt/kde3/share/local/lang/LC_MESSAGES</filename> and for Debian distro, for SuSE it is <filename>/opt/trinity/share/local/lang/LC_MESSAGES</filename> and for Debian
<filename>/usr/share/local/lang/LC_MESSAGES</filename>. For lang you can use <filename>/usr/share/local/lang/LC_MESSAGES</filename>. For lang you can use
any string, like de or even de_test if you want to run it with a test any string, like de or even de_test if you want to run it with a test
language. Be aware that &app; uses some text strings from KDE and since they language. Be aware that &app; uses some text strings from KDE and since they

2
kmymoney2/widgets/kmymoneyedit.cpp
Unescape View File

@ -170,7 +170,7 @@ kMyMoneyEdit::kMyMoneyEdit(const MyMoneySecurity& sec, TQWidget *parent, const c
init(); init();
} }
// converted image from kde3.5.1/share/apps/kdevdesignerpart/pics/designer_resetproperty.png // converted image from trinity.5.1/share/apps/kdevdesignerpart/pics/designer_resetproperty.png
static const uchar resetButtonImage[] = { static const uchar resetButtonImage[] = {
0x89,0x50,0x4E,0x47,0x0D,0x0A,0x1A,0x0A, 0x89,0x50,0x4E,0x47,0x0D,0x0A,0x1A,0x0A,
0x00,0x00,0x00,0x0D,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x0D,0x49,0x48,0x44,0x52,

Write Preview
Loading…
Cancel
Save