diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index ba5fe219c..058eb2f96 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -120,7 +120,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char m_newLayerMenu = new TDEPopupMenu(this); m_lst->bnAdd->setPopup(m_newLayerMenu); m_lst->bnAdd->setPopupDelay(1); - m_newLayerMenu->insertItem( SmallIconSet( "filenew" ), i18n( "&New Layer..." ), PAINT_LAYER ); + m_newLayerMenu->insertItem( SmallIconSet( "document-new" ), i18n( "&New Layer..." ), PAINT_LAYER ); m_newLayerMenu->insertItem( SmallIconSet( "folder" ), i18n( "New &Group Layer..." ), GROUP_LAYER ); m_newLayerMenu->insertItem( SmallIconSet( "tool_filter" ), i18n( "New &Adjustment Layer..." ), ADJUSTMENT_LAYER ); m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", TQT_TQOBJECT(this) ); diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc index 7bb0b3321..bfae82825 100644 --- a/chalk/ui/kis_layerlist.cc +++ b/chalk/ui/kis_layerlist.cc @@ -61,11 +61,11 @@ void KisLayerList::constructMenu( LayerItem *layer ) m_partLayerAction->setText( i18n( "&Object Layer" ) ); m_partLayerAction->plug( &submenu ); - contextMenu()->insertItem( SmallIconSet( "filenew" ), i18n( "&New" ), &submenu ); + contextMenu()->insertItem( SmallIconSet( "document-new" ), i18n( "&New" ), &submenu ); } else { - contextMenu()->insertItem( SmallIconSet( "filenew" ), i18n( "&New Layer..." ), MenuItems::NewLayer ); + contextMenu()->insertItem( SmallIconSet( "document-new" ), i18n( "&New Layer..." ), MenuItems::NewLayer ); contextMenu()->insertItem( SmallIconSet( "folder" ), i18n( "New &Group Layer..." ), MenuItems::NewFolder ); contextMenu()->insertItem( SmallIconSet( "tool_filter" ), i18n( "New &Adjustment Layer..." ), ADJUSTMENT_LAYER ); m_partLayerAction->setText( i18n( "New &Object Layer" ) ); diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 569188d92..59da51890 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -640,7 +640,7 @@ void KisView::setupActions() m_layerBottom = new TDEAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", TQT_TQOBJECT(this), TQT_SLOT(layerBack()), actionCollection(), "bottomlayer"); m_layerProperties = new TDEAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerProperties()), actionCollection(), "layer_properties"); (void)new TDEAction(i18n("I&nsert Image as Layer..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer"); - m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "filesave", TQT_TQOBJECT(this), TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image"); + m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "document-save", TQT_TQOBJECT(this), TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image"); (void)new TDEAction(i18n("Flip on &X Axis"), "view_left_right", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX"); (void)new TDEAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY"); diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index bb82396a2..7f7b118d5 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -735,12 +735,12 @@ void LayerList::constructMenu( LayerItem *layer ) d->contextMenu.insertItem( layer->d->properties[i] ? d->properties[i].enabledIcon : d->properties[i].disabledIcon, d->properties[i].displayName, MenuItems::COUNT + i ); d->contextMenu.insertItem( SmallIconSet( "info" ), i18n( "&Properties" ), MenuItems::LayerProperties ); d->contextMenu.insertSeparator(); - d->contextMenu.insertItem( SmallIconSet( "editdelete" ), + d->contextMenu.insertItem( SmallIconSet( "edit-delete" ), selectedLayers().count() > 1 ? i18n( "Remove Layers" ) : layer->isFolder() ? i18n( "&Remove Folder" ) : i18n( "&Remove Layer" ), MenuItems::RemoveLayer ); } - d->contextMenu.insertItem( SmallIconSet( "filenew" ), i18n( "&New Layer" ), MenuItems::NewLayer ); + d->contextMenu.insertItem( SmallIconSet( "document-new" ), i18n( "&New Layer" ), MenuItems::NewLayer ); d->contextMenu.insertItem( SmallIconSet( "folder" ), i18n( "New &Folder" ), MenuItems::NewFolder ); } diff --git a/example/example_view.cc b/example/example_view.cc index e681bdb32..1a8e07e19 100644 --- a/example/example_view.cc +++ b/example/example_view.cc @@ -39,7 +39,7 @@ ExampleView::ExampleView( ExamplePart* part, TQWidget* parent, const char* name KStdAction::copy(this, TQT_SLOT( copy() ), actionCollection(), "copy" ); KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new TDEAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ), + //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQT_SLOT( cut() ), // actionCollection(), "cut"); } diff --git a/karbon/commands/vdeletecmd.cc b/karbon/commands/vdeletecmd.cc index 997a7cc95..2cd6a711b 100644 --- a/karbon/commands/vdeletecmd.cc +++ b/karbon/commands/vdeletecmd.cc @@ -24,7 +24,7 @@ #include "vdocument.h" VDeleteCmd::VDeleteCmd( VDocument* doc ) - : VCommand( doc, i18n( "Delete Objects" ), "editdelete" ) + : VCommand( doc, i18n( "Delete Objects" ), "edit-delete" ) { m_selection = document()->selection()->clone(); @@ -33,7 +33,7 @@ VDeleteCmd::VDeleteCmd( VDocument* doc ) } VDeleteCmd::VDeleteCmd( VDocument* doc, VObject* object ) - : VCommand( doc, i18n( "Delete Object" ), "editdelete" ) + : VCommand( doc, i18n( "Delete Object" ), "edit-delete" ) { m_selection = new VSelection(); m_selection->append( object ); diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 115bbf6fc..3fc8eaf5b 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -1002,7 +1002,7 @@ KarbonView::initActions() i18n( "&Import Graphic..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( fileImportGraphic() ), actionCollection(), "file_import" ); m_deleteSelectionAction = new TDEAction( - i18n( "D&elete" ), "editdelete", TQKeySequence( "Del" ), TQT_TQOBJECT(this), + i18n( "D&elete" ), "edit-delete", TQKeySequence( "Del" ), TQT_TQOBJECT(this), TQT_SLOT( editDeleteSelection() ), actionCollection(), "edit_delete" ); new TDEAction( i18n( "&History" ), 0, 0, TQT_TQOBJECT(this), diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp index 8376beb7e..0ddb7afa7 100644 --- a/kexi/formeditor/connectiondialog.cpp +++ b/kexi/formeditor/connectiondialog.cpp @@ -78,12 +78,12 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) //// Setup the icon toolbar ///////////////// TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3); - KPushButton *newItem = new KPushButton(SmallIconSet("filenew"), i18n("&New Connection"), frame); + KPushButton *newItem = new KPushButton(SmallIconSet("document-new"), i18n("&New Connection"), frame); vlayout->addWidget(newItem); m_buttons.insert(BAdd, newItem); connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem())); - KPushButton *delItem = new KPushButton(SmallIconSet("editdelete"), i18n("&Remove Connection"), frame); + KPushButton *delItem = new KPushButton(SmallIconSet("edit-delete"), i18n("&Remove Connection"), frame); vlayout->addWidget(delItem); m_buttons.insert(BRemove, delItem); connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem())); diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index 15bb1a2fe..2dcf57b81 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -208,9 +208,9 @@ KFormDesignerKDevPart::setupActions() KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection()); KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection()); KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection()); - new TDEAction(i18n("Clear Widget Contents"), "editclear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); - new TDEAction(i18n("Delete Widget"), "editdelete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); - new TDEAction(i18n("Preview Form"), "filequickprint", "Ctrl+T", this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); + new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); + new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); + new TDEAction(i18n("Preview Form"), "document-print-preview", "Ctrl+T", this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index 401bfd20a..913ec0512 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -212,9 +212,9 @@ KFormDesignerPart::setupActions() KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection()); KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection()); KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection()); - new TDEAction(i18n("Clear Widget Contents"), "editclear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); - new TDEAction(i18n("Delete Widget"), "editdelete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); - new TDEAction(i18n("Preview Form"), "filequickprint", CTRL+Key_T, this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); + new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); + new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); + new TDEAction(i18n("Preview Form"), "document-print-preview", CTRL+Key_T, this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp index cf478b94c..0be5b7427 100644 --- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp +++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp @@ -205,7 +205,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled, + i18n("The file is probably already open on this or another computer.") + " " + i18n("Could not gain exclusive access for writing the file."), KMessageBox::WarningContinueCancel, KMessageBox::Continue, - KGuiItem(i18n("Open As Read-Only"), "fileopen"), KStdGuiItem::cancel(), + KGuiItem(i18n("Open As Read-Only"), "document-open"), KStdGuiItem::cancel(), "askBeforeOpeningFileReadOnly", KMessageBox::Notify, msgHandler )) { clearError(); diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index edb472a07..4baa0d8b8 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -1032,7 +1032,7 @@ TQVariant KexiDB::notEmptyValueForType( KexiDB::Field::Type type ) TQByteArray ba; TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); - TQPixmap pm(SmallIcon("filenew")); + TQPixmap pm(SmallIcon("document-new")); pm.save( &buffer, "PNG"/*! @todo default? */ ); ADD(i, ba); continue; diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h index e535cd4b3..606e41a95 100644 --- a/kexi/kexidb/utils.h +++ b/kexi/kexidb/utils.h @@ -379,7 +379,7 @@ namespace KexiDB "notEmpty" property set. It works in a similar way as @ref TQVariant emptyValueForType( KexiDB::Field::Type type ) with the following differences: - " " string (a single space) is returned for Text and LongText types - - a byte array with saved "filenew" PNG image (icon) for BLOB type + - a byte array with saved "document-new" PNG image (icon) for BLOB type Returns null TQVariant for unsupported values like KexiDB::Field::InvalidType. This function is efficient (uses a cache) and is heavily used by the AlterTableHandler for filling new columns. */ diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp index 08884ff01..ec9edfbf0 100644 --- a/kexi/kexiutils/debuggui.cpp +++ b/kexi/kexiutils/debuggui.cpp @@ -97,7 +97,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel) TQHBoxLayout *hbox = new TQHBoxLayout(page); vbox->addLayout(hbox); hbox->addStretch(1); - KPushButton *btn_exec = new KPushButton(KGuiItem("Real Alter Table", "filesave"), page); + KPushButton *btn_exec = new KPushButton(KGuiItem("Real Alter Table", "document-save"), page); btn_exec->setName("executeRealAlterTable"); hbox->addWidget(btn_exec); KPushButton *btn_clear = new KPushButton(KGuiItem("Clear", "clear_left"), page); diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 69ac854b5..1201a79c4 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -524,7 +524,7 @@ void KexiMainWindowImpl::initActions() // connect(d->actionMapper, TQT_SIGNAL(mapped(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotAction(const TQString &))); // PROJECT MENU - TDEAction *action = new TDEAction(i18n("&New..."), "filenew", TDEStdAccel::shortcut(TDEStdAccel::New), + TDEAction *action = new TDEAction(i18n("&New..."), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotProjectNew()), actionCollection(), "project_new"); action->setToolTip(i18n("Create a new project")); action->setWhatsThis(i18n("Creates a new project. Currently opened project is not affected.")); @@ -563,13 +563,13 @@ void KexiMainWindowImpl::initActions() d->action_save = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" ); -// d->action_save = new TDEAction(i18n("&Save"), "filesave", TDEStdAccel::shortcut(TDEStdAccel::Save), +// d->action_save = new TDEAction(i18n("&Save"), "document-save", TDEStdAccel::shortcut(TDEStdAccel::Save), // TQT_TQOBJECT(this), TQT_SLOT(slotProjectSave()), actionCollection(), "project_save"); d->action_save->setToolTip(i18n("Save object changes")); d->action_save->setWhatsThis(i18n("Saves object changes from currently selected window.")); #ifdef KEXI_SHOW_UNIMPLEMENTED - d->action_save_as = new TDEAction(i18n("Save &As..."), "filesaveas", 0, + d->action_save_as = new TDEAction(i18n("Save &As..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas"); d->action_save_as->setToolTip(i18n("Save object as")); d->action_save_as->setWhatsThis( @@ -582,7 +582,7 @@ void KexiMainWindowImpl::initActions() d->action_project_properties = d->dummy_action; #endif - d->action_close = new TDEAction(i18n("&Close Project"), "fileclose", 0, + d->action_close = new TDEAction(i18n("&Close Project"), "window-close", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectClose()), actionCollection(), "project_close" ); d->action_close->setToolTip(i18n("Close the current project")); d->action_close->setWhatsThis(i18n("Closes the current project.")); @@ -633,7 +633,7 @@ void KexiMainWindowImpl::initActions() d->action_project_export_data_table->setWhatsThis( i18n("Exports data from the active table or query data to a file.")); -//TODO new TDEAction(i18n("From File..."), "fileopen", 0, +//TODO new TDEAction(i18n("From File..."), "document-open", 0, //TODO TQT_TQOBJECT(this), TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file"); //TODO new TDEAction(i18n("From Server..."), "server", 0, //TODO TQT_TQOBJECT(this), TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server"); @@ -715,7 +715,7 @@ void KexiMainWindowImpl::initActions() d->action_edit_select_all = createSharedAction( KStdAction::SelectAll, "edit_select_all"); - d->action_edit_delete = createSharedAction(i18n("&Delete"), "editdelete", + d->action_edit_delete = createSharedAction(i18n("&Delete"), "edit-delete", 0/*TQt::Key_Delete*/, "edit_delete"); d->action_edit_delete->setToolTip(i18n("Delete selected object")); d->action_edit_delete->setWhatsThis(i18n("Deletes currently selected object.")); @@ -3791,7 +3791,7 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk ) "%1\n" "If you click \"Delete\", you will not be able to undo the deletion.") .arg( "

