Differential D18809 Diff 51088 wallpapers/image/image.cpp

Changeset View

Standalone View

View Options

wallpapers/image/image.cpp

Context not available.
25#include "image.h" 25​#include "image.h"
26#include "debug.h" 26​#include "debug.h"
27 27​
28​#include <algorithm>
28#include <math.h> 29​#include <math.h>
29#include <float.h> // FLT_MAX 30​#include <float.h> // FLT_MAX
30 31​
Context not available.
39#include <QImageReader> 40​#include <QImageReader>
40#include <QQuickItem> 41​#include <QQuickItem>
41#include <QQuickWindow> 42​#include <QQuickWindow>
43​#include <QUrl>
42 44​
43#include <QDebug> 45​#include <QDebug>
44#include <KDirWatch> 46​#include <KDirWatch>
Context not available.
53#include <Plasma/PluginLoader> 55​#include <Plasma/PluginLoader>
54#include <qstandardpaths.h> 56​#include <qstandardpaths.h>
55#include "backgroundlistmodel.h" 57​#include "backgroundlistmodel.h"
58​#include "slidemodel.h"
56 59​
57#include <KPackage/PackageLoader> 60​#include <KPackage/PackageLoader>
58 61​
Context not available.
64 m_mode(SingleImage), 67​ m_mode(SingleImage),
65 m_currentSlide(-1), 68​ m_currentSlide(-1),
66 m_model(nullptr), 69​ m_model(nullptr),
70​ m_slideshowModel(nullptr),
67 m_dialog(nullptr) 71​ m_dialog(nullptr)
68{ 72​{
69 m_wallpaperPackage = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Wallpaper/Images")); 73​ m_wallpaperPackage = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Wallpaper/Images"));
Context not available.
275 return m_model; 279​ return m_model;
276} 280​}
277 281​
282​QAbstractItemModel* Image::slideshowModel()
283​{
284​ if (!m_slideshowModel) {
285​ m_slideshowModel = new SlideModel(this, this);
286​ m_slideshowModel->reload(m_slidePaths);
287​ }
288​ return m_slideshowModel;
289​}
290​
278int Image::slideTimer() const 291​int Image::slideTimer() const
279{ 292​{
280 return m_delay; 293​ return m_delay;
Context not available.
336 updateDirWatch(m_slidePaths); 349​ updateDirWatch(m_slidePaths);
337 startSlideshow(); 350​ startSlideshow();
338 } 351​ }
339 352​ if (m_slideshowModel) {
353​ m_slideshowModel->reload(m_slidePaths);
354​ }
340 emit slidePathsChanged(); 355​ emit slidePathsChanged();
341} 356​}
342 357​
Context not available.
357 if (m_mode == SlideShow) { 372​ if (m_mode == SlideShow) {
358 updateDirWatch(m_slidePaths); 373​ updateDirWatch(m_slidePaths);
359 } 374​ }
360 375​ if (m_slideshowModel) {
376​ m_slideshowModel->reload(m_slidePaths);
377​ }
361 emit slidePathsChanged(); 378​ emit slidePathsChanged();
362 startSlideshow(); 379​ startSlideshow();
363 } 380​ }
Context not available.
367{ 384​{
368 if (m_slidePaths.contains(path)) { 385​ if (m_slidePaths.contains(path)) {
369 m_slidePaths.removeAll(path); 386​ m_slidePaths.removeAll(path);
387​ Q_FOREACH(const QString& slide, m_uncheckedSlides) {
388​ if (slide.startsWith(QUrl::fromLocalFile(path).toString())) {
389​ m_uncheckedSlides.removeAll(slide);
390​ }
391​ }
370 if (m_mode == SlideShow) { 392​ if (m_mode == SlideShow) {
371 updateDirWatch(m_slidePaths); 393​ updateDirWatch(m_slidePaths);
372 } 394​ }
373 395​ if (m_slideshowModel) {
396​ m_slideshowModel->removeDir(path);
397​ }
374 emit slidePathsChanged(); 398​ emit slidePathsChanged();
375 startSlideshow(); 399​ startSlideshow();
376 } 400​ }
377} 401​}
378 402​
403​void Image::toggleSlide(const QString &path, bool checked)
404​{
405​ if (checked && m_uncheckedSlides.contains(path)) {
406​ m_uncheckedSlides.removeAll(path);
407​ emit uncheckedSlidesChanged();
408​ startSlideshow();
409​ } else if (!checked && ! m_uncheckedSlides.contains(path)) {
410​ m_uncheckedSlides.append(path);
411​ emit uncheckedSlidesChanged();
412​ startSlideshow();
413​ }
414​}
415​
379void Image::pathDirty(const QString& path) 416​void Image::pathDirty(const QString& path)
380{ 417​{
381 updateDirWatch(QStringList(path)); 418​ updateDirWatch(QStringList(path));
Context not available.
582 startSlideshow(); 619​ startSlideshow();
583 return; 620​ return;
584 } 621​ }
585 ​
586 m_slideshowBackgrounds = paths; 622​ m_slideshowBackgrounds = paths;
623​ m_slideshowBackgrounds.erase(std::remove_if(m_slideshowBackgrounds.begin(), m_slideshowBackgrounds.end(),
624​ [&](QString& path) {return m_uncheckedSlides.contains(QUrl::fromLocalFile(path).toString());}), m_slideshowBackgrounds.end());
587 m_unseenSlideshowBackgrounds.clear(); 625​ m_unseenSlideshowBackgrounds.clear();
588 // start slideshow 626​ // start slideshow
589 if (m_slideshowBackgrounds.isEmpty()) { 627​ if (m_slideshowBackgrounds.isEmpty()) {
Context not available.
793{ 831​{
794 if(m_slideshowBackgrounds.removeAll(path)) { 832​ if(m_slideshowBackgrounds.removeAll(path)) {
795 m_unseenSlideshowBackgrounds.removeAll(path); 833​ m_unseenSlideshowBackgrounds.removeAll(path);
834​ m_uncheckedSlides.removeAll(path);
796 if(path == m_img) { 835​ if(path == m_img) {
797 nextSlide(); 836​ nextSlide();
798 } 837​ }
ngrahamUnsubmitted
Done

This generates a warning (variable krun is unused). I would suggest using KIO::highlightInFileManager() instead. For example: https://cgit.kde.org/spectacle.git/tree/src/Gui/KSMainWindow.cpp#n327

ngraham: This generates a warning (variable `krun` is unused). I would suggest using `KIO…
davidreAuthorUnsubmitted
Not Done

Yes I also saw this method since the backgroundlist uses it but the Header said to use KRun if you want to open a folder instead of it.

davidre: Yes I also saw this method since the backgroundlist uses it but the Header said to use KRun if…
ngrahamUnsubmitted
Not Done

Well it just depends on what you want to do. If you want to open the folder, then yeah KRun is better. But if you want to highlight it in a file manager window, then highlightInFileManager() is the way to go.

ngraham: Well it just depends on what you want to do. If you want to open the folder, then yeah KRun is…
Context not available.
856 } 895​ }
857} 896​}
858 897​
898​QStringList Image::uncheckedSlides() const
899​{
900​ return m_uncheckedSlides;
901​}
902​
903​void Image::setUncheckedSlides(QStringList& uncheckedSlides)
904​{
905​ if (uncheckedSlides == m_uncheckedSlides) {
906​ return;
907​ }
908​ m_uncheckedSlides = uncheckedSlides;
909​ emit uncheckedSlidesChanged();
davidedmundsonUnsubmitted
Not Done

You update m_uncheckedSlides but you're not updating m_slideshowBackgrounds so it does nothing till you restart

davidedmundson: You update m_uncheckedSlides but you're not updating m_slideshowBackgrounds so it does nothing…
davidreAuthorUnsubmitted
Not Done

Thanks for spotting this, will try testing this.

davidre: Thanks for spotting this, will try testing this.
910​}
Context not available.