Branch: master

ea819932 2014-10-13 20:10:01 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 yakuake/src/main_window.cpp
 
diff --git a/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp
index cdee080..5f63d8d 100644
--- a/yakuake/src/main_window.cpp
+++ b/yakuake/src/main_window.cpp
@@ -117,16 +117,16 @@
                               "Alt+Ctrl+S", TQT_TQOBJECT(this), TQT_SLOT(slotInteractiveRename()),
                               actionCollection(), "edit_name");
 
-    action = new TDEAction(i18n("Increase Width"), SmallIcon("viewmag+"),
+    action = new TDEAction(i18n("Increase Width"), SmallIcon("zoom-in"),
                               "Alt+Shift+Right", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeW()),
                               actionCollection(), "increasew");
-    action = new TDEAction(i18n("Decrease Width"), SmallIcon("viewmag-"),
+    action = new TDEAction(i18n("Decrease Width"), SmallIcon("zoom-out"),
                               "Alt+Shift+Left", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeW()),
                               actionCollection(), "decreasew");
-    action = new TDEAction(i18n("Increase Height"), SmallIcon("viewmag+"),
+    action = new TDEAction(i18n("Increase Height"), SmallIcon("zoom-in"),
                               "Alt+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeH()),
                               actionCollection(), "increaseh");
-    action = new TDEAction(i18n("Decrease Height"), SmallIcon("viewmag-"),
+    action = new TDEAction(i18n("Decrease Height"), SmallIcon("zoom-out"),
                               "Alt+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeH()),
                               actionCollection(), "decreaseh");
41effe8d 2014-10-13 20:11:21 Timothy Pearson 
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/yakuake
M cmake
 
diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090