X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=12c6f0cfede13f370f4d4ae8a880c81465e49f68;hp=b8150b7bfaa4dadd187eec8eb7b233c660e2f2ad;hb=HEAD;hpb=20c80c8aa4720f5b379e319f553c133687069b4e

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index b8150b7b..55b7e826 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -17,22 +17,37 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
+#include <glib.h>
+
 #include <QApplication>
-#include <QCheckBox>
+#include <QComboBox>
 #include <QDialogButtonBox>
+#include <QFileDialog>
 #include <QFormLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QMainWindow>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QScrollBar>
+#include <QSpinBox>
 #include <QString>
+#include <QStyleFactory>
 #include <QTextBrowser>
 #include <QTextDocument>
+#include <QTextStream>
 #include <QVBoxLayout>
 
 #include "settings.hpp"
 
+#include "pv/application.hpp"
 #include "pv/devicemanager.hpp"
 #include "pv/globalsettings.hpp"
+#include "pv/logging.hpp"
+#include "pv/widgets/colorbutton.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -40,30 +55,54 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
-using std::shared_ptr;
+using pv::widgets::ColorButton;
 
 namespace pv {
 namespace dialogs {
 
+/**
+ * Special version of a QListView that has the width of the first column as minimum size.
+ *
+ * @note Inspired by https://github.com/qt-creator/qt-creator/blob/master/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+ */
+class PageListWidget: public QListWidget
+{
+public:
+	PageListWidget() :
+		QListWidget()
+	{
+		setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
+	}
+
+	QSize sizeHint() const final
+	{
+		int width = sizeHintForColumn(0) + frameWidth() * 2 + 5;
+		if (verticalScrollBar()->isVisible())
+			width += verticalScrollBar()->width();
+		return QSize(width, 100);
+	}
+};
+
 Settings::Settings(DeviceManager &device_manager, QWidget *parent) :
-	QDialog(parent, nullptr),
+	QDialog(parent),
 	device_manager_(device_manager)
 {
-	const int icon_size = 64;
-
 	resize(600, 400);
 
-	page_list = new QListWidget;
-	page_list->setViewMode(QListView::IconMode);
-	page_list->setIconSize(QSize(icon_size, icon_size));
+	// Create log view
+	log_view_ = create_log_view();
+
+	// Create pages
+	page_list = new PageListWidget();
+	page_list->setViewMode(QListView::ListMode);
 	page_list->setMovement(QListView::Static);
-	page_list->setMaximumWidth(icon_size + icon_size/2);
-	page_list->setSpacing(12);
+	page_list->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
 	pages = new QStackedWidget;
 	create_pages();
 	page_list->setCurrentIndex(page_list->model()->index(0, 0));
 
+	// Create the rest of the dialog
 	QHBoxLayout *tab_layout = new QHBoxLayout;
 	tab_layout->addWidget(page_list);
 	tab_layout->addWidget(pages, Qt::AlignLeft);
@@ -87,28 +126,173 @@ Settings::Settings(DeviceManager &device_manager, QWidget *parent) :
 
 void Settings::create_pages()
 {
+	// General page
+	pages->addWidget(get_general_settings_form(pages));
+
+	QListWidgetItem *generalButton = new QListWidgetItem(page_list);
+	generalButton->setIcon(QIcon(":/icons/settings-general.png"));
+	generalButton->setText(tr("General"));
+	generalButton->setTextAlignment(Qt::AlignVCenter);
+	generalButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
 	// View page
 	pages->addWidget(get_view_settings_form(pages));
 
 	QListWidgetItem *viewButton = new QListWidgetItem(page_list);
 	viewButton->setIcon(QIcon(":/icons/settings-views.svg"));
 	viewButton->setText(tr("Views"));
-	viewButton->setTextAlignment(Qt::AlignHCenter);
+	viewButton->setTextAlignment(Qt::AlignVCenter);
 	viewButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
+#ifdef ENABLE_DECODE
+	// Decoder page
+	pages->addWidget(get_decoder_settings_form(pages));
+
+	QListWidgetItem *decoderButton = new QListWidgetItem(page_list);
+	decoderButton->setIcon(QIcon(":/icons/add-decoder.svg"));
+	decoderButton->setText(tr("Decoders"));
+	decoderButton->setTextAlignment(Qt::AlignVCenter);
+	decoderButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+#endif
+
 	// About page
 	pages->addWidget(get_about_page(pages));
 
 	QListWidgetItem *aboutButton = new QListWidgetItem(page_list);
 	aboutButton->setIcon(QIcon(":/icons/information.svg"));
 	aboutButton->setText(tr("About"));
-	aboutButton->setTextAlignment(Qt::AlignHCenter);
+	aboutButton->setTextAlignment(Qt::AlignVCenter);
 	aboutButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+	// Logging page
+	pages->addWidget(get_logging_page(pages));
+
+	QListWidgetItem *loggingButton = new QListWidgetItem(page_list);
+	loggingButton->setIcon(QIcon(":/icons/information.svg"));
+	loggingButton->setText(tr("Logging"));
+	loggingButton->setTextAlignment(Qt::AlignVCenter);
+	loggingButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+}
+
+QCheckBox *Settings::create_checkbox(const QString& key, const char* slot) const
+{
+	GlobalSettings settings;
+
+	QCheckBox *cb = new QCheckBox();
+	cb->setChecked(settings.value(key).toBool());
+	connect(cb, SIGNAL(stateChanged(int)), this, slot);
+	return cb;
+}
+
+QPlainTextEdit *Settings::create_log_view() const
+{
+	GlobalSettings settings;
+
+	QPlainTextEdit *log_view = new QPlainTextEdit();
+
+	log_view->setReadOnly(true);
+	log_view->setWordWrapMode(QTextOption::NoWrap);
+	log_view->setCenterOnScroll(true);
+
+	log_view->appendHtml(logging.get_log());
+	connect(&logging, SIGNAL(logged_text(QString)),
+		log_view, SLOT(appendHtml(QString)));
+
+	return log_view;
+}
+
+QWidget *Settings::get_general_settings_form(QWidget *parent) const
+{
+	GlobalSettings settings;
+	QCheckBox *cb;
+
+	QWidget *form = new QWidget(parent);
+	QVBoxLayout *form_layout = new QVBoxLayout(form);
+
+	// General settings
+	QGroupBox *general_group = new QGroupBox(tr("General"));
+	form_layout->addWidget(general_group);
+
+	QFormLayout *general_layout = new QFormLayout();
+	general_group->setLayout(general_layout);
+
+	// Generate language combobox
+	QComboBox *language_cb = new QComboBox();
+	Application* a = qobject_cast<Application*>(QApplication::instance());
+
+	QString current_language = settings.value(GlobalSettings::Key_General_Language, "en").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);
+		}
+	}
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	connect(language_cb, SIGNAL(currentTextChanged(const QString&)),
+		this, SLOT(on_general_language_changed(const QString&)));
+#else
+	connect(language_cb, SIGNAL(currentIndexChanged(const QString&)),
+		this, SLOT(on_general_language_changed(const QString&)));
+#endif
+	general_layout->addRow(tr("User interface language"), language_cb);
+
+	// Theme combobox
+	QComboBox *theme_cb = new QComboBox();
+	for (const pair<QString, QString>& entry : Themes)
+		theme_cb->addItem(entry.first, entry.second);
+
+	theme_cb->setCurrentIndex(
+		settings.value(GlobalSettings::Key_General_Theme).toInt());
+	connect(theme_cb, SIGNAL(currentIndexChanged(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())
+		style_cb->addItem(s, s);
+
+	const QString current_style =
+		settings.value(GlobalSettings::Key_General_Style).toString();
+	if (current_style.isEmpty())
+		style_cb->setCurrentIndex(0);
+	else
+		style_cb->setCurrentIndex(style_cb->findText(current_style));
+
+	connect(style_cb, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(on_general_style_changed(int)));
+	general_layout->addRow(tr("Qt widget style"), style_cb);
+
+	QLabel *description_2 = new QLabel(tr("(Dark themes look best with the Fusion style)"));
+	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;
 }
 
 QWidget *Settings::get_view_settings_form(QWidget *parent) const
 {
 	GlobalSettings settings;
+	QCheckBox *cb;
 
 	QWidget *form = new QWidget(parent);
 	QVBoxLayout *form_layout = new QVBoxLayout(form);
@@ -120,99 +304,235 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 	QFormLayout *trace_view_layout = new QFormLayout();
 	trace_view_group->setLayout(trace_view_layout);
 
-	QCheckBox *coloured_bg_cb = new QCheckBox();
-	coloured_bg_cb->setChecked(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
-	connect(coloured_bg_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_colouredBG_changed(int)));
-	trace_view_layout->addRow(tr("Use coloured trace &background"), coloured_bg_cb);
+	cb = create_checkbox(GlobalSettings::Key_View_ColoredBG,
+		SLOT(on_view_coloredBG_changed(int)));
+	trace_view_layout->addRow(tr("Use colored trace &background"), cb);
+
+	cb = create_checkbox(GlobalSettings::Key_View_ZoomToFitDuringAcq,
+		SLOT(on_view_zoomToFitDuringAcq_changed(int)));
+	trace_view_layout->addRow(tr("Constantly perform &zoom-to-fit during acquisition"), cb);
+
+	cb = create_checkbox(GlobalSettings::Key_View_ZoomToFitAfterAcq,
+		SLOT(on_view_zoomToFitAfterAcq_changed(int)));
+	trace_view_layout->addRow(tr("Perform a zoom-to-&fit when acquisition stops"), cb);
+
+	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);
+
+	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);
+
+	ColorButton* high_fill_cb = new ColorButton(parent);
+	high_fill_cb->set_color(QColor::fromRgba(
+		settings.value(GlobalSettings::Key_View_FillSignalHighAreaColor).value<uint32_t>()));
+	connect(high_fill_cb, SIGNAL(selected(QColor)),
+		this, SLOT(on_view_fillSignalHighAreaColor_changed(QColor)));
+	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)));
+	trace_view_layout->addRow(tr("Show analog minor grid in addition to div grid"), cb);
+
+	cb = create_checkbox(GlobalSettings::Key_View_ShowHoverMarker,
+		SLOT(on_view_showHoverMarker_changed(int)));
+	trace_view_layout->addRow(tr("Highlight mouse cursor using a vertical marker line"), cb);
+
+	cb = create_checkbox(GlobalSettings::Key_View_KeepRulerItemSelected,
+		SLOT(on_view_keepRulerItemSelected_changed(int)));
+	trace_view_layout->addRow(tr("Keep active item on ruler selected when editing popup is closed"), cb);
+
+	QSpinBox *snap_distance_sb = new QSpinBox();
+	snap_distance_sb->setRange(0, 1000);
+	snap_distance_sb->setSuffix(tr(" pixels"));
+	snap_distance_sb->setValue(
+		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 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<uint32_t>()));
+	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);
+	thr_disp_mode_cb->addItem(tr("Background"), GlobalSettings::ConvThrDispMode_Background);
+	thr_disp_mode_cb->addItem(tr("Dots"), GlobalSettings::ConvThrDispMode_Dots);
+	thr_disp_mode_cb->setCurrentIndex(
+		settings.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt());
+	connect(thr_disp_mode_cb, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(on_view_conversionThresholdDispMode_changed(int)));
+	trace_view_layout->addRow(tr("Conversion threshold display mode (analog traces only)"), thr_disp_mode_cb);
+
+	QSpinBox *default_div_height_sb = new QSpinBox();
+	default_div_height_sb->setRange(20, 1000);
+	default_div_height_sb->setSuffix(tr(" pixels"));
+	default_div_height_sb->setValue(
+		settings.value(GlobalSettings::Key_View_DefaultDivHeight).toInt());
+	connect(default_div_height_sb, SIGNAL(valueChanged(int)), this,
+		SLOT(on_view_defaultDivHeight_changed(int)));
+	trace_view_layout->addRow(tr("Default analog trace div height"), default_div_height_sb);
+
+	QSpinBox *default_logic_height_sb = new QSpinBox();
+	default_logic_height_sb->setRange(5, 1000);
+	default_logic_height_sb->setSuffix(tr(" pixels"));
+	default_logic_height_sb->setValue(
+		settings.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt());
+	connect(default_logic_height_sb, SIGNAL(valueChanged(int)), this,
+		SLOT(on_view_defaultLogicHeight_changed(int)));
+	trace_view_layout->addRow(tr("Default logic trace height"), default_logic_height_sb);
+
+	return form;
+}
 
