diff options
-rw-r--r-- | src/gui/preferencedialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/preferencedialog.ui | 17 | ||||
-rw-r--r-- | src/gui/tikzview.cpp | 10 |
3 files changed, 22 insertions, 7 deletions
diff --git a/src/gui/preferencedialog.cpp b/src/gui/preferencedialog.cpp index 14cacf0..0fdd5c3 100644 --- a/src/gui/preferencedialog.cpp +++ b/src/gui/preferencedialog.cpp @@ -31,6 +31,7 @@ PreferenceDialog::PreferenceDialog(QWidget *parent) : connect(ui->minorColor, SIGNAL(clicked()), this, SLOT(colorClick())); ui->selectNewEdges->setChecked(settings.value("select-new-edges", false).toBool()); + ui->shiftToScroll->setChecked(settings.value("shift-to-scroll", false).toBool()); } PreferenceDialog::~PreferenceDialog() @@ -47,6 +48,7 @@ void PreferenceDialog::accept() settings.setValue("grid-color-major", color(ui->majorColor)); settings.setValue("grid-color-minor", color(ui->minorColor)); settings.setValue("select-new-edges", ui->selectNewEdges->isChecked()); + settings.setValue("shift-to-scroll", ui->shiftToScroll->isChecked()); QDialog::accept(); } diff --git a/src/gui/preferencedialog.ui b/src/gui/preferencedialog.ui index 80bdc57..894d356 100644 --- a/src/gui/preferencedialog.ui +++ b/src/gui/preferencedialog.ui @@ -47,7 +47,7 @@ <item row="2" column="0"> <widget class="QLabel" name="label_3"> <property name="text"> - <string>Grid colors</string> + <string>Grid Colors</string> </property> </widget> </item> @@ -220,17 +220,24 @@ </property> </widget> </item> - <item row="4" column="0"> + <item row="5" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> - <string>Auto-select new edges</string> + <string>UI Options</string> </property> </widget> </item> - <item row="4" column="1"> + <item row="5" column="1"> <widget class="QCheckBox" name="selectNewEdges"> <property name="text"> - <string/> + <string>Auto-select new edges</string> + </property> + </widget> + </item> + <item row="6" column="1"> + <widget class="QCheckBox" name="shiftToScroll"> + <property name="text"> + <string>Hold shift to scroll with wheel or touchpad</string> </property> </widget> </item> diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index ddbc404..3615685 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -134,10 +134,16 @@ void TikzView::drawBackground(QPainter *painter, const QRectF &rect) void TikzView::wheelEvent(QWheelEvent *event) { - if (event->modifiers() & Qt::ShiftModifier) { + QSettings settings("tikzit", "tikzit"); + bool shiftScroll = settings.value("shift-to-scroll", false).toBool(); + if ((!shiftScroll && event->modifiers() == Qt::NoModifier) || + (shiftScroll && (event->modifiers() == Qt::ShiftModifier))) + { event->setModifiers(Qt::NoModifier); QGraphicsView::wheelEvent(event); - } else if (event->modifiers() & Qt::ControlModifier) { + } + + if (event->modifiers() & Qt::ControlModifier) { if (event->angleDelta().y() > 0) { zoomIn(); } else if (event->angleDelta().y() < 0) { |