# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1426210337 14400
# Node ID 29fe196d2ce05ef953bc9c181a5b17ef4315df20
# Parent  2d5cbb6ac845dcb71b71602d4627131446a2ed8c
GUI: use reource manager for command window icons (Bug #44528)

* libgui/qterminal/libqterminal/QTerminal.h
  (toplevel): include resource-manager.h
  (QTerminal::QTerminal): Use resource manager icons for copy and paste menus

* libgui/qterminal-module.mk:
  (qterminal_libqterminal_la_CPPFLAGS): add -I libgui/src

diff -r 2d5cbb6ac845 -r 29fe196d2ce0 libgui/qterminal-module.mk
--- a/libgui/qterminal-module.mk	Thu Mar 12 15:00:32 2015 -0700
+++ b/libgui/qterminal-module.mk	Thu Mar 12 21:32:17 2015 -0400
@@ -35,7 +35,8 @@
 qterminal_libqterminal_la_CPPFLAGS = \
   $(AM_CPPFLAGS) \
   @QT_CPPFLAGS@ \
-  -I$(srcdir)/qterminal/libqterminal
+  -I$(srcdir)/qterminal/libqterminal \
+  -I$(srcdir)/src
 
 qterminal_libqterminal_la_CFLAGS = $(AM_CFLAGS)
 
diff -r 2d5cbb6ac845 -r 29fe196d2ce0 libgui/qterminal/libqterminal/QTerminal.h
--- a/libgui/qterminal/libqterminal/QTerminal.h	Thu Mar 12 15:00:32 2015 -0700
+++ b/libgui/qterminal/libqterminal/QTerminal.h	Thu Mar 12 21:32:17 2015 -0400
@@ -35,6 +35,8 @@
 #include <QApplication>
 #include <QAction>
 
+#include "resource-manager.h"
+
 class QTerminal : public QWidget
 {
   Q_OBJECT
@@ -127,11 +129,11 @@
     _contextMenu = new QMenu (this);
 
     _copy_action = _contextMenu->addAction (
-                     QIcon::fromTheme ("edit-copy", QIcon (":/actions/icons/edit-copy.svg")),
+                     resource_manager::icon ("edit-copy"),
                      tr ("Copy"), this, SLOT (copyClipboard ()));
 
     _paste_action = _contextMenu->addAction (
-                     QIcon::fromTheme ("edit-paste", QIcon (":/actions/icons/edit-paste.svg")),
+                     resource_manager::icon ("edit-paste"),
                       tr ("Paste"), this, SLOT (pasteClipboard ()));
 
     _contextMenu->addSeparator ();