| b6fea6f8 | 2014-10-13 20:10:03 | 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 kipi-plugins/jpeglossless/plugin_jpeglossless.cpp M kipi-plugins/sendimages/plugin_sendimages.cpp M kipi-plugins/slideshow/toolbar.cpp |
||
diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
index e69358e..99feebc 100644
--- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
+++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
@@ -87,24 +87,24 @@
"rotate_exif");
m_action_RotateImage = new TDEActionMenu(i18n("Rotate"),
- "rotate_cw",
+ "object-rotate-right",
actionCollection(),
"jpeglossless_rotate");
m_action_RotateImage->insert( new TDEAction(i18n("Left"),
- "rotate_ccw",
+ "object-rotate-left",
SHIFT+CTRL+Key_Left,
this,
TQT_SLOT(slotRotate()),
actionCollection(),
- "rotate_ccw") );
+ "object-rotate-left") );
m_action_RotateImage->insert( new TDEAction(i18n("Right"),
- "rotate_cw",
+ "object-rotate-right",
SHIFT+CTRL+Key_Right,
this,
TQT_SLOT(slotRotate()),
actionCollection(),
- "rotate_cw") );
+ "object-rotate-right") );
m_action_FlipImage = new TDEActionMenu(i18n("Flip"),
"flip",
@@ -233,13 +233,13 @@
TQString title;
bool proceed = false;
- if (from == "rotate_cw")
+ if (from == "object-rotate-right")
{
m_thread->rotate(items, KIPIJPEGLossLessPlugin::Rot90);
title = i18n("right (clockwise)");
proceed = true;
}
- else if (from == "rotate_ccw")
+ else if (from == "object-rotate-left")
{
m_thread->rotate(items, KIPIJPEGLossLessPlugin::Rot270);
title = i18n("left (counterclockwise)");
diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp
index 11f886a..7e61403 100644
--- a/kipi-plugins/sendimages/plugin_sendimages.cpp
+++ b/kipi-plugins/sendimages/plugin_sendimages.cpp
@@ -74,7 +74,7 @@
KIPI::Plugin::setup( widget );
m_action_sendimages = new TDEAction (i18n("Email Images..."), // Menu message.
- "mail_new", // Menu icon.
+ "mail-message-new", // Menu icon.
0,
this,
TQT_SLOT(slotActivate()),
diff --git a/kipi-plugins/slideshow/toolbar.cpp b/kipi-plugins/slideshow/toolbar.cpp
index 87086d7..bf8a463 100644
--- a/kipi-plugins/slideshow/toolbar.cpp
+++ b/kipi-plugins/slideshow/toolbar.cpp
@@ -52,7 +52,7 @@
m_playBtn->setToggleButton(true);
TDEIconLoader* loader = kapp->iconLoader();
- m_playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22));
+ m_playBtn->setIconSet(loader->loadIcon("media-playback-pause", TDEIcon::NoGroup, 22));
m_prevBtn->setIconSet(loader->loadIcon("back", TDEIcon::NoGroup, 22));
m_nextBtn->setIconSet(loader->loadIcon("forward", TDEIcon::NoGroup, 22));
m_stopBtn->setIconSet(loader->loadIcon("process-stop", TDEIcon::NoGroup, 22));
@@ -130,14 +130,14 @@
{
m_canHide = false;
TDEIconLoader* loader = kapp->iconLoader();
- m_playBtn->setIconSet(loader->loadIcon("player_play", TDEIcon::NoGroup, 22));
+ m_playBtn->setIconSet(loader->loadIcon("media-playback-start", TDEIcon::NoGroup, 22));
emit signalPause();
}
else
{
m_canHide = true;
TDEIconLoader* loader = kapp->iconLoader();
- m_playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22));
+ m_playBtn->setIconSet(loader->loadIcon("media-playback-pause", TDEIcon::NoGroup, 22));
emit signalPlay();
}
}
@@ -149,7 +149,7 @@
m_playBtn->setOn(true);
m_canHide = false;
TDEIconLoader* loader = kapp->iconLoader();
- m_playBtn->setIconSet(loader->loadIcon("player_play", TDEIcon::NoGroup, 22));
+ m_playBtn->setIconSet(loader->loadIcon("media-playback-start", TDEIcon::NoGroup, 22));
emit signalPause();
}
}
|
||
| f8eb77cf | 2014-10-13 20:11:30 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kipi-plugins |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |
||