-	QCheckBox *always_zoom_to_fit_cb = new QCheckBox();
-	always_zoom_to_fit_cb->setChecked(settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool());
-	connect(always_zoom_to_fit_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_alwaysZoomToFit_changed(int)));
-	trace_view_layout->addRow(tr("Constantly perform &zoom-to-fit during capture"), always_zoom_to_fit_cb);
+QWidget *Settings::get_decoder_settings_form(QWidget *parent)
+{
+#ifdef ENABLE_DECODE
+	GlobalSettings settings;
+	QCheckBox *cb;
 
-	QCheckBox *sticky_scrolling_cb = new QCheckBox();
-	sticky_scrolling_cb->setChecked(settings.value(GlobalSettings::Key_View_StickyScrolling).toBool());
-	connect(sticky_scrolling_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_stickyScrolling_changed(int)));
-	trace_view_layout->addRow(tr("Always keep &newest samples at the right edge during capture"), sticky_scrolling_cb);
+	QWidget *form = new QWidget(parent);
+	QVBoxLayout *form_layout = new QVBoxLayout(form);
 
-	QCheckBox *show_sampling_points_cb = new QCheckBox();
-	show_sampling_points_cb->setChecked(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
-	connect(show_sampling_points_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_showSamplingPoints_changed(int)));
-	trace_view_layout->addRow(tr("Show data &sampling points"), show_sampling_points_cb);
+	// Decoder settings
+	QGroupBox *decoder_group = new QGroupBox(tr("Decoders"));
+	form_layout->addWidget(decoder_group);
+
+	QFormLayout *decoder_layout = new QFormLayout();
+	decoder_group->setLayout(decoder_layout);
+
+	cb = create_checkbox(GlobalSettings::Key_Dec_InitialStateConfigurable,
+		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(
+		settings.value(GlobalSettings::Key_Dec_ExportFormat).toString());
+	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; %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; %q: use quotation marks"));
+	description_2->setAlignment(Qt::AlignRight);
+	decoder_layout->addRow(description_2);
 
 	return form;
+#else
+	(void)parent;
+	return nullptr;
+#endif
 }
 
 QWidget *Settings::get_about_page(QWidget *parent) const
 {
-#ifdef ENABLE_DECODE
-	struct srd_decoder *dec;
-#endif
+	Application* a = qobject_cast<Application*>(QApplication::instance());
 
 	QLabel *icon = new QLabel();
-	icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/sigrok-logo-notext.svg")));
+	icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/pulseview.svg")));
 
-	/* Setup the version field */
-	QLabel *version_info = new QLabel();
-	version_info->setText(tr("%1 %2<br />%3<br /><a href=\"http://%4\">%4</a>")
-		.arg(QApplication::applicationName(),
-		QApplication::applicationVersion(),
+	// Setup the license field with the project homepage link
+	QLabel *gpl_home_info = new QLabel();
+	gpl_home_info->setText(tr("%1<br /><a href=\"http://%2\">%2</a>").arg(
 		tr("GNU GPL, version 3 or later"),
 		QApplication::organizationDomain()));
-	version_info->setOpenExternalLinks(true);
-
-	shared_ptr<sigrok::Context> context = device_manager_.context();
+	gpl_home_info->setOpenExternalLinks(true);
 
 	QString s;
+
+	s.append("<style type=\"text/css\"> tr .id { white-space: pre; padding-right: 5px; } </style>");
+
 	s.append("<table>");
 
-	/* Library info */
 	s.append("<tr><td colspan=\"2\"><b>" +
-			tr("Used libraries:") +
-			"</b></td></tr>");
-	s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			.arg(QString("Qt"), qVersion()));
+		tr("Versions, libraries and features:") + "</b></td></tr>");
+	for (pair<QString, QString> &entry : a->get_version_info())
+		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+			.arg(entry.first, entry.second));
 
