Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

pull/1/head
Timothy Pearson 10 years ago
parent 2166880f2b
commit 20b4873704

@ -232,7 +232,7 @@ void CervisiaPart::setupActions()
//
// 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");

@ -195,7 +195,7 @@ LogDialog::LogDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
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");

@ -217,7 +217,7 @@ bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* parent)
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;

@ -328,15 +328,15 @@ void CatalogManager::setupActions()
// 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");

@ -1500,7 +1500,7 @@ void CatalogManagerView::slotDeleteFile()
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()))
{

@ -74,7 +74,7 @@ ProjectDialog::ProjectDialog(Project::Ptr project)
_savePage = new SavePreferences(0);
addPage(_savePage, i18n("title of page in preferences dialog","Save")
, "filesave"
, "document-save"
, i18n("Options for File Saving"));

@ -591,15 +591,15 @@ void KBabelMW::setupActions()
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 @@ void KBabelMW::setupActions()
, 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");

@ -1593,7 +1593,7 @@ bool KBabelView::saveFileSpecial()
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 )

@ -43,7 +43,7 @@ CWBugDetailsContainer::CWBugDetailsContainer( TQWidget *parent , const char * na
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" ) );

@ -162,7 +162,7 @@ void KBBMainWindow::initActions()
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 @@ void KBBMainWindow::initActions()
// 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 @@ void KBBMainWindow::slotListChanges()
{
// 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();
}

@ -80,7 +80,7 @@ void MessageEditor::removeButton()
{
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());

@ -77,7 +77,7 @@ PreferencesDialog::~PreferencesDialog()
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() );

