X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=4744567f6b0eef1d6eee0cc14e99e23e447cfae5;hb=641574bcc118be0b6dc3a65039ab3497f9d7241a;hp=25994f1fb1fba422372a6da500fc5ba1e0421f34;hpb=bcb4c327ee9b8d2172d126429ba017884d079d4c;p=pulseview.git

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 25994f1..4744567 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -33,6 +33,7 @@
 #include <QMainWindow>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QScrollBar>
 #include <QSpinBox>
 #include <QString>
 #include <QTextBrowser>
@@ -57,29 +58,49 @@ using std::shared_ptr;
 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),
 	device_manager_(device_manager)
 {
-	const int icon_size = 64;
-
 	resize(600, 400);
 
 	// Create log view
 	log_view_ = create_log_view();
 
 	// Create pages
-	page_list = new QListWidget;
-	page_list->setViewMode(QListView::IconMode);
-	page_list->setIconSize(QSize(icon_size, icon_size));
+	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);
@@ -109,7 +130,7 @@ void Settings::create_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
@@ -119,7 +140,7 @@ void Settings::create_pages()
 	QListWidgetItem *decoderButton = new QListWidgetItem(page_list);
 	decoderButton->setIcon(QIcon(":/icons/add-decoder.svg"));
 	decoderButton->setText(tr("Decoders"));
-	decoderButton->setTextAlignment(Qt::AlignHCenter);
+	decoderButton->setTextAlignment(Qt::AlignVCenter);
 	decoderButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 #endif
 
@@ -129,7 +150,7 @@ void Settings::create_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
@@ -138,7 +159,7 @@ void Settings::create_pages()
 	QListWidgetItem *loggingButton = new QListWidgetItem(page_list);
 	loggingButton->setIcon(QIcon(":/icons/information.svg"));
 	loggingButton->setText(tr("Logging"));
-	loggingButton->setTextAlignment(Qt::AlignHCenter);
+	loggingButton->setTextAlignment(Qt::AlignVCenter);
 	loggingButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 }
 
@@ -184,9 +205,9 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 	QFormLayout *trace_view_layout = new QFormLayout();
 	trace_view_group->setLayout(trace_view_layout);
 
-	cb = create_checkbox(GlobalSettings::Key_View_ColouredBG,
-		SLOT(on_view_colouredBG_changed(int)));
-	trace_view_layout->addRow(tr("Use coloured trace &background"), 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)));
@@ -550,10 +571,10 @@ void Settings::on_view_triggerIsZero_changed(int state)
 	settings.setValue(GlobalSettings::Key_View_TriggerIsZeroTime, state ? true : false);
 }
 
-void Settings::on_view_colouredBG_changed(int state)
+void Settings::on_view_coloredBG_changed(int state)
 {
 	GlobalSettings settings;
-	settings.setValue(GlobalSettings::Key_View_ColouredBG, state ? true : false);
+	settings.setValue(GlobalSettings::Key_View_ColoredBG, state ? true : false);
 }
 
 void Settings::on_view_stickyScrolling_changed(int state)
@@ -649,7 +670,7 @@ 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(0, Qt::SubWindow);
+	QMainWindow *window = new QMainWindow(nullptr, Qt::SubWindow);
 
 	window->setObjectName(QString::fromUtf8("Log Window"));
 	window->setWindowTitle(tr("%1 Log").arg(PV_TITLE));