Mercurial > octave

changeset 18002:67978cb5d269

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix icons for the release and community windows * main-window.cc (display_release_notes): set actual window icon for already existing window, too (display_community_news): use same icon for communiy as for release window
author Torsten <ttl@justmail.de>
date Mon, 25 Nov 2013 19:27:42 +0100
parents a51e4904ca1b
children f25ac324b6d4
files libgui/src/main-window.cc
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Mon Nov 25 19:10:48 2013 +0100
+++ b/libgui/src/main-window.cc	Mon Nov 25 19:27:42 2013 +0100
@@ -326,7 +326,6 @@
 
       release_notes_window->setLayout (vlayout);
       release_notes_window->setWindowTitle (tr ("Octave Release Notes"));
-      release_notes_window->setWindowIcon (QIcon (_release_notes_icon));
 
       browser->document()->adjustSize ();
       QSize doc_size = browser->document()->size().toSize ();
@@ -344,6 +343,8 @@
   else if (release_notes_window->isMinimized ())
     release_notes_window->showNormal ();
 
+  release_notes_window->setWindowIcon (QIcon (_release_notes_icon));
+
   release_notes_window->raise ();
   release_notes_window->activateWindow ();
 }
@@ -511,7 +512,6 @@
 
       community_news_window->setLayout (vlayout);
       community_news_window->setWindowTitle (tr ("Octave Community News"));
-      community_news_window->setWindowIcon (QIcon (":/icons/logo.png"));
       community_news_window->resize (640, 480);
       int win_x = QApplication::desktop ()->width ();
       int win_y = QApplication::desktop ()->height ();
@@ -524,6 +524,9 @@
   else if (community_news_window->isMinimized ())
     community_news_window->showNormal ();
 
+  // same icon as release notes
+  community_news_window->setWindowIcon (QIcon (_release_notes_icon));
+
   community_news_window->raise ();
   community_news_window->activateWindow ();
 }