Mercurial > octave

comparison libgui/src/documentation.cc @ 31621:0645ea65ca6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
handle icons and themes in gui_settings class, not resource_manager * resource-manager.h, resource-manager.cc (resource_manager::config_icon_theme, resource_manager::icon): Move funtcions to gui-settings.h and gui-settings.cc. * Canvas.cc, QTerminal.cc, documentation-bookmarks.cc, documentation.cc, dw-main-window.cc, files-dock-widget.cc, find-files-dialog.cc, gui-settings.cc, gui-settings.h, history-dock-widget.cc, file-editor.cc, main-window.cc, octave-dock-widget.cc, octave-qobject.cc, qt-interpreter-events.cc, resource-manager.cc, resource-manager.h, variable-editor.cc: Change all uses.
author John W. Eaton <jwe@octave.org>
date Fri, 02 Dec 2022 18:43:12 -0500
parents ad014fc78bd6
children ca7d58406f82
comparison
equal deleted inserted replaced
31620:6dfaaf8ecf3b 31621:0645ea65ca6b
155 connect (m_find_line_edit, &QLineEdit::textEdited, 155 connect (m_find_line_edit, &QLineEdit::textEdited,
156 this, &documentation::find_forward_from_anchor); 156 this, &documentation::find_forward_from_anchor);
157 QToolButton *forward_button = new QToolButton (find_footer); 157 QToolButton *forward_button = new QToolButton (find_footer);
158 forward_button->setText (tr ("Search forward")); 158 forward_button->setText (tr ("Search forward"));
159 forward_button->setToolTip (tr ("Search forward")); 159 forward_button->setToolTip (tr ("Search forward"));
160 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); 160
161 forward_button->setIcon (rmgr.icon ("go-down")); 161 gui_settings settings;
162
163 forward_button->setIcon (settings.icon ("go-down"));
162 connect (forward_button, &QToolButton::pressed, 164 connect (forward_button, &QToolButton::pressed,
163 this, [=] () { find (); }); 165 this, [=] () { find (); });
164 QToolButton *backward_button = new QToolButton (find_footer); 166 QToolButton *backward_button = new QToolButton (find_footer);
165 backward_button->setText (tr ("Search backward")); 167 backward_button->setText (tr ("Search backward"));
166 backward_button->setToolTip (tr ("Search backward")); 168 backward_button->setToolTip (tr ("Search backward"));
167 backward_button->setIcon (rmgr.icon ("go-up")); 169 backward_button->setIcon (settings.icon ("go-up"));
168 connect (backward_button, &QToolButton::pressed, 170 connect (backward_button, &QToolButton::pressed,
169 this, &documentation::find_backward); 171 this, &documentation::find_backward);
170 QHBoxLayout *h_box_find_footer = new QHBoxLayout (find_footer); 172 QHBoxLayout *h_box_find_footer = new QHBoxLayout (find_footer);
171 h_box_find_footer->addWidget (find_label); 173 h_box_find_footer->addWidget (find_label);
172 h_box_find_footer->addWidget (m_find_line_edit); 174 h_box_find_footer->addWidget (m_find_line_edit);
347 } 349 }
348 350
349 void documentation::construct_tool_bar (void) 351 void documentation::construct_tool_bar (void)
350 { 352 {
351 // Home, Previous, Next 353 // Home, Previous, Next
352 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); 354 gui_settings settings;
355
353 m_action_go_home 356 m_action_go_home
354 = add_action (rmgr.icon ("go-home"), tr ("Go home"), SLOT (home (void)), 357 = add_action (settings.icon ("go-home"), tr ("Go home"), SLOT (home (void)),
355 m_doc_browser, m_tool_bar); 358 m_doc_browser, m_tool_bar);
356 359
357 m_action_go_prev 360 m_action_go_prev
358 = add_action (rmgr.icon ("go-previous"), tr ("Go back"), 361 = add_action (settings.icon ("go-previous"), tr ("Go back"),
359 SLOT (backward (void)), m_doc_browser, m_tool_bar); 362 SLOT (backward (void)), m_doc_browser, m_tool_bar);
360 m_action_go_prev->setEnabled (false); 363 m_action_go_prev->setEnabled (false);
361 364
362 // popdown menu with prev pages files 365 // popdown menu with prev pages files
363 QToolButton *popdown_button_prev_pages = new QToolButton (); 366 QToolButton *popdown_button_prev_pages = new QToolButton ();
368 popdown_button_prev_pages->setCheckable (false); 371 popdown_button_prev_pages->setCheckable (false);
369 popdown_button_prev_pages->setArrowType(Qt::DownArrow); 372 popdown_button_prev_pages->setArrowType(Qt::DownArrow);
370 m_tool_bar->addWidget (popdown_button_prev_pages); 373 m_tool_bar->addWidget (popdown_button_prev_pages);
371 374
372 m_action_go_next 375 m_action_go_next
373 = add_action (rmgr.icon ("go-next"), tr ("Go forward"), 376 = add_action (settings.icon ("go-next"), tr ("Go forward"),
374 SLOT (forward (void)), m_doc_browser, m_tool_bar); 377 SLOT (forward (void)), m_doc_browser, m_tool_bar);
375 m_action_go_next->setEnabled (false); 378 m_action_go_next->setEnabled (false);
376 379
377 // popdown menu with prev pages files 380 // popdown menu with prev pages files
378 QToolButton *popdown_button_next_pages = new QToolButton (); 381 QToolButton *popdown_button_next_pages = new QToolButton ();
411 this, &documentation::open_hist_url); 414 this, &documentation::open_hist_url);
412 415
413 // Find 416 // Find
414 m_tool_bar->addSeparator (); 417 m_tool_bar->addSeparator ();
415 m_action_find 418 m_action_find
416 = add_action (rmgr.icon ("edit-find"), tr ("Find"), 419 = add_action (settings.icon ("edit-find"), tr ("Find"),
417 SLOT (activate_find (void)), this, m_tool_bar); 420 SLOT (activate_find (void)), this, m_tool_bar);
418 421
419 // Zoom 422 // Zoom
420 m_tool_bar->addSeparator (); 423 m_tool_bar->addSeparator ();
421 m_action_zoom_in 424 m_action_zoom_in
422 = add_action (rmgr.icon ("view-zoom-in"), tr ("Zoom in"), 425 = add_action (settings.icon ("view-zoom-in"), tr ("Zoom in"),
423 SLOT (zoom_in (void)), m_doc_browser, m_tool_bar); 426 SLOT (zoom_in (void)), m_doc_browser, m_tool_bar);
424 m_action_zoom_out 427 m_action_zoom_out
425 = add_action (rmgr.icon ("view-zoom-out"), tr ("Zoom out"), 428 = add_action (settings.icon ("view-zoom-out"), tr ("Zoom out"),
426 SLOT (zoom_out (void)), m_doc_browser, m_tool_bar); 429 SLOT (zoom_out (void)), m_doc_browser, m_tool_bar);
427 m_action_zoom_original 430 m_action_zoom_original
428 = add_action (rmgr.icon ("view-zoom-original"), tr ("Zoom original"), 431 = add_action (settings.icon ("view-zoom-original"), tr ("Zoom original"),
429 SLOT (zoom_original (void)), m_doc_browser, m_tool_bar); 432 SLOT (zoom_original (void)), m_doc_browser, m_tool_bar);
430 433
431 // Bookmarks (connect slots later) 434 // Bookmarks (connect slots later)
432 m_tool_bar->addSeparator (); 435 m_tool_bar->addSeparator ();
433 m_action_bookmark 436 m_action_bookmark
434 = add_action (rmgr.icon ("bookmark-new"), tr ("Bookmark current page"), 437 = add_action (settings.icon ("bookmark-new"),
435 nullptr, nullptr, m_tool_bar); 438 tr ("Bookmark current page"), nullptr, nullptr, m_tool_bar);
436 } 439 }
437 440
438 void documentation::global_search (void) 441 void documentation::global_search (void)
439 { 442 {
440 if (! m_help_engine) 443 if (! m_help_engine)