Mercurial > octave
changeset 18026:50bce63dbb04 stable
add fallback for theme warning icon
* icons/warning.png: New file.
* libgui/src/module.mk (octave_gui_ICONS): Add it to the list.
* libgui/src/resource.qrc: Include warning.png.
* main-window.cc (main_window::construct_warning_bar):
Use warning.png as fallback for theme "dialog-warning" icon.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 27 Nov 2013 01:40:29 -0500 |
| parents | 7c0f59b688fc |
| children | f1d791ffeeb4 |
| files | libgui/src/icons/warning.png libgui/src/main-window.cc libgui/src/module.mk libgui/src/resource.qrc |
| diffstat | 4 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Tue Nov 26 20:59:00 2013 -0800 +++ b/libgui/src/main-window.cc Wed Nov 27 01:40:29 2013 -0500 @@ -1780,7 +1780,9 @@ QFrame *box = new QFrame (warning_bar); QLabel *icon = new QLabel (box); - QIcon warning_icon = QIcon::fromTheme ("dialog-warning"); + QIcon warning_icon + = QIcon::fromTheme ("dialog-warning", + QIcon (":/actions/icons/warning.png")); QPixmap icon_pixmap = warning_icon.pixmap (QSize (32, 32)); icon->setPixmap (icon_pixmap);
--- a/libgui/src/module.mk Tue Nov 26 20:59:00 2013 -0800 +++ b/libgui/src/module.mk Wed Nov 27 01:40:29 2013 -0500 @@ -67,6 +67,7 @@ src/icons/terminal.png \ src/icons/undo.png \ src/icons/up.png \ + src/icons/warning.png \ src/icons/widget-close.png \ src/icons/widget-dock.png \ src/icons/widget-undock.png \
--- a/libgui/src/resource.qrc Tue Nov 26 20:59:00 2013 -0800 +++ b/libgui/src/resource.qrc Wed Nov 27 01:40:29 2013 -0500 @@ -63,6 +63,7 @@ <file>icons/graphic_logo_WorkspaceView.png</file> <file>icons/graphic_logo_DocumentationDockWidget.png</file> <file>icons/graphic_logo_ReleaseWidget.png</file> + <file>icons/warning.png</file> <file>icons/widget-close.png</file> <file>icons/widget-dock.png</file> <file>icons/widget-undock.png</file>