| ab197a37 | 2014-10-13 15:43:56 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
|
M drkonqi/debugger.cpp M kate/app/kateconfigdialog.cpp M kate/app/katemainwindow.cpp M kate/app/katemwmodonhddialog.cpp M kate/app/katesession.cpp M kcontrol/background/bgdialog.cpp M kcontrol/konsole/schemaeditor.cpp M kcontrol/konsole/sessioneditor.cpp M kcontrol/kthememanager/kthememanager.cpp M kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp M kdesktop/desktop.cc M kdesktop/kdiconview.cc M kfind/kfwin.cpp M kicker/applets/clock/clock.cpp M kicker/kicker/ui/k_mnu.cpp M kicker/kicker/ui/k_new_mnu.cpp M kicker/menuext/tdeprint/print_mnu.cpp M kicker/taskmanager/taskrmbmenu.cpp M kmenuedit/kmenuedit.cpp M konqueror/about/konq_aboutpage.cc M konqueror/keditbookmarks/actionsimpl.cpp M konqueror/konq_mainwindow.cc M konqueror/konq_profiledlg.cc M konqueror/konq_tabs.cc M konqueror/sidebar/sidebar_widget.cpp M konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp M konqueror/sidebar/trees/history_module/history_module.cpp M konqueror/sidebar/trees/konq_sidebartree.cpp M konsole/konsole/konsole.cpp M konsole/konsole/konsole_part.cpp M kpager/kpager.cpp M ksplashml/kcmksplash/installer.cpp M ksysguard/gui/ksysguard.cc M libkonq/knewmenu.cc M libkonq/konq_operations.cc M libkonq/konq_popupmenu.cc M tdeprint/kjobviewer/kjobviewer.cpp M tdeprint/slave/tdeio_print.cpp M tdeprint/tdeprintfax/conffilters.cpp M tdeprint/tdeprintfax/configdlg.cpp M tdeprint/tdeprintfax/tdeprintfax.cpp M twin/useractions.cpp |
||
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index aab0e79..4e3622e 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -62,7 +62,7 @@
m_status = new TQLabel( w );
m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
//m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
- KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) );
+ KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "edit-copy" ) );
m_copyButton = new KPushButton( item, w );
connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
m_copyButton->setEnabled( false );
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 697e466..38f71f2 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -95,7 +95,7 @@
//BEGIN General page
path << i18n("Application") << i18n("General");
- TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", TDEIcon::SizeSmall));
+ TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("go-home", TDEIcon::SizeSmall));
TQVBoxLayout *lo = new TQVBoxLayout( frGeneral );
lo->setSpacing(KDialog::spacingHint());
@@ -273,7 +273,7 @@
path << i18n("Application") << i18n("File Selector");
TQVBox *page = addVBoxPage( path, i18n("File Selector Settings"),
- BarIcon("fileopen", TDEIcon::SizeSmall) );
+ BarIcon("document-open", TDEIcon::SizeSmall) );
fileSelConfigPage = new KFSConfigPage( page, "file selector config page",
mainWindow->fileselector );
connect( fileSelConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 4cd3c35..a1b3e90 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -213,7 +213,7 @@
filelist = new KateFileList (this, m_viewManager, ft, "filelist");
filelist->readConfig(KateApp::self()->config(), "Filelist");
- KateMDI::ToolView *t = createToolView("kate_fileselector", KMultiTabBar::Left, SmallIcon("fileopen"), i18n("Filesystem Browser"));
+ KateMDI::ToolView *t = createToolView("kate_fileselector", KMultiTabBar::Left, SmallIcon("document-open"), i18n("Filesystem Browser"));
fileselector = new KateFileSelector( this, m_viewManager, t, "operator");
connect(fileselector->dirOperator(),TQT_SIGNAL(fileSelected(const KFileItem*)),this,TQT_SLOT(fileSelected(const KFileItem*)));
@@ -302,10 +302,10 @@
slotWindowActivated ();
// session actions
- new TDEAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new");
- new TDEAction(i18n("&Open..."), "fileopen", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open");
- new TDEAction(i18n("&Save"), "filesave", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save");
- new TDEAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as");
+ new TDEAction(i18n("Menu entry Session->New", "&New"), "document-new", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new");
+ new TDEAction(i18n("&Open..."), "document-open", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open");
+ new TDEAction(i18n("&Save"), "document-save", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save");
+ new TDEAction(i18n("Save &As..."), "document-save-as", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as");
new TDEAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage");
// quick open menu ;)
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index ab14184..508e0aa 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -60,8 +60,8 @@
KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n("Documents Modified on Disk"),
User1|User2|User3, User3, false,
- KGuiItem (i18n("&Ignore"), "fileclose"),
- KGuiItem (i18n("&Overwrite"), "filesave"),
+ KGuiItem (i18n("&Ignore"), "window-close"),
+ KGuiItem (i18n("&Overwrite"), "document-save"),
KGuiItem (i18n("&Reload"), "reload") )
{
setButtonWhatsThis( User1, i18n(
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index ed6ee3f..2c0057b 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -620,8 +620,8 @@
, KDialogBase::User2
, true
, KStdGuiItem::quit ()
- , KGuiItem (i18n ("Open Session"), "fileopen")
- , KGuiItem (i18n ("New Session"), "filenew")
+ , KGuiItem (i18n ("Open Session"), "document-open")
+ , KGuiItem (i18n ("New Session"), "document-new")
)
{
TQHBox *page = new TQHBox (this);
@@ -717,7 +717,7 @@
, KDialogBase::User2
, false
, KStdGuiItem::cancel ()
- , KGuiItem( i18n("&Open"), "fileopen")
+ , KGuiItem( i18n("&Open"), "document-open")
)
{
TQHBox *page = new TQHBox (this);
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index b2f8251..e903b7b 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -142,7 +142,7 @@
}
// background image settings
- TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("document-open"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
m_urlWallpaperButton->setIconSet( iconSet );
m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index 66b07e5..dfa4dbe 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -317,7 +317,7 @@
int code = KMessageBox::warningContinueCancel(this,
i18n("You are trying to remove a system schema. Are you sure?"),
i18n("Removing System Schema"),
- KGuiItem(i18n("&Delete"), "editdelete"));
+ KGuiItem(i18n("&Delete"), "edit-delete"));
if (code != KMessageBox::Continue)
return;
}
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index 86c9dd8..290541d 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -358,7 +358,7 @@
int code = KMessageBox::warningContinueCancel(this,
i18n("You are trying to remove a system session. Are you sure?"),
i18n("Removing System Session"),
- KGuiItem(i18n("&Delete"),"editdelete"));
+ KGuiItem(i18n("&Delete"),"edit-delete"));
if (code != KMessageBox::Continue)
return;
}
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index aa04d8e..ba8bb3a 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -252,7 +252,7 @@
{
TQString themeName = cur->text( 0 );
if ( KMessageBox::warningContinueCancel( this, "<qt>" + i18n( "Do you really want to remove the theme <b>%1</b>?" ).arg( themeName ),
- i18n( "Remove Theme" ), KGuiItem( i18n( "&Remove" ), "editdelete" ) )
+ i18n( "Remove Theme" ), KGuiItem( i18n( "&Remove" ), "edit-delete" ) )
== KMessageBox::Continue )
{
KTheme::remove( themeName );
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index 7004f0a..d61ea4d 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -236,7 +236,7 @@
act->plug(toolbar);
#ifdef HAVE_XFT
toolbar->insertLineSeparator();
- act=new TDEAction(i18n("Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
+ act=new TDEAction(i18n("Print..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
act->plug(toolbar);
#endif
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index b3893c0..de6873e 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -950,7 +950,7 @@
{
TDEPopupMenu popup;
if ( m_pIconView )
- popup.insertItem(SmallIconSet("filesave"),i18n("&Save to Desktop..."), 1);
+ popup.insertItem(SmallIconSet("document-save"),i18n("&Save to Desktop..."), 1);
if ( ( m_pIconView && m_pIconView->maySetWallpaper() ) || m_pRootWidget )
popup.insertItem(SmallIconSet("background"),i18n("Set as &Wallpaper"), 2);
popup.insertSeparator();
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 948ea51..39dcc4c 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -449,7 +449,7 @@
TDEConfig config("kdeglobals", true, false);
config.setGroup( "KDE" );
- (void) new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
+ (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
// Initial state of the actions (cut/copy/paste/...)
slotSelectionChanged();
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index 3eb10e1..c0223ea 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -287,7 +287,7 @@
{
TQString tmp = i18n("Do you really want to delete the selected file?",
"Do you really want to delete the %n selected files?",selectedItems().count());
- if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel)
+ if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "edit-delete")) == KMessageBox::Cancel)
return;
// Iterate on all selected elements
@@ -409,11 +409,11 @@
{
//menu = new TDEPopupMenu(item->text(0), this);
m_menu->insertTitle(item->text(0));
- m_menu->insertItem(SmallIcon("fileopen"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding()));
+ m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding()));
m_menu->insertItem(SmallIcon("window_new"),i18n("Open Folder"), this, TQT_SLOT(openFolder()));
m_menu->insertSeparator();
- m_menu->insertItem(SmallIcon("editcopy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
- m_menu->insertItem(SmallIcon("editdelete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
+ m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
+ m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
m_menu->insertSeparator();
m_menu->insertItem(i18n("Open With..."), this, TQT_SLOT(slotOpenWith()));
m_menu->insertSeparator();
@@ -422,8 +422,8 @@
else
{
m_menu->insertTitle(i18n("Selected Files"));
- m_menu->insertItem(SmallIcon("editcopy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
- m_menu->insertItem(SmallIcon("editdelete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
+ m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
+ m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
}
m_menu->popup(p, 1);
}
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 90b8843..86ee8b0 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -1592,7 +1592,7 @@
menu->insertItem(SmallIcon("kcontrol"), i18n("Date && Time &Format..."), 104, 5);
}
- menu->insertItem(SmallIcon("editcopy"), i18n("C&opy to Clipboard"), copyMenu, 105, 6);
+ menu->insertItem(SmallIcon("edit-copy"), i18n("C&opy to Clipboard"), copyMenu, 105, 6);
if (!bImmutable)
{
menu->insertSeparator(7);
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 9d1d70f..4362e91 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -388,7 +388,7 @@
** Diff limit reached (max: 250 lines) **
|
||