X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=9f458c99953e8c26c1721b5b9e819e73f9f1a1f7;hb=73d5a9bbc2f32ed84077ca4e75a125a6b0fc1921;hp=b79772ff0dc078e99916cc678aef7a849043184d;hpb=374c697f74ba8abbfe2a014416eb398bb460d1c3;p=pulseview.git diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp index b79772ff..9f458c99 100644 --- a/pv/dialogs/settings.cpp +++ b/pv/dialogs/settings.cpp @@ -204,6 +204,7 @@ QPlainTextEdit *Settings::create_log_view() const QWidget *Settings::get_general_settings_form(QWidget *parent) const { GlobalSettings settings; + QCheckBox *cb; QWidget *form = new QWidget(parent); QVBoxLayout *form_layout = new QVBoxLayout(form); @@ -215,6 +216,26 @@ QWidget *Settings::get_general_settings_form(QWidget *parent) const QFormLayout *general_layout = new QFormLayout(); general_group->setLayout(general_layout); + // Generate language combobox + QComboBox *language_cb = new QComboBox(); + Application* a = qobject_cast(QApplication::instance()); + + QString current_language = settings.value(GlobalSettings::Key_General_Language).toString(); + for (const QString& language : a->get_languages()) { + QLocale locale = QLocale(language); + QString desc = locale.languageToString(locale.language()); + language_cb->addItem(desc, language); + + if (language == current_language) { + int index = language_cb->findText(desc, Qt::MatchFixedString); + language_cb->setCurrentIndex(index); + } + } + connect(language_cb, SIGNAL(currentIndexChanged(const QString&)), + this, SLOT(on_general_language_changed(const QString&))); + general_layout->addRow(tr("User interface language"), language_cb); + + // Theme combobox QComboBox *theme_cb = new QComboBox(); for (const pair& entry : Themes) theme_cb->addItem(entry.first, entry.second); @@ -222,13 +243,14 @@ QWidget *Settings::get_general_settings_form(QWidget *parent) const theme_cb->setCurrentIndex( settings.value(GlobalSettings::Key_General_Theme).toInt()); connect(theme_cb, SIGNAL(currentIndexChanged(int)), - this, SLOT(on_general_theme_changed_changed(int))); + this, SLOT(on_general_theme_changed(int))); general_layout->addRow(tr("User interface theme"), theme_cb); QLabel *description_1 = new QLabel(tr("(You may need to restart PulseView for all UI elements to update)")); description_1->setAlignment(Qt::AlignRight); general_layout->addRow(description_1); + // Style combobox QComboBox *style_cb = new QComboBox(); style_cb->addItem(tr("System Default"), ""); for (QString& s : QStyleFactory::keys()) @@ -239,7 +261,7 @@ QWidget *Settings::get_general_settings_form(QWidget *parent) const if (current_style.isEmpty()) style_cb->setCurrentIndex(0); else - style_cb->setCurrentIndex(style_cb->findText(current_style, 0)); + style_cb->setCurrentIndex(style_cb->findText(current_style, nullptr)); connect(style_cb, SIGNAL(currentIndexChanged(int)), this, SLOT(on_general_style_changed(int))); @@ -249,6 +271,11 @@ QWidget *Settings::get_general_settings_form(QWidget *parent) const description_2->setAlignment(Qt::AlignRight); general_layout->addRow(description_2); + // Misc + cb = create_checkbox(GlobalSettings::Key_General_SaveWithSetup, + SLOT(on_general_save_with_setup_changed(int))); + general_layout->addRow(tr("Save session &setup along with .sr file"), cb); + return form; } @@ -300,7 +327,7 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const settings.value(GlobalSettings::Key_View_FillSignalHighAreaColor).value())); connect(high_fill_cb, SIGNAL(selected(QColor)), this, SLOT(on_view_fillSignalHighAreaColor_changed(QColor))); - trace_view_layout->addRow(tr("Fill high areas of logic signals"), high_fill_cb); + trace_view_layout->addRow(tr("Color to fill high areas of logic signals with"), high_fill_cb); cb = create_checkbox(GlobalSettings::Key_View_ShowAnalogMinorGrid, SLOT(on_view_showAnalogMinorGrid_changed(int))); @@ -317,7 +344,14 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const settings.value(GlobalSettings::Key_View_SnapDistance).toInt()); connect(snap_distance_sb, SIGNAL(valueChanged(int)), this, SLOT(on_view_snapDistance_changed(int))); - trace_view_layout->addRow(tr("Maximum distance from edges before cursors snap to them"), snap_distance_sb); + trace_view_layout->addRow(tr("Maximum distance from edges before markers snap to them"), snap_distance_sb); + + ColorButton* cursor_fill_cb = new ColorButton(parent); + cursor_fill_cb->set_color(QColor::fromRgba( + settings.value(GlobalSettings::Key_View_CursorFillColor).value())); + connect(cursor_fill_cb, SIGNAL(selected(QColor)), + this, SLOT(on_view_cursorFillColor_changed(QColor))); + trace_view_layout->addRow(tr("Color to fill cursor area with"), cursor_fill_cb); QComboBox *thr_disp_mode_cb = new QComboBox(); thr_disp_mode_cb->addItem(tr("None"), GlobalSettings::ConvThrDispMode_None); @@ -370,6 +404,10 @@ QWidget *Settings::get_decoder_settings_form(QWidget *parent) SLOT(on_dec_initialStateConfigurable_changed(int))); decoder_layout->addRow(tr("Allow configuration of &initial signal state"), cb); + cb = create_checkbox(GlobalSettings::Key_Dec_AlwaysShowAllRows, + SLOT(on_dec_alwaysshowallrows_changed(int))); + decoder_layout->addRow(tr("Always show all &rows, even if no annotation is visible"), cb); + // Annotation export settings ann_export_format_ = new QLineEdit(); ann_export_format_->setText( @@ -377,10 +415,10 @@ QWidget *Settings::get_decoder_settings_form(QWidget *parent) connect(ann_export_format_, SIGNAL(textChanged(const QString&)), this, SLOT(on_dec_exportFormat_changed(const QString&))); decoder_layout->addRow(tr("Annotation export format"), ann_export_format_); - QLabel *description_1 = new QLabel(tr("%s = sample range; %d: decoder name; %c: row name; %q: use quotations marks")); + QLabel *description_1 = new QLabel(tr("%s = sample range; %d: decoder name; %r: row name; %c: class name")); description_1->setAlignment(Qt::AlignRight); decoder_layout->addRow(description_1); - QLabel *description_2 = new QLabel(tr("%1: longest annotation text; %a: all annotation texts")); + QLabel *description_2 = new QLabel(tr("%1: longest annotation text; %a: all annotation texts; %q: use quotation marks")); description_2->setAlignment(Qt::AlignRight); decoder_layout->addRow(description_2); @@ -567,26 +605,64 @@ void Settings::on_page_changed(QListWidgetItem *current, QListWidgetItem *previo pages->setCurrentIndex(page_list->row(current)); } -void Settings::on_general_theme_changed_changed(int state) +void Settings::on_general_language_changed(const QString &text) { GlobalSettings settings; - settings.setValue(GlobalSettings::Key_General_Theme, state); + Application* a = qobject_cast(QApplication::instance()); + + for (const QString& language : a->get_languages()) { + QLocale locale = QLocale(language); + QString desc = locale.languageToString(locale.language()); + + if (text == desc) + settings.setValue(GlobalSettings::Key_General_Language, language); + } +} + +void Settings::on_general_theme_changed(int value) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_General_Theme, value); settings.apply_theme(); + + QMessageBox msg(this); + msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No); + msg.setIcon(QMessageBox::Question); + + if (settings.current_theme_is_dark()) { + msg.setText(tr("You selected a dark theme.\n" \ + "Should I set the user-adjustable colors to better suit your choice?\n\n" \ + "Please keep in mind that PulseView may need a restart to display correctly.")); + if (msg.exec() == QMessageBox::Yes) + settings.set_dark_theme_default_colors(); + } else { + msg.setText(tr("You selected a bright theme.\n" \ + "Should I set the user-adjustable colors to better suit your choice?\n\n" \ + "Please keep in mind that PulseView may need a restart to display correctly.")); + if (msg.exec() == QMessageBox::Yes) + settings.set_bright_theme_default_colors(); + } } -void Settings::on_general_style_changed(int state) +void Settings::on_general_style_changed(int value) { GlobalSettings settings; - if (state == 0) + if (value == 0) settings.setValue(GlobalSettings::Key_General_Style, ""); else settings.setValue(GlobalSettings::Key_General_Style, - QStyleFactory::keys().at(state - 1)); + QStyleFactory::keys().at(value - 1)); settings.apply_theme(); } +void Settings::on_general_save_with_setup_changed(int state) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_General_SaveWithSetup, state ? true : false); +} + void Settings::on_view_zoomToFitDuringAcq_changed(int state) { GlobalSettings settings; @@ -653,6 +729,12 @@ void Settings::on_view_snapDistance_changed(int value) settings.setValue(GlobalSettings::Key_View_SnapDistance, value); } +void Settings::on_view_cursorFillColor_changed(QColor color) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_CursorFillColor, color.rgba()); +} + void Settings::on_view_conversionThresholdDispMode_changed(int state) { GlobalSettings settings; @@ -683,6 +765,12 @@ void Settings::on_dec_exportFormat_changed(const QString &text) GlobalSettings settings; settings.setValue(GlobalSettings::Key_Dec_ExportFormat, text); } + +void Settings::on_dec_alwaysshowallrows_changed(int state) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_Dec_AlwaysShowAllRows, state ? true : false); +} #endif void Settings::on_log_logLevel_changed(int value) @@ -713,8 +801,7 @@ void Settings::on_log_saveToFile_clicked(bool checked) if (out_stream.status() == QTextStream::Ok) { QMessageBox msg(this); - msg.setText(tr("Success")); - msg.setInformativeText(tr("Log saved to %1.").arg(file_name)); + msg.setText(tr("Success") + "\n\n" + tr("Log saved to %1.").arg(file_name)); msg.setStandardButtons(QMessageBox::Ok); msg.setIcon(QMessageBox::Information); msg.exec(); @@ -724,8 +811,7 @@ void Settings::on_log_saveToFile_clicked(bool checked) } QMessageBox msg(this); - msg.setText(tr("Error")); - msg.setInformativeText(tr("File %1 could not be written to.").arg(file_name)); + msg.setText(tr("Error") + "\n\n" + tr("File %1 could not be written to.").arg(file_name)); msg.setStandardButtons(QMessageBox::Ok); msg.setIcon(QMessageBox::Warning); msg.exec();