Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

4 files changed, 20 insertions, 20 deletions

diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp
index 136627b0..63febee8 100644
--- a/umbrello/umbrello/listpopupmenu.cpp
+++ b/umbrello/umbrello/listpopupmenu.cpp
@@ -230,7 +230,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
         insertSeparator();
         insertItem(SmallIcon( "fonts" ), i18n( "Change Font..." ),
                    mt_Change_Font_Selection );
-        insertItem(SmallIcon( "editdelete" ), i18n("Delete Selected Items"),
+        insertItem(SmallIcon( "edit-delete" ), i18n("Delete Selected Items"),
                    mt_Delete_Selection);
 
         // add this here and not above with the other stuff of the interface
@@ -331,7 +331,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
     case Uml::wt_Message:
         insertStdItems(false, type);
         insertStdItem(mt_Change_Font);
-        insertItem(SmallIcon( "filenew"), i18n("New Operation..."), mt_Operation);
+        insertItem(SmallIcon( "document-new"), i18n("New Operation..."), mt_Operation);
         insertItem(i18n("Select Operation..."), mt_Select_Operation);
         break;
 
@@ -341,7 +341,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
         insertStdItem(mt_Cut);
         insertStdItem(mt_Copy);
         insertStdItem(mt_Paste);
-        insertItem(SmallIcon( "editdelete"), i18n("Clear"), mt_Clear);
+        insertItem(SmallIcon( "edit-delete"), i18n("Clear"), mt_Clear);
         insertSeparator();
         insertItem(i18n("Change Text..."), mt_Rename);
         insertStdItem(mt_Delete);
@@ -357,7 +357,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
         pState = static_cast< StateWidget *>( object );
         if( pState -> getStateType() == StateWidget::Normal ) {
             m_pInsert = new TDEPopupMenu(this);
-            m_pInsert -> insertItem(SmallIcon( "filenew"), i18n("Activity..."), mt_New_Activity);
+            m_pInsert -> insertItem(SmallIcon( "document-new"), i18n("Activity..."), mt_New_Activity);
             insertFileNew();
         }
         setupColor( object -> getUseFillColour() );
@@ -420,7 +420,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
         case Uml::tr_Seq_Message_Self:
         case Uml::tr_Seq_Message:
             insertStdItem(mt_Change_Font);
-            insertItem(SmallIcon( "filenew"), i18n("New Operation..."), mt_Operation);
+            insertItem(SmallIcon( "document-new"), i18n("New Operation..."), mt_Operation);
             insertItem(i18n("Select Operation..."), mt_Select_Operation);
             break;
 
@@ -458,7 +458,7 @@ void ListPopupMenu::init() {
 }
 
 void ListPopupMenu::insertFileNew() {
-    insertItem(SmallIcon("filenew"), i18n("New"), m_pInsert);
+    insertItem(SmallIcon("document-new"), i18n("New"), m_pInsert);
 }
 
 void ListPopupMenu::insertStdItem(Menu_Type m)
@@ -471,16 +471,16 @@ void ListPopupMenu::insertStdItem(Menu_Type m)
         insertItem(i18n("Rename..."), mt_Rename);
         break;
     case mt_Delete:
-        insertItem(SmallIcon("editdelete"), i18n("Delete"), mt_Delete);
+        insertItem(SmallIcon("edit-delete"), i18n("Delete"), mt_Delete);
         break;
     case mt_Cut:
-        insertItem(SmallIcon("editcut"), i18n("Cut"), mt_Cut);
+        insertItem(SmallIcon("edit-cut"), i18n("Cut"), mt_Cut);
         break;
     case mt_Copy:
-        insertItem(SmallIcon("editcopy"), i18n("Copy"), mt_Copy);
+        insertItem(SmallIcon("edit-copy"), i18n("Copy"), mt_Copy);
         break;
     case mt_Paste:
-        insertItem(SmallIcon("editpaste"), i18n("Paste"), mt_Paste);
+        insertItem(SmallIcon("edit-paste"), i18n("Paste"), mt_Paste);
         break;
     case mt_Change_Font:
         insertItem(SmallIcon("fonts"), i18n("Change Font..."), mt_Change_Font);
@@ -532,7 +532,7 @@ void ListPopupMenu::insertStdItem(Menu_Type m)
     case mt_Component_Folder:
     case mt_UseCase_Folder:
     case mt_EntityRelationship_Folder:
-        m_pInsert->insertItem(BarIcon("folder_new"), i18n("Folder"), m);
+        m_pInsert->insertItem(BarIcon("folder-new"), i18n("Folder"), m);
         break;
     case mt_Entity:
         m_pInsert->insertItem(m_pixmap[pm_Entity], i18n("Entity"), mt_Entity);
@@ -605,7 +605,7 @@ void ListPopupMenu::insertStdItems(bool insertLeadingSeparator /* = true */,
 
 void ListPopupMenu::insertContainerItems(bool folderAndDiagrams) {
     if (folderAndDiagrams)
-        m_pInsert -> insertItem(BarIcon("folder_new"), i18n("Folder"), mt_Logical_Folder);
+        m_pInsert -> insertItem(BarIcon("folder-new"), i18n("Folder"), mt_Logical_Folder);
     m_pInsert -> insertItem(m_pixmap[pm_Class], i18n("Class"), mt_Class);
     m_pInsert -> insertItem(m_pixmap[pm_Interface], i18n("Interface"), mt_Interface);
     m_pInsert -> insertItem(m_pixmap[pm_Datatype], i18n("Datatype"), mt_Datatype);
@@ -1253,7 +1253,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
         break;
 
     case mt_Anchor:
-        insertItem(SmallIcon( "editdelete"),i18n("Delete Anchor"), mt_Delete);
+        insertItem(SmallIcon( "edit-delete"),i18n("Delete Anchor"), mt_Delete);
         break;
 
     case mt_RoleNameA:
@@ -1336,7 +1336,7 @@ void ListPopupMenu::setupDiagramMenu(UMLView* view) {
     insertStdItem(mt_Copy);
     insertStdItem(mt_Paste);
     insertSeparator();
-    insertItem(SmallIcon("editclear"), i18n("Clear Diagram"), mt_Clear);
+    insertItem(SmallIcon("edit-clear"), i18n("Clear Diagram"), mt_Clear);
     insertStdItem(mt_Export_Image);
     insertSeparator();
     insertItem(i18n("Snap to Grid"), mt_SnapToGrid);
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 7b491208..3f0d5a74 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -214,13 +214,13 @@ void UMLApp::initActions() {
     preferences->setToolTip( i18n( "Set the default program preferences") );
 
     deleteSelectedWidget = new TDEAction( i18n("Delete &Selected"),
-                                        SmallIconSet("editdelete"),
+                                        SmallIconSet("edit-delete"),
                                         TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(this),
                                         TQT_SLOT( slotDeleteSelectedWidget() ), actionCollection(),
                                         "delete_selected" );
 
     // The different views
-    newDiagram = new TDEActionMenu(0, SmallIconSet("filenew"), actionCollection(), "new_view");
+    newDiagram = new TDEActionMenu(0, SmallIconSet("document-new"), actionCollection(), "new_view");
     classDiagram = new TDEAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0,
                                 TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
 
@@ -255,7 +255,7 @@ void UMLApp::initActions() {
                                 TQT_TQOBJECT(this), TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(),
                                 "new_entityrelationship_diagram" );
 
-    viewClearDiagram = new TDEAction(i18n("&Clear Diagram"), SmallIconSet("editclear"), 0,
+    viewClearDiagram = new TDEAction(i18n("&Clear Diagram"), SmallIconSet("edit-clear"), 0,
                                    TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram");
     viewSnapToGrid = new TDEToggleAction(i18n("&Snap to Grid"), 0,
                                        TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid");
@@ -264,7 +264,7 @@ void UMLApp::initActions() {
 #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
     viewShowGrid->setCheckedState(i18n("&Hide Grid"));
 #endif
-    deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("editdelete"), 0,
+    deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("edit-delete"), 0,
                                 TQT_TQOBJECT(this), TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete");
     viewExportImage = new TDEAction(i18n("&Export as Picture..."), SmallIconSet("image"), 0,
                                   TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image");
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index ad0a7d18..28a98f7d 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -1096,7 +1096,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) {
         kError()<<"Request to remove diagram " << ID2STR(id) << ": Diagram not found!"<<endl;
         return;
     }
-    if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
+    if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "edit-delete")) == KMessageBox::Continue) {
         removeView(umlview);
         emit sigDiagramRemoved(id);
         setModified(true);
diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp
index effbcf04..b6118424 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -2735,7 +2735,7 @@ bool UMLView::checkUniqueSelection()
 void UMLView::clearDiagram() {
     if( KMessageBox::Continue == KMessageBox::warningContinueCancel( this, i18n("You are about to delete "
             "the entire diagram.\nAre you sure?"),
-            i18n("Delete Diagram?"),KGuiItem( i18n("&Delete"), "editdelete") ) ) {
+            i18n("Delete Diagram?"),KGuiItem( i18n("&Delete"), "edit-delete") ) ) {
         removeAllWidgets();
     }
 }