Mercurial > hg > octave-nkf
changeset 20145:29fe196d2ce0
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
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Thu, 12 Mar 2015 21:32:17 -0400 |
| parents | 2d5cbb6ac845 |
| children | f134ee404041 |
| files | libgui/qterminal-module.mk libgui/qterminal/libqterminal/QTerminal.h |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal-module.mk +++ b/libgui/qterminal-module.mk @@ -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)
--- a/libgui/qterminal/libqterminal/QTerminal.h +++ b/libgui/qterminal/libqterminal/QTerminal.h @@ -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 ();