From aa8b192b5e9d0cd49e07e89fd0eaa567121ae1d3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 20:10:05 -0500 Subject: [PATCH] Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance --- kate/app/katemailfilesdialog.cpp | 2 +- kate/app/katemainwindow.cpp | 2 +- kate/app/katemdi.cpp | 2 +- kate/app/kwritemain.cpp | 2 +- kcontrol/randr/tderandrtray.cpp | 6 +++--- kfind/kfwin.cpp | 2 +- khelpcenter/mainwindow.cpp | 4 ++-- kicker/kicker/plugins/kickoff-beagle-plugin.cpp | 2 +- kicker/kicker/ui/k_new_mnu.cpp | 6 +++--- kicker/taskmanager/taskrmbmenu.cpp | 2 +- konqueror/about/konq_aboutpage.cc | 2 +- konqueror/konq_mainwindow.cc | 6 +++--- .../sidebar/trees/bookmark_module/bookmark_module.cpp | 2 +- konqueror/sidebar/trees/history_module/history_module.cpp | 2 +- konqueror/sidebar/trees/konq_sidebartree.cpp | 2 +- konsole/konsole/konsole.cpp | 8 ++++---- konsole/konsole/konsole_part.cpp | 4 ++-- libkonq/konq_dirpart.cc | 4 ++-- libkonq/konq_popupmenu.cc | 2 +- tdeioslave/media/libmediacommon/notifieropenaction.cpp | 2 +- twin/useractions.cpp | 2 +- 21 files changed, 33 insertions(+), 33 deletions(-) diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp index 858caa5f1..2d933669a 100644 --- a/kate/app/katemailfilesdialog.cpp +++ b/kate/app/katemailfilesdialog.cpp @@ -49,7 +49,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin ) KGuiItem( i18n("&Show All Documents >>") ) ), mainWindow( mainwin ) { - setButtonGuiItem( KDialogBase::Ok, KGuiItem( i18n("&Mail..."), "mail_send") ); + setButtonGuiItem( KDialogBase::Ok, KGuiItem( i18n("&Mail..."), "mail-send") ); mw = makeVBoxMainWidget(); mw->installEventFilter( this ); diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index a1b3e9045..af0617074 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -257,7 +257,7 @@ void KateMainWindow::setupActions() KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window")); - a=new TDEAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view"); + a=new TDEAction(i18n("&New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view"); a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list).")); if ( KateApp::self()->authorize("shell_access") ) diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 27035d48e..adf297563 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -464,7 +464,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) p->insertTitle(SmallIcon("view_remove"), i18n("Behavior"), 50); - p->insertItem(w->persistent ? SmallIconSet("window_nofullscreen") : SmallIconSet("window_fullscreen"), w->persistent ? i18n("Make Non-Persistent") : i18n("Make Persistent"), 10); + p->insertItem(w->persistent ? SmallIconSet("view-restore") : SmallIconSet("view-fullscreen"), w->persistent ? i18n("Make Non-Persistent") : i18n("Make Persistent"), 10); p->insertTitle(SmallIcon("move"), i18n("Move To"), 51); diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 75d494832..f427b0094 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -150,7 +150,7 @@ void KWrite::setupActions() actionCollection()); m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again.")); - TDEAction *a=new TDEAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()), + TDEAction *a=new TDEAction(i18n("&New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()), actionCollection(), "view_new_view"); a->setWhatsThis(i18n("Create another view containing the current document")); diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 32f6f39ac..d6a711db7 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -353,7 +353,7 @@ void KRandRSystemTray::configChanged() KRandrPassivePopup::message( i18n("Screen configuration has changed"), - currentScreen()->changedMessage(), SmallIcon("window_fullscreen"), + currentScreen()->changedMessage(), SmallIcon("view-fullscreen"), this, "ScreenChangeNotification"); } @@ -409,7 +409,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu) { int lastIndex = 0; - menu->insertTitle(SmallIcon("window_fullscreen"), i18n("Screen Size")); + menu->insertTitle(SmallIcon("view-fullscreen"), i18n("Screen Size")); int numSizes = currentScreen()->numSizes(); int* sizeSort = new int[numSizes]; @@ -889,7 +889,7 @@ void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) { if (device->type() == TDEGenericDeviceType::Monitor) { KRandrPassivePopup::message( i18n("New display output options are available!"), - i18n("A screen has been added, removed, or changed"), SmallIcon("window_fullscreen"), + i18n("A screen has been added, removed, or changed"), SmallIcon("view-fullscreen"), this, "ScreenChangeNotification"); reloadDisplayConfiguration(); diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index c0223ea42..f068d031e 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -410,7 +410,7 @@ void KfindWindow::slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoi //menu = new TDEPopupMenu(item->text(0), this); m_menu->insertTitle(item->text(0)); m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding())); - m_menu->insertItem(SmallIcon("window_new"),i18n("Open Folder"), this, TQT_SLOT(openFolder())); + m_menu->insertItem(SmallIcon("window-new"),i18n("Open Folder"), this, TQT_SLOT(openFolder())); m_menu->insertSeparator(); m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection())); m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles())); diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index ab75d29a7..c2246232a 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -248,8 +248,8 @@ void MainWindow::setupActions() History::self().setupActions( actionCollection() ); new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); - new TDEAction( i18n( "Increase Font Sizes" ), "viewmag+", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); - new TDEAction( i18n( "Decrease Font Sizes" ), "viewmag-", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); + new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); + new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); } void MainWindow::slotCopySelectedText() diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp index 9763419b5..7ded9eea3 100644 --- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp +++ b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp @@ -238,7 +238,7 @@ HitMenuItem *KickoffBeaglePlugin::hitToHitMenuItem (int category, Hit *hit) info = (*hit)[vCard_PREFEMAIL]; uri = "mailto:"+(*hit)[vCard_PREFEMAIL]; mimetype = hit->getMimeType (); - icon = "mail_new"; + icon = "mail-message-new"; HitMenuItem * first_item=new HitMenuItem (title, info, uri, mimetype, 0, category, icon, score); kickoffSearchInterface()->addHitMenuItem(first_item); diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index c6ac44bf1..3e705ba31 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -2270,7 +2270,7 @@ void KMenu::searchAddressbook() } hit_item = new HitMenuItem (i18n("Send Email to %1").arg(realName), (*it).preferredEmail(), - "mailto:"+(*it).preferredEmail(), TQString(), 0, ACTIONS, "mail_new"); + "mailto:"+(*it).preferredEmail(), TQString(), 0, ACTIONS, "mail-message-new"); insertSearchResult(hit_item); } @@ -2400,7 +2400,7 @@ void KMenu::doQuery (bool return_pressed) if (emailRegExp.exactMatch(query_str)) { categorised_hit_total[ACTIONS] ++; HitMenuItem *hit_item = new HitMenuItem (i18n("Send Email to %1").arg(query_str), TQString(), - "mailto:"+query_str, TQString(), (++max_category_id [ACTIONS]), ACTIONS, "mail_new"); + "mailto:"+query_str, TQString(), (++max_category_id [ACTIONS]), ACTIONS, "mail-message-new"); int index = getHitMenuItemPosition (hit_item); m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name, hit_item->display_info, "mailto:"+query_str, max_category_id [ACTIONS], index); } @@ -3848,7 +3848,7 @@ void KMenu::insertSuspendOption( int &nId, int &index ) if ( standby && !disableSuspend ) { m_exitView->leftView()->insertItem( - "player_pause", + "media-playback-pause", i18n( "Standby" ), i18n( "Pause without logging out" ), "kicker:/standby", nId++, index++ ); diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index 7059bea69..58682196b 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -220,7 +220,7 @@ TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) t, TQT_SLOT(toggleKeptBelowOthers())); menu->setItemChecked(id, t->isKeptBelowOthers()); - id = menu->insertItem(SmallIconSet("window_fullscreen"), + id = menu->insertItem(SmallIconSet("view-fullscreen"), i18n("&Fullscreen"), t, TQT_SLOT(toggleFullScreen())); menu->setItemChecked(id, t->isFullScreen()); diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index c06331994..a94f2d554 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -342,7 +342,7 @@ TQString KonqAboutPageFactory::tips() TQString locationbar_erase_icon_path = iconloader->iconPath("locationbar_erase", TDEIcon::Small ); TQString window_fullscreen_icon_path = - iconloader->iconPath("window_fullscreen", TDEIcon::Small ); + iconloader->iconPath("view-fullscreen", TDEIcon::Small ); TQString view_left_right_icon_path = iconloader->iconPath("view_left_right", TDEIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small ); diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index bd2d6164e..225757f4d 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -3805,7 +3805,7 @@ void KonqMainWindow::initActions() (void) new TDEAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" ); (void) new TDEAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" ); - (void) new TDEAction( i18n( "New &Window" ), "window_new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); + (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); @@ -4110,7 +4110,7 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, TQPopupMenu * pm else { popupItems.append( new KFileItem( bk.url(), TQString::null, KFileItem::Unknown) ); - pm->insertItem( SmallIcon("window_new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) ); + pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) ); pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQT_SLOT( slotPopupNewTabRight() ) ); } } @@ -4762,7 +4762,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); actNewWindow->setToolTip( i18n( "Open the document in current window" ) ); } - actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); + actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); actNewWindow->setToolTip( i18n( "Open the document in a new window" ) ); //Set tab_new_x to point to the correct icon based on NewTabsInFront diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 692241d8c..208fe2ee6 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -64,7 +64,7 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark"); (void) new TDEAction( i18n("Properties"), "edit", 0, this, TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new TDEAction( i18n("Open in New Window"), "window_new", 0, this, + (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 3ebb339a0..6f051a553 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -75,7 +75,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree TQT_SLOT( slotItemExpanded( TQListViewItem * ))); m_collection = new TDEActionCollection( this, "history actions" ); - (void) new TDEAction( i18n("New &Window"), "window_new", 0, this, + (void) new TDEAction( i18n("New &Window"), "window-new", 0, this, TQT_SLOT( slotNewWindow() ), m_collection, "open_new"); (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this, TQT_SLOT( slotRemoveEntry() ), m_collection, "remove"); diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index f5cf661b3..0ce4c2049 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -921,7 +921,7 @@ void KonqSidebarTree::showToplevelContextMenu() TQT_SLOT( slotDelete() ), m_collection, "delete_link"); (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new TDEAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 2c7e63cfd..4ba8b60ca 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -3507,9 +3507,9 @@ void Konsole::loadSessionCommands() void Konsole::createSessionMenus() { if (no2command.isEmpty()) { // All sessions have been deleted - m_session->insertItem(SmallIconSet("window_new"), + m_session->insertItem(SmallIconSet("window-new"), i18n("New &Window"), SESSION_NEW_WINDOW_ID); - m_tabbarSessionsCommands->insertItem(SmallIconSet("window_new"), + m_tabbarSessionsCommands->insertItem(SmallIconSet("window-new"), i18n("New &Window"), SESSION_NEW_WINDOW_ID); return; } @@ -3525,9 +3525,9 @@ void Konsole::createSessionMenus() comment=txt.prepend(i18n("New ")); insertItemSorted(m_session, SmallIconSet(icon), comment.replace('&',"&&"), SESSION_NEW_SHELL_ID); - m_session->insertItem(SmallIconSet("window_new"), + m_session->insertItem(SmallIconSet("window-new"), i18n("New &Window"), SESSION_NEW_WINDOW_ID); - m_tabbarSessionsCommands->insertItem(SmallIconSet("window_new"), + m_tabbarSessionsCommands->insertItem(SmallIconSet("window-new"), i18n("New &Window"), SESSION_NEW_WINDOW_ID); m_session->insertSeparator(); m_tabbarSessionsCommands->insertSeparator(); diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 6cc900efc..1e02447d9 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -364,8 +364,8 @@ void konsolePart::makeGUI() selectBell->plug(m_options); m_fontsizes = new TDEActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L ); - m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "viewmag+" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); - m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "viewmag-" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); m_fontsizes->plug(m_options); diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 0cd801896..602496b7c 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -137,8 +137,8 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name ) actionCollection()->setHighlightingEnabled( true ); - m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "viewmag+", 0, this, TQT_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" ); - m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "viewmag-", 0, this, TQT_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" ); + m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "zoom-in", 0, this, TQT_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" ); + m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "zoom-out", 0, this, TQT_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" ); m_paDefaultIcons = new TDERadioAction( i18n( "&Default Size" ), 0, actionCollection(), "modedefault" ); d->aEnormousIcons = new TDERadioAction( i18n( "&Huge" ), 0, diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 7a6ddaa13..482c152c5 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -499,7 +499,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( ((kpf & ShowNewWindow) != 0) && sReading ) { TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" ); - actNewWindow = new TDEAction( openStr, "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" ); + actNewWindow = new TDEAction( openStr, "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" ); } if ( actNewWindow && !isKDesktop ) diff --git a/tdeioslave/media/libmediacommon/notifieropenaction.cpp b/tdeioslave/media/libmediacommon/notifieropenaction.cpp index 110b9fe28..0ca5c18bc 100644 --- a/tdeioslave/media/libmediacommon/notifieropenaction.cpp +++ b/tdeioslave/media/libmediacommon/notifieropenaction.cpp @@ -24,7 +24,7 @@ NotifierOpenAction::NotifierOpenAction() : NotifierAction() { - setIconName("window_new"); + setIconName("window-new"); setLabel(i18n("Open in New Window")); } diff --git a/twin/useractions.cpp b/twin/useractions.cpp index 71bec42be..25a6f03b4 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -62,7 +62,7 @@ TQPopupMenu* Workspace::clientPopup() i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp ); advanced_popup->insertItem( SmallIconSet( "go-down" ), i18n("Keep &Below Others")+'\t'+keys->shortcut("Window Below Other Windows").seq(0).toString(), Options::KeepBelowOp ); - advanced_popup->insertItem( SmallIconSet( "window_fullscreen" ), + advanced_popup->insertItem( SmallIconSet( "view-fullscreen" ), i18n("&Fullscreen")+'\t'+keys->shortcut("Window Fullscreen").seq(0).toString(), Options::FullScreenOp ); advanced_popup->insertItem( i18n("&No Border")+'\t'+keys->shortcut("Window No Border").seq(0).toString(), Options::NoBorderOp ); advanced_popup->insertItem( i18n("Shad&ow"), Options::ShadowOp );