TDE
/
digikam
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/digikam
0
0
Fork 0
Code Issues Releases Wiki Activity

Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

Browse Source
pull/1/head
Timothy Pearson 10 years ago
parent 85c5c9e3a5
commit 9769a30949
20 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

6
digikam/digikam/albumfolderview.cpp
Unescape View File

@ -668,7 +668,7 @@ void AlbumFolderView::slotContextMenu(TQListViewItem *listitem, const TQPoint &,
} }
else else
{ {
popmenu.insertItem(SmallIcon("editdelete"), popmenu.insertItem(SmallIcon("edit-delete"),
i18n("Delete Album"), 12); i18n("Delete Album"), 12);
} }
} }
@ -1194,7 +1194,7 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e)
TDEPopupMenu popMenu(this); TDEPopupMenu popMenu(this);
popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums")); popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 ); 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) if (imageIDs.count() == 1)
popMenu.insertItem(i18n("Set as Album Thumbnail"), 12); popMenu.insertItem(i18n("Set as Album Thumbnail"), 12);
popMenu.insertSeparator(-1); popMenu.insertSeparator(-1);
@ -1322,7 +1322,7 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e)
TDEPopupMenu popMenu(this); TDEPopupMenu popMenu(this);
popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums")); popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 ); 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.insertSeparator(-1);
popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
popMenu.setMouseTracking(true); popMenu.setMouseTracking(true);

4
digikam/digikam/albumiconview.cpp
Unescape View File

@ -1403,7 +1403,7 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event)
TQPopupMenu popMenu(this); TQPopupMenu popMenu(this);
popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 ); 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.insertSeparator(-1);
popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
@ -1441,7 +1441,7 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event)
TQPopupMenu popMenu(this); TQPopupMenu popMenu(this);
popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 ); 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.insertSeparator(-1);
popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );

6
digikam/digikam/digikamapp.cpp
Unescape View File

