| d504497c | 2014-10-13 15:43:48 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
|
M chalk/ui/kis_layerbox.cc M chalk/ui/kis_layerlist.cc M chalk/ui/kis_view.cc M chalk/ui/layerlist.cpp M example/example_view.cc M karbon/commands/vdeletecmd.cc M karbon/karbon_view.cc M kexi/formeditor/connectiondialog.cpp M kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp M kexi/formeditor/test/kfd_part.cpp M kexi/kexidb/drivers/sqlite/sqliteconnection.cpp M kexi/kexidb/utils.cpp M kexi/kexidb/utils.h M kexi/kexiutils/debuggui.cpp M kexi/main/keximainwindowimpl.cpp M kexi/main/printing/kexisimpleprintingpagesetup.cpp M kexi/main/printing/kexisimpleprintingpart.cpp M kexi/main/printing/kexisimpleprintpreviewwindow.cpp M kexi/main/startup/KexiConnSelector.cpp M kexi/main/startup/KexiNewProjectWizard.cpp M kexi/main/startup/KexiProjectSelector.cpp M kexi/main/startup/KexiStartup.cpp M kexi/main/startup/KexiStartupDialog.cpp M kexi/main/startup/KexiStartupFileDialog_win.cpp M kexi/plugins/forms/kexiactionselectiondialog.cpp M kexi/plugins/forms/kexiformpart.cpp M kexi/plugins/importexport/csv/kexicsvexportwizard.cpp M kexi/plugins/importexport/csv/kexicsvimportdialog.cpp M kexi/plugins/queries/kexiquerydesignersql.cpp M kexi/plugins/queries/kexiquerydesignersqlhistory.cpp M kexi/plugins/tables/kexitablepart.cpp M kexi/widget/kexibrowser.cpp M kexi/widget/kexidbconnectionwidget.cpp M kexi/widget/pixmapcollection.cpp M kexi/widget/relations/kexirelationview.cpp M kexi/widget/relations/kexirelationwidget.cpp M kexi/widget/tableview/kexidataawareobjectiface.cpp M kexi/widget/utils/kexicontextmenuutils.cpp M kivio/kiviopart/kivio_view.cpp M koshell/koshell_shell.cc M kplato/kptview.cc M kpresenter/KPrView.cpp M kspread/dialogs/kspread_dlg_preference.cc M kspread/dialogs/link.cc M kspread/kspread_view.cc M kugar/kudesigner/kudesigner_view.cpp M kword/KWDeleteDia.cpp M kword/KWView.cpp M lib/kofficecore/KoDetailsPane.cpp M lib/kofficecore/KoMainWindow.cpp M lib/kofficecore/KoOpenPane.cpp M lib/kofficeui/KoInsertLink.cpp M lib/kofficeui/KoTemplateCreateDia.cpp M lib/kross/main/wdgscriptsmanager.cpp |
||
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index ba5fe21..058eb2f 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -120,7 +120,7 @@
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 7bb0b33..bfae828 100644
--- a/chalk/ui/kis_layerlist.cc
+++ b/chalk/ui/kis_layerlist.cc
@@ -61,11 +61,11 @@
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 569188d..59da518 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -640,7 +640,7 @@
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 bb82396..7f7b118 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -735,12 +735,12 @@
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 e681bdb..1a8e07e 100644
--- a/example/example_view.cc
+++ b/example/example_view.cc
@@ -39,7 +39,7 @@
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 997a7cc..2cd6a71 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, 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 115bbf6..3fc8eaf 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -1002,7 +1002,7 @@
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 8376beb..0ddb7af 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -78,12 +78,12 @@
//// 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 15bb1a2..2dcf57b 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -208,9 +208,9 @@
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 401bfd2..913ec05 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -212,9 +212,9 @@
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 cf478b9..0be5b74 100644
--- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
@@ -205,7 +205,7 @@
+ 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 edb472a..4baa0d8 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -1032,7 +1032,7 @@
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 e535cd4..606e41a 100644
--- a/kexi/kexidb/utils.h
+++ b/kexi/kexidb/utils.h
@@ -379,7 +379,7 @@
"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 08884ff..ec9edfb 100644
--- a/kexi/kexiutils/debuggui.cpp
+++ b/kexi/kexiutils/debuggui.cpp
@@ -97,7 +97,7 @@
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 69ac854..1201a79 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -524,7 +524,7 @@
// 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 @@
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 @@
d->action_project_properties = d->dummy_action;
#endif
- d->action_close = new TDEAction(i18n("&Close Project"), "fileclose", 0,
** Diff limit reached (max: 250 lines) **
|
||