| 3a347442 | 2014-10-13 15:43:59 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
|
M kimagemapeditor/kimagemapeditor.cpp M kimagemapeditor/kimedialogs.cpp M klinkstatus/src/actionmanager.cpp M klinkstatus/src/ui/sessionwidget.cpp M klinkstatus/src/ui/tablelinkstatus.cpp M klinkstatus/src/ui/treeview.cpp M kommander/editor/messagelog.cpp M kommander/editor/propertyeditor.cpp M kommander/editor/workspace.cpp M kommander/pluginmanager/mainwindow.cpp M kommander/widgets/fileselector.cpp M lib/compatibility/tdemdi/qextmdi/ktabbar.cpp M lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp M quanta/components/csseditor/tlpeditors.cpp M quanta/components/debugger/debuggerbreakpointview.cpp M quanta/components/debugger/variableslistview.cpp M quanta/dialogs/tagdialogs/tagimgdlgdata.cpp M quanta/messages/messageoutput.cpp M quanta/project/projectprivate.cpp M quanta/src/quanta_init.cpp M quanta/src/quantaview.cpp M quanta/src/viewmanager.cpp M quanta/treeviews/basetreeview.cpp M quanta/treeviews/filestreeview.cpp M quanta/treeviews/projecttreeview.cpp M quanta/treeviews/servertreeview.cpp M quanta/treeviews/structtreeview.cpp M quanta/treeviews/tagattributetree.cpp M quanta/treeviews/templatestreeview.cpp M tdefilereplace/knewprojectdlg.cpp M tdefilereplace/tdefilereplacepart.cpp M tdefilereplace/tdefilereplaceview.cpp |
||
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 231bf8e..804e67a 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -432,7 +432,7 @@
{
// File Open
TDEAction *temp=KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
- TQMimeSourceFactory::defaultFactory()->setPixmap( "openimage", SmallIcon("fileopen") );
+ TQMimeSourceFactory::defaultFactory()->setPixmap( "openimage", SmallIcon("document-open") );
temp->setWhatsThis(i18n("<h3>Open File</h3>Click this to <em>open</em> a new picture or HTML file."));
temp->setToolTip(i18n("Open new picture or HTML file"));
@@ -441,7 +441,7 @@
actionCollection());
// File Save
temp =KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
- TQMimeSourceFactory::defaultFactory()->setPixmap( "saveimage", SmallIcon("filesave") );
+ TQMimeSourceFactory::defaultFactory()->setPixmap( "saveimage", SmallIcon("document-save") );
temp->setWhatsThis(i18n("<h3>Save File</h3>Click this to <em>save</em> the changes to the HTML file."));
temp->setToolTip(i18n("Save HTML file"));
@@ -451,36 +451,36 @@
// File Close
temp=KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection());
- TQMimeSourceFactory::defaultFactory()->setPixmap( "closeimage", SmallIcon("fileclose") );
+ TQMimeSourceFactory::defaultFactory()->setPixmap( "closeimage", SmallIcon("window-close") );
temp->setWhatsThis(i18n("<h3>Close File</h3>Click this to <em>close</em> the currently open HTML file."));
temp->setToolTip(i18n("Close HTML file"));
// Edit Copy
copyAction=KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection());
- TQMimeSourceFactory::defaultFactory()->setPixmap( "editcopyimage", SmallIcon("editcopy") );
+ TQMimeSourceFactory::defaultFactory()->setPixmap( "editcopyimage", SmallIcon("edit-copy") );
copyAction->setWhatsThis(i18n("<h3>Copy</h3>"
"Click this to <em>copy</em> the selected area."));
copyAction->setEnabled(false);
// Edit Cut
cutAction=KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection());
- TQMimeSourceFactory::defaultFactory()->setPixmap( "editcutimage", SmallIcon("editcut") );
+ TQMimeSourceFactory::defaultFactory()->setPixmap( "editcutimage", SmallIcon("edit-cut") );
cutAction->setWhatsThis(i18n("<h3>Cut</h3>"
"Click this to <em>cut</em> the selected area."));
cutAction->setEnabled(false);
// Edit Paste
pasteAction=KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection());
- TQMimeSourceFactory::defaultFactory()->setPixmap( "editpasteimage", SmallIcon("editpaste") );
+ TQMimeSourceFactory::defaultFactory()->setPixmap( "editpasteimage", SmallIcon("edit-paste") );
pasteAction->setWhatsThis(i18n("<h3>Paste</h3>"
"Click this to <em>paste</em> the copied area."));
pasteAction->setEnabled(false);
// Edit Delete
- deleteAction=new TDEAction(i18n("&Delete"), "editdelete",
+ deleteAction=new TDEAction(i18n("&Delete"), "edit-delete",
Key_Delete,this,TQT_SLOT (slotDelete()),actionCollection(), "edit_delete");
- TQMimeSourceFactory::defaultFactory()->setPixmap( "editdeleteimage", SmallIcon("editdelete") );
+ TQMimeSourceFactory::defaultFactory()->setPixmap( "editdeleteimage", SmallIcon("edit-delete") );
deleteAction->setWhatsThis(i18n("<h3>Delete</h3>"
"Click this to <em>delete</em> the selected area."));
deleteAction->setEnabled(false);
@@ -2584,7 +2584,7 @@
int result = KMessageBox::warningContinueCancel(widget(),
i18n("<qt>Are you sure you want to delete the map <i>%1</i>?"
" <br><b>There is no way to undo this.</b></qt>").arg(selectedMap),
- i18n("Delete Map?"),KGuiItem(i18n("&Delete"),"editdelete"));
+ i18n("Delete Map?"),KGuiItem(i18n("&Delete"),"edit-delete"));
if (result == KMessageBox::No)
return;
diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp
index d541b14..2b7b92b 100644
--- a/kimagemapeditor/kimedialogs.cpp
+++ b/kimagemapeditor/kimedialogs.cpp
@@ -328,7 +328,7 @@
TQHBox *hbox= new TQHBox(page);
hrefEdit = new TQLineEdit(area->attribute("href"),hbox);
TQPushButton *btn = new TQPushButton("",hbox);
- btn->setPixmap(SmallIcon("fileopen"));
+ btn->setPixmap(SmallIcon("document-open"));
connect( btn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooseHref()));
hbox->setMinimumHeight(hbox->height());
diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index 8eb08a6..98dff74 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -87,17 +87,17 @@
// *************** File menu *********************
- new TDEAction(i18n("New Link Check"), "filenew",
+ new TDEAction(i18n("New Link Check"), "document-new",
0,
d->part, TQT_SLOT(slotNewLinkCheck()),
TQT_TQOBJECT(d->actionCollection), "new_link_check");
- new TDEAction(i18n("Open URL..."), "fileopen",
+ new TDEAction(i18n("Open URL..."), "document-open",
0,
d->part, TQT_SLOT(slotOpenLink()),
TQT_TQOBJECT(d->actionCollection), "open_link");
- action = new TDEAction(i18n("Close Tab"), "fileclose",
+ action = new TDEAction(i18n("Close Tab"), "window-close",
0,
d->part, TQT_SLOT(slotClose()),
TQT_TQOBJECT(d->actionCollection), "close_tab");
@@ -132,7 +132,7 @@
// *************** File menu *********************
- TDEAction* action = new TDEAction(i18n("E&xport Results as HTML..."), "filesave", 0,
+ TDEAction* action = new TDEAction(i18n("E&xport Results as HTML..."), "document-save", 0,
TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotExportAsHTML()),
TQT_TQOBJECT(d->actionCollection), "file_export_html");
action->setEnabled(false);
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index e9821ee..a3dc0e2 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -104,8 +104,8 @@
toolButton_clear_combo->setIconSet(SmallIconSet("locationbar_erase"));
- pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("fileopen", TDEIcon::Small));
- TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::Small);
+ pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("document-open", TDEIcon::Small));
+ TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("document-open", TDEIcon::Small);
pushbutton_url->setFixedSize(pixMap.width() + 8, pixMap.height() + 8);
connect(pushbutton_url, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChooseUrlDialog()));
diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp
index fc8067a..4a886e1 100644
--- a/klinkstatus/src/ui/tablelinkstatus.cpp
+++ b/klinkstatus/src/ui/tablelinkstatus.cpp
@@ -283,30 +283,30 @@
}
connect(sub_menu_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEditReferrerWithQuanta(int)));
- context_table_menu_.insertItem(SmallIconSet("fileopen"), i18n("Edit Referrer with Quanta"),
+ context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Edit Referrer with Quanta"),
sub_menu_);
}
else
{
- int id = context_table_menu_.insertItem(SmallIconSet("fileopen"), i18n("Edit Referrer with Quanta"));
+ int id = context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Edit Referrer with Quanta"));
context_table_menu_.setItemEnabled(id, false);
}
- context_table_menu_.insertItem(SmallIconSet("fileopen"), i18n("Open URL"),
+ context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open URL"),
this, TQT_SLOT(slotViewUrlInBrowser()));
- context_table_menu_.insertItem(SmallIconSet("fileopen"), i18n("Open Referrer URL"),
+ context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open Referrer URL"),
this, TQT_SLOT(slotViewParentUrlInBrowser()));
context_table_menu_.insertSeparator();
- context_table_menu_.insertItem(SmallIconSet("editcopy"), i18n("Copy URL"),
+ context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy URL"),
this, TQT_SLOT(slotCopyUrlToClipboard()));
- context_table_menu_.insertItem(SmallIconSet("editcopy"), i18n("Copy Referrer URL"),
+ context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy Referrer URL"),
this, TQT_SLOT(slotCopyParentUrlToClipboard()));
- context_table_menu_.insertItem(SmallIconSet("editcopy"), i18n("Copy Cell Text"),
+ context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy Cell Text"),
this, TQT_SLOT(slotCopyCellTextToClipboard()));
}
diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp
index e869e1e..c14a082 100644
--- a/klinkstatus/src/ui/treeview.cpp
+++ b/klinkstatus/src/ui/treeview.cpp
@@ -360,25 +360,25 @@
}
else
{
- int id = context_table_menu_.insertItem(SmallIconSet("fileopen"), i18n("Edit Referrer with Quanta"));
+ int id = context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Edit Referrer with Quanta"));
context_table_menu_.setItemEnabled(id, false);
}
- context_table_menu_.insertItem(SmallIconSet("fileopen"), i18n("Open URL"),
+ context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open URL"),
this, TQT_SLOT(slotViewUrlInBrowser()));
- context_table_menu_.insertItem(/*SmallIconSet("fileopen"), */i18n("Open Referrer URL"),
+ context_table_menu_.insertItem(/*SmallIconSet("document-open"), */i18n("Open Referrer URL"),
this, TQT_SLOT(slotViewParentUrlInBrowser()));
context_table_menu_.insertSeparator();
- context_table_menu_.insertItem(SmallIconSet("editcopy"), i18n("Copy URL"),
+ context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy URL"),
this, TQT_SLOT(slotCopyUrlToClipboard()));
- context_table_menu_.insertItem(/*SmallIconSet("editcopy"), */i18n("Copy Referrer URL"),
+ context_table_menu_.insertItem(/*SmallIconSet("edit-copy"), */i18n("Copy Referrer URL"),
this, TQT_SLOT(slotCopyParentUrlToClipboard()));
- context_table_menu_.insertItem(/*SmallIconSet("editcopy"), */i18n("Copy Cell Text"),
+ context_table_menu_.insertItem(/*SmallIconSet("edit-copy"), */i18n("Copy Cell Text"),
this, TQT_SLOT(slotCopyCellTextToClipboard()));
}
@@ -591,7 +591,7 @@
else if(linkStatus()->status() == LinkStatus::HTTP_SERVER_ERROR)
return SmallIcon("no");
else if(linkStatus()->status() == LinkStatus::MALFORMED)
- return SmallIcon("editdelete");
+ return SmallIcon("edit-delete");
else if(linkStatus()->status() == LinkStatus::NOT_SUPPORTED)
return SmallIcon("help");
else if(linkStatus()->status() == LinkStatus::SUCCESSFULL)
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index 3163016..e6d13a2 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -31,11 +31,11 @@
MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name)
{
m_popupMenu = new TDEPopupMenu(this);
- m_popupMenu->insertItem(SmallIconSet("editcopy"), i18n("Copy Current &Line"), this, TQT_SLOT(copyLine()));
- m_popupMenu->insertItem(SmallIconSet("editcopy"), i18n("&Copy Content"), this, TQT_SLOT(copyContent()));
- m_popupMenu->insertItem(SmallIconSet("filesaveas"), i18n("&Save As..."), this, TQT_SLOT(saveToFile()));
+ m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("Copy Current &Line"), this, TQT_SLOT(copyLine()));
+ m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("&Copy Content"), this, TQT_SLOT(copyContent()));
+ m_popupMenu->insertItem(SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveToFile()));
m_popupMenu->insertSeparator();
- m_popupMenu->insertItem(SmallIconSet("editclear"), i18n("Clear"), this, TQT_SLOT(clearContent()));
+ m_popupMenu->insertItem(SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clearContent()));
for (int i = 0; i < m_listCount; i++)
{
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 4893ee8..f105a4e 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -3392,8 +3392,8 @@
TQPopupMenu menu;
const int NEW_ITEM = 1;
** Diff limit reached (max: 250 lines) **
|
||