From 30d9349b01546db3365d79fe8026944074356e01 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 22 Oct 2014 01:27:24 -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

---
 kftpgrabber/src/mainactions.cpp                 | 10 +++++-----
 kftpgrabber/src/mainwindow.cpp                  |  2 +-
 kftpgrabber/src/widgets/browser/actions.cpp     |  2 +-
 kftpgrabber/src/widgets/browser/propsplugin.cpp |  2 +-
 kftpgrabber/src/widgets/configdialog.cpp        |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kftpgrabber/src/mainactions.cpp b/kftpgrabber/src/mainactions.cpp
index 76f4649..a00335a 100644
--- a/kftpgrabber/src/mainactions.cpp
+++ b/kftpgrabber/src/mainactions.cpp
@@ -94,9 +94,9 @@ MainActions::MainActions(MainWindow *parent)
   mainWidget()->setStandardToolBarMenuEnabled(true);
 
   // setup transfermode actions
-  m_transModeAction = new TDEActionMenu(i18n("&Transfer Mode (Auto)"), "binary", actionCollection(), "transfermode");
-  m_modeAscii = new TDERadioAction(i18n("ASCII"), "ascii", TDEShortcut(), this, SLOT(slotModeAscii()), actionCollection());
-  m_modeBinary = new TDERadioAction(i18n("Binary"), "binary", TDEShortcut(), this, SLOT(slotModeBinary()), actionCollection());
+  m_transModeAction = new TDEActionMenu(i18n("&Transfer Mode (Auto)"), "application-octet-stream", actionCollection(), "transfermode");
+  m_modeAscii = new TDERadioAction(i18n("ASCII"), "text-vnd.tde.ascii", TDEShortcut(), this, SLOT(slotModeAscii()), actionCollection());
+  m_modeBinary = new TDERadioAction(i18n("Binary"), "application-octet-stream", TDEShortcut(), this, SLOT(slotModeBinary()), actionCollection());
   m_modeAuto = new TDERadioAction(i18n("Auto"), TDEShortcut(), this, SLOT(slotModeAuto()), actionCollection());
 
   // Set grouping so only one action can be selected
@@ -125,14 +125,14 @@ TDEMainWindow *MainActions::mainWidget()
 
 void MainActions::slotModeAscii()
 {
-  m_transModeAction->setIcon("ascii");
+  m_transModeAction->setIcon("text-vnd.tde.ascii");
   m_transModeAction->setText(i18n("&Transfer Mode (ASCII)"));
   KFTPCore::Config::self()->setGlobalMode('A');
 }
 
 void MainActions::slotModeBinary()
 {
-  m_transModeAction->setIcon("binary");
+  m_transModeAction->setIcon("application-octet-stream");
   m_transModeAction->setText(i18n("&Transfer Mode (Binary)"));
   KFTPCore::Config::self()->setGlobalMode('I');
 }
diff --git a/kftpgrabber/src/mainwindow.cpp b/kftpgrabber/src/mainwindow.cpp
index 4970066..9c01601 100644
--- a/kftpgrabber/src/mainwindow.cpp
+++ b/kftpgrabber/src/mainwindow.cpp
@@ -340,7 +340,7 @@ void MainWindow::initSidebars()
   // Create the failed transfers view
   KFTPWidgets::FailedTransfers *failedTransfers = new KFTPWidgets::FailedTransfers(0, "failedtransfers");
 
-  m_bottomSidebar->addSidebar(m_queueView, i18n("Queue"), "document");
+  m_bottomSidebar->addSidebar(m_queueView, i18n("Queue"), "text-x-generic");
   m_bottomSidebar->addSidebar(failedTransfers, i18n("Failed Transfers"), "cancel");
   // END bottom
 
diff --git a/kftpgrabber/src/widgets/browser/actions.cpp b/kftpgrabber/src/widgets/browser/actions.cpp
index c2eeaea..11fb08c 100644
--- a/kftpgrabber/src/widgets/browser/actions.cpp
+++ b/kftpgrabber/src/widgets/browser/actions.cpp
@@ -749,7 +749,7 @@ void Actions::slotCompare()
   
   PopupMessage *popup = new PopupMessage(m_view->getStatusLabel(), m_view);
   popup->setText(i18n("Identical files on both sides have been hidden. Only <b>different files</b> are now visible."));
-  popup->setImage(SmallIcon("info"));
+  popup->setImage(SmallIcon("application-vnd.tde.info"));
   popup->setShowCloseButton(false);
   popup->setShowCounter(false);
   
diff --git a/kftpgrabber/src/widgets/browser/propsplugin.cpp b/kftpgrabber/src/widgets/browser/propsplugin.cpp
index 6a6ed1f..cb22ede 100644
--- a/kftpgrabber/src/widgets/browser/propsplugin.cpp
+++ b/kftpgrabber/src/widgets/browser/propsplugin.cpp
@@ -115,7 +115,7 @@ PropsPlugin::PropsPlugin(KPropertiesDialog *props, KFileItemList items)
       fileSize += (*i)->size();
     }
     
-    iconText = "tdemultiple";
+    iconText = "application-vnd.tde.tdemultiple";
     nameText = TDEIO::itemsSummaryString(countFiles + countFolders, countFiles, countFolders, 0, false);
   }
   
diff --git a/kftpgrabber/src/widgets/configdialog.cpp b/kftpgrabber/src/widgets/configdialog.cpp
index cc4452f..bd3170e 100644
--- a/kftpgrabber/src/widgets/configdialog.cpp
+++ b/kftpgrabber/src/widgets/configdialog.cpp
@@ -68,7 +68,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name)
   // Add all standard pages
   addPage(new GeneralSettings(0, "General"), i18n("General"), "kfm");
   addPage(new TransferSettings(0, "Transfers"), i18n("Transfers"), "queue");
-  addPage(new LogSettings(0, "Log"), i18n("Log"), "log");
+  addPage(new LogSettings(0, "Log"), i18n("Log"), "text-x-log");
   addPage(new DisplaySettings(0, "Display"), i18n("Display"), "display");
   
   // Add  the actions page
-- 
cgit v1.2.1