Mercurial > octave
changeset 31558:69c8979f8b2c stable
fix missing trnaslation for new strings in settings dialog (bug #63404)
* gui-preferences-sd.h: move new string constants to here
* gui-settings.h: move new string constatns from here but leave
the constants that are required in several different widgets
* settings-dialog.cc (settings_dialog): use tr () for new strings here, too;
(read_workspace_colors): dito;
(read_terminal_colors): dito;
(read_varedit_colors): dito;
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Sun, 27 Nov 2022 11:27:29 +0100 |
| parents | 9978ef12aea3 |
| children | 26f1ef8fa1ce |
| files | libgui/src/gui-preferences-sd.h libgui/src/gui-settings.h libgui/src/settings-dialog.cc |
| diffstat | 3 files changed, 45 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/gui-preferences-sd.h Sat Nov 26 17:08:30 2022 -0500 +++ b/libgui/src/gui-preferences-sd.h Sun Nov 27 11:27:29 2022 +0100 @@ -39,4 +39,28 @@ const gui_pref sd_last_editor_styles_tab ("settings/last_editor_styles_tab", QVariant (0)); +// Textstrings for second color schemes +const QString settings_color_modes = QT_TRANSLATE_NOOP ( + "octave::settings_dialog", + "Second color mode (light/dark)"); +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" + "Discards non-applied current changes!"); +const QString settings_reload_colors = QT_TRANSLATE_NOOP ( + "octave::settings_dialog", + "&Reload default colors"); +const QString settings_reload_colors_tooltip = QT_TRANSLATE_NOOP ( + "octave::settings_dialog", + "Reloads the default colors,\n" + "depending on currently selected mode."); +const QString settings_reload_styles = QT_TRANSLATE_NOOP ( + "octave::settings_dialog", + "&Reload default styles"); +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."); + #endif
--- a/libgui/src/gui-settings.h Sat Nov 26 17:08:30 2022 -0500 +++ b/libgui/src/gui-settings.h Sun Nov 27 11:27:29 2022 +0100 @@ -123,37 +123,13 @@ } -// Some constants used several times in the settings - -// Special color indicating no change compared to default color -// or automatically computed color -const QColor settings_color_no_change (255, 0, 255); +// Some constants used in the preferences of several widgets and therefore +// defined globally here -// Other color schemes (currently one extra, but possibly more in the future) -const QString settings_color_modes = QT_TRANSLATE_NOOP ( - "octave::settings_dialog", - "Second color mode (light/dark)"); -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" - "Discards non-applied current changes!"); +// Constants for handling different color schemes +const QColor settings_color_no_change (255, 0, 255); const QStringList settings_color_modes_ext (QStringList () << "" << "_2"); -// Reset colors (reload default values) -const QString settings_reload_colors = QT_TRANSLATE_NOOP ( - "octave::settings_dialog", - "&Reload default colors"); -const QString settings_reload_colors_tooltip = QT_TRANSLATE_NOOP ( - "octave::settings_dialog", - "Reloads the default colors,\n" - "depending on currently selected mode."); -const QString settings_reload_styles = QT_TRANSLATE_NOOP ( - "octave::settings_dialog", - "&Reload default styles"); -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."); const int settings_reload_default_colors_flag = -1; + #endif
--- a/libgui/src/settings-dialog.cc Sat Nov 26 17:08:30 2022 -0500 +++ b/libgui/src/settings-dialog.cc Sun Nov 27 11:27:29 2022 +0100 @@ -459,14 +459,14 @@ int mode = settings->value (ed_color_mode).toInt (); - QCheckBox *cb_color_mode = new QCheckBox (settings_color_modes, + QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ()), group_box_editor_styles); - cb_color_mode->setToolTip (settings_color_modes_tooltip); + cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ())); cb_color_mode->setChecked (mode > 0); cb_color_mode->setObjectName (ed_color_mode.key); - QPushButton *pb_reload_default_colors = new QPushButton (settings_reload_styles); - pb_reload_default_colors->setToolTip (settings_reload_styles_tooltip); + QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_styles.toStdString ().data ())); + pb_reload_default_colors->setToolTip (tr (settings_reload_styles_tooltip.toStdString ().data ())); color_picker *current_line_color = new color_picker ( settings->value (ed_highlight_current_line_color.key + @@ -1279,16 +1279,16 @@ m_ws_hide_tool_tips->setChecked (settings->value (ws_hide_tool_tips).toBool ()); - QCheckBox *cb_color_mode = new QCheckBox (settings_color_modes); - cb_color_mode->setToolTip (settings_color_modes_tooltip); + QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ())); + cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ())); cb_color_mode->setChecked (mode == 1); cb_color_mode->setObjectName (ws_color_mode.key); connect (m_ws_enable_colors, &QCheckBox::toggled, cb_color_mode, &QCheckBox::setEnabled); style_grid->addWidget (cb_color_mode, row, column); - QPushButton *pb_reload_default_colors = new QPushButton (settings_reload_colors); - pb_reload_default_colors->setToolTip (settings_reload_colors_tooltip); + QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_colors.toStdString ().data ())); + pb_reload_default_colors->setToolTip (tr (settings_reload_colors_tooltip.toStdString ().data ())); connect (m_ws_enable_colors, &QCheckBox::toggled, pb_reload_default_colors, &QPushButton::setEnabled); style_grid->addWidget (pb_reload_default_colors, row+1, column++); @@ -1406,14 +1406,14 @@ int mode = settings->value (cs_color_mode).toInt (); - QCheckBox *cb_color_mode = new QCheckBox (settings_color_modes); - cb_color_mode->setToolTip (settings_color_modes_tooltip); + QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ())); + cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ())); cb_color_mode->setChecked (mode == 1); cb_color_mode->setObjectName (cs_color_mode.key); style_grid->addWidget (cb_color_mode, 0, 0); - QPushButton *pb_reload_default_colors = new QPushButton (settings_reload_colors); - pb_reload_default_colors->setToolTip (settings_reload_colors_tooltip); + QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_colors.toStdString ().data ())); + pb_reload_default_colors->setToolTip (tr (settings_reload_colors_tooltip.toStdString ().data ())); style_grid->addWidget (pb_reload_default_colors, 1, 0); int column = 1; // column 0 is for the color mode checkbox @@ -1512,14 +1512,14 @@ int mode = settings->value (ve_color_mode).toInt (); - QCheckBox *cb_color_mode = new QCheckBox (settings_color_modes); - cb_color_mode->setToolTip (settings_color_modes_tooltip); + QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ())); + cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ())); cb_color_mode->setChecked (mode == 1); cb_color_mode->setObjectName (ve_color_mode.key); style_grid->addWidget (cb_color_mode, 0, 0); - QPushButton *pb_reload_default_colors = new QPushButton (settings_reload_colors); - pb_reload_default_colors->setToolTip (settings_reload_colors_tooltip); + QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_colors.toStdString ().data ())); + pb_reload_default_colors->setToolTip (tr (settings_reload_colors_tooltip.toStdString ().data ())); style_grid->addWidget (pb_reload_default_colors, 1, 0); int column = 1;