Browse Source

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

tags/r14.0.0
Timothy Pearson 4 years ago
parent
commit
bab4f22f92
96 changed files with 120 additions and 120 deletions
  1. 1
    1
      kate/part/katedocument.cpp
  2. 2
    2
      kate/part/kateview.cpp
  3. 0
    0
      pics/crystalsvg/cr128-action-document-open.png
  4. 0
    0
      pics/crystalsvg/cr16-action-document-new.png
  5. 0
    0
      pics/crystalsvg/cr16-action-document-open.png
  6. 0
    0
      pics/crystalsvg/cr16-action-document-print-preview.png
  7. 0
    0
      pics/crystalsvg/cr16-action-document-print.png
  8. 0
    0
      pics/crystalsvg/cr16-action-document-save.png
  9. 0
    0
      pics/crystalsvg/cr16-action-edit-clear.png
  10. 0
    0
      pics/crystalsvg/cr16-action-edit-copy.png
  11. 0
    0
      pics/crystalsvg/cr16-action-edit-cut.png
  12. 0
    0
      pics/crystalsvg/cr16-action-edit-delete.png
  13. 0
    0
      pics/crystalsvg/cr16-action-edit-paste.png
  14. 0
    0
      pics/crystalsvg/cr16-action-folder-new.png
  15. 0
    0
      pics/crystalsvg/cr16-action-go-home.png
  16. 0
    0
      pics/crystalsvg/cr16-action-window-close.png
  17. 0
    0
      pics/crystalsvg/cr22-action-document-new.png
  18. 0
    0
      pics/crystalsvg/cr22-action-document-open.png
  19. 0
    0
      pics/crystalsvg/cr22-action-document-print-preview.png
  20. 0
    0
      pics/crystalsvg/cr22-action-document-print.png
  21. 0
    0
      pics/crystalsvg/cr22-action-document-save.png
  22. 0
    0
      pics/crystalsvg/cr22-action-edit-clear.png
  23. 0
    0
      pics/crystalsvg/cr22-action-edit-copy.png
  24. 0
    0
      pics/crystalsvg/cr22-action-edit-cut.png
  25. 0
    0
      pics/crystalsvg/cr22-action-edit-delete.png
  26. 0
    0
      pics/crystalsvg/cr22-action-edit-paste.png
  27. 0
    0
      pics/crystalsvg/cr22-action-folder-new.png
  28. 0
    0
      pics/crystalsvg/cr22-action-go-home.png
  29. 0
    0
      pics/crystalsvg/cr22-action-window-close.png
  30. 0
    0
      pics/crystalsvg/cr32-action-document-new.png
  31. 0
    0
      pics/crystalsvg/cr32-action-document-open.png
  32. 0
    0
      pics/crystalsvg/cr32-action-document-print-preview.png
  33. 0
    0
      pics/crystalsvg/cr32-action-document-print.png
  34. 0
    0
      pics/crystalsvg/cr32-action-document-save.png
  35. 0
    0
      pics/crystalsvg/cr32-action-edit-clear.png
  36. 0
    0
      pics/crystalsvg/cr32-action-edit-copy.png
  37. 0
    0
      pics/crystalsvg/cr32-action-edit-cut.png
  38. 0
    0
      pics/crystalsvg/cr32-action-edit-delete.png
  39. 0
    0
      pics/crystalsvg/cr32-action-edit-paste.png
  40. 0
    0
      pics/crystalsvg/cr32-action-folder-new.png
  41. 0
    0
      pics/crystalsvg/cr32-action-go-home.png
  42. 0
    0
      pics/crystalsvg/cr32-action-window-close.png
  43. 0
    0
      pics/crystalsvg/cr48-action-document-new.png
  44. 0
    0
      pics/crystalsvg/cr48-action-document-print-preview.png
  45. 0
    0
      pics/crystalsvg/cr48-action-document-print.png
  46. 0
    0
      pics/crystalsvg/cr48-action-go-home.png
  47. 0
    0
      pics/crystalsvg/cr48-action-window-close.png
  48. 0
    0
      pics/crystalsvg/cr64-action-document-open.png
  49. 1
    1
      tdecore/tdeapplication.h
  50. 1
    1
      tdehtml/tdehtml_part.cpp
  51. 1
    1
      tdehtml/testtdehtml.cpp
  52. 4
    4
      tdeio/bookmarks/kbookmarkmenu.cc
  53. 3
    3
      tdeio/misc/tdewalletd/tdewalletd.cpp
  54. 2
    2
      tdeio/misc/uiserver.cpp
  55. 2
    2
      tdeio/tdefile/kdirselectdialog.cpp
  56. 2
    2
      tdeio/tdefile/kurlbar.cpp
  57. 1
    1
      tdeio/tdefile/kurlrequester.cpp
  58. 2
    2
      tdeio/tdefile/tdediroperator.cpp
  59. 1
    1
      tdeio/tdefile/tdefiledialog.cpp
  60. 2
    2
      tdeio/tdeio/defaultprogress.cpp
  61. 1
    1
      tdemdi/tdemdichildfrm.cpp
  62. 1
    1
      tdeparts/browserrun.cpp
  63. 1
    1
      tdeparts/tests/ghostview.cpp
  64. 1
    1
      tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
  65. 2
    2
      tdeprint/cups/cupsdconf2/editlist.cpp
  66. 1
    1
      tdeprint/cups/cupsdconf2/qdirlineedit.cpp
  67. 2
    2
      tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
  68. 2
    2
      tdeprint/cups/ippreportdlg.cpp
  69. 1
    1
      tdeprint/cups/kmpropbanners.cpp
  70. 1
    1
      tdeprint/driveritem.cpp
  71. 1
    1
      tdeprint/kprintdialog.cpp
  72. 3
    3
      tdeprint/kprintpreview.cpp
  73. 1
    1
      tdeprint/lpr/editentrydialog.cpp
  74. 1
    1
      tdeprint/management/kmconfigfonts.cpp
  75. 1
    1
      tdeprint/management/kmconfiggeneral.cpp
  76. 1
    1
      tdeprint/management/kmdriverdbwidget.cpp
  77. 4
    4
      tdeprint/management/kminstancepage.cpp
  78. 3
    3
      tdeprint/management/kmjobviewer.cpp
  79. 1
    1
      tdeprint/management/kmpages.cpp
  80. 1
    1
      tdeprint/management/kmspecialprinterdlg.cpp
  81. 6
    6
      tdeprint/management/kxmlcommanddlg.cpp
  82. 2
    2
      tdeprint/management/kxmlcommandselector.cpp
  83. 1
    1
      tdeprint/tdefilelist.cpp
  84. 2
    2
      tdeprint/tdeprintd.cpp
  85. 1
    1
      tdeui/kcombobox.cpp
  86. 5
    5
      tdeui/keditcl2.cpp
  87. 2
    2
      tdeui/kedittoolbar.cpp
  88. 4
    4
      tdeui/klineedit.cpp
  89. 1
    1
      tdeui/kstdaction.h
  90. 14
    14
      tdeui/kstdaction_p.h
  91. 6
    6
      tdeui/kstdguiitem.cpp
  92. 1
    1
      tdeui/ktabbar.cpp
  93. 5
    5
      tdeui/ktextbrowser.cpp
  94. 5
    5
      tdeui/ktextedit.cpp
  95. 1
    1
      tdeui/tdeaction.h
  96. 9
    9
      tdeui/tests/twindowtest.cpp

+ 1
- 1
kate/part/katedocument.cpp View File

@@ -525,7 +525,7 @@ TQPixmap KateDocument::configPagePixmap (uint number, int size) const
525 525
       return BarIcon("rightjust", size);
526 526
 
527 527
     case 5:
528
-      return BarIcon("filesave", size);
528
+      return BarIcon("document-save", size);
529 529
 
530 530
     case 6:
531 531
       return BarIcon("source", size);

+ 2
- 2
kate/part/kateview.cpp View File

@@ -221,7 +221,7 @@ void KateView::setupActions()
221 221
   m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac);
222 222
   a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard."));
223 223
 
224
-  m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
224
+  m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
225 225
   a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard."));
226 226
 
227 227
   if (!m_doc->readOnly())
