| 806f3d23 | 2014-10-13 20:10:12 | 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 ark/mainwindow.cpp M ktimer/ktimer.cpp |
||
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 0b3872e..4726989 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -109,7 +109,7 @@
void
MainWindow::setupActions()
{
- newWindowAction = new TDEAction(i18n("New &Window"), "window_new", TDEShortcut(), TQT_TQOBJECT(this),
+ newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), TQT_TQOBJECT(this),
TQT_SLOT(file_newWindow()), actionCollection(), "new_window");
newArchAction = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection());
diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp
index d8020a6..3a3cef8 100644
--- a/ktimer/ktimer.cpp
+++ b/ktimer/ktimer.cpp
@@ -75,8 +75,8 @@
setText( 1, TQString::number(m_job->delay()) );
switch( m_job->state() ) {
- case KTimerJob::Stopped: setPixmap( 2, SmallIcon("player_stop") ); break;
- case KTimerJob::Paused: setPixmap( 2, SmallIcon("player_pause") ); break;
+ case KTimerJob::Stopped: setPixmap( 2, SmallIcon("media-playback-stop") ); break;
+ case KTimerJob::Paused: setPixmap( 2, SmallIcon("media-playback-pause") ); break;
case KTimerJob::Started: setPixmap( 2, SmallIcon("1rightarrow") ); break;
}
@@ -105,8 +105,8 @@
d->jobs.setAutoDelete( true );
// set icons
- m_stop->setIconSet( SmallIconSet("player_stop") );
- m_pause->setIconSet( SmallIconSet("player_pause") );
+ m_stop->setIconSet( SmallIconSet("media-playback-stop") );
+ m_pause->setIconSet( SmallIconSet("media-playback-pause") );
m_start->setIconSet( SmallIconSet("1rightarrow") );
// create tray icon
|
||
| 9a0734c6 | 2014-10-13 20:11:50 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeutils |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |
||