diff options
32 files changed, 106 insertions, 106 deletions
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 231bf8ed..804e67ae 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -432,7 +432,7 @@ void KImageMapEditor::setupActions() { // 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 @@ void KImageMapEditor::setupActions() 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 @@ void KImageMapEditor::setupActions() // 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 @@ void KImageMapEditor::mapDelete() 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 d541b142..2b7b92bb 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -328,7 +328,7 @@ TQWidget* AreaDialog::createGeneralPage() 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 8eb08a60..98dff74b 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -87,17 +87,17 @@ void ActionManager::initPart(KLinkStatusPart* part) // *************** 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 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession) // *************** 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 e9821eeb..a3dc0e25 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -104,8 +104,8 @@ void SessionWidget::init() 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 fc8067a1..4a886e1d 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -283,30 +283,30 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> const& referrers, } 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 e869e1e0..c14a0824 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -360,25 +360,25 @@ void TreeView::loadContextTableMenu(TQValueVector<KURL> const& referrers, bool i } 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 @@ TQPixmap TreeColumnViewItem::pixmap(int column) const 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 3163016a..e6d13a21 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 4893ee80..f105a4e8 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -3392,8 +3392,8 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) TQPopupMenu menu; const int NEW_ITEM = 1; const int DEL_ITEM = 2; - menu.insertItem( PixmapChooser::loadPixmap( "filenew" ), i18n("New Signal Handler" ), NEW_ITEM ); - menu.insertItem( PixmapChooser::loadPixmap( "editcut" ), i18n("Delete Signal Handler" ), DEL_ITEM ); + menu.insertItem( PixmapChooser::loadPixmap( "document-new" ), i18n("New Signal Handler" ), NEW_ITEM ); + menu.insertItem( PixmapChooser::loadPixmap( "edit-cut" ), i18n("Delete Signal Handler" ), DEL_ITEM ); int res = menu.exec( pos ); if ( res == NEW_ITEM ) { TQString s; diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp index b7e2943a..a14eac60 100644 --- a/kommander/editor/workspace.cpp +++ b/kommander/editor/workspace.cpp @@ -660,14 +660,14 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) case WorkspaceItem::SourceFileType: menu.insertItem( i18n("&Open Source File..." ), OPEN_SOURCE ); menu.insertSeparator(); - menu.insertItem( PixmapChooser::loadPixmap( "editcut" ), + menu.insertItem( PixmapChooser::loadPixmap( "edit-cut" ), i18n("&Remove Source File From Project" ), REMOVE_SOURCE ); break; #endif case WorkspaceItem::FormFileType: menu.insertItem( i18n("&Open Form..." ), OPEN_FORM ); menu.insertSeparator(); - menu.insertItem( PixmapChooser::loadPixmap( "editcut" ), + menu.insertItem( PixmapChooser::loadPixmap( "edit-cut" ), #ifndef KOMMANDER i18n("&Remove Form From Project" ), REMOVE_FORM ); #else @@ -677,7 +677,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) case WorkspaceItem::FormSourceType: menu.insertItem( i18n("&Open Form Source..." ), OPEN_FORM_SOURCE ); menu.insertSeparator(); - menu.insertItem( PixmapChooser::loadPixmap( "editcut" ), + menu.insertItem( PixmapChooser::loadPixmap( "edit-cut" ), #ifndef KOMMANDER i18n("&Remove Form From Project" ), REMOVE_FORM ); #else diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp index 1f07af77..dd196043 100644 --- a/kommander/pluginmanager/mainwindow.cpp +++ b/kommander/pluginmanager/mainwindow.cpp @@ -32,7 +32,7 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) : TDEMainWindow( parent, name, f ) { TDEToolBar *toolBar = new TDEToolBar( this ); - toolBar->insertButton("fileopen", Add, true, i18n("Add") ); + toolBar->insertButton("document-open", Add, true, i18n("Add") ); toolBar->insertButton("no", Remove, true, i18n("Remove") ); toolBar->insertButton("reload", Refresh, true, i18n("Refresh") ); connect( toolBar, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(toolButton(int)) ); diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp index 8f67e346..9d6869a7 100644 --- a/kommander/widgets/fileselector.cpp +++ b/kommander/widgets/fileselector.cpp @@ -44,7 +44,7 @@ FileSelector::FileSelector(TQWidget * a_parent, const char *a_name) m_lineEdit = new KLineEdit(this); - m_selectButton = new KPushButton(BarIconSet("fileopen"), "", this); + m_selectButton = new KPushButton(BarIconSet("document-open"), "", this); m_boxLayout = new TQHBoxLayout(this, 0, 11); m_boxLayout->addWidget(m_lineEdit); diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp index 625fab54..fff6b2c1 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp @@ -190,7 +190,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } mHoverCloseButton = new TQPushButton( this ); - mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, TDEIcon::SizeSmall) ); + mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("window-close", TDEIcon::Toolbar, TDEIcon::SizeSmall) ); mHoverCloseButton->setGeometry( rect ); TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); mHoverCloseButton->setFlat(true); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp index 8108bd75..62a973d9 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp @@ -143,7 +143,7 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) ); TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) ); - m_pIconButtonPixmap = new TQPixmap( SmallIcon( "filenew" ) ); + m_pIconButtonPixmap = new TQPixmap( SmallIcon( "document-new" ) ); if ( m_pIconButtonPixmap->isNull() ) * m_pIconButtonPixmap = TQPixmap( filenew ); diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp index e5c3c2ff..678ba827 100644 --- a/quanta/components/csseditor/tlpeditors.cpp +++ b/quanta/components/csseditor/tlpeditors.cpp @@ -70,7 +70,7 @@ URIEditor::URIEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name TQString whatsthis =i18n("With this line edit you can insert the URI of the resource you want to reach"); setWhatsThis(whatsthis); setLabelText(" Uri :"); - setButtonIcon("fileopen"); + setButtonIcon("document-open"); setToolTip(i18n("Open the URI selector")); connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFileDialog())); diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index d36fecf8..7cb4c097 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -67,7 +67,7 @@ DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *nam setAllColumnsShowFocus(true); m_breakpointPopup = new TDEPopupMenu(this); - m_breakpointPopup->insertItem(SmallIcon("editdelete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected())); + m_breakpointPopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected())); connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 4799afe4..9624416f 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -60,14 +60,14 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name) setSorting(-1); // No sorting m_variablePopup = new TDEPopupMenu(this); - m_variablePopup->insertItem(SmallIcon("editdelete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch); + m_variablePopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch); if(quantaApp->debugger()->client()->supports(DebuggerClientCapabilities::VariableSetValue)) m_variablePopup->insertItem(SmallIcon("edit"), i18n("&Set Value"), this, TQT_SLOT(slotVariableSetValue()), 0, setValue); m_variablePopup->insertItem(SmallIcon("viewmag"), i18n("&Dump in Messages Log"), this, TQT_SLOT(slotVariableDump()), 0, dumpValue); - m_variablePopup->insertItem(SmallIcon("editcopy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue); + m_variablePopup->insertItem(SmallIcon("edit-copy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue); connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); } diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp index 97c82811..d20ab7cd 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp @@ -123,7 +123,7 @@ void TagImgDlg::initDialog(){ widgetImg= new PictureView(this); grid->addMultiCellWidget(widgetImg, 5, 10, 0, 4); - buttonImgSource->setPixmap( SmallIcon("fileopen") ); + buttonImgSource->setPixmap( SmallIcon("document-open") ); buttonRecalcImgSize->setPixmap( SmallIcon("reload") ); } diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 05fad523..06625c74 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -46,10 +46,10 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name ) m_popupMenu = new TDEPopupMenu(this); connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); - m_popupMenu->insertItem( SmallIconSet("editcopy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ; - m_popupMenu->insertItem( SmallIconSet("filesaveas"), i18n("&Save As..."), this, TQT_SLOT(saveContent()) ) ; + m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ; + m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveContent()) ) ; m_popupMenu->insertSeparator(); - m_popupMenu->insertItem( SmallIconSet("editclear"), i18n("Clear"), this, TQT_SLOT(clear()) ) ; + m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clear()) ) ; connect( this, TQT_SIGNAL(clicked(TQListBoxItem*)), TQT_SLOT(clickItem(TQListBoxItem*)) ); } diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index f74f4a3a..966b1491 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -97,7 +97,7 @@ void ProjectPrivate::initActions(TDEActionCollection *ac) m_projectRecent->setToolTip(i18n("Open/Open recent project")); connect(m_projectRecent, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenProject())); - closeprjAction = new TDEAction( i18n( "&Close Project" ), "fileclose", 0, + closeprjAction = new TDEAction( i18n( "&Close Project" ), "window-close", 0, this, TQT_SLOT( slotCloseProject() ), ac, "project_close" ); @@ -108,13 +108,13 @@ void ProjectPrivate::initActions(TDEActionCollection *ac) this, TQT_SLOT(slotOpenProjectView(const TQString &))); openPrjViewAction->setToolTip(i18n("Open project view")); - savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "filesave", 0, + savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "document-save", 0, this, TQT_SLOT( slotSaveProjectView() ), ac, "project_view_save" ); - saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "filesaveas", 0, + saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "document-save-as", 0, this, TQT_SLOT( slotSaveAsProjectView() ), ac, "project_view_save_as" ); - deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "editdelete", 0, + deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "edit-delete", 0, ac, "project_view_delete" ); connect(deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotDeleteProjectView(const TQString &))); diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 3ea5d11e..6d65d9b6 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -1050,11 +1050,11 @@ void QuantaInit::initActions() TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFrameWizard() ), TQT_TQOBJECT(ac), "tag_frame_wizard" ); - (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "editpaste", 0, + (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "edit-paste", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteHTMLQuoted() ), TQT_TQOBJECT(ac), "edit_paste_html_quoted" ); - (void) new TDEAction( i18n( "Paste &URL Encoded" ), "editpaste", 0, + (void) new TDEAction( i18n( "Paste &URL Encoded" ), "edit-paste", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteURLEncoded() ), TQT_TQOBJECT(ac), "edit_paste_url_encoded" ); diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index bcef6729..158ba563 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -282,7 +282,7 @@ void QuantaView::updateTab() { if (qConfig.showCloseButtons == "ShowAlways") { - setIcon(SmallIcon("fileclose")); + setIcon(SmallIcon("window-close")); } if (m_document) { @@ -298,7 +298,7 @@ void QuantaView::updateTab() setMDICaption(urlStr + " " + i18n("[modified]")); } else { - setIcon(SmallIcon("filesave")); + setIcon(SmallIcon("document-save")); setMDICaption(urlStr); } m_szCaption = urlStr + " " + i18n("[modified]"); diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index af057900..831b81f0 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -67,12 +67,12 @@ ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, m_lastActiveEditorView = 0L; m_documentationView = 0L; m_tabPopup = new TDEPopupMenu(quantaApp); - m_tabPopup->insertItem(SmallIcon("fileclose"), i18n("&Close"), this, TQT_SLOT(slotCloseView())); + m_tabPopup->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQT_SLOT(slotCloseView())); m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQT_SLOT(slotCloseOtherTabs())); m_tabPopup->insertItem(i18n("Close &All"), this, TQT_SLOT(closeAll())); m_tabPopup->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReloadFile()), 0, RELOAD_ID); m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQT_SLOT(slotUploadFile()), 0, UPLOAD_ID); - m_tabPopup->insertItem(SmallIcon("editdelete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID); + m_tabPopup->insertItem(SmallIcon("edit-delete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID); m_tabPopup->insertSeparator(); m_fileListPopup = new TDEPopupMenu(quantaApp); connect(m_fileListPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileListPopupAboutToShow())); diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 948778e0..3a3a7029 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -884,7 +884,7 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil if (sMoving || (sReading && sDeleting)) popup.insertItem(SmallIconSet("goto"), i18n("&Move Here"), 2 ); if (sReading) - popup.insertItem(SmallIconSet("editcopy"), i18n("&Copy Here"), 1 ); + popup.insertItem(SmallIconSet("edit-copy"), i18n("&Copy Here"), 1 ); if (sLinking) popup.insertItem(SmallIconSet("www"), i18n("&Link Here"), 3 ); popup.insertSeparator(); diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index a8fb6f01..1b438a0e 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -84,34 +84,34 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("fileclose"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); m_fileMenu->insertSeparator(); m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_fileMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_fileMenu->insertSeparator(); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); - createNewMenu->insertItem(SmallIcon("folder_new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); + createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); m_folderMenu = new TDEPopupMenu(); - m_folderMenu->insertItem(SmallIcon("folder_new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder())); + m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder())); m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop())); m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate())); m_folderMenu->insertItem(SmallIcon("empty"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); - m_folderMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("editpaste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQT_SLOT(slotChangeAlias())); m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_menuDel = m_folderMenu->insertItem( SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_folderMenu->insertSeparator(); m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 0da3eb9e..26e6ed43 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -125,41 +125,41 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this, TQT_SLOT(slotOpen())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQT_SLOT(slotOpen())); m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQT_SLOT(slotLoadToolbar())); m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("fileclose"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); m_fileMenu->insertSeparator(); m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQT_SLOT(slotUploadSingleURL())); m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQT_SLOT(slotQuickUploadURL())); m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); - m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_fileMenu->insertSeparator(); m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); - createNewMenu->insertItem(SmallIcon("folder_new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); + createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); m_folderMenu = new TDEPopupMenu(this); - m_folderMenu->insertItem(SmallIconSet("filenew"), i18n("&Create New"), createNewMenu); + m_folderMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQT_SLOT(slotUploadSingleURL())); m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQT_SLOT(slotQuickUploadURL())); m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate())); m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); - m_folderMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_folderMenu->insertSeparator(); m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus())); m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); m_projectMenu = new TDEPopupMenu(this); - m_projectMenu->insertItem(SmallIconSet("filenew"), i18n("&Create New"), createNewMenu); + m_projectMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu); m_projectMenu->insertSeparator(); m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject())); m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQT_SLOT(slotRescan())); diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index af04b9cd..c1cc3b62 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -100,13 +100,13 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL & m_fileMenu = new TDEPopupMenu(); - m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); m_fileMenu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("fileclose"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); m_fileMenu->insertSeparator(); // m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_fileMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); m_fileMenu->insertSeparator(); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); @@ -114,9 +114,9 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL & m_folderMenu = new TDEPopupMenu(); // m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); - m_folderMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("editpaste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_menuDel = m_folderMenu->insertItem( SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); + m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); m_folderMenu->insertSeparator(); m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index a46cb590..feb56bc9 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -830,7 +830,7 @@ void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListV TDEPopupMenu *menu = new TDEPopupMenu( this ); menu->insertItem( i18n("&Move Here"), DRAG_MOVE, 0 ); - menu->insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), DRAG_COPY, 1 ); + menu->insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), DRAG_COPY, 1 ); menu->insertSeparator(); menu->insertItem( SmallIcon("cancel"), i18n("C&ancel"), DRAG_CANCEL, 3 ); int id = menu->exec(TQCursor::pos(), 0); diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index c82de08e..e8d0bbfc 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -466,13 +466,13 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char widgetLayout->addWidget( nodeName, 0, 0 ); deleteTag = new KPushButton(this, i18n( "Delete Tag" ).ascii()); - deleteTag->setPixmap(SmallIcon("editdelete")); + deleteTag->setPixmap(SmallIcon("edit-delete")); deleteTag->setMaximumHeight(32); deleteTag->setMaximumWidth(32); TQToolTip::add(deleteTag, i18n("Delete the current tag only.")); deleteAll = new KPushButton(this, i18n( "Delete All" ).ascii()); - deleteAll->setPixmap(SmallIcon("editdelete")); + deleteAll->setPixmap(SmallIcon("edit-delete")); deleteAll->setMaximumHeight(32); deleteAll->setMaximumWidth(32); TQToolTip::add(deleteAll, i18n("Delete the current tag and all its children.")); diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 1d421d61..700dfcff 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -144,28 +144,28 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) m_fileMenu = new TDEPopupMenu(this); m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQT_SLOT(slotInsert())); - m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); m_fileMenu->insertItem(SmallIcon("mail_send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate())); m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("fileclose"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_fileMenu->insertSeparator(); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); m_folderMenu = new TDEPopupMenu(this); - m_folderMenu->insertItem(SmallIcon("folder_new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir())); + m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir())); m_folderMenu->insertItem(SmallIcon("mail_send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate())); m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate())); m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("editpaste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); + m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_folderMenu->insertSeparator(); m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); diff --git a/tdefilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp index d21801bd..bbdd8edd 100644 --- a/tdefilereplace/knewprojectdlg.cpp +++ b/tdefilereplace/knewprojectdlg.cpp @@ -205,7 +205,7 @@ void KNewProjectDlg::slotEnableChbBackup(bool b) //PRIVATE void KNewProjectDlg::initGUI() { - TQIconSet iconSet = SmallIconSet("fileopen"); + TQIconSet iconSet = SmallIconSet("document-open"); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pbLocation->setIconSet(iconSet); diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp index d3b4e4cb..e0bb9f97 100644 --- a/tdefilereplace/tdefilereplacepart.cpp +++ b/tdefilereplace/tdefilereplacepart.cpp @@ -572,17 +572,17 @@ void TDEFileReplacePart::initGUI() (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate"); (void)new TDEAction(i18n("&Replace"), "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace"); (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop"); - (void)new TDEAction(i18n("Cre&ate Report File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results"); + (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results"); // Strings (void)new TDEAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add"); (void)new TDEAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del"); - (void)new TDEAction(i18n("&Empty Strings List"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty"); + (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty"); (void)new TDEAction(i18n("Edit Selected String..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEdit()), actionCollection(), "strings_edit"); - (void)new TDEAction(i18n("&Save Strings List to File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save"); + (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save"); (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load"); - (void)new TDERecentFilesAction(i18n("&Load Recent Strings Files"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenRecentStringFile(const KURL&)), actionCollection(),"strings_load_recent"); + (void)new TDERecentFilesAction(i18n("&Load Recent Strings Files"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenRecentStringFile(const KURL&)), actionCollection(),"strings_load_recent"); (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert"); (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all"); @@ -596,14 +596,14 @@ void TDEFileReplacePart::initGUI() // Results (void)new TDEAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos"); - (void)new TDEAction(i18n("&Open"), "filenew", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile"); + (void)new TDEAction(i18n("&Open"), "document-new", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile"); if(quantaFound) { (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile"); } - (void)new TDEAction(i18n("Open Parent &Folder"), "fileopen", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir"); - (void)new TDEAction(i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete"); + (void)new TDEAction(i18n("Open Parent &Folder"), "document-open", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir"); + (void)new TDEAction(i18n("&Delete"), "edit-delete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete"); (void)new TDEAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand"); (void)new TDEAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce"); (void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp index f0924b2b..a4af2f7a 100644 --- a/tdefilereplace/tdefilereplaceview.cpp +++ b/tdefilereplace/tdefilereplaceview.cpp @@ -498,7 +498,7 @@ void TDEFileReplaceView::initGUI() - m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("fileopen")), + m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("document-open")), i18n("&Open"), this, TQT_SLOT(slotResultOpen())); @@ -521,7 +521,7 @@ void TDEFileReplaceView::initGUI() i18n("Open Parent &Folder"), this, TQT_SLOT(slotResultDirOpen())); - m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("editdelete")), + m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("edit-delete")), i18n("&Delete"), this, TQT_SLOT(slotResultDelete())); |