Mercurial > octave

comparison libgui/src/welcome-wizard.cc @ 31647:431f80aba37a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 15:37:43 -0500
parents ca7d58406f82 c6d54dd31a7e
children deb553ac2c54
comparison
equal deleted inserted replaced
31645:bd9da634f00d 31647:431f80aba37a
40 #include "gui-preferences-dw.h" 40 #include "gui-preferences-dw.h"
41 #include "gui-preferences-nr.h" 41 #include "gui-preferences-nr.h"
42 #include "gui-settings.h" 42 #include "gui-settings.h"
43 #include "welcome-wizard.h" 43 #include "welcome-wizard.h"
44 44
45 namespace octave 45 OCTAVE_BEGIN_NAMESPACE(octave)
46 { 46
47 static QLabel * 47 static QLabel *
48 make_octave_logo (QWidget *p = nullptr, int height = 100) 48 make_octave_logo (QWidget *p = nullptr, int height = 100)
49 { 49 {
50 QLabel *logo = new QLabel (p); 50 QLabel *logo = new QLabel (p);
51 QPixmap logo_pixmap (dw_icon_set_names["NONE"]); 51 QPixmap logo_pixmap (dw_icon_set_names["NONE"]);
375 connect (m_previous, &QPushButton::clicked, 375 connect (m_previous, &QPushButton::clicked,
376 wizard, &welcome_wizard::previous_page); 376 wizard, &welcome_wizard::previous_page);
377 connect (m_finish, &QPushButton::clicked, wizard, &welcome_wizard::accept); 377 connect (m_finish, &QPushButton::clicked, wizard, &welcome_wizard::accept);
378 connect (m_cancel, &QPushButton::clicked, wizard, &welcome_wizard::reject); 378 connect (m_cancel, &QPushButton::clicked, wizard, &welcome_wizard::reject);
379 } 379 }
380 } 380
381 OCTAVE_END_NAMESPACE(octave)