diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-13 20:10:11 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-13 20:10:11 -0500 |
| commit | ce1138c8ba3865132c2ea42d119f68a5417458ad (patch) | |
| tree | 40453be7f11591c2a5851c86af291692a1a824b3 /tdehtml | |
| parent | bab4f22f92cb4960c7a7c17845813de2082ffdc9 (diff) | |
| download | tdelibs-ce1138c8ba3865132c2ea42d119f68a5417458ad.tar.gz tdelibs-ce1138c8ba3865132c2ea42d119f68a5417458ad.zip | |
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
Diffstat (limited to 'tdehtml')
| -rw-r--r-- | tdehtml/tdehtml_ext.cpp | 4 | ||||
| -rw-r--r-- | tdehtml/tdehtml_part.cpp | 4 | ||||
| -rw-r--r-- | tdehtml/tdehtmlview.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp index 0148d8aa6..9c1ab2aaf 100644 --- a/tdehtml/tdehtml_ext.cpp +++ b/tdehtml/tdehtml_ext.cpp @@ -515,7 +515,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri if ( selectedText.contains("://") && KURL(selectedText).isValid() ) - new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0, + new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window-new", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" ); } else if ( url.isEmpty() && !isImage ) @@ -547,7 +547,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri { if ( tdehtml->parentPart() ) { - new TDEAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotFrameInWindow() ), + new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotFrameInWindow() ), actionCollection(), "frameinwindow" ); new TDEAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ), actionCollection(), "frameintop" ); diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index b138e91e6..9c3613372 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -358,13 +358,13 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) if ( prof == BrowserViewGUI ) { d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n( - "Enlarge Font" ), "viewmag+", "CTRL++;CTRL+=", this, + "Enlarge Font" ), "zoom-in", "CTRL++;CTRL+=", this, TQT_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" ); d->m_paIncZoomFactor->setWhatsThis( i18n( "Enlarge Font<p>" "Make the font in this window bigger. " "Click and hold down the mouse button for a menu with all available font sizes." ) ); d->m_paDecZoomFactor = new TDEHTMLZoomFactorAction( this, false, i18n( - "Shrink Font" ), "viewmag-", CTRL + Key_Minus, this, + "Shrink Font" ), "zoom-out", CTRL + Key_Minus, this, TQT_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" ); d->m_paDecZoomFactor->setWhatsThis( i18n( "Shrink Font<p>" "Make the font in this window smaller. " diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 9e921809c..901c02321 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -1269,7 +1269,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) { #ifdef Q_WS_X11 - TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window_new", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true ); + TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window-new", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true ); if (d->cursor_icon_widget) { const TQPixmap *pm = d->cursor_icon_widget->backgroundPixmap(); |