@ -596,7 +596,7 @@ void DigikamApp::setupActions()
TQT_TQOBJECT(this), TQT_SLOT(slotRecurseTags(bool))); TQT_TQOBJECT(this), TQT_SLOT(slotRecurseTags(bool)));
d->deleteAction = new TDEAction(i18n("Delete"), d->deleteAction = new TDEAction(i18n("Delete"),
"editdelete", "edit-delete",
0, 0,
TQT_TQOBJECT(d->view), TQT_TQOBJECT(d->view),
TQT_SLOT(slotDeleteAlbum()), TQT_SLOT(slotDeleteAlbum()),
@ -728,7 +728,7 @@ void DigikamApp::setupActions()
// Pop up dialog to ask user whether to permanently delete // Pop up dialog to ask user whether to permanently delete
d->imageDeletePermanentlyAction = new TDEAction(i18n("Delete permanently"), d->imageDeletePermanentlyAction = new TDEAction(i18n("Delete permanently"),
"editdelete", "edit-delete",
SHIFT+Key_Delete, SHIFT+Key_Delete,
TQT_TQOBJECT(d->view), TQT_TQOBJECT(d->view),
TQT_SLOT(slotImageDeletePermanently()), TQT_SLOT(slotImageDeletePermanently()),
@ -738,7 +738,7 @@ void DigikamApp::setupActions()
// These two actions are hidden, no menu entry, no toolbar entry, no shortcut. // These two actions are hidden, no menu entry, no toolbar entry, no shortcut.
// Power users may add them. // Power users may add them.
d->imageDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete permanently without confirmation"), d->imageDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete permanently without confirmation"),
"editdelete", "edit-delete",
0, 0,
TQT_TQOBJECT(d->view), TQT_TQOBJECT(d->view),
TQT_SLOT(slotImageDeletePermanentlyDirectly()), TQT_SLOT(slotImageDeletePermanentlyDirectly()),

2
digikam/digikam/searchfolderview.cpp
Unescape View File

@ -430,7 +430,7 @@ void SearchFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, int
popmenu.insertItem(SmallIcon("edit-find"), i18n("Edit as Advanced Search..."), 11); popmenu.insertItem(SmallIcon("edit-find"), i18n("Edit as Advanced Search..."), 11);
popmenu.insertSeparator(-1); 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())) switch (popmenu.exec(TQCursor::pos()))
{ {

2
digikam/digikam/tagfilterview.cpp
Unescape View File

@ -1246,7 +1246,7 @@ void TagFilterView::tagDelete(TagFilterViewItem* item)
int result = KMessageBox::warningContinueCancel(0, message, int result = KMessageBox::warningContinueCancel(0, message,
i18n("Delete Tag"), i18n("Delete Tag"),
KGuiItem(i18n("Delete"), KGuiItem(i18n("Delete"),
"editdelete")); "edit-delete"));
if (result == KMessageBox::Continue) if (result == KMessageBox::Continue)
{ {

2
digikam/digikam/tagfolderview.cpp
Unescape View File

@ -748,7 +748,7 @@ void TagFolderView::tagDelete(TagFolderViewItem *item)
int result = KMessageBox::warningContinueCancel(0, message, int result = KMessageBox::warningContinueCancel(0, message,
i18n("Delete Tag"), i18n("Delete Tag"),
KGuiItem(i18n("Delete"), KGuiItem(i18n("Delete"),
"editdelete")); "edit-delete"));
if(result == KMessageBox::Continue) if(result == KMessageBox::Continue)
{ {

2
digikam/digikam/timelinefolderview.cpp
Unescape View File

@ -272,7 +272,7 @@ void TimeLineFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, i
TDEPopupMenu popmenu(this); TDEPopupMenu popmenu(this);
popmenu.insertTitle(SmallIcon("digikam"), i18n("My Date Searches")); popmenu.insertTitle(SmallIcon("digikam"), i18n("My Date Searches"));
popmenu.insertItem(SmallIcon("pencil"), i18n("Rename..."), 10); 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())) switch (popmenu.exec(TQCursor::pos()))
{ {

2
digikam/digikam/timelineview.cpp
Unescape View File

@ -204,7 +204,7 @@ TimeLineView::TimeLineView(TQWidget *parent)
"\"My Date Searches\" view")); "\"My Date Searches\" view"));
d->saveButton = new TQPushButton(hbox2); d->saveButton = new TQPushButton(hbox2);
d->saveButton->setPixmap(SmallIcon("filesave")); d->saveButton->setPixmap(SmallIcon("document-save"));
d->saveButton->setEnabled(false); d->saveButton->setEnabled(false);
TQToolTip::add(d->saveButton, i18n("Save current selection to a new virtual Album")); 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 " TQWhatsThis::add(d->saveButton, i18n("<p>If you press this button, current "

2
digikam/libs/imageproperties/imagedescedittab.cpp
Unescape View File

@ -1153,7 +1153,7 @@ void ImageDescEditTab::tagDelete(TAlbum *album)
int result = KMessageBox::warningContinueCancel(this, message, int result = KMessageBox::warningContinueCancel(this, message,
i18n("Delete Tag"), i18n("Delete Tag"),
KGuiItem(i18n("Delete"), KGuiItem(i18n("Delete"),
"editdelete")); "edit-delete"));
if (result == KMessageBox::Continue) if (result == KMessageBox::Continue)
{ {

6
digikam/libs/widgets/metadata/metadatawidget.cpp
Unescape View File

@ -126,19 +126,19 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name)
d->toolButtons->setFrameShape(TQFrame::NoFrame); d->toolButtons->setFrameShape(TQFrame::NoFrame);
TQPushButton *saveMetadata = new TQPushButton( d->toolButtons ); 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" ) ); TQWhatsThis::add( saveMetadata, i18n( "Save metadata to a binary file" ) );
TQToolTip::add( saveMetadata, i18n( "Save metadata" )); TQToolTip::add( saveMetadata, i18n( "Save metadata" ));
d->toolButtons->insert(saveMetadata); d->toolButtons->insert(saveMetadata);
TQPushButton *printMetadata = new TQPushButton( d->toolButtons ); 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" ) ); TQWhatsThis::add( printMetadata, i18n( "Print metadata to printer" ) );
TQToolTip::add( printMetadata, i18n( "Print metadata" )); TQToolTip::add( printMetadata, i18n( "Print metadata" ));
d->toolButtons->insert(printMetadata); d->toolButtons->insert(printMetadata);
TQPushButton *copy2ClipBoard = new TQPushButton( d->toolButtons ); 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" ) ); TQWhatsThis::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" ) );
TQToolTip::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" )); TQToolTip::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" ));
d->toolButtons->insert(copy2ClipBoard); d->toolButtons->insert(copy2ClipBoard);

