Mercurial > octave

comparison libgui/src/settings-dialog.cc @ 31558:69c8979f8b2c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d3231a604a62
children 26f1ef8fa1ce
comparison
equal deleted inserted replaced
31556:9978ef12aea3 31558:69c8979f8b2c
457 457
458 #if defined (HAVE_QSCINTILLA) 458 #if defined (HAVE_QSCINTILLA)
459 459
460 int mode = settings->value (ed_color_mode).toInt (); 460 int mode = settings->value (ed_color_mode).toInt ();
461 461
462 QCheckBox *cb_color_mode = new QCheckBox (settings_color_modes, 462 QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ()),
463 group_box_editor_styles); 463 group_box_editor_styles);
464 cb_color_mode->setToolTip (settings_color_modes_tooltip); 464 cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ()));
465 cb_color_mode->setChecked (mode > 0); 465 cb_color_mode->setChecked (mode > 0);
466 cb_color_mode->setObjectName (ed_color_mode.key); 466 cb_color_mode->setObjectName (ed_color_mode.key);
467 467
468 QPushButton *pb_reload_default_colors = new QPushButton (settings_reload_styles); 468 QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_styles.toStdString ().data ()));
469 pb_reload_default_colors->setToolTip (settings_reload_styles_tooltip); 469 pb_reload_default_colors->setToolTip (tr (settings_reload_styles_tooltip.toStdString ().data ()));
470 470
471 color_picker *current_line_color = new color_picker ( 471 color_picker *current_line_color = new color_picker (
472 settings->value (ed_highlight_current_line_color.key + 472 settings->value (ed_highlight_current_line_color.key +
473 settings_color_modes_ext[mode], 473 settings_color_modes_ext[mode],
474 ed_highlight_current_line_color.def).value<QColor> (), this); 474 ed_highlight_current_line_color.def).value<QColor> (), this);
1277 connect (m_ws_enable_colors, &QCheckBox::toggled, 1277 connect (m_ws_enable_colors, &QCheckBox::toggled,
1278 m_ws_hide_tool_tips, &QCheckBox::setEnabled); 1278 m_ws_hide_tool_tips, &QCheckBox::setEnabled);
1279 m_ws_hide_tool_tips->setChecked 1279 m_ws_hide_tool_tips->setChecked
1280 (settings->value (ws_hide_tool_tips).toBool ()); 1280 (settings->value (ws_hide_tool_tips).toBool ());
1281 1281
1282 QCheckBox *cb_color_mode = new QCheckBox (settings_color_modes); 1282 QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ()));
1283 cb_color_mode->setToolTip (settings_color_modes_tooltip); 1283 cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ()));
1284 cb_color_mode->setChecked (mode == 1); 1284 cb_color_mode->setChecked (mode == 1);
1285 cb_color_mode->setObjectName (ws_color_mode.key); 1285 cb_color_mode->setObjectName (ws_color_mode.key);
1286 connect (m_ws_enable_colors, &QCheckBox::toggled, 1286 connect (m_ws_enable_colors, &QCheckBox::toggled,
1287 cb_color_mode, &QCheckBox::setEnabled); 1287 cb_color_mode, &QCheckBox::setEnabled);
1288 style_grid->addWidget (cb_color_mode, row, column); 1288 style_grid->addWidget (cb_color_mode, row, column);
1289 1289
1290 QPushButton *pb_reload_default_colors = new QPushButton (settings_reload_colors); 1290 QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_colors.toStdString ().data ()));
1291 pb_reload_default_colors->setToolTip (settings_reload_colors_tooltip); 1291 pb_reload_default_colors->setToolTip (tr (settings_reload_colors_tooltip.toStdString ().data ()));
1292 connect (m_ws_enable_colors, &QCheckBox::toggled, 1292 connect (m_ws_enable_colors, &QCheckBox::toggled,
1293 pb_reload_default_colors, &QPushButton::setEnabled); 1293 pb_reload_default_colors, &QPushButton::setEnabled);
1294 style_grid->addWidget (pb_reload_default_colors, row+1, column++); 1294 style_grid->addWidget (pb_reload_default_colors, row+1, column++);
1295 1295
1296 bool colors_enabled = settings->value (ws_enable_colors).toBool (); 1296 bool colors_enabled = settings->value (ws_enable_colors).toBool ();
1404 QVector<QLabel *> description (cs_colors_count); 1404 QVector<QLabel *> description (cs_colors_count);
1405 QVector<color_picker *> color (cs_colors_count); 1405 QVector<color_picker *> color (cs_colors_count);
1406 1406
1407 int mode = settings->value (cs_color_mode).toInt (); 1407 int mode = settings->value (cs_color_mode).toInt ();
1408 1408
1409 QCheckBox *cb_color_mode = new QCheckBox (settings_color_modes); 1409 QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ()));
1410 cb_color_mode->setToolTip (settings_color_modes_tooltip); 1410 cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ()));
1411 cb_color_mode->setChecked (mode == 1); 1411 cb_color_mode->setChecked (mode == 1);
1412 cb_color_mode->setObjectName (cs_color_mode.key); 1412 cb_color_mode->setObjectName (cs_color_mode.key);
1413 style_grid->addWidget (cb_color_mode, 0, 0); 1413 style_grid->addWidget (cb_color_mode, 0, 0);
1414 1414
1415 QPushButton *pb_reload_default_colors = new QPushButton (settings_reload_colors); 1415 QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_colors.toStdString ().data ()));
1416 pb_reload_default_colors->setToolTip (settings_reload_colors_tooltip); 1416 pb_reload_default_colors->setToolTip (tr (settings_reload_colors_tooltip.toStdString ().data ()));
1417 style_grid->addWidget (pb_reload_default_colors, 1, 0); 1417 style_grid->addWidget (pb_reload_default_colors, 1, 0);
1418 1418
1419 int column = 1; // column 0 is for the color mode checkbox 1419 int column = 1; // column 0 is for the color mode checkbox
1420 const int color_columns = 2; // place colors in so many columns 1420 const int color_columns = 2; // place colors in so many columns
1421 int row = 0; 1421 int row = 0;
1510 QVector<QLabel *> description (ve_colors_count); 1510 QVector<QLabel *> description (ve_colors_count);
1511 QVector<color_picker *> color (ve_colors_count); 1511 QVector<color_picker *> color (ve_colors_count);
1512 1512
1513 int mode = settings->value (ve_color_mode).toInt (); 1513 int mode = settings->value (ve_color_mode).toInt ();
1514 1514
1515 QCheckBox *cb_color_mode = new QCheckBox (settings_color_modes); 1515 QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ()));
1516 cb_color_mode->setToolTip (settings_color_modes_tooltip); 1516 cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ()));
1517 cb_color_mode->setChecked (mode == 1); 1517 cb_color_mode->setChecked (mode == 1);
1518 cb_color_mode->setObjectName (ve_color_mode.key); 1518 cb_color_mode->setObjectName (ve_color_mode.key);
1519 style_grid->addWidget (cb_color_mode, 0, 0); 1519 style_grid->addWidget (cb_color_mode, 0, 0);
1520 1520
1521 QPushButton *pb_reload_default_colors = new QPushButton (settings_reload_colors); 1521 QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_colors.toStdString ().data ()));
1522 pb_reload_default_colors->setToolTip (settings_reload_colors_tooltip); 1522 pb_reload_default_colors->setToolTip (tr (settings_reload_colors_tooltip.toStdString ().data ()));
1523 style_grid->addWidget (pb_reload_default_colors, 1, 0); 1523 style_grid->addWidget (pb_reload_default_colors, 1, 0);
1524 1524
1525 int column = 1; 1525 int column = 1;
1526 int color_columns = 2; 1526 int color_columns = 2;
1527 int row = 0; 1527 int row = 0;