@@ -889,7 +889,7 @@ bool KateView::checkOverwrite( KURL u )
889 889
               ( this,
890 890
                 i18n( "A file named \"%1\" already exists. Are you sure you want to overwrite it?" ).arg( info.fileName() ),
891 891
                 i18n( "Overwrite File?" ),
892
-                KGuiItem( i18n( "&Overwrite" ), "filesave", i18n( "Overwrite the file" ) )
892
+                KGuiItem( i18n( "&Overwrite" ), "document-save", i18n( "Overwrite the file" ) )
893 893
               );
894 894
 }
895 895
 

pics/crystalsvg/cr128-action-fileopen.png → pics/crystalsvg/cr128-action-document-open.png View File


pics/crystalsvg/cr16-action-filenew.png → pics/crystalsvg/cr16-action-document-new.png View File


pics/crystalsvg/cr16-action-fileopen.png → pics/crystalsvg/cr16-action-document-open.png View File


pics/crystalsvg/cr16-action-filequickprint.png → pics/crystalsvg/cr16-action-document-print-preview.png View File


pics/crystalsvg/cr16-action-fileprint.png → pics/crystalsvg/cr16-action-document-print.png View File


pics/crystalsvg/cr16-action-filesaveas.png → pics/crystalsvg/cr16-action-document-save.png View File


pics/crystalsvg/cr16-action-editclear.png → pics/crystalsvg/cr16-action-edit-clear.png View File


pics/crystalsvg/cr16-action-editcopy.png → pics/crystalsvg/cr16-action-edit-copy.png View File


pics/crystalsvg/cr16-action-editcut.png → pics/crystalsvg/cr16-action-edit-cut.png View File


pics/crystalsvg/cr16-action-editdelete.png → pics/crystalsvg/cr16-action-edit-delete.png View File


pics/crystalsvg/cr16-action-editpaste.png → pics/crystalsvg/cr16-action-edit-paste.png View File


pics/crystalsvg/cr16-action-folder_new.png → pics/crystalsvg/cr16-action-folder-new.png View File


pics/crystalsvg/cr16-action-gohome.png → pics/crystalsvg/cr16-action-go-home.png View File


pics/crystalsvg/cr16-action-fileclose.png → pics/crystalsvg/cr16-action-window-close.png View File


pics/crystalsvg/cr22-action-filenew.png → pics/crystalsvg/cr22-action-document-new.png View File


pics/crystalsvg/cr22-action-fileopen.png → pics/crystalsvg/cr22-action-document-open.png View File


pics/crystalsvg/cr22-action-filequickprint.png → pics/crystalsvg/cr22-action-document-print-preview.png View File


pics/crystalsvg/cr22-action-fileprint.png → pics/crystalsvg/cr22-action-document-print.png View File


pics/crystalsvg/cr22-action-filesaveas.png → pics/crystalsvg/cr22-action-document-save.png View File


pics/crystalsvg/cr22-action-editclear.png → pics/crystalsvg/cr22-action-edit-clear.png View File


pics/crystalsvg/cr22-action-editcopy.png → pics/crystalsvg/cr22-action-edit-copy.png View File


pics/crystalsvg/cr22-action-editcut.png → pics/crystalsvg/cr22-action-edit-cut.png View File


pics/crystalsvg/cr22-action-editdelete.png → pics/crystalsvg/cr22-action-edit-delete.png View File


pics/crystalsvg/cr22-action-editpaste.png → pics/crystalsvg/cr22-action-edit-paste.png View File


pics/crystalsvg/cr22-action-folder_new.png → pics/crystalsvg/cr22-action-folder-new.png View File


pics/crystalsvg/cr22-action-gohome.png → pics/crystalsvg/cr22-action-go-home.png View File


pics/crystalsvg/cr22-action-fileclose.png → pics/crystalsvg/cr22-action-window-close.png View File


pics/crystalsvg/cr32-action-filenew.png → pics/crystalsvg/cr32-action-document-new.png View File


pics/crystalsvg/cr32-action-fileopen.png → pics/crystalsvg/cr32-action-document-open.png View File


pics/crystalsvg/cr32-action-filequickprint.png → pics/crystalsvg/cr32-action-document-print-preview.png View File


pics/crystalsvg/cr32-action-fileprint.png → pics/crystalsvg/cr32-action-document-print.png View File


pics/crystalsvg/cr32-action-filesaveas.png → pics/crystalsvg/cr32-action-document-save.png View File


pics/crystalsvg/cr32-action-editclear.png → pics/crystalsvg/cr32-action-edit-clear.png View File


pics/crystalsvg/cr32-action-editcopy.png → pics/crystalsvg/cr32-action-edit-copy.png View File


pics/crystalsvg/cr32-action-editcut.png → pics/crystalsvg/cr32-action-edit-cut.png View File


pics/crystalsvg/cr32-action-editdelete.png → pics/crystalsvg/cr32-action-edit-delete.png View File


pics/crystalsvg/cr32-action-editpaste.png → pics/crystalsvg/cr32-action-edit-paste.png View File


pics/crystalsvg/cr32-action-folder_new.png → pics/crystalsvg/cr32-action-folder-new.png View File


pics/crystalsvg/cr32-action-gohome.png → pics/crystalsvg/cr32-action-go-home.png View File


pics/crystalsvg/cr32-action-fileclose.png → pics/crystalsvg/cr32-action-window-close.png View File


pics/crystalsvg/cr48-action-filenew.png → pics/crystalsvg/cr48-action-document-new.png View File


pics/crystalsvg/cr48-action-filequickprint.png → pics/crystalsvg/cr48-action-document-print-preview.png View File


pics/crystalsvg/cr48-action-fileprint.png → pics/crystalsvg/cr48-action-document-print.png View File


pics/crystalsvg/cr48-action-gohome.png → pics/crystalsvg/cr48-action-go-home.png View File


pics/crystalsvg/cr48-action-fileclose.png → pics/crystalsvg/cr48-action-window-close.png View File


pics/crystalsvg/cr64-action-fileopen.png → pics/crystalsvg/cr64-action-document-open.png View File


+ 1
- 1
tdecore/tdeapplication.h View File

@@ -648,7 +648,7 @@ public slots:
648 648
    * If the widget with focus provides a clear() slot, call that slot.  Thus for a
649 649
    * simple application clear() can be implemented as:
650 650
    * \code
651
-   * new TDEAction( i18n( "Clear" ), "editclear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" );
651
+   * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" );
652 652
    * \endcode
653 653
    *
654 654
    * Note that for some widgets, this may not provide the intended bahavior.  For

+ 1
- 1
tdehtml/tdehtml_part.cpp View File

@@ -1088,7 +1088,7 @@ KJSErrorDlg *TDEHTMLPart::jsErrorExtension() {
1088 1088
     d->m_jsedlg->setURL(m_url.prettyURL());
1089 1089
     if (TDEGlobalSettings::showIconsOnPushButtons()) {
1090 1090
       d->m_jsedlg->_clear->setIconSet(SmallIconSet("locationbar_erase"));
1091
-      d->m_jsedlg->_close->setIconSet(SmallIconSet("fileclose"));
1091
+      d->m_jsedlg->_close->setIconSet(SmallIconSet("window-close"));
1092 1092
     }
1093 1093
   }
1094 1094
   return d->m_jsedlg;

+ 1
- 1
tdehtml/testtdehtml.cpp View File

@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
109 109
     (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
110 110
     TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" );
111 111
     kprint->setEnabled(true);
112
-    TDEToggleAction *ta = new TDEToggleAction( "Navigable", "editclear", 0, doc->actionCollection(), "navigable" );
112
+    TDEToggleAction *ta = new TDEToggleAction( "Navigable", "edit-clear", 0, doc->actionCollection(), "navigable" );
113 113
     ta->setChecked(doc->isCaretMode());
114 114
     TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) ));
115 115
     ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" );

+ 4
- 4
tdeio/bookmarks/kbookmarkmenu.cc View File

@@ -276,7 +276,7 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address,
276 276
     id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQT_SLOT(slotRMBActionEditAt(int)) );
277 277
     contextMenu->setItemParameter( id, val );
278 278
     contextMenu->insertSeparator();
