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

8 files changed, 22 insertions, 22 deletions

diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp
index 7b83d7c..6d5e583 100644
--- a/digikam/digikam/digikamapp.cpp
+++ b/digikam/digikam/digikamapp.cpp
@@ -911,7 +911,7 @@ void DigikamApp::setupActions()
     // -----------------------------------------------------------
 
     d->zoomPlusAction = new TDEAction(i18n("Zoom In"),
-                                   "viewmag+",
+                                   "zoom-in",
                                    CTRL+Key_Plus,
                                    TQT_TQOBJECT(d->view),
                                    TQT_SLOT(slotZoomIn()),
@@ -919,7 +919,7 @@ void DigikamApp::setupActions()
                                    "album_zoomin");
 
     d->zoomMinusAction = new TDEAction(i18n("Zoom Out"),
-                                   "viewmag-",
+                                   "zoom-out",
                                    CTRL+Key_Minus,
                                    TQT_TQOBJECT(d->view),
                                    TQT_SLOT(slotZoomOut()),
@@ -927,7 +927,7 @@ void DigikamApp::setupActions()
                                    "album_zoomout");
 
     d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"),
-                                   "viewmag1",
+                                   "zoom-original",
                                    ALT+CTRL+Key_0,      // NOTE: Photoshop 7 use ALT+CTRL+0.
                                    TQT_TQOBJECT(d->view),
                                    TQT_SLOT(slotZoomTo100Percents()),
@@ -944,7 +944,7 @@ void DigikamApp::setupActions()
 
     // Do not use std KDE action for full screen because action text is too large for app. toolbar.
     d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"),
-                                   "window_fullscreen",
+                                   "view-fullscreen",
                                    CTRL+SHIFT+Key_F,
                                    TQT_TQOBJECT(this),
                                    TQT_SLOT(slotToggleFullScreen()),
diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
index bb674ed..05bce11 100644
--- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
+++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
@@ -116,13 +116,13 @@ ImageEffect_SuperImpose::ImageEffect_SuperImpose(TQWidget* parent)
     bGroup->addSpace(0);
     TQPushButton *zoomInButton = new TQPushButton( bGroup );
     bGroup->insert(zoomInButton, ZOOMIN);
-    zoomInButton->setPixmap( icon.loadIcon( "viewmag+", (TDEIcon::Group)TDEIcon::Toolbar ) );
+    zoomInButton->setPixmap( icon.loadIcon( "zoom-in", (TDEIcon::Group)TDEIcon::Toolbar ) );
     zoomInButton->setToggleButton(true);
     TQToolTip::add( zoomInButton, i18n( "Zoom in" ) );
     bGroup->addSpace(20);
     TQPushButton *zoomOutButton = new TQPushButton( bGroup );
     bGroup->insert(zoomOutButton, ZOOMOUT);
-    zoomOutButton->setPixmap( icon.loadIcon( "viewmag-", (TDEIcon::Group)TDEIcon::Toolbar ) );
+    zoomOutButton->setPixmap( icon.loadIcon( "zoom-out", (TDEIcon::Group)TDEIcon::Toolbar ) );
     zoomOutButton->setToggleButton(true);
     TQToolTip::add( zoomOutButton, i18n( "Zoom out" ) );
     bGroup->addSpace(20);
diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp
index ccd3029..6d3686f 100644
--- a/digikam/imageplugins/superimpose/superimposetool.cpp
+++ b/digikam/imageplugins/superimpose/superimposetool.cpp
@@ -98,13 +98,13 @@ SuperImposeTool::SuperImposeTool(TQObject* parent)
     bGroup->addSpace(0);
     TQPushButton *zoomInButton = new TQPushButton( bGroup );
     bGroup->insert(zoomInButton, ZOOMIN);
-    zoomInButton->setPixmap( icon.loadIcon( "viewmag+", (TDEIcon::Group)TDEIcon::Toolbar ) );
+    zoomInButton->setPixmap( icon.loadIcon( "zoom-in", (TDEIcon::Group)TDEIcon::Toolbar ) );
     zoomInButton->setToggleButton(true);
     TQToolTip::add( zoomInButton, i18n( "Zoom in" ) );
     bGroup->addSpace(20);
     TQPushButton *zoomOutButton = new TQPushButton( bGroup );
     bGroup->insert(zoomOutButton, ZOOMOUT);
