From a09a81226625ca200f8cbd24e702e21dc81b1291 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 22 Oct 2014 01:27:30 -0500 Subject: Bring most mimetypes in line with XDG specifications. The following are not fully verified in source as of this commit due to ubiquity: html, empty, info, make, man, misc, source, unknown --- kdvi/kdvi_multipage.cpp | 2 +- kghostview/kgvconfigdialog.cpp | 2 +- kmrml/kmrml/mrml-servicemenu.desktop | 2 +- kmrml/kmrml/mrml.desktop | 2 +- kmrml/kmrml/mrml.protocol | 2 +- kooka/kookaview.cpp | 2 +- kpdf/conf/preferencesdialog.cpp | 2 +- kpdf/part.cpp | 2 +- kpdf/ui/pageview.cpp | 2 +- kpovmodeler/pmshell.cpp | 2 +- kruler/klineal.cpp | 4 ++-- ksvg/plugin/ksvg_plugin.cpp | 6 +++--- ksvg/plugin/ksvgplugin.desktop | 2 +- kview/kimageviewer/kimageviewer.desktop | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp index a9b26fde..baea1809 100644 --- a/kdvi/kdvi_multipage.cpp +++ b/kdvi/kdvi_multipage.cpp @@ -206,7 +206,7 @@ void KDVIMultiPage::addConfigDialogs(TDEConfigDialog* configDialog) optionDialogSpecialWidget* specialConfigWidget = new optionDialogSpecialWidget(scrollView()); configDialog->addPage(fontConfigWidget, Prefs::self(), i18n("TeX Fonts"), "fonts"); - configDialog->addPage(specialConfigWidget, Prefs::self(), i18n("DVI Specials"), "dvi"); + configDialog->addPage(specialConfigWidget, Prefs::self(), i18n("DVI Specials"), "application-x-lyx"); configDialog->setHelp("preferences", "kdvi"); } diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp index 887c4811..d76a7343 100644 --- a/kghostview/kgvconfigdialog.cpp +++ b/kghostview/kgvconfigdialog.cpp @@ -142,7 +142,7 @@ void ConfigDialog::showSettings( KGVPart* main ) { dialog->addPage( new GeneralSettingsWidget( 0, "general-settings" ), i18n( "General" ), TQString::fromLatin1( "kghostview" ) ); GSSettingsWidget *gssw = new GSSettingsWidget( 0, "gs-settings" ); - dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::fromLatin1( "pdf" ) ); + dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::fromLatin1( "application-pdf" ) ); gssw->setDetectedVersion(Configuration::version()); diff --git a/kmrml/kmrml/mrml-servicemenu.desktop b/kmrml/kmrml/mrml-servicemenu.desktop index 0c3100da..ee0bdd62 100644 --- a/kmrml/kmrml/mrml-servicemenu.desktop +++ b/kmrml/kmrml/mrml-servicemenu.desktop @@ -63,5 +63,5 @@ Name[zh_CN]=搜索类似图像... Name[zh_HK]=尋找類似的圖像... Name[zh_TW]=尋找類似的影像... Name[zu]=Sesha ukuthola Izithombe Ezifanayo.... -Icon=image +Icon=image-x-generic Exec=mrmlsearch %U diff --git a/kmrml/kmrml/mrml.desktop b/kmrml/kmrml/mrml.desktop index 4c50ce28..457070dd 100644 --- a/kmrml/kmrml/mrml.desktop +++ b/kmrml/kmrml/mrml.desktop @@ -53,7 +53,7 @@ Comment[zh_CN]=多媒体检索标记语言文档 Comment[zh_HK]=多媒體取得標記語言文件 Comment[zh_TW]=多媒體補償標記語言文件 Comment[zu]=Ushicilelo Lwe-Multimedia Retrieval Markup Language -Icon=html +Icon=text-x-text-html Type=MimeType MimeType=text/mrml Patterns=*.mrml;*.MRML; diff --git a/kmrml/kmrml/mrml.protocol b/kmrml/kmrml/mrml.protocol index a92d9d5c..1f29350b 100644 --- a/kmrml/kmrml/mrml.protocol +++ b/kmrml/kmrml/mrml.protocol @@ -6,5 +6,5 @@ output=filesystem reading=true defaultMimetype=text/mrml determineMimetypeFromExtension=false -Icon=image +Icon=image-x-generic DocPath=tdeioslave/mrml/index.html diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 98b49ef7..f9c39d6c 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -156,7 +156,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU * Create a Kombobox that holds the last folders visible even on the preview page */ m_dockRecent = parent->createDockWidget( "Recent", - loader->loadIcon( "image", TDEIcon::Small ), + loader->loadIcon( ""image-x-generic", TDEIcon::Small ), 0L, i18n("Gallery Folders")); m_dockRecent->setDockSite(KDockWidget::DockFullSite); diff --git a/kpdf/conf/preferencesdialog.cpp b/kpdf/conf/preferencesdialog.cpp index 7a308b27..3b8de428 100644 --- a/kpdf/conf/preferencesdialog.cpp +++ b/kpdf/conf/preferencesdialog.cpp @@ -29,6 +29,6 @@ PreferencesDialog::PreferencesDialog( TQWidget * parent, TDEConfigSkeleton * ske addPage( m_general, i18n("General"), "kpdf", i18n("General Options") ); addPage( m_accessibility, i18n("Accessibility"), "access", i18n("Reading Aids") ); addPage( m_performance, i18n("Performance"), "launch", i18n("Performance Tuning") ); - addPage( m_presentation, i18n("Presentation"), "kpresenter_kpr", + addPage( m_presentation, i18n("Presentation"), "application-x-kpresenter", i18n("Options for Presentation Mode") ); } diff --git a/kpdf/part.cpp b/kpdf/part.cpp index 92e6b596..9348e7ac 100644 --- a/kpdf/part.cpp +++ b/kpdf/part.cpp @@ -294,7 +294,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, m_showProperties = new TDEAction(i18n("&Properties"), "info", 0, this, TQT_SLOT(slotShowProperties()), ac, "properties"); m_showProperties->setEnabled( false ); - m_showPresentation = new TDEAction( i18n("P&resentation"), "kpresenter_kpr", "Ctrl+Shift+P", this, TQT_SLOT(slotShowPresentation()), ac, "presentation"); + m_showPresentation = new TDEAction( i18n("P&resentation"), "application-x-kpresenter", "Ctrl+Shift+P", this, TQT_SLOT(slotShowPresentation()), ac, "presentation"); m_showPresentation->setEnabled( false ); // attach the actions of the children widgets too diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index 682c0f67..4920bcd2 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -1132,7 +1132,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e ) menu.insertItem( SmallIcon("kttsd"), i18n( "Speak Text" ), 2 ); } menu.insertTitle( i18n( "Image (%1 by %2 pixels)" ).arg( selectionRect.width() ).arg( selectionRect.height() ) ); - menu.insertItem( SmallIcon("image"), i18n( "Copy to Clipboard" ), 3 ); + menu.insertItem( SmallIcon("image-x-generic"), i18n( "Copy to Clipboard" ), 3 ); menu.insertItem( SmallIcon("document-save"), i18n( "Save to File..." ), 4 ); int choice = menu.exec( e->globalPos() ); // IMAGE operation choosen diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp index 7b96e066..07170187 100644 --- a/kpovmodeler/pmshell.cpp +++ b/kpovmodeler/pmshell.cpp @@ -208,7 +208,7 @@ PMDockWidget* PMShell::createView( const TQString& t, PMViewOptions* o, else { // unknown view type - dock = createDockWidget( name, SmallIcon( "unknown" ), 0L, + dock = createDockWidget( name, SmallIcon( "text-x-katefilelist" ), 0L, i18n( "Unknown" ), i18n( "Unknown" ) ); contents = new PMUnknownView( t, dock ); } diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp index 9bdac1ad..7041fea1 100644 --- a/kruler/klineal.cpp +++ b/kruler/klineal.cpp @@ -159,8 +159,8 @@ KLineal::KLineal(TQWidget*parent,const char* name):TDEMainWindow(parent,name){ mLenMenu->insertItem(i18n("&Tall"), this, TQT_SLOT(setTallLength()), CTRL+Key_T); mLenMenu->insertItem(i18n("&Full Screen Width"), this, TQT_SLOT(setFullLength()), CTRL+Key_F, FULLSCREENID); mMenu->insertItem(i18n("&Length"), mLenMenu); - mMenu->insertItem(SmallIcon("colorscm"), i18n("&Choose Color..."), this, TQT_SLOT(choseColor()), CTRL+Key_C); - mMenu->insertItem(SmallIcon("font"), i18n("Choose &Font..."), this, TQT_SLOT(choseFont()), Key_F); + mMenu->insertItem(SmallIcon("application-x-kcsrc"), i18n("&Choose Color..."), this, TQT_SLOT(choseColor()), CTRL+Key_C); + mMenu->insertItem(SmallIcon("font-x-generic"), i18n("Choose &Font..."), this, TQT_SLOT(choseFont()), Key_F); mMenu->insertSeparator(); mMenu->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), helpMenu()); mMenu->insertSeparator(); diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp index 5e4cb0f2..14eaa417 100644 --- a/ksvg/plugin/ksvg_plugin.cpp +++ b/ksvg/plugin/ksvg_plugin.cpp @@ -116,11 +116,11 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const ksvgd->zoomOutAction = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection()); ksvgd->zoomResetAction = new TDEAction(i18n("Zoom &Reset"), "viewmag", this, TQT_SLOT(slotZoomReset()), actionCollection(), "zoom_reset"); ksvgd->stopAnimationsAction = new TDEAction(i18n("&Stop Animations"), "process-stop", Key_Escape, this, TQT_SLOT(slotStop()), actionCollection(), "stop_anims"); - ksvgd->viewSourceAction = new TDEAction(i18n("View &Source"), "document2", Key_F6, this, TQT_SLOT(slotViewSource()), actionCollection(), "view_source"); - ksvgd->viewMemoryAction = new TDEAction(i18n("View &Memory"), "document2", Key_F7, this, TQT_SLOT(slotViewMemory()), actionCollection(), "view_memory"); + ksvgd->viewSourceAction = new TDEAction(i18n("View &Source"), "text-x-generic-template", Key_F6, this, TQT_SLOT(slotViewSource()), actionCollection(), "view_source"); + ksvgd->viewMemoryAction = new TDEAction(i18n("View &Memory"), "text-x-generic-template", Key_F7, this, TQT_SLOT(slotViewMemory()), actionCollection(), "view_memory"); ksvgd->saveToPNG = new TDEAction(i18n("Save to PNG..."), "save", 0, this, TQT_SLOT(slotSaveToPNG()), actionCollection(), "save_to_png"); // ksvgd->aboutApp = KStdAction::aboutApp(this, TQT_SLOT(slotAboutKSVG()), actionCollection());//, "KSVG"); - ksvgd->aboutApp = new TDEAction(i18n("About KSVG"), "vectorgfx", 0, this, TQT_SLOT(slotAboutKSVG()), actionCollection(), "help_about_app"); + ksvgd->aboutApp = new TDEAction(i18n("About KSVG"), "image-svg+xml", 0, this, TQT_SLOT(slotAboutKSVG()), actionCollection(), "help_about_app"); ksvgd->fontKerningAction = new TDEToggleAction(i18n("Use Font &Kerning"), "zoom-fit-best", Key_F8, this, TQT_SLOT(slotFontKerning()), actionCollection(), "font_kerning"); ksvgd->progressiveAction = new TDEToggleAction(i18n("Use &Progressive Rendering"), "", Key_F9, this, TQT_SLOT(slotProgressiveRendering()), actionCollection(), "progressive"); diff --git a/ksvg/plugin/ksvgplugin.desktop b/ksvg/plugin/ksvgplugin.desktop index 5a59f16c..e391e978 100644 --- a/ksvg/plugin/ksvgplugin.desktop +++ b/ksvg/plugin/ksvgplugin.desktop @@ -19,7 +19,7 @@ Name[ta]=KSVGசொருகுப்பொருள் Name[tr]=KSVG Eklentisi Name[xh]=Iplagi efakiweyo ye KSVG Name[zu]=Iplagi efakiweyo ye KSVG -Icon=vectorgfx +Icon=image-svg+xml MimeType=image/svg+xml;image/svg Comment=Scalable Vector Graphics Viewer Comment[ar]=عارض الرسومات الثابتة القابلة للقياس diff --git a/kview/kimageviewer/kimageviewer.desktop b/kview/kimageviewer/kimageviewer.desktop index 8abe4ca4..a6006b98 100644 --- a/kview/kimageviewer/kimageviewer.desktop +++ b/kview/kimageviewer/kimageviewer.desktop @@ -2,7 +2,7 @@ Type=ServiceType X-TDE-ServiceType=KImageViewer/Viewer X-TDE-Derived=KParts/ReadWritePart -Icon=image +Icon=image-x-generic Comment=Embeddable Image Viewer Component Comment[af]=Inlegbare Beeld Aansig Komponent Comment[ar]=مكون عارض الصور القابل للدمج -- cgit v1.2.1