fd06cd80 | 2014-10-13 15:43:59 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
M buildtools/autotools/autodetailsview.cpp M buildtools/autotools/autosubprojectview.cpp M buildtools/autotools/fileselectorwidget.cpp M buildtools/autotools/removetargetdlg.cpp M buildtools/qmake/trollprojectwidget.cpp M languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp M languages/cpp/app_templates/kofficepart/kopart_view.cpp M languages/cpp/app_templates/qmakeapp/qmakeapp.cpp M languages/cpp/debugger/variablewidget.cpp M lib/widgets/kdevtabwidget.cpp M parts/abbrev/abbrevconfigwidget.cpp M parts/diff/diffpart.cpp M parts/diff/diffwidget.cpp M parts/filecreate/filecreate_part.cpp M parts/filelist/filelist_item.cpp M parts/filelist/projectviewpart.cpp M src/projectmanager.cpp M src/simplemainwindow.cpp M vcs/cvsservice/diffwidget.cpp |
||
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 91b6d75..9751c23 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -187,7 +187,7 @@ 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("<b>Create new file</b><p>Creates a new file and " @@ -241,7 +241,7 @@ "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("<b>Remove</b><p>Shows a list of targets " diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 8353e2e..01428eb 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -180,7 +180,7 @@ 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("<qt><b>Add new subproject</b><p>Creates a new " "subproject in currently selected subproject.</qt>")); diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 5cc066c..85bb32c 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -80,7 +80,7 @@ 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 dd50181..c9068ec 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -56,7 +56,7 @@ 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 68dfad8..b125335 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -101,7 +101,7 @@ 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 @@ // 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 @@ "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( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> 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 <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) ); @@ -1044,10 +1044,10 @@ { idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) ); popup.setWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>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( "<b>Remove Scope</b><p>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( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> 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 <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) ); @@ -1540,29 +1540,29 @@ 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( "<b>Add install object</b><p>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( "<b>Install path</b><p>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( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. " "It is possible to use wildcards and relative paths like <i>docs/*</i>." ) ); - idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Install Object" ) ); + idRemoveFile = popup.insertItem( SmallIconSet( "edit-delete" ), i18n( "Remove Install Object" ) ); popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>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( "<b>Create new file</b><p>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( "<b>Add existing files</b><p>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 @@ } 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( "<b>Create new file</b><p>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( "<b>Add existing files</b><p>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 @@ } 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( "<b>Remove file</b><p>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( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) ); @@ -1802,7 +1802,7 @@ { idEditInstallPattern = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Edit Pattern" ) ); popup.setWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>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( "<b>Remove pattern</b><p>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 0dabf86..39b6e5a 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("<p>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 6e2c943..601413e 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 0dabf86..39b6e5a 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("<p>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 7be42f6..5750d24 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -304,7 +304,7 @@ if (dynamic_cast<WatchRoot*>(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 @@ 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 @@ } 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 @@ 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")); ** Diff limit reached (max: 250 lines) ** |