2
digikam/showfoto/setup/setup.cpp
Unescape View File

@ -108,7 +108,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
d->iccPage = new Digikam::SetupICC(d->page_icc, this); d->iccPage = new Digikam::SetupICC(d->page_icc, this);
d->page_iofiles = addPage(i18n("Save Images"), i18n("Save Images' Files' Settings"), 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->iofilesPage = new Digikam::SetupIOFiles(d->page_iofiles);
d->page_slideshow = addPage(i18n("Slide Show"), i18n("Slide Show Settings"), d->page_slideshow = addPage(i18n("Slide Show"), i18n("Slide Show Settings"),

2
digikam/showfoto/showfoto.cpp
Unescape View File

@ -561,7 +561,7 @@ void ShowFoto::applySettings()
} }
else else
{ {
m_fileDeleteAction->setIcon("editdelete"); m_fileDeleteAction->setIcon("edit-delete");
m_fileDeleteAction->setText(i18n("Delete File")); m_fileDeleteAction->setText(i18n("Delete File"));
} }

2
digikam/utilities/cameragui/cameraiconview.cpp
Unescape View File

@ -589,7 +589,7 @@ void CameraIconView::slotContextMenu(IconItem * item, const TQPoint&)
menu.insertItem(SmallIcon("go-down"),i18n("Download && Delete"), 4); menu.insertItem(SmallIcon("go-down"),i18n("Download && Delete"), 4);
menu.insertItem(SmallIcon("encrypted"), i18n("Toggle lock"), 3); menu.insertItem(SmallIcon("encrypted"), i18n("Toggle lock"), 3);
menu.insertSeparator(-1); menu.insertSeparator(-1);
menu.insertItem(SmallIcon("editdelete"), i18n("Delete"), 2); menu.insertItem(SmallIcon("edit-delete"), i18n("Delete"), 2);
int result = menu.exec(TQCursor::pos()); int result = menu.exec(TQCursor::pos());

2
digikam/utilities/cameragui/cameraui.cpp
Unescape View File

@ -301,7 +301,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
"E.g.: <i>Thu Aug 24 2006</i><p>" "E.g.: <i>Thu Aug 24 2006</i><p>"
"<b>Local Settings</b>: the date format depending on TDE control panel settings.<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")); i18n("Auto-creation of Albums"));
// -- On the Fly options --------------------------------------------------- // -- On the Fly options ---------------------------------------------------

2
digikam/utilities/imageeditor/editor/editorwindow.cpp
Unescape View File

@ -287,7 +287,7 @@ void EditorWindow::setupStandardActions()
m_saveAsAction->setEnabled(false); m_saveAsAction->setEnabled(false);
m_revertAction->setEnabled(false); m_revertAction->setEnabled(false);
d->filePrintAction = new TDEAction(i18n("Print Image..."), "fileprint", d->filePrintAction = new TDEAction(i18n("Print Image..."), "document-print",
CTRL+Key_P, CTRL+Key_P,
TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()),
actionCollection(), "editorwindow_print"); actionCollection(), "editorwindow_print");

4
digikam/utilities/imageeditor/editor/imagewindow.cpp
Unescape View File

