Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the under-the-hood code to support customisation of ... #32

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added the under-the-hood code to support customisation of ... #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0eaa00
Added the under-the-hood code to support customisation of keys/mousew…
Sep 20, 2020
8ed7b72
Finished customised navigation by adding GUI support for setting the …
Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
535 changes: 535 additions & 0 deletions icons/navigation.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions pulseview.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<file>icons/media-playback-pause.png</file>
<file>icons/media-playback-start.png</file>
<file>icons/menu.svg</file>
<file>icons/navigation.svg</file>
<file>icons/preferences-system.png</file>
<file>icons/settings-general.png</file>
<file>icons/settings-views.svg</file>
Expand Down
89 changes: 89 additions & 0 deletions pv/dialogs/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,15 @@ void Settings::create_pages()
viewButton->setTextAlignment(Qt::AlignVCenter);
viewButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);

// Navigation page
pages->addWidget(get_navigation_settings_form(pages));

QListWidgetItem *navButton = new QListWidgetItem(page_list);
navButton->setIcon(QIcon(":/icons/navigation.svg"));
navButton->setText(tr("Navigation"));
navButton->setTextAlignment(Qt::AlignVCenter);
navButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);

#ifdef ENABLE_DECODE
// Decoder page
pages->addWidget(get_decoder_settings_form(pages));
Expand Down Expand Up @@ -384,6 +393,54 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
return form;
}

QWidget *Settings::get_navigation_settings_form(QWidget *parent)
{
GlobalSettings settings;

QWidget *form = new QWidget(parent);
QVBoxLayout *form_layout = new QVBoxLayout(form);

// Navigation control settings
QGroupBox *nav_group = new QGroupBox(tr("Trace Navigation Controls"));
form_layout->addWidget(nav_group);

QGridLayout *nav_layout = new QGridLayout();
nav_group->setLayout(nav_layout);

int row = 0;

// buttons for default settings
QPushButton *zoom_but = new QPushButton( tr("Reset to &Zoom as main controls") );
connect(zoom_but, SIGNAL(clicked(bool)), this, SLOT(on_nav_resetZoomControls_clicked(bool)));
nav_layout->addWidget(zoom_but, row, 0);
QPushButton *move_but = new QPushButton( tr("Reset to &Move as main controls") );
connect(move_but, SIGNAL(clicked(bool)), this, SLOT(on_nav_resetMoveControls_clicked(bool)));
nav_layout->addWidget(move_but, row, 1);
row++;

// heading
QLabel *hdr1_label = new QLabel(tr("Control"));
hdr1_label->setAlignment(Qt::AlignLeft);
nav_layout->addWidget(hdr1_label, row, 0);
QLabel *hdr2_label = new QLabel(tr("Operation"));
hdr2_label->setAlignment(Qt::AlignLeft);
nav_layout->addWidget(hdr2_label, row, 1);
QLabel *hdr3_label = new QLabel(tr("NumPages or NumTimes"));
hdr3_label->setAlignment(Qt::AlignLeft);
nav_layout->addWidget(hdr3_label, row, 2);
row++;
// entries
NAV_SETTINGS_ROWS(UpDown, "Up / Down", row); row++;
NAV_SETTINGS_ROWS(LeftRight,"Left / Right", row); row++;
NAV_SETTINGS_ROWS(PageUpDown,"PageUp / PageDown", row); row++;
NAV_SETTINGS_ROWS(WheelHori,"Mouse Wheel Horizontal", row); row++;
NAV_SETTINGS_ROWS(WheelVert,"Mouse Wheel Vertical", row); row++;

nav_load_gui_from_settings();

return form;
}

QWidget *Settings::get_decoder_settings_form(QWidget *parent)
{
#ifdef ENABLE_DECODE
Expand Down Expand Up @@ -769,6 +826,38 @@ void Settings::on_view_defaultLogicHeight_changed(int value)
settings.setValue(GlobalSettings::Key_View_DefaultLogicHeight, value);
}

void Settings::on_nav_resetZoomControls_clicked(bool checked)
{
printf("on_nav_resetZoomControls_clicked : %d\n", checked?1:0);
GlobalSettings settings;
settings.set_nav_zoom_defaults(true);
nav_load_gui_from_settings();
}

