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

annotate libgui/src/welcome-wizard.cc @ 27620:45bb5bbaf291

don't use singleton pattern for resource manager in GUI Move ownership of the resource_manager object to the base_qobject class. Store reference to resource_manager object as a member variable in most objects that need to access it. Eliminate static member functions in resource_managar class. Provide a get_resource_manager method in the base_qboject class and a global __get_resource_manager__ function for those instances where we can't easily provide local access to the resource_manager object. There are many changes to many files, but most are straightforward.

author	John W. Eaton <jwe@octave.org>
date	Fri, 01 Nov 2019 18:16:49 -0400
parents	deb8877f2c34
children	a2b147e2b603

rev	line source
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	1 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26333 diff changeset	3 Copyright (C) 2013-2019 John W. Eaton
00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26333 diff changeset	4 Copyright (C) 2011-2019 Jacob Dawid
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24118 diff changeset	8 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	9 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24118 diff changeset	10 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	11 (at your option) any later version.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	16 GNU General Public License for more details.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	18 You should have received a copy of the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	19 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24118 diff changeset	20 <https://www.gnu.org/licenses/>.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	22 */
13674 c0e66d6e3dc8 Updated license headers and moved to AGPLv3. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13668 diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	25 # include "config.h"
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	26 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	27
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	28 #include <QApplication>
26643 5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	29 #include <QDesktopWidget>
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	30 #include <QHBoxLayout>
17937 f87a7e161710 * welcome-wizard.h, welcome-wizard.cc: Rewrite. John W. Eaton <jwe@octave.org> parents: 17935 diff changeset	31 #include <QPushButton>
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	32 #include <QVBoxLayout>
0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	33
21979 d04da18a407a use OCTAVE_USE_WINDOWS_API more consistently John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	34 #if defined (OCTAVE_USE_WINDOWS_API)
19886 17d21d68888d GUI: force show of welcome wizard when displayed (Bug #41074) John Donoghue parents: 19861 diff changeset	35 #define WIN32_LEAN_AND_MEAN
17d21d68888d GUI: force show of welcome wizard when displayed (Bug #41074) John Donoghue parents: 19861 diff changeset	36 #include <windows.h>
17d21d68888d GUI: force show of welcome wizard when displayed (Bug #41074) John Donoghue parents: 19861 diff changeset	37 #endif
17d21d68888d GUI: force show of welcome wizard when displayed (Bug #41074) John Donoghue parents: 19861 diff changeset	38
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	39 #include "gui-preferences-nr.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	40 #include "resource-manager.h"
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	41 #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	42
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	43 namespace octave
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	44 {
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	45 static QLabel *
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	46 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	47 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	48 QLabel *logo = new QLabel (p);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	49 QPixmap logo_pixmap (":/actions/icons/logo.png");
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	50 logo->setPixmap (logo_pixmap.scaledToHeight (height));
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	51 return logo;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	52 };
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27087 diff changeset	53
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	54 welcome_wizard::welcome_wizard (resource_manager& rmgr, QWidget *p)
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	55 : QDialog (p), m_resource_manager (rmgr), m_page_ctor_list (),
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	56 m_page_list_iterator (), m_current_page (initial_page::create (this)),
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	57 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	58 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	59 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	60 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	61 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	62 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	63
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	64 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	65
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	66 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	67
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	68 setEnabled (true);
26643 5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	69
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	70 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	71
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	72 // 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	73 show_page ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	74 adjust_size ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	75 next_page ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	76 adjust_size ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	77 next_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 // 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	80 previous_page ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	81 previous_page ();
26643 5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	82
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	83 // Set the size determined above
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	84 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	85
21979 d04da18a407a use OCTAVE_USE_WINDOWS_API more consistently John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	86 #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	87 // 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	88 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	89 #endif
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	90 }
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	91
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	92 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	93 {
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	94 // 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	95 adjustSize ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	96 QSize sz = size ();
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 // 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	99
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	100 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	101 m_max_height = sz.height ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	102
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	103 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	104 m_max_width = sz.width ();
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	105 }
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	106
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	107 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	108 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	109 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	110 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	111
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	112 void welcome_wizard::show_page (void)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	113 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	114 delete m_current_page;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	115 delete layout ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	116
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	117 m_current_page = (*m_page_list_iterator) (this);
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17937 diff changeset	118
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	119 QVBoxLayout *new_layout = new QVBoxLayout ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	120 setLayout (new_layout);
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	121
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	122 new_layout->addWidget (m_current_page);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	123 }
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	124
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	125 void welcome_wizard::previous_page (void)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	126 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	127 --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	128
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	129 show_page ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	130 }
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	131
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	132 void welcome_wizard::next_page (void)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	133 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	134 ++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	135
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	136 show_page ();
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
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	139 void welcome_wizard::accept (void)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	140 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	141 // 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	142
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	143 m_resource_manager.reload_settings ();
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	144
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	145 gui_settings *settings = m_resource_manager.get_settings ();
17611 0dd2cf2e3174 don't use ui designer for welcome dialog box John W. Eaton <jwe@octave.org> parents: 17515 diff changeset	146
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	147 if (settings)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	148 {
27613 deb8877f2c34 use symbolic constants for preferences key and default values in news reader Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	149 settings->setValue (nr_allow_connection.key,
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	150 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	151
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	152 settings->sync ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	153 }
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17937 diff changeset	154
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	155 QDialog::accept ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	156 }
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17937 diff changeset	157
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	158 initial_page::initial_page (welcome_wizard *wizard)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	159 : QWidget (wizard),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	160 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	161 m_message (new QLabel (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	162 m_logo (make_octave_logo (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	163 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	164 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	165 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	166 QFont ft;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	167 ft.setPointSize (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	168 m_title->setFont (ft);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	169
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	170 resource_manager& rmgr
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	171 = __get_resource_manager__ ("shortcut_manager::shortcut_manager");
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	172
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	173 m_message->setText
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	174 (tr ("<html><body>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	175 "<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	176 "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	177 "<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	178 "</body></html>").
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	179 arg (rmgr.get_settings_file ()));
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	180 m_message->setWordWrap (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	181 m_message->setMinimumWidth (400);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	182
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	183 QVBoxLayout *message_layout = new QVBoxLayout;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	184
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	185 message_layout->addWidget (m_title);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	186 message_layout->addWidget (m_message);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	187
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	188 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	189
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	190 message_and_logo->addLayout (message_layout);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	191 message_and_logo->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	192 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	193
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	194 QHBoxLayout *button_bar = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	195
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	196 button_bar->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	197 button_bar->addWidget (m_next);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	198 button_bar->addWidget (m_cancel);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	199
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	200 QVBoxLayout *page_layout = new QVBoxLayout (this);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	201 setLayout (page_layout);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	202
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	203 page_layout->addLayout (message_and_logo);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	204 page_layout->addStretch (10);
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	205 page_layout->addSpacing (20);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	206 page_layout->addLayout (button_bar);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	207
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	208 setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	209
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	210 m_next->setDefault (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	211 m_next->setFocus ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	212
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	213 connect (m_next, SIGNAL (clicked ()), wizard, SLOT (next_page ()));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	214 connect (m_cancel, SIGNAL (clicked ()), wizard, SLOT (reject ()));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	215 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	216
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	217 setup_community_news::setup_community_news (welcome_wizard *wizard)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	218 : QWidget (wizard),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	219 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	220 m_message (new QLabel (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	221 m_checkbox (new QCheckBox (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	222 m_checkbox_message (new QLabel (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	223 m_logo (make_octave_logo (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	224 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	225 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	226 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	227 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	228 QFont ft;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	229 ft.setPointSize (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	230 m_title->setFont (ft);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	231
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	232 m_message->setText
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	233 (tr ("<html><body>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	234 "<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	235 "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	236 "<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	237 "<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	238 "</body></html>"));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	239 m_message->setWordWrap (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	240 m_message->setMinimumWidth (400);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	241 m_message->setOpenExternalLinks (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	242
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	243 QVBoxLayout *message_layout = new QVBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	244
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	245 message_layout->addWidget (m_title);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	246 message_layout->addWidget (m_message);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	247
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	248 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	249
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	250 message_and_logo->addLayout (message_layout);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	251 message_and_logo->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	252 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	253
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	254 QHBoxLayout *checkbox_layout = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	255
27613 deb8877f2c34 use symbolic constants for preferences key and default values in news reader Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	256 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	257 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	258 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	259 else
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::Unchecked);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	261
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	262 m_checkbox_message->setText
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	263 (tr ("<html><head>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	264 "<style>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	265 "a:link { text-decoration: underline; color: #0000ff; }\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	266 "</style>\n"
26786 bb3a441addb0 * welcome-wizard.cc (setup_community_news): fix incorrect head tag Torsten <mttl@mailbox.org> parents: 26643 diff changeset	267 "</head><body>\n"
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	268 "<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	269 "</body></html>"));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	270 m_checkbox_message->setWordWrap (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	271 m_checkbox_message->setOpenExternalLinks (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	272 m_checkbox_message->setMinimumWidth (500);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	273
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	274 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	275 checkbox_layout->addSpacing (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	276 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	277 checkbox_layout->addStretch (10);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	278
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	279 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	280
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	281 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	282 message_logo_and_checkbox->addSpacing (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	283 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	284
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	285 QHBoxLayout *button_bar = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	286
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	287 button_bar->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	288 button_bar->addWidget (m_previous);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	289 button_bar->addWidget (m_next);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	290 button_bar->addWidget (m_cancel);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	291
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	292 QVBoxLayout *page_layout = new QVBoxLayout (this);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	293 setLayout (page_layout);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	294
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	295 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	296 page_layout->addStretch (10);
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	297 page_layout->addSpacing (20);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	298 page_layout->addLayout (button_bar);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	299
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	300 setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	301
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	302 m_next->setDefault (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	303 m_next->setFocus ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	304
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	305 connect (m_checkbox, SIGNAL (stateChanged (int)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	306 wizard, SLOT (handle_web_connect_option (int)));
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	307
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	308 connect (m_previous, SIGNAL (clicked ()), wizard, SLOT (previous_page ()));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	309 connect (m_next, SIGNAL (clicked ()), wizard, SLOT (next_page ()));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	310 connect (m_cancel, SIGNAL (clicked ()), wizard, SLOT (reject ()));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	311 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	312
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	313 final_page::final_page (welcome_wizard *wizard)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	314 : QWidget (wizard),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	315 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	316 m_message (new QLabel (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	317 m_logo (make_octave_logo (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	318 m_links (new QLabel (this)),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	319 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	320 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	321 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	322 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	323 QFont ft;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	324 ft.setPointSize (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	325 m_title->setFont (ft);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	326
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	327 m_message->setText
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	328 (tr ("<html><body>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	329 "<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	330 "<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	331 "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	332 "</body></html>"));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	333 m_message->setWordWrap (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	334 m_message->setMinimumWidth (400);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	335 m_message->setOpenExternalLinks (true);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	336
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	337 QVBoxLayout *message_layout = new QVBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	338
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	339 message_layout->addWidget (m_title);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	340 message_layout->addWidget (m_message);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	341
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	342 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	343
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	344 message_and_logo->addLayout (message_layout);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	345 message_and_logo->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	346 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	347
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	348 m_links->setText
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	349 (tr ("<html><head>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	350 "<style>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	351 "a:link { text-decoration: underline; color: #0000ff; }\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	352 "</style>\n"
26333 13c62f51e830 welcome-wizard.cc: Fix 2 typos in HTML. (bug #55347) Doug Stewart parents: 25054 diff changeset	353 "</head><body>\n"
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	354 "<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	355 "<ul>\n"
25024 3c817af70eed maint: use https for all Octave project URLs Mike Miller <mtmiller@octave.org> parents: 24718 diff changeset	356 "<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	357 "<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	358 "<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	359 "</ul>\n"
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	360 "</body></html>"));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	361 m_links->setWordWrap (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	362 m_links->setOpenExternalLinks (true);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	363
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	364 QHBoxLayout *button_bar = new QHBoxLayout;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	365
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	366 button_bar->addStretch (10);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	367 button_bar->addWidget (m_previous);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	368 button_bar->addWidget (m_finish);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	369 button_bar->addWidget (m_cancel);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	370
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	371 QVBoxLayout *page_layout = new QVBoxLayout (this);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	372 setLayout (page_layout);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	373
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	374 page_layout->addLayout (message_and_logo);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	375 page_layout->addSpacing (20);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	376 page_layout->addWidget (m_links);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	377 page_layout->addStretch (10);
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	378 page_layout->addSpacing (20);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	379 page_layout->addLayout (button_bar);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	380
27087 4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	381 setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
4092ffc1e43c fix size of the welcome wizard (bug #56265) Torsten Lilge <ttl-octave@mailbox.org> parents: 26786 diff changeset	382
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	383 m_finish->setDefault (true);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	384 m_finish->setFocus ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	385
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	386 connect (m_previous, SIGNAL (clicked ()), wizard, SLOT (previous_page ()));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	387 connect (m_finish, SIGNAL (clicked ()), wizard, SLOT (accept ()));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	388 connect (m_cancel, SIGNAL (clicked ()), wizard, SLOT (reject ()));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	389 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	390 }

Mercurial > octave

annotate libgui/src/welcome-wizard.cc @ 27620:45bb5bbaf291