"+part->instanceCaption()+" \""+ item->name() + "\"?

" ), - 0, KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::no())) + 0, KGuiItem(i18n("Delete"), "edit-delete"), KStdGuiItem::no())) return cancelled; } diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index 35f8aa31b..294b7c0a4 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -339,7 +339,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi m_contents->printButton->setText( KStdGuiItem::print().text() ); connect(m_contents->printButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(print())); - m_contents->printPreviewButton->setIconSet( SmallIconSet("filequickprint") ); + m_contents->printPreviewButton->setIconSet( SmallIconSet("document-print-preview") ); m_contents->printPreviewButton->setText( i18n("Print Previe&w...") ); connect(m_contents->printPreviewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(printPreview())); diff --git a/kexi/main/printing/kexisimpleprintingpart.cpp b/kexi/main/printing/kexisimpleprintingpart.cpp index 048f92ae0..8634b06a3 100644 --- a/kexi/main/printing/kexisimpleprintingpart.cpp +++ b/kexi/main/printing/kexisimpleprintingpart.cpp @@ -29,7 +29,7 @@ #include KexiSimplePrintingPart::KexiSimplePrintingPart() - : KexiPart::StaticPart("kexi/simpleprinting", "fileprint", i18n("Printing")) + : KexiPart::StaticPart("kexi/simpleprinting", "document-print", i18n("Printing")) { // REGISTERED ID: //?? m_registeredPartID = (int)KexiPart::QueryObjectType; diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index 0e1b77489..6ddb19514 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -158,7 +158,7 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( , m_pagesCount(-1) { setCaption(i18n("%1 - Print Preview - %2").arg(previewName).arg(KEXI_APP_NAME)); - setIcon(DesktopIcon("filequickprint")); + setIcon(DesktopIcon("document-print-preview")); TQVBoxLayout *lyr = new TQVBoxLayout(this, 6); int id; diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index 1c46a0463..25305e1a6 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -384,7 +384,7 @@ void KexiConnSelectorWidget::slotRemoteEditBtnClicked() if (!item) return; KexiDBConnectionDialog dlg(*item->data(), TQString(), - KGuiItem(i18n("&Save"), "filesave", i18n("Save changes made to this database connection")) ); + KGuiItem(i18n("&Save"), "document-save", i18n("Save changes made to this database connection")) ); dlg.setCaption(i18n("Edit Database Connection")); if (TQDialog::Accepted!=dlg.exec()) return; diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index e479d1bbf..38b5fd1ee 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -89,7 +89,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, , d(new KexiNewProjectWizardPrivate() ) { d->msgHandler = new KexiGUIMessageHandler(this); - setIcon( DesktopIcon("filenew") ); + setIcon( DesktopIcon("document-new") ); setCaption( i18n("Creating New Project") ); finishButton()->setText(i18n("Create")); diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp index 76299637b..b887cdfd7 100644 --- a/kexi/main/startup/KexiProjectSelector.cpp +++ b/kexi/main/startup/KexiProjectSelector.cpp @@ -240,7 +240,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const ch #endif Ok | Cancel, Ok, parent, name, true/*modal*/, false/*sep*/ ) { - setButtonGuiItem(Ok, KGuiItem(i18n("&Open"), "fileopen", i18n("Open Database Connection"))); + setButtonGuiItem(Ok, KGuiItem(i18n("&Open"), "document-open", i18n("Open Database Connection"))); assert(cdata); if (!cdata) return; diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index d54a9d129..66acc0ebe 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -166,7 +166,7 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD this, TQT_SLOT(slotShowConnectionDetails()) ); setButtonText(KDialogBase::User1, i18n("&Details")+ " >>"); } - setButtonOK(KGuiItem(i18n("&Open"), "fileopen")); + setButtonOK(KGuiItem(i18n("&Open"), "document-open")); } KexiDBPasswordDialog::~KexiDBPasswordDialog() diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index f0b9a0e97..5aebe3b1f 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -166,7 +166,7 @@ KexiStartupDialog::KexiStartupDialog( d->singlePage = dlgSinglePage(dialogType); if (dialogType==OpenExisting) {//this dialog has "open" tab only! - setIcon(DesktopIcon("fileopen")); + setIcon(DesktopIcon("document-open")); } else { setIcon(d->kexi_sqlite_icon); } diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index 08e242073..1432ac3c6 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -84,7 +84,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f //TODO d->keepLocation = false; //TODO d->operationMode = Opening; setMode(KFile::File | KFile::ExistingOnly); //(js) default: open action - setIcon( TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::Desktop) ); + setIcon( TDEGlobal::iconLoader()->loadIcon("document-open", TDEIcon::Desktop) ); setDir(TQDir(startDir)); //TODO d->hasDefaultFilter = false; //TODO d->hasView = false; @@ -387,7 +387,7 @@ void KexiStartupFileDialogBase::setOperationMode( KFileDialog::OperationMode mod // d->keepLocation = (mode == Saving); if (mode == KFileDialog::Saving) { setMode( KFile::File ); - setIcon( TDEGlobal::iconLoader()->loadIcon("filesave", TDEIcon::Desktop) ); + setIcon( TDEGlobal::iconLoader()->loadIcon("document-save", TDEIcon::Desktop) ); } //(js) filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving ); //(js) d->okButton->setGuiItem( (mode == Saving) ? KStdGuiItem::save() : KStdGuiItem::ok() ); diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index dde61c8aa..95954cceb 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -266,7 +266,7 @@ class ActionToExecuteListView : public ActionsListViewBase const TQPixmap noIcon( KexiUtils::emptyIcon(TDEIcon::Small) ); if (supportedViewModes & Kexi::DataViewMode) { item = new ActionSelectorDialogListItem("open", this, i18n("Open in Data View")); - item->setPixmap(0, SmallIcon("fileopen")); + item->setPixmap(0, SmallIcon("document-open")); } if (part->info()->isExecuteSupported()) { item = new ActionSelectorDialogListItem("execute", this, i18n("Execute")); @@ -275,7 +275,7 @@ class ActionToExecuteListView : public ActionsListViewBase if (part->info()->isPrintingSupported()) { ActionSelectorDialogListItem *printItem = new ActionSelectorDialogListItem( "print", this, i18n("Print")); - printItem->setPixmap(0, SmallIcon("fileprint")); + printItem->setPixmap(0, SmallIcon("document-print")); TDEAction *a = KStdAction::printPreview(0, 0, 0); item = new ActionSelectorDialogListItem("printPreview", printItem, a->text().replace("&", "").replace("...", "")); @@ -301,7 +301,7 @@ class ActionToExecuteListView : public ActionsListViewBase exportItem->setExpandable(false); } item = new ActionSelectorDialogListItem("new", this, i18n("Create New Object")); - item->setPixmap(0, SmallIcon("filenew")); + item->setPixmap(0, SmallIcon("document-new")); if (supportedViewModes & Kexi::DesignViewMode) { item = new ActionSelectorDialogListItem("design", this, i18n("Open in Design View")); item->setPixmap(0, SmallIcon("edit")); @@ -311,7 +311,7 @@ class ActionToExecuteListView : public ActionsListViewBase item->setPixmap(0, noIcon); } item = new ActionSelectorDialogListItem("close", this, i18n("Close View")); - item->setPixmap(0, SmallIcon("fileclose")); + item->setPixmap(0, SmallIcon("window-close")); updateWidth(); } diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 69ca66022..76492ed55 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -173,7 +173,7 @@ void KexiFormPart::initInstanceActions() //connect actions provided by widget factories connect( col->action("widget_assign_action"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotAssignAction())); - createSharedAction(Kexi::DesignViewMode, i18n("Clear Widget Contents"), "editclear", 0, "formpart_clear_contents"); + createSharedAction(Kexi::DesignViewMode, i18n("Clear Widget Contents"), "edit-clear", 0, "formpart_clear_contents"); createSharedAction(Kexi::DesignViewMode, i18n("Edit Tab Order..."), "tab_order", 0, "formpart_taborder"); //TODO createSharedAction(Kexi::DesignViewMode, i18n("Edit Pixmap Collection"), "icons", 0, "formpart_pixmap_collection"); //TODO createSharedAction(Kexi::DesignViewMode, i18n("Edit Form Connections"), "connections", 0, "formpart_connections"); diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 104e43b39..b2d3940c4 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -130,7 +130,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, m_exportOptionsPage ); if (m_options.mode==KexiCSVExport::Clipboard) - m_infoLblTo->setIcon("editpaste"); + m_infoLblTo->setIcon("edit-paste"); exportOptionsLyr->addMultiCellWidget(m_infoLblTo, 1, 1, 0, 2); m_showOptionsButton = new KPushButton(KGuiItem(i18n("Show Options >>"), "configure"), diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 941a7bd06..a1b1c6ea7 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -358,7 +358,7 @@ if ( m_mode == Clipboard ) } if (m_mode==Clipboard) { - m_infoLbl->setIcon("editpaste"); + m_infoLbl->setIcon("edit-paste"); } //updateRowCountInfo(); diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 39e36bbb7..c9f9e1c5f 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -147,9 +147,9 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi static const TQString msg_back = i18n("Back to Selected Query"); static const TQString msg_clear = i18n("Clear History"); d->historyHead->addButton("select_item", msg_back, TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery())); - d->historyHead->addButton("editclear", msg_clear, TQT_TQOBJECT(d->history), TQT_SLOT(clear())); + d->historyHead->addButton("edit-clear", msg_clear, TQT_TQOBJECT(d->history), TQT_SLOT(clear())); d->history->popupMenu()->insertItem(SmallIcon("select_item"), msg_back, TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery())); - d->history->popupMenu()->insertItem(SmallIcon("editclear"), msg_clear, d->history, TQT_SLOT(clear())); + d->history->popupMenu()->insertItem(SmallIcon("edit-clear"), msg_clear, d->history, TQT_SLOT(clear())); connect(d->history, TQT_SIGNAL(currentItemDoubleClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery())); d->heightForHistoryMode = -1; //height() / 2; diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index c528540a7..fba543db3 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -41,7 +41,7 @@ KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const m_history->setAutoDelete(true); m_popup = new TDEPopupMenu(this); - m_popup->insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); + m_popup->insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); } KexiQueryDesignerSQLHistory::~KexiQueryDesignerSQLHistory() @@ -162,7 +162,7 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e) KexiQueryDesignerSQLHistory::contextMenu(const TQPoint &pos, HistoryEntry *) { TDEPopupMenu p(this); - p.insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); + p.insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); #ifndef KEXI_NO_UNFINISHED diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp index 5b8538a7e..2a9b61d3a 100644 --- a/kexi/plugins/tables/kexitablepart.cpp +++ b/kexi/plugins/tables/kexitablepart.cpp @@ -188,7 +188,7 @@ tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *parent, K int r = KMessageBox::questionYesNo(parent, "