void Settings::on_nav_resetMoveControls_clicked(bool checked)
{
printf("on_nav_resetMoveControls_clicked : %d\n", checked?1:0);
GlobalSettings settings;
settings.set_nav_move_defaults(true);
nav_load_gui_from_settings();
}

NAV_SETTINGS_FUNC_DEFINE(UpDown)
NAV_SETTINGS_FUNC_DEFINE(LeftRight)
NAV_SETTINGS_FUNC_DEFINE(PageUpDown)
NAV_SETTINGS_FUNC_DEFINE(WheelHori)
NAV_SETTINGS_FUNC_DEFINE(WheelVert)

void Settings::nav_load_gui_from_settings()
{
GlobalSettings settings;
NAV_SETTINGS_LOAD(UpDown);
NAV_SETTINGS_LOAD(LeftRight);
NAV_SETTINGS_LOAD(PageUpDown);
NAV_SETTINGS_LOAD(WheelHori);
NAV_SETTINGS_LOAD(WheelVert);
}

#ifdef ENABLE_DECODE
void Settings::on_dec_initialStateConfigurable_changed(int state)
{
Expand Down
89 changes: 88 additions & 1 deletion pv/dialogs/settings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,79 @@
#include <QPlainTextEdit>
#include <QStackedWidget>
#include <QLineEdit>
#include <QComboBox>

#define NAV_SETTINGS_FUNC_DECLARE1(name) \
void on_nav_ ## name ## Type_changed(int type); \
void on_nav_ ## name ## Amount_changed(const QString& astr)

#define NAV_SETTINGS_FUNC_DECLARE(name) \
NAV_SETTINGS_FUNC_DECLARE1(name); \
NAV_SETTINGS_FUNC_DECLARE1(name ## Alt);\
NAV_SETTINGS_FUNC_DECLARE1(name ## Ctrl);\
NAV_SETTINGS_FUNC_DECLARE1(name ## Shift)

#define NAV_SETTINGS_FUNC_DEFINE1(name) \
void Settings::on_nav_ ## name ## Type_changed(int type){ \
GlobalSettings settings; \
settings.setValue(GlobalSettings::Key_Nav_ ## name ## Type, type); \
} \
void Settings::on_nav_ ## name ## Amount_changed(const QString& astr) { \
GlobalSettings settings; \
settings.setValue(GlobalSettings::Key_Nav_ ## name ## Amount, astr.toDouble()); \
}

#define NAV_SETTINGS_FUNC_DEFINE(name) \
NAV_SETTINGS_FUNC_DEFINE1(name) \
NAV_SETTINGS_FUNC_DEFINE1(name ## Alt) \
NAV_SETTINGS_FUNC_DEFINE1(name ## Ctrl) \
NAV_SETTINGS_FUNC_DEFINE1(name ## Shift)

#define NAV_SETTINGS_ROW(name, text, row) \
QLabel * name ## _label = new QLabel(tr(text));\
name ## _label->setAlignment(Qt::AlignLeft); \
nav_layout->addWidget(name ## _label, row, 0); \
\
name ## _type_cb_ = new QComboBox(); \
name ## _type_cb_->addItem(tr("None"), NAV_TYPE_NONE); \
name ## _type_cb_->addItem(tr("Zoom"), NAV_TYPE_ZOOM); \
name ## _type_cb_->addItem(tr("Move Horizontally"), NAV_TYPE_HORI); \
name ## _type_cb_->addItem(tr("Move Vertically"), NAV_TYPE_VERT); \
name ## _type_cb_->setCurrentIndex( settings.value(GlobalSettings::Key_Nav_ ## name ## Type).toInt() ); \
connect(name ## _type_cb_, SIGNAL(currentIndexChanged(int)), this, SLOT(on_nav_ ## name ## Type_changed(int))); \
nav_layout->addWidget(name ## _type_cb_, row, 1); \
\
name ## _amount_edit_ = new QLineEdit(); \
name ## _amount_edit_->setText( settings.value(GlobalSettings::Key_Nav_ ## name ## Amount).toString() ); \
connect(name ## _amount_edit_, SIGNAL(textChanged(const QString&)), this, SLOT(on_nav_ ## name ## Amount_changed(const QString&))); \
nav_layout->addWidget(name ## _amount_edit_, row, 2)
// name ## _amount_edit_->setValidator( new QDoubleValidator(name ## _amount_edit_) );

#define NAV_SETTINGS_ROWS(name, text, row) \
NAV_SETTINGS_ROW(name, text, row*4 + 0); \
NAV_SETTINGS_ROW(name ## Alt, text " + Alt", row*4 + 1); \
NAV_SETTINGS_ROW(name ## Ctrl, text " + Ctrl", row*4 + 2); \
NAV_SETTINGS_ROW(name ## Shift, text " + Shift", row*4 + 3)

#define NAV_SETTINGS_VAR_DECLARE1(name) \
QComboBox * name ## _type_cb_; \
QLineEdit* name ## _amount_edit_

#define NAV_SETTINGS_VAR_DECLARE(name) \
NAV_SETTINGS_VAR_DECLARE1(name); \
NAV_SETTINGS_VAR_DECLARE1(name ## Alt); \
NAV_SETTINGS_VAR_DECLARE1(name ## Ctrl); \
NAV_SETTINGS_VAR_DECLARE1(name ## Shift)

#define NAV_SETTINGS_LOAD1(name) \
name ## _type_cb_->setCurrentIndex( settings.value(GlobalSettings::Key_Nav_ ## name ## Type).toInt() ); \
name ## _amount_edit_->setText( settings.value(GlobalSettings::Key_Nav_ ## name ## Amount).toString() )

#define NAV_SETTINGS_LOAD(name) \
NAV_SETTINGS_LOAD1(name); \
NAV_SETTINGS_LOAD1(name ## Alt); \
NAV_SETTINGS_LOAD1(name ## Ctrl); \
NAV_SETTINGS_LOAD1(name ## Shift)

namespace pv {

Expand All @@ -49,6 +122,7 @@ class Settings : public QDialog

QWidget *get_general_settings_form(QWidget *parent) const;
QWidget *get_view_settings_form(QWidget *parent) const;
QWidget *get_navigation_settings_form(QWidget *parent);
QWidget *get_decoder_settings_form(QWidget *parent);
QWidget *get_about_page(QWidget *parent) const;
QWidget *get_logging_page(QWidget *parent) const;
Expand Down Expand Up @@ -77,7 +151,15 @@ private Q_SLOTS:
void on_view_conversionThresholdDispMode_changed(int state);
void on_view_defaultDivHeight_changed(int value);
void on_view_defaultLogicHeight_changed(int value);
#ifdef ENABLE_DECODE
void on_nav_resetZoomControls_clicked(bool checked);
void on_nav_resetMoveControls_clicked(bool checked);
NAV_SETTINGS_FUNC_DECLARE(UpDown);
NAV_SETTINGS_FUNC_DECLARE(LeftRight);
NAV_SETTINGS_FUNC_DECLARE(PageUpDown);
NAV_SETTINGS_FUNC_DECLARE(WheelHori);
NAV_SETTINGS_FUNC_DECLARE(WheelVert);
void nav_load_gui_from_settings();
#ifdef ENABLE_DECODE
void on_dec_initialStateConfigurable_changed(int state);
void on_dec_exportFormat_changed(const QString &text);
void on_dec_alwaysshowallrows_changed(int state);
Expand All @@ -91,6 +173,11 @@ private Q_SLOTS:
DeviceManager &device_manager_;
PageListWidget *page_list;
QStackedWidget *pages;
NAV_SETTINGS_VAR_DECLARE(UpDown);
NAV_SETTINGS_VAR_DECLARE(LeftRight);
NAV_SETTINGS_VAR_DECLARE(PageUpDown);
NAV_SETTINGS_VAR_DECLARE(WheelHori);
NAV_SETTINGS_VAR_DECLARE(WheelVert);

#ifdef ENABLE_DECODE
QLineEdit *ann_export_format_;
Expand Down
75 changes: 74 additions & 1 deletion pv/globalsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ const QString GlobalSettings::Key_View_CursorFillColor = "View_CursorFillColor";
const QString GlobalSettings::Key_View_CursorShowFrequency = "View_CursorShowFrequency";
const QString GlobalSettings::Key_View_CursorShowInterval = "View_CursorShowInterval";
const QString GlobalSettings::Key_View_CursorShowSamples = "View_CursorShowSamples";
NAV_GSETTINGS_VAR_SETUP(UpDown);
NAV_GSETTINGS_VAR_SETUP(LeftRight);
NAV_GSETTINGS_VAR_SETUP(PageUpDown);
NAV_GSETTINGS_VAR_SETUP(WheelHori);
NAV_GSETTINGS_VAR_SETUP(WheelVert);
const QString GlobalSettings::Key_Dec_InitialStateConfigurable = "Dec_InitialStateConfigurable";
const QString GlobalSettings::Key_Dec_ExportFormat = "Dec_ExportFormat";
const QString GlobalSettings::Key_Dec_AlwaysShowAllRows = "Dec_AlwaysShowAllRows";
Expand Down Expand Up @@ -98,6 +103,72 @@ void GlobalSettings::save_internal_defaults()
default_palette_ = QApplication::palette();
}

// make controls zoom the traces when not using any key modifiers
// these controls are similar to the old controls used before customisation was introduced.
void GlobalSettings::set_nav_zoom_defaults(bool force)
{
// zoom
NAV_GSETTINGS_VAR_DEFAULT(UpDown, NAV_TYPE_ZOOM, 0.25); // up/down arrow will zoom the traces by 1/4x
// small vertical movement
NAV_GSETTINGS_VAR_DEFAULT(UpDownCtrl, NAV_TYPE_VERT, 0.125); // up/down with any modifier will move traces vertically by 1/8 page
NAV_GSETTINGS_VAR_DEFAULT(UpDownAlt, NAV_TYPE_VERT, 0.125);
NAV_GSETTINGS_VAR_DEFAULT(UpDownShift, NAV_TYPE_VERT, 0.125);
// small horizontal movement
NAV_GSETTINGS_VAR_DEFAULT(LeftRight, NAV_TYPE_HORI, 0.125); // left/right arrow will move the trace by 1/8 page
NAV_GSETTINGS_VAR_DEFAULT(LeftRightShift, NAV_TYPE_HORI, 0.125); // left/right arrow + ctrl will move the trace by 1/8 page
NAV_GSETTINGS_VAR_DEFAULT(LeftRightCtrl, NAV_TYPE_HORI, 0.25); // left/right arrow + ctrl will move the trace by 1/4 page
NAV_GSETTINGS_VAR_DEFAULT(LeftRightAlt, NAV_TYPE_HORI, 0.5); // left/right arrow + alt will move the trace by 1/2 page
// big vertical movement
NAV_GSETTINGS_VAR_DEFAULT(PageUpDown, NAV_TYPE_VERT, 1.0); // page up/down will move traces vertically by 1 page
NAV_GSETTINGS_VAR_DEFAULT(PageUpDownShift, NAV_TYPE_VERT, 1.0); // page up/down + shift will move traces vertically by 1 page
NAV_GSETTINGS_VAR_DEFAULT(PageUpDownCtrl, NAV_TYPE_VERT, 2.0); // page up/down + ctrl will move traces vertically by 2 page
NAV_GSETTINGS_VAR_DEFAULT(PageUpDownAlt, NAV_TYPE_VERT, 4.0); // page up/down + alt will move traces vertically by 4 page
// vertical mosewheel can zoom and move horizontally and vertically
NAV_GSETTINGS_VAR_DEFAULT(WheelVert, NAV_TYPE_ZOOM, 0.25); // vertical mousewheel will zoom the traces by 1/4x
NAV_GSETTINGS_VAR_DEFAULT(WheelVertShift, NAV_TYPE_ZOOM, 0.25); // vertical mousewheel + shift will zoom the traces by 1/4x
NAV_GSETTINGS_VAR_DEFAULT(WheelVertCtrl, NAV_TYPE_VERT, 0.5); // vertical mousewheel + ctrl will move the traces by 1/2 page
NAV_GSETTINGS_VAR_DEFAULT(WheelVertAlt, NAV_TYPE_HORI, 1.0); // vertical mousewheel + alt will move the traces by 1 page
// horizontal mousewheel always moves horizontally
NAV_GSETTINGS_VAR_DEFAULT(WheelHori, NAV_TYPE_HORI, 0.25); // horizontal mousewheel will move the traces by 1/4 page
NAV_GSETTINGS_VAR_DEFAULT(WheelHoriShift, NAV_TYPE_HORI, 0.25); // horizontal mousewheel + shift will move the traces by 1/4 page
NAV_GSETTINGS_VAR_DEFAULT(WheelHoriCtrl, NAV_TYPE_HORI, 0.5); // horizontal mousewheel + ctrl will move the traces by 1/2 page
NAV_GSETTINGS_VAR_DEFAULT(WheelHoriAlt, NAV_TYPE_HORI, 1.0); // horizontal mousewheel + alt will move the traces by 1 page
}

// make controls move the traces without key modifiers.
// slow speed move is default
// ctrl modifier does medium speed move
// alt modifier does fast speed move
// shift key always does zoom
void GlobalSettings::set_nav_move_defaults(bool force)
{
// vertical movement
NAV_GSETTINGS_VAR_DEFAULT(UpDown, NAV_TYPE_VERT, 0.125); // up/down arrow will move the traces by 1/8 page
// zoom
NAV_GSETTINGS_VAR_DEFAULT(WheelHoriShift, NAV_TYPE_ZOOM, 0.25); // horizontal mousewheel + shift will zoom in/out by 1/4 x
NAV_GSETTINGS_VAR_DEFAULT(WheelVertShift, NAV_TYPE_ZOOM, 0.25); // vertical mousewheel + shift will zoom in/out by 1/4 x
NAV_GSETTINGS_VAR_DEFAULT(UpDownShift, NAV_TYPE_ZOOM, 1.0); // up/down arrow + shift will zoom in/out by 1x
NAV_GSETTINGS_VAR_DEFAULT(PageUpDownShift, NAV_TYPE_ZOOM, 2.0); // page up/down + shift will zoom in/out by 2x
// horizontal movement
NAV_GSETTINGS_VAR_DEFAULT(LeftRight, NAV_TYPE_HORI, 0.125); // left/right arrow will move the trace by 1/8 page
NAV_GSETTINGS_VAR_DEFAULT(LeftRightCtrl, NAV_TYPE_HORI, 0.25); // left/right arrow + ctrl will move the trace by 1/4 page
NAV_GSETTINGS_VAR_DEFAULT(LeftRightAlt, NAV_TYPE_HORI, 0.5); // left/right arrow + alt will move the trace by 1/2 page
NAV_GSETTINGS_VAR_DEFAULT(PageUpDown, NAV_TYPE_HORI, 1.0); // page up/down will move the trace by 1 page
NAV_GSETTINGS_VAR_DEFAULT(PageUpDownCtrl, NAV_TYPE_HORI, 2.0); // page up/down + ctrl will move the trace by 2 pages
NAV_GSETTINGS_VAR_DEFAULT(PageUpDownAlt, NAV_TYPE_HORI, 4.0); // page up/down + alt will move the trace by 4 pages
// horizontal movement with mousewheel
NAV_GSETTINGS_VAR_DEFAULT(WheelHori, NAV_TYPE_HORI, 0.25); // horizontal mousewheel will move the traces by 1/4 page
NAV_GSETTINGS_VAR_DEFAULT(WheelVert, NAV_TYPE_HORI, 0.25); // vertical mousewheel will move the traces by 1/4 page
NAV_GSETTINGS_VAR_DEFAULT(WheelHoriCtrl, NAV_TYPE_HORI, 0.5); // horizontal mousewheel + ctrl will move the traces by 1/2 page
NAV_GSETTINGS_VAR_DEFAULT(WheelVertCtrl, NAV_TYPE_HORI, 0.5); // vertical mousewheel + ctrl will move the traces by 1/2 page
NAV_GSETTINGS_VAR_DEFAULT(WheelHoriAlt, NAV_TYPE_HORI, 1.0); // horizontal mousewheel + alt will move the traces by 1 page
NAV_GSETTINGS_VAR_DEFAULT(WheelVertAlt, NAV_TYPE_HORI, 1.0); // vertical mousewheel + alt will move the traces by 1 page
// not used
NAV_GSETTINGS_VAR_DEFAULT(UpDownCtrl, NAV_TYPE_NONE, 0);
NAV_GSETTINGS_VAR_DEFAULT(UpDownAlt, NAV_TYPE_NONE, 0);
NAV_GSETTINGS_VAR_DEFAULT(LeftRightShift, NAV_TYPE_NONE, 0);
}

void GlobalSettings::set_defaults_where_needed()
{
if (!contains(Key_General_Language)) {
Expand Down Expand Up @@ -154,7 +225,9 @@ void GlobalSettings::set_defaults_where_needed()

if (!contains(Key_View_CursorShowFrequency))
setValue(Key_View_CursorShowFrequency, true);


set_nav_zoom_defaults(false);

// %c was used for the row name in the past so we need to transition such users
if (!contains(Key_Dec_ExportFormat) ||
value(Key_Dec_ExportFormat).toString() == "%s %d: %c: %1")
Expand Down
40 changes: 40 additions & 0 deletions pv/globalsettings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,39 @@ class GlobalSettingsInterface
};


// type of navigation to perform
#define NAV_TYPE_NONE 0
#define NAV_TYPE_ZOOM 1
#define NAV_TYPE_HORI 2
#define NAV_TYPE_VERT 3

#define NAV_GSETTINGS_VAR_DECLARE(name) \
static const QString Key_Nav_ ## name ## Type; \
static const QString Key_Nav_ ## name ## Amount; \
static const QString Key_Nav_ ## name ## AltType; \
static const QString Key_Nav_ ## name ## AltAmount; \
static const QString Key_Nav_ ## name ## CtrlType; \
static const QString Key_Nav_ ## name ## CtrlAmount; \
static const QString Key_Nav_ ## name ## ShiftType; \
static const QString Key_Nav_ ## name ## ShiftAmount

#define NAV_GSETTINGS_VAR_SETUP(name) \
const QString GlobalSettings::Key_Nav_ ## name ## Type = "Nav_" #name "Type"; \
const QString GlobalSettings::Key_Nav_ ## name ## Amount = "Nav_" #name "Amount"; \
const QString GlobalSettings::Key_Nav_ ## name ## AltType = "Nav_" #name "AltType"; \
const QString GlobalSettings::Key_Nav_ ## name ## AltAmount = "Nav_" #name "AltAmount"; \
const QString GlobalSettings::Key_Nav_ ## name ## CtrlType = "Nav_" #name "CtrlType"; \
const QString GlobalSettings::Key_Nav_ ## name ## CtrlAmount = "Nav_" #name "CtrlAmount"; \
const QString GlobalSettings::Key_Nav_ ## name ## ShiftType = "Nav_" #name "ShiftType"; \
const QString GlobalSettings::Key_Nav_ ## name ## ShiftAmount = "Nav_" #name "ShiftAmount"

#define NAV_GSETTINGS_VAR_DEFAULT(name, type, amount) \
if (!contains(Key_Nav_ ## name ## Type) || force) \
setValue(Key_Nav_ ## name ## Type, type); \
if (!contains(Key_Nav_ ## name ## Amount) || force) \
setValue(Key_Nav_ ## name ## Amount, amount)


class GlobalSettings : public QSettings
{
Q_OBJECT
Expand Down Expand Up @@ -75,6 +108,11 @@ class GlobalSettings : public QSettings
static const QString Key_View_CursorShowInterval;
static const QString Key_View_CursorShowFrequency;
static const QString Key_View_CursorShowSamples;
NAV_GSETTINGS_VAR_DECLARE(UpDown);
NAV_GSETTINGS_VAR_DECLARE(LeftRight);
NAV_GSETTINGS_VAR_DECLARE(PageUpDown);
NAV_GSETTINGS_VAR_DECLARE(WheelHori);
NAV_GSETTINGS_VAR_DECLARE(WheelVert);
static const QString Key_Dec_InitialStateConfigurable;
static const QString Key_Dec_ExportFormat;
static const QString Key_Dec_AlwaysShowAllRows;
Expand All @@ -92,6 +130,8 @@ class GlobalSettings : public QSettings

void save_internal_defaults();
void set_defaults_where_needed();
void set_nav_zoom_defaults(bool force);
void set_nav_move_defaults(bool force);
void set_bright_theme_default_colors();
void set_dark_theme_default_colors();

Expand Down
Loading