Browse Source

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

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
d504497c10
54 changed files with 94 additions and 94 deletions
  1. +1
    -1
      chalk/ui/kis_layerbox.cc
  2. +2
    -2
      chalk/ui/kis_layerlist.cc
  3. +1
    -1
      chalk/ui/kis_view.cc
  4. +2
    -2
      chalk/ui/layerlist.cpp
  5. +1
    -1
      example/example_view.cc
  6. +2
    -2
      karbon/commands/vdeletecmd.cc
  7. +1
    -1
      karbon/karbon_view.cc
  8. +2
    -2
      kexi/formeditor/connectiondialog.cpp
  9. +3
    -3
      kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
  10. +3
    -3
      kexi/formeditor/test/kfd_part.cpp
  11. +1
    -1
      kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
  12. +1
    -1
      kexi/kexidb/utils.cpp
  13. +1
    -1
      kexi/kexidb/utils.h
  14. +1
    -1
      kexi/kexiutils/debuggui.cpp
  15. +7
    -7
      kexi/main/keximainwindowimpl.cpp
  16. +1
    -1
      kexi/main/printing/kexisimpleprintingpagesetup.cpp
  17. +1
    -1
      kexi/main/printing/kexisimpleprintingpart.cpp
  18. +1
    -1
      kexi/main/printing/kexisimpleprintpreviewwindow.cpp
  19. +1
    -1
      kexi/main/startup/KexiConnSelector.cpp
  20. +1
    -1
      kexi/main/startup/KexiNewProjectWizard.cpp
  21. +1
    -1
      kexi/main/startup/KexiProjectSelector.cpp
  22. +1
    -1
      kexi/main/startup/KexiStartup.cpp
  23. +1
    -1
      kexi/main/startup/KexiStartupDialog.cpp
  24. +2
    -2
      kexi/main/startup/KexiStartupFileDialog_win.cpp
  25. +4
    -4
      kexi/plugins/forms/kexiactionselectiondialog.cpp
  26. +1
    -1
      kexi/plugins/forms/kexiformpart.cpp
  27. +1
    -1
      kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
  28. +1
    -1
      kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
  29. +2
    -2
      kexi/plugins/queries/kexiquerydesignersql.cpp
  30. +2
    -2
      kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
  31. +1
    -1
      kexi/plugins/tables/kexitablepart.cpp
  32. +6
    -6
      kexi/widget/kexibrowser.cpp
  33. +3
    -3
      kexi/widget/kexidbconnectionwidget.cpp
  34. +1
    -1
      kexi/widget/pixmapcollection.cpp
  35. +1
    -1
      kexi/widget/relations/kexirelationview.cpp
  36. +1
    -1
      kexi/widget/relations/kexirelationwidget.cpp
  37. +1
    -1
      kexi/widget/tableview/kexidataawareobjectiface.cpp
  38. +2
    -2
      kexi/widget/utils/kexicontextmenuutils.cpp
  39. +2
    -2
      kivio/kiviopart/kivio_view.cpp
  40. +2
    -2
      koshell/koshell_shell.cc
  41. +1
    -1
      kplato/kptview.cc
  42. +3
    -3
      kpresenter/KPrView.cpp
  43. +1
    -1
      kspread/dialogs/kspread_dlg_preference.cc
  44. +1
    -1
      kspread/dialogs/link.cc
  45. +2
    -2
      kspread/kspread_view.cc
  46. +1
    -1
      kugar/kudesigner/kudesigner_view.cpp
  47. +1
    -1
      kword/KWDeleteDia.cpp
  48. +2
    -2
      kword/KWView.cpp
  49. +1
    -1
      lib/kofficecore/KoDetailsPane.cpp
  50. +1
    -1
      lib/kofficecore/KoMainWindow.cpp
  51. +2
    -2
      lib/kofficecore/KoOpenPane.cpp
  52. +1
    -1
      lib/kofficeui/KoInsertLink.cpp
  53. +1
    -1
      lib/kofficeui/KoTemplateCreateDia.cpp
  54. +6
    -6
      lib/kross/main/wdgscriptsmanager.cpp

+ 1
- 1
chalk/ui/kis_layerbox.cc View File

@@ -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) );


+ 2
- 2
chalk/ui/kis_layerlist.cc View File

@@ -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" ) );


+ 1
- 1
chalk/ui/kis_view.cc View File

@@ -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");



+ 2
- 2
chalk/ui/layerlist.cpp View File

@@ -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 );
}



+ 1
- 1
example/example_view.cc View File

@@ -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");
}



+ 2
- 2
karbon/commands/vdeletecmd.cc View File

@@ -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 );


+ 1
- 1
karbon/karbon_view.cc View File

@@ -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),


+ 2
- 2
kexi/formeditor/connectiondialog.cpp View File

@@ -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()));


+ 3
- 3
kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp View File

@@ -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");


+ 3
- 3
kexi/formeditor/test/kfd_part.cpp View File

@@ -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");


+ 1
- 1
kexi/kexidb/drivers/sqlite/sqliteconnection.cpp View File