279
-    id = contextMenu->insertItem( SmallIcon("editdelete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
279
+    id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
280 280
     contextMenu->setItemParameter( id, val );
281 281
     contextMenu->insertSeparator();
282 282
     id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) );
@@ -287,7 +287,7 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address,
287 287
     id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQT_SLOT(slotRMBActionCopyLocation(int)) );
288 288
     contextMenu->setItemParameter( id, val );
289 289
     contextMenu->insertSeparator();
290
-    id = contextMenu->insertItem( SmallIcon("editdelete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
290
+    id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
291 291
     contextMenu->setItemParameter( id, val );
292 292
     contextMenu->insertSeparator();
293 293
     id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) );
@@ -541,7 +541,7 @@ void KBookmarkMenu::addNewFolder()
541 541
     title.remove( p, 1 );
542 542
 
543 543
   TDEAction * paNewFolder = new TDEAction( title,
544
-                                       "folder_new", //"folder",
544
+                                       "folder-new", //"folder",
545 545
                                        0,
546 546
                                        this,
547 547
                                        TQT_SLOT( slotNewFolder() ),
@@ -828,7 +828,7 @@ KBookmarkEditDialog::KBookmarkEditDialog(const TQString& title, const TQString&
828 828
 {
829 829
   setButtonOK( (editType == InsertionMode) ? KGuiItem( i18n( "&Add" ), "bookmark_add") : i18n( "&Update" ) );
830 830
   if (editType == InsertionMode) {
831
-    setButtonGuiItem( User1, KGuiItem( i18n( "&New Folder..." ), "folder_new") );
831
+    setButtonGuiItem( User1, KGuiItem( i18n( "&New Folder..." ), "folder-new") );
832 832
   }
833 833
 
834 834
   bool folder = url.isNull();

+ 3
- 3
tdeio/misc/tdewalletd/tdewalletd.cpp View File

@@ -440,7 +440,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
440 440
 					kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</b>'. Please enter the password for this wallet below.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet)));
441 441
 				}
442 442
 				brandNew = false;
443
-				kpd->setButtonOK(KGuiItem(i18n("&Open"),"fileopen"));
443
+				kpd->setButtonOK(KGuiItem(i18n("&Open"),"document-open"));
444 444
 			} else {
445 445
 				emptyPass = true;
446 446
 			}
@@ -454,7 +454,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
454 454
 				kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to open the TDE wallet. This is used to store sensitive data in a secure fashion. Please enter a password to use with this wallet or click cancel to deny the application's request.").arg(TQStyleSheet::escape(appid)));
455 455
 			}
456 456
 			brandNew = true;
457
-			kpd->setButtonOK(KGuiItem(i18n("&Open"),"fileopen"));
457
+			kpd->setButtonOK(KGuiItem(i18n("&Open"),"document-open"));
458 458
 		} else {
459 459
 			kpd = new KPasswordDialog(KPasswordDialog::NewPassword, false, 0);
460 460
 			if (appid.length() == 0) {
@@ -463,7 +463,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
463 463
 				kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to create a new wallet named '<b>%2</b>'. Please choose a password for this wallet, or cancel to deny the application's request.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet)));
464 464
 			}
465 465
 			brandNew = true;
466
-			kpd->setButtonOK(KGuiItem(i18n("C&reate"),"filenew"));
466
+			kpd->setButtonOK(KGuiItem(i18n("C&reate"),"document-new"));
467 467
 		}
468 468
 
469 469
 		if (kpd) {

+ 2
- 2
tdeio/misc/uiserver.cpp View File

@@ -97,7 +97,7 @@ class UIServerSystemTray:public KSystemTray
97 97
          TDEPopupMenu* pop= contextMenu();
98 98
          pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
99 99
          pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
100
-         setPixmap(loadIcon("filesave"));
100
+         setPixmap(loadIcon("document-save"));
101 101
          //actionCollection()->action("file_quit")->setEnabled(true);
102 102
          KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection());
103 103
       }
@@ -595,7 +595,7 @@ UIServer::UIServer()
595 595
   readSettings();
596 596
 
597 597
   // setup toolbar
598
-  toolBar()->insertButton("editdelete", TOOL_CANCEL,
598
+  toolBar()->insertButton("edit-delete", TOOL_CANCEL,
599 599
                           TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
600 600
                           TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
601 601
   toolBar()->insertButton("configure", TOOL_CONFIGURE,

+ 2
- 2
tdeio/tdefile/kdirselectdialog.cpp View File

@@ -89,7 +89,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
89 89
                                    bool modal)
90 90
     : KDialogBase( parent, name, modal, i18n("Select Folder"),
91 91
                    Ok|Cancel|User1, Ok, false,
92
-                   KGuiItem( i18n("New Folder..."), "folder_new" ) ),
92
+                   KGuiItem( i18n("New Folder..."), "folder-new" ) ),
93 93
       m_localOnly( localOnly )
94 94
 {
95 95
     d = new KDirSelectDialogPrivate;
@@ -122,7 +122,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
122 122
              TQT_SLOT( slotComboTextChanged( const TQString& ) ));
123 123
 
124 124
     m_contextMenu = new TQPopupMenu( this );
125
-    TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
125
+    TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
126 126
     newFolder->plug(m_contextMenu);
127 127
     m_contextMenu->insertSeparator();
128 128
     m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),

+ 2
- 2
tdeio/tdefile/kurlbar.cpp View File

@@ -752,11 +752,11 @@ void KURLBar::slotContextMenuRequested( TQListBoxItem *_item, const TQPoint& pos
752 752
         popup->insertSeparator();
753 753
     }
754 754
 
755
-    popup->insertItem(SmallIconSet("filenew"), i18n("&Add Entry..."), AddItem);
755
+    popup->insertItem(SmallIconSet("document-new"), i18n("&Add Entry..."), AddItem);
756 756
 
757 757
     if (item != 0L && item->isPersistent())
758 758
     {
759
-        popup->insertItem( SmallIconSet("editdelete"), i18n("&Remove Entry"),
759
+        popup->insertItem( SmallIconSet("edit-delete"), i18n("&Remove Entry"),
760 760
                           RemoveItem );
761 761
     }
762 762
 

+ 1
- 1
tdeio/tdefile/kurlrequester.cpp View File

@@ -206,7 +206,7 @@ void KURLRequester::init()
206 206
 	d->edit = new KLineEdit( this, "line edit" );
207 207
 
208 208
     myButton = new KURLDragPushButton( this, "tdefile button");
209
-    TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
209
+    TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("document-open"));
210 210
     TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
211 211
     myButton->setIconSet( iconSet );
212 212
     myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );

+ 2
- 2
tdeio/tdefile/tdediroperator.cpp View File

@@ -1271,9 +1271,9 @@ void KDirOperator::setupActions()
1271 1271
     TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
1272 1272
     connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
1273 1273
 	     this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) );
1274
-    new TDEAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
1274
+    new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
1275 1275
                   TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
1276
-    mkdirAction->setIcon( TQString::fromLatin1("folder_new") );
1276
+    mkdirAction->setIcon( TQString::fromLatin1("folder-new") );
1277 1277
     reloadAction->setText( i18n("Reload") );
1278 1278
     reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload ));
1279 1279
 

+ 1
- 1
tdeio/tdefile/tdefiledialog.cpp View File

@@ -1838,7 +1838,7 @@ void KFileDialog::setOperationMode( OperationMode mode )
1838 1838
     d->keepLocation = (mode == Saving);
1839 1839
     filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving );
1840 1840
     if ( mode == Opening )
1841
-       d->okButton->setGuiItem( KGuiItem( i18n("&Open"), "fileopen") );
1841
+       d->okButton->setGuiItem( KGuiItem( i18n("&Open"), "document-open") );
1842 1842
     else if ( mode == Saving ) {
1843 1843
        d->okButton->setGuiItem( KStdGuiItem::save() );
1844 1844
        setNonExtSelection();

+ 2
- 2
tdeio/tdeio/defaultprogress.cpp View File

@@ -89,8 +89,8 @@ void DefaultProgress::init()
89 89
 #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS
90 90
   // Set a useful icon for this window!
91 91
   KWin::setIcons( winId(),
92
-          TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 32 ),
93
-          TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 16 ) );
92
+          TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 32 ),
93
+          TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 16 ) );
94 94
 #endif
