summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-22 01:27:29 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-22 01:27:29 -0500
commit46e2e93fa23ff2b5e1fd9f40046bb96f6e6a2870 (patch)
treef643c1f8c35237043b62bc9a438c64cfd95237fd /kcontrol
parent2a34ebd1f8117f3e87bb66226461b9d812327438 (diff)
downloadtdebase-46e2e93fa23ff2b5e1fd9f40046bb96f6e6a2870.tar.gz
tdebase-46e2e93fa23ff2b5e1fd9f40046bb96f6e6a2870.zip
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
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/colors/colors.desktop2
-rw-r--r--kcontrol/componentchooser/componentchooser.desktop2
-rw-r--r--kcontrol/fonts/fonts.desktop2
-rw-r--r--kcontrol/icons/iconthemes.cpp2
-rw-r--r--kcontrol/konqhtml/tdehtml_fonts.desktop2
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp2
-rw-r--r--kcontrol/tdefontinst/installfont.desktop2
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp2
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp2
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop2
-rw-r--r--kcontrol/tdefontinst/tdeio/fonts.desktop2
-rw-r--r--kcontrol/tdefontinst/tdeio/fonts.protocol2
-rw-r--r--kcontrol/tdefontinst/tdeio/package.desktop2
-rw-r--r--kcontrol/tdefontinst/viewpart/tdefontview.desktop2
-rw-r--r--kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop2
15 files changed, 15 insertions, 15 deletions
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