-	/* Set up the supported field */
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
-		tr("Supported hardware drivers:") +
-		"</b></td></tr>");
-	for (auto entry : context->drivers()) {
-		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			.arg(QString::fromUtf8(entry.first.c_str()),
-				QString::fromUtf8(entry.second->long_name().c_str())));
-	}
+		tr("Firmware search paths:") + "</b></td></tr>");
+	for (QString &entry : a->get_fw_path_list())
+		s.append(QString("<tr><td colspan=\"2\">%1</td></tr>").arg(entry));
 
+#ifdef ENABLE_DECODE
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
-		tr("Supported input formats:") +
-		"</b></td></tr>");
-	for (auto entry : context->input_formats()) {
-		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			.arg(QString::fromUtf8(entry.first.c_str()),
-				QString::fromUtf8(entry.second->description().c_str())));
-	}
+		tr("Protocol decoder search paths:") + "</b></td></tr>");
+	for (QString &entry : a->get_pd_path_list())
+		s.append(QString("<tr><td colspan=\"2\">%1</td></tr>").arg(entry));
+	s.append(tr("<tr><td colspan=\"2\">(Note: Set environment variable SIGROKDECODE_DIR to add a custom directory)</td></tr>"));
+#endif
 
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
-		tr("Supported output formats:") +
-		"</b></td></tr>");
-	for (auto entry : context->output_formats()) {
-		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			.arg(QString::fromUtf8(entry.first.c_str()),
-				QString::fromUtf8(entry.second->description().c_str())));
-	}
+		tr("Supported hardware drivers:") + "</b></td></tr>");
+	for (pair<QString, QString> &entry : a->get_driver_list())
+		s.append(QString("<tr><td class=\"id\"><i>%1</i></td><td>%2</td></tr>")
+			.arg(entry.first, entry.second));
+
+	s.append("<tr><td colspan=\"2\"></td></tr>");
+	s.append("<tr><td colspan=\"2\"><b>" +
+		tr("Supported input formats:") + "</b></td></tr>");
+	for (pair<QString, QString> &entry : a->get_input_format_list())
+		s.append(QString("<tr><td class=\"id\"><i>%1</i></td><td>%2</td></tr>")
+			.arg(entry.first, entry.second));
+
+	s.append("<tr><td colspan=\"2\"></td></tr>");
+	s.append("<tr><td colspan=\"2\"><b>" +
+		tr("Supported output formats:") + "</b></td></tr>");
+	for (pair<QString, QString> &entry : a->get_output_format_list())
+		s.append(QString("<tr><td class=\"id\"><i>%1</i></td><td>%2</td></tr>")
+			.arg(entry.first, entry.second));
 
 #ifdef ENABLE_DECODE
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
-		tr("Supported protocol decoders:") +
-		"</b></td></tr>");
-	for (const GSList *l = srd_decoder_list(); l; l = l->next) {
-		dec = (struct srd_decoder *)l->data;
-		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			.arg(QString::fromUtf8(dec->id),
-				QString::fromUtf8(dec->longname)));
-	}
+		tr("Supported protocol decoders:") + "</b></td></tr>");
+	for (pair<QString, QString> &entry : a->get_pd_list())
+		s.append(QString("<tr><td class=\"id\"><i>%1</i></td><td>%2</td></tr>")
+			.arg(entry.first, entry.second));
 #endif
 