@@ -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();


+ 1
- 1
kexi/kexidb/utils.cpp View File

@@ -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;


+ 1
- 1
kexi/kexidb/utils.h View File

@@ -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. */


+ 1
- 1
kexi/kexiutils/debuggui.cpp View File

@@ -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);


+ 7
- 7
kexi/main/keximainwindowimpl.cpp View File

@@ -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;
}



+ 1
- 1
kexi/main/printing/kexisimpleprintingpagesetup.cpp View File

@@ -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()));



+ 1
- 1
kexi/main/printing/kexisimpleprintingpart.cpp View File

@@ -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;


+ 1
- 1
kexi/main/printing/kexisimpleprintpreviewwindow.cpp View File

@@ -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;


+ 1
- 1
kexi/main/startup/KexiConnSelector.cpp View File

@@ -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;


+ 1
- 1
kexi/main/startup/KexiNewProjectWizard.cpp View File

@@ -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"));



+ 1
- 1
kexi/main/startup/KexiProjectSelector.cpp View File

@@ -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;


+ 1
- 1
kexi/main/startup/KexiStartup.cpp View File

@@ -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()


+ 1
- 1
kexi/main/startup/KexiStartupDialog.cpp View File

@@ -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);
}


+ 2
- 2
kexi/main/startup/KexiStartupFileDialog_win.cpp View File

@@ -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() );


+ 4
- 4
kexi/plugins/forms/kexiactionselectiondialog.cpp View File

@@ -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();
}



+ 1
- 1
kexi/plugins/forms/kexiformpart.cpp View File

@@ -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");


+ 1
- 1
kexi/plugins/importexport/csv/kexicsvexportwizard.cpp View File

@@ -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"),


+ 1
- 1
kexi/plugins/importexport/csv/kexicsvimportdialog.cpp View File

@@ -358,7 +358,7 @@ if ( m_mode == Clipboard )
}

if (m_mode==Clipboard) {
m_infoLbl->setIcon("editpaste");
m_infoLbl->setIcon("edit-paste");
}
//updateRowCountInfo();



+ 2
- 2
kexi/plugins/queries/kexiquerydesignersql.cpp View File

@@ -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;


+ 2
- 2
kexi/plugins/queries/kexiquerydesignersqlhistory.cpp View File

@@ -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


+ 1
- 1
kexi/plugins/tables/kexitablepart.cpp View File

@@ -188,7 +188,7 @@ tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *parent, K
int r = KMessageBox::questionYesNo(parent,
"<p>"+msg+"</p><p>"+openedObjectsStr+"</p><p>"
+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


+ 6
- 6
kexi/widget/kexibrowser.cpp View File

@@ -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"));
}


+ 3
- 3
kexi/widget/kexidbconnectionwidget.cpp View File

@@ -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
)
{


+ 1
- 1
kexi/widget/pixmapcollection.cpp View File

@@ -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);


+ 1
- 1
kexi/widget/relations/kexirelationview.cpp View File

@@ -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");


+ 1
- 1
kexi/widget/relations/kexirelationwidget.cpp View File

@@ -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(),


+ 1
- 1
kexi/widget/tableview/kexidataawareobjectiface.cpp View File

@@ -1210,7 +1210,7 @@ void KexiDataAwareObjectInterface::deleteCurrentRow()
case AskDelete:
if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(dynamic_cast<TQWidget*>(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;


+ 2
- 2
kexi/widget/utils/kexicontextmenuutils.cpp View File

@@ -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


+ 2
- 2
kivio/kiviopart/kivio_view.cpp View File

@@ -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;


+ 2
- 2
koshell/koshell_shell.cc View File

@@ -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];


+ 1
- 1
kplato/kptview.cc View File

@@ -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),


+ 3
- 3
kpresenter/KPrView.cpp View File

@@ -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",


+ 1
- 1
kspread/dialogs/kspread_dlg_preference.cc View File

@@ -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) );


+ 1
- 1
kspread/dialogs/link.cc View File

@@ -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 );


+ 2
- 2
kspread/kspread_view.cc View File

@@ -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 )
{


+ 1
- 1
kugar/kudesigner/kudesigner_view.cpp View File

@@ -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 );


+ 1
- 1
kword/KWDeleteDia.cpp View File

@@ -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.")) );
}


+ 2
- 2
kword/KWView.cpp View File

@@ -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)


+ 1
- 1
lib/kofficecore/KoDetailsPane.cpp View File

@@ -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();


+ 1
- 1
lib/kofficecore/KoMainWindow.cpp View File

@@ -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") );



+ 2
- 2
lib/kofficecore/KoOpenPane.cpp View File

@@ -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<int>&)),
this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)));
connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)),


+ 1
- 1
lib/kofficeui/KoInsertLink.cpp View File

@@ -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 ()));



+ 1
- 1
lib/kofficeui/KoTemplateCreateDia.cpp View File

@@ -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;
}


+ 6
- 6
lib/kross/main/wdgscriptsmanager.cpp View File

@@ -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();


Loading…
Cancel
Save