@ -231,7 +231,7 @@ void KompareShell::setupActions()
{
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,

@ -230,7 +230,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
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 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
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 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
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 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
pState = static_cast< StateWidget *>( object );
if( pState -> getStateType() == StateWidget::Normal ) {
m_pInsert = new TDEPopupMenu(this);
m_pInsert -> insertItem(SmallIcon( "filenew"), i18n("Activity..."), mt_New_Activity);
m_pInsert -> insertItem(SmallIcon( "document-new"), i18n("Activity..."), mt_New_Activity);
insertFileNew();
}
setupColor( object -> getUseFillColour() );
@ -420,7 +420,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
case Uml::tr_Seq_Message_Self:
case Uml::tr_Seq_Message:
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;
@ -458,7 +458,7 @@ void ListPopupMenu::init() {
}
void ListPopupMenu::insertFileNew() {
insertItem(SmallIcon("filenew"), i18n("New"), m_pInsert);
insertItem(SmallIcon("document-new"), i18n("New"), m_pInsert);
}
void ListPopupMenu::insertStdItem(Menu_Type m)
@ -471,16 +471,16 @@ void ListPopupMenu::insertStdItem(Menu_Type m)
insertItem(i18n("Rename..."), mt_Rename);
break;
case mt_Delete:
insertItem(SmallIcon("editdelete"), i18n("Delete"), mt_Delete);
insertItem(SmallIcon("edit-delete"), i18n("Delete"), mt_Delete);
break;
case mt_Cut:
insertItem(SmallIcon("editcut"), i18n("Cut"), mt_Cut);
insertItem(SmallIcon("edit-cut"), i18n("Cut"), mt_Cut);
break;
case mt_Copy:
insertItem(SmallIcon("editcopy"), i18n("Copy"), mt_Copy);
insertItem(SmallIcon("edit-copy"), i18n("Copy"), mt_Copy);
break;
case mt_Paste:
insertItem(SmallIcon("editpaste"), i18n("Paste"), mt_Paste);
insertItem(SmallIcon("edit-paste"), i18n("Paste"), mt_Paste);
break;
case mt_Change_Font:
insertItem(SmallIcon("fonts"), i18n("Change Font..."), mt_Change_Font);
@ -532,7 +532,7 @@ void ListPopupMenu::insertStdItem(Menu_Type m)
case mt_Component_Folder:
case mt_UseCase_Folder:
case mt_EntityRelationship_Folder:
m_pInsert->insertItem(BarIcon("folder_new"), i18n("Folder"), m);
m_pInsert->insertItem(BarIcon("folder-new"), i18n("Folder"), m);
break;
case mt_Entity:
m_pInsert->insertItem(m_pixmap[pm_Entity], i18n("Entity"), mt_Entity);
@ -605,7 +605,7 @@ void ListPopupMenu::insertStdItems(bool insertLeadingSeparator /* = true */,
void ListPopupMenu::insertContainerItems(bool folderAndDiagrams) {
if (folderAndDiagrams)
m_pInsert -> insertItem(BarIcon("folder_new"), i18n("Folder"), mt_Logical_Folder);
m_pInsert -> insertItem(BarIcon("folder-new"), i18n("Folder"), mt_Logical_Folder);
m_pInsert -> insertItem(m_pixmap[pm_Class], i18n("Class"), mt_Class);
m_pInsert -> insertItem(m_pixmap[pm_Interface], i18n("Interface"), mt_Interface);
m_pInsert -> insertItem(m_pixmap[pm_Datatype], i18n("Datatype"), mt_Datatype);
@ -1253,7 +1253,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Anchor:
insertItem(SmallIcon( "editdelete"),i18n("Delete Anchor"), mt_Delete);
insertItem(SmallIcon( "edit-delete"),i18n("Delete Anchor"), mt_Delete);
break;
case mt_RoleNameA:
@ -1336,7 +1336,7 @@ void ListPopupMenu::setupDiagramMenu(UMLView* view) {
insertStdItem(mt_Copy);
insertStdItem(mt_Paste);
insertSeparator();
insertItem(SmallIcon("editclear"), i18n("Clear Diagram"), mt_Clear);
insertItem(SmallIcon("edit-clear"), i18n("Clear Diagram"), mt_Clear);
insertStdItem(mt_Export_Image);
insertSeparator();
insertItem(i18n("Snap to Grid"), mt_SnapToGrid);

@ -214,13 +214,13 @@ void UMLApp::initActions() {
preferences->setToolTip( i18n( "Set the default program preferences") );
deleteSelectedWidget = new TDEAction( i18n("Delete &Selected"),
SmallIconSet("editdelete"),
SmallIconSet("edit-delete"),
TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(this),
TQT_SLOT( slotDeleteSelectedWidget() ), actionCollection(),
"delete_selected" );
// The different views
newDiagram = new TDEActionMenu(0, SmallIconSet("filenew"), actionCollection(), "new_view");
newDiagram = new TDEActionMenu(0, SmallIconSet("document-new"), actionCollection(), "new_view");
classDiagram = new TDEAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
@ -255,7 +255,7 @@ void UMLApp::initActions() {
TQT_TQOBJECT(this), TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(),
"new_entityrelationship_diagram" );
viewClearDiagram = new TDEAction(i18n("&Clear Diagram"), SmallIconSet("editclear"), 0,
viewClearDiagram = new TDEAction(i18n("&Clear Diagram"), SmallIconSet("edit-clear"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram");
viewSnapToGrid = new TDEToggleAction(i18n("&Snap to Grid"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid");
@ -264,7 +264,7 @@ void UMLApp::initActions() {
#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
viewShowGrid->setCheckedState(i18n("&Hide Grid"));
#endif
deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("editdelete"), 0,
deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("edit-delete"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete");
viewExportImage = new TDEAction(i18n("&Export as Picture..."), SmallIconSet("image"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image");

@ -1096,7 +1096,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) {
kError()<<"Request to remove diagram " << ID2STR(id) << ": Diagram not found!"<<endl;
return;
}
if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "edit-delete")) == KMessageBox::Continue) {
removeView(umlview);
emit sigDiagramRemoved(id);
setModified(true);

@ -2735,7 +2735,7 @@ bool UMLView::checkUniqueSelection()
void UMLView::clearDiagram() {
if( KMessageBox::Continue == KMessageBox::warningContinueCancel( this, i18n("You are about to delete "
"the entire diagram.\nAre you sure?"),
i18n("Delete Diagram?"),KGuiItem( i18n("&Delete"), "editdelete") ) ) {
i18n("Delete Diagram?"),KGuiItem( i18n("&Delete"), "edit-delete") ) ) {
removeAllWidgets();
}
}

Loading…
Cancel
Save