| 65dde0a7 | 2014-10-13 20:10:10 | Timothy Pearson |
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 |
||
|
M kooka/kooka.cpp M kpdf/part.cpp M kpdf/ui/pageview.cpp M ksvg/plugin/ksvg_plugin.cpp M kuickshow/src/kuickshow.cpp M kview/kviewviewer/kviewviewer.cpp M tdeiconedit/tdeiconedit.cpp |
||
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index 58c368a..5905c30 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -204,12 +204,12 @@
TQT_TQOBJECT(m_view), TQT_SLOT( slOpenCurrInGraphApp() ),
actionCollection(), "openInGraphApp" );
- act = new TDEAction(i18n("&Rotate Image Clockwise"), "rotate_cw", CTRL+Key_R,
+ act = new TDEAction(i18n("&Rotate Image Clockwise"), "object-rotate-right", CTRL+Key_R,
TQT_TQOBJECT(this), TQT_SLOT( slRotateClockWise() ),
actionCollection(), "rotateClockwise" );
m_view->connectViewerAction( act );
- act = new TDEAction(i18n("Rotate Image Counter-Clock&wise"), "rotate_ccw", CTRL+Key_W,
+ act = new TDEAction(i18n("Rotate Image Counter-Clock&wise"), "object-rotate-left", CTRL+Key_W,
TQT_TQOBJECT(this), TQT_SLOT( slRotateCounterClockWise() ),
actionCollection(), "rotateCounterClockwise" );
m_view->connectViewerAction( act );
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 8d325fc..f4fe5a2 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -945,7 +945,7 @@
else
popup->insertItem( SmallIcon("bookmark_add"), i18n("Add Bookmark"), 1 );
if ( m_pageView->canFitPageWidth() )
- popup->insertItem( SmallIcon("viewmagfit"), i18n("Fit Width"), 2 );
+ popup->insertItem( SmallIcon("zoom-fit-best"), i18n("Fit Width"), 2 );
//popup->insertItem( SmallIcon("pencil"), i18n("Edit"), 3 );
//popup->setItemEnabled( 3, false );
reallyShow = true;
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index c008fe2..682c0f6 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -262,15 +262,15 @@
d->aZoomFitPage = new TDEToggleAction( i18n("Fit to &Page"), "view_fit_window", 0, ac, "zoom_fit_page" );
connect( d->aZoomFitPage, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToPageToggled( bool ) ) );
- d->aZoomFitText = new TDEToggleAction( i18n("Fit to &Text"), "viewmagfit", 0, ac, "zoom_fit_text" );
+ d->aZoomFitText = new TDEToggleAction( i18n("Fit to &Text"), "zoom-fit-best", 0, ac, "zoom_fit_text" );
connect( d->aZoomFitText, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToTextToggled( bool ) ) );
// rotate actions
TDEAction *action;
- action = new TDEAction( i18n("Rotate Right"), "rotate_cw", TDEShortcut( "Ctrl+Shift++" ),
+ action = new TDEAction( i18n("Rotate Right"), "object-rotate-right", TDEShortcut( "Ctrl+Shift++" ),
TQT_TQOBJECT(this), TQT_SLOT( slotRotateRight() ), ac, "rotate_right" );
- action = new TDEAction( i18n("Rotate Left"), "rotate_ccw", TDEShortcut( "Ctrl+Shift+-" ),
+ action = new TDEAction( i18n("Rotate Left"), "object-rotate-left", TDEShortcut( "Ctrl+Shift+-" ),
TQT_TQOBJECT(this), TQT_SLOT( slotRotateLeft() ), ac, "rotate_left" );
// View-Layout actions
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index cd94223..5e4cb0f 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -121,7 +121,7 @@
ksvgd->saveToPNG = new TDEAction(i18n("Save to PNG..."), "save", 0, this, TQT_SLOT(slotSaveToPNG()), actionCollection(), "save_to_png");
// ksvgd->aboutApp = KStdAction::aboutApp(this, TQT_SLOT(slotAboutKSVG()), actionCollection());//, "KSVG");
ksvgd->aboutApp = new TDEAction(i18n("About KSVG"), "vectorgfx", 0, this, TQT_SLOT(slotAboutKSVG()), actionCollection(), "help_about_app");
- ksvgd->fontKerningAction = new TDEToggleAction(i18n("Use Font &Kerning"), "viewmagfit", Key_F8, this, TQT_SLOT(slotFontKerning()), actionCollection(), "font_kerning");
+ ksvgd->fontKerningAction = new TDEToggleAction(i18n("Use Font &Kerning"), "zoom-fit-best", Key_F8, this, TQT_SLOT(slotFontKerning()), actionCollection(), "font_kerning");
ksvgd->progressiveAction = new TDEToggleAction(i18n("Use &Progressive Rendering"), "", Key_F9, this, TQT_SLOT(slotProgressiveRendering()), actionCollection(), "progressive");
KSimpleConfig config("ksvgpluginrc", true);
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 7ddac89..f6260aa 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -266,7 +266,7 @@
TQT_TQOBJECT(this), TQT_SLOT( about() ), coll, "about" );
oneWindowAction = new TDEToggleAction( i18n("Open Only One Image Window"),
- "window_new",
+ "window-new",
TDEShortcut( CTRL+Key_N ), coll,
"kuick_one window" );
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 8bfe4cd..781dbc2 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -465,9 +465,9 @@
void KViewViewer::setupActions()
{
- m_paZoomIn = new TDEAction( i18n( "Zoom In" ), "viewmag+", TDEStdAccel::shortcut( TDEStdAccel::ZoomIn ), this,
+ m_paZoomIn = new TDEAction( i18n( "Zoom In" ), "zoom-in", TDEStdAccel::shortcut( TDEStdAccel::ZoomIn ), this,
TQT_SLOT( slotZoomIn() ), actionCollection(), "zoomin" );
- m_paZoomOut = new TDEAction( i18n( "Zoom Out" ), "viewmag-", TDEStdAccel::shortcut( TDEStdAccel::ZoomOut ), this,
+ m_paZoomOut = new TDEAction( i18n( "Zoom Out" ), "zoom-out", TDEStdAccel::shortcut( TDEStdAccel::ZoomOut ), this,
TQT_SLOT( slotZoomOut() ), actionCollection(), "zoomout" );
m_paZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" );
@@ -483,9 +483,9 @@
m_paFlipMenu->insert( m_paFlipV );
m_paFlipMenu->insert( m_paFlipH );
- m_paRotateCCW = new TDEAction( i18n( "Ro&tate Counter-Clockwise" ), "rotate_ccw", 0, this,
+ m_paRotateCCW = new TDEAction( i18n( "Ro&tate Counter-Clockwise" ), "object-rotate-left", 0, this,
TQT_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" );
- m_paRotateCW = new TDEAction( i18n( "Rotate Clockwise" ), "rotate_cw", 0, this,
+ m_paRotateCW = new TDEAction( i18n( "Rotate Clockwise" ), "object-rotate-right", 0, this,
TQT_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" );
m_paSave = KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() );
m_paSave->setEnabled( false );
diff --git a/tdeiconedit/tdeiconedit.cpp b/tdeiconedit/tdeiconedit.cpp
index 4705d10..b4fe1d4 100644
--- a/tdeiconedit/tdeiconedit.cpp
+++ b/tdeiconedit/tdeiconedit.cpp
@@ -239,7 +239,7 @@
TDEShortcut cut;
// File Menu
- action = new TDEAction(i18n("New &Window"), "window_new", cut,
+ action = new TDEAction(i18n("New &Window"), "window-new", cut,
TQT_TQOBJECT(this), TQT_SLOT(slotNewWin()), actionCollection(), "file_new_window");
action->setWhatsThis(i18n("New window\n\nOpens a new icon editor window."));
|
||
| 5a1646f2 | 2014-10-13 20:11:45 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdegraphics |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |
||