+	s.append("<tr><td colspan=\"2\"></td></tr>");
+	s.append("<tr><td colspan=\"2\"><b>" +
+		tr("Available Translations:") + "</b></td></tr>");
+	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("<tr><td class=\"id\"><i>%1</i></td><td>(%2)</td></tr>")
+			.arg(desc, editors));
+	}
+
 	s.append("</table>");
 
 	QTextDocument *supported_doc = new QTextDocument();
@@ -221,10 +541,14 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	QTextBrowser *support_list = new QTextBrowser();
 	support_list->setDocument(supported_doc);
 
-	QGridLayout *layout = new QGridLayout();
-	layout->addWidget(icon, 0, 0, 1, 1);
-	layout->addWidget(version_info, 0, 1, 1, 1);
-	layout->addWidget(support_list, 1, 1, 1, 1);
+	QHBoxLayout *h_layout = new QHBoxLayout();
+	h_layout->setAlignment(Qt::AlignLeft);
+	h_layout->addWidget(icon);
+	h_layout->addWidget(gpl_home_info);
+
+	QVBoxLayout *layout = new QVBoxLayout();
+	layout->addLayout(h_layout);
+	layout->addWidget(support_list);
 
 	QWidget *page = new QWidget(parent);
 	page->setLayout(layout);
