X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=12c6f0cfede13f370f4d4ae8a880c81465e49f68;hb=978dbc9a3e3c4bf8b42f00a269d04d0dca62b1a5;hp=0dc6b055813ea80320e1ba49ab79ff882854b8a2;hpb=c409988b235a55772537ef92e1a231bb0a75fa6e;p=pulseview.git diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp index 0dc6b055..12c6f0cf 100644 --- a/pv/dialogs/settings.cpp +++ b/pv/dialogs/settings.cpp @@ -216,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()) { + const QLocale locale = QLocale(language); + const 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); @@ -223,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()) @@ -250,10 +271,16 @@ 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); + cb = create_checkbox(GlobalSettings::Key_General_StartAllSessions, + SLOT(on_general_start_all_sessions_changed(int))); + general_layout->addRow(tr("Start acquisition for all open sessions when clicking 'Run'"), cb); + + return form; } @@ -286,19 +313,23 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const cb = create_checkbox(GlobalSettings::Key_View_TriggerIsZeroTime, SLOT(on_view_triggerIsZero_changed(int))); - trace_view_layout->addRow(tr("Show time zero at the trigger"), cb); + trace_view_layout->addRow(tr("Show time zero at the &trigger"), cb); cb = create_checkbox(GlobalSettings::Key_View_StickyScrolling, SLOT(on_view_stickyScrolling_changed(int))); trace_view_layout->addRow(tr("Always keep &newest samples at the right edge during capture"), cb); + cb = create_checkbox(GlobalSettings::Key_View_AllowVerticalDragging, + SLOT(on_view_allowVerticalDragging_changed(int))); + trace_view_layout->addRow(tr("Allow &vertical dragging in the view area"), cb); + cb = create_checkbox(GlobalSettings::Key_View_ShowSamplingPoints, SLOT(on_view_showSamplingPoints_changed(int))); trace_view_layout->addRow(tr("Show data &sampling points"), cb); cb = create_checkbox(GlobalSettings::Key_View_FillSignalHighAreas, SLOT(on_view_fillSignalHighAreas_changed(int))); - trace_view_layout->addRow(tr("Fill high areas of logic signals"), cb); + trace_view_layout->addRow(tr("Fill &high areas of logic signals"), cb); ColorButton* high_fill_cb = new ColorButton(parent); high_fill_cb->set_color(QColor::fromRgba( @@ -322,7 +353,7 @@ 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( @@ -393,10 +424,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); @@ -445,6 +476,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const tr("Protocol decoder search paths:") + ""); for (QString &entry : a->get_pd_path_list()) s.append(QString("%1").arg(entry)); + s.append(tr("(Note: Set environment variable SIGROKDECODE_DIR to add a custom directory)")); #endif s.append(""); @@ -477,6 +509,21 @@ QWidget *Settings::get_about_page(QWidget *parent) const .arg(entry.first, entry.second)); #endif + s.append(""); + s.append("" + + tr("Available Translations:") + ""); + for (const QString& language : a->get_languages()) { + if (language == "en") + continue; + + const QLocale locale = QLocale(language); + const QString desc = locale.languageToString(locale.language()); + const QString editors = a->get_language_editors(language); + + s.append(QString("%1(%2)") + .arg(desc, editors)); + } + s.append(""); QTextDocument *supported_doc = new QTextDocument(); @@ -583,10 +630,24 @@ 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); @@ -608,15 +669,15 @@ void Settings::on_general_theme_changed_changed(int state) } } -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(); } @@ -627,6 +688,12 @@ void Settings::on_general_save_with_setup_changed(int state) settings.setValue(GlobalSettings::Key_General_SaveWithSetup, state ? true : false); } +void Settings::on_general_start_all_sessions_changed(int state) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_General_StartAllSessions, state ? true : false); +} + void Settings::on_view_zoomToFitDuringAcq_changed(int state) { GlobalSettings settings; @@ -657,6 +724,12 @@ void Settings::on_view_stickyScrolling_changed(int state) settings.setValue(GlobalSettings::Key_View_StickyScrolling, state ? true : false); } +void Settings::on_view_allowVerticalDragging_changed(int state) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_AllowVerticalDragging, state ? true : false); +} + void Settings::on_view_showSamplingPoints_changed(int state) { GlobalSettings settings;