Mercurial > octave
view libgui/src/community-news.cc @ 30964:04601f6c47f4
fix broken icon path after new icon structure in GUI
* community-news.cc: use window icon configured in the preferences
* documentation-dock-widget.cc (documentation_dock_widget)
* files-dock-widget.cc (files_dock_widget)
* history-dock-widget.cc (history_dock_widget)
* terminal-dock-widget.cc (terminal_dock_widget)
* variable-editor.cc (variable_editor)
* workspace-view.cc (workspace_view)
do not set window icon here as it is set in the main window
* gui-preferences-dw.h: organize dw_icon_set_names in a hash
* file-editor.cc (notice_settings): fix path to tab close icon on mac
* find-dialog.cc (find_dialog): do not set window icon here, it is
already set by the editor
* main-window.cc (notice_settings): set dok widget icons using the
new hash structure of available icon sets
(construct): use global const settings instead of literal string
for main window icon
* octave-qobject.cc (release_notes_widget): pass base qobject
to the release note constructor
* release-notes.cc (release_notes): get qbase object as argument,
get desired window icon from settings
* release-notes.h: constructor with base object as argument
* variable-editor.cc (toplevel_change): use icon path from const
preferences instead of literal strings
* welcome-wizard.cc (make_octave_logo): use icon path from const
preferences instead of literal strings
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Sat, 23 Apr 2022 18:10:45 +0200 |
parents | e2c8c852399e |
children | ad014fc78bd6 c6d54dd31a7e |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2011-2022 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // This file is part of Octave. // // Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <QLayout> #include <QTextBrowser> #include <QThread> #include "community-news.h" #include "gui-utils.h" #include "gui-preferences-dw.h" #include "gui-preferences-nr.h" #include "news-reader.h" #include "octave-qobject.h" namespace octave { community_news::community_news (base_qobject& oct_qobj, int serial) : QWidget (nullptr), m_browser (nullptr) { construct (oct_qobj, "https://octave.org", "community-news.html", serial); } community_news::community_news (base_qobject& oct_qobj, QWidget *parent, const QString& base_url, const QString& page, int serial) : QWidget (parent), m_browser (nullptr) { construct (oct_qobj, base_url, page, serial); } void community_news::construct (base_qobject& oct_qobj, const QString& base_url, const QString& page, int serial) { m_browser = new QTextBrowser (this); m_browser->setObjectName ("OctaveNews"); m_browser->setOpenExternalLinks (true); QVBoxLayout *vlayout = new QVBoxLayout; vlayout->addWidget (m_browser); setLayout (vlayout); setWindowTitle (tr ("Octave Community News")); int win_x, win_y; get_screen_geometry (win_x, win_y); resize (win_x/2, win_y/2); move ((win_x - width ())/2, (win_y - height ())/2); resource_manager& rmgr = oct_qobj.get_resource_manager (); gui_settings *settings = rmgr.get_settings (); QString icon; QString icon_set = settings->value (dw_icon_set).toString (); if (icon_set != "NONE") // No extra icon for Community news, take the one of the release notes icon = dw_icon_set_names[icon_set] + "ReleaseWidget.png"; else icon = dw_icon_set_names[icon_set]; setWindowIcon (QIcon (icon)); // FIXME: This is a news reader preference, so shouldn't it be used // in the news_reader object? bool connect_to_web = (settings ? settings->value (nr_allow_connection).toBool () : true); QThread *worker_thread = new QThread; news_reader *reader = new news_reader (oct_qobj, base_url, page, serial, connect_to_web); reader->moveToThread (worker_thread); connect (reader, &news_reader::display_news_signal, this, &community_news::set_news); connect (worker_thread, &QThread::started, reader, &news_reader::process); connect (reader, &news_reader::finished, worker_thread, &QThread::quit); connect (reader, &news_reader::finished, reader, &news_reader::deleteLater); connect (worker_thread, &QThread::finished, worker_thread, &QThread::deleteLater); worker_thread->start (); } void community_news::set_news (const QString& news) { m_browser->setHtml (news); } void community_news::display (void) { if (! isVisible ()) show (); else if (isMinimized ()) showNormal (); raise (); activateWindow (); } }