Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qimgv for openSUSE:Factory checked in at 2023-07-11 15:57:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qimgv (Old) and /work/SRC/openSUSE:Factory/.qimgv.new.8922 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qimgv" Tue Jul 11 15:57:07 2023 rev:27 rq:1098029 version:1.0.3a+git20230615.e2675f1 Changes: -------- --- /work/SRC/openSUSE:Factory/qimgv/qimgv.changes 2023-01-11 14:36:38.761770717 +0100 +++ /work/SRC/openSUSE:Factory/.qimgv.new.8922/qimgv.changes 2023-07-11 15:57:26.949222278 +0200 @@ -1,0 +2,22 @@ +Mon Jul 03 22:22:39 UTC 2023 - [email protected] + +- Update to version 1.0.3a+git20230615.e2675f1: + * Update build-package.yml + * Exiv2::AnyError was removed + * toggleScalingFilter now toggles configured filter instead of bilinear + * Modify build-package.yaml + * Modify build-package.yml + * Modify build-package.yml + +------------------------------------------------------------------- +Thu May 18 00:14:39 UTC 2023 - [email protected] + +- Update to version 1.0.3a+git20230407.22a8f2e: + * debug printouts / wheel test + * [Settings] add trackpadDetection toggle #337 + * [DirectoryManager] make folder sorting optional + * upd donate links + * [thumbnailview] reduce calls to loadVisibleThumbnails() + * [thumbnailview] fix incorrect preload areas + +------------------------------------------------------------------- Old: ---- qimgv-1.0.3a+git20221107.8ad0a11.tar.gz New: ---- qimgv-1.0.3a+git20230615.e2675f1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qimgv.spec ++++++ --- /var/tmp/diff_new_pack.Vh7h7K/_old 2023-07-11 15:57:28.549231585 +0200 +++ /var/tmp/diff_new_pack.Vh7h7K/_new 2023-07-11 15:57:28.553231609 +0200 @@ -17,7 +17,7 @@ Name: qimgv -Version: 1.0.3a+git20221107.8ad0a11 +Version: 1.0.3a+git20230615.e2675f1 Release: 0 Summary: Qt5 image viewer License: GPL-3.0-only ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Vh7h7K/_old 2023-07-11 15:57:28.601231888 +0200 +++ /var/tmp/diff_new_pack.Vh7h7K/_new 2023-07-11 15:57:28.609231934 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/easymodo/qimgv</param> - <param name="changesrevision">8ad0a1173cd3c6b96a5549405de71d1ea57c09ac</param></service></servicedata> + <param name="changesrevision">e2675f135d6be45036f84285a68e5a079ab4f449</param></service></servicedata> (No newline at EOF) ++++++ qimgv-1.0.3a+git20221107.8ad0a11.tar.gz -> qimgv-1.0.3a+git20230615.e2675f1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/README.md new/qimgv-1.0.3a+git20230615.e2675f1/README.md --- old/qimgv-1.0.3a+git20221107.8ad0a11/README.md 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/README.md 2023-06-15 07:42:32.000000000 +0200 @@ -1,7 +1,4 @@ -## DEVELOPMENT IS ON HOLD INDEFINITELY (russian invasion of my country) ------------------------------- ------------------------------- ------------------------------- +## :exclamation: Updates may be slow due to war in Ukraine :sunflower: :sunflower: :sunflower: qimgv | Current version: 1.0.2 ===== @@ -207,8 +204,10 @@ # Donate -If you wish to throw me a few bucks, you can do it here: +If you wish to give me a few bucks, please consider donating to the Ukrainian Army instead: -<a href="https://www.buymeacoffee.com/easymodo"; target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-orange.png"; alt="Donate" height="41" width="174"></a> +[https://savelife.in.ua/en/donate-en/#donate-army-card-once](https://savelife.in.ua/en/donate-en/#donate-army-card-once) -Any support is appreciated! +[https://u24.gov.ua/](https://u24.gov.ua/) + +This directly increases the chances of me being able to work on this in future diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/components/directorymanager/directorymanager.cpp new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/components/directorymanager/directorymanager.cpp --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/components/directorymanager/directorymanager.cpp 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/components/directorymanager/directorymanager.cpp 2023-06-15 07:42:32.000000000 +0200 @@ -384,7 +384,10 @@ } void DirectoryManager::sortEntryLists() { - std::sort(dirEntryVec.begin(), dirEntryVec.end(), std::bind(compareFunction(), this, std::placeholders::_1, std::placeholders::_2)); + if(settings->sortFolders()) + std::sort(dirEntryVec.begin(), dirEntryVec.end(), std::bind(compareFunction(), this, std::placeholders::_1, std::placeholders::_2)); + else + std::sort(dirEntryVec.begin(), dirEntryVec.end(), std::bind(&DirectoryManager::path_entry_compare, this, std::placeholders::_1, std::placeholders::_2)); std::sort(fileEntryVec.begin(), fileEntryVec.end(), std::bind(compareFunction(), this, std::placeholders::_1, std::placeholders::_2)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/customwidgets/thumbnailview.cpp new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/customwidgets/thumbnailview.cpp --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/customwidgets/thumbnailview.cpp 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/customwidgets/thumbnailview.cpp 2023-06-15 07:42:32.000000000 +0200 @@ -371,15 +371,15 @@ QRectF offRectBack; QRectF offRectFront; if(mOrientation == Qt::Horizontal) { - offRectBack = QRectF(visRect.left() - offscreenPreloadArea, visRect.top(), - visRect.left(), visRect.height()); + offRectBack = QRectF(visRect.left() - offscreenPreloadArea, visRect.top(), + offscreenPreloadArea, visRect.height()); offRectFront = QRectF(visRect.right(), visRect.top(), - visRect.right() + offscreenPreloadArea, visRect.height()); + offscreenPreloadArea, visRect.height()); } else { - offRectBack = QRectF(visRect.left(), visRect.top() - offscreenPreloadArea, - visRect.width(), visRect.top()); + offRectBack = QRectF(visRect.left(), visRect.top() - offscreenPreloadArea, + visRect.width(), offscreenPreloadArea); offRectFront = QRectF(visRect.left(), visRect.bottom(), - visRect.width(), visRect.bottom() + offscreenPreloadArea); + visRect.width(), offscreenPreloadArea); } QList<QGraphicsItem *>visibleItems; if(lastScrollDirection == SCROLL_FORWARDS) @@ -591,7 +591,7 @@ { redirect = true; } - if(scrollTimeLine->state() == QTimeLine::Running || scrollTimeLine->state() == QTimeLine::Paused) { + if(scrollTimeLine->state() == QTimeLine::Running || scrollTimeLine->state() == QTimeLine::Paused) { int oldEndFrame = scrollTimeLine->endFrame(); if(scrollTimeLine->currentTime() < SCROLL_ACCELERATION_THRESHOLD) accelerate = true; @@ -601,13 +601,16 @@ createScrollTimeLine(); if(!redirect && additive) newEndFrame = oldEndFrame - static_cast<int>(delta * multiplier * acceleration); + // force load thumbs inbetween scroll animations + blockThumbnailLoading = false; + loadVisibleThumbnails(); } scrollTimeLine->stop(); if(accelerate) scrollTimeLine->setDuration(SCROLL_DURATION / SCROLL_ACCELERATION); else scrollTimeLine->setDuration(SCROLL_DURATION); - //blockThumbnailLoading = true; + blockThumbnailLoading = true; scrollTimeLine->setFrameRange(center, newEndFrame); scrollTimeLine->start(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/dialogs/settingsdialog.cpp new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/dialogs/settingsdialog.cpp --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/dialogs/settingsdialog.cpp 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/dialogs/settingsdialog.cpp 2023-06-15 07:42:32.000000000 +0200 @@ -185,6 +185,9 @@ ui->confirmDeleteCheckBox->setChecked(settings->confirmDelete()); ui->confirmTrashCheckBox->setChecked(settings->confirmTrash()); ui->unlockMinZoomCheckBox->setChecked(settings->unlockMinZoom()); + ui->sortFoldersCheckBox->setChecked(settings->sortFolders()); + ui->trackpadDetectionCheckBox->setChecked(settings->trackpadDetection()); + if(settings->zoomIndicatorMode() == INDICATOR_ENABLED) ui->zoomIndicatorOn->setChecked(true); else if(settings->zoomIndicatorMode() == INDICATOR_AUTO) @@ -318,6 +321,9 @@ settings->setConfirmDelete(ui->confirmDeleteCheckBox->isChecked()); settings->setConfirmTrash(ui->confirmTrashCheckBox->isChecked()); settings->setUnlockMinZoom(ui->unlockMinZoomCheckBox->isChecked()); + settings->setSortFolders(ui->sortFoldersCheckBox->isChecked()); + settings->setTrackpadDetection(ui->trackpadDetectionCheckBox->isChecked()); + if(ui->zoomIndicatorOn->isChecked()) settings->setZoomIndicatorMode(INDICATOR_ENABLED); else if(ui->zoomIndicatorAuto->isChecked()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/dialogs/settingsdialog.ui new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/dialogs/settingsdialog.ui --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/dialogs/settingsdialog.ui 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/dialogs/settingsdialog.ui 2023-06-15 07:42:32.000000000 +0200 @@ -308,7 +308,7 @@ <x>0</x> <y>0</y> <width>595</width> - <height>1257</height> + <height>1291</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_5" stretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"> @@ -1535,6 +1535,13 @@ </item> </layout> </item> + <item> + <widget class="QCheckBox" name="sortFoldersCheckBox"> + <property name="text"> + <string>Apply sorting to folders</string> + </property> + </widget> + </item> </layout> </item> </layout> @@ -3933,6 +3940,30 @@ </property> </widget> </item> + <item> + <widget class="QWidget" name="widget_29" native="true"> + <property name="accessibleName"> + <string notr="true">SLine</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="trackpadDetectionCheckBox"> + <property name="text"> + <string>Trackpad detection</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_7"> + <property name="accessibleName"> + <string notr="true">SNoteText</string> + </property> + <property name="text"> + <string>Disable if you have issues with mouse scrolling</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -4110,8 +4141,8 @@ <rect> <x>0</x> <y>0</y> - <width>609</width> - <height>694</height> + <width>485</width> + <height>622</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_31"> @@ -4727,6 +4758,8 @@ <html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> p, li { white-space: pre-wrap; } hr { height: 1px; border-width: 0; } +li.unchecked::marker { content: "\2610"; } +li.checked::marker { content: "\2612"; } </style></head><body style=" font-family:'Noto Sans'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">This is a fast and easy to use image viewer</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Features video support via libmpv</span></p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/mainwindow.cpp new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/mainwindow.cpp --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/mainwindow.cpp 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/mainwindow.cpp 2023-06-15 07:42:32.000000000 +0200 @@ -336,10 +336,13 @@ } void MW::toggleScalingFilter() { - if(viewerWidget->scalingFilter() == QI_FILTER_BILINEAR) + ScalingFilter configuredFilter = settings->scalingFilter(); + if(viewerWidget->scalingFilter() == configuredFilter) { setFilterNearest(); - else - setFilterBilinear(); + } + else { + setFilter(configuredFilter); + } } void MW::setFilterNearest() { @@ -352,6 +355,32 @@ viewerWidget->setFilterBilinear(); } +void MW::setFilter(ScalingFilter filter) { + QString filterName; + switch (filter) { + case QI_FILTER_NEAREST: + filterName = "nearest"; + break; + case ScalingFilter::QI_FILTER_BILINEAR: + filterName = "bilinear"; + break; + case QI_FILTER_CV_BILINEAR_SHARPEN: + filterName = "bilinear + sharpen"; + break; + case QI_FILTER_CV_CUBIC: + filterName = "bicubic"; + break; + case QI_FILTER_CV_CUBIC_SHARPEN: + filterName = "bicubic + sharpen"; + break; + default: + filterName = "configured " + QString::number(static_cast<int>(filter)); + break; + } + showMessage("Filter " + filterName, 600); + viewerWidget->setScalingFilter(filter); +} + bool MW::isCropPanelActive() { return (activeSidePanel == SIDEPANEL_CROP); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/mainwindow.h new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/mainwindow.h --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/mainwindow.h 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/mainwindow.h 2023-06-15 07:42:32.000000000 +0200 @@ -246,6 +246,7 @@ void toggleRenameOverlay(QString currentName); void setFilterNearest(); void setFilterBilinear(); + void setFilter(ScalingFilter filter); void toggleScalingFilter(); void setDirectoryPath(QString path); void toggleLockZoom(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/viewers/imageviewerv2.cpp new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/viewers/imageviewerv2.cpp --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/viewers/imageviewerv2.cpp 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/viewers/imageviewerv2.cpp 2023-06-15 07:42:32.000000000 +0200 @@ -14,6 +14,7 @@ mIsFullscreen(false), scrollBarWorkaround(true), useFixedZoomLevels(false), + trackpadDetection(true), mouseInteraction(MouseInteractionState::MOUSE_NONE), minScale(0.01f), maxScale(500.0f), @@ -107,6 +108,7 @@ imageFitModeDefault = settings->imageFitMode(); zoomStep = settings->zoomStep(); focusIn1to1 = settings->focusPointIn1to1Mode(); + trackpadDetection = settings->trackpadDetection(); if( (useFixedZoomLevels = settings->useFixedZoomLevels()) ) { // zoomlevels are stored as a string, parse into list zoomLevels.clear(); @@ -548,6 +550,7 @@ // warning for future me: // for some reason in qgraphicsview wheelEvent is followed by moveEvent (wtf?) void ImageViewerV2::wheelEvent(QWheelEvent *event) { + qDebug() << event->modifiers() << event->pixelDelta() << event->angleDelta() << lastTouchpadScroll.elapsed() << this->trackpadDetection; #ifdef __APPLE__ // this event goes off during force touch with Qt::ScrollPhase being set to begin/end // lets filter these @@ -593,7 +596,9 @@ * pixelDelta = (0,0) * AngleDelta = (0,120*m) */ - bool isWheel = angleDelta.y() && !(angleDelta.y() % 120) && lastTouchpadScroll.elapsed() > 100; + bool isWheel = true; + if(trackpadDetection) + isWheel = angleDelta.y() && !(angleDelta.y() % 120) && lastTouchpadScroll.elapsed() > 250; if(!isWheel) { lastTouchpadScroll.restart(); event->accept(); @@ -607,6 +612,7 @@ centerIfNecessary(); snapToEdges(); } + qDebug() << "trackpad"; } else if(isWheel && settings->imageScrolling() == SCROLL_BY_TRACKPAD_AND_WHEEL) { // scroll by interval bool scrollable = false; @@ -619,14 +625,17 @@ event->accept(); scroll(0, -angleDelta.y(), true); } else { + qDebug() << "pass1"; event->ignore(); // not scrollable; passthrough event } } else { + qDebug() << "pass2"; event->ignore(); QWidget::wheelEvent(event); } saveViewportPos(); } else { + qDebug() << "pass3"; event->ignore(); QWidget::wheelEvent(event); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/viewers/imageviewerv2.h new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/viewers/imageviewerv2.h --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/viewers/imageviewerv2.h 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/viewers/imageviewerv2.h 2023-06-15 07:42:32.000000000 +0200 @@ -132,7 +132,7 @@ bool transparencyGrid, expandImage, smoothAnimatedImages, smoothUpscaling, forceFastScale, keepFitMode, loopPlayback, mIsFullscreen, scrollBarWorkaround, - useFixedZoomLevels; + useFixedZoomLevels, trackpadDetection; QList<float> zoomLevels; MouseInteractionState mouseInteraction; const int SCROLL_UPDATE_RATE = 7; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/viewers/viewerwidget.cpp new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/viewers/viewerwidget.cpp --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/viewers/viewerwidget.cpp 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/viewers/viewerwidget.cpp 2023-06-15 07:42:32.000000000 +0200 @@ -38,6 +38,7 @@ connect(this, &ViewerWidget::toggleTransparencyGrid, imageViewer.get(), &ImageViewerV2::toggleTransparencyGrid); connect(this, &ViewerWidget::setFilterNearest, imageViewer.get(), &ImageViewerV2::setFilterNearest); connect(this, &ViewerWidget::setFilterBilinear, imageViewer.get(), &ImageViewerV2::setFilterBilinear); + connect(this, &ViewerWidget::setScalingFilter, imageViewer.get(), &ImageViewerV2::setScalingFilter); videoPlayer.reset(new VideoPlayerInitProxy(this)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/viewers/viewerwidget.h new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/viewers/viewerwidget.h --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/gui/viewers/viewerwidget.h 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/gui/viewers/viewerwidget.h 2023-06-15 07:42:32.000000000 +0200 @@ -78,6 +78,7 @@ void draggedOut(); void setFilterNearest(); void setFilterBilinear(); + void setScalingFilter(ScalingFilter filter); void playbackFinished(); void toggleLockZoom(); void toggleLockView(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/settings.cpp new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/settings.cpp --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/settings.cpp 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/settings.cpp 2023-06-15 07:42:32.000000000 +0200 @@ -1139,3 +1139,19 @@ void Settings::setUnlockMinZoom(bool mode) { settings->settingsConf->setValue("unlockMinZoom", mode); } +//------------------------------------------------------------------------------ +bool Settings::sortFolders() { + return settings->settingsConf->value("sortFolders", true).toBool(); +} + +void Settings::setSortFolders(bool mode) { + settings->settingsConf->setValue("sortFolders", mode); +} +//------------------------------------------------------------------------------ +bool Settings::trackpadDetection() { + return settings->settingsConf->value("trackpadDetection", true).toBool(); +} + +void Settings::setTrackpadDetection(bool mode) { + settings->settingsConf->setValue("trackpadDetection", mode); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/settings.h new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/settings.h --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/settings.h 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/settings.h 2023-06-15 07:42:32.000000000 +0200 @@ -293,6 +293,10 @@ void setUseFixedZoomLevels(bool mode); bool unlockMinZoom(); void setUnlockMinZoom(bool mode); + bool sortFolders(); + void setSortFolders(bool mode); + bool trackpadDetection(); + void setTrackpadDetection(bool mode); private: explicit Settings(QObject *parent = nullptr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/sourcecontainers/documentinfo.cpp new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/sourcecontainers/documentinfo.cpp --- old/qimgv-1.0.3a+git20221107.8ad0a11/qimgv/sourcecontainers/documentinfo.cpp 2022-11-07 22:30:45.000000000 +0100 +++ new/qimgv-1.0.3a+git20230615.e2675f1/qimgv/sourcecontainers/documentinfo.cpp 2023-06-15 07:42:32.000000000 +0200 @@ -269,7 +269,7 @@ } } // No exception was caught, which may cause QT crash - catch (Exiv2::AnyError& e) { + catch (Exiv2::Error& e) { qDebug() << "Caught Exiv2 exception:\n" << e.what() << "\n"; return; } ++++++ qimgv.obsinfo ++++++ --- /var/tmp/diff_new_pack.Vh7h7K/_old 2023-07-11 15:57:28.965234005 +0200 +++ /var/tmp/diff_new_pack.Vh7h7K/_new 2023-07-11 15:57:28.969234028 +0200 @@ -1,5 +1,5 @@ name: qimgv -version: 1.0.3a+git20221107.8ad0a11 -mtime: 1667856645 -commit: 8ad0a1173cd3c6b96a5549405de71d1ea57c09ac +version: 1.0.3a+git20230615.e2675f1 +mtime: 1686807752 +commit: e2675f135d6be45036f84285a68e5a079ab4f449
![https://cdn.buymeacoffee.com/buttons/default-orange.png"](https://cdn.buymeacoffee.com/buttons/default-orange.png"){kind=link}