# HG changeset patch # User Arun Giridhar # Date 1669583424 18000 # Node ID 4e77f48d92ffde23bc800d7eb4406a436e639a79 # Parent 2fb47f51561217080bd516c20431a4c4b1bc9687# Parent 9d9b31c8458b01bac05a92510ecde28575c380f2 maint: Merge stable to default diff -r 2fb47f515612 -r 4e77f48d92ff libgui/src/gui-preferences-sd.h --- a/libgui/src/gui-preferences-sd.h Sat Nov 26 17:14:01 2022 -0500 +++ b/libgui/src/gui-preferences-sd.h Sun Nov 27 16:10:24 2022 -0500 @@ -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 diff -r 2fb47f515612 -r 4e77f48d92ff libgui/src/gui-settings.h --- a/libgui/src/gui-settings.h Sat Nov 26 17:14:01 2022 -0500 +++ b/libgui/src/gui-settings.h Sun Nov 27 16:10:24 2022 -0500 @@ -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 diff -r 2fb47f515612 -r 4e77f48d92ff libgui/src/settings-dialog.cc --- a/libgui/src/settings-dialog.cc Sat Nov 26 17:14:01 2022 -0500 +++ b/libgui/src/settings-dialog.cc Sun Nov 27 16:10:24 2022 -0500 @@ -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 + @@ -573,7 +573,17 @@ if (button_role == QDialogButtonBox::RejectRole || button_role == QDialogButtonBox::AcceptRole) - close (); + { + // save last settings dialog's geometry and close + resource_manager& rmgr = m_octave_qobj.get_resource_manager (); + gui_settings *settings = rmgr.get_settings (); + + settings->setValue (sd_last_tab.key, tabWidget->currentIndex ()); + settings->setValue (sd_geometry.key, saveGeometry ()); + settings->sync (); + + close (); + } } void settings_dialog::set_disabled_pref_file_browser_dir (bool disable) @@ -1250,10 +1260,6 @@ shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager (); scmgr.write_shortcuts (settings, closing); - // settings dialog's geometry - settings->setValue (sd_last_tab.key, tabWidget->currentIndex ()); - settings->setValue (sd_geometry.key, saveGeometry ()); - settings->sync (); } @@ -1279,16 +1285,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 +1412,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 +1518,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; diff -r 2fb47f515612 -r 4e77f48d92ff libgui/src/workspace-model.cc --- a/libgui/src/workspace-model.cc Sat Nov 26 17:14:01 2022 -0500 +++ b/libgui/src/workspace-model.cc Sun Nov 27 16:10:24 2022 -0500 @@ -44,6 +44,8 @@ workspace_model::workspace_model (QObject *p) : QAbstractTableModel (p) { + // The header names. Use tr () again when accessing them since + // the translator si not yet initialized when this ctor is called m_columnNames.append (tr ("Name")); m_columnNames.append (tr ("Class")); m_columnNames.append (tr ("Dimension")); @@ -92,7 +94,7 @@ int role) const { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) - return m_columnNames[section]; + return tr (m_columnNames[section].toStdString ().data ()); else return QVariant (); }