Branch: master

4dbdc7d1 2014-10-22 01:27:26 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 src/gui/newfiledlg.cpp
M src/gui/settingsdlg.cpp
M src/ktechlab.cpp
diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp
index fd929e6..50af44b 100644
--- a/src/gui/newfiledlg.cpp
+++ b/src/gui/newfiledlg.cpp
@@ -47,8 +47,8 @@
 	
 	TQValueList<TQIconViewItem*> items;
 	
-	items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Assembly Code (.asm)", loader->loadIcon( "source", TDEIcon::NoGroup, TDEIcon::SizeHuge ) );
-	items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"C (.c)", loader->loadIcon( "source_c", TDEIcon::NoGroup, TDEIcon::SizeHuge ) );
+	items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Assembly Code (.asm)", loader->loadIcon( ""text-x-src", TDEIcon::NoGroup, TDEIcon::SizeHuge ) );
+	items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"C (.c)", loader->loadIcon( ""text-x-csrc", TDEIcon::NoGroup, TDEIcon::SizeHuge ) );
 	items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Circuit (.circuit)", loader->loadIcon( "ktechlab_circuit", TDEIcon::NoGroup, TDEIcon::SizeHuge ) );
 	items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"FlowCode (.flowcode)", loader->loadIcon( "ktechlab_flowcode", TDEIcon::NoGroup, TDEIcon::SizeHuge ) );
 #ifdef MECHANICS
diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp
index e8e481d..6976f00 100644
--- a/src/gui/settingsdlg.cpp
+++ b/src/gui/settingsdlg.cpp
@@ -60,7 +60,7 @@
 	addPage( m_asmFormattingWidget, i18n("Formatter"), "indent_asm", i18n("Assembly Formatter") );
 	addPage( m_logicWidget, i18n("Logic"), "logic_or", i18n("Electronic Logic Values") );
 	addPage( m_gpasmSettingsWidget, "Gpasm", "convert_to_hex", "gpasm" );
-	addPage( m_sdccOptionsWidget, "SDCC", "source_c", "SDCC" );
+	addPage( m_sdccOptionsWidget, "SDCC", "text-x-csrc", "SDCC" );
 	
 	connect( m_generalOptionsWidget->refreshRateSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotUpdateRefreshRateLabel(int)) );
 	connect( m_picProgrammerConfigWidget->kcfg_PicProgrammerProgram, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotUpdatePicProgrammerDescription()) );
diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp
index 0149939..2291480 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -209,7 +209,7 @@
 	
 	tv = createToolView( LanguageManager::toolViewIdentifier(),
 						 KMultiTabBar::Bottom,
-						 loader->loadIcon( "log", TDEIcon::Small ),
+						 loader->loadIcon( ""text-x-log", TDEIcon::Small ),
 						 i18n("Messages") );
 	LanguageManager::self( tv, this );
 	
@@ -431,8 +431,8 @@
 	//BEGIN New file popup
 	TDEToolBarPopupAction *p = new TDEToolBarPopupAction( i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), ac, "newfile_popup" );
 	p->popupMenu()->insertTitle( i18n("New File") );
-	(new TDEAction( i18n("Assembly"), "source", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() );
-	(new TDEAction( i18n("C source"), "source_c", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("Assembly"), "text-x-src", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("C source"), "text-x-csrc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() );
 	(new TDEAction( i18n("Circuit"), "ktechlab_circuit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() );
 	(new TDEAction( i18n("FlowCode"), "ktechlab_flowcode", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() );
 #ifdef MECHANICS
@@ -1035,7 +1035,7 @@
 				break;
 				
 			case Document::dt_text:
-				iconName = "txt";
+				iconName = "text-plain";
 				break;
 				
 			case Document::dt_pinMapEditor: