| 9769a309 | 2014-10-13 15:43:42 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
|
M digikam/digikam/albumfolderview.cpp M digikam/digikam/albumiconview.cpp M digikam/digikam/digikamapp.cpp M digikam/digikam/searchfolderview.cpp M digikam/digikam/tagfilterview.cpp M digikam/digikam/tagfolderview.cpp M digikam/digikam/timelinefolderview.cpp M digikam/digikam/timelineview.cpp M digikam/libs/imageproperties/imagedescedittab.cpp M digikam/libs/widgets/metadata/metadatawidget.cpp M digikam/showfoto/setup/setup.cpp M digikam/showfoto/showfoto.cpp M digikam/utilities/cameragui/cameraiconview.cpp M digikam/utilities/cameragui/cameraui.cpp M digikam/utilities/imageeditor/editor/editorwindow.cpp M digikam/utilities/imageeditor/editor/imagewindow.cpp M digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp M digikam/utilities/lighttable/lighttablebar.cpp M digikam/utilities/lighttable/lighttablewindow.cpp M digikam/utilities/setup/setup.cpp |
||
diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp
index cddab03..9d84999 100644
--- a/digikam/digikam/albumfolderview.cpp
+++ b/digikam/digikam/albumfolderview.cpp
@@ -668,7 +668,7 @@
}
else
{
- popmenu.insertItem(SmallIcon("editdelete"),
+ popmenu.insertItem(SmallIcon("edit-delete"),
i18n("Delete Album"), 12);
}
}
@@ -1194,7 +1194,7 @@
TDEPopupMenu popMenu(this);
popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
- popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+ popMenu.insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), 11 );
if (imageIDs.count() == 1)
popMenu.insertItem(i18n("Set as Album Thumbnail"), 12);
popMenu.insertSeparator(-1);
@@ -1322,7 +1322,7 @@
TDEPopupMenu popMenu(this);
popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
- popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+ popMenu.insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), 11 );
popMenu.insertSeparator(-1);
popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
popMenu.setMouseTracking(true);
diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp
index e5e6dd9..c8ccf53 100644
--- a/digikam/digikam/albumiconview.cpp
+++ b/digikam/digikam/albumiconview.cpp
@@ -1403,7 +1403,7 @@
TQPopupMenu popMenu(this);
popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
- popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+ popMenu.insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), 11 );
popMenu.insertSeparator(-1);
popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
@@ -1441,7 +1441,7 @@
TQPopupMenu popMenu(this);
popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
- popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+ popMenu.insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), 11 );
popMenu.insertSeparator(-1);
popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp
index 642214d..7b83d7c 100644
--- a/digikam/digikam/digikamapp.cpp
+++ b/digikam/digikam/digikamapp.cpp
@@ -596,7 +596,7 @@
TQT_TQOBJECT(this), TQT_SLOT(slotRecurseTags(bool)));
d->deleteAction = new TDEAction(i18n("Delete"),
- "editdelete",
+ "edit-delete",
0,
TQT_TQOBJECT(d->view),
TQT_SLOT(slotDeleteAlbum()),
@@ -728,7 +728,7 @@
// Pop up dialog to ask user whether to permanently delete
d->imageDeletePermanentlyAction = new TDEAction(i18n("Delete permanently"),
- "editdelete",
+ "edit-delete",
SHIFT+Key_Delete,
TQT_TQOBJECT(d->view),
TQT_SLOT(slotImageDeletePermanently()),
@@ -738,7 +738,7 @@
// These two actions are hidden, no menu entry, no toolbar entry, no shortcut.
// Power users may add them.
d->imageDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete permanently without confirmation"),
- "editdelete",
+ "edit-delete",
0,
TQT_TQOBJECT(d->view),
TQT_SLOT(slotImageDeletePermanentlyDirectly()),
diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp
index af5c893..5fd23e9 100644
--- a/digikam/digikam/searchfolderview.cpp
+++ b/digikam/digikam/searchfolderview.cpp
@@ -430,7 +430,7 @@
popmenu.insertItem(SmallIcon("edit-find"), i18n("Edit as Advanced Search..."), 11);
popmenu.insertSeparator(-1);
- popmenu.insertItem(SmallIcon("editdelete"), i18n("Delete Search"), 12);
+ popmenu.insertItem(SmallIcon("edit-delete"), i18n("Delete Search"), 12);
switch (popmenu.exec(TQCursor::pos()))
{
diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp
index 6157aeb..fe658c0 100644
--- a/digikam/digikam/tagfilterview.cpp
+++ b/digikam/digikam/tagfilterview.cpp
@@ -1246,7 +1246,7 @@
int result = KMessageBox::warningContinueCancel(0, message,
i18n("Delete Tag"),
KGuiItem(i18n("Delete"),
- "editdelete"));
+ "edit-delete"));
if (result == KMessageBox::Continue)
{
diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp
index 2b59aa6..13629b9 100644
--- a/digikam/digikam/tagfolderview.cpp
+++ b/digikam/digikam/tagfolderview.cpp
@@ -748,7 +748,7 @@
int result = KMessageBox::warningContinueCancel(0, message,
i18n("Delete Tag"),
KGuiItem(i18n("Delete"),
- "editdelete"));
+ "edit-delete"));
if(result == KMessageBox::Continue)
{
diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp
index 4028bc3..97225f7 100644
--- a/digikam/digikam/timelinefolderview.cpp
+++ b/digikam/digikam/timelinefolderview.cpp
@@ -272,7 +272,7 @@
TDEPopupMenu popmenu(this);
popmenu.insertTitle(SmallIcon("digikam"), i18n("My Date Searches"));
popmenu.insertItem(SmallIcon("pencil"), i18n("Rename..."), 10);
- popmenu.insertItem(SmallIcon("editdelete"), i18n("Delete"), 11);
+ popmenu.insertItem(SmallIcon("edit-delete"), i18n("Delete"), 11);
switch (popmenu.exec(TQCursor::pos()))
{
diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp
index 2436fb6..1951d43 100644
--- a/digikam/digikam/timelineview.cpp
+++ b/digikam/digikam/timelineview.cpp
@@ -204,7 +204,7 @@
"\"My Date Searches\" view"));
d->saveButton = new TQPushButton(hbox2);
- d->saveButton->setPixmap(SmallIcon("filesave"));
+ d->saveButton->setPixmap(SmallIcon("document-save"));
d->saveButton->setEnabled(false);
TQToolTip::add(d->saveButton, i18n("Save current selection to a new virtual Album"));
TQWhatsThis::add(d->saveButton, i18n("<p>If you press this button, current "
diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp
index cb01526..3c350b1 100644
--- a/digikam/libs/imageproperties/imagedescedittab.cpp
+++ b/digikam/libs/imageproperties/imagedescedittab.cpp
@@ -1153,7 +1153,7 @@
int result = KMessageBox::warningContinueCancel(this, message,
i18n("Delete Tag"),
KGuiItem(i18n("Delete"),
- "editdelete"));
+ "edit-delete"));
if (result == KMessageBox::Continue)
{
diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp
index dadec35..4ccfbbf 100644
--- a/digikam/libs/widgets/metadata/metadatawidget.cpp
+++ b/digikam/libs/widgets/metadata/metadatawidget.cpp
@@ -126,19 +126,19 @@
d->toolButtons->setFrameShape(TQFrame::NoFrame);
TQPushButton *saveMetadata = new TQPushButton( d->toolButtons );
- saveMetadata->setPixmap( iconLoader->loadIcon( "filesave", (TDEIcon::Group)TDEIcon::Toolbar ) );
+ saveMetadata->setPixmap( iconLoader->loadIcon( "document-save", (TDEIcon::Group)TDEIcon::Toolbar ) );
TQWhatsThis::add( saveMetadata, i18n( "Save metadata to a binary file" ) );
TQToolTip::add( saveMetadata, i18n( "Save metadata" ));
d->toolButtons->insert(saveMetadata);
TQPushButton *printMetadata = new TQPushButton( d->toolButtons );
- printMetadata->setPixmap( iconLoader->loadIcon( "fileprint", (TDEIcon::Group)TDEIcon::Toolbar ) );
+ printMetadata->setPixmap( iconLoader->loadIcon( "document-print", (TDEIcon::Group)TDEIcon::Toolbar ) );
TQWhatsThis::add( printMetadata, i18n( "Print metadata to printer" ) );
TQToolTip::add( printMetadata, i18n( "Print metadata" ));
d->toolButtons->insert(printMetadata);
TQPushButton *copy2ClipBoard = new TQPushButton( d->toolButtons );
- copy2ClipBoard->setPixmap( iconLoader->loadIcon( "editcopy", (TDEIcon::Group)TDEIcon::Toolbar ) );
+ copy2ClipBoard->setPixmap( iconLoader->loadIcon( "edit-copy", (TDEIcon::Group)TDEIcon::Toolbar ) );
TQWhatsThis::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" ) );
TQToolTip::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" ));
d->toolButtons->insert(copy2ClipBoard);
diff --git a/digikam/showfoto/setup/setup.cpp b/digikam/showfoto/setup/setup.cpp
index 6261ac5..698fb20 100644
--- a/digikam/showfoto/setup/setup.cpp
+++ b/digikam/showfoto/setup/setup.cpp
@@ -108,7 +108,7 @@
d->iccPage = new Digikam::SetupICC(d->page_icc, this);
d->page_iofiles = addPage(i18n("Save Images"), i18n("Save Images' Files' Settings"),
- BarIcon("filesave", TDEIcon::SizeMedium));
+ BarIcon("document-save", TDEIcon::SizeMedium));
d->iofilesPage = new Digikam::SetupIOFiles(d->page_iofiles);
d->page_slideshow = addPage(i18n("Slide Show"), i18n("Slide Show Settings"),
diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp
index 0b1b5f2..bae1dae 100644
--- a/digikam/showfoto/showfoto.cpp
+++ b/digikam/showfoto/showfoto.cpp
@@ -561,7 +561,7 @@
}
else
{
- m_fileDeleteAction->setIcon("editdelete");
+ m_fileDeleteAction->setIcon("edit-delete");
m_fileDeleteAction->setText(i18n("Delete File"));
}
diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp
index b49426e..86b39e2 100644
--- a/digikam/utilities/cameragui/cameraiconview.cpp
+++ b/digikam/utilities/cameragui/cameraiconview.cpp
@@ -589,7 +589,7 @@
menu.insertItem(SmallIcon("go-down"),i18n("Download && Delete"), 4);
menu.insertItem(SmallIcon("encrypted"), i18n("Toggle lock"), 3);
menu.insertSeparator(-1);
- menu.insertItem(SmallIcon("editdelete"), i18n("Delete"), 2);
+ menu.insertItem(SmallIcon("edit-delete"), i18n("Delete"), 2);
int result = menu.exec(TQCursor::pos());
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index 2fdaa84..7920d13 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@@ -301,7 +301,7 @@
"E.g.: <i>Thu Aug 24 2006</i><p>"
"<b>Local Settings</b>: the date format depending on TDE control panel settings.<p>"));
- d->advBox->insertItem(CameraUIPriv::AUTOALBUMPAGE, albumBox, SmallIconSet("folder_new"),
+ d->advBox->insertItem(CameraUIPriv::AUTOALBUMPAGE, albumBox, SmallIconSet("folder-new"),
i18n("Auto-creation of Albums"));
// -- On the Fly options ---------------------------------------------------
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index 8c2a122..585fa9f 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -287,7 +287,7 @@
m_saveAsAction->setEnabled(false);
m_revertAction->setEnabled(false);
- d->filePrintAction = new TDEAction(i18n("Print Image..."), "fileprint",
** Diff limit reached (max: 250 lines) **
|
||