#include <QMainWindow>
#include <QMessageBox>
#include <QPushButton>
+#include <QScrollBar>
#include <QSpinBox>
#include <QString>
#include <QTextBrowser>
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);
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
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
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
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);
}
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)));
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);
+
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);
QLabel *icon = new QLabel();
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);
+ gpl_home_info->setOpenExternalLinks(true);
shared_ptr<sigrok::Context> context = device_manager_.context();
s.append("<table>");
- /* Library info */
+ /* Version, library, and feature info */
s.append("<tr><td colspan=\"2\"><b>" +
- tr("Libraries and features:") + "</b></td></tr>");
+ tr("Versions, libraries and features:") + "</b></td></tr>");
+ s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+ .arg(QApplication::applicationName(),
+ QApplication::applicationVersion()));
s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
.arg(QString("Qt"), qVersion()));
s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
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);
// 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());
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)
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_conversionThresholdDispMode_changed(int state)
{
GlobalSettings settings;
(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));
projects / pulseview.git / blobdiff