95 95
 
96 96
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),

+ 1
- 1
tdemdi/tdemdichildfrm.cpp View File

@@ -143,7 +143,7 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
143 143
 	TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) );
144 144
 	TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) );
145 145
 
146
-	m_pIconButtonPixmap = new TQPixmap( SmallIcon( "filenew" ) );
146
+	m_pIconButtonPixmap = new TQPixmap( SmallIcon( "document-new" ) );
147 147
 	if ( m_pIconButtonPixmap->isNull() )
148 148
 		* m_pIconButtonPixmap = TQPixmap( filenew );
149 149
 

+ 1
- 1
tdeparts/browserrun.cpp View File

@@ -350,7 +350,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ
350 350
 
351 351
     int choice = KMessageBox::questionYesNoCancel(
352 352
         0L, question, url.host(),
353
-        KStdGuiItem::saveAs(), KGuiItem( i18n( "&Open" ), "fileopen"),
353
+        KStdGuiItem::saveAs(), KGuiItem( i18n( "&Open" ), "document-open"),
354 354
         TQString::fromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
355 355
     return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel );
356 356
     // SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC

+ 1
- 1
tdeparts/tests/ghostview.cpp View File

@@ -20,7 +20,7 @@ Shell::Shell()
20 20
 {
21 21
   setXMLFile( "ghostviewtest_shell.rc" );
22 22
 
23
-  TDEAction * paOpen = new TDEAction( "&Open file" , "fileopen", 0, this,
23
+  TDEAction * paOpen = new TDEAction( "&Open file" , "document-open", 0, this,
24 24
     TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" );
25 25
 
26 26
   TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" );

+ 1
- 1
tdeprint/cups/cupsdconf2/cupsdjobspage.cpp View File

@@ -33,7 +33,7 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name)
33 33
 {
34 34
 	setPageLabel(i18n("Jobs"));
35 35
 	setHeader(i18n("Print Jobs Settings"));
36
-	setPixmap("fileprint");
36
+	setPixmap("document-print");
37 37
 
38 38
 	keepjobhistory_ = new TQCheckBox(i18n("Preserve job history"), this);
39 39
 	keepjobfiles_ = new TQCheckBox(i18n("Preserve job files"), this);

+ 2
- 2
tdeprint/cups/cupsdconf2/editlist.cpp View File

@@ -30,9 +30,9 @@ EditList::EditList(TQWidget *parent, const char *name)
30 30
 	: TQWidget(parent, name)
31 31
 {
32 32
 	list_ = new TDEListBox(this);
33
-	addbtn_ = new KPushButton(KGuiItem(i18n("Add..."), "filenew"), this);
33
+	addbtn_ = new KPushButton(KGuiItem(i18n("Add..."), "document-new"), this);
34 34
 	editbtn_ = new KPushButton(KGuiItem(i18n("Edit..."), "edit"), this);
35
-	delbtn_ = new KPushButton(KGuiItem(i18n("Delete"), "editdelete"), this);
35
+	delbtn_ = new KPushButton(KGuiItem(i18n("Delete"), "edit-delete"), this);
36 36
 	defbtn_ = new KPushButton(KGuiItem(i18n("Default List"), "history"), this);
37 37
 
38 38
 	TQGridLayout *m1 = new TQGridLayout(this, 4, 2, 0, 0);

+ 1
- 1
tdeprint/cups/cupsdconf2/qdirlineedit.cpp View File

@@ -30,7 +30,7 @@ QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name)
30 30
 {
31 31
 	edit_ = new TQLineEdit(this);
32 32
 	button_ = new KPushButton(this);
33
-	button_->setPixmap(SmallIcon("fileopen"));
33
+	button_->setPixmap(SmallIcon("document-open"));
34 34
 	connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked()));
35 35
 
36 36
 	TQHBoxLayout	*main_ = new TQHBoxLayout(this, 0, 3);

+ 2
- 2
tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp View File

@@ -37,10 +37,10 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
37 37
 	connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*)));
38 38
 
39 39
 	m_add = new TQPushButton(this);
40
-	m_add->setPixmap(SmallIcon("folder_new"));
40
+	m_add->setPixmap(SmallIcon("folder-new"));
41 41
 	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked()));
42 42
 	m_remove = new TQPushButton(this);
43
-	m_remove->setPixmap(SmallIcon("editdelete"));
43
+	m_remove->setPixmap(SmallIcon("edit-delete"));
44 44
 	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked()));
45 45
 	m_remove->setEnabled(false);
46 46
 

+ 2
- 2
tdeprint/cups/ippreportdlg.cpp View File

@@ -31,14 +31,14 @@
31 31
 #include <tqpaintdevicemetrics.h>
32 32
 
33 33
 IppReportDlg::IppReportDlg(TQWidget *parent, const char *name)
34
-: KDialogBase(parent, name, true, i18n("IPP Report"), Close|User1, Close, false, KGuiItem(i18n("&Print"), "fileprint"))
34
+: KDialogBase(parent, name, true, i18n("IPP Report"), Close|User1, Close, false, KGuiItem(i18n("&Print"), "document-print"))
35 35
 {
36 36
 	m_edit = new KTextEdit(this);
37 37
 	m_edit->setReadOnly(true);
38 38
 	setMainWidget(m_edit);
39 39
 	resize(540, 500);
40 40
 	setFocusProxy(m_edit);
41
-	setButtonGuiItem(User1, KGuiItem(i18n("&Print"),"fileprint"));
41
+	setButtonGuiItem(User1, KGuiItem(i18n("&Print"),"document-print"));
42 42
 }
43 43
 
44 44
 void IppReportDlg::slotUser1()

+ 1
- 1
tdeprint/cups/kmpropbanners.cpp View File

@@ -48,7 +48,7 @@ KMPropBanners::KMPropBanners(TQWidget *parent, const char *name)
48 48
 
49 49
 	m_title = i18n("Banners");
50 50
 	m_header = i18n("Banner Settings");
51
-	m_pixmap = "editcopy";
51
+	m_pixmap = "edit-copy";
52 52
 }
53 53
 
54 54
 KMPropBanners::~KMPropBanners()

+ 1
- 1
tdeprint/driveritem.cpp View File

@@ -28,7 +28,7 @@ DriverItem::DriverItem(TQListView *parent, DrBase *item)
28 28
 : TQListViewItem(parent), m_item(item), m_conflict(false)
29 29
 {
30 30
 	setOpen(depth() < 3);
31
-	setPixmap(0,SmallIcon("fileprint"));
31
+	setPixmap(0,SmallIcon("document-print"));
32 32
 	updateText();
33 33
 }
34 34
 

+ 1
- 1
tdeprint/kprintdialog.cpp View File

@@ -304,7 +304,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
304 304
 	d->m_wizard->setMinimumSize(TQSize(d->m_printers->minimumHeight(),d->m_printers->minimumHeight()));
305 305
 	TQToolTip::add(d->m_wizard, i18n("Add printer..."));
306 306
 	TQWhatsThis::add(d->m_wizard, whatsThisAddPrinterWizard);
307
-	d->m_ok = new KPushButton(KGuiItem(i18n("&Print"), "fileprint"), this);
307
+	d->m_ok = new KPushButton(KGuiItem(i18n("&Print"), "document-print"), this);
308 308
         TQWhatsThis::add( d->m_ok, whatsThisPrintButton);
309 309
 	d->m_ok->setDefault(true);
310 310
 	d->m_ok->setEnabled( false );

+ 3
- 3
tdeprint/kprintpreview.cpp View File

@@ -138,7 +138,7 @@ static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOn
138 138
 	else
139 139
 	{
140 140
 		msg.append(" ").append(i18n("Do you want to continue printing anyway?"));
141
-		return (KMessageBox::warningContinueCancel(parent, msg, TQString::null, KGuiItem(i18n("Print"),"fileprint")) == KMessageBox::Continue);
141
+		return (KMessageBox::warningContinueCancel(parent, msg, TQString::null, KGuiItem(i18n("Print"),"document-print")) == KMessageBox::Continue);
142 142
 	}
143 143
 }
144 144
 
@@ -157,7 +157,7 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
157 157
 		KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print");
158 158
 	else