-    zoomOutButton->setPixmap( icon.loadIcon( "viewmag-", (TDEIcon::Group)TDEIcon::Toolbar ) );
+    zoomOutButton->setPixmap( icon.loadIcon( "zoom-out", (TDEIcon::Group)TDEIcon::Toolbar ) );
     zoomOutButton->setToggleButton(true);
     TQToolTip::add( zoomOutButton, i18n( "Zoom out" ) );
     bGroup->addSpace(20);
diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp
index 10e7079..2bc4e06 100644
--- a/digikam/libs/widgets/common/statuszoombar.cpp
+++ b/digikam/libs/widgets/common/statuszoombar.cpp
@@ -109,7 +109,7 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent)
     d->zoomMinusButton = new TQToolButton(this);
     d->zoomMinusButton->setAutoRaise(true);
     d->zoomMinusButton->setFocusPolicy(TQ_NoFocus);
-    d->zoomMinusButton->setIconSet(SmallIconSet("viewmag-"));
+    d->zoomMinusButton->setIconSet(SmallIconSet("zoom-out"));
     TQToolTip::add(d->zoomMinusButton, i18n("Zoom Out"));
 
     d->zoomSlider = new TQSliderReverseWheel(this);
@@ -125,7 +125,7 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent)
 
     d->zoomPlusButton = new TQToolButton(this);
     d->zoomPlusButton->setAutoRaise(true);
-    d->zoomPlusButton->setIconSet(SmallIconSet("viewmag+"));
+    d->zoomPlusButton->setIconSet(SmallIconSet("zoom-in"));
     d->zoomPlusButton->setFocusPolicy(TQ_NoFocus);
     TQToolTip::add(d->zoomPlusButton, i18n("Zoom In"));
 
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index 585fa9f..e2cf2d4 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -356,7 +356,7 @@ void EditorWindow::setupStandardActions()
     d->zoomMinusAction = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseZoom()),
                                              actionCollection(), "editorwindow_zoomminus");
 
-    d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "viewmag1",
+    d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "zoom-original",
                                        ALT+CTRL+Key_0,      // NOTE: Photoshop 7 use ALT+CTRL+0.
                                        TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()),
                                        actionCollection(), "editorwindow_zoomto100percents");
@@ -367,7 +367,7 @@ void EditorWindow::setupStandardActions()
                                        TQT_TQOBJECT(this), TQT_SLOT(slotToggleFitToWindow()),
                                        actionCollection(), "editorwindow_zoomfit2window");
 
-    d->zoomFitToSelectAction = new TDEAction(i18n("Fit to &Selection"), "viewmagfit",
+    d->zoomFitToSelectAction = new TDEAction(i18n("Fit to &Selection"), "zoom-fit-best",
                                          ALT+CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotFitToSelect()),
                                          actionCollection(), "editorwindow_zoomfit2select");
     d->zoomFitToSelectAction->setEnabled(false);
@@ -401,7 +401,7 @@ void EditorWindow::setupStandardActions()
             TQT_TQOBJECT(this), TQT_SLOT(slotZoomTextChanged(const TQString &)) );
 
     // Do not use std KDE action for full screen because action text is too large for app. toolbar.
-    m_fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "window_fullscreen",
+    m_fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "view-fullscreen",
                                            CTRL+SHIFT+Key_F, TQT_TQOBJECT(this),
                                            TQT_SLOT(slotToggleFullScreen()),
                                            actionCollection(), "editorwindow_fullscreen");
@@ -456,13 +456,13 @@ void EditorWindow::setupStandardActions()
     // -- Standard 'Rotate' menu actions ----------------------------------------
 
     d->rotateLeftAction = new TDEAction(i18n("Rotate Left"),
-                                     "rotate_ccw", SHIFT+CTRL+Key_Left,
+                                     "object-rotate-left", SHIFT+CTRL+Key_Left,
                                      TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate270()),
                                      actionCollection(),
                                      "editorwindow_rotate_left");
     d->rotateLeftAction->setEnabled(false);
     d->rotateRightAction  = new TDEAction(i18n("Rotate Right"),
-                                     "rotate_cw", SHIFT+CTRL+Key_Right,
+                                     "object-rotate-right", SHIFT+CTRL+Key_Right,
                                      TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate90()),
                                      actionCollection(),
                                      "editorwindow_rotate_right");
diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp
index 2c1b544..23d1cbc 100644
--- a/digikam/utilities/lighttable/lighttablepreview.cpp
+++ b/digikam/utilities/lighttable/lighttablepreview.cpp
@@ -376,7 +376,7 @@ void LightTablePreview::slotContextMenu()
     //-- Zoom actions -----------------------------------------------
 
     popmenu.insertItem(SmallIcon("viewmag"), i18n("Zoom in"), 17);
-    popmenu.insertItem(SmallIcon("viewmag-"), i18n("Zoom out"), 18);
+    popmenu.insertItem(SmallIcon("zoom-out"), i18n("Zoom out"), 18);
     popmenu.insertItem(SmallIcon("view_fit_window"), i18n("Fit to &Window"), 19);
 
     //-- Edit actions -----------------------------------------------
diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp
index 44767fa..f57a924 100644
--- a/digikam/utilities/lighttable/lighttablewindow.cpp
+++ b/digikam/utilities/lighttable/lighttablewindow.cpp
@@ -407,7 +407,7 @@ void LightTableWindow::setupActions()
                                              actionCollection(), "lighttable_zoomminus");
     d->zoomMinusAction->setEnabled(false);
 
-    d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "viewmag1",
+    d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "zoom-original",
                                        ALT+CTRL+Key_0,      // NOTE: Photoshop 7 use ALT+CTRL+0.
                                        TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()),
                                        actionCollection(), "lighttable_zoomto100percents");
@@ -417,7 +417,7 @@ void LightTableWindow::setupActions()
                                            actionCollection(), "lighttable_zoomfit2window");
 
     // Do not use std KDE action for full screen because action text is too large for app. toolbar.
-    d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "window_fullscreen",
+    d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "view-fullscreen",
                                             CTRL+SHIFT+Key_F, TQT_TQOBJECT(this),
                                             TQT_SLOT(slotToggleFullScreen()),
                                             actionCollection(), "lighttable_fullscreen");
diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp
index 6633598..9f7023a 100644
--- a/digikam/utilities/slideshow/toolbar.cpp
+++ b/digikam/utilities/slideshow/toolbar.cpp
@@ -76,7 +76,7 @@ ToolBar::ToolBar(TQWidget* parent)
     d->playBtn->setToggleButton(true);
 
     TDEIconLoader* loader = kapp->iconLoader();
-    d->playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22));
+    d->playBtn->setIconSet(loader->loadIcon("media-playback-pause", TDEIcon::NoGroup, 22));
     d->prevBtn->setIconSet(loader->loadIcon("back", TDEIcon::NoGroup, 22));
     d->nextBtn->setIconSet(loader->loadIcon("forward", TDEIcon::NoGroup, 22));
     d->stopBtn->setIconSet(loader->loadIcon("process-stop", TDEIcon::NoGroup, 22));
@@ -154,14 +154,14 @@ void ToolBar::slotPlayBtnToggled()
     {
         d->canHide = false;
         TDEIconLoader* loader = kapp->iconLoader();
-        d->playBtn->setIconSet(loader->loadIcon("player_play", TDEIcon::NoGroup, 22));
+        d->playBtn->setIconSet(loader->loadIcon("media-playback-start", TDEIcon::NoGroup, 22));
         emit signalPause();
     }
     else
     {
         d->canHide = true;
         TDEIconLoader* loader = kapp->iconLoader();
-        d->playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22));
+        d->playBtn->setIconSet(loader->loadIcon("media-playback-pause", TDEIcon::NoGroup, 22));
         emit signalPlay();
     }
 }
@@ -173,7 +173,7 @@ void ToolBar::slotNexPrevClicked()
         d->playBtn->setOn(true);
         d->canHide = false;
         TDEIconLoader* loader = kapp->iconLoader();
-        d->playBtn->setIconSet(loader->loadIcon("player_play", TDEIcon::NoGroup, 22));
+        d->playBtn->setIconSet(loader->loadIcon("media-playback-start", TDEIcon::NoGroup, 22));
         emit signalPause();
     }
 }