# HG changeset patch # User Torsten # Date 1381345600 -7200 # Node ID 4288b90f18c429946a72de28a219f234ee87ac7e # Parent 77eff9c6fb09e3197677f4725966383415c0daa9 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 diff -r 77eff9c6fb09 -r 4288b90f18c4 libgui/src/icons/graphic_logo_NewsDockWidget.png Binary file libgui/src/icons/graphic_logo_NewsDockWidget.png has changed diff -r 77eff9c6fb09 -r 4288b90f18c4 libgui/src/icons/graphic_logo_ReleaseWidget.png Binary file libgui/src/icons/graphic_logo_ReleaseWidget.png has changed diff -r 77eff9c6fb09 -r 4288b90f18c4 libgui/src/icons/letter_logo_NewsDockWidget.png Binary file libgui/src/icons/letter_logo_NewsDockWidget.png has changed diff -r 77eff9c6fb09 -r 4288b90f18c4 libgui/src/icons/letter_logo_ReleaseWidget.png Binary file libgui/src/icons/letter_logo_ReleaseWidget.png has changed diff -r 77eff9c6fb09 -r 4288b90f18c4 libgui/src/main-window.cc --- 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)); diff -r 77eff9c6fb09 -r 4288b90f18c4 libgui/src/main-window.h --- 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; diff -r 77eff9c6fb09 -r 4288b90f18c4 libgui/src/module.mk --- 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 \ diff -r 77eff9c6fb09 -r 4288b90f18c4 libgui/src/resource.qrc --- 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 @@ icons/db_stop.png icons/letter_logo_FilesDockWidget.png icons/letter_logo_FileEditor.png + icons/letter_logo_NewsDockWidget.png icons/letter_logo_TerminalDockWidget.png icons/letter_logo_HistoryDockWidget.png icons/letter_logo_WorkspaceView.png icons/letter_logo_DocumentationDockWidget.png + icons/letter_logo_ReleaseWidget.png icons/graphic_logo_FilesDockWidget.png icons/graphic_logo_FileEditor.png + icons/graphic_logo_NewsDockWidget.png icons/graphic_logo_TerminalDockWidget.png icons/graphic_logo_HistoryDockWidget.png icons/graphic_logo_WorkspaceView.png icons/graphic_logo_DocumentationDockWidget.png + icons/graphic_logo_ReleaseWidget.png icons/widget-close.png icons/widget-dock.png icons/widget-undock.png