From bab4f22f92cb4960c7a7c17845813de2082ffdc9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 15:43:57 -0500 Subject: Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance --- tdeio/tdefile/kdirselectdialog.cpp | 4 ++-- tdeio/tdefile/kurlbar.cpp | 4 ++-- tdeio/tdefile/kurlrequester.cpp | 2 +- tdeio/tdefile/tdediroperator.cpp | 4 ++-- tdeio/tdefile/tdefiledialog.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tdeio/tdefile') diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp index 5027f631c..8087f206d 100644 --- a/tdeio/tdefile/kdirselectdialog.cpp +++ b/tdeio/tdefile/kdirselectdialog.cpp @@ -89,7 +89,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, bool modal) : KDialogBase( parent, name, modal, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, - KGuiItem( i18n("New Folder..."), "folder_new" ) ), + KGuiItem( i18n("New Folder..."), "folder-new" ) ), m_localOnly( localOnly ) { d = new KDirSelectDialogPrivate; @@ -122,7 +122,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, TQT_SLOT( slotComboTextChanged( const TQString& ) )); m_contextMenu = new TQPopupMenu( this ); - TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); + TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); newFolder->plug(m_contextMenu); m_contextMenu->insertSeparator(); m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this), diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp index e4f86fbed..64f5f4fb2 100644 --- a/tdeio/tdefile/kurlbar.cpp +++ b/tdeio/tdefile/kurlbar.cpp @@ -752,11 +752,11 @@ void KURLBar::slotContextMenuRequested( TQListBoxItem *_item, const TQPoint& pos popup->insertSeparator(); } - popup->insertItem(SmallIconSet("filenew"), i18n("&Add Entry..."), AddItem); + popup->insertItem(SmallIconSet("document-new"), i18n("&Add Entry..."), AddItem); if (item != 0L && item->isPersistent()) { - popup->insertItem( SmallIconSet("editdelete"), i18n("&Remove Entry"), + popup->insertItem( SmallIconSet("edit-delete"), i18n("&Remove Entry"), RemoveItem ); } diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp index 7ecfd543d..64e25b93c 100644 --- a/tdeio/tdefile/kurlrequester.cpp +++ b/tdeio/tdefile/kurlrequester.cpp @@ -206,7 +206,7 @@ void KURLRequester::init() d->edit = new KLineEdit( this, "line edit" ); myButton = new KURLDragPushButton( this, "tdefile button"); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("document-open")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp index dc44aa8ba..c7dc845cc 100644 --- a/tdeio/tdefile/tdediroperator.cpp +++ b/tdeio/tdefile/tdediroperator.cpp @@ -1271,9 +1271,9 @@ void KDirOperator::setupActions() TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - new TDEAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), + new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); - mkdirAction->setIcon( TQString::fromLatin1("folder_new") ); + mkdirAction->setIcon( TQString::fromLatin1("folder-new") ); reloadAction->setText( i18n("Reload") ); reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload )); diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index 03bc17757..a004ae177 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -1838,7 +1838,7 @@ void KFileDialog::setOperationMode( OperationMode mode ) d->keepLocation = (mode == Saving); filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving ); if ( mode == Opening ) - d->okButton->setGuiItem( KGuiItem( i18n("&Open"), "fileopen") ); + d->okButton->setGuiItem( KGuiItem( i18n("&Open"), "document-open") ); else if ( mode == Saving ) { d->okButton->setGuiItem( KStdGuiItem::save() ); setNonExtSelection(); -- cgit v1.2.1