159 159
 	{
160
-		new TDEAction(i18n("Print"), "fileprint", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print");
160
+		new TDEAction(i18n("Print"), "document-print", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print");
161 161
 		new TDEAction(i18n("Cancel"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print");
162 162
 	}
163 163
 
@@ -319,7 +319,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
319 319
 	}
320 320
 	else if (!previewOnly)
321 321
 	{
322
-		return (KMessageBox::questionYesNo(parentW, i18n("Do you want to continue printing?"), TQString::null, KGuiItem(i18n("Print"),"fileprint"), KStdGuiItem::cancel(), "continuePrinting") == KMessageBox::Yes);
322
+		return (KMessageBox::questionYesNo(parentW, i18n("Do you want to continue printing?"), TQString::null, KGuiItem(i18n("Print"),"document-print"), KStdGuiItem::cancel(), "continuePrinting") == KMessageBox::Yes);
323 323
 	}
324 324
 	else
325 325
 		return false;

+ 1
- 1
tdeprint/lpr/editentrydialog.cpp View File

@@ -75,7 +75,7 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c
75 75
 		TQListViewItem	*root = new TQListViewItem(m_view, entry->name), *item = 0;
76 76
 		root->setSelectable(false);
77 77
 		root->setOpen(true);
78
-		root->setPixmap(0, SmallIcon("fileprint"));
78
+		root->setPixmap(0, SmallIcon("document-print"));
79 79
 		for (TQMap<TQString,Field>::ConstIterator it=m_fields.begin(); it!=m_fields.end(); ++it)
80 80
 			item = new TQListViewItem(root, item, (*it).toString(), it.key());
81 81
 	}

+ 1
- 1
tdeprint/management/kmconfigfonts.cpp View File

@@ -57,7 +57,7 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
57 57
 	m_up = new KPushButton(KGuiItem(i18n("&Up"), "go-up"), box2);
58 58
 	m_down = new KPushButton(KGuiItem(i18n("&Down"), "go-down"), box2);
59 59
 	m_add = new KPushButton(KGuiItem(i18n("&Add"), "add"), box2);
60
-	m_remove = new KPushButton(KGuiItem(i18n("&Remove"), "editdelete"), box2);
60
+	m_remove = new KPushButton(KGuiItem(i18n("&Remove"), "edit-delete"), box2);
61 61
 	TQLabel	*lab0 = new TQLabel(i18n("Additional director&y:"), box2);
62 62
 	lab0->setBuddy(m_addpath);
63 63
 

+ 1
- 1
tdeprint/management/kmconfiggeneral.cpp View File

@@ -43,7 +43,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
43 43
 {
44 44
 	setPageName(i18n("General"));
45 45
 	setPageHeader(i18n("General Settings"));
46
-	setPagePixmap("fileprint");
46
+	setPagePixmap("document-print");
47 47
 
48 48
 	TQGroupBox	*m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this);
49 49
 	m_timer = new KIntNumInput(m_timerbox,"Timer");

+ 1
- 1
tdeprint/management/kmdriverdbwidget.cpp View File

@@ -52,7 +52,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
52 52
 	m_raw = new TQCheckBox(i18n("&Raw printer (no driver needed)"),this);
53 53
 	m_postscript->setCursor(KCursor::handCursor());
54 54
 	m_raw->setCursor(KCursor::handCursor());
55
-	m_other = new KPushButton(KGuiItem(i18n("&Other..."), "fileopen"), this);
55
+	m_other = new KPushButton(KGuiItem(i18n("&Other..."), "document-open"), this);
56 56
 	TQLabel	*l1 = new TQLabel(i18n("&Manufacturer:"), this);
57 57
 	TQLabel	*l2 = new TQLabel(i18n("Mo&del:"), this);
58 58
 	l1->setBuddy(m_manu);

+ 4
- 4
tdeprint/management/kminstancepage.cpp View File

@@ -84,14 +84,14 @@ void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, cons
84 84
 
85 85
 void KMInstancePage::initActions()
86 86
 {
87
-	addButton(i18n("New..."), "filenew", TQT_SLOT(slotNew()));
88
-	addButton(i18n("Copy..."), "editcopy", TQT_SLOT(slotCopy()));
87
+	addButton(i18n("New..."), "document-new", TQT_SLOT(slotNew()));
88
+	addButton(i18n("Copy..."), "edit-copy", TQT_SLOT(slotCopy()));
89 89
 	addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove()));
90 90
 	m_buttons.append(0);
91 91
 	addButton(i18n("Set as Default"), "exec", TQT_SLOT(slotDefault()));
92 92
 	addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings()));
93 93
 	m_buttons.append(0);
94
-	addButton(i18n("Test..."), "fileprint", TQT_SLOT(slotTest()));
94
+	addButton(i18n("Test..."), "document-print", TQT_SLOT(slotTest()));
95 95
 }
96 96
 
97 97
 void KMInstancePage::setPrinter(KMPrinter *p)
@@ -110,7 +110,7 @@ void KMInstancePage::setPrinter(KMPrinter *p)
110 110
 		for (;it.current();++it)
111 111
 		{
112 112
 			TQStringList	pair = TQStringList::split('/',it.current()->name(),false);
113
-			m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "exec" : "fileprint")),(pair.count() > 1 ? pair[1] : i18n("(Default)")));
113
+			m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "exec" : "document-print")),(pair.count() > 1 ? pair[1] : i18n("(Default)")));
114 114
 		}
115 115
 		m_view->sort();
116 116
 	}

+ 3
- 3
tdeprint/management/kmjobviewer.cpp View File

@@ -145,7 +145,7 @@ void KMJobViewer::updateCaption()
145 145
 	if (!m_standalone)
146 146
 		return;
147 147
 
148
-	TQString	pixname("fileprint");
148
+	TQString	pixname("document-print");
149 149
 	if (!m_prname.isEmpty())
150 150
 	{
151 151
 		setCaption(i18n("Print Jobs for %1").arg(m_prname));
@@ -263,7 +263,7 @@ void KMJobViewer::initActions()
263 263
 	TDEAction	*ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
264 264
 	TDEAction	*dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
265 265
 	TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
266
-	TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move");
266
+	TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move");
267 267
 	mact->setDelayed(false);
268 268
 	connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int)));
269 269
 	connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
@@ -353,7 +353,7 @@ void KMJobViewer::buildPrinterMenu(TQPopupMenu *menu, bool use_all, bool use_spe
353 353
 	int	i(0);
354 354
 	if (use_all)
355 355
 	{
356
-		menu->insertItem(SmallIcon("fileprint"), i18n("All Printers"), i++);
356
+		menu->insertItem(SmallIcon("document-print"), i18n("All Printers"), i++);
357 357
 		menu->insertSeparator();
358 358
 	}
359 359
 	for (; it.current(); ++it, i++)

+ 1
- 1
tdeprint/management/kmpages.cpp View File

@@ -66,7 +66,7 @@ void KMPages::initialize()
66 66
 
67 67
 	// Instance page
68 68
 	KMInstancePage	*instpage = new KMInstancePage(this, "Instance");
69
-	addTab(instpage, SmallIcon("fileprint"), i18n("Instances"));
69
+	addTab(instpage, SmallIcon("document-print"), i18n("Instances"));
70 70
 	m_pages.append(instpage);
71 71
 
72 72
 	// initialize pages

+ 1
- 1
tdeprint/management/kmspecialprinterdlg.cpp View File

@@ -89,7 +89,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
89 89
 	m_extensionlabel->setBuddy(m_extension);
90 90
 
91 91
 	m_icon = new TDEIconButton(dummy);
92
-	m_icon->setIcon("fileprint");
92
+	m_icon->setIcon("document-print");
93 93
 	m_icon->setFixedSize(TQSize(48,48));
94 94
 
95 95
 	connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetype, TQT_SLOT( setEnabled( bool ) ) );

+ 6
- 6
tdeprint/management/kxmlcommanddlg.cpp View File

@@ -95,7 +95,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
95 95
 	m_addopt = new TQToolButton(this);
96 96
 	m_addopt->setIconSet(SmallIconSet("document"));
97 97
 	m_delopt = new TQToolButton(this);
98
-	m_delopt->setIconSet(SmallIconSet("editdelete"));
98
+	m_delopt->setIconSet(SmallIconSet("edit-delete"));
99 99
 	m_up = new TQToolButton(this);
100 100
 	m_up->setIconSet(SmallIconSet("go-up"));
101 101
 	m_down = new TQToolButton(this);
@@ -144,9 +144,9 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
144 144
 	m_values->setSorting(-1);
145 145
 	m_values->setMaximumHeight(110);
146 146
 	m_addval = new TQToolButton(w2);
147
-	m_addval->setIconSet(SmallIconSet("editcopy"));
147
+	m_addval->setIconSet(SmallIconSet("edit-copy"));
148 148
 	m_delval = new TQToolButton(w2);
149
-	m_delval->setIconSet(SmallIconSet("editdelete"));
149
+	m_delval->setIconSet(SmallIconSet("edit-delete"));
150 150
 	TQToolTip::add(m_addval, i18n("Add value"));
151 151
 	TQToolTip::add(m_delval, i18n("Delete value"));
152 152
 
@@ -370,7 +370,7 @@ void KXmlCommandAdvancedDlg::parseXmlCommand(KXmlCommand *xmlcmd)
370 370
 	TQListViewItem	*root = new TQListViewItem(m_view, xmlcmd->name(), xmlcmd->name());
371 371
 	DrMain	*driver = xmlcmd->driver();
372 372
 
373
-	root->setPixmap(0, SmallIcon("fileprint"));
373
+	root->setPixmap(0, SmallIcon("document-print"));
374 374
 	root->setOpen(true);
375 375
 	if (driver)
376 376
 	{
@@ -845,9 +845,9 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
845 845
 	m_requirements->addColumn("");
846 846
 	m_requirements->header()->hide();
847 847
 	m_addreq = new TQToolButton(m_gb2);
848
-	m_addreq->setIconSet(SmallIconSet("filenew"));
848
+	m_addreq->setIconSet(SmallIconSet("document-new"));
849 849
 	m_removereq = new TQToolButton(m_gb2);
850
-	m_removereq->setIconSet(SmallIconSet("editdelete"));
850
+	m_removereq->setIconSet(SmallIconSet("edit-delete"));
851 851
 	TQPushButton	*m_edit = new KPushButton(KGuiItem(i18n("&Edit Command..."), "edit"), topmain);
852 852
 	m_mimetype = new TQComboBox(dummy);
853 853
 	m_availablemime = new TDEListBox(m_gb1);

+ 2
- 2
tdeprint/management/kxmlcommandselector.cpp View File

@@ -47,7 +47,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
47 47
 	connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int)));
48 48
 	TQPushButton	*m_add = new KPushButton(this);
49 49
 	TQPushButton	*m_edit = new KPushButton(this);
50
-	m_add->setPixmap(SmallIcon("filenew"));
50
+	m_add->setPixmap(SmallIcon("document-new"));
51 51
 	m_edit->setPixmap(SmallIcon("configure"));
52 52
 	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand()));
53 53
 	connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand()));
@@ -69,7 +69,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
69 69
 	if (canBeNull)
70 70
 	{
71 71
 		m_line = new TQLineEdit(this);
72
-		m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "fileopen"), this);
72
+		m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "document-open"), this);
73 73
 		m_usefilter = new TQCheckBox(i18n("Use co&mmand:"), this);
74 74
 		connect(m_browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse()));
75 75
 		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_line, TQT_SLOT(setDisabled(bool)));

+ 1
- 1
tdeprint/tdefilelist.cpp View File

@@ -110,7 +110,7 @@ KFileList::KFileList(TQWidget *parent, const char *name)
110 110
 	connect(m_files, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
111 111
 
112 112
 	m_add = new TQToolButton(this);
113
-	m_add->setIconSet(SmallIconSet("fileopen"));
113
+	m_add->setIconSet(SmallIconSet("document-open"));
114 114
 	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFile()));
115 115
 	TQToolTip::add(m_add, i18n("Add file"));
116 116
 	TQWhatsThis::add(m_add, whatsThisAddFileButton);

+ 2
- 2
tdeprint/tdeprintd.cpp View File

@@ -69,9 +69,9 @@ StatusWindow::StatusWindow(int pid)
69 69
 	m_label->setAlignment(AlignCenter);
70 70
 	m_button = new KPushButton(KStdGuiItem::close(), this);
71 71
 	m_icon = new TQLabel(this);
72
-	m_icon->setPixmap(DesktopIcon("fileprint"));
72
+	m_icon->setPixmap(DesktopIcon("document-print"));
73 73
 	m_icon->setAlignment(AlignCenter);
74
-	KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("fileprint"));
74
+	KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("document-print"));
75 75
 	TQGridLayout	*l0 = new TQGridLayout(this, 2, 3, 10, 10);
76 76
 	l0->setRowStretch(0, 1);
77 77
 	l0->setColStretch(1, 1);

+ 1
- 1
tdeui/kcombobox.cpp View File

@@ -729,7 +729,7 @@ void KHistoryComboEditor::virtual_hook( int id, void* data )
729 729
 KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget *parent )
730 730
 : KDialogBase( parent, "khistorycomboeditor", true, i18n( "History Editor" ),
731 731
     KDialogBase::Close | KDialogBase::User1, KDialogBase::User1, true,
732
-    KGuiItem( i18n( "&Delete Entry" ), "editdelete") ), d(0)
732
+    KGuiItem( i18n( "&Delete Entry" ), "edit-delete") ), d(0)
733 733
 {
734 734
     TQVBox* box = new TQVBox( this );
735 735
     box->setSpacing( KDialog::spacingHint() );

+ 5
- 5
tdeui/keditcl2.cpp View File

@@ -1112,15 +1112,15 @@ TQPopupMenu *KEdit::createPopupMenu( const TQPoint& pos )
1112 1112
     TQPopupMenu *menu = TQMultiLineEdit::createPopupMenu( pos );
1113 1113
     
1114 1114
     if ( isReadOnly() )
1115
-      menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) );
1115
+      menu->changeItem( menu->idAt(0), SmallIconSet("edit-copy"), menu->text( menu->idAt(0) ) );
1116 1116
     else {
1117 1117
       int id = menu->idAt(0);
1118 1118
       menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) );
1119 1119
       menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) );
1120
-      menu->changeItem( id - IdCut, SmallIconSet("editcut"), menu->text( id - IdCut) );
1121
-      menu->changeItem( id - IdCopy, SmallIconSet("editcopy"), menu->text( id - IdCopy) );
1122
-      menu->changeItem( id - IdPaste, SmallIconSet("editpaste"), menu->text( id - IdPaste) );
1123
-      menu->changeItem( id - IdClear, SmallIconSet("editclear"), menu->text( id - IdClear) );
1120
+      menu->changeItem( id - IdCut, SmallIconSet("edit-cut"), menu->text( id - IdCut) );
1121
+      menu->changeItem( id - IdCopy, SmallIconSet("edit-copy"), menu->text( id - IdCopy) );
1122
+      menu->changeItem( id - IdPaste, SmallIconSet("edit-paste"), menu->text( id - IdPaste) );
1123
+      menu->changeItem( id - IdClear, SmallIconSet("edit-clear"), menu->text( id - IdClear) );
1124 1124
     }
1125 1125
 
1126 1126
     return menu;

+ 2
- 2
tdeui/kedittoolbar.cpp View File

@@ -767,10 +767,10 @@ void KEditToolbarWidget::setupLayout()
767 767
           this,           TQT_SLOT(slotToolbarSelected(const TQString&)));
768 768
 
769 769
 //  TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this);
770
-//  new_toolbar->setPixmap(BarIcon("filenew", TDEIcon::SizeSmall));
770
+//  new_toolbar->setPixmap(BarIcon("document-new", TDEIcon::SizeSmall));
771 771
 //  new_toolbar->setEnabled(false); // disabled until implemented
772 772
 //  TQPushButton *del_toolbar = new TQPushButton(i18n("&Delete"), this);
773
-//  del_toolbar->setPixmap(BarIcon("editdelete", TDEIcon::SizeSmall));
773
+//  del_toolbar->setPixmap(BarIcon("edit-delete", TDEIcon::SizeSmall));
774 774
 //  del_toolbar->setEnabled(false); // disabled until implemented