@@ -232,6 +556,65 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 	return page;
 }
 
+QWidget *Settings::get_logging_page(QWidget *parent) const
+{
+	GlobalSettings settings;
+
+	// Log level
+	QSpinBox *loglevel_sb = new QSpinBox();
+	loglevel_sb->setMaximum(SR_LOG_SPEW);
+	loglevel_sb->setValue(logging.get_log_level());
+	connect(loglevel_sb, SIGNAL(valueChanged(int)), this,
+		SLOT(on_log_logLevel_changed(int)));
+
+	QHBoxLayout *loglevel_layout = new QHBoxLayout();
+	loglevel_layout->addWidget(new QLabel(tr("Log level:")));
+	loglevel_layout->addWidget(loglevel_sb);
+
+	// Background buffer size
+	QSpinBox *buffersize_sb = new QSpinBox();
+	buffersize_sb->setSuffix(tr(" lines"));
+	buffersize_sb->setMinimum(Logging::MIN_BUFFER_SIZE);
+	buffersize_sb->setMaximum(Logging::MAX_BUFFER_SIZE);
+	buffersize_sb->setValue(
+		settings.value(GlobalSettings::Key_Log_BufferSize).toInt());
+	connect(buffersize_sb, SIGNAL(valueChanged(int)), this,
+		SLOT(on_log_bufferSize_changed(int)));
+
+	QHBoxLayout *buffersize_layout = new QHBoxLayout();
+	buffersize_layout->addWidget(new QLabel(tr("Length of background buffer:")));
+	buffersize_layout->addWidget(buffersize_sb);
+
+	// Save to file
+	QPushButton *save_log_pb = new QPushButton(
+		QIcon::fromTheme("document-save-as", QIcon(":/icons/document-save-as.png")),
+		tr("&Save to File"));
+	connect(save_log_pb, SIGNAL(clicked(bool)),
+		this, SLOT(on_log_saveToFile_clicked(bool)));
+
+	// Pop out
+	QPushButton *pop_out_pb = new QPushButton(
+		QIcon::fromTheme("window-new", QIcon(":/icons/window-new.png")),
+		tr("&Pop out"));
+	connect(pop_out_pb, SIGNAL(clicked(bool)),
+		this, SLOT(on_log_popOut_clicked(bool)));
+
+	QHBoxLayout *control_layout = new QHBoxLayout();
+	control_layout->addLayout(loglevel_layout);
+	control_layout->addLayout(buffersize_layout);
+	control_layout->addWidget(save_log_pb);
+	control_layout->addWidget(pop_out_pb);
+
+	QVBoxLayout *root_layout = new QVBoxLayout();
+	root_layout->addLayout(control_layout);
+	root_layout->addWidget(log_view_);
+
+	QWidget *page = new QWidget(parent);
+	page->setLayout(root_layout);
+
+	return page;
+}
+
 void Settings::accept()
 {
 	GlobalSettings settings;
@@ -256,16 +639,92 @@ void Settings::on_page_changed(QListWidgetItem *current, QListWidgetItem *previo
 	pages->setCurrentIndex(page_list->row(current));
 }
 
-void Settings::on_view_alwaysZoomToFit_changed(int state)
+void Settings::on_general_language_changed(const QString &text)
+{
+	GlobalSettings settings;
+	Application* a = qobject_cast<Application*>(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 value)
 {
 	GlobalSettings settings;
-	settings.setValue(GlobalSettings::Key_View_AlwaysZoomToFit, state ? true : false);
+
+	if (value == 0)
+		settings.setValue(GlobalSettings::Key_General_Style, "");
+	else
+		settings.setValue(GlobalSettings::Key_General_Style,
+			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_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;
+	settings.setValue(GlobalSettings::Key_View_ZoomToFitDuringAcq, state ? true : false);
 }
 
-void Settings::on_view_colouredBG_changed(int state)
+void Settings::on_view_zoomToFitAfterAcq_changed(int state)
 {
 	GlobalSettings settings;
-	settings.setValue(GlobalSettings::Key_View_ColouredBG, state ? true : false);
+	settings.setValue(GlobalSettings::Key_View_ZoomToFitAfterAcq, state ? true : false);
+}
+
+void Settings::on_view_triggerIsZero_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_TriggerIsZeroTime, state ? true : false);
+}
+
+void Settings::on_view_coloredBG_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_ColoredBG, state ? true : false);
 }
 
 void Settings::on_view_stickyScrolling_changed(int state)
