File 0003-check-on-current-comic-to-be-valid.patch of Package plasma5-addons

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-check-on-current-comic-to-be-valid.patch of Package plasma5-addons (Revision 5e513337c011bfc720d1707922bfca87)

Currently displaying revision 5e513337c011bfc720d1707922bfca87 , Show latest

From 639cd2b519909563497790065cbfcaa1e1286cb4 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Tue, 29 Nov 2016 13:57:55 +0100
Subject: [PATCH 3/3] check on current comic to be valid

don't crash on invalid config groups when asked.
also, disable the context menu options when no valid comic is loaded

BUG:373031
---
 applets/comic/comic.cpp     | 18 ++++++++++++++----
 applets/comic/comicdata.cpp | 13 +++++++++++++
 applets/comic/comicdata.h   |  5 +++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/applets/comic/comic.cpp b/applets/comic/comic.cpp
index a2c03b33c..67a068e42 100644
--- a/applets/comic/comic.cpp
+++ b/applets/comic/comic.cpp
@@ -270,6 +270,7 @@ void ComicApplet::updateUsedComics()
 
     mActiveComicModel->clear();
     mCurrent = ComicData();
+    updateContextMenu();
 
     bool isFirst = true;
     QModelIndex data;
@@ -343,6 +344,7 @@ void ComicApplet::configChanged()
 
     const QString id = mTabIdentifier.count() ? mTabIdentifier.at( 0 ) : QString();
     mCurrent = ComicData();
+    updateContextMenu();
     mCurrent.init(id, cg);
 
     mShowComicUrl = cg.readEntry( "showComicUrl", false );
@@ -502,11 +504,19 @@ void ComicApplet::updateComic( const QString &identifierSuffix )
 
 void ComicApplet::updateContextMenu()
 {
-    mActionGoFirst->setVisible(mCurrent.hasFirst());
-    mActionGoFirst->setEnabled(mCurrent.hasPrev());
-    mActionGoLast->setEnabled(true);//always enable to have some kind of refresh action
+    if (mActions.isEmpty()) {
+        return;
+    }
+    mActionGoFirst->setVisible(mCurrent.isValid() && mCurrent.hasFirst());
+    mActionGoFirst->setEnabled(mCurrent.isValid() && mCurrent.hasPrev());
+    mActionGoLast->setEnabled(mCurrent.isValid());
+
     if (mActionShop) {
-        mActionShop->setEnabled(mCurrent.shopUrl().isValid());
+        mActionShop->setEnabled(mCurrent.isValid() && mCurrent.shopUrl().isValid());
+    }
+
+    for (auto a : mActions) {
+        a->setEnabled(mCurrent.isValid());
     }
 }
 
diff --git a/applets/comic/comicdata.cpp b/applets/comic/comicdata.cpp
index 3b1c8f889..ef7172260 100644
--- a/applets/comic/comicdata.cpp
+++ b/applets/comic/comicdata.cpp
@@ -36,6 +36,10 @@ void ComicData::init(const QString &id, const KConfigGroup &config)
 
 void ComicData::load()
 {
+    if (!mCfg.isValid()) {
+        return;
+    }
+
     mScaleComic = mCfg.readEntry("scaleToContent_" + mId, false);
     mMaxStripNum = mCfg.readEntry("maxStripNum_" + mId, 0);
     mStored = mCfg.readEntry("storedPosition_" + mId, QString());
@@ -43,6 +47,10 @@ void ComicData::load()
 
 void ComicData::save()
 {
+    if (!mCfg.isValid()) {
+        return;
+    }
+
     mCfg.writeEntry("scaleToContent_" + mId,  mScaleComic);
     mCfg.writeEntry("maxStripNum_" + mId, mMaxStripNum);
     mCfg.writeEntry("storedPosition_" + id(), mStored);
@@ -54,6 +62,11 @@ void ComicData::save()
     }
 }
 
+bool ComicData::isValid() const
+{
+    return mCfg.isValid();
+}
+
 void ComicData::setScaleComic(bool scale)
 {
     mScaleComic = scale;
diff --git a/applets/comic/comicdata.h b/applets/comic/comicdata.h
index 23945aab5..f451b3fc1 100644
--- a/applets/comic/comicdata.h
+++ b/applets/comic/comicdata.h
@@ -73,6 +73,11 @@ class ComicData
          */
         QString first() const { return mFirst; }
 
+        /**
+         * if false this doesn't represent a valid comic data
+         */
+        bool isValid() const;
+
         bool hasNext() const { return !mNext.isEmpty(); }
 
         bool hasPrev() const { return !mPrev.isEmpty(); }
-- 
2.11.0

Places

File 0003-check-on-current-comic-to-be-valid.patch of Package plasma5-addons (Revision 5e513337c011bfc720d1707922bfca87)

Places