775 775
 
776 776
   // our list of inactive actions

+ 4
- 4
tdeui/klineedit.cpp View File

@@ -868,10 +868,10 @@ TQPopupMenu *KLineEdit::createPopupMenu()
868 868
       int id = popup->idAt(0);
869 869
       popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) );
870 870
       popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) );
871
-      popup->changeItem( id - IdCut, SmallIconSet("editcut"), popup->text( id - IdCut) );
872
-      popup->changeItem( id - IdCopy, SmallIconSet("editcopy"), popup->text( id - IdCopy) );
873
-      popup->changeItem( id - IdPaste, SmallIconSet("editpaste"), popup->text( id - IdPaste) );
874
-      popup->changeItem( id - IdClear, SmallIconSet("editclear"), popup->text( id - IdClear) );
871
+      popup->changeItem( id - IdCut, SmallIconSet("edit-cut"), popup->text( id - IdCut) );
872
+      popup->changeItem( id - IdCopy, SmallIconSet("edit-copy"), popup->text( id - IdCopy) );
873
+      popup->changeItem( id - IdPaste, SmallIconSet("edit-paste"), popup->text( id - IdPaste) );
874
+      popup->changeItem( id - IdClear, SmallIconSet("edit-clear"), popup->text( id - IdClear) );
875 875
 
876 876
     // If a completion object is present and the input
877 877
     // widget is not read-only, show the Text Completion

+ 1
- 1
tdeui/kstdaction.h View File

@@ -50,7 +50,7 @@ class TDEToggleFullScreenAction;
50 50
  * for regular actions.  For example, if you previously had:
51 51
  *
52 52
  * \code
53
- * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("filenew")),
53
+ * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("document-new")),
54 54
  *                               TDEStdAccel::shortcut(TDEStdAccel::New), this,
55 55
  *                               TQT_SLOT(fileNew()), actionCollection());
56 56
  * \endcode

+ 14
- 14
tdeui/kstdaction_p.h View File

@@ -37,25 +37,25 @@ struct KStdActionInfo
37 37
 
38 38
 static const KStdActionInfo g_rgActionInfo[] =
39 39
 {
40
-	{ New,           TDEStdAccel::New, "file_new", I18N_NOOP("&New"), 0, "filenew" },
41
-	{ Open,          TDEStdAccel::Open, "file_open", I18N_NOOP("&Open..."), 0, "fileopen" },
42
-	{ OpenRecent,    TDEStdAccel::AccelNone, "file_open_recent", I18N_NOOP("Open &Recent"), 0, "fileopen" },
43
-	{ Save,          TDEStdAccel::Save, "file_save", I18N_NOOP("&Save"), 0, "filesave" },
44
-	{ SaveAs,        TDEStdAccel::AccelNone, "file_save_as", I18N_NOOP("Save &As..."), 0, "filesaveas" },
40
+	{ New,           TDEStdAccel::New, "file_new", I18N_NOOP("&New"), 0, "document-new" },
41
+	{ Open,          TDEStdAccel::Open, "file_open", I18N_NOOP("&Open..."), 0, "document-open" },
42
+	{ OpenRecent,    TDEStdAccel::AccelNone, "file_open_recent", I18N_NOOP("Open &Recent"), 0, "document-open" },
43
+	{ Save,          TDEStdAccel::Save, "file_save", I18N_NOOP("&Save"), 0, "document-save" },
44
+	{ SaveAs,        TDEStdAccel::AccelNone, "file_save_as", I18N_NOOP("Save &As..."), 0, "document-save-as" },
45 45
 	{ Revert,        TDEStdAccel::AccelNone, "file_revert", I18N_NOOP("Re&vert"), 0, "revert" },
46
-	{ Close,         TDEStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "fileclose" },
47
-	{ Print,         TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "fileprint" },
48
-	{ PrintPreview,  TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "filequickprint" },
46
+	{ Close,         TDEStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "window-close" },
47
+	{ Print,         TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "document-print" },
48
+	{ PrintPreview,  TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "document-print-preview" },
49 49
 	{ Mail,          TDEStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail_send" },
50 50
 	{ Quit,          TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" },
51 51
 
52 52
 	{ Undo,          TDEStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "edit-undo" },
53 53
 	{ Redo,          TDEStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "edit-redo" },
54
-	{ Cut,           TDEStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "editcut" },
55
-	{ Copy,          TDEStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "editcopy" },
56
-	{ Paste,         TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" },
57
-	{ PasteText,     TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" },
58
-	{ Clear,         TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "editclear" },
54
+	{ Cut,           TDEStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "edit-cut" },
55
+	{ Copy,          TDEStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "edit-copy" },
56
+	{ Paste,         TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "edit-paste" },
57
+	{ PasteText,     TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "edit-paste" },
58
+	{ Clear,         TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "edit-clear" },
59 59
 	{ SelectAll,     TDEStdAccel::SelectAll, "edit_select_all", I18N_NOOP("Select &All"), 0, 0 },
60 60
 	{ Deselect,      TDEStdAccel::Deselect, "edit_deselect", I18N_NOOP("Dese&lect"), 0, 0 },
61 61
 	{ Find,          TDEStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "edit-find" },
@@ -78,7 +78,7 @@ static const KStdActionInfo g_rgActionInfo[] =
78 78
 	// The following three have special i18n() needs for sLabel
79 79
 	{ Back,          TDEStdAccel::Back, "go_back", 0, 0, "back" },
80 80
 	{ Forward,       TDEStdAccel::Forward, "go_forward", 0, 0, "forward" },
81
-	{ Home,          TDEStdAccel::Home, "go_home", 0, 0, "gohome" },
81
+	{ Home,          TDEStdAccel::Home, "go_home", 0, 0, "go-home" },
82 82
 	{ Prior,         TDEStdAccel::Prior, "go_previous", I18N_NOOP("&Previous Page"), 0, "back" },
83 83
 	{ Next,          TDEStdAccel::Next, "go_next", I18N_NOOP("&Next Page"), 0, "forward" },
84 84
 	{ Goto,          TDEStdAccel::AccelNone, "go_goto", I18N_NOOP("&Go To..."), 0, 0 },

+ 6
- 6
tdeui/kstdguiitem.cpp View File

@@ -124,7 +124,7 @@ KGuiItem KStdGuiItem::discard()
124 124
 
125 125
 KGuiItem KStdGuiItem::save()
126 126
 {
127
-  return KGuiItem( i18n( "&Save" ), "filesave", i18n( "Save data" ) );
127
+  return KGuiItem( i18n( "&Save" ), "document-save", i18n( "Save data" ) );
128 128
 }
129 129
 
130 130
 KGuiItem KStdGuiItem::dontSave()
@@ -135,7 +135,7 @@ KGuiItem KStdGuiItem::dontSave()
135 135
 
136 136
 KGuiItem KStdGuiItem::saveAs()
137 137
 {
138
-  return KGuiItem( i18n( "Save &As..." ), "filesaveas",
138
+  return KGuiItem( i18n( "Save &As..." ), "document-save-as",
139 139
                    i18n( "Save file with another name" ) );
140 140
 }
141 141
 
@@ -171,7 +171,7 @@ KGuiItem KStdGuiItem::help()
171 171
 
172 172
 KGuiItem KStdGuiItem::close()
173 173
 {
174
-  return KGuiItem( i18n( "&Close" ), "fileclose",
174
+  return KGuiItem( i18n( "&Close" ), "window-close",
175 175
                    i18n( "Close the current window or document" ) );
176 176
 }
177 177
 
@@ -204,7 +204,7 @@ TQPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward()
204 204
 
205 205
 KGuiItem KStdGuiItem::print()
206 206
 {
207
-  return KGuiItem( i18n( "&Print..." ), "fileprint",
207
+  return KGuiItem( i18n( "&Print..." ), "document-print",
208 208
                    i18n( "Opens the print dialog to print "
209 209
                          "the current document" ) );
210 210
 }
@@ -217,13 +217,13 @@ KGuiItem KStdGuiItem::cont()
217 217
 
218 218
 KGuiItem KStdGuiItem::del()
219 219
 {
220
-  return KGuiItem( i18n( "&Delete" ), "editdelete",
220
+  return KGuiItem( i18n( "&Delete" ), "edit-delete",
221 221
                    i18n( "Delete item(s)" ) );
222 222
 }
223 223
 
224 224
 KGuiItem KStdGuiItem::open()
225 225
 {
226
-  return KGuiItem( i18n( "&Open..." ), "fileopen",
226
+  return KGuiItem( i18n( "&Open..." ), "document-open",
227 227
                    i18n( "Open file" ) );
228 228
 }
229 229
 

+ 1
- 1
tdeui/ktabbar.cpp View File

@@ -191,7 +191,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
191 191
                 }
192 192
 
193 193
                 mHoverCloseButton = new TQPushButton( this );
194
-                mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, TDEIcon::SizeSmall) );
194
+                mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("window-close", TDEIcon::Toolbar, TDEIcon::SizeSmall) );
195 195
                 mHoverCloseButton->setGeometry( rect );
196 196
                 TQToolTip::add(mHoverCloseButton,i18n("Close this tab"));
197 197
                 mHoverCloseButton->setFlat(true);

+ 5
- 5
tdeui/ktextbrowser.cpp View File

@@ -125,15 +125,15 @@ TQPopupMenu *KTextBrowser::createPopupMenu( const TQPoint & pos )
125 125
     TQPopupMenu *popup = TQTextBrowser::createPopupMenu( pos );
126 126
 
127 127
     if ( isReadOnly() )
128
-      popup->changeItem( popup->idAt(0), SmallIconSet("editcopy"), popup->text( popup->idAt(0) ) );
128
+      popup->changeItem( popup->idAt(0), SmallIconSet("edit-copy"), popup->text( popup->idAt(0) ) );
129 129
     else {
130 130
       int id = popup->idAt(0);
131 131
       popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) );
132 132
       popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) );
133
-      popup->changeItem( id - IdCut, SmallIconSet("editcut"), popup->text( id - IdCut) );
134
-      popup->changeItem( id - IdCopy, SmallIconSet("editcopy"), popup->text( id - IdCopy) );
135
-      popup->changeItem( id - IdPaste, SmallIconSet("editpaste"), popup->text( id - IdPaste) );
136
-      popup->changeItem( id - IdClear, SmallIconSet("editclear"), popup->text( id - IdClear) );
133
+      popup->changeItem( id - IdCut, SmallIconSet("edit-cut"), popup->text( id - IdCut) );
134
+      popup->changeItem( id - IdCopy, SmallIconSet("edit-copy"), popup->text( id - IdCopy) );
135
+      popup->changeItem( id - IdPaste, SmallIconSet("edit-paste"), popup->text( id - IdPaste) );
136
+      popup->changeItem( id - IdClear, SmallIconSet("edit-clear"), popup->text( id - IdClear) );
137 137
     }
138 138
 
139 139
     return popup;

+ 5
- 5
tdeui/ktextedit.cpp View File

@@ -217,15 +217,15 @@ TQPopupMenu *KTextEdit::createPopupMenu( const TQPoint &pos )
217 217
     TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos );
218 218
 
219 219
     if ( isReadOnly() )
220
-      menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) );
220
+      menu->changeItem( menu->idAt(0), SmallIconSet("edit-copy"), menu->text( menu->idAt(0) ) );
221 221
     else {
222 222
       int id = menu->idAt(0);
223 223
       menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) );
