diff options
Diffstat (limited to 'kexi/main')
-rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 14 | ||||
-rw-r--r-- | kexi/main/printing/kexisimpleprintingpagesetup.cpp | 2 | ||||
-rw-r--r-- | kexi/main/printing/kexisimpleprintingpart.cpp | 2 | ||||
-rw-r--r-- | kexi/main/printing/kexisimpleprintpreviewwindow.cpp | 2 | ||||
-rw-r--r-- | kexi/main/startup/KexiConnSelector.cpp | 2 | ||||
-rw-r--r-- | kexi/main/startup/KexiNewProjectWizard.cpp | 2 | ||||
-rw-r--r-- | kexi/main/startup/KexiProjectSelector.cpp | 2 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartup.cpp | 2 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartupDialog.cpp | 2 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartupFileDialog_win.cpp | 4 |
10 files changed, 17 insertions, 17 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 69ac854b..1201a79c 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( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ), - 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 35f8aa31..294b7c0a 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 048f92ae..8634b06a 100644 --- a/kexi/main/printing/kexisimpleprintingpart.cpp +++ b/kexi/main/printing/kexisimpleprintingpart.cpp @@ -29,7 +29,7 @@ #include <kexipartinfo.h> 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 0e1b7748..6ddb1951 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 1c46a046..25305e1a 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 e479d1bb..38b5fd1e 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 76299637..b887cdfd 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 d54a9d12..66acc0eb 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 f0b9a0e9..5aebe3b1 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 08e24207..1432ac3c 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() ); |