@@ -274,11 +733,158 @@ 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;
 	settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, state ? true : false);
 }
 
+void Settings::on_view_fillSignalHighAreas_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_FillSignalHighAreas, state ? true : false);
+}
+
+void Settings::on_view_fillSignalHighAreaColor_changed(QColor color)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_FillSignalHighAreaColor, color.rgba());
+}
+
+void Settings::on_view_showAnalogMinorGrid_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, state ? true : false);
+}
+
+void Settings::on_view_showHoverMarker_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_ShowHoverMarker, state ? true : false);
+}
+
+void Settings::on_view_keepRulerItemSelected_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_KeepRulerItemSelected, state ? true : false);
+}
+
+void Settings::on_view_snapDistance_changed(int value)
+{
+	GlobalSettings settings;
+	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;
+	settings.setValue(GlobalSettings::Key_View_ConversionThresholdDispMode, state);
+}
+
+void Settings::on_view_defaultDivHeight_changed(int value)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_DefaultDivHeight, value);
+}
+
+void Settings::on_view_defaultLogicHeight_changed(int value)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_DefaultLogicHeight, value);
+}
+
+#ifdef ENABLE_DECODE
+void Settings::on_dec_initialStateConfigurable_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_Dec_InitialStateConfigurable, state ? true : false);
+}
+
+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)
+{
+	logging.set_log_level(value);
+}
+
+void Settings::on_log_bufferSize_changed(int value)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_Log_BufferSize, value);
+}
+
+void Settings::on_log_saveToFile_clicked(bool checked)
+{
+	(void)checked;
+
+	const QString file_name = QFileDialog::getSaveFileName(
+		this, tr("Save Log"), "", tr("Log Files (*.txt *.log);;All Files (*)"));
+
+	if (file_name.isEmpty())
+		return;
+
+	QFile file(file_name);
+	if (file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
+		QTextStream out_stream(&file);
+		out_stream << log_view_->toPlainText();
+
+		if (out_stream.status() == QTextStream::Ok) {
+			QMessageBox msg(this);
+			msg.setText(tr("Success") + "\n\n" + tr("Log saved to %1.").arg(file_name));
+			msg.setStandardButtons(QMessageBox::Ok);
+			msg.setIcon(QMessageBox::Information);
+			msg.exec();
+
+			return;
+		}
+	}
+
+	QMessageBox msg(this);
+	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();
+}
+
+void Settings::on_log_popOut_clicked(bool checked)
+{
+	(void)checked;
+
+	// Create the window as a sub-window so it closes when the main window closes
+	QMainWindow *window = new QMainWindow(nullptr, Qt::SubWindow);
+
+	window->setObjectName(QString::fromUtf8("Log Window"));
+	window->setWindowTitle(tr("%1 Log").arg(PV_TITLE));
+
+	// Use same width/height as the settings dialog
+	window->resize(width(), height());
+
+	window->setCentralWidget(create_log_view());
+	window->show();
+}
+
 } // namespace dialogs
 } // namespace pv