From 88d7ebff6abf9536530707e79b9997ad2b24241b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 15:43:58 -0500 Subject: [PATCH] Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance --- filesharing/advanced/kcm_sambaconf/kcminterface.ui.h | 8 ++++---- filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp | 4 ++-- filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp | 2 +- kdict/queryview.cpp | 4 ++-- kget/tdemainwidget.cpp | 2 +- kget/transfer.cpp | 2 +- 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 +- kpf/src/Applet.cpp | 2 +- kpf/src/AppletItem.cpp | 2 +- kppp/accounts.cpp | 2 +- kppp/miniterm.cpp | 2 +- ksirc/mditoplevel.cpp | 2 +- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h b/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h index b90c47d5..4045bcdd 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h @@ -28,14 +28,14 @@ void KcmInterface::init() { - addShareBtn->setIconSet(SmallIconSet("filenew")); + addShareBtn->setIconSet(SmallIconSet("document-new")); editShareBtn->setIconSet(SmallIconSet("edit")); - removeShareBtn->setIconSet(SmallIconSet("editdelete")); + removeShareBtn->setIconSet(SmallIconSet("edit-delete")); editDefaultShareBtn->setIconSet(SmallIconSet("queue")); - addPrinterBtn->setIconSet(SmallIconSet("filenew")); + addPrinterBtn->setIconSet(SmallIconSet("document-new")); editPrinterBtn->setIconSet(SmallIconSet("edit")); - removePrinterBtn->setIconSet(SmallIconSet("editdelete")); + removePrinterBtn->setIconSet(SmallIconSet("edit-delete")); editDefaultPrinterBtn->setIconSet(SmallIconSet("print_class")); advancedWarningPixLbl->setPixmap(SmallIcon("messagebox_warning")); diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 2ba64931..7f4f7cfa 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -155,7 +155,7 @@ TQPixmap ShareListViewItem::createPropertyPixmap() if (_share->getBoolValue("printable")) { - p.drawPixmap(x,0,SmallIcon("fileprint")); + p.drawPixmap(x,0,SmallIcon("document-print")); x = x+w+margin; } @@ -308,7 +308,7 @@ void KcmSambaConf::initAdvancedTab() icon = SmallIcon("system-lock-screen"); else if (label == i18n("Printing")) - icon = SmallIcon("fileprint"); + icon = SmallIcon("document-print"); else if (label == i18n("Logon")) icon = SmallIcon("tdmconfig"); diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 161d704f..958feb56 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -295,7 +295,7 @@ void ShareDlgImpl::initAdvancedTab() icon = SmallIcon("folder"); else if (label.lower() == "printing") - icon = SmallIcon("fileprint"); + icon = SmallIcon("document-print"); else if (label.lower() == "locking") icon = SmallIcon("system-lock-screen"); diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index 2f5f4a49..902b412e 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -418,14 +418,14 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point) } if(type=="realhttp") { popupLink.prepend("http://"); - rightBtnMenu->insertItem(SmallIcon("fileopen"), + rightBtnMenu->insertItem(SmallIcon("document-open"), i18n("&Open Link"), this,TQT_SLOT(popupOpenLink())); rightBtnMenu->insertSeparator(); } if(type=="realftp") { popupLink.prepend("ftp://"); - rightBtnMenu->insertItem(SmallIcon("fileopen"), + rightBtnMenu->insertItem(SmallIcon("document-open"), i18n("&Open Link"), this,TQT_SLOT(popupOpenLink())); rightBtnMenu->insertSeparator(); diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp index 2f7e0a26..2fd09b3d 100644 --- a/kget/tdemainwidget.cpp +++ b/kget/tdemainwidget.cpp @@ -365,7 +365,7 @@ void TDEMainWidget::setupGUI() #endif m_paResume = new TDEAction(i18n("&Resume"),"tool_resume", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResumeCurrent()), coll, "resume"); m_paPause = new TDEAction(i18n("&Pause"),"tool_pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPauseCurrent()), coll, "pause"); - m_paDelete = new TDEAction(i18n("&Delete"),"editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrent()), coll, "delete"); + m_paDelete = new TDEAction(i18n("&Delete"),"edit-delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrent()), coll, "delete"); m_paRestart = new TDEAction(i18n("Re&start"),"tool_restart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRestartCurrent()), coll, "restart"); m_paQueue = new TDERadioAction(i18n("&Queue"),"tool_queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQueueCurrent()), coll, "queue"); diff --git a/kget/transfer.cpp b/kget/transfer.cpp index f8ef34f3..6025c4cf 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -130,7 +130,7 @@ Transfer::init(const uint _id) m_paPause = new TDEAction(i18n("&Pause"), "tool_pause", 0, this, TQT_SLOT(slotRequestPause()), this, "pause"); - m_paDelete = new TDEAction(i18n("&Delete"), "editdelete", 0, this, TQT_SLOT(slotRequestRemove()), this, "delete"); + m_paDelete = new TDEAction(i18n("&Delete"), "edit-delete", 0, this, TQT_SLOT(slotRequestRemove()), this, "delete"); m_paRestart = new TDEAction(i18n("Re&start"), "tool_restart", 0, this, TQT_SLOT(slotRequestRestart()), this, "restart"); 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) diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp index d6c55f0e..3d3c52a9 100644 --- a/kpf/src/Applet.cpp +++ b/kpf/src/Applet.cpp @@ -125,7 +125,7 @@ namespace KPF popup_ = new TQPopupMenu(this); popup_->insertItem - (BarIcon("filenew"), i18n("New Server..."), NewServer, NewServer); + (BarIcon("document-new"), i18n("New Server..."), NewServer, NewServer); // popup_->insertItem // (BarIcon("quit"), i18n("Quit"), Quit, Quit); diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index 552bfdc8..f83d94f3 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -70,7 +70,7 @@ namespace KPF (SmallIcon("kpf"), popupTitle, Title, Title); popup_->insertItem - (SmallIcon("filenew"), i18n("New Server..."), NewServer, NewServer); + (SmallIcon("document-new"), i18n("New Server..."), NewServer, NewServer); popup_->insertSeparator(Separator); diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index 250a83d4..cfd24c3a 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -326,7 +326,7 @@ void AccountWidget::deleteaccount() { TQString s = i18n("Are you sure you want to delete\nthe account \"%1\"?") .arg(accountlist_l->text(accountlist_l->currentItem())); - if(KMessageBox::warningYesNo(this, s, i18n("Confirm"), KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::cancel()) != KMessageBox::Yes) + if(KMessageBox::warningYesNo(this, s, i18n("Confirm"), KGuiItem(i18n("Delete"), "edit-delete"), KStdGuiItem::cancel()) != KMessageBox::Yes) return; if(gpppdata.deleteAccount(accountlist_l->text(accountlist_l->currentItem()))) diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp index 2f27f98f..336076c8 100644 --- a/kppp/miniterm.cpp +++ b/kppp/miniterm.cpp @@ -54,7 +54,7 @@ MiniTerm::MiniTerm(TQWidget *parent, const char *name) KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); m_file = new TQPopupMenu(this); - m_file->insertItem( SmallIcon("fileclose"), i18n("&Close"), this, TQT_SLOT(cancelbutton()) ); + m_file->insertItem( SmallIcon("window-close"), i18n("&Close"), this, TQT_SLOT(cancelbutton()) ); m_options = new TQPopupMenu(this); m_options->insertItem(i18n("&Reset Modem"),this,TQT_SLOT(resetModem())); m_help = diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp index 4e67b5d0..e43982ff 100644 --- a/ksirc/mditoplevel.cpp +++ b/ksirc/mditoplevel.cpp @@ -54,7 +54,7 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name) m_addressedIcon = UserIcon( "info" ); m_pop = new TDEPopupMenu(m_tab, ""); - m_pop->insertItem( SmallIcon("fileclose"), i18n("Close"), this, TQT_SLOT( slotCloseLastWid() )); + m_pop->insertItem( SmallIcon("window-close"), i18n("Close"), this, TQT_SLOT( slotCloseLastWid() )); }