From 0bde81cee4b8d3edc6da54dbbb37846806873c73 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 15:43:56 -0500 Subject: [PATCH] Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance --- kbruch/src/mainqtwidget.cpp | 2 +- khangman/khangman/khangman.cpp | 2 +- kig/kig/kig_part.cpp | 2 +- kig/modes/popup.cc | 2 +- kig/modes/typesdialog.cpp | 4 ++-- klettres/klettres/klettres.cpp | 2 +- kmplot/kmplot/MainDlg.cpp | 2 +- kstars/kstars/imageviewer.cpp | 4 ++-- kstars/kstars/indifitsconf.cpp | 2 +- kstars/kstars/kstarsinit.cpp | 4 ++-- kstars/kstars/tools/observinglist.cpp | 6 +++--- kstars/kstars/tools/scriptbuilder.cpp | 8 ++++---- kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp | 2 +- kvoctrain/kvoctrain/kva_init.cpp | 4 ++-- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp index ebd780c0..1b54e990 100644 --- a/kbruch/src/mainqtwidget.cpp +++ b/kbruch/src/mainqtwidget.cpp @@ -154,7 +154,7 @@ void MainQtWidget::writeOptions() void MainQtWidget::setupActions() { // new task action - m_NewTaskAction = new TDEAction(i18n("&New"), "filenew", TDEStdAccel::shortcut(TDEStdAccel::New), + m_NewTaskAction = new TDEAction(i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(NewTask()), actionCollection(), "NewTask"); diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 7c4d7039..6b54405b 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -74,7 +74,7 @@ KHangMan::~KHangMan() void KHangMan::setupActions() { // Game->New - TDEAction *action = new TDEAction(i18n("&New"), "filenew", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new"); + TDEAction *action = new TDEAction(i18n("&New"), "document-new", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new"); action->setToolTip(i18n( "Play with a new word" )); // Game->Get Words in New Language diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index 393ccfb9..af62d3b2 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -228,7 +228,7 @@ void KigPart::setupActions() TQPixmap tmp; aDeleteObjects = new TDEAction( - i18n("&Delete Objects"), "editdelete", Key_Delete, this, + i18n("&Delete Objects"), "edit-delete", Key_Delete, this, TQT_SLOT(deleteObjects()), actionCollection(), "delete_objects"); aDeleteObjects->setToolTip(i18n("Delete the selected objects")); diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc index eef5b1e3..05dc5d24 100644 --- a/kig/modes/popup.cc +++ b/kig/modes/popup.cc @@ -399,7 +399,7 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in nextfree += 2; TQPixmap p = l->loadIcon( "move", TDEIcon::Toolbar ); popup.addAction( menu, p, i18n( "&Move" ), nextfree++ ); - p = l->loadIcon( "editdelete", TDEIcon::Toolbar ); + p = l->loadIcon( "edit-delete", TDEIcon::Toolbar ); popup.addAction( menu, p, i18n( "&Delete" ), nextfree++ ); } else if ( menu == NormalModePopupObjects::SetColorMenu ) diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index 8847ee5a..d8219308 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -69,7 +69,7 @@ TypesDialog::TypesDialog( TQWidget* parent, KigPart& part ) buttonCancel->setGuiItem( KStdGuiItem::cancel() ); il = part.instance()->iconLoader(); buttonEdit->setIconSet( TQIconSet( il->loadIcon( "edit", TDEIcon::Small ) ) ); - buttonRemove->setIconSet( TQIconSet( il->loadIcon( "editdelete", TDEIcon::Small ) ) ); + buttonRemove->setIconSet( TQIconSet( il->loadIcon( "edit-delete", TDEIcon::Small ) ) ); buttonExport->setIconSet( TQIconSet( il->loadIcon( "fileexport", TDEIcon::Small ) ) ); buttonImport->setIconSet( TQIconSet( il->loadIcon( "fileimport", TDEIcon::Small ) ) ); @@ -82,7 +82,7 @@ TypesDialog::TypesDialog( TQWidget* parent, KigPart& part ) popup = new TQPopupMenu( this ); popup->insertItem( SmallIcon( "edit" ), i18n( "&Edit..." ), this, TQT_SLOT( editType() ) ); - popup->insertItem( SmallIcon( "editdelete" ), i18n( "&Delete" ), this, TQT_SLOT( deleteType() ) ); + popup->insertItem( SmallIcon( "edit-delete" ), i18n( "&Delete" ), this, TQT_SLOT( deleteType() ) ); popup->insertSeparator(); popup->insertItem( SmallIcon( "fileexport" ), i18n( "E&xport..." ), this, TQT_SLOT( exportType() ) ); diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index e899be00..871056d2 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -204,7 +204,7 @@ void KLettres::setupActions() m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound.")); KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); - m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"editclear", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotMenubar()), actionCollection(), "menubar"); + m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"edit-clear", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotMenubar()), actionCollection(), "menubar"); m_menubarAction->setCheckedState(i18n("Hide &Menubar")); m_menubarAction->setChecked(true); m_menubarAction->setWhatsThis(i18n("You can show or hide the menubar as you wish by clicking this button.")); diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 0c55074d..7533518c 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -192,7 +192,7 @@ void MainDlg::setupActions() // Popup menu TDEAction *mnuHide = new TDEAction(i18n("&Hide") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" ); mnuHide->plug(m_popupmenu); - TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"editdelete", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); + TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"edit-delete", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); mnuRemove->plug(m_popupmenu); TDEAction *mnuEdit = new TDEAction(i18n("&Edit"),"editplots", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" ); mnuEdit->plug(m_popupmenu); diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp index 80b14c4b..7e31d3cc 100644 --- a/kstars/kstars/imageviewer.cpp +++ b/kstars/kstars/imageviewer.cpp @@ -37,9 +37,9 @@ ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *pa // JH: easier to just disable its mobility toolBar()->setMovingEnabled( false ); - TDEAction *action = new TDEAction (i18n ("Close Window"), "fileclose", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection()); + TDEAction *action = new TDEAction (i18n ("Close Window"), "window-close", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection()); action->plug (toolBar()); - action = new TDEAction (i18n ("Save Image"), "filesave", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection()); + action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection()); action->plug (toolBar()); statusBar()->insertItem( capText, 0, 1, true ); diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp index 083dca84..83779bb1 100644 --- a/kstars/kstars/indifitsconf.cpp +++ b/kstars/kstars/indifitsconf.cpp @@ -28,7 +28,7 @@ INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlag { TDEIconLoader *icons = TDEGlobal::iconLoader(); - selectDirB->setPixmap( icons->loadIcon( "fileopen", TDEIcon::Toolbar ) ); + selectDirB->setPixmap( icons->loadIcon( "document-open", TDEIcon::Toolbar ) ); connect(selectDirB, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveFITSDirectory())); connect(filterCombo, TQT_SIGNAL(activated (int)), this, TQT_SLOT(comboUpdate(int))); } diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index e5493a63..456c18a6 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -50,11 +50,11 @@ void KStars::initActions() { //File Menu: new TDEAction(i18n("&New Window"), "window_new", TDEShortcut( "Ctrl+N" ), TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection(), "new_window"); - new TDEAction(i18n("&Close Window"), "fileclose", TDEShortcut( "Ctrl+W" ), + new TDEAction(i18n("&Close Window"), "window-close", TDEShortcut( "Ctrl+W" ), TQT_TQOBJECT(this), TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); new TDEAction( i18n( "&Download Data..." ), "knewstuff", TDEShortcut( "Ctrl+D" ), TQT_TQOBJECT(this), TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); - new TDEAction( i18n( "Open FITS..."), "fileopen", TDEShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); + new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); new TDEAction( i18n( "&Save Sky Image..." ), "fileexport", TDEShortcut( "Ctrl+I" ), TQT_TQOBJECT(this), TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); new TDEAction( i18n( "&Run Script..." ), "launch", TDEShortcut( "Ctrl+R" ), diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index be2ec6f4..d3b921ea 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -106,9 +106,9 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) //Add icons to Push Buttons TDEIconLoader *icons = TDEGlobal::iconLoader(); - ui->OpenButton->setPixmap( icons->loadIcon( "fileopen", TDEIcon::Toolbar ) ); - ui->SaveButton->setPixmap( icons->loadIcon( "filesave", TDEIcon::Toolbar ) ); - ui->SaveAsButton->setPixmap( icons->loadIcon( "filesaveas", TDEIcon::Toolbar ) ); + ui->OpenButton->setPixmap( icons->loadIcon( "document-open", TDEIcon::Toolbar ) ); + ui->SaveButton->setPixmap( icons->loadIcon( "document-save", TDEIcon::Toolbar ) ); + ui->SaveAsButton->setPixmap( icons->loadIcon( "document-save-as", TDEIcon::Toolbar ) ); ui->WizardButton->setPixmap( icons->loadIcon( "wizard", TDEIcon::Toolbar ) ); ui->MiniButton->setPixmap( icons->loadIcon( "window_nofullscreen", TDEIcon::Toolbar ) ); diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index e688b651..3d1ddbaa 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -266,10 +266,10 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) //Add icons to Push Buttons TDEIconLoader *icons = TDEGlobal::iconLoader(); - sb->NewButton->setIconSet( icons->loadIcon( "filenew", TDEIcon::Toolbar ) ); - sb->OpenButton->setIconSet( icons->loadIcon( "fileopen", TDEIcon::Toolbar ) ); - sb->SaveButton->setIconSet( icons->loadIconSet( "filesave", TDEIcon::Toolbar ) ); - sb->SaveAsButton->setIconSet( icons->loadIconSet( "filesaveas", TDEIcon::Toolbar ) ); + sb->NewButton->setIconSet( icons->loadIcon( "document-new", TDEIcon::Toolbar ) ); + sb->OpenButton->setIconSet( icons->loadIcon( "document-open", TDEIcon::Toolbar ) ); + sb->SaveButton->setIconSet( icons->loadIconSet( "document-save", TDEIcon::Toolbar ) ); + sb->SaveAsButton->setIconSet( icons->loadIconSet( "document-save-as", TDEIcon::Toolbar ) ); sb->RunButton->setIconSet( icons->loadIconSet( "launch", TDEIcon::Toolbar ) ); sb->CopyButton->setIconSet( icons->loadIconSet( "reload", TDEIcon::Toolbar ) ); sb->AddButton->setIconSet( icons->loadIconSet( "back", TDEIcon::Toolbar ) ); diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp index dc18ac4e..05f9e590 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp @@ -73,7 +73,7 @@ KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * les addPage(m_viewOptions, i18n("View"), "view_choose", i18n("View Settings"), true); m_pasteOptions = new PasteOptions(m_langSet, doc, 0, "Copy & Paste Settings"); - addPage(m_pasteOptions, i18n("Copy & Paste"), "editpaste", i18n("Copy & Paste Settings"), true); + addPage(m_pasteOptions, i18n("Copy & Paste"), "edit-paste", i18n("Copy & Paste Settings"), true); connect(m_pasteOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); m_queryOptions = new QueryOptions(0, "Query Settings"); diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index e8a40734..f4f36e70 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -106,7 +106,7 @@ void kvoctrainApp::initActions() fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileOpenExample = new TDEAction(i18n("Open &Example..."), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); + fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); fileOpen->setWhatsThis(i18n("Open a vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); @@ -168,7 +168,7 @@ void kvoctrainApp::initActions() editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows")); editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis()); - editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("filesaveas", TDEIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); + editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary")); editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis());