octave: libgui/src/welcome-wizard.cc annotate

annotate libgui/src/welcome-wizard.cc @ 31619:ad014fc78bd6

use individual local gui_settings objects Previously, we created a single gui_settings object (derived from QSettings) and accessed it from the resource_manager object. That design is not necessary and is not the way QSettings was designed to be used. Instead of managing a single object, we should be using individual QSettings objects where needed. Each individual QSettings object manages thread-safe access to a single global collection of settings. The Qt docs say that operations on QSettings are not thread safe, but that means that you can't create a QSettings object in one thread and use it in another without some locking. I'm not sure whether we were doing that correctly, but with this change it no longer matters. Each QSettings object does perform locking when reading or writing the underlying global data. * resource-manager.h, resource-manager.cc (resource_manager::m_settings): Delete data member. (resource_manager::get_settings): Delete. * annotation-dialog.cc, QTerminal.cc, QTerminal.h, command-widget.cc, command-widget.h, community-news.cc, dialog.cc, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, history-dock-widget.cc, history-dock-widget.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, octave-qscintilla.cc, main-window.cc, main-window.h, news-reader.cc, octave-dock-widget.cc, octave-dock-widget.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, resource-manager.cc, resource-manager.h, set-path-dialog.cc, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, workspace-model.cc, workspace-model.h, workspace-view.cc: Use local gui_settings objects instead of accessing a pointer to a single gui_settings object owned by the resource_manager object.

author	John W. Eaton <jwe@octave.org>
date	Fri, 02 Dec 2022 14:23:53 -0500
parents	04601f6c47f4
children	474e184321d3

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	3 // Copyright (C) 2011-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
13674 c0e66d6e3dc8 Updated license headers and moved to AGPLv3. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13668 diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	27 # include "config.h"
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	28 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	29
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	30 #include <QApplication>
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	31 #include <QHBoxLayout>
17937 f87a7e161710 * welcome-wizard.h, welcome-wizard.cc: Rewrite. John W. Eaton <jwe@octave.org> parents: 17935 diff changeset	32 #include <QPushButton>
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	33 #include <QVBoxLayout>
0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	34
21979 d04da18a407a use OCTAVE_USE_WINDOWS_API more consistently John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	35 #if defined (OCTAVE_USE_WINDOWS_API)
19886 17d21d68888d GUI: force show of welcome wizard when displayed (Bug #41074) John Donoghue parents: 19861 diff changeset	36 #define WIN32_LEAN_AND_MEAN
17d21d68888d GUI: force show of welcome wizard when displayed (Bug #41074) John Donoghue parents: 19861 diff changeset	37 #include <windows.h>
17d21d68888d GUI: force show of welcome wizard when displayed (Bug #41074) John Donoghue parents: 19861 diff changeset	38 #endif
17d21d68888d GUI: force show of welcome wizard when displayed (Bug #41074) John Donoghue parents: 19861 diff changeset	39
30964 04601f6c47f4 fix broken icon path after new icon structure in GUI Torsten Lilge <ttl-octave@mailbox.org> parents: 30690 diff changeset	40 #include "gui-preferences-dw.h"
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	41 #include "gui-preferences-nr.h"
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 30964 diff changeset	42 #include "gui-settings.h"
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27628 diff changeset	43 #include "octave-qobject.h"
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	44 #include "welcome-wizard.h"
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	45
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	46 namespace octave
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	47 {
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	48 static QLabel *
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	49 make_octave_logo (QWidget *p = nullptr, int height = 100)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	50 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	51 QLabel *logo = new QLabel (p);
30964 04601f6c47f4 fix broken icon path after new icon structure in GUI Torsten Lilge <ttl-octave@mailbox.org> parents: 30690 diff changeset	52 QPixmap logo_pixmap (dw_icon_set_names["NONE"]);
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	53 logo->setPixmap (logo_pixmap.scaledToHeight (height));
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	54 return logo;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	55 };
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	56
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27628 diff changeset	57 welcome_wizard::welcome_wizard (base_qobject& oct_qobj, QWidget *p)
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27628 diff changeset	58 : QDialog (p), m_octave_qobj (oct_qobj), m_page_ctor_list (),
27644 cca325162ed7 eliminate need for global access to resource manager in welcome wizard objects John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	59 m_page_list_iterator (),
cca325162ed7 eliminate need for global access to resource manager in welcome wizard objects John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	60 m_current_page (initial_page::create (oct_qobj, this)),
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	61 m_allow_web_connect_state (false),
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	62 m_max_height (0), m_max_width (0)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	63 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	64 m_page_ctor_list.push_back (initial_page::create);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	65 m_page_ctor_list.push_back (setup_community_news::create);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	66 m_page_ctor_list.push_back (final_page::create);
17937 f87a7e161710 * welcome-wizard.h, welcome-wizard.cc: Rewrite. John W. Eaton <jwe@octave.org> parents: 17935 diff changeset	67
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	68 m_page_list_iterator = m_page_ctor_list.begin ();
17937 f87a7e161710 * welcome-wizard.h, welcome-wizard.cc: Rewrite. John W. Eaton <jwe@octave.org> parents: 17935 diff changeset	69
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	70 setWindowTitle (tr ("Welcome to GNU Octave"));
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	71
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	72 setEnabled (true);
26643 5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	73
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	74 setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
26643 5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	75
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	76 // Create all pages for pre-setting the minimal required size for all pages
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	77 show_page ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	78 adjust_size ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	79 next_page ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	80 adjust_size ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	81 next_page ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	82 adjust_size ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	83 // now go back to the first page
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	84 previous_page ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	85 previous_page ();
26643 5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	86
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	87 // Set the size determined above
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	88 resize (m_max_width, m_max_height);
19886 17d21d68888d GUI: force show of welcome wizard when displayed (Bug #41074) John Donoghue parents: 19861 diff changeset	89
21979 d04da18a407a use OCTAVE_USE_WINDOWS_API more consistently John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	90 #if defined (OCTAVE_USE_WINDOWS_API)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	91 // HACK to forceshow of dialog if started minimized
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	92 ShowWindow (reinterpret_cast<HWND> (winId ()), SW_SHOWNORMAL);
19886 17d21d68888d GUI: force show of welcome wizard when displayed (Bug #41074) John Donoghue parents: 19861 diff changeset	93 #endif
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	94 }
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	95
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	96 void welcome_wizard::adjust_size (void)
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	97 {
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	98 // Get adjusted size for the current page
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	99 adjustSize ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	100 QSize sz = size ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	101
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	102 // Update the max. size of the three pages if required
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	103
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	104 if (sz.height () > m_max_height)
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	105 m_max_height = sz.height ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	106
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	107 if (sz.width () > m_max_width)
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	108 m_max_width = sz.width ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	109 }
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	110
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	111 void welcome_wizard::handle_web_connect_option (int state)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	112 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	113 m_allow_web_connect_state = state == Qt::Checked;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	114 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	115
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	116 void welcome_wizard::show_page (void)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	117 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	118 delete m_current_page;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	119 delete layout ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	120
27644 cca325162ed7 eliminate need for global access to resource manager in welcome wizard objects John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	121 m_current_page = (*m_page_list_iterator) (m_octave_qobj, this);
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17937 diff changeset	122
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	123 QVBoxLayout *new_layout = new QVBoxLayout ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	124 setLayout (new_layout);
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	125
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	126 new_layout->addWidget (m_current_page);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	127 }
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	128
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	129 void welcome_wizard::previous_page (void)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	130 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	131 --m_page_list_iterator;
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	132
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	133 show_page ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	134 }
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	135
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	136 void welcome_wizard::next_page (void)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	137 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	138 ++m_page_list_iterator;
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	139
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	140 show_page ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	141 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	142
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	143 void welcome_wizard::accept (void)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	144 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	145 // Create default settings file.
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	146
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27628 diff changeset	147 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27628 diff changeset	148 rmgr.reload_settings ();
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	149
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 30964 diff changeset	150 gui_settings settings;
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	151
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 30964 diff changeset	152 settings.setValue (nr_allow_connection.key,
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 30964 diff changeset	153 m_allow_web_connect_state);
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17937 diff changeset	154
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 30964 diff changeset	155 settings.sync ();
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17937 diff changeset	156
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	157 QDialog::accept ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	158 }
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17937 diff changeset	159
27644 cca325162ed7 eliminate need for global access to resource manager in welcome wizard objects John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	160 initial_page::initial_page (base_qobject& oct_qobj, welcome_wizard *wizard)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	161 : QWidget (wizard),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	162 m_title (new QLabel (tr ("Welcome to Octave!"), this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	163 m_message (new QLabel (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	164 m_logo (make_octave_logo (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	165 m_next (new QPushButton (tr ("Next"), this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	166 m_cancel (new QPushButton (tr ("Cancel"), this))
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	167 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	168 QFont ft;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	169 ft.setPointSize (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	170 m_title->setFont (ft);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	171
27644 cca325162ed7 eliminate need for global access to resource manager in welcome wizard objects John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	172 resource_manager& rmgr = oct_qobj.get_resource_manager ();
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	173
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	174 m_message->setText
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	175 (tr ("<html><body>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	176 "<p>You seem to be using the Octave graphical interface for the first time on this computer.\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	177 "Click 'Next' to create a configuration file and launch Octave.</p>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	178 "<p>The configuration file is stored in<br>%1.</p>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	179 "</body></html>").
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	180 arg (rmgr.get_settings_file ()));
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	181 m_message->setWordWrap (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	182 m_message->setMinimumWidth (400);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	183
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	184 QVBoxLayout *message_layout = new QVBoxLayout;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	185
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	186 message_layout->addWidget (m_title);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	187 message_layout->addWidget (m_message);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	188
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	189 QHBoxLayout *message_and_logo = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	190
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	191 message_and_logo->addLayout (message_layout);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	192 message_and_logo->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	193 message_and_logo->addWidget (m_logo, 0, Qt::AlignTop);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	194
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	195 QHBoxLayout *button_bar = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	196
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	197 button_bar->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	198 button_bar->addWidget (m_next);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	199 button_bar->addWidget (m_cancel);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	200
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	201 QVBoxLayout *page_layout = new QVBoxLayout (this);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	202 setLayout (page_layout);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	203
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	204 page_layout->addLayout (message_and_logo);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	205 page_layout->addStretch (10);
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	206 page_layout->addSpacing (20);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	207 page_layout->addLayout (button_bar);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	208
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	209 setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	210
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	211 m_next->setDefault (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	212 m_next->setFocus ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	213
29542 3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	214 connect (m_next, &QPushButton::clicked, wizard, &welcome_wizard::next_page);
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	215 connect (m_cancel, &QPushButton::clicked, wizard, &welcome_wizard::reject);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	216 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	217
27644 cca325162ed7 eliminate need for global access to resource manager in welcome wizard objects John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	218 setup_community_news::setup_community_news (base_qobject&,
cca325162ed7 eliminate need for global access to resource manager in welcome wizard objects John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	219 welcome_wizard *wizard)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	220 : QWidget (wizard),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	221 m_title (new QLabel (tr ("Community News"), this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	222 m_message (new QLabel (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	223 m_checkbox (new QCheckBox (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	224 m_checkbox_message (new QLabel (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	225 m_logo (make_octave_logo (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	226 m_previous (new QPushButton (tr ("Previous"), this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	227 m_next (new QPushButton (tr ("Next"), this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	228 m_cancel (new QPushButton (tr ("Cancel"), this))
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	229 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	230 QFont ft;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	231 ft.setPointSize (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	232 m_title->setFont (ft);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	233
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	234 m_message->setText
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	235 (tr ("<html><body>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	236 "<p>When Octave starts, it will optionally check the Octave web site for current news and information about the Octave community.\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	237 "The check will happen at most once each day and news will only be displayed if there is something new since the last time you viewed the news.</p>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	238 "<p>You may also view the news by selecting the \"Community News\" item in the \"Help\" menu, or by visiting\n"
25024 3c817af70eed maint: use https for all Octave project URLs Mike Miller <mtmiller@octave.org> parents: 24718 diff changeset	239 "<a href=\"https://octave.org/community-news.html\">https://octave.org/community-news.html</a>.</p>\n"
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	240 "</body></html>"));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	241 m_message->setWordWrap (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	242 m_message->setMinimumWidth (400);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	243 m_message->setOpenExternalLinks (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	244
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	245 QVBoxLayout *message_layout = new QVBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	246
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	247 message_layout->addWidget (m_title);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	248 message_layout->addWidget (m_message);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	249
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	250 QHBoxLayout *message_and_logo = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	251
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	252 message_and_logo->addLayout (message_layout);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	253 message_and_logo->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	254 message_and_logo->addWidget (m_logo, 0, Qt::AlignTop);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	255
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	256 QHBoxLayout *checkbox_layout = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	257
27613 deb8877f2c34 use symbolic constants for preferences key and default values in news reader Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	258 bool allow_connection = nr_allow_connection.def.toBool ();
deb8877f2c34 use symbolic constants for preferences key and default values in news reader Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	259 if (allow_connection)
deb8877f2c34 use symbolic constants for preferences key and default values in news reader Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	260 m_checkbox->setCheckState (Qt::Checked);
deb8877f2c34 use symbolic constants for preferences key and default values in news reader Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	261 else
deb8877f2c34 use symbolic constants for preferences key and default values in news reader Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	262 m_checkbox->setCheckState (Qt::Unchecked);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	263
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	264 m_checkbox_message->setText
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	265 (tr ("<html><head>\n"
26786 bb3a441addb0 * welcome-wizard.cc (setup_community_news): fix incorrect head tag Torsten <mttl@mailbox.org> parents: 26643 diff changeset	266 "</head><body>\n"
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	267 "<p>Allow Octave to connect to the Octave web site when it starts to display current news and information about the Octave community.</p>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	268 "</body></html>"));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	269 m_checkbox_message->setWordWrap (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	270 m_checkbox_message->setOpenExternalLinks (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	271 m_checkbox_message->setMinimumWidth (500);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	272
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	273 checkbox_layout->addWidget (m_checkbox, 0, Qt::AlignTop);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	274 checkbox_layout->addSpacing (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	275 checkbox_layout->addWidget (m_checkbox_message, 0, Qt::AlignTop);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	276 checkbox_layout->addStretch (10);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	277
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	278 QVBoxLayout *message_logo_and_checkbox = new QVBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	279
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	280 message_logo_and_checkbox->addLayout (message_and_logo);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	281 message_logo_and_checkbox->addSpacing (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	282 message_logo_and_checkbox->addLayout (checkbox_layout);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	283
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	284 QHBoxLayout *button_bar = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	285
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	286 button_bar->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	287 button_bar->addWidget (m_previous);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	288 button_bar->addWidget (m_next);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	289 button_bar->addWidget (m_cancel);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	290
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	291 QVBoxLayout *page_layout = new QVBoxLayout (this);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	292 setLayout (page_layout);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	293
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	294 page_layout->addLayout (message_logo_and_checkbox);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	295 page_layout->addStretch (10);
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	296 page_layout->addSpacing (20);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	297 page_layout->addLayout (button_bar);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	298
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	299 setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	300
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	301 m_next->setDefault (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	302 m_next->setFocus ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	303
29542 3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	304 connect (m_checkbox, &QCheckBox::stateChanged,
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	305 wizard, &welcome_wizard::handle_web_connect_option);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	306
29542 3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	307 connect (m_previous, &QPushButton::clicked, wizard, &welcome_wizard::previous_page);
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	308 connect (m_next, &QPushButton::clicked, wizard, &welcome_wizard::next_page);
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	309 connect (m_cancel, &QPushButton::clicked, wizard, &welcome_wizard::reject);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	310 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	311
27644 cca325162ed7 eliminate need for global access to resource manager in welcome wizard objects John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	312 final_page::final_page (base_qobject&, welcome_wizard *wizard)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	313 : QWidget (wizard),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	314 m_title (new QLabel (tr ("Enjoy!"), this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	315 m_message (new QLabel (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	316 m_logo (make_octave_logo (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	317 m_links (new QLabel (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	318 m_previous (new QPushButton (tr ("Previous"), this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	319 m_finish (new QPushButton (tr ("Finish"), this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	320 m_cancel (new QPushButton (tr ("Cancel"), this))
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	321 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	322 QFont ft;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	323 ft.setPointSize (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	324 m_title->setFont (ft);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	325
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	326 m_message->setText
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	327 (tr ("<html><body>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	328 "<p>We hope you find Octave to be a useful tool.</p>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	329 "<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other community-based support channels.\n"
25024 3c817af70eed maint: use https for all Octave project URLs Mike Miller <mtmiller@octave.org> parents: 24718 diff changeset	330 "You can find more information about each of these by visiting <a href=\"https://octave.org/support.html\">https://octave.org/support.html</a> (opens in external browser).</p>\n"
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	331 "</body></html>"));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	332 m_message->setWordWrap (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	333 m_message->setMinimumWidth (400);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	334 m_message->setOpenExternalLinks (true);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	335
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	336 QVBoxLayout *message_layout = new QVBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	337
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	338 message_layout->addWidget (m_title);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	339 message_layout->addWidget (m_message);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	340
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	341 QHBoxLayout *message_and_logo = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	342
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	343 message_and_logo->addLayout (message_layout);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	344 message_and_logo->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	345 message_and_logo->addWidget (m_logo, 0, Qt::AlignTop);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	346
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	347 m_links->setText
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	348 (tr ("<html><head>\n"
26333 13c62f51e830 welcome-wizard.cc: Fix 2 typos in HTML. (bug #55347) Doug Stewart parents: 25054 diff changeset	349 "</head><body>\n"
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	350 "<p>For more information about Octave:</p>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	351 "<ul>\n"
25024 3c817af70eed maint: use https for all Octave project URLs Mike Miller <mtmiller@octave.org> parents: 24718 diff changeset	352 "<li>Visit <a href=\"https://octave.org\">https://octave.org</a> (opens in external browser)</li>\n"
26333 13c62f51e830 welcome-wizard.cc: Fix 2 typos in HTML. (bug #55347) Doug Stewart parents: 25054 diff changeset	353 "<li>Get the documentation online as <a href=\"https://www.gnu.org/software/octave/doc/interpreter/index.html\">html</a>- or <a href=\"https://www.gnu.org/software/octave/octave.pdf\">pdf</a>-document (opens in external browser)</li>\n"
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	354 "<li>Open the documentation browser of the Octave GUI with the help menu</li>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	355 "</ul>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	356 "</body></html>"));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	357 m_links->setWordWrap (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	358 m_links->setOpenExternalLinks (true);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	359
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	360 QHBoxLayout *button_bar = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	361
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	362 button_bar->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	363 button_bar->addWidget (m_previous);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	364 button_bar->addWidget (m_finish);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	365 button_bar->addWidget (m_cancel);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	366
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	367 QVBoxLayout *page_layout = new QVBoxLayout (this);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	368 setLayout (page_layout);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	369
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	370 page_layout->addLayout (message_and_logo);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	371 page_layout->addSpacing (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	372 page_layout->addWidget (m_links);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	373 page_layout->addStretch (10);
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	374 page_layout->addSpacing (20);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	375 page_layout->addLayout (button_bar);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	376
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	377 setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	378
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	379 m_finish->setDefault (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	380 m_finish->setFocus ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	381
29542 3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	382 connect (m_previous, &QPushButton::clicked,
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	383 wizard, &welcome_wizard::previous_page);
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	384 connect (m_finish, &QPushButton::clicked, wizard, &welcome_wizard::accept);
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29523 diff changeset	385 connect (m_cancel, &QPushButton::clicked, wizard, &welcome_wizard::reject);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	386 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	387 }

Mercurial > octave

annotate libgui/src/welcome-wizard.cc @ 31619:ad014fc78bd6