| 88d7ebff | 2014-10-13 15:43:58 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
|
M filesharing/advanced/kcm_sambaconf/kcminterface.ui.h M filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp M filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp M kdict/queryview.cpp M kget/tdemainwidget.cpp M kget/transfer.cpp M kopete/kopete/chatwindow/chatmessagepart.cpp M kopete/kopete/config/accounts/kopeteaccountconfig.cpp M kopete/kopete/config/identity/kopeteidentityconfig.cpp M kopete/kopete/contactlist/kopetecontactlistview.cpp M kopete/plugins/alias/aliaspreferences.cpp M kopete/plugins/history/historydialog.cpp M kopete/protocols/irc/ircprotocol.cpp M kopete/protocols/jabber/jabberaccount.cpp M kpf/src/Applet.cpp M kpf/src/AppletItem.cpp M kppp/accounts.cpp M kppp/miniterm.cpp M ksirc/mditoplevel.cpp |
||
diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h b/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h
index b90c47d..4045bcd 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 2ba6493..7f4f7cf 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -155,7 +155,7 @@
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 @@
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 161d704..958feb5 100644
--- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
@@ -295,7 +295,7 @@
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 2f5f4a4..902b412 100644
--- a/kdict/queryview.cpp
+++ b/kdict/queryview.cpp
@@ -418,14 +418,14 @@
}
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 2f7e0a2..2fd09b3 100644
--- a/kget/tdemainwidget.cpp
+++ b/kget/tdemainwidget.cpp
@@ -365,7 +365,7 @@
#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 f8ef34f..6025c4c 100644
--- a/kget/transfer.cpp
+++ b/kget/transfer.cpp
@@ -130,7 +130,7 @@
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 56d015b..f22c0a2 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -264,7 +264,7 @@
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 d76e215..ad5b2be 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
+++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
@@ -232,7 +232,7 @@
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 e7ad4ac..d3c2b33 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
@@ -121,7 +121,7 @@
// 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 051ca69..25f886c 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -475,9 +475,9 @@
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 @@
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 @@
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 @@
"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 2c160ab..2b81fb8 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -466,7 +466,7 @@
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 aedd3e8..e89ec98 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -175,7 +175,7 @@
//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 f5723c0..84ceff3 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -919,7 +919,7 @@
Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the network <b>%1</b>?<br>"
"Any accounts which use this network will have to be modified.</qt>")
.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 @@
if ( KMessageBox::warningContinueCancel(
Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the host <b>%1</b>?</qt>")
.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 cf4999f..2982a6f 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -1689,7 +1689,7 @@
"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 d6c55f0..3d3c52a 100644
** Diff limit reached (max: 250 lines) **
|
||