From 6ed1ea98db6b1b369e7561efcc2c666b810e5446 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 8 Jun 2012 15:51:46 -0500 Subject: Update XDG information in support of bug report 892. --- kio/kfile/kfiledialog.cpp | 6 +++--- kio/kfile/kfilemetapreview.cpp | 4 ++-- kio/kfile/kopenwith.cpp | 2 +- kio/kfile/kpropertiesdialog.cpp | 30 +++++++++++++++--------------- kio/kfile/kpropertiesdialog.h | 2 +- kio/kfile/kpropsdlgplugin.desktop | 4 ++-- kio/kfile/krecentdocument.cpp | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) (limited to 'kio/kfile') diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index f84db825b..f9086cff7 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -1948,8 +1948,8 @@ void KFileDialog::updateAutoSelectExtension (void) { KMimeType::Ptr mime = KMimeType::mimeType (filter); - // first try X-KDE-NativeExtension - TQString nativeExtension = mime->property ("X-KDE-NativeExtension").toString (); + // first try X-TDE-NativeExtension + TQString nativeExtension = mime->property ("X-TDE-NativeExtension").toString (); if (nativeExtension.at (0) == '.') { d->extension = nativeExtension.lower (); @@ -1957,7 +1957,7 @@ void KFileDialog::updateAutoSelectExtension (void) << d->extension << "\'" << endl; } - // no X-KDE-NativeExtension + // no X-TDE-NativeExtension if (d->extension.isEmpty ()) { d->extension = getExtensionFromPatternList (mime->patterns ()).lower (); diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp index d5a2d4019..155e1194c 100644 --- a/kio/kfile/kfilemetapreview.cpp +++ b/kio/kfile/kfilemetapreview.cpp @@ -117,8 +117,8 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT parentMimeType = parentMimeInfo->parentMimeType(); } - // check X-KDE-Text property - TQVariant textProperty = mimeInfo->property( "X-KDE-text" ); + // check X-TDE-Text property + TQVariant textProperty = mimeInfo->property( "X-TDE-text" ); if ( textProperty.isValid() && textProperty.type() == TQVariant::Bool ) { if ( textProperty.toBool() ) diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index 2a3e7e690..8f498aa8d 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -768,7 +768,7 @@ void KOpenWithDlg::slotOK() { // Also make sure the "auto embed" setting for this mimetype is off KDesktopFile mimeDesktop( locateLocal( "mime", qServiceType + ".desktop" ) ); - mimeDesktop.writeEntry( "X-KDE-AutoEmbed", false ); + mimeDesktop.writeEntry( "X-TDE-AutoEmbed", false ); mimeDesktop.sync(); } } diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index 29537bc2b..30d6e0637 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -518,8 +518,8 @@ void KPropertiesDialog::insertPages() TQString query = TQString::fromLatin1( "('KPropsDlg/Plugin' in ServiceTypes) and " - "((not exist [X-KDE-Protocol]) or " - " ([X-KDE-Protocol] == '%1' ) )" ).arg(item->url().protocol()); + "((not exist [X-TDE-Protocol]) or " + " ([X-TDE-Protocol] == '%1' ) )" ).arg(item->url().protocol()); kdDebug( 250 ) << "trader query: " << query << endl; KTrader::OfferList offers = KTrader::self()->query( mimetype, query ); @@ -2742,8 +2742,8 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl if ( !m_sMimeStr.isEmpty() ) mimeEdit->setText( m_sMimeStr ); cbAutoEmbed->setTristate(); - if ( config.hasKey( "X-KDE-AutoEmbed" ) ) - cbAutoEmbed->setChecked( config.readBoolEntry( "X-KDE-AutoEmbed" ) ); + if ( config.hasKey( "X-TDE-AutoEmbed" ) ) + cbAutoEmbed->setChecked( config.readBoolEntry( "X-TDE-AutoEmbed" ) ); else cbAutoEmbed->setNoChange(); @@ -2804,9 +2804,9 @@ void KBindingPropsPlugin::applyChanges() commentEdit->text(), true, false, true ); // for compat config.writeEntry( "MimeType", mimeEdit->text() ); if ( cbAutoEmbed->state() == TQButton::NoChange ) - config.deleteEntry( "X-KDE-AutoEmbed", false ); + config.deleteEntry( "X-TDE-AutoEmbed", false ); else - config.writeEntry( "X-KDE-AutoEmbed", cbAutoEmbed->isChecked() ); + config.writeEntry( "X-TDE-AutoEmbed", cbAutoEmbed->isChecked() ); config.sync(); } @@ -3154,12 +3154,12 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) TQString pathStr = config.readPathEntry( "Path" ); m_terminalBool = config.readBoolEntry( "Terminal" ); m_terminalOptionStr = config.readEntry( "TerminalOptions" ); - m_suidBool = config.readBoolEntry( "X-KDE-SubstituteUID" ); - m_suidUserStr = config.readEntry( "X-KDE-Username" ); + m_suidBool = config.readBoolEntry( "X-TDE-SubstituteUID" ); + m_suidUserStr = config.readEntry( "X-TDE-Username" ); if( config.hasKey( "StartupNotify" )) m_startupBool = config.readBoolEntry( "StartupNotify", true ); else - m_startupBool = config.readBoolEntry( "X-KDE-StartupNotify", true ); + m_startupBool = config.readBoolEntry( "X-TDE-StartupNotify", true ); m_dcopServiceType = config.readEntry("X-DCOP-ServiceType").lower(); TQStringList mimeTypes = config.readListEntry( "MimeType", ';' ); @@ -3395,8 +3395,8 @@ void KDesktopPropsPlugin::applyChanges() config.writeEntry("Terminal", m_terminalBool); config.writeEntry("TerminalOptions", m_terminalOptionStr); - config.writeEntry("X-KDE-SubstituteUID", m_suidBool); - config.writeEntry("X-KDE-Username", m_suidUserStr); + config.writeEntry("X-TDE-SubstituteUID", m_suidBool); + config.writeEntry("X-TDE-Username", m_suidUserStr); config.writeEntry("StartupNotify", m_startupBool); config.writeEntry("X-DCOP-ServiceType", m_dcopServiceType); config.sync(); @@ -3734,8 +3734,8 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) swallowTitleStr = config.readEntry( "SwallowTitle" ); termBool = config.readBoolEntry( "Terminal" ); termOptionsStr = config.readEntry( "TerminalOptions" ); - suidBool = config.readBoolEntry( "X-KDE-SubstituteUID" ); - suidUserStr = config.readEntry( "X-KDE-Username" ); + suidBool = config.readBoolEntry( "X-TDE-SubstituteUID" ); + suidUserStr = config.readEntry( "X-TDE-Username" ); if ( !swallowExecStr.isNull() ) swallowExecEdit->setText( swallowExecStr ); @@ -3865,8 +3865,8 @@ void KExecPropsPlugin::applyChanges() temp += TQString::fromLatin1("--noclose "); temp = temp.stripWhiteSpace(); config.writeEntry( "TerminalOptions", temp ); - config.writeEntry( "X-KDE-SubstituteUID", suidCheck->isChecked() ); - config.writeEntry( "X-KDE-Username", suidEdit->text() ); + config.writeEntry( "X-TDE-SubstituteUID", suidCheck->isChecked() ); + config.writeEntry( "X-TDE-Username", suidEdit->text() ); } diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h index 4243bf602..91439f8cc 100644 --- a/kio/kfile/kpropertiesdialog.h +++ b/kio/kfile/kpropertiesdialog.h @@ -431,7 +431,7 @@ private: * servicetype, as well as the mimetypes for which the plugin should be created. * For instance, ServiceTypes=KPropsDlg/Plugin,text/html,application/x-mymimetype. * - * You can also include X-KDE-Protocol=file if you want that plugin + * You can also include X-TDE-Protocol=file if you want that plugin * to be loaded only for local files, for instance. */ class KIO_EXPORT KPropsDlgPlugin : public TQObject diff --git a/kio/kfile/kpropsdlgplugin.desktop b/kio/kfile/kpropsdlgplugin.desktop index b4ced80e6..f74e3895e 100644 --- a/kio/kfile/kpropsdlgplugin.desktop +++ b/kio/kfile/kpropsdlgplugin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=ServiceType -X-KDE-ServiceType=KPropsDlg/Plugin +X-TDE-ServiceType=KPropsDlg/Plugin Comment=Plugin for the Properties Dialog Comment[af]=Inprop module vir die Eienskappe Dialoog Comment[ar]=ملحق لمربع حوار خصائص @@ -83,5 +83,5 @@ Comment[zh_HK]=屬性對話盒的外掛程式 Comment[zh_TW]=屬性對話盒的外掛程式 Comment[zu]=I-plugin Yengxoxo Yezinkomba zobunini -[PropertyDef::X-KDE-Protocol] +[PropertyDef::X-TDE-Protocol] Type=TQString diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp index d691de359..7ad690be4 100644 --- a/kio/kfile/krecentdocument.cpp +++ b/kio/kfile/krecentdocument.cpp @@ -108,7 +108,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) // see if it points to the same file and application KSimpleConfig tmp(ddesktop); tmp.setDesktopGroup(); - if(tmp.readEntry(TQString::fromLatin1("X-KDE-LastOpenedWith")) + if(tmp.readEntry(TQString::fromLatin1("X-TDE-LastOpenedWith")) == desktopEntryName) { utime(TQFile::encodeName(ddesktop), NULL); @@ -140,7 +140,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") ); conf.writePathEntry( TQString::fromLatin1("URL"), openStr ); // If you change the line below, change the test in the above loop - conf.writeEntry( TQString::fromLatin1("X-KDE-LastOpenedWith"), desktopEntryName ); + conf.writeEntry( TQString::fromLatin1("X-TDE-LastOpenedWith"), desktopEntryName ); TQString name = url.fileName(); if (name.isEmpty()) name = openStr; -- cgit v1.2.1