| 58964048 | 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 akregator/src/actionmanagerimpl.cpp M certmanager/certmanager.cpp M certmanager/lib/ui/messagebox.cpp M kaddressbook/emaileditwidget.cpp M kaddressbook/features/distributionlistwidget.cpp M kaddressbook/features/resourceselection.cpp M kaddressbook/kabcore.cpp M kaddressbook/keywidget.cpp M kaddressbook/viewmanager.cpp M kalarm/editdlg.cpp M kalarm/functions.cpp M kalarm/mainwindow.cpp M kalarm/prefdlg.cpp M kalarm/sounddlg.cpp M kalarm/templatedlg.cpp M karm/karm_part.cpp M karm/mainwindow.cpp M kitchensync/src/mainwidget.cpp M kmail/accountdialog.cpp M kmail/configuredialog.cpp M kmail/favoritefolderview.cpp M kmail/foldertreebase.cpp M kmail/kmcomposewin.cpp M kmail/kmfilterdlg.cpp M kmail/kmfolderseldlg.cpp M kmail/kmfoldertree.cpp M kmail/kmmainwidget.cpp M kmail/kmmimeparttree.cpp M kmail/kmreadermainwin.cpp M kmail/kmreaderwin.cpp M kmail/snippetwidget.cpp M kmail/treebase.cpp M kmobile/kmobile.cpp M knode/articlewidget.cpp M knode/knaccountmanager.cpp M knode/knarticlemanager.cpp M knode/kncomposer.cpp M knode/knconfig.cpp M knode/knconfigwidgets.cpp M knode/knfiltermanager.cpp M knode/knmainwidget.cpp M knode/knsearchdialog.cpp M knotes/knote.cpp M knotes/knoteedit.cpp M knotes/knotesapp.cpp M kontact/plugins/knotes/knotes_part.cpp M kontact/plugins/korganizer/summarywidget.cpp M kontact/plugins/korganizer/todosummarywidget.cpp M korganizer/actionmanager.cpp M korganizer/calendarview.cpp M korganizer/filtereditdialog.cpp M korganizer/journalentry.cpp M korganizer/kodaymatrix.cpp M korganizer/koeditorattachments.cpp M korganizer/koeventeditor.cpp M korganizer/koeventpopupmenu.cpp M korganizer/kojournaleditor.cpp M korganizer/kotodoview.cpp M korganizer/plugins/exchange/exchange.cpp M ktnef/gui/ktnefmain.cpp M libtdepim/komposer/core/core.cpp M libtdepim/kscoringeditor.cpp M libtdepim/progressdialog.cpp |
||
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index 050be54..3213935 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -286,8 +286,8 @@
// Feed/Feed Group popup menu
new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
- new TDEAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
- new TDEAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
+ new TDEAction(i18n("Ne&w Folder..."), "folder-new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
+ new TDEAction(i18n("&Delete Feed"), "edit-delete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
new TDEAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
TDEActionMenu* vm = new TDEActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" );
@@ -325,7 +325,7 @@
new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
- new TDEAction(i18n("&Delete"), "editdelete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
+ new TDEAction(i18n("&Delete"), "edit-delete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
if (Settings::showTaggingGUI())
{
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 1bffa97..86ee531 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -267,7 +267,7 @@
actionCollection(), "view_stop_operations" );
action->setEnabled( false );
- (void) new TDEAction( i18n("New Key Pair..."), "filenew", 0,
+ (void) new TDEAction( i18n("New Key Pair..."), "document-new", 0,
TQT_TQOBJECT(this), TQT_SLOT(newCertificate()),
actionCollection(), "file_new_certificate" );
@@ -298,7 +298,7 @@
connectEnableOperationSignal( this, mExtendCertificateAction );
#endif
- mDeleteCertificateAction = new TDEAction( i18n("Delete"), "editdelete", Key_Delete,
+ mDeleteCertificateAction = new TDEAction( i18n("Delete"), "edit-delete", Key_Delete,
TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()),
actionCollection(), "edit_delete_certificate" );
connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction );
@@ -1082,7 +1082,7 @@
if ( KMessageBox::warningContinueCancelList( this, msg, keyDisplayNames,
i18n( "Delete Certificates" ),
- KGuiItem( i18n( "Delete" ), "editdelete" ),
+ KGuiItem( i18n( "Delete" ), "edit-delete" ),
"ConfirmDeleteCert", KMessageBox::Dangerous )
!= KMessageBox::Continue )
return;
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 935084b..fa14bfb 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -62,11 +62,11 @@
namespace {
static KGuiItem KGuiItem_save() {
- return KGuiItem( i18n("&Save to Disk..."), "filesaveas" );
+ return KGuiItem( i18n("&Save to Disk..."), "document-save-as" );
}
static KGuiItem KGuiItem_copy() {
- return KGuiItem( i18n("&Copy to Clipboard"), "editcopy", i18n("Copy Audit Log to Clipboard") );
+ return KGuiItem( i18n("&Copy to Clipboard"), "edit-copy", i18n("Copy Audit Log to Clipboard") );
}
static KGuiItem KGuiItem_showAuditLog() {
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index a9bdf99..d517f0b 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -305,7 +305,7 @@
TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).arg( address );
TQString caption = i18n( "Confirm Remove" );
- if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue) {
+ if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "edit-delete") ) == KMessageBox::Continue) {
EmailItem *item = static_cast<EmailItem*>( mEmailListBox->item( mEmailListBox->currentItem() ) );
bool preferred = item->preferred();
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index dce024a..28a6f8f 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -344,7 +344,7 @@
{
int result = KMessageBox::warningContinueCancel( this,
i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .arg( mNameCombo->currentText() ),
- TQString(), KGuiItem( i18n("Delete"), "editdelete") );
+ TQString(), KGuiItem( i18n("Delete"), "edit-delete") );
if ( result != KMessageBox::Continue )
return;
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 66d75b9..1d80c91 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -299,7 +299,7 @@
int result = KMessageBox::warningContinueCancel( this,
i18n( "<qt>Do you really want to remove the address book <b>%1</b>?</qt>" )
.arg( item->resource()->resourceName() ), "",
- KGuiItem( i18n( "&Remove" ), "editdelete" ) );
+ KGuiItem( i18n( "&Remove" ), "edit-delete" ) );
if ( result == KMessageBox::Cancel )
return;
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index c17a70c..186f0fa 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1366,7 +1366,7 @@
// mActionUndo->setWhatsThis( i18n( "Undoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) );
// mActionRedo->setWhatsThis( i18n( "Redoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) );
- mActionDelete = new TDEAction( i18n( "&Delete Contact" ), "editdelete",
+ mActionDelete = new TDEAction( i18n( "&Delete Contact" ), "edit-delete",
Key_Delete, this, TQT_SLOT( deleteContacts() ),
actionCollection(), "edit_delete" );
mActionDelete->setWhatsThis( i18n( "Delete all selected contacts." ) );
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 8af9f26..c0417b7 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -154,7 +154,7 @@
TQString type = mKeyCombo->currentText();
TQString text = i18n( "<qt>Do you really want to remove the key <b>%1</b>?</qt>" );
- if ( KMessageBox::warningContinueCancel( this, text.arg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel )
+ if ( KMessageBox::warningContinueCancel( this, text.arg( type ), "", KGuiItem( i18n("&Delete"), "edit-delete") ) == KMessageBox::Cancel )
return;
mKeyList.remove( mKeyList.at( pos ) );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 8b21136..93fe626 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -310,7 +310,7 @@
.arg( mActiveView->caption() );
TQString caption = i18n( "Confirm Delete" );
- if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue ) {
+ if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "edit-delete") ) == KMessageBox::Continue ) {
mViewNameList.remove( mActiveView->caption() );
// remove the view from the config file
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index ced8348..f6e1f0b 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -435,7 +435,7 @@
// File browse button
mFileBrowseButton = new TQPushButton(mFileBox);
- mFileBrowseButton->setPixmap(SmallIcon("fileopen"));
+ mFileBrowseButton->setPixmap(SmallIcon("document-open"));
mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint());
TQToolTip::add(mFileBrowseButton, i18n("Choose a file"));
TQWhatsThis::add(mFileBrowseButton, i18n("Select a text or image file to display."));
@@ -526,7 +526,7 @@
// Log file browse button.
// The file browser dialogue is activated by the PickLogFileRadio class.
TQPushButton* browseButton = new TQPushButton(box);
- browseButton->setPixmap(SmallIcon("fileopen"));
+ browseButton->setPixmap(SmallIcon("document-open"));
browseButton->setFixedSize(browseButton->sizeHint());
TQToolTip::add(browseButton, i18n("Choose a file"));
TQWhatsThis::add(browseButton, i18n("Select a log file."));
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index f7dbc25..cd1f95d 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -111,7 +111,7 @@
*/
TDEAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, TDEActionCollection* actions, const char* name)
{
- return new TDEAction(label, "filenew", TDEStdAccel::openNew(), receiver, slot, actions, name);
+ return new TDEAction(label, "document-new", TDEStdAccel::openNew(), receiver, slot, actions, name);
}
/******************************************************************************
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 7487a8a..d079121 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -330,9 +330,9 @@
mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actions, "new");
mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl");
mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate");
- mActionCopy = new TDEAction(i18n("&Copy..."), "editcopy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy");
+ mActionCopy = new TDEAction(i18n("&Copy..."), "edit-copy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy");
mActionModify = new TDEAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotModify()), actions, "modify");
- mActionDelete = new TDEAction(i18n("&Delete"), "editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete");
+ mActionDelete = new TDEAction(i18n("&Delete"), "edit-delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete");
mActionReactivate = new TDEAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReactivate()), actions, "undelete");
mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotEnable()), actions, "disable");
mActionView = new TDEAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actions, "view");
@@ -673,7 +673,7 @@
if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the selected alarm?",
"Do you really want to delete the %n selected alarms?", n),
i18n("Delete Alarm", "Delete Alarms", n),
- KGuiItem(i18n("&Delete"), "editdelete"),
+ KGuiItem(i18n("&Delete"), "edit-delete"),
Preferences::CONFIRM_ALARM_DELETION)
!= KMessageBox::Continue)
return;
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 22346af..f439d60 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -960,7 +960,7 @@
mSoundFile = new TQLineEdit(box);
mSoundFileLabel->setBuddy(mSoundFile);
mSoundFileBrowse = new TQPushButton(box);
- mSoundFileBrowse->setPixmap(SmallIcon("fileopen"));
+ mSoundFileBrowse->setPixmap(SmallIcon("document-open"));
mSoundFileBrowse->setFixedSize(mSoundFileBrowse->sizeHint());
connect(mSoundFileBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowseSoundFile()));
TQToolTip::add(mSoundFileBrowse, i18n("Choose a sound file"));
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index a63c4df..6cd2301 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -97,7 +97,7 @@
// File browse button
mFileBrowseButton = new PushButton(box);
- mFileBrowseButton->setPixmap(SmallIcon("fileopen"));
+ mFileBrowseButton->setPixmap(SmallIcon("document-open"));
mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint());
connect(mFileBrowseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
TQToolTip::add(mFileBrowseButton, i18n("Choose a file"));
diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index 8ee2ca3..3754487 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -187,7 +187,7 @@
int n = items.count();
if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the selected alarm template?",
"Do you really want to delete the %n selected alarm templates?", n),
- i18n("Delete Alarm Template", "Delete Alarm Templates", n), KGuiItem(i18n("&Delete"), "editdelete"))
+ i18n("Delete Alarm Template", "Delete Alarm Templates", n), KGuiItem(i18n("&Delete"), "edit-delete"))
!= KMessageBox::Continue)
return;
** Diff limit reached (max: 250 lines) **
|
||