From fd06cd80d2fb44f970b3d7b026f9eb3c330a46cf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 15:43:59 -0500 Subject: Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance --- buildtools/autotools/autodetailsview.cpp | 4 +-- buildtools/autotools/autosubprojectview.cpp | 2 +- buildtools/autotools/fileselectorwidget.cpp | 2 +- buildtools/autotools/removetargetdlg.cpp | 2 +- buildtools/qmake/trollprojectwidget.cpp | 32 +++++++++++----------- .../cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp | 2 +- .../cpp/app_templates/kofficepart/kopart_view.cpp | 2 +- languages/cpp/app_templates/qmakeapp/qmakeapp.cpp | 2 +- languages/cpp/debugger/variablewidget.cpp | 8 +++--- lib/widgets/kdevtabwidget.cpp | 2 +- parts/abbrev/abbrevconfigwidget.cpp | 2 +- parts/diff/diffpart.cpp | 2 +- parts/diff/diffwidget.cpp | 2 +- parts/filecreate/filecreate_part.cpp | 2 +- parts/filelist/filelist_item.cpp | 2 +- parts/filelist/projectviewpart.cpp | 8 +++--- src/projectmanager.cpp | 2 +- src/simplemainwindow.cpp | 2 +- vcs/cvsservice/diffwidget.cpp | 2 +- 19 files changed, 41 insertions(+), 41 deletions(-) diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 91b6d75c..9751c23f 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -187,7 +187,7 @@ void AutoDetailsView::initActions() targetOptionsAction->setEnabled( false ); TQToolTip::add( m_button1, tr2i18n( "Create New File..." ) ); - addNewFileAction = new AutoToolsAction( i18n( "Create New File..." ), "filenew", 0, + addNewFileAction = new AutoToolsAction( i18n( "Create New File..." ), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddNewFile() ), actions, "add new file" ); addNewFileAction->setWhatsThis(i18n("Create new file

Creates a new file and " @@ -241,7 +241,7 @@ void AutoDetailsView::initActions() "command builds it.")); TQToolTip::add( m_button3, tr2i18n( "Remove")); - removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, TQT_TQOBJECT(this), + removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveDetail() ), actions, "remove detail" ); removeDetailAction->setWhatsThis(i18n("Remove

Shows a list of targets " diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 8353e2ea..01428eb3 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -180,7 +180,7 @@ void AutoSubprojectView::initActions() subProjectOptionsAction->plug( m_optionsButton ); TQToolTip::add( m_button1, tr2i18n( "Add new subproject...")); - addSubprojectAction = new AutoToolsAction( i18n( "Add new subproject..." ), "folder_new", 0, + addSubprojectAction = new AutoToolsAction( i18n( "Add new subproject..." ), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddSubproject() ), actions, "add subproject" ); addSubprojectAction->setWhatsThis(i18n("Add new subproject

Creates a new " "subproject in currently selected subproject.")); diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 5cc066c6..85bb32c0 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -80,7 +80,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, lo->addWidget(hlow); home = new TQPushButton( hlow ); - home->setPixmap(SmallIcon("gohome")); + home->setPixmap(SmallIcon("go-home")); TQToolTip::add(home, i18n("Home directory")); up = new TQPushButton( /*i18n("&Up"),*/ hlow ); up->setPixmap(SmallIcon("go-up")); diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index dd501818..c9068ec8 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -56,7 +56,7 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPa connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); - setIcon ( SmallIcon ( "editdelete" ) ); + setIcon ( SmallIcon ( "edit-delete" ) ); progressBar->hide(); diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 68dfad8e..b1253355 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -101,7 +101,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) projectTools->setSpacing ( 2 ); // Add subdir addSubdirButton = new TQToolButton ( projectTools, "Add subproject button" ); - addSubdirButton->setPixmap ( SmallIcon ( "folder_new" ) ); + addSubdirButton->setPixmap ( SmallIcon ( "folder-new" ) ); addSubdirButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) ); addSubdirButton->setEnabled ( true ); TQToolTip::add( addSubdirButton, i18n( "Add subproject" ) ); @@ -198,7 +198,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Add new file button newfileButton = new TQToolButton ( fileTools, "Create new file" ); - newfileButton->setPixmap ( SmallIcon ( "filenew" ) ); + newfileButton->setPixmap ( SmallIcon ( "document-new" ) ); newfileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) ); newfileButton->setEnabled ( true ); TQToolTip::add( newfileButton, i18n( "Create new file" ) ); @@ -1022,7 +1022,7 @@ void TrollProjectWidget::slotOverviewContextMenu( TDEListView *, TQListViewItem "This creates or regenerates Makefile." ) ); popup.insertSeparator(); - idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) ); + idAddSubproject = popup.insertItem( SmallIcon( "folder-new" ), i18n( "Add Subproject..." ) ); popup.setWhatsThis( idAddSubproject, i18n( "Add subproject

Creates a new or adds an existing subproject to a currently selected subproject. " "This action is allowed only if a type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in Subproject Settings dialog (open it from the subproject context menu)." ) ); @@ -1044,10 +1044,10 @@ void TrollProjectWidget::slotOverviewContextMenu( TDEListView *, TQListViewItem { idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) ); popup.setWhatsThis( idAddScope, i18n( "Create Scope

Creates TQMake scope in the currently selected scope." ) ); - idRemoveScope = popup.insertItem( SmallIcon( "editdelete" ), i18n( "Remove Scope" ) ); + idRemoveScope = popup.insertItem( SmallIcon( "edit-delete" ), i18n( "Remove Scope" ) ); popup.setWhatsThis( idRemoveScope, i18n( "Remove Scope

Removes currently selected scope." ) ); popup.insertSeparator(); - idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) ); + idAddSubproject = popup.insertItem( SmallIcon( "folder-new" ), i18n( "Add Subproject..." ) ); popup.setWhatsThis( idAddSubproject, i18n( "Add subproject

Creates a new or adds an existing subproject to the currently selected scope. " "This action is allowed only if the type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in the Subproject Settings dialog (open it from the subproject context menu)." ) ); @@ -1540,29 +1540,29 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * int idLRelease = -2; int idRemoveFile = -2; - // int idFileProperties = popup.insertItem(SmallIconSet("filenew"),i18n("Properties...")); + // int idFileProperties = popup.insertItem(SmallIconSet("document-new"),i18n("Properties...")); if ( titem->groupType == GroupItem::InstallRoot ) { - idInsInstallObject = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Install Object..." ) ); + idInsInstallObject = popup.insertItem( SmallIconSet( "document-open" ), i18n( "Add Install Object..." ) ); popup.setWhatsThis( idInsInstallObject, i18n( "Add install object

Creates TQMake install object. " "It is possible to define a list of files to install and installation locations for each object. Warning! " "Install objects without path specified will not be saved to a project file." ) ); } else if ( titem->groupType == GroupItem::InstallObject ) { - idSetInstObjPath = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Install Path..." ) ); + idSetInstObjPath = popup.insertItem( SmallIconSet( "document-open" ), i18n( "Install Path..." ) ); popup.setWhatsThis( idSetInstObjPath, i18n( "Install path

Allows to choose the installation path for the current install object." ) ); - idInsNewFilepatternItem = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Pattern of Files to Install..." ) ); + idInsNewFilepatternItem = popup.insertItem( SmallIconSet( "document-open" ), i18n( "Add Pattern of Files to Install..." ) ); popup.setWhatsThis( idInsNewFilepatternItem, i18n( "Add pattern of files to install

Defines the pattern to match files which will be installed. " "It is possible to use wildcards and relative paths like docs/*." ) ); - idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Install Object" ) ); + idRemoveFile = popup.insertItem( SmallIconSet( "edit-delete" ), i18n( "Remove Install Object" ) ); popup.setWhatsThis( idRemoveFile, i18n( "Remove install object

Removes the install object the current group." ) ); } else if ( titem->groupType == GroupItem::Translations ) { - idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) ); + idInsNewFile = popup.insertItem( SmallIconSet( "document-new" ), i18n( "Create New File..." ) ); popup.setWhatsThis( idInsNewFile, i18n( "Create new file

Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) ); - idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) ); + idInsExistingFile = popup.insertItem( SmallIconSet( "document-open" ), i18n( "Add Existing Files..." ) ); popup.setWhatsThis( idInsExistingFile, i18n( "Add existing files

Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is " "possible to copy files to a current subproject directory, create symbolic links or " "add them with the relative path." ) ); @@ -1575,9 +1575,9 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * } else // File group containing files { - idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) ); + idInsNewFile = popup.insertItem( SmallIconSet( "document-new" ), i18n( "Create New File..." ) ); popup.setWhatsThis( idInsNewFile, i18n( "Create new file

Creates a new file and adds it to a currently selected group." ) ); - idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) ); + idInsExistingFile = popup.insertItem( SmallIconSet( "document-open" ), i18n( "Add Existing Files..." ) ); popup.setWhatsThis( idInsExistingFile, i18n( "Add existing files

Adds existing files to a currently selected group. It is " "possible to copy files to a current subproject directory, create symbolic links or " "add them with the relative path." ) ); @@ -1793,7 +1793,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * } if ( !( gitem->groupType == GroupItem::InstallObject ) ) { - idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove File" ) ); + idRemoveFile = popup.insertItem( SmallIconSet( "edit-delete" ), i18n( "Remove File" ) ); popup.setWhatsThis( idRemoveFile, i18n( "Remove file

Removes file from a current group. For sources, this also removes the subclassing information." ) ); idFileProperties = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Exclude File" ) ); popup.setWhatsThis( idFileProperties, i18n( "Exclude File

Excludes the file from this Scope. Does not touch subclassing information" ) ); @@ -1802,7 +1802,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * { idEditInstallPattern = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Edit Pattern" ) ); popup.setWhatsThis( idEditInstallPattern, i18n( "Edit pattern

Allows to edit install files pattern." ) ); - idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Pattern" ) ); + idRemoveFile = popup.insertItem( SmallIconSet( "edit-delete" ), i18n( "Remove Pattern" ) ); popup.setWhatsThis( idRemoveFile, i18n( "Remove pattern

Removes install files pattern from the current install object." ) ); } if ( !( gitem->groupType == GroupItem::InstallObject ) ) diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp index 0dabf861..39b6e5af 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp @@ -59,7 +59,7 @@ TQWhatsThis::add( fileOpen, fileOpenText ); - TQMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon ); + TQMimeSourceFactory::defaultFactory()->setPixmap( "document-open", openIcon ); TQString fileSaveText = tr("

Click this button to save the file you " "are editing. You will be prompted for a file name.\n" diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 6e2c943c..601413ef 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -20,7 +20,7 @@ setXMLFile( "%{APPNAMELC}.rc" ); KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new TDEAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ), + //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQT_SLOT( cut() ), // actionCollection(), "cut"); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index 0dabf861..39b6e5af 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -59,7 +59,7 @@ TQWhatsThis::add( fileOpen, fileOpenText ); - TQMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon ); + TQMimeSourceFactory::defaultFactory()->setPixmap( "document-open", openIcon ); TQString fileSaveText = tr("

Click this button to save the file you " "are editing. You will be prompted for a file name.\n" diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 7be42f65..5750d243 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -304,7 +304,7 @@ void VariableTree::slotContextMenu(TDEListView *, TQListViewItem *item) if (dynamic_cast(root)) { idRemove = popup.insertItem( - SmallIcon("editdelete"), i18n("Remove Watch Variable") ); + SmallIcon("edit-delete"), i18n("Remove Watch Variable") ); popup.setAccel(TQt::Key_Delete, idRemove); } else if (root != recentExpressions_) { idWatch = popup.insertItem( @@ -316,7 +316,7 @@ void VariableTree::slotContextMenu(TDEListView *, TQListViewItem *item) SmallIcon("reload"), i18n("Reevaluate Expression") ); MAYBE_DISABLE(idReevaluate); idRemove = popup.insertItem( - SmallIcon("editdelete"), i18n("Remove Expression") ); + SmallIcon("edit-delete"), i18n("Remove Expression") ); popup.setAccel(TQt::Key_Delete, idRemove); } @@ -327,7 +327,7 @@ void VariableTree::slotContextMenu(TDEListView *, TQListViewItem *item) } int idCopyToClipboard = popup.insertItem( - SmallIcon("editcopy"), i18n("Copy Value") ); + SmallIcon("edit-copy"), i18n("Copy Value") ); popup.setAccel(TQt::CTRL + TQt::Key_C, idCopyToClipboard); activePopup_ = &popup; @@ -396,7 +396,7 @@ void VariableTree::slotContextMenu(TDEListView *, TQListViewItem *item) TDEPopupMenu popup(this); popup.insertTitle(i18n("Recent Expressions")); int idRemove = popup.insertItem( - SmallIcon("editdelete"), i18n("Remove All")); + SmallIcon("edit-delete"), i18n("Remove All")); int idReevaluate = popup.insertItem( SmallIcon("reload"), i18n("Reevaluate All")); if (controller()->stateIsOn(s_dbgNotStarted)) diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index 33c9f733..cadff807 100644 --- a/lib/widgets/kdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -32,7 +32,7 @@ KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) TQPixmap closePixmap = TDEGlobal::instance()->iconLoader()->loadIcon( "tab_remove", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true ); if (closePixmap.isNull()) - closePixmap = SmallIcon("fileclose"); + closePixmap = SmallIcon("window-close"); m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQT_SLOT(closeWindowSlot())); m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQT_SLOT(closeOthersSlot())); diff --git a/parts/abbrev/abbrevconfigwidget.cpp b/parts/abbrev/abbrevconfigwidget.cpp index 77276371..7019b9fb 100644 --- a/parts/abbrev/abbrevconfigwidget.cpp +++ b/parts/abbrev/abbrevconfigwidget.cpp @@ -97,7 +97,7 @@ void AbbrevConfigWidget::codeChanged() if (item->text(3) == item->text(4)) item->setPixmap( 0, SmallIcon("template_source") ); else - item->setPixmap( 0, SmallIcon("filesave") ); + item->setPixmap( 0, SmallIcon("document-save") ); } } diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index a0dbafdd..01c703d0 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -48,7 +48,7 @@ DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) setXMLFile("kdevdiff.rc"); diffWidget = new DiffWidget(this, 0, "diffWidget"); - diffWidget->setIcon( SmallIcon("editcopy") ); + diffWidget->setIcon( SmallIcon("edit-copy") ); TQString nm( i18n( "Diff" ) ); diffWidget->setCaption( i18n( "Diff Output" ) ); TQWhatsThis::add(diffWidget, i18n("Difference viewer

Shows output of the diff format. " diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 51dabcaf..b52b8b25 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -80,7 +80,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) popup->insertSeparator( i ); connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "filesaveas" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 19deeb66..371e3733 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -78,7 +78,7 @@ FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStrin this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - TDEToolBarPopupAction * newAction = new TDEToolBarPopupAction( i18n("&New"), "filenew", CTRL+TQt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new"); + TDEToolBarPopupAction * newAction = new TDEToolBarPopupAction( i18n("&New"), "document-new", CTRL+TQt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new"); newAction->setWhatsThis( i18n("New file

Creates a new file. Also adds it the project if the Add to project checkbox is turned on.") ); newAction->setToolTip( i18n("Create a new file") ); m_newPopupMenu = newAction->popupMenu(); diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp index b2df14e9..2d48a043 100644 --- a/parts/filelist/filelist_item.cpp +++ b/parts/filelist/filelist_item.cpp @@ -51,7 +51,7 @@ void FileListItem::setState( DocumentState state ) // setPixmap( 0, 0L ); break; case Modified: - setPixmap( 0, SmallIcon("filesave") ); + setPixmap( 0, SmallIcon("document-save") ); break; case Dirty: setPixmap( 0, SmallIcon("document-revert") ); diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 517d2f98..8db2a727 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -281,17 +281,17 @@ void ProjectviewPart::setupActions() m_openPrjViewAction->setToolTip(i18n("Open Session")); - m_savePrjViewAction = new TDEAction(i18n("Save Session"), "filesave", 0, this, TQT_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); + m_savePrjViewAction = new TDEAction(i18n("Save Session"), "document-save", 0, this, TQT_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); - m_newPrjViewAction = new TDEAction(i18n("New Session..."), "filenew", 0, this, TQT_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); + m_newPrjViewAction = new TDEAction(i18n("New Session..."), "document-new", 0, this, TQT_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); - m_deletePrjViewAction = new TDESelectAction(i18n("Delete Session"), "editdelete", 0, actionCollection(), "viewsession_delete"); + m_deletePrjViewAction = new TDESelectAction(i18n("Delete Session"), "edit-delete", 0, actionCollection(), "viewsession_delete"); connect(m_deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotDeleteProjectView(const TQString &))); m_deletePrjViewAction->setToolTip(i18n("Delete Session")); - m_deleteCurrentPrjViewAction = new TDEAction(i18n("Delete Session"), "editdelete", 0, this, TQT_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); + m_deleteCurrentPrjViewAction = new TDEAction(i18n("Delete Session"), "edit-delete", 0, this, TQT_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); m_deleteCurrentPrjViewAction->setToolTip(i18n("Delete Session")); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index c0380ffb..77c84658 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -108,7 +108,7 @@ void ProjectManager::createActions( TDEActionCollection* ac ) m_openRecentProjectAction->loadEntries(kapp->config(), "RecentProjects"); m_closeProjectAction = - new TDEAction(i18n("C&lose Project"), "fileclose",0, + new TDEAction(i18n("C&lose Project"), "window-close",0, this, TQT_SLOT(closeProject()), ac, "project_close"); m_closeProjectAction->setEnabled(false); diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 047d0726..b3e02591 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -572,7 +572,7 @@ void SimpleMainWindow::documentChangedState(const KURL &url, DocumentState state widget->setIcon(TQPixmap()); break; case Modified: - widget->setIcon(SmallIcon("filesave", isize)); + widget->setIcon(SmallIcon("document-save", isize)); break; case Dirty: widget->setIcon(SmallIcon("document-revert", isize)); diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 65d3ea42..008dc867 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -77,7 +77,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) popup->insertSeparator( i ); connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "filesaveas" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); -- cgit v1.2.3