Mercurial > octave-nkf
changeset 17619:4288b90f18c4
icons for news and release notes widgets
* letter_logo_NewsDockWidget.png, graphic_logo_NewsDockWidget.png,
letter_logo_ReleaseWidget.png, graphic_logo_ReleaseWidget.png: new icons
* libgui/module.mk: new icons files added
* resource.qrc: new icons files added
* main-window.cc(display_url_in_window): set window title and icon;
(notice_settings): set the desired icon for the release notes widget
* main-window.h: new variable for icon of release notes widget
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Wed, 09 Oct 2013 21:06:40 +0200 |
| parents | 77eff9c6fb09 |
| children | 83e6baf0bc3f |
| files | libgui/src/icons/graphic_logo_NewsDockWidget.png libgui/src/icons/graphic_logo_ReleaseWidget.png libgui/src/icons/letter_logo_NewsDockWidget.png libgui/src/icons/letter_logo_ReleaseWidget.png libgui/src/main-window.cc libgui/src/main-window.h libgui/src/module.mk libgui/src/resource.qrc |
| diffstat | 8 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Wed Oct 09 13:53:12 2013 -0400 +++ b/libgui/src/main-window.cc Wed Oct 09 21:06:40 2013 +0200 @@ -268,6 +268,8 @@ vlayout->addWidget (browser); w->setLayout (vlayout); + w->setWindowTitle (tr ("Octave Release Notes")); + w->setWindowIcon (QIcon (_release_notes_icon)); w->show (); w->raise (); w->activateWindow (); @@ -368,6 +370,11 @@ widget->setWindowIcon (QIcon (icon)); } } + if (widget_icon_data[icon_set_found].name != "NONE") + _release_notes_icon = widget_icon_data[icon_set_found].path + + "ReleaseWidget.png"; + else + _release_notes_icon = ":/actions/icons/logo.png"; int icon_size = settings->value ("toolbar_icon_size",24).toInt (); _main_tool_bar->setIconSize (QSize (icon_size,icon_size));
--- a/libgui/src/main-window.h Wed Oct 09 13:53:12 2013 -0400 +++ b/libgui/src/main-window.h Wed Oct 09 21:06:40 2013 +0200 @@ -291,6 +291,8 @@ return list; } + QString _release_notes_icon; + QToolBar *_main_tool_bar; QMenu *_debug_menu;
--- a/libgui/src/module.mk Wed Oct 09 13:53:12 2013 -0400 +++ b/libgui/src/module.mk Wed Oct 09 21:06:40 2013 +0200 @@ -36,8 +36,10 @@ src/icons/graphic_logo_FileEditor.png \ src/icons/graphic_logo_FilesDockWidget.png \ src/icons/graphic_logo_HistoryDockWidget.png \ + src/icons/graphic_logo_NewsDockWidget.png \ src/icons/graphic_logo_TerminalDockWidget.png \ src/icons/graphic_logo_WorkspaceView.png \ + src/icons/graphic_logo_ReleaseWidget.png \ src/icons/help_index.png \ src/icons/home.png \ src/icons/icons_license \ @@ -46,8 +48,10 @@ src/icons/letter_logo_FileEditor.png \ src/icons/letter_logo_FilesDockWidget.png \ src/icons/letter_logo_HistoryDockWidget.png \ + src/icons/letter_logo_NewsDockWidget.png \ src/icons/letter_logo_TerminalDockWidget.png \ src/icons/letter_logo_WorkspaceView.png \ + src/icons/letter_logo_ReleaseWidget.png \ src/icons/logo.png \ src/icons/ok.png \ src/icons/question.png \
--- a/libgui/src/resource.qrc Wed Oct 09 13:53:12 2013 -0400 +++ b/libgui/src/resource.qrc Wed Oct 09 21:06:40 2013 +0200 @@ -46,16 +46,20 @@ <file>icons/db_stop.png</file> <file>icons/letter_logo_FilesDockWidget.png</file> <file>icons/letter_logo_FileEditor.png</file> + <file>icons/letter_logo_NewsDockWidget.png</file> <file>icons/letter_logo_TerminalDockWidget.png</file> <file>icons/letter_logo_HistoryDockWidget.png</file> <file>icons/letter_logo_WorkspaceView.png</file> <file>icons/letter_logo_DocumentationDockWidget.png</file> + <file>icons/letter_logo_ReleaseWidget.png</file> <file>icons/graphic_logo_FilesDockWidget.png</file> <file>icons/graphic_logo_FileEditor.png</file> + <file>icons/graphic_logo_NewsDockWidget.png</file> <file>icons/graphic_logo_TerminalDockWidget.png</file> <file>icons/graphic_logo_HistoryDockWidget.png</file> <file>icons/graphic_logo_WorkspaceView.png</file> <file>icons/graphic_logo_DocumentationDockWidget.png</file> + <file>icons/graphic_logo_ReleaseWidget.png</file> <file>icons/widget-close.png</file> <file>icons/widget-dock.png</file> <file>icons/widget-undock.png</file>