summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-13 15:43:56 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-13 15:43:56 -0500
commitab197a37e3e362ae3980f5bdd9840b0e4703e370 (patch)
tree8778c43175b2f6e2b593ef0edf3f9e5c8518e678
parenta19ce6ad349c047b7feb2ad49c5a066d7dd2c745 (diff)
downloadtdebase-ab197a37e3e362ae3980f5bdd9840b0e4703e370.tar.gz
tdebase-ab197a37e3e362ae3980f5bdd9840b0e4703e370.zip
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance
-rw-r--r--drkonqi/debugger.cpp2
-rw-r--r--kate/app/kateconfigdialog.cpp4
-rw-r--r--kate/app/katemainwindow.cpp10
-rw-r--r--kate/app/katemwmodonhddialog.cpp4
-rw-r--r--kate/app/katesession.cpp6
-rw-r--r--kcontrol/background/bgdialog.cpp2
-rw-r--r--kcontrol/konsole/schemaeditor.cpp2
-rw-r--r--kcontrol/konsole/sessioneditor.cpp2
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp2
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp2
-rw-r--r--kdesktop/desktop.cc2
-rw-r--r--kdesktop/kdiconview.cc2
-rw-r--r--kfind/kfwin.cpp12
-rw-r--r--kicker/applets/clock/clock.cpp2
-rw-r--r--kicker/kicker/ui/k_mnu.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp4
-rw-r--r--kicker/menuext/tdeprint/print_mnu.cpp2
-rw-r--r--kicker/taskmanager/taskrmbmenu.cpp2
-rw-r--r--kmenuedit/kmenuedit.cpp4
-rw-r--r--konqueror/about/konq_aboutpage.cc2
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp6
-rw-r--r--konqueror/konq_mainwindow.cc6
-rw-r--r--konqueror/konq_profiledlg.cc2
-rw-r--r--konqueror/konq_tabs.cc2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp2
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp10
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp8
-rw-r--r--konsole/konsole/konsole.cpp18
-rw-r--r--konsole/konsole/konsole_part.cpp8
-rw-r--r--kpager/kpager.cpp2
-rw-r--r--ksplashml/kcmksplash/installer.cpp2
-rw-r--r--ksysguard/gui/ksysguard.cc6
-rw-r--r--libkonq/knewmenu.cc4
-rw-r--r--libkonq/konq_operations.cc2
-rw-r--r--libkonq/konq_popupmenu.cc2
-rw-r--r--tdeprint/kjobviewer/kjobviewer.cpp2
-rw-r--r--tdeprint/slave/tdeio_print.cpp2
-rw-r--r--tdeprint/tdeprintfax/conffilters.cpp2
-rw-r--r--tdeprint/tdeprintfax/configdlg.cpp2
-rw-r--r--tdeprint/tdeprintfax/tdeprintfax.cpp2
-rw-r--r--twin/useractions.cpp2
42 files changed, 82 insertions, 82 deletions
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index aab0e7948..4e3622e12 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -62,7 +62,7 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
m_status = new TQLabel( w );
m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
//m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
- KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) );
+ KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "edit-copy" ) );
m_copyButton = new KPushButton( item, w );
connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
m_copyButton->setEnabled( false );
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 697e46644..38f71f2d3 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -95,7 +95,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
//BEGIN General page
path << i18n("Application") << i18n("General");
- TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", TDEIcon::SizeSmall));
+ TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("go-home", TDEIcon::SizeSmall));
TQVBoxLayout *lo = new TQVBoxLayout( frGeneral );
lo->setSpacing(KDialog::spacingHint());
@@ -273,7 +273,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
path << i18n("Application") << i18n("File Selector");
TQVBox *page = addVBoxPage( path, i18n("File Selector Settings"),
- BarIcon("fileopen", TDEIcon::SizeSmall) );
+ BarIcon("document-open", TDEIcon::SizeSmall) );
fileSelConfigPage = new KFSConfigPage( page, "file selector config page",
mainWindow->fileselector );
connect( fileSelConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 4cd3c358e..a1b3e9045 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -213,7 +213,7 @@ void KateMainWindow::setupMainWindow ()
filelist = new KateFileList (this, m_viewManager, ft, "filelist");
filelist->readConfig(KateApp::self()->config(), "Filelist");
- KateMDI::ToolView *t = createToolView("kate_fileselector", KMultiTabBar::Left, SmallIcon("fileopen"), i18n("Filesystem Browser"));
+ KateMDI::ToolView *t = createToolView("kate_fileselector", KMultiTabBar::Left, SmallIcon("document-open"), i18n("Filesystem Browser"));
fileselector = new KateFileSelector( this, m_viewManager, t, "operator");
connect(fileselector->dirOperator(),TQT_SIGNAL(fileSelected(const KFileItem*)),this,TQT_SLOT(fileSelected(const KFileItem*)));
@@ -302,10 +302,10 @@ void KateMainWindow::setupActions()
slotWindowActivated ();
// session actions
- new TDEAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new");
- new TDEAction(i18n("&Open..."), "fileopen", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open");
- new TDEAction(i18n("&Save"), "filesave", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save");
- new TDEAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as");
+ new TDEAction(i18n("Menu entry Session->New", "&New"), "document-new", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new");
+ new TDEAction(i18n("&Open..."), "document-open", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open");
+ new TDEAction(i18n("&Save"), "document-save", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save");
+ new TDEAction(i18n("Save &As..."), "document-save-as", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as");
new TDEAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage");
// quick open menu ;)
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index ab1418477..508e0aadc 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -60,8 +60,8 @@ class KateDocItem : public TQCheckListItem
KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n("Documents Modified on Disk"),
User1|User2|User3, User3, false,
- KGuiItem (i18n("&Ignore"), "fileclose"),
- KGuiItem (i18n("&Overwrite"), "filesave"),
+ KGuiItem (i18n("&Ignore"), "window-close"),
+ KGuiItem (i18n("&Overwrite"), "document-save"),
KGuiItem (i18n("&Reload"), "reload") )
{
setButtonWhatsThis( User1, i18n(
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index ed6ee3f95..2c0057bf8 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -620,8 +620,8 @@ KateSessionChooser::KateSessionChooser (TQWidget *parent, const TQString &lastSe
, KDialogBase::User2
, true
, KStdGuiItem::quit ()
- , KGuiItem (i18n ("Open Session"), "fileopen")
- , KGuiItem (i18n ("New Session"), "filenew")
+ , KGuiItem (i18n ("Open Session"), "document-open")
+ , KGuiItem (i18n ("New Session"), "document-new")
)
{
TQHBox *page = new TQHBox (this);
@@ -717,7 +717,7 @@ KateSessionOpenDialog::KateSessionOpenDialog (TQWidget *parent)
, KDialogBase::User2
, false
, KStdGuiItem::cancel ()
- , KGuiItem( i18n("&Open"), "fileopen")
+ , KGuiItem( i18n("&Open"), "document-open")
)
{
TQHBox *page = new TQHBox (this);
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index b2f825184..e903b7bc2 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -142,7 +142,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
}
// background image settings
- TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("document-open"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
m_urlWallpaperButton->setIconSet( iconSet );
m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index 66b07e59f..dfa4dbefe 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -317,7 +317,7 @@ void SchemaEditor::removeCurrent()
int code = KMessageBox::warningContinueCancel(this,
i18n("You are trying to remove a system schema. Are you sure?"),
i18n("Removing System Schema"),
- KGuiItem(i18n("&Delete"), "editdelete"));
+ KGuiItem(i18n("&Delete"), "edit-delete"));
if (code != KMessageBox::Continue)
return;
}
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index 86c9dd825..290541d12 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -358,7 +358,7 @@ void SessionEditor::removeCurrent()
int code = KMessageBox::warningContinueCancel(this,
i18n("You are trying to remove a system session. Are you sure?"),
i18n("Removing System Session"),
- KGuiItem(i18n("&Delete"),"editdelete"));
+ KGuiItem(i18n("&Delete"),"edit-delete"));
if (code != KMessageBox::Continue)
return;
}
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index aa04d8e56..ba8bb3a7e 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -252,7 +252,7 @@ void kthememanager::slotRemoveTheme()
{
TQString themeName = cur->text( 0 );
if ( KMessageBox::warningContinueCancel( this, "<qt>" + i18n( "Do you really want to remove the theme <b>%1</b>?" ).arg( themeName ),
- i18n( "Remove Theme" ), KGuiItem( i18n( "&Remove" ), "editdelete" ) )
+ i18n( "Remove Theme" ), KGuiItem( i18n( "&Remove" ), "edit-delete" ) )
== KMessageBox::Continue )
{
KTheme::remove( themeName );
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index 7004f0ae5..d61ea4da0 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -236,7 +236,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
act->plug(toolbar);
#ifdef HAVE_XFT
toolbar->insertLineSeparator();
- act=new TDEAction(i18n("Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
+ act=new TDEAction(i18n("Print..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
act->plug(toolbar);
#endif
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index b3893c029..de6873e2c 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -950,7 +950,7 @@ void KDesktop::handleImageDropEvent(TQDropEvent * e)
{
TDEPopupMenu popup;
if ( m_pIconView )
- popup.insertItem(SmallIconSet("filesave"),i18n("&Save to Desktop..."), 1);
+ popup.insertItem(SmallIconSet("document-save"),i18n("&Save to Desktop..."), 1);
if ( ( m_pIconView && m_pIconView->maySetWallpaper() ) || m_pRootWidget )
popup.insertItem(SmallIconSet("background"),i18n("Set as &Wallpaper"), 2);
popup.insertSeparator();
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 948ea511c..39dcc4c28 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -449,7 +449,7 @@ void KDIconView::createActions()
TDEConfig config("kdeglobals", true, false);
config.setGroup( "KDE" );
- (void) new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
+ (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
// Initial state of the actions (cut/copy/paste/...)
slotSelectionChanged();
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index 3eb10e1b4..c0223ea42 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -287,7 +287,7 @@ void KfindWindow::deleteFiles()
{
TQString tmp = i18n("Do you really want to delete the selected file?",
"Do you really want to delete the %n selected files?",selectedItems().count());
- if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel)
+ if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "edit-delete")) == KMessageBox::Cancel)
return;
// Iterate on all selected elements
@@ -409,11 +409,11 @@ void KfindWindow::slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoi
{
//menu = new TDEPopupMenu(item->text(0), this);
m_menu->insertTitle(item->text(0));
- m_menu->insertItem(SmallIcon("fileopen"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding()));
+ m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding()));
m_menu->insertItem(SmallIcon("window_new"),i18n("Open Folder"), this, TQT_SLOT(openFolder()));
m_menu->insertSeparator();
- m_menu->insertItem(SmallIcon("editcopy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
- m_menu->insertItem(SmallIcon("editdelete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
+ m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
+ m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
m_menu->insertSeparator();
m_menu->insertItem(i18n("Open With..."), this, TQT_SLOT(slotOpenWith()));
m_menu->insertSeparator();
@@ -422,8 +422,8 @@ void KfindWindow::slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoi
else
{
m_menu->insertTitle(i18n("Selected Files"));
- m_menu->insertItem(SmallIcon("editcopy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
- m_menu->insertItem(SmallIcon("editdelete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
+ m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
+ m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
}
m_menu->popup(p, 1);
}
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 90b88437c..86ee8b059 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -1592,7 +1592,7 @@ void ClockApplet::aboutToShowContextMenu()
menu->insertItem(SmallIcon("kcontrol"), i18n("Date && Time &Format..."), 104, 5);
}
- menu->insertItem(SmallIcon("editcopy"), i18n("C&opy to Clipboard"), copyMenu, 105, 6);
+ menu->insertItem(SmallIcon("edit-copy"), i18n("C&opy to Clipboard"), copyMenu, 105, 6);
if (!bImmutable)
{
menu->insertSeparator(7);
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 9d1d70f87..4362e91f1 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -388,7 +388,7 @@ void PanelKMenu::initialize()
ksmserver.setGroup("General");
if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession")
{
- insertItem(KickerLib::menuIconSet("filesave"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession()));
+ insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession()));
}
if (kapp->authorize("lock_screen"))
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 2fb6f1ed1..c6ac44bf1 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -1347,7 +1347,7 @@ void KMenu::insertStaticExitItems()
ksmserver.setGroup("General");
if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession")
{
- m_exitView->leftView()->insertItem("filesave", i18n("Save Session"),
+ m_exitView->leftView()->insertItem("document-save", i18n("Save Session"),
i18n("Save current Session for next login"),
"kicker:/savesession", nId++, index++ );
}
@@ -2466,7 +2466,7 @@ void KMenu::doQuery (bool return_pressed)
categorised_hit_total[ACTIONS] ++;
HitMenuItem *hit_item = new HitMenuItem (description, TQString(),
exe.isEmpty() ? filterData.uri() : exe, TQString(),
- (++max_category_id [ACTIONS]), ACTIONS, exe.isEmpty() ? "fileopen": "run");
+ (++max_category_id [ACTIONS]), ACTIONS, exe.isEmpty() ? "document-open": "run");
int index = getHitMenuItemPosition (hit_item);
m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name,
hit_item->display_info,
diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp
index a4dbe3dfb..3a1b31145 100644
--- a/kicker/menuext/tdeprint/print_mnu.cpp
+++ b/kicker/menuext/tdeprint/print_mnu.cpp
@@ -72,7 +72,7 @@ void PrintMenu::initialize()
insertItem(SmallIconSet("kcontrol"), i18n("Print Manager"), PRINT_MANAGER_ID);
insertItem(SmallIconSet("konqueror"), i18n("Print Browser (Konqueror)"), PRINT_BROWSER_ID);
insertSeparator();
- insertItem(SmallIconSet("fileprint"), i18n("Print File..."), KPRINTER_ID);
+ insertItem(SmallIconSet("document-print"), i18n("Print File..."), KPRINTER_ID);
// printer list
TQPtrList<KMPrinter> *l = KMManager::self()->printerList();
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index 08fe0785d..7059bea69 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -115,7 +115,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
insertSeparator();
}
- id = insertItem(SmallIcon("fileclose"), i18n("&Close"), t, TQT_SLOT(close()));
+ id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQT_SLOT(close()));
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose));
}
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 9e3b82091..8a90cfcd0 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -63,7 +63,7 @@ KMenuEdit::~KMenuEdit()
void KMenuEdit::setupActions()
{
(void)new TDEAction(i18n("&New Submenu..."), "menu_new", 0, actionCollection(), "newsubmenu");
- (void)new TDEAction(i18n("New &Item..."), "filenew", TDEStdAccel::openNew(), actionCollection(), "newitem");
+ (void)new TDEAction(i18n("New &Item..."), "document-new", TDEStdAccel::openNew(), actionCollection(), "newitem");
if (!m_controlCenter)
(void)new TDEAction(i18n("New S&eparator"), "menu_new_sep", 0, actionCollection(), "newsep");
@@ -126,7 +126,7 @@ void KMenuEdit::slotChangeView()
delete m_actionDelete;
- m_actionDelete = new TDEAction(i18n("&Delete"), "editdelete", Key_Delete, actionCollection(), "delete");
+ m_actionDelete = new TDEAction(i18n("&Delete"), "edit-delete", Key_Delete, actionCollection(), "delete");
if (!m_splitter)
setupView();
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index a96de06cf..c06331994 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -192,7 +192,7 @@ TQString KonqAboutPageFactory::intro()
TDEIconLoader *iconloader = TDEGlobal::iconLoader();
TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", TDEIcon::Small ):iconloader->iconPath("back", TDEIcon::Small );
- TQString gohome_icon_path = iconloader->iconPath("gohome", TDEIcon::Small );
+ TQString gohome_icon_path = iconloader->iconPath("go-home", TDEIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 197d5ab99..67e694dd5 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -105,7 +105,7 @@ void KEBApp::createActions() {
// actions
(void) new TDEAction(
- i18n("&Delete"), "editdelete", Key_Delete,
+ i18n("&Delete"), "edit-delete", Key_Delete,
TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete");
(void) new TDEAction(
i18n("Rename"), "text", Key_F2,
@@ -126,7 +126,7 @@ void KEBApp::createActions() {
i18n("Recursive Sort"), 0,
TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
(void) new TDEAction(
- i18n("&New Folder..."), "folder_new", CTRL+Key_N,
+ i18n("&New Folder..."), "folder-new", CTRL+Key_N,
TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
(void) new TDEAction(
i18n("&New Bookmark"), "www", 0,
@@ -154,7 +154,7 @@ void KEBApp::createActions() {
i18n("Collapse &All Folders"), 0,
TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
(void) new TDEAction(
- i18n("&Open in Konqueror"), "fileopen", 0,
+ i18n("&Open in Konqueror"), "document-open", 0,
TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
(void) new TDEAction(
i18n("Check &Status"), "bookmark", 0,
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 9a89cc87f..bd2d6164e 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -3813,7 +3813,7 @@ void KonqMainWindow::initActions()
{
(void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
}
- (void) new TDEAction( i18n( "&Open Location..." ), "fileopen", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
+ (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" );
@@ -3848,7 +3848,7 @@ void KonqMainWindow::initActions()
connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotGoMenuAboutToShow() ) );
connect( m_paHistory, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotGoHistoryActivated( int ) ) );
- m_paHome = new TDEAction( i18n( "Home" ), "gohome", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" );
+ m_paHome = new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" );
connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) );
@@ -3957,7 +3957,7 @@ void KonqMainWindow::initActions()
connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
- m_paDelete = new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" );
+ m_paDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, actionCollection(), "del" );
// F5 is the default key binding for Reload.... a la Windows. mc users want F5 for Copy and F6 for move, but I can't make that default.
m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 5f8626f8e..f7241713b 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -76,7 +76,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese
: KDialogBase( parent, "konq_profile_dialog", true, i18n( "Profile Management" ),
KDialogBase::Close | BTN_RENAME | BTN_DELETE | BTN_SAVE, BTN_SAVE, true,
KGuiItem( i18n( "&Rename Profile" ) ),
- KGuiItem( i18n( "&Delete Profile" ), "editdelete"),
+ KGuiItem( i18n( "&Delete Profile" ), "edit-delete"),
KStdGuiItem::save() )
{
m_pViewManager = manager;
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index cc0f00ef7..0ccaa4b55 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -282,7 +282,7 @@ void KonqFrameTabs::setTabIcon( const KURL &url, TQWidget* sender )
//kdDebug(1202) << "KonqFrameTabs::setTabIcon( " << url << " , " << sender << " )" << endl;
TQIconSet iconSet;
if (m_permanentCloseButtons)
- iconSet = SmallIcon( "fileclose" );
+ iconSet = SmallIcon( "window-close" );
else
iconSet = SmallIconSet( KonqPixmapProvider::self()->iconNameFor( url.url() ) );
if (tabIconSet( sender ).pixmap().serialNumber() != iconSet.pixmap().serialNumber())
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index e8e2f9f91..8eefa7c34 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -879,7 +879,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
m_buttonPopup->insertItem(SmallIconSet("www"), i18n("Set URL..."),2);
m_buttonPopup->insertItem(SmallIconSet("icons"), i18n("Set Icon..."),1);
m_buttonPopup->insertSeparator();
- m_buttonPopup->insertItem(SmallIconSet("editdelete"), i18n("Remove"),3);
+ m_buttonPopup->insertItem(SmallIconSet("edit-delete"), i18n("Remove"),3);
m_buttonPopup->insertSeparator();
m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4);
connect(m_buttonPopup, TQT_SIGNAL(activated(int)),
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 675642c36..692241d8c 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -56,11 +56,11 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr
this, TQT_SLOT(slotOpenChange(TQListViewItem*)));
m_collection = new TDEActionCollection( this, "bookmark actions" );
- (void) new TDEAction( i18n("&Create New Folder"), "folder_new", 0, this,
+ (void) new TDEAction( i18n("&Create New Folder"), "folder-new", 0, this,
TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
- (void) new TDEAction( i18n("Delete Folder"), "editdelete", 0, this,
+ (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this,
TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
- (void) new TDEAction( i18n("Delete Bookmark"), "editdelete", 0, this,
+ (void) new TDEAction( i18n("Delete Bookmark"), "edit-delete", 0, this,
TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark");
(void) new TDEAction( i18n("Properties"), "edit", 0, this,
TQT_SLOT( slotProperties() ), m_collection, "item_properties");
@@ -70,7 +70,7 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr
TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
(void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this,
TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
- (void) new TDEAction( i18n("Copy Link Address"), "editcopy", 0, this,
+ (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this,
TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ),
@@ -309,7 +309,7 @@ void KonqSidebarBookmarkModule::slotDelete()
: i18n("Are you sure you wish to remove the bookmark\n\"%1\"?").arg(bookmark.text()),
folder ? i18n("Bookmark Folder Deletion")
: i18n("Bookmark Deletion"),
- KGuiItem( i18n("&Delete"), "editdelete"), KStdGuiItem::cancel())
+ KGuiItem( i18n("&Delete"), "edit-delete"), KStdGuiItem::cancel())
!= KMessageBox::Yes
)
return;
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 6d5ac5094..3ebb339a0 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -77,7 +77,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
m_collection = new TDEActionCollection( this, "history actions" );
(void) new TDEAction( i18n("New &Window"), "window_new", 0, this,
TQT_SLOT( slotNewWindow() ), m_collection, "open_new");
- (void) new TDEAction( i18n("&Remove Entry"), "editdelete", 0, this,
+ (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this,
TQT_SLOT( slotRemoveEntry() ), m_collection, "remove");
(void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this,
TQT_SLOT( slotClearHistory() ), m_collection, "clear");
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index cd915c4ab..f5cf661b3 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -911,13 +911,13 @@ void KonqSidebarTree::showToplevelContextMenu()
if (!m_collection)
{
m_collection = new TDEActionCollection( this, "bookmark actions" );
- (void) new TDEAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
- (void) new TDEAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
(void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotRename() ), m_collection, "rename");
- (void) new TDEAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotDelete() ), m_collection, "delete_link");
(void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotProperties() ), m_collection, "item_properties");
@@ -925,7 +925,7 @@ void KonqSidebarTree::showToplevelContextMenu()
TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
(void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
- (void) new TDEAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
}
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index bdfae69f6..2c7e63cfd 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -710,7 +710,7 @@ void Konsole::makeGUI()
m_options->insertSeparator();
- TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "filesave", 0, TQT_TQOBJECT(this),
+ TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSaveSettings()), actions, "save_default");
save_settings->plug(m_options);
@@ -882,7 +882,7 @@ void Konsole::makeGUI()
TQT_SLOT( activateSession( int ) ) );
m_tabPopupMenu->insertSeparator();
- m_tabPopupMenu->insertItem( SmallIcon("fileclose"), i18n("C&lose Session"), TQT_TQOBJECT(this),
+ m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), TQT_TQOBJECT(this),
TQT_SLOT(slotTabCloseSession()) );
if (m_options) {
@@ -1100,9 +1100,9 @@ void Konsole::makeBasicGUI()
m_shortcuts = new TDEActionCollection(this);
- m_copyClipboard = new TDEAction(i18n("&Copy"), "editcopy", 0, TQT_TQOBJECT(this),
+ m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy");
- m_pasteClipboard = new TDEAction(i18n("&Paste"), "editpaste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this),
+ m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this),
TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
m_pasteSelection = new TDEAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this),
TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection");
@@ -1123,7 +1123,7 @@ void Konsole::makeBasicGUI()
TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous");
m_findPrevious->setEnabled( b_histEnabled );
- m_saveHistory = new TDEAction(i18n("S&ave History As..."), "filesaveas", 0, TQT_TQOBJECT(this),
+ m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history");
m_saveHistory->setEnabled(b_histEnabled );
@@ -1171,7 +1171,7 @@ void Konsole::makeBasicGUI()
connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this),TQT_SLOT(updateFullScreen(bool)));
m_fullscreen->setChecked(b_fullscreen);
- m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("filesaveas"), 0, TQT_TQOBJECT(this),
+ m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" );
//help menu
@@ -1180,9 +1180,9 @@ void Konsole::makeBasicGUI()
// Don't steal F1 (handbook) accel (esp. since it not visible in
// "Configure Shortcuts").
- m_closeSession = new TDEAction(i18n("C&lose Session"), "fileclose", 0, TQT_TQOBJECT(this),
+ m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, TQT_TQOBJECT(this),
TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session");
- m_print = new TDEAction(i18n("&Print Screen..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
+ m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit");
TDEShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N);
@@ -1268,7 +1268,7 @@ bool Konsole::queryClose()
"Are you sure you want to quit?" ),
i18n("Really Quit?"),
KStdGuiItem::quit(),
- KGuiItem(i18n("C&lose Session"),"fileclose")
+ KGuiItem(i18n("C&lose Session"),"window-close")
)
) {
case KMessageBox::Yes :
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 87cd2b373..6cc900efc 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -450,7 +450,7 @@ void konsolePart::makeGUI()
// Save Settings
m_options->insertSeparator();
- TDEAction *saveSettings = new TDEAction(i18n("&Save as Default"), "filesave", 0, this,
+ TDEAction *saveSettings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this,
TQT_SLOT(saveProperties()), actions, "save_default");
saveSettings->plug(m_options);
if (TDEGlobalSettings::insertTearOffHandle())
@@ -463,11 +463,11 @@ void konsolePart::makeGUI()
TQT_SLOT(setSelectionEnd()), actions, "selection_end");
selectionEnd->plug(m_popupMenu);
- TDEAction *copyClipboard = new TDEAction(i18n("&Copy"), "editcopy", 0,
+ TDEAction *copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0,
TQT_TQOBJECT(te), TQT_SLOT(copyClipboard()), actions, "edit_copy");
copyClipboard->plug(m_popupMenu);
- TDEAction *pasteClipboard = new TDEAction(i18n("&Paste"), "editpaste", 0,
+ TDEAction *pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", 0,
TQT_TQOBJECT(te), TQT_SLOT(pasteClipboard()), actions, "edit_paste");
pasteClipboard->plug(m_popupMenu);
@@ -483,7 +483,7 @@ void konsolePart::makeGUI()
m_popupMenu->insertSeparator();
}
- TDEAction *closeSession = new TDEAction(i18n("&Close Terminal Emulator"), "fileclose", 0, this,
+ TDEAction *closeSession = new TDEAction(i18n("&Close Terminal Emulator"), "window-close", 0, this,
TQT_SLOT(closeCurrentSession()), actions, "close_session");
closeSession->plug(m_popupMenu);
if (TDEGlobalSettings::insertTearOffHandle())
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index 3bceac2f3..4775576ee 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -340,7 +340,7 @@ void KPager::showPopupMenu( WId wid, TQPoint pos)
m_mnu->insertItem(i18n("&To Desktop"), m_dmnu );
m_mnu->insertSeparator();
- m_mnu->insertItem(SmallIcon("fileclose"),i18n("&Close"), CloseOp);
+ m_mnu->insertItem(SmallIcon("window-close"),i18n("&Close"), CloseOp);
m_mnu->insertSeparator();
m_prefs_action->plug(m_mnu);
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index d04fbc4ff..7ee681907 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -297,7 +297,7 @@ void SplashInstaller::slotRemove()
{
KURL url;
url.setPath(themeDir);
- if (KMessageBox::warningContinueCancel(this,i18n("Delete folder %1 and its contents?").arg(themeDir),"",KGuiItem(i18n("&Delete"),"editdelete"))==KMessageBox::Continue)
+ if (KMessageBox::warningContinueCancel(this,i18n("Delete folder %1 and its contents?").arg(themeDir),"",KGuiItem(i18n("&Delete"),"edit-delete"))==KMessageBox::Continue)
rc = TDEIO::NetAccess::del(url,this);
else
return;
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc
index 2e62465f7..b08763b2f 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cc
@@ -108,16 +108,16 @@ TopLevel::TopLevel( const char *name )
new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace),
TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" );
- new TDEAction( i18n( "Import Worksheet..." ), "fileopen", 0, TQT_TQOBJECT(mWorkSpace),
+ new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, TQT_TQOBJECT(mWorkSpace),
TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" );
- mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"fileopen", 0,
+ mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"document-open", 0,
TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );
new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace),
TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" );
- new TDEAction( i18n( "&Export Worksheet..." ), "filesaveas", 0, TQT_TQOBJECT(mWorkSpace),
+ new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, TQT_TQOBJECT(mWorkSpace),
TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" );
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index d4cae95ad..621b1f614 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -64,7 +64,7 @@ public:
};
KNewMenu::KNewMenu( TDEActionCollection * _collec, const char *name ) :
- TDEActionMenu( i18n( "Create New" ), "filenew", _collec, name ),
+ TDEActionMenu( i18n( "Create New" ), "document-new", _collec, name ),
menuItemsVersion( 0 )
{
//kdDebug(1203) << "KNewMenu::KNewMenu " << this << endl;
@@ -76,7 +76,7 @@ KNewMenu::KNewMenu( TDEActionCollection * _collec, const char *name ) :
}
KNewMenu::KNewMenu( TDEActionCollection * _collec, TQWidget *parentWidget, const char *name ) :
- TDEActionMenu( i18n( "Create New" ), "filenew", _collec, name ),
+ TDEActionMenu( i18n( "Create New" ), "document-new", _collec, name ),
menuItemsVersion( 0 )
{
d = new KNewMenuPrivate;
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index ea89e39d0..4f754681e 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -574,7 +574,7 @@ void KonqOperations::doFileCopy()
if (!mlst.isEmpty() && (sMoving || (sReading && sDeleting)) && !linkOnly )
popup.insertItem(SmallIconSet("goto"), i18n( "&Move Here" ) + "\t" + KKey::modFlagLabel( KKey::SHIFT ), 2 );
if ( sReading && !linkOnly)
- popup.insertItem(SmallIconSet("editcopy"), i18n( "&Copy Here" ) + "\t" + KKey::modFlagLabel( KKey::CTRL ), 1 );
+ popup.insertItem(SmallIconSet("edit-copy"), i18n( "&Copy Here" ) + "\t" + KKey::modFlagLabel( KKey::CTRL ), 1 );
popup.insertItem(SmallIconSet("www"), i18n( "&Link Here" ) + "\t" + KKey::modFlagLabel( (KKey::ModFlag)( KKey::CTRL|KKey::SHIFT ) ), 3 );
if (bSetWallpaper)
popup.insertItem(SmallIconSet("background"), i18n( "Set as &Wallpaper" ), 4 );
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index c16b95abf..7a6ddaa13 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -528,7 +528,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{
if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory)
{
- TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
+ TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
addAction( actNewDir );
addSeparator();
}
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index 0d456b1ec..393cd1c95 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -137,7 +137,7 @@ void KJobViewerApp::initialize()
if (!m_tray)
{
m_tray = new JobTray(this);
- m_tray->setPixmap(m_tray->loadIcon("fileprint"));
+ m_tray->setPixmap(m_tray->loadIcon("document-print"));
}
diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp
index fa03bf032..2e714087a 100644
--- a/tdeprint/slave/tdeio_print.cpp
+++ b/tdeprint/slave/tdeio_print.cpp
@@ -849,7 +849,7 @@ void TDEIO_Print::showJobs(KMPrinter *prt, bool completed)
.arg(buildMenu(TQStringList::split('|', i18n("Active jobs|Completed jobs"), false),
TQStringList::split('|', "?jobs|?completed_jobs", true),
(completed ? 1 : 0)))
- .arg("fileprint")
+ .arg("document-print")
.arg(i18n("All jobs"));
}
content = content.arg(i18n("ID")).arg(i18n("Owner")).arg(i18n("Printer")).arg(i18n("Name")).arg(i18n("State"));
diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp
index 372074a8a..7fdb4fec1 100644
--- a/tdeprint/tdeprintfax/conffilters.cpp
+++ b/tdeprint/tdeprintfax/conffilters.cpp
@@ -48,7 +48,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)
connect(m_filters, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(slotChange()));
m_add = new TQPushButton(this);
- m_add->setPixmap(BarIcon("filenew"));
+ m_add->setPixmap(BarIcon("document-new"));
m_remove = new TQPushButton(this);
m_remove->setIconSet(BarIconSet("remove"));
m_change = new TQPushButton(this);
diff --git a/tdeprint/tdeprintfax/configdlg.cpp b/tdeprint/tdeprintfax/configdlg.cpp
index f2dae996a..ca23df5d7 100644
--- a/tdeprint/tdeprintfax/configdlg.cpp
+++ b/tdeprint/tdeprintfax/configdlg.cpp
@@ -34,7 +34,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name)
TQVBox *page1 = addVBoxPage(i18n("Personal"), i18n("Personal Settings"), DesktopIcon("tdmconfig"));
m_general = new ConfGeneral(page1, "Personal");
- TQVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy"));
+ TQVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("edit-copy"));
m_fax = new ConfFax(page2, "Fax");
TQVBox *page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("tdeprintfax"));
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 794ca51e4..2927d4e88 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -188,7 +188,7 @@ KdeprintFax::~KdeprintFax()
void KdeprintFax::initActions()
{
- new TDEAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
+ new TDEAction(i18n("&Add File..."), "document-new", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
new TDEAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
new TDEAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
new TDEAction(i18n("A&bort"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index fbf1be558..71bec42be 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -109,7 +109,7 @@ TQPopupMenu* Workspace::clientPopup()
popup->insertSeparator();
}
- popup->insertItem( SmallIconSet( "fileclose" ), i18n("&Close")+'\t'+keys->shortcut("Window Close").seq(0).toString(), Options::CloseOp );
+ popup->insertItem( SmallIconSet( "window-close" ), i18n("&Close")+'\t'+keys->shortcut("Window Close").seq(0).toString(), Options::CloseOp );
}
return popup;
}