224 224
       menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) );
225
-      menu->changeItem( id - IdCut, SmallIconSet("editcut"), menu->text( id - IdCut) );
226
-      menu->changeItem( id - IdCopy, SmallIconSet("editcopy"), menu->text( id - IdCopy) );
227
-      menu->changeItem( id - IdPaste, SmallIconSet("editpaste"), menu->text( id - IdPaste) );
228
-      menu->changeItem( id - IdClear, SmallIconSet("editclear"), menu->text( id - IdClear) );
225
+      menu->changeItem( id - IdCut, SmallIconSet("edit-cut"), menu->text( id - IdCut) );
226
+      menu->changeItem( id - IdCopy, SmallIconSet("edit-copy"), menu->text( id - IdCopy) );
227
+      menu->changeItem( id - IdPaste, SmallIconSet("edit-paste"), menu->text( id - IdPaste) );
228
+      menu->changeItem( id - IdClear, SmallIconSet("edit-clear"), menu->text( id - IdClear) );
229 229
 
230 230
         menu->insertSeparator();
231 231
         id = menu->insertItem( SmallIconSet( "spellcheck" ), i18n( "Check Spelling..." ),

+ 1
- 1
tdeui/tdeaction.h View File

@@ -133,7 +133,7 @@ class TDEMainWindow;
133 133
  *
134 134
  * Here is an example of enabling a "New [document]" action
135 135
  * \code
136
- * TDEAction *newAct = new TDEAction(i18n("&New"), "filenew",
136
+ * TDEAction *newAct = new TDEAction(i18n("&New"), "document-new",
137 137
  *                               TDEStdAccel::shortcut(TDEStdAccel::New),
138 138
  *                               this, TQT_SLOT(fileNew()),
139 139
  *                               actionCollection(), "new");

+ 9
- 9
tdeui/tests/twindowtest.cpp View File

@@ -112,17 +112,17 @@ setAutoSaveSettings();
112 112
 
113 113
     
114 114
     // First four  buttons
115
-    pix = BarIcon("filenew");
115
+    pix = BarIcon("document-new");
116 116
     itemId = tb->insertButton(pix, 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()),
117 117
                          true, "Create.. (toggles upper button)", 50);
118
-    pix = BarIcon("fileopen");
118
+    pix = BarIcon("document-open");
119 119
     tb->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()),
120 120
                          false, "Open");
121 121
     pix = BarIcon("filefloppy");
122 122
     tb->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()),
123 123
                           true, "Save (beep or delayed popup)");
124 124
     tb->setDelayedPopup(2, itemsMenu);
125
-    pix = BarIcon("fileprint");
125
+    pix = BarIcon("document-print");
126 126
     tb->insertButton(pix, 3, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrint()),
127 127
                          true, "Print (enables/disables open)");
128 128
 
@@ -156,12 +156,12 @@ setAutoSaveSettings();
156 156
     tb1 = new TDEToolBar(this, TQMainWindow::DockTop); // this one is normal and has separators
157 157
 
158 158
 
159
-    pix = BarIcon("filenew");
159
+    pix = BarIcon("document-new");
160 160
     tb1->insertButton(pix, 0, true, "Create new file2 (Toggle)");
161 161
     tb1->setToggle(0);
162 162
     tb1->addConnection (0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggle(bool)));
163 163
 
164
-    pix = BarIcon("fileopen");
164
+    pix = BarIcon("document-open");
165 165
     tb1->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()),
166 166
                           true, "Open (starts progres in sb)");
167 167
 
@@ -172,16 +172,16 @@ setAutoSaveSettings();
172 172
                       true, "Save file2 (autorepeat)");
173 173
     tb1->setAutoRepeat(2);
174 174
     
175
-    pix = BarIcon("fileprint");
175
+    pix = BarIcon("document-print");
176 176
     tb1->insertButton(pix, 3, itemsMenu, true, "Print (pops menu)");
177 177
     
178 178
     tb1->insertSeparator ();
179 179
     /**** RADIO BUTTONS */
180
-    pix = BarIcon("filenew");
180
+    pix = BarIcon("document-new");
181 181
     tb1->insertButton(pix, 4, true, "Radiobutton1");
182 182
     tb1->setToggle(4);
183 183
 
184
-    pix = BarIcon("fileopen");
184
+    pix = BarIcon("document-open");
185 185
     tb1->insertButton(pix, 5, true, "Radiobutton2");
186 186
     tb1->setToggle(5);
187 187
     
@@ -189,7 +189,7 @@ setAutoSaveSettings();
189 189
     tb1->insertButton(pix, 6, true, "Radiobutton3");
190 190
     tb1->setToggle(6);
191 191
     
192
-    pix = BarIcon("fileprint");
192
+    pix = BarIcon("document-print");
193 193
     tb1->insertButton(pix, 7, true, "Radiobutton4");
194 194
     tb1->setToggle(7);
195 195
 

Loading…
Cancel
Save