"+msg+"

"+openedObjectsStr+"

" +i18n("Do you want to close all windows for these objects?"), - TQString(), KGuiItem(i18n("Close windows"),"fileclose"), KStdGuiItem::cancel()); + TQString(), KGuiItem(i18n("Close windows"),"window-close"), KStdGuiItem::cancel()); tristate res; if (r == KMessageBox::Yes) { //try to close every window diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 2c86d4f75..208fb9744 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -123,7 +123,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } // actions - m_openAction = new TDEAction(i18n("&Open"), "fileopen", 0/*TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), + m_openAction = new TDEAction(i18n("&Open"), "document-open", 0/*TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), TQT_SLOT(slotOpenObject()), TQT_TQOBJECT(this), "open_object"); m_openAction->setToolTip(i18n("Open object")); m_openAction->setWhatsThis(i18n("Opens object selected in the list")); @@ -145,7 +145,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_newObjectPopup = 0; } else { - m_deleteAction = new TDEAction(i18n("&Delete"), "editdelete", 0/*TQt::Key_Delete*/, + m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", 0/*TQt::Key_Delete*/, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), m_actions, "edit_delete"); //! @todo 1.1: just add "Delete" tooltip and what's this m_deleteAction->setToolTip(i18n("&Delete").replace("&","")); @@ -172,7 +172,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_editTextAction->setToolTip(i18n("Open object in text view")); m_editTextAction->setWhatsThis(i18n("Opens selected object in the list in text view")); - m_newObjectAction = new TDEAction("", "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewObject()), TQT_TQOBJECT(this), "new_object"); + m_newObjectAction = new TDEAction("", "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewObject()), TQT_TQOBJECT(this), "new_object"); if (m_features & Toolbar) { m_newObjectToolButton = new KexiSmallToolButton(this, "", TQIconSet(), "new_object"); m_newObjectPopup = new TDEPopupMenu(this, "newObjectPopup"); @@ -200,7 +200,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features i18n("Exports data from the currently selected table or query data to a file.")); m_exportActionMenu->insert( m_dataExportAction ); - m_printAction = new TDEAction(i18n("&Print..."), "fileprint", 0, TQT_TQOBJECT(this), + m_printAction = new TDEAction(i18n("&Print..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrintItem()), TQT_TQOBJECT(this), "printItem"); m_printAction->setWhatsThis( i18n("Prints data from the currently selected table or query.")); @@ -536,10 +536,10 @@ KexiBrowser::slotSelectionChanged(TQListViewItem* i) } else { if (m_newObjectAction) { m_newObjectAction->setText(i18n("&Create Object...")); - // m_newObjectToolbarAction->setIconSet( SmallIconSet("filenew") ); + // m_newObjectToolbarAction->setIconSet( SmallIconSet("document-new") ); // m_newObjectToolbarAction->setText(m_newObjectAction->text()); if (m_features & Toolbar) { - m_newObjectToolButton->setIconSet( "filenew" ); + m_newObjectToolButton->setIconSet( "document-new" ); TQToolTip::add(m_newObjectToolButton, i18n("Create object")); TQWhatsThis::add(m_newObjectToolButton, i18n("Creates a new object")); } diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp index aabd7cc22..c36df02f3 100644 --- a/kexi/widget/kexidbconnectionwidget.cpp +++ b/kexi/widget/kexidbconnectionwidget.cpp @@ -88,7 +88,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent, const char* n TQHBoxLayout *hbox = new TQHBoxLayout(frmBottom); hbox->addStretch(2); - d->btnSaveChanges = new KPushButton(KGuiItem(i18n("Save Changes"), "filesave", + d->btnSaveChanges = new KPushButton(KGuiItem(i18n("Save Changes"), "document-save", i18n("Save all changes made to this connection information"), i18n("Save all changes made to this connection information. You can later reuse this information.")), frmBottom, "savechanges"); @@ -342,7 +342,7 @@ KexiDBConnectionDialog::KexiDBConnectionDialog(const KexiProjectData& data, KDialogBase::User1|KDialogBase::Cancel|KDialogBase::Help, KDialogBase::User1, false, acceptButtonGuiItem.text().isEmpty() - ? KGuiItem(i18n("&Open"), "fileopen", i18n("Open Database Connection")) + ? KGuiItem(i18n("&Open"), "document-open", i18n("Open Database Connection")) : acceptButtonGuiItem ) { @@ -357,7 +357,7 @@ KexiDBConnectionDialog::KexiDBConnectionDialog(const KexiDB::ConnectionData& dat KDialogBase::User1|KDialogBase::Cancel|KDialogBase::Help, KDialogBase::User1, false, acceptButtonGuiItem.text().isEmpty() - ? KGuiItem(i18n("&Open"), "fileopen", i18n("Open Database Connection")) + ? KGuiItem(i18n("&Open"), "document-open", i18n("Open Database Connection")) : acceptButtonGuiItem ) { diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index 8c4d95518..c2ce43cfe 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -242,7 +242,7 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW //// Setup the icon toolbar ///////////////// TQVBoxLayout *vlayout = new TQVBoxLayout(l, 3); TQToolButton *newItemPath = new TQToolButton(frame); - newItemPath->setIconSet(BarIconSet("fileopen")); + newItemPath->setIconSet(BarIconSet("document-open")); newItemPath->setTextLabel(i18n("&Add File"), true); vlayout->addWidget(newItemPath); m_buttons.insert(BNewItemPath, newItemPath); diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 7dcec4159..faf708875 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -73,7 +73,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject())); */ #if 0 - m_removeSelectedTableQueryAction = new TDEAction(i18n("&Hide Selected Table/Query"), "editdelete", "", + m_removeSelectedTableQueryAction = new TDEAction(i18n("&Hide Selected Table/Query"), "edit-delete", "", this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery"); m_removeSelectedConnectionAction = new TDEAction(i18n("&Remove Selected Relationship"), "button_cancel", "", this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection"); diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index eef477a5a..b1ad05fcf 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -83,7 +83,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, m_areaPopup = new TDEPopupMenu(this, "m_areaPopup"); - m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("fileopen"), TDEShortcut(), + m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("document-open"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(openSelectedTable()), TQT_TQOBJECT(this), "relationsview_openTable"); m_openSelectedTableAction->plug( m_tableQueryPopup ); m_designSelectedTableAction = new TDEAction(i18n("&Design Table"), SmallIcon("edit"), TDEShortcut(), diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp index 68690ef95..4ff506737 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.cpp +++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp @@ -1210,7 +1210,7 @@ void KexiDataAwareObjectInterface::deleteCurrentRow() case AskDelete: if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(dynamic_cast(this), i18n("Do you want to delete selected row?"), 0, - KGuiItem(i18n("&Delete Row"),"editdelete"), + KGuiItem(i18n("&Delete Row"),"edit-delete"), "dontAskBeforeDeleteRow"/*config entry*/, KMessageBox::Notify|KMessageBox::Dangerous)) return; diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index 6e5b5c9e6..f52ff7d58 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -62,7 +62,7 @@ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent) setName("KexiImageContextMenu"); insertTitle(TQString()); - d->insertFromFileAction = new TDEAction(i18n("Insert From &File..."), SmallIconSet("fileopen"), 0, + d->insertFromFileAction = new TDEAction(i18n("Insert From &File..."), SmallIconSet("document-open"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertFromFile()), &d->actionCollection, "insert"); d->insertFromFileAction->plug(this); d->saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), &d->actionCollection); @@ -75,7 +75,7 @@ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent) d->copyAction->plug(this); d->pasteAction = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), &d->actionCollection); d->pasteAction->plug(this); - d->deleteAction = new TDEAction(i18n("&Clear"), SmallIconSet("editdelete"), 0, + d->deleteAction = new TDEAction(i18n("&Clear"), SmallIconSet("edit-delete"), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), &d->actionCollection, "delete"); d->deleteAction->plug(this); #ifdef KEXI_NO_UNFINISHED diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index 2d986414a..dfc3e2ff6 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -521,7 +521,7 @@ void KivioView::setupActions() (void) new TDEAction(i18n("Install Stencil Set..."), 0, TQT_TQOBJECT(this), TQT_SLOT(installStencilSet()), actionCollection(), "installStencilSet"); - m_editDelete = new TDEAction(i18n("Delete"), "editdelete", Key_Delete, + m_editDelete = new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteObject()), actionCollection(), "deleteObject"); } @@ -805,7 +805,7 @@ void KivioView::removePage() return; } TQApplication::beep(); - int ret = KMessageBox::warningContinueCancel(this,i18n("You are going to remove the active page.\nDo you want to continue?"),i18n("Remove Page"),KGuiItem(i18n("&Delete"),"editdelete")); + int ret = KMessageBox::warningContinueCancel(this,i18n("You are going to remove the active page.\nDo you want to continue?"),i18n("Remove Page"),KGuiItem(i18n("&Delete"),"edit-delete")); if ( ret == KMessageBox::Continue ) { KivioPage* tbl = m_pActivePage; diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index fc5ac0cf8..aaff3c02b 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -671,8 +671,8 @@ void KoShellWindow::tab_contextMenu(TQWidget * w,const TQPoint &p) { TDEPopupMenu menu; TDEIconLoader il; - int const mnuSave = menu.insertItem( il.loadIconSet( "filesave", TDEIcon::Small ), i18n("Save") ); - int const mnuClose = menu.insertItem( il.loadIcon( "fileclose", TDEIcon::Small ), i18n("Close") ); + int const mnuSave = menu.insertItem( il.loadIconSet( "document-save", TDEIcon::Small ), i18n("Save") ); + int const mnuClose = menu.insertItem( il.loadIcon( "window-close", TDEIcon::Small ), i18n("Close") ); int tabnr = m_pFrame->indexOf( w ); Page page = m_lstPages[tabnr]; diff --git a/kplato/kptview.cc b/kplato/kptview.cc index c9f935534..238ff733f 100644 --- a/kplato/kptview.cc +++ b/kplato/kptview.cc @@ -270,7 +270,7 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/) TQT_SLOT(slotOpenNode()), actionCollection(), "node_properties"); actionTaskProgress = new TDEAction(i18n("Progress..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTaskProgress()), actionCollection(), "task_progress"); - actionDeleteTask = new TDEAction(i18n("Delete Task"), "editdelete", 0, TQT_TQOBJECT(this), + actionDeleteTask = new TDEAction(i18n("Delete Task"), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteTask()), actionCollection(), "delete_task"); actionEditResource = new TDEAction(i18n("Edit Resource..."), "edit", 0, TQT_TQOBJECT(this), diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 0bf478503..c8c9ba896 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -707,7 +707,7 @@ void KPrView::updateSideBarMenu() void KPrView::editDelPage() { if ( KMessageBox::warningContinueCancel( this, - i18n( "Do you want to remove the current slide?"),i18n("Remove Slide"),KGuiItem(i18n("&Delete"),"editdelete") ) + i18n( "Do you want to remove the current slide?"),i18n("Remove Slide"),KGuiItem(i18n("&Delete"),"edit-delete") ) != KMessageBox::Continue ) return; m_canvas->exitEditMode(); @@ -2323,12 +2323,12 @@ void KPrView::setupActions() actionEditPaste, TQT_SLOT( setEnabled( bool ) ) ); m_pKPresenterDoc->clipboardDataChanged(); // set paste's initial state - actionEditDelete = new TDEAction( i18n( "&Delete" ), "editdelete", CTRL + TQt::Key_Delete, + actionEditDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", CTRL + TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( editDelete() ), actionCollection(), "edit_delete" ); actionEditSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); actionEditDeSelectAll= KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); - actionEditCopyPage = new TDEAction( i18n( "Copy Slide" ), "editcopy", + actionEditCopyPage = new TDEAction( i18n( "Copy Slide" ), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT( editCopyPage() ), actionCollection(), "edit_copypage" ); actionEditDuplicatePage = new TDEAction( i18n( "Duplicate Slide" ), "newslide", diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index b47d55f8f..6fa1208bd 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -65,7 +65,7 @@ PreferenceDialog::PreferenceDialog( View* parent, const char* /*name*/) connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply())); - TQVBox *page2=addVBoxPage(i18n("Locale Settings"), TQString(),BarIcon("gohome",TDEIcon::SizeMedium)); + TQVBox *page2=addVBoxPage(i18n("Locale Settings"), TQString(),BarIcon("go-home",TDEIcon::SizeMedium)); _localePage=new parameterLocale(parent,page2 ); TQVBox *page3=addVBoxPage(i18n("Interface"), TQString(),BarIcon("signature", TDEIcon::SizeMedium) ); diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc index 5d2217cb3..e75e421c8 100644 --- a/kspread/dialogs/link.cc +++ b/kspread/dialogs/link.cc @@ -95,7 +95,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) // link for external file d->filePage = addPage( i18n( "File" ), TQString(), - BarIcon( "filenew",TDEIcon::SizeMedium ) ); + BarIcon( "document-new",TDEIcon::SizeMedium ) ); TQVBoxLayout* fLayout = new TQVBoxLayout( d->filePage, marginHint(), spacingHint() ); fLayout->add( new TQLabel( i18n("Text to display:" ), d->filePage ) ); d->fileText = new KLineEdit( d->filePage ); diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index ae6456a6a..79c355cb1 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -5619,7 +5619,7 @@ void View::slotPopupDeleteChild() // a) It is annoying from a user's persepective // b) The behaviour should be consistant with other KOffice apps - /*int ret = KMessageBox::warningContinueCancel(this,i18n("You are about to remove this embedded document.\nDo you want to continue?"),i18n("Delete Embedded Document"),KGuiItem(i18n("&Delete"),"editdelete")); + /*int ret = KMessageBox::warningContinueCancel(this,i18n("You are about to remove this embedded document.\nDo you want to continue?"),i18n("Delete Embedded Document"),KGuiItem(i18n("&Delete"),"edit-delete")); if ( ret == KMessageBox::Continue ) { @@ -6779,7 +6779,7 @@ void View::removeSheet() } KNotifyClient::beep(); int ret = KMessageBox::warningContinueCancel( this, i18n( "You are about to remove the active sheet.\nDo you want to continue?" ), - i18n( "Remove Sheet" ),KGuiItem(i18n("&Delete"),"editdelete") ); + i18n( "Remove Sheet" ),KGuiItem(i18n("&Delete"),"edit-delete") ); if ( ret == KMessageBox::Continue ) { diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index 1f3eeafa3..a7028ae55 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -182,7 +182,7 @@ void KudesignerView::initActions() copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), actionCollection() ); pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( paste() ), actionCollection() ); selectAllAction = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), actionCollection() ); - deleteAction = new TDEAction( i18n( "Delete" ), "editdelete", 0, TQT_TQOBJECT(this), + deleteAction = new TDEAction( i18n( "Delete" ), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT( deleteItems() ), actionCollection(), "edit_delete" ); cutAction->setEnabled( false ); copyAction->setEnabled( false ); diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp index 40f391d18..5f9290cc0 100644 --- a/kword/KWDeleteDia.cpp +++ b/kword/KWDeleteDia.cpp @@ -37,7 +37,7 @@ KWDeleteDia::KWDeleteDia( KWView *parent, KWTableFrameSet *table, DeleteType typ setupTab1(); setButtonOK( KGuiItem( - i18n("&Delete"), "editdelete", type == deleteRow ? + i18n("&Delete"), "edit-delete", type == deleteRow ? i18n("Delete the row from the table.") : i18n("Delete the column from the table.")) ); } diff --git a/kword/KWView.cpp b/kword/KWView.cpp index eb0022ce8..1cf60cce3 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -2802,7 +2802,7 @@ void KWView::deleteFrame( bool warning ) this, i18n("Do you want to delete this frame?"), i18n("Delete Frame"), - KGuiItem(i18n("&Delete"),"editdelete"), + KGuiItem(i18n("&Delete"),"edit-delete"), "DeleteLastFrameConfirmation", true ); if (result != KMessageBox::Continue) @@ -2819,7 +2819,7 @@ void KWView::deleteFrame( bool warning ) this, i18n("Do you want to delete this frame?"), i18n("Delete Frame"), - KGuiItem(i18n("&Delete"),"editdelete"), + KGuiItem(i18n("&Delete"),"edit-delete"), "DeleteLastFrameConfirmation", true ); if (result != KMessageBox::Continue) diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 5611e8737..18e0f317b 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -276,7 +276,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst m_previewLabel->installEventFilter(this); m_documentList->installEventFilter(this); setFocusProxy(m_documentList); - KGuiItem openGItem(i18n("Open This Document"), "fileopen"); + KGuiItem openGItem(i18n("Open This Document"), "document-open"); m_openButton->setGuiItem(openGItem); m_alwaysUseCheckBox->hide(); m_documentList->header()->hide(); diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index a2189c888..2dd15e955 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -259,7 +259,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) new KKbdAccessExtensions(this, "mw-panelSizer"); // set up the action "list" for "Close all Views" (hacky :) (Werner) d->m_veryHackyActionList.append( - new TDEAction(i18n("&Close All Views"), "fileclose", + new TDEAction(i18n("&Close All Views"), "window-close", "ctrl+shift+w", TQT_TQOBJECT(this), TQT_SLOT(slotCloseAllViews()), actionCollection(), "view_closeallviews") ); diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index ed3086ab9..130226be5 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -114,7 +114,7 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& connect(m_sectionList, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(itemClicked(TQListViewItem*))); - KGuiItem openExistingGItem(i18n("Open Existing Document..."), "fileopen"); + KGuiItem openExistingGItem(i18n("Open Existing Document..."), "document-open"); m_openExistingButton->setGuiItem(openExistingGItem); connect(m_openExistingButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showOpenFileDialog())); @@ -172,7 +172,7 @@ void KoOpenPane::initRecentDocs() { KoRecentDocumentsPane* recentDocPane = new KoRecentDocumentsPane(this, d->m_instance); connect(recentDocPane, TQT_SIGNAL(openFile(const TQString&)), this, TQT_SIGNAL(openExistingFile(const TQString&))); - TQListViewItem* item = addPane(i18n("Recent Documents"), "fileopen", recentDocPane, 0); + TQListViewItem* item = addPane(i18n("Recent Documents"), "document-open", recentDocPane, 0); connect(recentDocPane, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList&)), this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList&))); connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList&)), diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index bb58686cd..1e1a26608 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -50,7 +50,7 @@ KoInsertLinkDia::KoInsertLinkDia( TQWidget *parent, const char *name, bool displ mailLink = new mailLinkPage(page ); connect(mailLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); - page=addVBoxPage(i18n("File"), TQString(),BarIcon("filenew",TDEIcon::SizeMedium)); + page=addVBoxPage(i18n("File"), TQString(),BarIcon("document-new",TDEIcon::SizeMedium)); fileLink = new fileLinkPage(page ); connect(fileLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index 0033ca2d9..cb418650e 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -430,7 +430,7 @@ void KoTemplateCreateDia::slotRemove() { } if(KMessageBox::warningContinueCancel(this, what, - removed,KGuiItem(i18n("&Delete"),"editdelete"))==KMessageBox::Cancel) { + removed,KGuiItem(i18n("&Delete"),"edit-delete"))==KMessageBox::Cancel) { d->m_name->setFocus(); return; } diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 7aea9b3a0..e2e063ca8 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -139,13 +139,13 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "exec", TDEIcon::MainToolbar, 16 )); connect(btnExec, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); - btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileopen", TDEIcon::MainToolbar, 16 )); + btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "document-open", TDEIcon::MainToolbar, 16 )); connect(btnLoad, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript())); - btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", TDEIcon::MainToolbar, 16 )); + btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 )); connect(btnUnload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript())); btnInstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileimport", TDEIcon::MainToolbar, 16 )); connect(btnInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript())); - btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", TDEIcon::MainToolbar, 16 )); + btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 )); connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript())); #ifdef KROSS_SUPPORT_NEWSTUFF btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 )); @@ -157,14 +157,14 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con toolBar->insertButton("exec", WdgScriptsManagerPrivate::ExecBtn, false, i18n("Execute")); toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); toolBar->insertLineSeparator(); - toolBar->insertButton("fileopen", WdgScriptsManagerPrivate::LoadBtn, true, i18n("Load")); + toolBar->insertButton("document-open", WdgScriptsManagerPrivate::LoadBtn, true, i18n("Load")); toolBar->addConnection(WdgScriptsManagerPrivate::LoadBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript())); - toolBar->insertButton("fileclose", WdgScriptsManagerPrivate::UnloadBtn, false, i18n("Unload")); + toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UnloadBtn, false, i18n("Unload")); toolBar->addConnection(WdgScriptsManagerPrivate::UnloadBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript())); toolBar->insertLineSeparator(); toolBar->insertButton("fileimport", WdgScriptsManagerPrivate::InstallBtn, true, i18n("Install")); toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript())); - toolBar->insertButton("fileclose", WdgScriptsManagerPrivate::UninstallBtn, false, i18n("Uninstall")); + toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UninstallBtn, false, i18n("Uninstall")); toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript())); #ifdef KROSS_SUPPORT_NEWSTUFF toolBar->insertLineSeparator();