summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-13 15:43:42 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-13 15:43:42 -0500
commit6ae9931c042a26c2b75b729eeeabd74e8519b1c3 (patch)
tree9033709c03f7e2da7aae986452133bf8132c327f
parent3118190af4a61e2af2f6f2b6e75d82b3a0a4e22b (diff)
downloadgwenview-6ae9931c042a26c2b75b729eeeabd74e8519b1c3.tar.gz
gwenview-6ae9931c042a26c2b75b729eeeabd74e8519b1c3.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--src/app/bookmarkviewcontroller.cpp6
-rw-r--r--src/app/dirviewcontroller.cpp4
-rw-r--r--src/app/mainwindow.cpp6
-rw-r--r--src/gvcore/fileoperation.cpp2
-rw-r--r--src/gvcore/fileopobject.cpp2
-rw-r--r--src/gvimagepart/gvimagepart.cpp2
6 files changed, 11 insertions, 11 deletions
diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
index f6e4b32..33aad1b 100644
--- a/src/app/bookmarkviewcontroller.cpp
+++ b/src/app/bookmarkviewcontroller.cpp
@@ -209,7 +209,7 @@ BookmarkViewController::BookmarkViewController(TQWidget* parent)
action=new TDEAction(i18n("Add a bookmark (keep it short)", "Add"), "bookmark_add", 0,
this, TQT_SLOT(bookmarkCurrentURL()), d->mActionCollection);
action->plug(toolbar);
- action=new TDEAction(i18n("Remove a bookmark (keep it short)", "Remove"), "editdelete", 0,
+ action=new TDEAction(i18n("Remove a bookmark (keep it short)", "Remove"), "edit-delete", 0,
this, TQT_SLOT(deleteCurrentBookmark()), d->mActionCollection);
action->plug(toolbar);
}
@@ -302,7 +302,7 @@ void BookmarkViewController::slotContextMenu(TQListViewItem* item_) {
menu.insertSeparator();
menu.insertItem(SmallIcon("edit"), i18n("Edit..."),
this, TQT_SLOT(editCurrentBookmark()));
- menu.insertItem(SmallIcon("editdelete"), i18n("Delete"),
+ menu.insertItem(SmallIcon("edit-delete"), i18n("Delete"),
this, TQT_SLOT(deleteCurrentBookmark()));
}
menu.exec(TQCursor::pos());
@@ -402,7 +402,7 @@ void BookmarkViewController::deleteCurrentBookmark() {
int response=KMessageBox::warningContinueCancel(d->mListView,
"<qt>" + msg + "</qt>", title,
- KGuiItem(title, "editdelete")
+ KGuiItem(title, "edit-delete")
);
if (response==KMessageBox::Cancel) return;
diff --git a/src/app/dirviewcontroller.cpp b/src/app/dirviewcontroller.cpp
index 805391c..8466681 100644
--- a/src/app/dirviewcontroller.cpp
+++ b/src/app/dirviewcontroller.cpp
@@ -92,10 +92,10 @@ void DirViewController::slotTreeViewSelectionChanged(TQListViewItem* item) {
void DirViewController::slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint& pos) {
TQPopupMenu menu(d->mTreeView);
- menu.insertItem(SmallIcon("folder_new"),i18n("New Folder..."),this,TQT_SLOT(makeDir()));
+ menu.insertItem(SmallIcon("folder-new"),i18n("New Folder..."),this,TQT_SLOT(makeDir()));
menu.insertSeparator();
menu.insertItem(i18n("Rename..."),this,TQT_SLOT(renameDir()));
- menu.insertItem(SmallIcon("editdelete"),i18n("Delete"),this,TQT_SLOT(removeDir()));
+ menu.insertItem(SmallIcon("edit-delete"),i18n("Delete"),this,TQT_SLOT(removeDir()));
menu.insertSeparator();
menu.insertItem(i18n("Properties"),this,TQT_SLOT(showPropertiesDialog()));
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 0e62df1..3ae271a 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -495,7 +495,7 @@ void MainWindow::openFileViewControllerContextMenu(const TQPoint& pos, bool onIt
actionCollection()->action("view_sort")->plug(&menu);
mGoUp->plug(&menu);
- menu.insertItem(SmallIcon("folder_new"), i18n("New Folder..."), TQT_TQOBJECT(this), TQT_SLOT(makeDir()));
+ menu.insertItem(SmallIcon("folder-new"), i18n("New Folder..."), TQT_TQOBJECT(this), TQT_SLOT(makeDir()));
menu.insertSeparator();
@@ -979,7 +979,7 @@ void MainWindow::createActions() {
mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,TQT_TQOBJECT(this),TQT_SLOT(copyFiles()),actionCollection(),"file_copy");
mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,TQT_TQOBJECT(this),TQT_SLOT(moveFiles()),actionCollection(),"file_move");
mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,TQT_TQOBJECT(this),TQT_SLOT(linkFiles()),actionCollection(),"file_link");
- mDeleteFiles=new TDEAction(i18n("&Delete"),"editdelete",Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(deleteFiles()),actionCollection(),"file_delete");
+ mDeleteFiles=new TDEAction(i18n("&Delete"),"edit-delete",Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(deleteFiles()),actionCollection(),"file_delete");
mShowFileProperties=new TDEAction(i18n("Properties"),0,TQT_TQOBJECT(this),TQT_SLOT(showFileProperties()),actionCollection(),"file_properties");
KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()), actionCollection() );
@@ -999,7 +999,7 @@ void MainWindow::createActions() {
// Go
mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection(), "go_up");
- new TDEAction( i18n( "Home" ), "gohome", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection(), "go_home");
+ new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection(), "go_home");
// Window
mResetDockWidgets = new TDEAction(i18n("Reset"), 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets");
diff --git a/src/gvcore/fileoperation.cpp b/src/gvcore/fileoperation.cpp
index 3a814cd..db969f3 100644
--- a/src/gvcore/fileoperation.cpp
+++ b/src/gvcore/fileoperation.cpp
@@ -94,7 +94,7 @@ void fillDropURLMenu(TQPopupMenu* menu, const KURL::List& urls, const KURL& targ
DropMenuContext* context=new DropMenuContext(TQT_TQOBJECT(menu), urls, target, wasMoved);
menu->insertItem( SmallIcon("goto"), i18n("&Move Here"),
context, TQT_SLOT(move()) );
- menu->insertItem( SmallIcon("editcopy"), i18n("&Copy Here"),
+ menu->insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"),
context, TQT_SLOT(copy()) );
menu->insertItem( SmallIcon("www"), i18n("&Link Here"),
context, TQT_SLOT(link()) );
diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
index 938ea3f..fe1dde6 100644
--- a/src/gvcore/fileopobject.cpp
+++ b/src/gvcore/fileopobject.cpp
@@ -192,7 +192,7 @@ void FileOpMakeDirObject::operator()() {
InputDialog dlg(mParent);
dlg.setCaption( i18n("Creating Folder") );
dlg.setLabel( i18n("Enter the name of the new folder:") );
- dlg.setButtonOK( KGuiItem(i18n("Create Folder"), "folder_new") );
+ dlg.setButtonOK( KGuiItem(i18n("Create Folder"), "folder-new") );
if (!dlg.exec()) return;
TQString newDir = dlg.lineEdit()->text();
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index 4dd45bf..91ec7a0 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -316,7 +316,7 @@ void GVImagePart::saveAs() {
return;
}
- KGuiItem saveItem(i18n("&Save Original"), "filesaveas");
+ KGuiItem saveItem(i18n("&Save Original"), "document-save-as");
int result = KMessageBox::warningContinueCancel(
widget(),
i18n("Gwenview KPart can't save the modifications you made. Do you want to save the original image?"),