| 20b48737 | 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 cervisia/cervisiapart.cpp M cervisia/logdlg.cpp M cervisia/misc.cpp M kbabel/catalogmanager/catalogmanager.cpp M kbabel/catalogmanager/catalogmanagerview.cpp M kbabel/commonui/projectpref.cpp M kbabel/kbabel/kbabel.cpp M kbabel/kbabel/kbabelview.cpp M kbugbuster/gui/cwbugdetailscontainer.cpp M kbugbuster/gui/kbbmainwindow.cpp M kbugbuster/gui/messageeditor.cpp M kbugbuster/gui/preferencesdialog.cpp M kompare/kompare_shell.cpp M umbrello/umbrello/listpopupmenu.cpp M umbrello/umbrello/uml.cpp M umbrello/umbrello/umldoc.cpp M umbrello/umbrello/umlview.cpp |
||
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 742091c..805c823 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -232,7 +232,7 @@
//
// File Menu
//
- action = new TDEAction( i18n("O&pen Sandbox..."), "fileopen", CTRL+Key_O,
+ action = new TDEAction( i18n("O&pen Sandbox..."), "document-open", CTRL+Key_O,
this, TQT_SLOT( slotOpenSandbox() ),
actionCollection(), "file_open" );
hint = i18n("Opens a CVS working folder in the main window");
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index e446b58..0e434ad 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -195,7 +195,7 @@
connect( this, TQT_SIGNAL(user3Clicked()),
this, TQT_SLOT(findClicked()) );
- setButtonGuiItem(Ok, KGuiItem(i18n("to view something", "&View"),"fileopen"));
+ setButtonGuiItem(Ok, KGuiItem(i18n("to view something", "&View"),"document-open"));
setButtonGuiItem(Apply, KGuiItem(i18n("Create Patch...")));
setHelp("browsinglogs");
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index 090861c..9de5006 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -217,7 +217,7 @@
result = (KMessageBox::warningContinueCancel(parent,
i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(fileName),
i18n("Overwrite File?"),
- KGuiItem(i18n("&Overwrite"), "filesave", i18n("Overwrite the file"))) == KMessageBox::Continue);
+ KGuiItem(i18n("&Overwrite"), "document-save", i18n("Overwrite the file"))) == KMessageBox::Continue);
}
return result;
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 57e9d76..44840af 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -328,15 +328,15 @@
// project menu
// the project menu
- action = new TDEAction(i18n("&New..."), "filenew"
+ action = new TDEAction(i18n("&New..."), "document-new"
, TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection()
,"project_new");
- action = new TDEAction(i18n("&Open..."), "fileopen"
+ action = new TDEAction(i18n("&Open..."), "document-open"
, TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection()
,"project_open");
- action = new TDEAction(i18n("C&lose"), "fileclose"
+ action = new TDEAction(i18n("C&lose"), "window-close"
, TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection()
,"project_close");
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 062326c..23773e2 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -1500,7 +1500,7 @@
if(item && item->isFile() && item->hasPo() && !item->hasPot())
{
const TQString msg=i18n("Do you really want to delete the file %1?").arg(item->poFile());
- if(KMessageBox::warningContinueCancel(this,msg,i18n("Warning"),KGuiItem( i18n("Delete"), "editdelete"))== KMessageBox::Continue)
+ if(KMessageBox::warningContinueCancel(this,msg,i18n("Warning"),KGuiItem( i18n("Delete"), "edit-delete"))== KMessageBox::Continue)
{
if(!TQFile::remove(item->poFile()))
{
diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp
index e2d3ced..3ef2b07 100644
--- a/kbabel/commonui/projectpref.cpp
+++ b/kbabel/commonui/projectpref.cpp
@@ -74,7 +74,7 @@
_savePage = new SavePreferences(0);
addPage(_savePage, i18n("title of page in preferences dialog","Save")
- , "filesave"
+ , "document-save"
, i18n("Options for File Saving"));
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 4156d47..5dc2af5 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -591,15 +591,15 @@
buildDictMenus();
// the project menu
- action = new TDEAction(i18n("&New..."), "filenew"
+ action = new TDEAction(i18n("&New..."), "document-new"
, TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection()
,"project_new");
- action = new TDEAction(i18n("&Open..."), "fileopen"
+ action = new TDEAction(i18n("&Open..."), "document-open"
, TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection()
,"project_open");
- action = new TDEAction(i18n("C&lose"), "fileclose"
+ action = new TDEAction(i18n("C&lose"), "window-close"
, TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection()
,"project_close");
action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() );
@@ -646,7 +646,7 @@
, TQT_TQOBJECT(m_view), TQT_SLOT(diffShowOrig()),actionCollection()
,"diff_showOrig");
- action = new TDEAction(i18n("&Open File for Diff"), "fileopen" ,0
+ action = new TDEAction(i18n("&Open File for Diff"), "document-open" ,0
, TQT_TQOBJECT(m_view), TQT_SLOT(openDiffFile()),actionCollection()
,"diff_openFile");
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 001b148..a96c5a7 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -1593,7 +1593,7 @@
SavePreferences* _prefWidget = new SavePreferences(_prefDialog);
_prefWidget->setAutoSaveVisible(false);
_prefDialog->addPage(_prefWidget, i18n("title of page in preferences dialog","Save")
- , "filesave"
+ , "document-save"
, i18n("Options for File Saving"));
if( _prefDialog->exec() == TQDialog::Accepted )
diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp
index b045c96..625a1f8 100644
--- a/kbugbuster/gui/cwbugdetailscontainer.cpp
+++ b/kbugbuster/gui/cwbugdetailscontainer.cpp
@@ -43,7 +43,7 @@
m_bugCloseBtn->setIconSet( BarIconSet( "edittrash" ) );
m_bugCloseSilentlyBtn->setIconSet( BarIconSet( "edittrash" ) );
m_bugReopenBtn->setIconSet( SmallIconSet( "idea" ) );
- m_bugReassignBtn->setIconSet( BarIconSet( "folder_new" ) );
+ m_bugReassignBtn->setIconSet( BarIconSet( "folder-new" ) );
m_bugTitleBtn->setIconSet( SmallIconSet( "text_under" ) );
m_bugSeverityBtn->setIconSet( SmallIconSet( "edit" ) );
m_bugReplyBtn->setIconSet( SmallIconSet( "mail_replyall" ) );
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index 5f7fb3a..9a34f6c 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -162,7 +162,7 @@
loadMyBugs = new TDEAction( i18n( "Load &My Bugs List" ), 0, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotLoadMyBugs() ),
actionCollection(), "load_my_bugs" );
reloadall = new TDEAction( i18n("Load All Bug Details (for current product)"), TQt::Key_F6, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" );
- new TDEAction( i18n("Extract &Attachments"), "filesave", TQt::Key_F4, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotExtractAttachments() ),
+ new TDEAction( i18n("Extract &Attachments"), "document-save", TQt::Key_F4, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotExtractAttachments() ),
actionCollection(), "extract_attachments" );
new TDEAction( i18n("Clear Cache"), 0, TQT_TQOBJECT(this), TQT_SLOT( clearCache() ),
@@ -187,7 +187,7 @@
// TQT_SLOT( closeBugSilently() ), actionCollection(), "cmd_close_silently" );
new TDEAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, TQT_TQOBJECT(m_mainWidget),
TQT_SLOT( reopenBug() ), actionCollection(), "cmd_reopen" );
-// new TDEAction( i18n("Re&assign..."), "folder_new", CTRL+TQt::Key_A, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("Re&assign..."), "folder-new", CTRL+TQt::Key_A, TQT_TQOBJECT(m_mainWidget),
// TQT_SLOT( reassignBug() ), actionCollection(), "cmd_reassign" );
// new TDEAction( i18n("Change &Title..."), "text_under", CTRL+TQt::Key_T, TQT_TQOBJECT(m_mainWidget),
// TQT_SLOT( titleBug() ), actionCollection(), "cmd_title" );
@@ -347,7 +347,7 @@
{
// Ask for confirmation, it's too easy to click the wrong button in the above dlg box
if ( KMessageBox::warningContinueCancel( this, i18n("Do you really want to delete all commands?"),
- i18n("Confirmation Required"), KGuiItem( i18n("&Delete"), "editdelete"), "clearcommands", true)
+ i18n("Confirmation Required"), KGuiItem( i18n("&Delete"), "edit-delete"), "clearcommands", true)
== KMessageBox::Continue )
BugSystem::self()->clearCommands();
}
diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp
index e77c659..d5a6428 100644
--- a/kbugbuster/gui/messageeditor.cpp
+++ b/kbugbuster/gui/messageeditor.cpp
@@ -80,7 +80,7 @@
{
int result = KMessageBox::warningContinueCancel(this,
i18n("Remove the button %1?").arg(mSelectionCombo->currentText()),
- i18n("Remove"), KGuiItem( i18n("Delete"), "editdelete") );
+ i18n("Remove"), KGuiItem( i18n("Delete"), "edit-delete") );
if (result == KMessageBox::Continue) {
mMessageButtons.remove(mSelectionCombo->currentText());
diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp
index e14d8e7..20ca026 100644
--- a/kbugbuster/gui/preferencesdialog.cpp
+++ b/kbugbuster/gui/preferencesdialog.cpp
@@ -77,7 +77,7 @@
void PreferencesDialog::setupServerPage()
{
TQFrame *topFrame = addPage( i18n("Servers"), 0,
- DesktopIcon( "gohome", TDEIcon::SizeMedium ) );
+ DesktopIcon( "go-home", TDEIcon::SizeMedium ) );
TQBoxLayout *layout = new TQVBoxLayout( topFrame );
layout->setSpacing( spacingHint() );
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 6ab1831..5502709 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -231,7 +231,7 @@
{
TDEAction* open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
open->setText( i18n( "&Open Diff..." ) );
- new TDEAction( i18n("&Compare Files..."), "fileopen", TQt::CTRL + TQt::Key_C,
+ new TDEAction( i18n("&Compare Files..."), "document-open", TQt::CTRL + TQt::Key_C,
TQT_TQOBJECT(this), TQT_SLOT(slotFileCompareFiles()),
actionCollection(), "file_compare_files" );
new TDEAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B,
diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp
index 136627b..63febee 100644
--- a/umbrello/umbrello/listpopupmenu.cpp
+++ b/umbrello/umbrello/listpopupmenu.cpp
@@ -230,7 +230,7 @@
insertSeparator();
insertItem(SmallIcon( "fonts" ), i18n( "Change Font..." ),
mt_Change_Font_Selection );
- insertItem(SmallIcon( "editdelete" ), i18n("Delete Selected Items"),
+ insertItem(SmallIcon( "edit-delete" ), i18n("Delete Selected Items"),
mt_Delete_Selection);
// add this here and not above with the other stuff of the interface
@@ -331,7 +331,7 @@
case Uml::wt_Message:
insertStdItems(false, type);
insertStdItem(mt_Change_Font);
- insertItem(SmallIcon( "filenew"), i18n("New Operation..."), mt_Operation);
+ insertItem(SmallIcon( "document-new"), i18n("New Operation..."), mt_Operation);
insertItem(i18n("Select Operation..."), mt_Select_Operation);
break;
@@ -341,7 +341,7 @@
insertStdItem(mt_Cut);
insertStdItem(mt_Copy);
insertStdItem(mt_Paste);
- insertItem(SmallIcon( "editdelete"), i18n("Clear"), mt_Clear);
+ insertItem(SmallIcon( "edit-delete"), i18n("Clear"), mt_Clear);
insertSeparator();
insertItem(i18n("Change Text..."), mt_Rename);
insertStdItem(mt_Delete);
@@ -357,7 +357,7 @@
pState = static_cast< StateWidget *>( object );
if( pState -> getStateType() == StateWidget::Normal ) {
** Diff limit reached (max: 250 lines) **
|
||