Make kdelibs support X-TDE-* in XDG desktop files

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1245191 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 17ee5ab476
commit 99739b6114

@ -27,7 +27,7 @@
KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal ) KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal )
:KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::tqfromLatin1("KDE"), :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::tqfromLatin1("TDE"),
KDialogBase::Help|KDialogBase::Close, KDialogBase::Close, KDialogBase::Help|KDialogBase::Close, KDialogBase::Close,
parent, name, modal ) parent, name, modal )
{ {

@ -708,7 +708,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
{ {
// compat mode: assume KIO if not set and it's a KDE app // compat mode: assume KIO if not set and it's a KDE app
TQStringList categories = _service.property("Categories").toStringList(); TQStringList categories = _service.property("Categories").toStringList();
if ( categories.tqfind("KDE") != categories.end() ) if (( categories.tqfind("TDE") != categories.end() ) && ( categories.tqfind("KDE") != categories.end() ))
supportedProtocols.append( "KIO" ); supportedProtocols.append( "KIO" );
else { // if no KDE app, be a bit over-generic else { // if no KDE app, be a bit over-generic
supportedProtocols.append( "http"); supportedProtocols.append( "http");

@ -733,7 +733,7 @@ bool KService::noDisplay() const {
{ {
TQString aValue = it.data().toString(); TQString aValue = it.data().toString();
TQStringList aList = TQStringList::split(';', aValue); TQStringList aList = TQStringList::split(';', aValue);
if (!aList.tqcontains("KDE")) if ((!aList.tqcontains("TDE")) && (!aList.tqcontains("KDE")))
return true; return true;
} }
@ -742,7 +742,7 @@ bool KService::noDisplay() const {
{ {
TQString aValue = it.data().toString(); TQString aValue = it.data().toString();
TQStringList aList = TQStringList::split(';', aValue); TQStringList aList = TQStringList::split(';', aValue);
if (aList.tqcontains("KDE")) if ((aList.tqcontains("TDE")) && (aList.tqcontains("KDE")))
return true; return true;
} }

@ -84,12 +84,12 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp
TQStringList tmpList; TQStringList tmpList;
if (config.hasKey("OnlyShowIn")) if (config.hasKey("OnlyShowIn"))
{ {
if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE")) if ((!config.readListEntry("OnlyShowIn", ';').tqcontains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE")))
d->m_bNoDisplay = true; d->m_bNoDisplay = true;
} }
if (config.hasKey("NotShowIn")) if (config.hasKey("NotShowIn"))
{ {
if (config.readListEntry("NotShowIn", ';').tqcontains("KDE")) if ((config.readListEntry("NotShowIn", ';').tqcontains("TDE")) && (config.readListEntry("NotShowIn", ';').tqcontains("KDE")))
d->m_bNoDisplay = true; d->m_bNoDisplay = true;
} }

@ -94,7 +94,7 @@ void KSSLKeyGen::slotGenerate() {
return; return;
} }
KProgressDialog *kpd = new KProgressDialog(this, "progress dialog", i18n("KDE"), i18n("Please wait while the encryption keys are generated...")); KProgressDialog *kpd = new KProgressDialog(this, "progress dialog", i18n("TDE"), i18n("Please wait while the encryption keys are generated..."));
kpd->progressBar()->setProgress(0); kpd->progressBar()->setProgress(0);
kpd->show(); kpd->show();
// FIXME - progress dialog won't show this way // FIXME - progress dialog won't show this way

@ -1378,10 +1378,10 @@ UIServer* UIServer::createInstance()
extern "C" KDE_EXPORT int kdemain(int argc, char **argv) extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{ {
KLocale::setMainCatalogue("kdelibs"); KLocale::setMainCatalogue("kdelibs");
// GS 5/2001 - I changed the name to "KDE" to make it look better // GS 5/2001 - I changed the name to "TDE" to make it look better
// in the titles of dialogs which are displayed. // in the titles of dialogs which are displayed.
KAboutData aboutdata("kio_uiserver", I18N_NOOP("KDE"), KAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
"0.8", I18N_NOOP("KDE Progress Information UI Server"), "0.8", I18N_NOOP("TDE Progress Information UI Server"),
KAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss"); KAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
// Who's the maintainer ? :) // Who's the maintainer ? :)
aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org"); aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org");

Loading…
Cancel
Save