@ -334,7 +334,7 @@ void ImageWindow::setupActions()
// Pop up dialog to ask user whether to permanently delete // Pop up dialog to ask user whether to permanently delete
d->fileDeletePermanentlyAction = new TDEAction(i18n("Delete File Permanently"), d->fileDeletePermanentlyAction = new TDEAction(i18n("Delete File Permanently"),
"editdelete", "edit-delete",
SHIFT+Key_Delete, SHIFT+Key_Delete,
TQT_TQOBJECT(this), TQT_TQOBJECT(this),
TQT_SLOT(slotDeleteCurrentItemPermanently()), TQT_SLOT(slotDeleteCurrentItemPermanently()),
@ -344,7 +344,7 @@ void ImageWindow::setupActions()
// These two actions are hidden, no menu entry, no toolbar entry, no shortcut. // These two actions are hidden, no menu entry, no toolbar entry, no shortcut.
// Power users may add them. // Power users may add them.
d->fileDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete Permanently without Confirmation"), d->fileDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete Permanently without Confirmation"),
"editdelete", "edit-delete",
0, 0,
TQT_TQOBJECT(this), TQT_TQOBJECT(this),
TQT_SLOT(slotDeleteCurrentItemPermanentlyDirectly()), TQT_SLOT(slotDeleteCurrentItemPermanentlyDirectly()),

2
digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
Unescape View File

@ -390,7 +390,7 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent)
TQToolTip::add(button(Ok), i18n("<p>Import image to editor using current settings.")); TQToolTip::add(button(Ok), i18n("<p>Import image to editor using current settings."));
button(Cancel)->setText(i18n("Use Default")); button(Cancel)->setText(i18n("Use Default"));
button(Cancel)->setIconSet(SmallIconSet("gohome")); button(Cancel)->setIconSet(SmallIconSet("go-home"));
TQToolTip::add(button(Cancel), i18n("<p>Use general Raw decoding settings to load this image in editor.")); TQToolTip::add(button(Cancel), i18n("<p>Use general Raw decoding settings to load this image in editor."));
// --------------------------------------------------------------- // ---------------------------------------------------------------

2
digikam/utilities/lighttable/lighttablebar.cpp
Unescape View File

@ -182,7 +182,7 @@ void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e)
} }
popmenu.insertSeparator(); popmenu.insertSeparator();
popmenu.insertItem(SmallIcon("fileclose"), i18n("Remove item"), 13); popmenu.insertItem(SmallIcon("window-close"), i18n("Remove item"), 13);
} }
int totalItems = itemsURLs().count(); int totalItems = itemsURLs().count();

2
digikam/utilities/lighttable/lighttablewindow.cpp
Unescape View File

@ -365,7 +365,7 @@ void LightTableWindow::setupActions()
actionCollection(), "lighttable_edititem"); actionCollection(), "lighttable_edititem");
d->editItemAction->setEnabled(false); d->editItemAction->setEnabled(false);
d->removeItemAction = new TDEAction(i18n("Remove item from LightTable"), "fileclose", d->removeItemAction = new TDEAction(i18n("Remove item from LightTable"), "window-close",
CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()),
actionCollection(), "lighttable_removeitem"); actionCollection(), "lighttable_removeitem");
d->removeItemAction->setEnabled(false); d->removeItemAction->setEnabled(false);

4
digikam/utilities/setup/setup.cpp
Unescape View File

@ -144,7 +144,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
d->generalPage = new SetupGeneral(d->page_general, this); d->generalPage = new SetupGeneral(d->page_general, this);
d->page_collections = addPage(i18n("Collections"), i18n("Album Collections"), d->page_collections = addPage(i18n("Collections"), i18n("Album Collections"),
BarIcon("fileopen", TDEIcon::SizeMedium)); BarIcon("document-open", TDEIcon::SizeMedium));
d->collectionsPage = new SetupCollections(d->page_collections); d->collectionsPage = new SetupCollections(d->page_collections);
d->page_identity = addPage(i18n("Identity"), i18n("Default IPTC identity information"), d->page_identity = addPage(i18n("Identity"), i18n("Default IPTC identity information"),
@ -172,7 +172,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
d->editorPage = new SetupEditor(d->page_editor); d->editorPage = new SetupEditor(d->page_editor);
d->page_iofiles = addPage(i18n("Save Images"), i18n("Image Editor: Settings for Saving Images Files"), d->page_iofiles = addPage(i18n("Save Images"), i18n("Image Editor: Settings for Saving Images Files"),
BarIcon("filesave", TDEIcon::SizeMedium)); BarIcon("document-save", TDEIcon::SizeMedium));
d->iofilesPage = new SetupIOFiles(d->page_iofiles); d->iofilesPage = new SetupIOFiles(d->page_iofiles);
d->page_dcraw = addPage(i18n("RAW decoding"), i18n("RAW Files Decoding Settings"), d->page_dcraw = addPage(i18n("RAW decoding"), i18n("RAW Files Decoding Settings"),

Write Preview
Loading…
Cancel
Save