2007-01-26 03:44:27 +01:00
|
|
|
$NetBSD: patch-an,v 1.11 2007/01/26 02:44:28 markd Exp $
|
2002-05-31 15:16:30 +02:00
|
|
|
|
2005-12-11 11:53:54 +01:00
|
|
|
--- kdecore/kstandarddirs.cpp.orig 2005-10-11 04:06:02.000000000 +1300
|
2002-05-31 15:16:30 +02:00
|
|
|
+++ kdecore/kstandarddirs.cpp
|
Update to KDE 3.4
Highlights at a glance
* Text-to-speech system with support built into Konqueror, Kate, KPDF
and the standalone application KSayIt
* Support for text to speech synthesis is integrated with the desktop
* Completely redesigned, more flexible trash system
* Kicker with improved look and feel
* KPDF now enables you to select, copy & paste text and images from
PDFs, along with many other improvements
* Kontact supports now various groupware servers, including eGroupware,
GroupWise, Kolab, OpenGroupware.org and SLOX
* Kopete supports Novell Groupwise and Lotus Sametime and gets
integrated into Kontact
* DBUS/HAL support allows to keep dynamic device icons in media:/ and
on the desktop in sync with the state of all devices
* KHTML has improved standard support and now close to full support for
CSS 2.1 and the CSS 3 Selectors module
* Better synchronization between 2 PCs
* A new high contrast style and a complete monochrome icon set
* An icon effect to paint all icons in two chosen colors, converting
third party application icons into high contrast monochrome icons
* Akregator allows you to read news from your favourite RSS-enabled
websites in one application
* Juk has now an album cover management via Google Image Search
* KMail now stores passwords securely with KWallet
* SVG files can now be used as wallpapers
* KHTML plug-ins are now configurable, so the user can selectively
disable ones that are not used. This does not include Netscape-style
plug-ins. Netscape plug-in in CPU usage can be manually lowered, and
plug-ins are more stable.
* more than 6,500 bugs have been fixed
* more than 1,700 wishes have been fullfilled
* more than 80,000 contributions with several million lines of code and
documentation added or changed
2005-03-23 22:28:33 +01:00
|
|
|
@@ -1018,33 +1018,33 @@ static int tokenize( QStringList& tokens
|
2002-05-31 15:16:30 +02:00
|
|
|
|
|
|
|
|
QString KStandardDirs::kde_default(const char *type) {
|
|
|
|
|
if (!strcmp(type, "data"))
|
|
|
|
|
- return "share/apps/";
|
|
|
|
|
+ return "share/kde/apps/";
|
|
|
|
|
if (!strcmp(type, "html"))
|
|
|
|
|
- return "share/doc/HTML/";
|
|
|
|
|
+ return "share/doc/kde/HTML/";
|
|
|
|
|
if (!strcmp(type, "icon"))
|
2007-01-26 03:44:27 +01:00
|
|
|
return "share/icons/";
|
2002-05-31 15:16:30 +02:00
|
|
|
if (!strcmp(type, "config"))
|
|
|
|
|
- return "share/config/";
|
|
|
|
|
+ return "share/kde/config/";
|
|
|
|
|
if (!strcmp(type, "pixmap"))
|
2005-12-30 00:41:42 +01:00
|
|
|
return "share/pixmaps/";
|
2002-05-31 15:16:30 +02:00
|
|
|
if (!strcmp(type, "apps"))
|
|
|
|
|
- return "share/applnk/";
|
|
|
|
|
+ return "share/kde/applnk/";
|
|
|
|
|
if (!strcmp(type, "sound"))
|
|
|
|
|
- return "share/sounds/";
|
|
|
|
|
+ return "share/kde/sounds/";
|
|
|
|
|
if (!strcmp(type, "locale"))
|
|
|
|
|
- return "share/locale/";
|
2004-12-11 02:19:29 +01:00
|
|
|
+ return "@PKGLOCALEDIR@/locale/";
|
2002-05-31 15:16:30 +02:00
|
|
|
if (!strcmp(type, "services"))
|
|
|
|
|
- return "share/services/";
|
|
|
|
|
+ return "share/kde/services/";
|
|
|
|
|
if (!strcmp(type, "servicetypes"))
|
|
|
|
|
- return "share/servicetypes/";
|
|
|
|
|
+ return "share/kde/servicetypes/";
|
|
|
|
|
if (!strcmp(type, "mime"))
|
|
|
|
|
- return "share/mimelnk/";
|
|
|
|
|
+ return "share/kde/mimelnk/";
|
|
|
|
|
if (!strcmp(type, "cgi"))
|
|
|
|
|
- return "cgi-bin/";
|
|
|
|
|
+ return "kde-cgi-bin/";
|
|
|
|
|
if (!strcmp(type, "wallpaper"))
|
|
|
|
|
- return "share/wallpapers/";
|
|
|
|
|
+ return "share/kde/wallpapers/";
|
|
|
|
|
if (!strcmp(type, "templates"))
|
|
|
|
|
- return "share/templates/";
|
|
|
|
|
+ return "share/kde/templates/";
|
|
|
|
|
if (!strcmp(type, "exe"))
|
|
|
|
|
return "bin/";
|
|
|
|
|
if (!strcmp(type, "lib"))
|
Update to KDE 3.4
Highlights at a glance
* Text-to-speech system with support built into Konqueror, Kate, KPDF
and the standalone application KSayIt
* Support for text to speech synthesis is integrated with the desktop
* Completely redesigned, more flexible trash system
* Kicker with improved look and feel
* KPDF now enables you to select, copy & paste text and images from
PDFs, along with many other improvements
* Kontact supports now various groupware servers, including eGroupware,
GroupWise, Kolab, OpenGroupware.org and SLOX
* Kopete supports Novell Groupwise and Lotus Sametime and gets
integrated into Kontact
* DBUS/HAL support allows to keep dynamic device icons in media:/ and
on the desktop in sync with the state of all devices
* KHTML has improved standard support and now close to full support for
CSS 2.1 and the CSS 3 Selectors module
* Better synchronization between 2 PCs
* A new high contrast style and a complete monochrome icon set
* An icon effect to paint all icons in two chosen colors, converting
third party application icons into high contrast monochrome icons
* Akregator allows you to read news from your favourite RSS-enabled
websites in one application
* Juk has now an album cover management via Google Image Search
* KMail now stores passwords securely with KWallet
* SVG files can now be used as wallpapers
* KHTML plug-ins are now configurable, so the user can selectively
disable ones that are not used. This does not include Netscape-style
plug-ins. Netscape plug-in in CPU usage can be manually lowered, and
plug-ins are more stable.
* more than 6,500 bugs have been fixed
* more than 1,700 wishes have been fullfilled
* more than 80,000 contributions with several million lines of code and
documentation added or changed
2005-03-23 22:28:33 +01:00
|
|
|
@@ -1060,9 +1060,9 @@ QString KStandardDirs::kde_default(const
|
Update to KDE-3.2.0.
Changes:
Libraries
* Hidden methods in DCOP interfaces - DCOPIDLng Alexander Kellett
* Documentation parsing (kdoc based) and inclusion in generated .dcopidl files
(note: kdebindings dcopidlng only) Alexander Kellett
* Kalyptus based rewrite of DCOPIDL - DCOPIDLng Alexander Kellett
* Thumbnail generator for DVI files. Stefan Kebekus
* Thumbnail generator for Xcursor files. Fredrik Hoeglund
* KMainWindow can now maintain the statusbar and corresponding action (duplicate
(99% of the time broken) code removed from countless applications in KDE).
Benjamin Meyer
* KMainWindow, KToolbar, and several other core classes now will only stores
settings if those settings are not the default values (helping to reduce the
huge size of config files). Benjamin Meyer
* Add support for International Domain Names (IDN). Thiago Macieira, Waldo
Bastian
* KDE Password Registry and Wallet. George Staikos
* SSL session ID reuse. George Staikos
* KCookiejar: Support HttpOnly cookies. Waldo Bastian
* KLocale: support for different calendar systems Hans Petter Bieker
* KCalendarSystem: support for Hebrew calendar system Hans Petter Bieker
* Support data urls. See rfc 2397. Leo Savernik
* New tab widget classes KTabBar and KTabWidget in kdeui Stephan Binner
* New KFile permissions panel Tim Jansen
* Support for mimetype inheritance and aliases David Faure
* KDialogBase: Replace setButtonOkText() & co. with setButtonOk() that takes a
KGuiItem instead (deprecating the old methods) Martijn Klingens
* Move KPrefs from libkdepim to kdelibs. Cornelius Schumacher
* Support for "extra fields" in KIO slaves and in Konqueror / KFileDialog
David Faure <faure@kde.org>
* Add KSplashScreen, a splash screen class based on QSplashScreen (with support
for KDE's Xinerama options) Chris Howells
* KPasteTextAction: enhanced action for pasting text by offering a list with
the clipboard history. Andras Mantia
KHTML
* Non-modal find dialog David Faure
KDEfx
* Added KCPUInfo class which makes it possible for applications to do runtime
checks for architecture specific CPU features, such MMX, 3DNow! and AltiVec.
Fredrik Hoeglund
* Added MMX and SSE2 optimizations to the blending functions in KImageEffect,
that among other things are used to blend the translucent menus when the menu
effect is set to software blend, and to tint icons when they're selected in
icon views. Fredrik Hoeglund
Kate Part
* File type specific settings Christoph Cullmann
* vi style cmd line Christoph Cullmann
* Support variable lines in files Anders Lund
* Color Schemes Christoph Cullmann
* Indentation based code folding Christoph Cullmann
* Implement more DCOP interfaces and clean up the ktexteditor dcop interfaces
Christoph Cullmann
KImgIO
* Add PCX image plugin, supports reading and writing 1, 4, 8 and 24bpp images
Nadeem Hasan
* Add TGA image plugin, supports reading and writing true color TGA images
(compressed and uncompressed) Dominik Seichter
Interfaces
* Interfaces for KBytesEdit widget part Friedrich W. H. Kossebau
KSpell
* Adding ability to spell check HTML, TeX and nroff documents. Zack Rusin
* Completely reworking the spell checking dialog. Adding language selection
combo. Zack Rusin
2004-02-04 14:58:39 +01:00
|
|
|
if (!strcmp(type, "xdgconf-menu"))
|
|
|
|
|
return "menus/";
|
|
|
|
|
if (!strcmp(type, "kcfg"))
|
|
|
|
|
- return "share/config.kcfg";
|
|
|
|
|
+ return "share/kde/config.kcfg";
|
Update to KDE 3.4
Highlights at a glance
* Text-to-speech system with support built into Konqueror, Kate, KPDF
and the standalone application KSayIt
* Support for text to speech synthesis is integrated with the desktop
* Completely redesigned, more flexible trash system
* Kicker with improved look and feel
* KPDF now enables you to select, copy & paste text and images from
PDFs, along with many other improvements
* Kontact supports now various groupware servers, including eGroupware,
GroupWise, Kolab, OpenGroupware.org and SLOX
* Kopete supports Novell Groupwise and Lotus Sametime and gets
integrated into Kontact
* DBUS/HAL support allows to keep dynamic device icons in media:/ and
on the desktop in sync with the state of all devices
* KHTML has improved standard support and now close to full support for
CSS 2.1 and the CSS 3 Selectors module
* Better synchronization between 2 PCs
* A new high contrast style and a complete monochrome icon set
* An icon effect to paint all icons in two chosen colors, converting
third party application icons into high contrast monochrome icons
* Akregator allows you to read news from your favourite RSS-enabled
websites in one application
* Juk has now an album cover management via Google Image Search
* KMail now stores passwords securely with KWallet
* SVG files can now be used as wallpapers
* KHTML plug-ins are now configurable, so the user can selectively
disable ones that are not used. This does not include Netscape-style
plug-ins. Netscape plug-in in CPU usage can be manually lowered, and
plug-ins are more stable.
* more than 6,500 bugs have been fixed
* more than 1,700 wishes have been fullfilled
* more than 80,000 contributions with several million lines of code and
documentation added or changed
2005-03-23 22:28:33 +01:00
|
|
|
if (!strcmp(type, "emoticons"))
|
|
|
|
|
- return "share/emoticons";
|
|
|
|
|
+ return "share/kde/emoticons";
|
|
|
|
|
|
|
|
|
|
|
Update to KDE-3.2.0.
Changes:
Libraries
* Hidden methods in DCOP interfaces - DCOPIDLng Alexander Kellett
* Documentation parsing (kdoc based) and inclusion in generated .dcopidl files
(note: kdebindings dcopidlng only) Alexander Kellett
* Kalyptus based rewrite of DCOPIDL - DCOPIDLng Alexander Kellett
* Thumbnail generator for DVI files. Stefan Kebekus
* Thumbnail generator for Xcursor files. Fredrik Hoeglund
* KMainWindow can now maintain the statusbar and corresponding action (duplicate
(99% of the time broken) code removed from countless applications in KDE).
Benjamin Meyer
* KMainWindow, KToolbar, and several other core classes now will only stores
settings if those settings are not the default values (helping to reduce the
huge size of config files). Benjamin Meyer
* Add support for International Domain Names (IDN). Thiago Macieira, Waldo
Bastian
* KDE Password Registry and Wallet. George Staikos
* SSL session ID reuse. George Staikos
* KCookiejar: Support HttpOnly cookies. Waldo Bastian
* KLocale: support for different calendar systems Hans Petter Bieker
* KCalendarSystem: support for Hebrew calendar system Hans Petter Bieker
* Support data urls. See rfc 2397. Leo Savernik
* New tab widget classes KTabBar and KTabWidget in kdeui Stephan Binner
* New KFile permissions panel Tim Jansen
* Support for mimetype inheritance and aliases David Faure
* KDialogBase: Replace setButtonOkText() & co. with setButtonOk() that takes a
KGuiItem instead (deprecating the old methods) Martijn Klingens
* Move KPrefs from libkdepim to kdelibs. Cornelius Schumacher
* Support for "extra fields" in KIO slaves and in Konqueror / KFileDialog
David Faure <faure@kde.org>
* Add KSplashScreen, a splash screen class based on QSplashScreen (with support
for KDE's Xinerama options) Chris Howells
* KPasteTextAction: enhanced action for pasting text by offering a list with
the clipboard history. Andras Mantia
KHTML
* Non-modal find dialog David Faure
KDEfx
* Added KCPUInfo class which makes it possible for applications to do runtime
checks for architecture specific CPU features, such MMX, 3DNow! and AltiVec.
Fredrik Hoeglund
* Added MMX and SSE2 optimizations to the blending functions in KImageEffect,
that among other things are used to blend the translucent menus when the menu
effect is set to software blend, and to tint icons when they're selected in
icon views. Fredrik Hoeglund
Kate Part
* File type specific settings Christoph Cullmann
* vi style cmd line Christoph Cullmann
* Support variable lines in files Anders Lund
* Color Schemes Christoph Cullmann
* Indentation based code folding Christoph Cullmann
* Implement more DCOP interfaces and clean up the ktexteditor dcop interfaces
Christoph Cullmann
KImgIO
* Add PCX image plugin, supports reading and writing 1, 4, 8 and 24bpp images
Nadeem Hasan
* Add TGA image plugin, supports reading and writing true color TGA images
(compressed and uncompressed) Dominik Seichter
Interfaces
* Interfaces for KBytesEdit widget part Friedrich W. H. Kossebau
KSpell
* Adding ability to spell check HTML, TeX and nroff documents. Zack Rusin
* Completely reworking the spell checking dialog. Adding language selection
combo. Zack Rusin
2004-02-04 14:58:39 +01:00
|
|
|
qFatal("unknown resource type %s", type);
|
2005-12-11 11:53:54 +01:00
|
|
|
@@ -1386,6 +1386,7 @@ void KStandardDirs::addKDEDefaults()
|
Update to KDE-3.2.0.
Changes:
Libraries
* Hidden methods in DCOP interfaces - DCOPIDLng Alexander Kellett
* Documentation parsing (kdoc based) and inclusion in generated .dcopidl files
(note: kdebindings dcopidlng only) Alexander Kellett
* Kalyptus based rewrite of DCOPIDL - DCOPIDLng Alexander Kellett
* Thumbnail generator for DVI files. Stefan Kebekus
* Thumbnail generator for Xcursor files. Fredrik Hoeglund
* KMainWindow can now maintain the statusbar and corresponding action (duplicate
(99% of the time broken) code removed from countless applications in KDE).
Benjamin Meyer
* KMainWindow, KToolbar, and several other core classes now will only stores
settings if those settings are not the default values (helping to reduce the
huge size of config files). Benjamin Meyer
* Add support for International Domain Names (IDN). Thiago Macieira, Waldo
Bastian
* KDE Password Registry and Wallet. George Staikos
* SSL session ID reuse. George Staikos
* KCookiejar: Support HttpOnly cookies. Waldo Bastian
* KLocale: support for different calendar systems Hans Petter Bieker
* KCalendarSystem: support for Hebrew calendar system Hans Petter Bieker
* Support data urls. See rfc 2397. Leo Savernik
* New tab widget classes KTabBar and KTabWidget in kdeui Stephan Binner
* New KFile permissions panel Tim Jansen
* Support for mimetype inheritance and aliases David Faure
* KDialogBase: Replace setButtonOkText() & co. with setButtonOk() that takes a
KGuiItem instead (deprecating the old methods) Martijn Klingens
* Move KPrefs from libkdepim to kdelibs. Cornelius Schumacher
* Support for "extra fields" in KIO slaves and in Konqueror / KFileDialog
David Faure <faure@kde.org>
* Add KSplashScreen, a splash screen class based on QSplashScreen (with support
for KDE's Xinerama options) Chris Howells
* KPasteTextAction: enhanced action for pasting text by offering a list with
the clipboard history. Andras Mantia
KHTML
* Non-modal find dialog David Faure
KDEfx
* Added KCPUInfo class which makes it possible for applications to do runtime
checks for architecture specific CPU features, such MMX, 3DNow! and AltiVec.
Fredrik Hoeglund
* Added MMX and SSE2 optimizations to the blending functions in KImageEffect,
that among other things are used to blend the translucent menus when the menu
effect is set to software blend, and to tint icons when they're selected in
icon views. Fredrik Hoeglund
Kate Part
* File type specific settings Christoph Cullmann
* vi style cmd line Christoph Cullmann
* Support variable lines in files Anders Lund
* Color Schemes Christoph Cullmann
* Indentation based code folding Christoph Cullmann
* Implement more DCOP interfaces and clean up the ktexteditor dcop interfaces
Christoph Cullmann
KImgIO
* Add PCX image plugin, supports reading and writing 1, 4, 8 and 24bpp images
Nadeem Hasan
* Add TGA image plugin, supports reading and writing true color TGA images
(compressed and uncompressed) Dominik Seichter
Interfaces
* Interfaces for KBytesEdit widget part Friedrich W. H. Kossebau
KSpell
* Adding ability to spell check HTML, TeX and nroff documents. Zack Rusin
* Completely reworking the spell checking dialog. Adding language selection
combo. Zack Rusin
2004-02-04 14:58:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xdgdirList.append("/usr/local/share/");
|
|
|
|
|
+ xdgdirList.append(KDEDIR "/share/");
|
|
|
|
|
xdgdirList.append("/usr/share/");
|
|
|
|
|
}
|
|
|
|
|
|
2005-12-11 11:53:54 +01:00
|
|
|
@@ -1560,7 +1561,7 @@ bool KStandardDirs::addCustomized(KConfi
|
|
|
|
|
for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
|
Update to KDE 3.4
Highlights at a glance
* Text-to-speech system with support built into Konqueror, Kate, KPDF
and the standalone application KSayIt
* Support for text to speech synthesis is integrated with the desktop
* Completely redesigned, more flexible trash system
* Kicker with improved look and feel
* KPDF now enables you to select, copy & paste text and images from
PDFs, along with many other improvements
* Kontact supports now various groupware servers, including eGroupware,
GroupWise, Kolab, OpenGroupware.org and SLOX
* Kopete supports Novell Groupwise and Lotus Sametime and gets
integrated into Kontact
* DBUS/HAL support allows to keep dynamic device icons in media:/ and
on the desktop in sync with the state of all devices
* KHTML has improved standard support and now close to full support for
CSS 2.1 and the CSS 3 Selectors module
* Better synchronization between 2 PCs
* A new high contrast style and a complete monochrome icon set
* An icon effect to paint all icons in two chosen colors, converting
third party application icons into high contrast monochrome icons
* Akregator allows you to read news from your favourite RSS-enabled
websites in one application
* Juk has now an album cover management via Google Image Search
* KMail now stores passwords securely with KWallet
* SVG files can now be used as wallpapers
* KHTML plug-ins are now configurable, so the user can selectively
disable ones that are not used. This does not include Netscape-style
plug-ins. Netscape plug-in in CPU usage can be manually lowered, and
plug-ins are more stable.
* more than 6,500 bugs have been fixed
* more than 1,700 wishes have been fullfilled
* more than 80,000 contributions with several million lines of code and
documentation added or changed
2005-03-23 22:28:33 +01:00
|
|
|
{
|
|
|
|
|
addPrefix(*it, priority);
|
|
|
|
|
- addXdgConfigPrefix(*it+"/etc/xdg", priority);
|
|
|
|
|
+ addXdgConfigPrefix(*it+"/xdg", priority);
|
|
|
|
|
addXdgDataPrefix(*it+"/share", priority);
|
|
|
|
|
}
|
|
|
|
|
// If there are no prefixes defined, check if there is a directory
|
2005-12-11 11:53:54 +01:00
|
|
|
@@ -1569,7 +1570,7 @@ bool KStandardDirs::addCustomized(KConfi
|
Update to KDE 3.4
Highlights at a glance
* Text-to-speech system with support built into Konqueror, Kate, KPDF
and the standalone application KSayIt
* Support for text to speech synthesis is integrated with the desktop
* Completely redesigned, more flexible trash system
* Kicker with improved look and feel
* KPDF now enables you to select, copy & paste text and images from
PDFs, along with many other improvements
* Kontact supports now various groupware servers, including eGroupware,
GroupWise, Kolab, OpenGroupware.org and SLOX
* Kopete supports Novell Groupwise and Lotus Sametime and gets
integrated into Kontact
* DBUS/HAL support allows to keep dynamic device icons in media:/ and
on the desktop in sync with the state of all devices
* KHTML has improved standard support and now close to full support for
CSS 2.1 and the CSS 3 Selectors module
* Better synchronization between 2 PCs
* A new high contrast style and a complete monochrome icon set
* An icon effect to paint all icons in two chosen colors, converting
third party application icons into high contrast monochrome icons
* Akregator allows you to read news from your favourite RSS-enabled
websites in one application
* Juk has now an album cover management via Google Image Search
* KMail now stores passwords securely with KWallet
* SVG files can now be used as wallpapers
* KHTML plug-ins are now configurable, so the user can selectively
disable ones that are not used. This does not include Netscape-style
plug-ins. Netscape plug-in in CPU usage can be manually lowered, and
plug-ins are more stable.
* more than 6,500 bugs have been fixed
* more than 1,700 wishes have been fullfilled
* more than 80,000 contributions with several million lines of code and
documentation added or changed
2005-03-23 22:28:33 +01:00
|
|
|
{
|
|
|
|
|
QString dir = profileDirsPrefix + profile;
|
|
|
|
|
addPrefix(dir, priority);
|
|
|
|
|
- addXdgConfigPrefix(dir+"/etc/xdg", priority);
|
|
|
|
|
+ addXdgConfigPrefix(dir+"/xdg", priority);
|
|
|
|
|
addXdgDataPrefix(dir+"/share", priority);
|
|
|
|
|
}
|
2005-03-06 13:48:09 +01:00
|
|
|
|
