Branch: master

dd681fe2 2014-10-13 20:09:56 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 k9Mplayer/k9mplayer.cpp
M libk9copy/k9backupdlg.cpp
M src/kviewmpeg2.cpp
diff --git a/k9Mplayer/k9mplayer.cpp b/k9Mplayer/k9mplayer.cpp
index f608390..b140236 100644
--- a/k9Mplayer/k9mplayer.cpp
+++ b/k9Mplayer/k9mplayer.cpp
@@ -28,8 +28,8 @@
 
     slider->setRange(0, 100);
     slider->setSteps(1, 1);
-    bPlay->setPixmap(SmallIcon("player_play"));
-    bStop->setPixmap(SmallIcon("player_stop"));
+    bPlay->setPixmap(SmallIcon("media-playback-start"));
+    bStop->setPixmap(SmallIcon("media-playback-stop"));
     bSwitchAudio->setPixmap(SmallIcon("cycle"));
     connect(m_process,TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),this,TQT_SLOT(receivedStdout( TDEProcess*, char*, int )));
     m_timer=new TQTimer(this);
diff --git a/libk9copy/k9backupdlg.cpp b/libk9copy/k9backupdlg.cpp
index 71d2507..113a0d7 100644
--- a/libk9copy/k9backupdlg.cpp
+++ b/libk9copy/k9backupdlg.cpp
@@ -43,7 +43,7 @@
     connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) );
     timer->start(500, 0 );
     bAbort->setIconSet(KStdGuiItem::cancel().iconSet());
-    bPlay->setIconSet(SmallIcon("player_play"));
+    bPlay->setIconSet(SmallIcon("media-playback-start"));
     totalCopied=0;
     m_progressTotal=0;
     m_progressLabel="";
diff --git a/src/kviewmpeg2.cpp b/src/kviewmpeg2.cpp
index f7aa196..393a008 100755
--- a/src/kviewmpeg2.cpp
+++ b/src/kviewmpeg2.cpp
@@ -75,8 +75,8 @@
     m_widget=NULL;
     m_GLwidget=NULL;
     m_layout=NULL;
-    bPlay->setPixmap(SmallIcon("player_play"));
-    bStop->setPixmap(SmallIcon("player_stop"));
+    bPlay->setPixmap(SmallIcon("media-playback-start"));
+    bStop->setPixmap(SmallIcon("media-playback-stop"));
     connect(&m_player  , TQT_SIGNAL(setPosition(uint32_t)), this, TQT_SLOT(setPosition(uint32_t)));
     connect(&m_player  , TQT_SIGNAL(setMax(uint32_t)), this, TQT_SLOT(setMax(uint32_t)));
     connect(&m_player  , TQT_SIGNAL(setMin(uint32_t)), this, TQT_SLOT(setMin(uint32_t)));
215ae7bd 2014-10-13 20:10:27 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/k9copy
M cmake
diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090