diff options
68 files changed, 75 insertions, 75 deletions
diff --git a/applnk/compat/konqhtml.desktop b/applnk/compat/konqhtml.desktop index 16bb26dc3..2b486699c 100644 --- a/applnk/compat/konqhtml.desktop +++ b/applnk/compat/konqhtml.desktop @@ -76,7 +76,7 @@ Name[wa]=Betchteu Konqueror Name[zh_CN]=Konqueror 浏览器 Name[zh_TW]=Konqueror 網頁瀏覽器 Type=Application -Icon=fonts +Icon=font-x-generics Exec=tdecmshell tdehtml_fonts X-TDE-ModuleType=Library X-TDE-Library=konqhtml diff --git a/kappfinder/apps/Internet/Terminal/ncftp.desktop b/kappfinder/apps/Internet/Terminal/ncftp.desktop index 06f406d2a..84330d9d0 100644 --- a/kappfinder/apps/Internet/Terminal/ncftp.desktop +++ b/kappfinder/apps/Internet/Terminal/ncftp.desktop @@ -89,7 +89,7 @@ GenericName[zh_TW]=FTP 客戶端程式 GenericName[zu]=Umxhasi we-FTP MimeType= Exec=ncftp -Icon=misc +Icon=application-vnd.tde.misc Path= Type=Application Terminal=true diff --git a/kappfinder/apps/Internet/gFTP.desktop b/kappfinder/apps/Internet/gFTP.desktop index c6c81e38a..959754ff1 100644 --- a/kappfinder/apps/Internet/gFTP.desktop +++ b/kappfinder/apps/Internet/gFTP.desktop @@ -75,5 +75,5 @@ GenericName[zh_CN]=FTP 浏览器 GenericName[zh_TW]=FTP 瀏覽器 Exec=gftp Terminal=false -Icon=gftp +Icon=application-x-tex-gftp Type=Application diff --git a/kappfinder/apps/Multimedia/aviplay.desktop b/kappfinder/apps/Multimedia/aviplay.desktop index a19f9d717..451ff81e6 100644 --- a/kappfinder/apps/Multimedia/aviplay.desktop +++ b/kappfinder/apps/Multimedia/aviplay.desktop @@ -79,7 +79,7 @@ GenericName[zh_CN]=AVI 视频播放器 GenericName[zh_TW]=AVI 視訊播放程式 GenericName[zu]=Umdlali we-Vidiyo ye-AVI Exec=aviplay %f -Icon=video +Icon=video-x-generic MimeType=application/vnd.ms-asf;video/mpeg;video/quicktime;video/x-flic;video/x-msvideo Name=Aviplay Name[bn]=এ.ভি.আই-প্লে diff --git a/kappfinder/apps/Multimedia/gtv.desktop b/kappfinder/apps/Multimedia/gtv.desktop index 2a7eb0ca8..996a4449f 100644 --- a/kappfinder/apps/Multimedia/gtv.desktop +++ b/kappfinder/apps/Multimedia/gtv.desktop @@ -81,7 +81,7 @@ GenericName[zh_CN]=MPEG 播放器 GenericName[zh_TW]=MPEG 播放程式 GenericName[zu]=Umdlali we-MPEG Exec=gtv -Icon=video +Icon=video-x-generic MimeType=video/mpeg Name=GTV Name[bn]=জিটিভি diff --git a/kappfinder/apps/Multimedia/mplayer.desktop b/kappfinder/apps/Multimedia/mplayer.desktop index e08dbc8e1..e6ba04150 100644 --- a/kappfinder/apps/Multimedia/mplayer.desktop +++ b/kappfinder/apps/Multimedia/mplayer.desktop @@ -82,7 +82,7 @@ GenericName[zh_CN]=视频播放器 GenericName[zh_TW]=視像檔播放程式 GenericName[zu]=Umdlali we-Vidiyo Exec=gmplayer %U -Icon=video +Icon=video-x-generic MimeType=application/vnd.ms-asf;video/mpeg;video/quicktime;video/x-flic;video/x-msvideo Name=MPlayer Name[bn]=এম-প্লেয়ার diff --git a/kappfinder/apps/Multimedia/mtv.desktop b/kappfinder/apps/Multimedia/mtv.desktop index 116eb5c74..1509f5a9d 100644 --- a/kappfinder/apps/Multimedia/mtv.desktop +++ b/kappfinder/apps/Multimedia/mtv.desktop @@ -82,7 +82,7 @@ GenericName[zh_CN]=视频播放器 GenericName[zh_TW]=視像檔播放程式 GenericName[zu]=Umdlali we-Vidiyo Exec=mtv -Icon=video +Icon=video-x-generic Name=MpegTV Name[af]=Mpegtv Name[bn]=এমপেগ-টিভি diff --git a/kappfinder/apps/Multimedia/ogle.desktop b/kappfinder/apps/Multimedia/ogle.desktop index e50b28a1f..6fe0430da 100644 --- a/kappfinder/apps/Multimedia/ogle.desktop +++ b/kappfinder/apps/Multimedia/ogle.desktop @@ -80,7 +80,7 @@ GenericName[zh_CN]=DVD 播放器 GenericName[zh_TW]=DVD 播放器 GenericName[zu]=Umdlali we-DVD Exec=ogle %f -Icon=video +Icon=video-x-generic MimeType=inode/chardevice;inode/directory Name=Ogle Name[bn]=ওগল diff --git a/kappfinder/apps/Multimedia/oqtplayer.desktop b/kappfinder/apps/Multimedia/oqtplayer.desktop index d511da23a..64a01eec3 100644 --- a/kappfinder/apps/Multimedia/oqtplayer.desktop +++ b/kappfinder/apps/Multimedia/oqtplayer.desktop @@ -80,7 +80,7 @@ GenericName[zh_CN]=MOV 视频播放器 GenericName[zh_TW]=MOV 視訊播放程式 GenericName[zu]=Umdlali we-MOV ye-Vidiyo Exec=oqtplayer %f -Icon=video +Icon=video-x-generic MimeType=video/quicktime Name=OQTPlayer Name[de]=OQT-Abspieler diff --git a/kappfinder/apps/Multimedia/xine.desktop b/kappfinder/apps/Multimedia/xine.desktop index 3944dbeb8..e9a7a0fa5 100644 --- a/kappfinder/apps/Multimedia/xine.desktop +++ b/kappfinder/apps/Multimedia/xine.desktop @@ -82,7 +82,7 @@ GenericName[zh_CN]=视频播放器 GenericName[zh_TW]=視像檔播放程式 GenericName[zu]=Umdlali we-Vidiyo Exec=xine %f -Icon=video +Icon=video-x-generic MimeType=video/mpeg;video/quicktime;video/x-flic;video/x-msvideo;video/x-ogm;video/x-theora;video/mp4 Name=Xine Name[hi]=एक्साइन diff --git a/kappfinder/apps/Office/Applix.desktop b/kappfinder/apps/Office/Applix.desktop index e80336063..d256ec292 100644 --- a/kappfinder/apps/Office/Applix.desktop +++ b/kappfinder/apps/Office/Applix.desktop @@ -8,7 +8,7 @@ Name[pa]=ਅਪਲੀਕਸ Name[te]=ఎప్ లిక్స్ MimeType= Exec=applix -Icon=applixware +Icon=application-x-applix-wordware Path= X-DocPath= Type=Application diff --git a/kappfinder/apps/System/sam.desktop b/kappfinder/apps/System/sam.desktop index 4c03f73e7..55707f110 100644 --- a/kappfinder/apps/System/sam.desktop +++ b/kappfinder/apps/System/sam.desktop @@ -81,7 +81,7 @@ Name[zh_TW]=SAM 系統管理 Name[zu]=Ukugcinwa kwesisitimu kwe-SAM MimeType= Exec=sam -Icon=log +Icon=text-x-text-x-log Path= Type=Application Terminal=false diff --git a/kappfinder/apps/System/xosview.desktop b/kappfinder/apps/System/xosview.desktop index 81443f919..457c3d807 100644 --- a/kappfinder/apps/System/xosview.desktop +++ b/kappfinder/apps/System/xosview.desktop @@ -101,7 +101,7 @@ GenericName[zh_CN]=系统监视器 GenericName[zh_TW]=系統監視器 GenericName[zu]=I-Monitor yesistimu Exec=xosview -Icon=log +Icon=text-x-text-x-log Path= Type=Application Terminal=false diff --git a/kappfinder/apps/Utilities/SystemLogViewer.desktop b/kappfinder/apps/Utilities/SystemLogViewer.desktop index 29fdd5990..41b10ed9f 100644 --- a/kappfinder/apps/Utilities/SystemLogViewer.desktop +++ b/kappfinder/apps/Utilities/SystemLogViewer.desktop @@ -79,5 +79,5 @@ Name[zh_TW]=系統紀錄檔檢視器 Name[zu]=Umbukisi Wenqubo eqoshiwe Yesistimu Exec=logview Terminal=false -Icon=logview +Icon=text-x-text-x-logview Type=Application diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index af0617074..0bcf08883 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -209,7 +209,7 @@ void KateMainWindow::setupMainWindow () m_viewManager = new KateViewManager (this); - KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("tdemultiple"), i18n("Documents")); + KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("application-vnd.tde.tdemultiple"), i18n("Documents")); filelist = new KateFileList (this, m_viewManager, ft, "filelist"); filelist->readConfig(KateApp::self()->config(), "Filelist"); diff --git a/kcontrol/colors/colors.desktop b/kcontrol/colors/colors.desktop index 07b0f76b8..51423b62e 100644 --- a/kcontrol/colors/colors.desktop +++ b/kcontrol/colors/colors.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=tdecmshell colors -Icon=colorscm +Icon=application-x-kcsrc Type=Application X-DocPath=kcontrol/colors/index.html diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop index 3202fd35a..e97c999b5 100644 --- a/kcontrol/componentchooser/componentchooser.desktop +++ b/kcontrol/componentchooser/componentchooser.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=tdecmshell componentchooser -Icon=misc +Icon=application-vnd.tde.misc Type=Application X-TDE-Library=componentchooser X-TDE-ParentApp=kcontrol diff --git a/kcontrol/fonts/fonts.desktop b/kcontrol/fonts/fonts.desktop index 189006960..c2a48eb49 100644 --- a/kcontrol/fonts/fonts.desktop +++ b/kcontrol/fonts/fonts.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=tdecmshell fonts -Icon=fonts +Icon=font-x-generics Type=Application X-DocPath=kcontrol/fonts/index.html diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index fe0a59ee7..c75bf5fe7 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -66,7 +66,7 @@ IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name) m_previewFolder=new TQLabel(m_preview); m_previewFolder->setPixmap(DesktopIcon("folder")); m_previewDocument=new TQLabel(m_preview); - m_previewDocument->setPixmap(DesktopIcon("document")); + m_previewDocument->setPixmap(DesktopIcon("text-x-generic")); lh2->addStretch(10); lh2->addWidget(m_previewExec); diff --git a/kcontrol/konqhtml/tdehtml_fonts.desktop b/kcontrol/konqhtml/tdehtml_fonts.desktop index 06eab09ab..981ae252e 100644 --- a/kcontrol/konqhtml/tdehtml_fonts.desktop +++ b/kcontrol/konqhtml/tdehtml_fonts.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application X-DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance -Icon=fonts +Icon=font-x-generics Exec=tdecmshell tdehtml_fonts diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index ba8bb3a7e..969e377ce 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -394,7 +394,7 @@ void kthememanager::queryLNFModules() // For now use a static list TDEIconLoader * il = TDEGlobal::iconLoader(); dlg->btnBackground->setIconSet( il->loadIconSet( "background", TDEIcon::Desktop, 32 ) ); - dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", TDEIcon::Desktop, 32 ) ); + dlg->btnColors->setIconSet( il->loadIconSet( "application-x-kcsrc", TDEIcon::Desktop, 32 ) ); dlg->btnStyle->setIconSet( il->loadIconSet( "style", TDEIcon::Desktop, 32 ) ); dlg->btnIcons->setIconSet( il->loadIconSet( "icons", TDEIcon::Desktop, 32 ) ); dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", TDEIcon::Desktop, 32 ) ); diff --git a/kcontrol/tdefontinst/installfont.desktop b/kcontrol/tdefontinst/installfont.desktop index b625877bd..7302e2346 100644 --- a/kcontrol/tdefontinst/installfont.desktop +++ b/kcontrol/tdefontinst/installfont.desktop @@ -75,5 +75,5 @@ Name[vi]=Cài đặt Name[wa]=Astaler Name[zh_CN]=安装 Name[zh_TW]=安裝 -Icon=fonts +Icon=font-x-generics Exec=kfmclient copy %U fonts:/ diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index d61ea4da0..920326f0a 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -211,7 +211,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsListAct->plug(toolbar); } - itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), + itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), itsDirOp->actionCollection(), "showbitmap"); itsShowBitmapAct->setChecked(showBitmap); itsShowBitmapAct->plug(toolbar); diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp index e393e238b..559c8c4c5 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp @@ -475,7 +475,7 @@ TQDragObject *CKFileFontView::dragObject() urls.append( (*it)->url() ); if(urls.count()> 1) - pixmap = DesktopIcon("tdemultiple", TDEIcon::SizeSmall); + pixmap = DesktopIcon("application-vnd.tde.tdemultiple", TDEIcon::SizeSmall); if(pixmap.isNull()) pixmap = currentFileItem()->pixmap(TDEIcon::SizeSmall); diff --git a/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop b/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop index 44575d840..12a05bd12 100644 --- a/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop +++ b/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=tdecmshell kcmfontinst -Icon=fonts +Icon=font-x-generics Type=Application X-DocPath=kcontrol/kcmfontinst/index.html diff --git a/kcontrol/tdefontinst/tdeio/fonts.desktop b/kcontrol/tdefontinst/tdeio/fonts.desktop index ac0f592cf..0e1d8736c 100644 --- a/kcontrol/tdefontinst/tdeio/fonts.desktop +++ b/kcontrol/tdefontinst/tdeio/fonts.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Link URL=fonts:/ -Icon=fonts +Icon=font-x-generics Name=Fonts Name[af]=Skriftipes Name[ar]=المحارف diff --git a/kcontrol/tdefontinst/tdeio/fonts.protocol b/kcontrol/tdefontinst/tdeio/fonts.protocol index d7dbd9cdb..4ea9cbdef 100644 --- a/kcontrol/tdefontinst/tdeio/fonts.protocol +++ b/kcontrol/tdefontinst/tdeio/fonts.protocol @@ -12,7 +12,7 @@ moving=true linking=false copyToFile=false copyFromFile=true -Icon=fonts +Icon=font-x-generics defaultMimetype=application/octet-stream maxInstances=1 Class=:local diff --git a/kcontrol/tdefontinst/tdeio/package.desktop b/kcontrol/tdefontinst/tdeio/package.desktop index 2d2e1e4af..9b5d46824 100644 --- a/kcontrol/tdefontinst/tdeio/package.desktop +++ b/kcontrol/tdefontinst/tdeio/package.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=MimeType MimeType=fonts/package -Icon=font +Icon=font-x-generic Patterns=*.fonts.tar.gz Comment=Fonts Package Comment[af]=Skriftipes Paket diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefontinst/viewpart/tdefontview.desktop index 5d5e2b81c..51fe71080 100644 --- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop +++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop @@ -21,7 +21,7 @@ Name[vi]=Trình xem phông chữ TDE Name[wa]=Håyneu di fontes (TDEFontView) Name[zh_CN]=字体预览 Exec=tdefontview %i %u -Icon=fonts +Icon=font-x-generics X-TDE-StartupNotify=true Type=Application MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;fonts/package; diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop index 9162afb1a..c8ef46048 100644 --- a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop +++ b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop @@ -83,4 +83,4 @@ X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View X-TDE-Library=libtdefontviewpart Type=Service X-TDE-InitialPreference=1 -Icon=fonts +Icon=font-x-generics diff --git a/kdesktop/init/Templates/CDROM-Device.desktop b/kdesktop/init/Templates/CDROM-Device.desktop index b4201f447..958b602f0 100644 --- a/kdesktop/init/Templates/CDROM-Device.desktop +++ b/kdesktop/init/Templates/CDROM-Device.desktop @@ -3,8 +3,8 @@ MountPoint= Dev= ReadOnly=false Type=FSDevice -Icon=cdrom_mount -UnmountIcon=cdrom_unmount +Icon=application-x-cdrom_mount +UnmountIcon=application-x-cdrom_unmount Actions=Eject; X-TDE-Priority=TopLevel [Desktop Action Eject] diff --git a/kdesktop/init/Templates/HTMLFile.desktop b/kdesktop/init/Templates/HTMLFile.desktop index d2ebe33b0..4aa1bcc85 100644 --- a/kdesktop/init/Templates/HTMLFile.desktop +++ b/kdesktop/init/Templates/HTMLFile.desktop @@ -145,4 +145,4 @@ Comment[zh_CN]=输入 HTML 文件名： Comment[zh_TW]=輸入 HTML 檔案名稱： Type=Link URL=.source/HTMLFile.html -Icon=html +Icon=text-x-text-html diff --git a/kdesktop/init/Templates/TextFile.desktop b/kdesktop/init/Templates/TextFile.desktop index 3c371d42c..5ca080129 100644 --- a/kdesktop/init/Templates/TextFile.desktop +++ b/kdesktop/init/Templates/TextFile.desktop @@ -145,4 +145,4 @@ Comment[zh_CN]=输入文本文件名： Comment[zh_TW]=輸入純文字檔案名稱: Type=Link URL=.source/TextFile.txt -Icon=txt +Icon=text-plain diff --git a/kdesktop/init/Templates/ZIP-Device.desktop b/kdesktop/init/Templates/ZIP-Device.desktop index bec34fe73..7668447a6 100644 --- a/kdesktop/init/Templates/ZIP-Device.desktop +++ b/kdesktop/init/Templates/ZIP-Device.desktop @@ -3,8 +3,8 @@ MountPoint= Dev= ReadOnly=false Type=FSDevice -Icon=zip_mount -UnmountIcon=zip_unmount +Icon=application-vnd.tde.overlay.zip_mount +UnmountIcon=application-vnd.tde.overlay.zip_unmount Actions=Eject; X-TDE-Priority=TopLevel [Desktop Action Eject] diff --git a/kdesktop/init/Templates/linkCDROM.desktop b/kdesktop/init/Templates/linkCDROM.desktop index b895fe79b..e933c7776 100644 --- a/kdesktop/init/Templates/linkCDROM.desktop +++ b/kdesktop/init/Templates/linkCDROM.desktop @@ -147,4 +147,4 @@ Comment[zh_CN]=新建 CD-ROM 设备 Comment[zh_TW]=新光碟機設備 Type=Link URL=.source/CDROM-Device.desktop -Icon=cdrom_unmount +Icon=application-x-cdrom_unmount diff --git a/kdesktop/init/Templates/linkZIP.desktop b/kdesktop/init/Templates/linkZIP.desktop index 9ef9eaee9..d7844bc08 100644 --- a/kdesktop/init/Templates/linkZIP.desktop +++ b/kdesktop/init/Templates/linkZIP.desktop @@ -147,4 +147,4 @@ Comment[zh_CN]=新建 ZIP 设备 Comment[zh_TW]=新 ZIP 設備 Type=Link URL=.source/ZIP-Device.desktop -Icon=zip_unmount +Icon=application-vnd.tde.overlay.zip_unmount diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp index e2feedcee..c0491a181 100644 --- a/khelpcenter/docentry.cpp +++ b/khelpcenter/docentry.cpp @@ -69,7 +69,7 @@ TQString DocEntry::icon() const if ( !docExists() ) return "unknown"; if ( isDirectory() ) return "contents2"; - else return "document2"; + else return "text-x-generic-template"; } void DocEntry::setUrl( const TQString &url ) diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 22f530a1f..9590ea54d 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -250,7 +250,7 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem // First parameter is ignored if second is an absolute path KURL url(KURL("help:/"), docPath); TQString icon = KProtocolInfo::icon(*it); - if ( icon.isEmpty() ) icon = "document2"; + if ( icon.isEmpty() ) icon = "text-x-generic-template"; DocEntry *entry = new DocEntry( *it, url.url(), icon ); NavigatorItem *item = new NavigatorItem( entry, topItem, prevItem ); prevItem = item; @@ -285,7 +285,7 @@ void Navigator::createItemFromDesktopFile( NavigatorItem *topItem, // First parameter is ignored if second is an absolute path KURL url(KURL("help:/"), docPath); TQString icon = desktopFile.readIcon(); - if ( icon.isEmpty() ) icon = "document2"; + if ( icon.isEmpty() ) icon = "text-x-generic-template"; DocEntry *entry = new DocEntry( desktopFile.readName(), url.url(), icon ); NavigatorItem *item = new NavigatorItem( entry, topItem ); item->setAutoDeleteDocEntry( true ); diff --git a/khelpcenter/plugins/Manpages/.directory b/khelpcenter/plugins/Manpages/.directory index cfdea1cfd..5aa1132e0 100644 --- a/khelpcenter/plugins/Manpages/.directory +++ b/khelpcenter/plugins/Manpages/.directory @@ -53,7 +53,7 @@ Name[zu]=Amakhasi Ezincwadi zesandla ze-UNIX DocPath=man:/ -Icon=document2 +Icon=text-x-text-x-generic2 X-DOC-Weight=500 X-DOC-DocumentType=text/man diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp index 87a6861e4..f96ab3f5d 100644 --- a/khelpcenter/scrollkeepertreebuilder.cpp +++ b/khelpcenter/scrollkeepertreebuilder.cpp @@ -156,7 +156,7 @@ int ScrollKeeperTreeBuilder::insertSection( NavigatorItem *parent, void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent, const TQDomNode &docNode ) { - DocEntry *entry = new DocEntry( "", "", "document2" ); + DocEntry *entry = new DocEntry( "", "", "text-x-generic-template" ); NavigatorItem *docItem = new NavigatorItem( entry, parent ); docItem->setAutoDeleteDocEntry( true ); mItems.append( docItem ); diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp index 19bcb01c0..abd8019fe 100644 --- a/khelpcenter/toc.cpp +++ b/khelpcenter/toc.cpp @@ -255,7 +255,7 @@ TOCSectionItem::TOCSectionItem( TOC *toc, TOCChapterItem *parent, TQListViewItem : TOCItem( toc, parent, after, title ), m_name( name ) { - setPixmap( 0, SmallIcon( "document" ) ); + setPixmap( 0, SmallIcon( "text-x-generic" ) ); entry()->setUrl(url()); } diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 2a25830e9..aa0c1faf2 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -547,7 +547,7 @@ void PanelBrowserMenu::initIconMap() _icons->insert("kdisknav", SmallIcon("kdisknav")); _icons->insert("kfm", SmallIcon("kfm")); _icons->insert("terminal", SmallIcon("terminal")); - _icons->insert("txt", SmallIcon("txt")); + _icons->insert("txt", SmallIcon("text-plain")); _icons->insert("exec", SmallIcon("exec")); _icons->insert("chardevice", SmallIcon("chardevice")); } diff --git a/kicker/menuext/recentdocs/recentdocs.desktop b/kicker/menuext/recentdocs/recentdocs.desktop index 290bc8d21..034382078 100644 --- a/kicker/menuext/recentdocs/recentdocs.desktop +++ b/kicker/menuext/recentdocs/recentdocs.desktop @@ -135,6 +135,6 @@ Comment[vi]=Thực đơn chứa các tài liệu bạn mới truy cập gần đ Comment[wa]=Dressêye des documints ki vs avoz eployîz enawaire Comment[zh_CN]=您最近使用过的文档的菜单 Comment[zh_TW]=您最近使用過的文件選單 -Icon=document +Icon=text-x-text-x-generic X-TDE-Library=kickermenu_recentdocs diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 10156afe0..0fa85a1e3 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -496,7 +496,7 @@ void TOM::initialize() m_recentDocsMenu->setFont(m_largerFont); connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs())); connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int))); - insertItem(DesktopIcon("document", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu); + insertItem(DesktopIcon("text-x-generic", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu); m_submenus.append(m_recentDocsMenu); TDEPopupMenu* recentApps = new TDEPopupMenu(this, "recentApps"); diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 8f22070cf..2b3620985 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -259,7 +259,7 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget, TQListViewItem *after = 0L; // QListView's default inserting really sucks ActionListIterator it( *list ); - const TQPixmap& doc = SmallIcon( "misc" ); + const TQPixmap& doc = SmallIcon( "application-vnd.tde.misc" ); const TQPixmap& exec = SmallIcon( "exec" ); for ( action = it.current(); action; action = ++it ) { @@ -361,7 +361,7 @@ void ActionWidget::slotItemChanged( TQListViewItem *item, const TQPoint&, int co void ActionWidget::slotAddAction() { TQListViewItem *item = new TQListViewItem( listView ); - item->setPixmap( 0, SmallIcon( "misc" )); + item->setPixmap( 0, SmallIcon( "application-vnd.tde.misc" )); item->setText( 0, i18n("Click here to set the regexp")); item->setText( 1, i18n("<new action>")); } diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 75d2c995c..0f245a5c5 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -842,7 +842,7 @@ void KonqBaseListViewWidget::startDrag() { int iconSize = m_pBrowserView->m_pProps->iconSize(); iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( TDEIcon::Small ); // Default = small - pixmap2 = DesktopIcon( "tdemultiple", iconSize ); + pixmap2 = DesktopIcon( "application-vnd.tde.tdemultiple", iconSize ); if ( pixmap2.isNull() ) kdWarning(1202) << "Could not find multiple pixmap" << endl; } diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 8eefa7c34..096cd08e3 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -874,7 +874,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) if (!m_buttonPopup) { m_buttonPopup=new TDEPopupMenu(this, "Sidebar_Widget::ButtonPopup"); - m_buttonPopup->insertTitle(SmallIcon("unknown"), "", 50); + m_buttonPopup->insertTitle(SmallIcon("text-x-katefilelist"), "", 50); m_buttonPopup->insertItem(SmallIconSet("text"), i18n("Set Name..."),4); // Item to open a dialog to change the name of the sidebar item (by Pupeno) m_buttonPopup->insertItem(SmallIconSet("www"), i18n("Set URL..."),2); m_buttonPopup->insertItem(SmallIconSet("icons"), i18n("Set Icon..."),1); diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 4ba8b60ca..49c24d8d7 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -660,13 +660,13 @@ void Konsole::makeGUI() TQT_SLOT( smallerFont() ), actions, "shrink_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), - SmallIconSet( "font" ), 0, TQT_TQOBJECT(this), + SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSelectFont() ), actions, "select_font" ) ); if ( b_installBitmapFonts ) { m_fontsizes->insert( new TDEAction( i18n( "&Install Bitmap..." ), - SmallIconSet( "font" ), 0, TQT_TQOBJECT(this), + SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotInstallBitmapFonts() ), actions, "install_fonts" ) ); } diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index ffefcc03b..1c0067bb9 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -366,7 +366,7 @@ void konsolePart::makeGUI() m_fontsizes = new TDEActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L ); m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); - m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); m_fontsizes->plug(m_options); // encoding menu, start with default checked ! diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index bf371fd1a..9293ef6a0 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -203,7 +203,7 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) aliases.insert("bash", new TQString("shell")); aliases.insert("cat", new TQString("tools")); aliases.insert("egrep", new TQString("tools")); - aliases.insert("emacs", new TQString("wordprocessing")); + aliases.insert("emacs", new TQString("application-vnd.oasis.opendocument.text")); aliases.insert("fgrep", new TQString("tools")); aliases.insert("find", new TQString("tools")); aliases.insert("grep", new TQString("tools")); @@ -215,8 +215,8 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) aliases.insert("su", new TQString("tools")); aliases.insert("tcsh", new TQString("shell")); aliases.insert("tee", new TQString("tools")); - aliases.insert("vi", new TQString("wordprocessing")); - aliases.insert("vim", new TQString("wordprocessing")); + aliases.insert("vi", new TQString("application-vnd.oasis.opendocument.text")); + aliases.insert("vim", new TQString("application-vnd.oasis.opendocument.text")); } /* The filter mode is controlled by a combo box of the parent. If diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc index c15c41d89..bb1b0d6c2 100644 --- a/libkonq/kivdirectoryoverlay.cc +++ b/libkonq/kivdirectoryoverlay.cc @@ -97,7 +97,7 @@ void KIVDirectoryOverlay::slotCompleted() } if ( best * 2 < total ) { - m_bestIcon = "tdemultiple"; + m_bestIcon = "application-vnd.tde.tdemultiple"; } if (!m_bestIcon.isNull()) { diff --git a/tdeioslave/cgi/cgi.protocol b/tdeioslave/cgi/cgi.protocol index 585c22659..964d00a4a 100644 --- a/tdeioslave/cgi/cgi.protocol +++ b/tdeioslave/cgi/cgi.protocol @@ -5,4 +5,4 @@ input=none output=filesystem reading=true DocPath=tdeioslave/cgi/index.html -Icon=html +Icon=text-x-text-html diff --git a/tdeioslave/man/man.protocol b/tdeioslave/man/man.protocol index cda7f61c9..bd0b45bcd 100644 --- a/tdeioslave/man/man.protocol +++ b/tdeioslave/man/man.protocol @@ -8,5 +8,5 @@ listing=Name defaultMimetype=text/html determineMimetypeFromExtension=false DocPath=tdeioslave/man/index.html -Icon=man +Icon=application-x-troff-man Class=:local diff --git a/tdeioslave/media/mimetypes/cdrom_mounted.desktop b/tdeioslave/media/mimetypes/cdrom_mounted.desktop index 427951b57..c00879b47 100644 --- a/tdeioslave/media/mimetypes/cdrom_mounted.desktop +++ b/tdeioslave/media/mimetypes/cdrom_mounted.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=cdrom_mount +Icon=application-x-cdrom_mount Type=MimeType MimeType=media/cdrom_mounted Comment=Mounted CD-ROM diff --git a/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop index d8bd4f199..05caea6f0 100644 --- a/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop +++ b/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Icon=cdrom_mount_decrypt +Icon=application-x-cdrom_mount_decrypt Type=MimeType MimeType=media/cdrom_mounted_decrypted Comment=Mounted Decrypted CD-ROM diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted.desktop index 3d35eef32..7133fdd51 100644 --- a/tdeioslave/media/mimetypes/cdrom_unmounted.desktop +++ b/tdeioslave/media/mimetypes/cdrom_unmounted.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=cdrom_unmount +Icon=application-x-cdrom_unmount Type=MimeType MimeType=media/cdrom_unmounted Comment=Unmounted CD-ROM diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop index c53abbc82..a20eae5f2 100644 --- a/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop +++ b/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Icon=cdrom_unmount_decrypt +Icon=application-x-cdrom_unmount_decrypt Type=MimeType MimeType=media/cdrom_unmounted_decrypted Comment=Unmounted Decrypted CD-ROM diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop index f11e43807..0a64aa9af 100644 --- a/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop +++ b/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Icon=cdrom_unmount_encrypt +Icon=application-x-cdrom_unmount_encrypt Type=MimeType MimeType=media/cdrom_unmounted_encrypted Comment=Unmounted Encrypted CD-ROM diff --git a/tdeioslave/media/mimetypes/svcd.desktop b/tdeioslave/media/mimetypes/svcd.desktop index 68c965a6f..775a0d1f1 100644 --- a/tdeioslave/media/mimetypes/svcd.desktop +++ b/tdeioslave/media/mimetypes/svcd.desktop @@ -47,4 +47,4 @@ Comment[vi]=Đĩa siêu video CD Comment[wa]=Super plake lazer CD videyo Comment[zh_CN]=超级 VCD Comment[zh_TW]=超級視訊 CD -Icon=cdrom_unmount +Icon=application-x-cdrom_unmount diff --git a/tdeioslave/media/mimetypes/vcd.desktop b/tdeioslave/media/mimetypes/vcd.desktop index dae4ddcaf..6f5593906 100644 --- a/tdeioslave/media/mimetypes/vcd.desktop +++ b/tdeioslave/media/mimetypes/vcd.desktop @@ -47,4 +47,4 @@ Comment[vi]=Đĩa video CD Comment[wa]=Plake lazer CD videyo Comment[zh_CN]=VCD Comment[zh_TW]=視訊 CD -Icon=cdrom_unmount +Icon=application-x-cdrom_unmount diff --git a/tdeioslave/media/mimetypes/zip_mounted.desktop b/tdeioslave/media/mimetypes/zip_mounted.desktop index ce82fe968..3d36e698b 100644 --- a/tdeioslave/media/mimetypes/zip_mounted.desktop +++ b/tdeioslave/media/mimetypes/zip_mounted.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=zip_mount +Icon=application-vnd.tde.overlay.zip_mount Type=MimeType MimeType=media/zip_mounted Comment=Mounted Zip Disk diff --git a/tdeioslave/media/mimetypes/zip_unmounted.desktop b/tdeioslave/media/mimetypes/zip_unmounted.desktop index eaa35577f..d61d139a4 100644 --- a/tdeioslave/media/mimetypes/zip_unmounted.desktop +++ b/tdeioslave/media/mimetypes/zip_unmounted.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=zip_unmount +Icon=application-vnd.tde.overlay.zip_unmount Type=MimeType MimeType=media/zip_unmounted Comment=Unmounted Zip Disk diff --git a/tdeioslave/tar/ar.protocol b/tdeioslave/tar/ar.protocol index df5c93fa2..c39756343 100644 --- a/tdeioslave/tar/ar.protocol +++ b/tdeioslave/tar/ar.protocol @@ -8,5 +8,5 @@ listing=Name,Type,Size,Date,Access,Owner,Group,Link reading=true source=true DocPath=tdeioslave/ar/index.html -Icon=tar +Icon=application-x-tar Class=:local diff --git a/tdeioslave/tar/tar.protocol b/tdeioslave/tar/tar.protocol index 79c9ae16b..41d5f99ba 100644 --- a/tdeioslave/tar/tar.protocol +++ b/tdeioslave/tar/tar.protocol @@ -8,5 +8,5 @@ listing=Name,Type,Size,Date,Access,Owner,Group,Link reading=true source=true DocPath=tdeioslave/tar/index.html -Icon=tar +Icon=application-x-tar Class=:local diff --git a/tdeioslave/tar/zip.protocol b/tdeioslave/tar/zip.protocol index 75a20dcbf..15e2bb0f8 100644 --- a/tdeioslave/tar/zip.protocol +++ b/tdeioslave/tar/zip.protocol @@ -8,5 +8,5 @@ listing=Name,Type,Size,Date,Access,Owner,Group,Link reading=true source=true DocPath=tdeioslave/zip/index.html -Icon=zip +Icon=application-vnd.tde.overlay.zip Class=:local diff --git a/tdeprint/slave/mimetypes/driver.desktop b/tdeprint/slave/mimetypes/driver.desktop index c7ba8ebc9..d9be21a36 100644 --- a/tdeprint/slave/mimetypes/driver.desktop +++ b/tdeprint/slave/mimetypes/driver.desktop @@ -68,7 +68,7 @@ Comment[vi]=Trình điều khiển Máy in Comment[wa]=Moenneu di scrirece Comment[zh_CN]=打印机驱动程序 Comment[zh_TW]=印表機驅動程式 -Icon=postscript +Icon=application-postscript Type=MimeType MimeType=print/driver Patterns= diff --git a/tdeprint/slave/print.protocol b/tdeprint/slave/print.protocol index 7fc4498f6..9eedd1cd6 100644 --- a/tdeprint/slave/print.protocol +++ b/tdeprint/slave/print.protocol @@ -10,6 +10,6 @@ makedir=false deleting=false moving=false linking=false -Icon=postscript +Icon=application-postscript DocPath=tdeioslave/print/index.html defaultMimetype=application/octet-stream diff --git a/tdeprint/slave/printdb.protocol b/tdeprint/slave/printdb.protocol index 740d44896..7cd52db90 100644 --- a/tdeprint/slave/printdb.protocol +++ b/tdeprint/slave/printdb.protocol @@ -10,6 +10,6 @@ makedir=false deleting=false moving=false linking=false -Icon=postscript +Icon=application-postscript defaultMimetype=application/octet-stream DocPath=tdeioslave/printdb/index.html |