Branch: master

27e7005b 2014-10-22 01:27:25 Timothy Pearson
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
M kmymoney2/kmymoney2.cpp
M kmymoney2/views/kgloballedgerview.cpp
diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index 1785256..3e95fe5 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -365,7 +365,7 @@
   new TDEAction(i18n("Reopen account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReopen()), actionCollection(), "account_reopen");
   new TDEAction(i18n("Transaction report"), "view_info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountTransactionReport()), actionCollection(), "account_transaction_report");
 #ifdef HAVE_KDCHART
-  new TDEAction(i18n("Show balance chart..."), "kchart_chrt", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountChart()), actionCollection(), "account_chart");
+  new TDEAction(i18n("Show balance chart..."), "application-x-kchart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountChart()), actionCollection(), "account_chart");
 #endif
   new TDEAction(i18n("Map to online account"), "news_subscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountMapOnline()), actionCollection(), "account_online_map");
   new TDEAction(i18n("Unmap account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUnmapOnline()), actionCollection(), "account_online_unmap");
@@ -1826,8 +1826,8 @@
   dlg->addPage(homePage, i18n("Home"), "home");
   dlg->addPage(schedulesPage, i18n("Scheduled\ntransactions"), "schedule");
   dlg->addPage(encryptionPage, i18n("Encryption"), "kgpg");
-  dlg->addPage(colorsPage, i18n("Colors"), "colorscm");
-  dlg->addPage(fontsPage, i18n("Fonts"), "font");
+  dlg->addPage(colorsPage, i18n("Colors"), "application-x-kcsrc");
+  dlg->addPage(fontsPage, i18n("Fonts"), "font-x-generic");
   dlg->addPage(onlineQuotesPage, i18n("Online Quotes"), "network_local");
   dlg->addPage(forecastPage, i18n("Forecast"), "forcast");
   dlg->addPage(pluginsPage, i18n("Plugins"), "connect_no");
diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
index 18546c0..5e7029c 100644
--- a/kmymoney2/views/kgloballedgerview.cpp
+++ b/kmymoney2/views/kgloballedgerview.cpp
@@ -171,7 +171,7 @@
   // I leave the code commented here for a while, so that I see
   // how I can add other  widgets at this point
   TDEIconLoader *il = TDEGlobal::iconLoader();
-  m_toolbar->insertButton(il->loadIcon("document", TDEIcon::Small, TDEIcon::SizeSmall),
+  m_toolbar->insertButton(il->loadIcon(""text-x-generic", TDEIcon::Small, TDEIcon::SizeSmall),
                         1,true,i18n("Account"));
   //m_toolbar->setMaximumSize(50,20);
   m_toolbar->alignItemRight(1);