| a4eabeb4 | 2014-10-22 01:27:30 | 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 cervisia/updateview_items.cpp M kbabel/catalogmanager/catalogmanager.cpp M kbabel/catalogmanager/catalogmanagerview.cpp M kbabel/kbabel/kbabelpref.cpp M kbugbuster/gui/kbbmainwindow.cpp M kompare/komparenavtreepart/komparenavtreepart.cpp M umbrello/umbrello/dialogs/classpropdlg.cpp M umbrello/umbrello/listpopupmenu.cpp M umbrello/umbrello/uml.cpp |
||
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index ce74fd2..1b0e788 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -154,7 +154,7 @@
}
fileItem->setRevTag(entry.m_revision, entry.m_tag);
fileItem->setDate(entry.m_dateTime);
- fileItem->setPixmap(0, isBinary ? SmallIcon("binary") : TQPixmap());
+ fileItem->setPixmap(0, isBinary ? SmallIcon("application-octet-stream") : TQPixmap());
}
return;
}
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 44d4499..ceed6ce 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -375,9 +375,9 @@
TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked");
action->setEnabled(false);
- action = new TDEAction( i18n("&Pack"), "tar", CTRL+Key_B,
+ action = new TDEAction( i18n("&Pack"), "application-x-tar", CTRL+Key_B,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageFiles()), actionCollection(), "package_file");
- action = new TDEAction( i18n("Pack &Marked"), "tar", CTRL+ALT+Key_B, TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked");
+ action = new TDEAction( i18n("Pack &Marked"), "application-x-tar", CTRL+ALT+Key_B, TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked");
action->setEnabled(false);
actionMap["statistics_marked"] = NEEDS_DIR | NEEDS_MARK;
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 23773e2..fcf9db4 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -2532,7 +2532,7 @@
uri.append(TQUriDrag::localFileToUri(item->potFile()));
TQUriDrag* drag = new TQUriDrag(uri,this);
- TQPixmap icon=TDEGlobal::iconLoader()->loadIcon("txt",TDEIcon::Desktop);
+ TQPixmap icon=TDEGlobal::iconLoader()->loadIcon(""text-plain",TDEIcon::Desktop);
drag->setPixmap(icon,TQPoint(icon.width()/2,icon.height()/2));
drag->drag();
}
diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp
index a3f3abb..11c0b8e 100644
--- a/kbabel/kbabel/kbabelpref.cpp
+++ b/kbabel/kbabel/kbabelpref.cpp
@@ -88,7 +88,7 @@
addPage(new FontPreferences(0, "fonts")
, i18n("name of page in preferences dialog icon list","Fonts")
- , "font"
+ , "font-x-generic"
, i18n("title of page in preferences dialog","Font Settings"));
addPage(new ColorPreferences(0, "colors")
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index 3c65eed..dea2a68 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -217,7 +217,7 @@
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection() );
- TDEToggleAction *toggleTmp = new TDEToggleAction( i18n("Show Closed Bugs"), "recycled", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleDone() ),
+ TDEToggleAction *toggleTmp = new TDEToggleAction( i18n("Show Closed Bugs"), "application-x-trash", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleDone() ),
actionCollection(), "cmd_toggle_done" );
#if KDE_IS_VERSION( 3, 2, 90 )
toggleTmp->setCheckedState(i18n("Hide Closed Bugs"));
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index daa3a51..31c881f 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -493,8 +493,8 @@
setText( 0, model->sourceFile() );
setText( 1, model->destinationFile() );
- setPixmap( 0, SmallIcon( "txt" ) );
- setPixmap( 1, SmallIcon( "txt" ) );
+ setPixmap( 0, SmallIcon( "text-plain" ) );
+ setPixmap( 1, SmallIcon( "text-plain" ) );
setSelectable( true );
}
diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp
index 0a95bfc..81e1c8c 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -115,7 +115,7 @@
//now setup the options page for classes
if (w->getBaseType() == Uml::wt_Class || w->getBaseType() == Uml::wt_Interface) {
- TQFrame* newPage = addPage( i18n("Display"), i18n("Display Options"), DesktopIcon("info") );
+ TQFrame* newPage = addPage( i18n("Display"), i18n("Display Options"), DesktopIcon("application-vnd.tde.info") );
TQHBoxLayout* m_pOptionsLayout = new TQHBoxLayout(newPage);
ClassifierWidget *cw = static_cast<ClassifierWidget*>(w);
m_pOptionsPage = new ClassOptionsPage( newPage, cw );
@@ -176,7 +176,7 @@
//add extra pages for class
if (ot == Uml::ot_Class ) {
//setup attributes page
- TQFrame* newPage = addPage( i18n("Attributes"), i18n("Attribute Settings"), DesktopIcon("misc") );
+ TQFrame* newPage = addPage( i18n("Attributes"), i18n("Attribute Settings"), DesktopIcon("application-vnd.tde.misc") );
m_pAttPage = new ClassifierListPage(newPage, (UMLClassifier *)c, m_pDoc, Uml::ot_Attribute);
TQHBoxLayout * attLayout = new TQHBoxLayout(newPage);
attLayout -> addWidget(m_pAttPage);
@@ -184,7 +184,7 @@
if (ot == Uml::ot_Class || ot == Uml::ot_Interface) {
//setup operations page
- TQFrame* newPage = addPage( i18n("Operations"), i18n("Operation Settings"), DesktopIcon("misc") );
+ TQFrame* newPage = addPage( i18n("Operations"), i18n("Operation Settings"), DesktopIcon("application-vnd.tde.misc") );
m_pOpsPage = new ClassifierListPage(newPage, (UMLClassifier*)c, m_pDoc, Uml::ot_Operation);
TQHBoxLayout* pOpsLayout = new TQHBoxLayout(newPage);
pOpsLayout -> addWidget(m_pOpsPage);
@@ -192,28 +192,28 @@
if (ot == Uml::ot_Class || ot == Uml::ot_Interface) {
//setup templates page
- TQFrame* newPage = addPage( i18n("Templates"), i18n("Templates Settings"), DesktopIcon("misc") );
+ TQFrame* newPage = addPage( i18n("Templates"), i18n("Templates Settings"), DesktopIcon("application-vnd.tde.misc") );
m_pTemplatePage = new ClassifierListPage(newPage, (UMLClassifier *)c, m_pDoc, Uml::ot_Template);
TQHBoxLayout* templatesLayout = new TQHBoxLayout(newPage);
templatesLayout->addWidget(m_pTemplatePage);
}
if (ot == Uml::ot_Enum) {
//setup enum literals page
- TQFrame* newPage = addPage( i18n("Enum Literals"), i18n("Enum Literals Settings"), DesktopIcon("misc") );
+ TQFrame* newPage = addPage( i18n("Enum Literals"), i18n("Enum Literals Settings"), DesktopIcon("application-vnd.tde.misc") );
m_pEnumLiteralPage = new ClassifierListPage(newPage, (UMLClassifier*)c, m_pDoc, Uml::ot_EnumLiteral);
TQHBoxLayout* enumLiteralsLayout = new TQHBoxLayout(newPage);
enumLiteralsLayout->addWidget(m_pEnumLiteralPage);
}
if (ot == Uml::ot_Entity) {
//setup enum literals page
- TQFrame* newPage = addPage( i18n("Entity Attributes"), i18n("Entity Attributes Settings"), DesktopIcon("misc") );
+ TQFrame* newPage = addPage( i18n("Entity Attributes"), i18n("Entity Attributes Settings"), DesktopIcon("application-vnd.tde.misc") );
m_pEntityAttributePage = new ClassifierListPage(newPage, (UMLClassifier*)c, m_pDoc, Uml::ot_EntityAttribute);
TQHBoxLayout* entityAttributesLayout = new TQHBoxLayout(newPage);
entityAttributesLayout->addWidget(m_pEntityAttributePage);
}
if (ot == Uml::ot_Package ) {
// Set up containment page.
- TQFrame* newPage = addPage( i18n("Contents"), i18n("Contents Settings"), DesktopIcon("misc") );
+ TQFrame* newPage = addPage( i18n("Contents"), i18n("Contents Settings"), DesktopIcon("application-vnd.tde.misc") );
m_pPkgContentsPage = new PkgContentsPage(newPage, (UMLPackage*)(c));
TQHBoxLayout* contentsLayout = new TQHBoxLayout(newPage);
contentsLayout->addWidget(m_pPkgContentsPage);
@@ -229,7 +229,7 @@
}
void ClassPropDlg::setupInstancePages(UMLWidget* widget) {
- TQFrame* page = addPage( i18n("General"), i18n("General Settings"), DesktopIcon("misc") );
+ TQFrame* page = addPage( i18n("General"), i18n("General Settings"), DesktopIcon("application-vnd.tde.misc") );
TQHBoxLayout* genLayout = new TQHBoxLayout(page);
page->setMinimumSize(310, 330);
m_pGenPage = new ClassGenPage(m_pDoc, page, widget);
diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp
index 63febee..0dc0d61 100644
--- a/umbrello/umbrello/listpopupmenu.cpp
+++ b/umbrello/umbrello/listpopupmenu.cpp
@@ -278,7 +278,7 @@
case Uml::wt_Enum:
m_pInsert = new TDEPopupMenu(this);
- m_pInsert->insertItem(SmallIcon("source"), i18n("Enum Literal..."), mt_EnumLiteral);
+ m_pInsert->insertItem(SmallIcon("text-x-src"), i18n("Enum Literal..."), mt_EnumLiteral);
insertFileNew();
setupColor(object->getUseFillColour());
insertStdItems(true, type);
@@ -289,7 +289,7 @@
case Uml::wt_Entity:
m_pInsert = new TDEPopupMenu(this);
- m_pInsert->insertItem(SmallIcon("source"), i18n("Entity Attribute..."), mt_EntityAttribute);
+ m_pInsert->insertItem(SmallIcon("text-x-src"), i18n("Entity Attribute..."), mt_EntityAttribute);
insertFileNew();
setupColor(object->getUseFillColour());
insertStdItems(true, type);
@@ -465,7 +465,7 @@
{
switch (m) {
case mt_Properties:
- insertItem(SmallIcon("info"), i18n("Properties"), mt_Properties);
+ insertItem(SmallIcon("application-vnd.tde.info"), i18n("Properties"), mt_Properties);
break;
case mt_Rename:
insertItem(i18n("Rename..."), mt_Rename);
@@ -504,7 +504,7 @@
insertItem(i18n("Internalize Folder"), mt_Internalize_Folder);
break;
case mt_Import_Classes:
- insertItem(BarIcon("source_cpp"), i18n("Import Classes..."), mt_Import_Classes);
+ insertItem(BarIcon("text-x-c++src"), i18n("Import Classes..."), mt_Import_Classes);
break;
case mt_Package:
m_pInsert->insertItem(m_pixmap[pm_Package], i18n("Package"), mt_Package);
@@ -558,7 +558,7 @@
insertItem(i18n("Reset Label Positions"), mt_Reset_Label_Positions);
break;
case mt_New_Parameter:
- insertItem(SmallIcon("source"), i18n("New Parameter..."), mt_New_Parameter);
+ insertItem(SmallIcon("text-x-src"), i18n("New Parameter..."), mt_New_Parameter);
break;
case mt_New_Operation:
insertItem(SmallIcon("CVpublic_meth"),i18n("New Operation..."), mt_New_Operation);
@@ -567,19 +567,19 @@
insertItem(SmallIcon("CVpublic_var"), i18n("New Attribute..."), mt_New_Attribute);
break;
case mt_New_Template:
- insertItem(SmallIcon("source"), i18n("New Template..."), mt_New_Template);
+ insertItem(SmallIcon("text-x-src"), i18n("New Template..."), mt_New_Template);
break;
case mt_New_EnumLiteral:
- insertItem(SmallIcon("source"), i18n("New Literal..."), mt_New_EnumLiteral);
+ insertItem(SmallIcon("text-x-src"), i18n("New Literal..."), mt_New_EnumLiteral);
break;
case mt_New_EntityAttribute:
- insertItem(SmallIcon("source"), i18n("New Entity Attribute..."), mt_New_EntityAttribute);
+ insertItem(SmallIcon("text-x-src"), i18n("New Entity Attribute..."), mt_New_EntityAttribute);
break;
case mt_New_Activity:
- m_pInsert->insertItem(SmallIcon("source"), i18n("Activity..."), mt_New_Activity);
+ m_pInsert->insertItem(SmallIcon("text-x-src"), i18n("Activity..."), mt_New_Activity);
break;
case mt_Export_Image:
- insertItem(SmallIcon("image"), i18n("Export as Picture..."), mt_Export_Image);
+ insertItem(SmallIcon("image-x-generic"), i18n("Export as Picture..."), mt_Export_Image);
break;
default:
kWarning() << "ListPopupMenu::insertStdItem called on unimplemented Menu_Type " << m << endl;
@@ -1088,7 +1088,7 @@
m_pInsert = new TDEPopupMenu(this);
m_pInsert -> insertItem(SmallIcon( "CVpublic_var"), i18n("Attribute"), mt_Attribute);
m_pInsert -> insertItem(SmallIcon( "CVpublic_meth"), i18n("Operation"), mt_Operation);
- m_pInsert -> insertItem(SmallIcon("source"), i18n("Template"), mt_Template);
+ m_pInsert -> insertItem(SmallIcon("text-x-src"), i18n("Template"), mt_Template);
insertFileNew();
insertStdItems();
insertStdItem(mt_Properties);
@@ -1097,7 +1097,7 @@
case mt_Interface:
m_pInsert = new TDEPopupMenu(this);
m_pInsert->insertItem(SmallIcon("CVpublic_meth"), i18n("Operation"), mt_Operation);
- m_pInsert -> insertItem(SmallIcon("source"), i18n("Template"), mt_Template);
+ m_pInsert -> insertItem(SmallIcon("text-x-src"), i18n("Template"), mt_Template);
insertFileNew();
insertStdItems();
insertStdItem(mt_Properties);
@@ -1140,7 +1140,7 @@
** Diff limit reached (max: 250 lines) **
|
||