From 88d7ebff6abf9536530707e79b9997ad2b24241b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 15:43:58 -0500 Subject: Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance --- kopete/kopete/chatwindow/chatmessagepart.cpp | 2 +- kopete/kopete/config/accounts/kopeteaccountconfig.cpp | 2 +- kopete/kopete/config/identity/kopeteidentityconfig.cpp | 2 +- kopete/kopete/contactlist/kopetecontactlistview.cpp | 10 +++++----- kopete/plugins/alias/aliaspreferences.cpp | 2 +- kopete/plugins/history/historydialog.cpp | 2 +- kopete/protocols/irc/ircprotocol.cpp | 4 ++-- kopete/protocols/jabber/jabberaccount.cpp | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) (limited to 'kopete') diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index 56d015bd..f22c0a20 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -264,7 +264,7 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co d->printAction = KStdAction::print( this, TQT_SLOT(print()),actionCollection() ); d->closeAction = KStdAction::close( this, TQT_SLOT(slotCloseView()),actionCollection() ); d->importEmoticon = new TDEAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() ); - d->copyURLAction = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() ); + d->copyURLAction = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() ); // read formatting override flags readOverrides(); diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp index d76e2159..ad5b2bea 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp +++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp @@ -232,7 +232,7 @@ void KopeteAccountConfig::slotRemoveAccount() Kopete::Account *i = lvi->account(); if ( KMessageBox::warningContinueCancel( this, i18n( "Are you sure you want to remove the account \"%1\"?" ).arg( i->accountLabel() ), - i18n( "Remove Account" ), KGuiItem(i18n( "Remove Account" ), "editdelete"), + i18n( "Remove Account" ), KGuiItem(i18n( "Remove Account" ), "edit-delete"), "askRemoveAccount", KMessageBox::Notify | KMessageBox::Dangerous ) == KMessageBox::Continue ) { Kopete::AccountManager::self()->removeAccount( i ); diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp index e7ad4ac8..d3c2b335 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp +++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp @@ -121,7 +121,7 @@ KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *parent, const char */*name* // Set icon for KPushButton d->m_view->buttonNewIdentity->setIconSet(SmallIconSet("new")); - d->m_view->buttonCopyIdentity->setIconSet(SmallIconSet("editcopy")); + d->m_view->buttonCopyIdentity->setIconSet(SmallIconSet("edit-copy")); d->m_view->buttonRenameIdentity->setIconSet(SmallIconSet("edit")); d->m_view->buttonRemoveIdentity->setIconSet(SmallIconSet("delete_user")); d->m_view->buttonClearPhoto->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) ); diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 051ca692..25f886c5 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -475,9 +475,9 @@ void KopeteContactListView::initActions( TDEActionCollection *ac ) actionStartChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( slotStartChat() ), ac, "contactStartChat" ); - actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "editcut" ), + actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "edit-cut" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" ); - actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::fromLatin1( "editcopy" ), 0, + actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::fromLatin1( "edit-copy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" ); actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), @@ -485,7 +485,7 @@ void KopeteContactListView::initActions( TDEActionCollection *ac ) actionSendEmail = new TDEAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" ); /* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/ - actionRename = new TDEAction( i18n( "Rename" ), "filesaveas", 0, + actionRename = new TDEAction( i18n( "Rename" ), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), ac, "contactRename" ); actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), ac, "contactSendFile" ); @@ -1566,7 +1566,7 @@ void KopeteContactListView::slotRemove() else return; // this should never happen - if( KMessageBox::warningContinueCancel( this, msg, i18n( "Remove" ), KGuiItem(i18n("Remove"),"editdelete") , + if( KMessageBox::warningContinueCancel( this, msg, i18n( "Remove" ), KGuiItem(i18n("Remove"),"edit-delete") , "askRemovingContactOrGroup" , KMessageBox::Notify | KMessageBox::Dangerous ) != KMessageBox::Continue ) { @@ -1582,7 +1582,7 @@ void KopeteContactListView::slotRemove() "contacts from your contact list?" ); if( KMessageBox::warningContinueCancelList( this, msg, items, i18n("Remove"), - KGuiItem(i18n("Remove"),"editdelete"), "askRemovingContactOrGroup", + KGuiItem(i18n("Remove"),"edit-delete"), "askRemovingContactOrGroup", KMessageBox::Notify | KMessageBox::Dangerous ) != KMessageBox::Continue ) { return; diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index 2c160abd..2b81fb88 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -466,7 +466,7 @@ void AliasPreferences::slotEditAlias() void AliasPreferences::slotDeleteAliases() { - if( KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to delete the selected aliases?"), i18n("Delete Aliases"), KGuiItem(i18n("Delete"), "editdelete") ) == KMessageBox::Continue ) + if( KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to delete the selected aliases?"), i18n("Delete Aliases"), KGuiItem(i18n("Delete"), "edit-delete") ) == KMessageBox::Continue ) { TQPtrList< TQListViewItem > items = preferencesDialog->aliasList->selectedItems(); for( TQListViewItem *i = items.first(); i; i = items.next() ) diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index aedd3e8a..e89ec981 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -175,7 +175,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, //initActions TDEActionCollection* ac = new TDEActionCollection(this); mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac ); - mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac ); + mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac ); resize(650, 700); centerOnScreen(this); diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index f5723c02..84ceff33 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -919,7 +919,7 @@ void IRCProtocol::slotDeleteNetwork() Kopete::UI::Global::mainWidget(), i18n("Are you sure you want to delete the network %1?
" "Any accounts which use this network will have to be modified.") .arg(network), i18n("Deleting Network"), - KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue ) + KGuiItem(i18n("&Delete Network"),"edit-delete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue ) { disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); @@ -945,7 +945,7 @@ void IRCProtocol::slotDeleteHost() if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n("Are you sure you want to delete the host %1?") .arg(hostName), i18n("Deleting Host"), - KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::fromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue ) + KGuiItem(i18n("&Delete Host"),"edit-delete"), TQString::fromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue ) { IRCHost *host = m_hosts[ hostName ]; if ( host ) diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index cf4999fc..2982a6ff 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -1689,7 +1689,7 @@ bool JabberAccount::removeAccount( ) "If you unregister, all your contact list may be removed on the server," "And you will never be able to connect to this account with any client").arg( accountLabel() ), i18n("Unregister"), - KGuiItem(i18n( "Remove and Unregister" ), "editdelete"), + KGuiItem(i18n( "Remove and Unregister" ), "edit-delete"), KGuiItem(i18n( "Remove from kopete only"), "edittrash"), TQString(), KMessageBox::Notify | KMessageBox::Dangerous ); if(result == KMessageBox::Cancel) -- cgit v1.2.1