Mercurial > octave
changeset 32521:874ed29dcd2a
maint: merge stable to default
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 30 Nov 2023 14:34:12 -0800 |
| parents | f511a54000f7 (current diff) 59d086639602 (diff) |
| children | dc06bb3bf1ed |
| files | |
| diffstat | 24 files changed, 105 insertions(+), 96 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS.9.md Tue Nov 28 22:02:57 2023 -0800 +++ b/etc/NEWS.9.md Thu Nov 30 14:34:12 2023 -0800 @@ -36,7 +36,7 @@ factor of "off" which is equivalent to setting it to 0. When a linestyle with a base marker is set suppressing arrowhead display, subsequent name-value property pairs in the quiver/quiver3 function call will no longer - turn arrowhead display back on (bug #64143). The linewdith property now also + turn arrowhead display back on (bug #64143). The linewidth property now also affects the line width of the base marker. - Classdefs now support breakpoints inside them.
--- a/libgui/graphics/annotation-dialog.ui Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/graphics/annotation-dialog.ui Thu Nov 30 14:34:12 2023 -0800 @@ -550,7 +550,7 @@ <item row="2" column="0" colspan="2"> <widget class="QLabel" name="label_13"> <property name="text"> - <string>Horz alignment</string> + <string>Horizontal alignment</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -579,7 +579,7 @@ <item row="2" column="3" colspan="2"> <widget class="QLabel" name="label_14"> <property name="text"> - <string>Vert alignment</string> + <string>Vertical alignment</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -659,6 +659,9 @@ <property name="text"> <string>Width</string> </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="0" column="5"> @@ -676,6 +679,9 @@ <property name="text"> <string>Height</string> </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="0" column="7">
--- a/libgui/src/documentation.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/documentation.cc Thu Nov 30 14:34:12 2023 -0800 @@ -150,8 +150,8 @@ QMessageBox::warning (this, tr ("Octave Documentation"), tr ("Could not setup the data required for the\n" "documentation viewer. Maybe the Qt SQlite\n" - "module is missing.\n" - "Only help texts in the Command Window will\n" + "module is missing?\n" + "Only help text in the Command Window will\n" "be available.")); #endif disconnect (m_help_engine, 0, 0, 0); @@ -253,7 +253,7 @@ QHelpIndexWidget *index = m_help_engine->indexWidget (); m_filter = new QComboBox (this); - m_filter->setToolTip (tr ("Enter text to search the indices")); + m_filter->setToolTip (tr ("Enter text to search function index")); m_filter->setEditable (true); m_filter->setInsertPolicy (QComboBox::NoInsert); m_filter->setMaxCount (10); @@ -454,13 +454,13 @@ // Zoom m_tool_bar->addSeparator (); m_action_zoom_in - = add_action (settings.icon ("view-zoom-in"), tr ("Zoom in"), + = add_action (settings.icon ("view-zoom-in"), tr ("Zoom In"), SLOT (zoom_in ()), m_doc_browser, m_tool_bar); m_action_zoom_out - = add_action (settings.icon ("view-zoom-out"), tr ("Zoom out"), + = add_action (settings.icon ("view-zoom-out"), tr ("Zoom Out"), SLOT (zoom_out ()), m_doc_browser, m_tool_bar); m_action_zoom_original - = add_action (settings.icon ("view-zoom-original"), tr ("Zoom original"), + = add_action (settings.icon ("view-zoom-original"), tr ("Zoom Original"), SLOT (zoom_original ()), m_doc_browser, m_tool_bar); // Bookmarks (connect slots later)
--- a/libgui/src/find-files-dialog.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/find-files-dialog.cc Thu Nov 30 14:34:12 2023 -0800 @@ -88,28 +88,28 @@ this, &find_files_dialog::browse_folders); m_recurse_dirs_check = new QCheckBox (tr ("Search subdirectories")); + m_recurse_dirs_check->setToolTip (tr ("Search recursively through directories for matching files")); m_recurse_dirs_check->setChecked (settings.bool_value (ff_recurse_dirs)); - m_recurse_dirs_check->setToolTip (tr ("Search recursively through directories for matching files")); m_include_dirs_check = new QCheckBox (tr ("Include directory names")); + m_include_dirs_check->setToolTip (tr ("Include matching directories in search results")); m_include_dirs_check->setChecked (settings.bool_value (ff_include_dirs)); - m_include_dirs_check->setToolTip (tr ("Include matching directories in search results")); - m_name_case_check = new QCheckBox (tr ("Name case insensitive")); + m_name_case_check = new QCheckBox (tr ("Ignore case")); + m_name_case_check->setToolTip (tr ("Perform case insensitive match")); m_name_case_check->setChecked (settings.bool_value (ff_name_case)); - m_name_case_check->setToolTip (tr ("Set matching name is case insensitive")); m_contains_text_check = new QCheckBox (tr ("Contains text:")); - m_contains_text_check->setToolTip (tr ("Enter the file content search expression")); + m_contains_text_check->setToolTip (tr ("Include only files containing specified text in search results")); m_contains_text_check->setChecked (settings.bool_value (ff_check_text)); m_contains_text_edit = new QLineEdit (); m_contains_text_edit->setToolTip (tr ("Text to match")); m_contains_text_edit->setText (settings.string_value (ff_contains_text)); - m_content_case_check = new QCheckBox (tr ("Text case insensitive")); + m_content_case_check = new QCheckBox (tr ("Ignore case")); + m_content_case_check->setToolTip (tr ("Perform case insensitive match")); m_content_case_check->setChecked (settings.bool_value (ff_content_case)); - m_content_case_check->setToolTip (tr ("Set text content is case insensitive")); find_files_model *model = new find_files_model (this); @@ -144,7 +144,7 @@ this, &find_files_dialog::start_find); m_stop_button = new QPushButton (tr ("Stop")); - m_stop_button->setToolTip (tr ("Stop searching")); + m_stop_button->setToolTip (tr ("Stop search")); m_stop_button->setEnabled (false); connect (m_stop_button, &QPushButton::clicked, this, &find_files_dialog::stop_find); @@ -160,7 +160,7 @@ this, &find_files_dialog::close); // name options - QGroupBox *name_group = new QGroupBox (tr ("Filename/location")); + QGroupBox *name_group = new QGroupBox (tr ("Filename/Location")); QGridLayout *name_layout = new QGridLayout; name_group->setLayout (name_layout);
--- a/libgui/src/gui-preferences-cs.h Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/gui-preferences-cs.h Thu Nov 30 14:34:12 2023 -0800 @@ -57,10 +57,10 @@ const QStringList cs_color_names = { - QT_TRANSLATE_NOOP ("octave::settings_dialog", "foreground"), - QT_TRANSLATE_NOOP ("octave::settings_dialog", "background"), - QT_TRANSLATE_NOOP ("octave::settings_dialog", "selection"), - QT_TRANSLATE_NOOP ("octave::settings_dialog", "cursor") + QT_TRANSLATE_NOOP ("octave::settings_dialog", "Foreground"), + QT_TRANSLATE_NOOP ("octave::settings_dialog", "Background"), + QT_TRANSLATE_NOOP ("octave::settings_dialog", "Selection"), + QT_TRANSLATE_NOOP ("octave::settings_dialog", "Cursor") }; extern gui_pref cs_focus_cmd;
--- a/libgui/src/gui-preferences-sc.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/gui-preferences-sc.cc Thu Nov 30 14:34:12 2023 -0800 @@ -68,7 +68,7 @@ // debug sc_pref sc_main_debug_step_over (QCoreApplication::translate ("shortcuts", "Step"), sc_main_debug + ":step_over", OCTAVE_QT_KEYCOMBINATION (PRE, Qt::Key_F10)); -sc_pref sc_main_debug_step_into (QCoreApplication::translate ("shortcuts", "Step Into"), sc_main_debug + ":step_into", OCTAVE_QT_KEYCOMBINATION (PRE, Qt::Key_F11)); +sc_pref sc_main_debug_step_into (QCoreApplication::translate ("shortcuts", "Step In"), sc_main_debug + ":step_into", OCTAVE_QT_KEYCOMBINATION (PRE, Qt::Key_F11)); sc_pref sc_main_debug_step_out (QCoreApplication::translate ("shortcuts", "Step Out"), sc_main_debug + ":step_out", OCTAVE_QT_KEYCOMBINATION (PRE | Qt::ShiftModifier, Qt::Key_F11)); sc_pref sc_main_debug_continue (QCoreApplication::translate ("shortcuts", "Continue"), sc_main_debug + ":continue", OCTAVE_QT_KEYCOMBINATION (PRE, Qt::Key_F5)); sc_pref sc_main_debug_quit (QCoreApplication::translate ("shortcuts", "Quit Debug Mode"), sc_main_debug + ":quit", OCTAVE_QT_KEYCOMBINATION (PRE | Qt::ShiftModifier, Qt::Key_F5));
--- a/libgui/src/gui-preferences-sd.h Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/gui-preferences-sd.h Thu Nov 30 14:34:12 2023 -0800 @@ -43,8 +43,8 @@ const QString settings_color_modes_tooltip = QT_TRANSLATE_NOOP ("octave::settings_dialog", - "Switches to another set of colors.\n" - "Useful for defining a dark/light mode.\n" + "Switch to a second set of colors.\n" + "Useful for defining light/dark modes.\n" "Discards non-applied current changes!"); const QString settings_reload_colors @@ -53,8 +53,8 @@ const QString settings_reload_colors_tooltip = QT_TRANSLATE_NOOP ("octave::settings_dialog", - "Reloads the default colors,\n" - "depending on currently selected mode."); + "Reload the default colors,\n" + "depends on currently selected mode."); const QString settings_reload_styles = QT_TRANSLATE_NOOP ("octave::settings_dialog", @@ -62,7 +62,7 @@ const QString settings_reload_styles_tooltip = QT_TRANSLATE_NOOP ("octave::settings_dialog", - "Reloads the default values of the styles,\n" - "depending on currently selected mode."); + "Reload the default style values,\n" + "depends on currently selected mode."); #endif
--- a/libgui/src/gui-preferences-ve.h Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/gui-preferences-ve.h Thu Nov 30 14:34:12 2023 -0800 @@ -56,7 +56,7 @@ QT_TRANSLATE_NOOP ("octave::settings_dialog", "Background"), QT_TRANSLATE_NOOP ("octave::settings_dialog", "Selected Foreground"), QT_TRANSLATE_NOOP ("octave::settings_dialog", "Selected Background"), - QT_TRANSLATE_NOOP ("octave::settings_dialog", "Alternate Background") + QT_TRANSLATE_NOOP ("octave::settings_dialog", "Alternating Background") }; const QStringList ve_save_formats = {
--- a/libgui/src/history-dock-widget.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/history-dock-widget.cc Thu Nov 30 14:34:12 2023 -0800 @@ -157,6 +157,7 @@ &history_dock_widget::handle_contextmenu_evaluate); menu.addAction (settings.icon ("document-new"), tr ("Create script"), this, &history_dock_widget::handle_contextmenu_create_script); + menu.addSeparator (); } if (m_filter_shown) menu.addAction (tr ("Hide filter"), this,
--- a/libgui/src/m-editor/file-editor-tab.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/m-editor/file-editor-tab.cc Thu Nov 30 14:34:12 2023 -0800 @@ -1765,7 +1765,7 @@ // modified seems sufficient. Exit-condition-specific messages could // be achieved by making 'available_actions' a function input string. QString available_actions = - tr ("Do you want to cancel closing, save or discard the changes?"); + tr ("Do you want to cancel closing, save, or discard the changes?"); QString file; if (valid_file_name ()) @@ -2380,7 +2380,7 @@ QMessageBox *msgBox = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"), - tr ("Could not open file %1 for write:\n%2."). + tr ("Could not open file %1 for writing:\n%2."). arg (file_to_save).arg (file.errorString ()), QMessageBox::Ok, nullptr); show_dialog (msgBox, false);
--- a/libgui/src/m-editor/file-editor.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/m-editor/file-editor.cc Thu Nov 30 14:34:12 2023 -0800 @@ -1110,7 +1110,7 @@ QMessageBox *msgBox = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"), tr ("File not saved! A file with the selected name\n%1\n" - "is already open in the editor"). + "is already open in the editor."). arg (saveFileName), QMessageBox::Ok, nullptr); @@ -1677,7 +1677,7 @@ QMessageBox *msgBox = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"), - tr ("Could not open file\n%1\nfor read: %2."). + tr ("Could not open file\n%1\nfor reading: %2."). arg (openFileName).arg (result), QMessageBox::Ok, this); @@ -1720,7 +1720,7 @@ // error opening the file msgBox = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"), - tr ("Could not open file\n%1\nfor write: %2."). + tr ("Could not open file\n%1\nfor writing: %2."). arg (openFileName).arg (file.errorString ()), QMessageBox::Ok, this); @@ -2038,11 +2038,11 @@ tr ("&Find and Replace..."), SLOT (request_find (bool))); m_find_next_action - = add_action (m_edit_menu, tr ("Find &Next..."), + = add_action (m_edit_menu, tr ("Find &Next"), SLOT (request_find_next (bool))); m_find_previous_action - = add_action (m_edit_menu, tr ("Find &Previous..."), + = add_action (m_edit_menu, tr ("Find &Previous"), SLOT (request_find_previous (bool))); m_edit_menu->addSeparator (); @@ -2301,7 +2301,7 @@ m_run_action = add_action (_run_menu, settings.icon ("system-run"), - tr ("Save File and Run / Continue"), + tr ("Save File and Run/Continue"), SLOT (request_run_file (bool))); m_run_selection_action
--- a/libgui/src/m-editor/find-dialog.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/m-editor/find-dialog.cc Thu Nov 30 14:34:12 2023 -0800 @@ -92,17 +92,17 @@ { setWindowTitle (tr ("Editor: Find and Replace")); - m_search_label = new QLabel (tr ("Find &what:")); + m_search_label = new QLabel (tr ("&Find:")); m_search_line_edit = new QComboBox (this); - m_search_line_edit->setToolTip (tr ("Enter text to search for")); + m_search_line_edit->setToolTip (tr ("Enter search text")); m_search_line_edit->setEditable (true); m_search_line_edit->setMaxCount (m_mru_length); m_search_line_edit->completer ()->setCaseSensitivity (Qt::CaseSensitive); m_search_label->setBuddy (m_search_line_edit); - m_replace_label = new QLabel (tr ("Re&place with:")); + m_replace_label = new QLabel (tr ("Re&place:")); m_replace_line_edit = new QComboBox (this); - m_replace_line_edit->setToolTip (tr ("Enter new text replacing search hits")); + m_replace_line_edit->setToolTip (tr ("Enter replacement text")); m_replace_line_edit->setEditable (true); m_replace_line_edit->setMaxCount (m_mru_length); m_replace_line_edit->completer ()->setCaseSensitivity (Qt::CaseSensitive); @@ -116,8 +116,8 @@ m_from_start_check_box = new QCheckBox (tr ("Search from &start")); m_wrap_check_box = new QCheckBox (tr ("&Wrap while searching")); m_wrap_check_box->setChecked (true); - m_find_next_button = new QPushButton (tr ("&Find Next")); - m_find_prev_button = new QPushButton (tr ("Find &Previous")); + m_find_next_button = new QPushButton (tr ("Find &Next")); + m_find_prev_button = new QPushButton (tr ("Find Pre&vious")); m_replace_button = new QPushButton (tr ("&Replace")); m_replace_all_button = new QPushButton (tr ("Replace &All")); @@ -135,7 +135,7 @@ m_extension = new QWidget (this); m_whole_words_check_box = new QCheckBox (tr ("&Whole words")); - m_regex_check_box = new QCheckBox (tr ("Regular E&xpressions")); + m_regex_check_box = new QCheckBox (tr ("Regular &expressions")); m_backward_check_box = new QCheckBox (tr ("Search &backward")); m_search_selection_check_box = new QCheckBox (tr ("Search se&lection")); m_search_selection_check_box->setCheckable (true);
--- a/libgui/src/main-window.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/main-window.cc Thu Nov 30 14:34:12 2023 -0800 @@ -1429,7 +1429,7 @@ case 3: case 5: case 103: - message = tr ("%1 is a built-in, compiled or inline\n" + message = tr ("%1 is a built-in, compiled, or inline\n" "function and can not be edited."); break; @@ -2315,7 +2315,7 @@ edit_menu->addSeparator (); m_set_path_action - = edit_menu->addAction (tr ("Set Path")); + = edit_menu->addAction (tr ("Set Path...")); m_preferences_action = edit_menu->addAction (settings.icon ("preferences-system"), @@ -2416,7 +2416,7 @@ m_profiler_stop->setEnabled (false); m_profiler_show = add_action (tools_menu, QIcon (), - tr ("&Show Profile Data"), SLOT (profiler_show ())); + tr ("&Show Profiler Data"), SLOT (profiler_show ())); } void main_window::editor_tabs_changed (bool have_tabs, bool is_octave) @@ -2538,7 +2538,7 @@ tr ("Octave Packages"), SLOT (open_octave_packages_page ())); m_contribute_action = add_action (help_menu, QIcon (), - tr ("Contribute"), SLOT (open_contribute_page ())); + tr ("Get Involved"), SLOT (open_contribute_page ())); m_developer_action = add_action (help_menu, QIcon (), tr ("Donate to Octave"), SLOT (open_donate_page ()));
--- a/libgui/src/news-reader.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/news-reader.cc Thu Nov 30 14:34:12 2023 -0800 @@ -130,7 +130,7 @@ "For the latest news, please check\n" "<a href=\"https://octave.org/community-news.html\">https://octave.org/community-news.html</a>\n" "when you have a connection to the web (link opens in an external browser)\n" - "or enable web connections for news in Octave's network settings dialog.\n" + "or enable web connections for news in Octave's network settings tab.\n" "</p>\n" "<p>\n" "<small><em>— The Octave Developers, ") + OCTAVE_RELEASE_DATE + "</em></small>\n"
--- a/libgui/src/octave-dock-widget.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/octave-dock-widget.cc Thu Nov 30 14:34:12 2023 -0800 @@ -79,7 +79,7 @@ m_dock_action = new QAction (settings.icon ("widget-undock", true), "", this); - m_dock_action->setToolTip (tr ("Undock widget")); + m_dock_action->setToolTip (tr ("Undock Widget")); m_dock_button = new QToolButton (m_title_widget); m_dock_button->setDefaultAction (m_dock_action); m_dock_button->setFocusPolicy (Qt::NoFocus); @@ -87,7 +87,7 @@ m_close_action = new QAction (settings.icon ("widget-close", true), "", this); - m_close_action->setToolTip (tr ("Close widget")); + m_close_action->setToolTip (tr ("Close Widget")); m_close_button = new QToolButton (m_title_widget); m_close_button->setDefaultAction (m_close_action); m_close_button->setFocusPolicy (Qt::NoFocus); @@ -231,13 +231,13 @@ connect (m_close_action, &QAction::triggered, this, &octave_dock_widget::change_visibility); - m_close_action->setToolTip (tr ("Hide widget")); + m_close_action->setToolTip (tr ("Hide Widget")); setStyleSheet (qdockwidget_css (global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-close.png", - QString ("Close widget"), + QString ("Close Widget"), global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-undock.png", - QString ("Undock widget"), m_icon_size, "", "")); + QString ("Undock Widget"), m_icon_size, "", "")); if (widget ()) widget ()->setToolTip (""); @@ -312,7 +312,7 @@ gui_settings settings; m_dock_action->setIcon (settings.icon ("widget-dock" + m_icon_color, true)); - m_dock_action->setToolTip (tr ("Dock widget")); + m_dock_action->setToolTip (tr ("Dock Widget")); } else { @@ -370,7 +370,7 @@ if (titleBarWidget ()) { m_dock_action->setIcon (settings.icon ("widget-undock" + m_icon_color, true)); - m_dock_action->setToolTip (tr ("Undock widget")); + m_dock_action->setToolTip (tr ("Undock Widget")); } else { @@ -728,18 +728,18 @@ QString icon_col = m_icon_color; - QString close_tooltip = "Close widget"; + QString close_tooltip = "Close Widget"; QString dock_tooltip; if (isFloating ()) { dock_icon = "widget-dock"; - dock_tooltip = "Dock widget"; + dock_tooltip = "Dock Widget"; } else { dock_icon = "widget-undock"; - dock_tooltip = "Undock widget"; + dock_tooltip = "Undock Widget"; } #if defined (Q_OS_MAC)
--- a/libgui/src/set-path-dialog.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/set-path-dialog.cc Thu Nov 30 14:34:12 2023 -0800 @@ -67,13 +67,13 @@ m_info_label = new QLabel (tr ("All changes take effect immediately.")); - m_add_folder_button = new QPushButton (tr ("Add Folder...")); + m_add_folder_button = new QPushButton (tr ("Add Directory...")); QMenu *add_dir_menu = new QMenu (); m_add_folder_button->setMenu (add_dir_menu); - add_dir_menu->addAction (tr ("Single Folder"), + add_dir_menu->addAction (tr ("Single Directory"), this, &set_path_dialog::add_dir); - add_dir_menu->addAction (tr ("Folder With Subfolders"), + add_dir_menu->addAction (tr ("Directory With Subdirectories"), this, &set_path_dialog::add_dir_subdirs); m_move_to_top_button = new QPushButton (tr ("Move to Top"));
--- a/libgui/src/settings-dialog.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/settings-dialog.cc Thu Nov 30 14:34:12 2023 -0800 @@ -1408,7 +1408,7 @@ m_ws_enable_colors = new QCheckBox (tr ("Enable attribute colors")); style_grid->addWidget (m_ws_enable_colors, row++, column, 1, 4); - m_ws_hide_tool_tips = new QCheckBox (tr ("Hide tools tips")); + m_ws_hide_tool_tips = new QCheckBox (tr ("Hide tool tips")); style_grid->addWidget (m_ws_hide_tool_tips, row++, column, 1, 4); connect (m_ws_enable_colors, &QCheckBox::toggled, m_ws_hide_tool_tips, &QCheckBox::setEnabled);
--- a/libgui/src/settings-dialog.ui Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/settings-dialog.ui Thu Nov 30 14:34:12 2023 -0800 @@ -454,7 +454,7 @@ <item> <widget class="QCheckBox" name="cb_cursor_blinking"> <property name="text"> - <string>Cursor blinking</string> + <string>Blinking cursor</string> </property> <property name="checked"> <bool>true</bool> @@ -2671,7 +2671,7 @@ <item> <widget class="QLabel" name="label_21"> <property name="text"> - <string>Edit a shortcut by double-clicking in a cell</string> + <string>Edit a shortcut by double-clicking in Actual column</string> </property> </widget> </item>
--- a/libgui/src/shortcuts-tree-widget.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/shortcuts-tree-widget.cc Thu Nov 30 14:34:12 2023 -0800 @@ -159,16 +159,15 @@ { setAttribute (Qt::WA_DeleteOnClose); - setWindowTitle (tr ("Enter new Shortcut")); + setWindowTitle (tr ("Enter New Shortcut")); QVBoxLayout *box = new QVBoxLayout (this); box->setSpacing (2); box->setContentsMargins (12, 12, 12, 12); - QLabel *help = new QLabel (tr ("Apply the desired shortcut or click " - "on the right button to reset the " - "shortcut to its default. (%1)") + QLabel *help = new QLabel (tr ("Enter custom shortcut\n" + "Action: %1") .arg (m_settings_key)); help->setWordWrap (true); @@ -176,7 +175,7 @@ box->addWidget (help); QCheckBox *direct - = new QCheckBox (tr ("Enter shortcut directly by performing it")); + = new QCheckBox (tr ("Enter shortcut by typing it")); QCheckBox *shift = new QCheckBox (tr ("Add Shift modifier\n" @@ -196,7 +195,7 @@ QGridLayout *grid = new QGridLayout (); - QLabel *actual = new QLabel (tr ("Actual shortcut")); + QLabel *actual = new QLabel (tr ("Actual Shortcut")); m_edit_actual = new enter_shortcut (this); m_edit_actual->setAlignment (Qt::AlignHCenter); @@ -204,7 +203,7 @@ grid->addWidget (actual, 0, 0); grid->addWidget (m_edit_actual, 0, 1); - QLabel *def = new QLabel (tr ("Default shortcut")); + QLabel *def = new QLabel (tr ("Default Shortcut")); QLabel *label_default = new QLabel (this); label_default->setAlignment (Qt::AlignHCenter);
--- a/libgui/src/variable-editor.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/variable-editor.cc Thu Nov 30 14:34:12 2023 -0800 @@ -174,7 +174,7 @@ { m_dock_action->setIcon (QIcon (global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-dock.png")); - m_dock_action->setToolTip (tr ("Dock widget")); + m_dock_action->setToolTip (tr ("Dock Widget")); setWindowFlags (Qt::Window); setWindowTitle (tr ("Variable Editor: ") + objectName ()); @@ -192,7 +192,7 @@ { m_dock_action->setIcon (QIcon (global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-undock.png")); - m_dock_action->setToolTip (tr ("Undock widget")); + m_dock_action->setToolTip (tr ("Undock Widget")); setFocus ();
--- a/libgui/src/welcome-wizard.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/libgui/src/welcome-wizard.cc Thu Nov 30 14:34:12 2023 -0800 @@ -319,7 +319,7 @@ m_message->setText (tr ("<html><body>\n" "<p>We hope you find Octave to be a useful tool.</p>\n" - "<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" + "<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a discussion board, a wiki, and other community-based support channels.\n" "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" "</body></html>")); m_message->setWordWrap (true);
--- a/liboctave/version.cc Tue Nov 28 22:02:57 2023 -0800 +++ b/liboctave/version.cc Thu Nov 30 14:34:12 2023 -0800 @@ -67,13 +67,16 @@ } std::string -octave_name_version_and_copyright () +octave_name_version_and_copyright (bool html) { // The GNU coding standards say that on the first line printed by // --version, the version number should follow the last space on the // line. + std::string br = (html ? "<br>\n" : "\n"); - return "GNU Octave, version " OCTAVE_VERSION "\n" OCTAVE_COPYRIGHT; + return "GNU Octave, version " OCTAVE_VERSION + + br + + OCTAVE_COPYRIGHT; } std::string @@ -83,7 +86,7 @@ std::string br = (html ? "<br>\n" : "\n"); std::string sep = (html ? "\n</p>\n<p>\n" : "\n\n"); - return octave_name_version_and_copyright () + return octave_name_version_and_copyright (html) + br + "This is free software; see the source code for copying conditions." + br
--- a/liboctave/version.in.h Tue Nov 28 22:02:57 2023 -0800 +++ b/liboctave/version.in.h Thu Nov 30 14:34:12 2023 -0800 @@ -62,7 +62,7 @@ extern OCTAVE_API std::string octave_bugs_statement (bool html = false); -extern OCTAVE_API std::string octave_name_version_and_copyright (); +extern OCTAVE_API std::string octave_name_version_and_copyright (bool html = false); extern OCTAVE_API std::string octave_name_version_copyright_copying_and_warranty
--- a/scripts/plot/util/private/__add_default_menu__.m Tue Nov 28 22:02:57 2023 -0800 +++ b/scripts/plot/util/private/__add_default_menu__.m Thu Nov 30 14:34:12 2023 -0800 @@ -80,29 +80,29 @@ ## Tools menu hui = uimenu (hf, "label", "&Tools", "handlevisibility", "off", ... "tag", "__default_menu__Tools"); - uimenu (hui, "label", "Toggle &grid on all axes", "tag", "toggle", ... + uimenu (hui, "label", "Toggle &Grid on All Axes", "tag", "toggle", ... "menuselectedfcn", @grid_cb); - uimenu (hui, "label", "Show grid on all axes", "tag", "on", ... + uimenu (hui, "label", "Show Grid on All Axes", "tag", "on", ... "menuselectedfcn", @grid_cb); - uimenu (hui, "label", "Hide grid on all axes", "tag", "off", ... + uimenu (hui, "label", "Hide Grid on All Axes", "tag", "off", ... "menuselectedfcn", @grid_cb); - uimenu (hui, "label", "Auto&scale all axes", + uimenu (hui, "label", "Auto&scale All Axes", "menuselectedfcn", @autoscale_cb); - hui2 = uimenu (hui, "label", "GUI &Mode (on all axes)"); - uimenu (hui2, "label", "Pan x and y", "tag", "pan_on", ... + hui2 = uimenu (hui, "label", "GUI &Mode (on All Axes)"); + uimenu (hui2, "label", "Pan X and Y", "tag", "pan_on", ... "menuselectedfcn", @guimode_cb); - uimenu (hui2, "label", "Pan x only", "tag", "pan_xon", ... + uimenu (hui2, "label", "Pan X Only", "tag", "pan_xon", ... "menuselectedfcn", @guimode_cb); - uimenu (hui2, "label", "Pan y only", "tag", "pan_yon", ... + uimenu (hui2, "label", "Pan Y Only", "tag", "pan_yon", ... "menuselectedfcn", @guimode_cb); - uimenu (hui2, "label", "Disable pan and rotate", "tag", ... - "no_pan_rotate", "menuselectedfcn", @guimode_cb); - uimenu (hui2, "label", "Rotate on", "tag", "rotate3d", ... + uimenu (hui2, "label", "Rotate On", "tag", "rotate3d", ... "menuselectedfcn", @guimode_cb); - uimenu (hui2, "label", "Enable mousezoom", "tag", "zoom_on", ... + uimenu (hui2, "label", "Disable Pan and Rotate", "tag", ... + "no_pan_rotate", "menuselectedfcn", @guimode_cb); + uimenu (hui2, "label", "Enable Mousezoom", "tag", "zoom_on", ... "menuselectedfcn", @guimode_cb); - uimenu (hui2, "label", "Disable mousezoom", "tag", "zoom_off", ... + uimenu (hui2, "label", "Disable Mousezoom", "tag", "zoom_off", ... "menuselectedfcn", @guimode_cb); hmenu(3) = hui; @@ -118,18 +118,18 @@ "tag", "__default_button_rotate__", ... "__named_icon__", "figure-rotate"); - ht(3) = uitoggletool (htb, "tooltipstring", "Zoom In", ... + ht(3) = uitoggletool (htb, "tooltipstring", "Zoom in", ... "tag", "__default_button_zoomin__", ... "__named_icon__", "figure-zoom-in", ... "separator", "on"); - ht(4) = uitoggletool (htb, "tooltipstring", "Zoom Out", ... + ht(4) = uitoggletool (htb, "tooltipstring", "Zoom out", ... "tag", "__default_button_zoomout__", ... "__named_icon__", "figure-zoom-out"); uipushtool (htb, "tooltipstring", "Automatic limits for current axes", ... "clickedcallback", @auto_cb, ... "__named_icon__", "figure-zoom-original"); - ht(5) = uitoggletool (htb, "tooltipstring", "Insert Text", ... + ht(5) = uitoggletool (htb, "tooltipstring", "Insert text", ... "tag", "__default_button_text__", ... "separator", "on", ... "__named_icon__", "figure-text");