From d23ce28991e32952fc24c3aee9c205ee10176c32 Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Wed, 4 Jul 2007 01:14:56 +0200
Subject: [PATCH] Add options to control the behaviour of spreads in two-pages
 mode

---
 src/cbconfigdialog.cpp |  8 +++++++-
 src/cbconfigdialog.h   |  2 ++
 src/cbsettings.cpp     | 26 ++++++++++++++++++++++++++
 src/cbsettings.h       |  6 ++++++
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/cbconfigdialog.cpp b/src/cbconfigdialog.cpp
index 7d5041e..84b7e4d 100644
--- a/src/cbconfigdialog.cpp
+++ b/src/cbconfigdialog.cpp
@@ -161,9 +161,13 @@ void ComicBookCfgDialog::setupMiscTab()
 	lay->addWidget(grp3);
 
 	QVGroupBox *grp4 = new QVGroupBox(tr("Two-pages mode"), w);
-	QHBox *box5 = new QHBox(grp4);
+	QVBox *box5 = new QVBox(grp4);
 	cb_twopagesstep = new QCheckBox(tr("Forward and backward two pages in two-pages mode"), box5);
 	cb_twopagesstep->setChecked(cfg->twoPagesStep());
+	cb_twopagesspread = new QCheckBox(tr("Show spreads (double-width single pages) alone"), box5);
+	cb_twopagesspread->setChecked(cfg->twoPagesSpread());
+	cb_twopagesskip = new QCheckBox(tr("Show page before and after spreads together"), box5);
+	cb_twopagesskip->setChecked(cfg->twoPagesSkip());
 	lay->addWidget(grp4);
 	
 	cb_autoinfo = new QCheckBox(tr("Open info dialog after opening comic book"), w);
@@ -224,6 +228,8 @@ void ComicBookCfgDialog::apply()
 	cfg->thumbnailsAge(sb_thumbsage->value());
 	cfg->stripMax(sb_stripmax->value());
 	cfg->twoPagesStep(cb_twopagesstep->isChecked());
+	cfg->twoPagesSpread(cb_twopagesspread->isChecked());
+	cfg->twoPagesSkip(cb_twopagesskip->isChecked());
 	cfg->useInternalBrowser(cb_intbrowser->isChecked());
 	cfg->externalBrowser(le_extbrowser->text());
 	cfg->autoInfo(cb_autoinfo->isChecked());
diff --git a/src/cbconfigdialog.h b/src/cbconfigdialog.h
index 919c8e8..3333425 100644
--- a/src/cbconfigdialog.h
+++ b/src/cbconfigdialog.h
@@ -32,6 +32,8 @@ namespace QComicBook
 		private:
 			ComicBookSettings *cfg;
 			QCheckBox *cb_twopagesstep;
+			QCheckBox *cb_twopagesspread;
+			QCheckBox *cb_twopagesskip;
 			QCheckBox *cb_smallcursor;
 			QCheckBox *cb_hidemenu;
 			QCheckBox *cb_hidestatus;
diff --git a/src/cbsettings.cpp b/src/cbsettings.cpp
index 6fdc853..e13ee6d 100644
--- a/src/cbsettings.cpp
+++ b/src/cbsettings.cpp
@@ -38,6 +38,8 @@
 #define GRP_NAVI                     "/Navigation"
 #define OPT_CONTSCROLL               "/ContinuousScroll"
 #define OPT_TWOPAGESSTEP             "/TwoPagesStep"
+#define OPT_TWOPAGESSPREAD           "/TwoPagesSpread"
+#define OPT_TWOPAGESSKIP             "/TwoPagesSkip"
 
 #define OPT_STRIPMODE                "/StripMode"
 #define OPT_STRIPMAX                 "/StripMax"
@@ -175,6 +177,8 @@ void ComicBookSettings::load()
 	cfg->beginGroup(GRP_NAVI);
 		contscroll = cfg->readBoolEntry(OPT_CONTSCROLL, true);
 		twopagesstep = cfg->readBoolEntry(OPT_TWOPAGESSTEP, true);
+		twopagesspread = cfg->readBoolEntry(OPT_TWOPAGESSPREAD, true);
+		twopagesskip = cfg->readBoolEntry(OPT_TWOPAGESSKIP, false);
 	cfg->endGroup();
 	cfg->beginGroup(GRP_MISC);
 		lastdir = cfg->readEntry(OPT_LASTDIR, QString::null);
@@ -213,6 +217,16 @@ bool ComicBookSettings::twoPagesStep() const
 	return twopagesstep;
 }
 
+bool ComicBookSettings::twoPagesSpread() const
+{
+	return twopagesspread;
+}
+
+bool ComicBookSettings::twoPagesSkip() const
+{
+	return twopagesskip;
+}
+
 bool ComicBookSettings::japaneseMode() const
 {
 	return japanese;
@@ -365,6 +379,18 @@ void ComicBookSettings::twoPagesStep(bool f)
 		cfg->writeEntry(GRP_NAVI OPT_TWOPAGESSTEP, twopagesstep = f);
 }
 
+void ComicBookSettings::twoPagesSpread(bool f)
+{
+	if (f != twopagesspread)
+		cfg->writeEntry(GRP_NAVI OPT_TWOPAGESSPREAD, twopagesspread = f);
+}
+
+void ComicBookSettings::twoPagesSkip(bool f)
+{
+	if (f != twopagesskip)
+		cfg->writeEntry(GRP_NAVI OPT_TWOPAGESSKIP, twopagesskip = f);
+}
+
 void ComicBookSettings::japaneseMode(bool f)
 {
 	if (f != japanese)
diff --git a/src/cbsettings.h b/src/cbsettings.h
index 2645dfd..f218320 100644
--- a/src/cbsettings.h
+++ b/src/cbsettings.h
@@ -37,6 +37,8 @@ namespace QComicBook
 			bool smallcursor;
 			bool twopages;
 			bool twopagesstep;
+			bool twopagesspread;
+			bool twopagesskip;
 			bool japanese;
 			bool contscroll;
 			bool scrollbars;
@@ -89,6 +91,8 @@ namespace QComicBook
 			bool smallCursor() const;
 			bool twoPagesMode() const;
 			bool twoPagesStep() const;
+			bool twoPagesSpread() const;
+			bool twoPagesSkip() const;
 			bool japaneseMode() const;
 			bool continuousScrolling() const;
 			bool scrollbarsVisible() const;
@@ -121,6 +125,8 @@ namespace QComicBook
 			void smallCursor(bool f);
 			void twoPagesMode(bool f);
 			void twoPagesStep(bool f);
+			void twoPagesSpread(bool f);
+			void twoPagesSkip(bool f);
 			void japaneseMode(bool f);
 			void continuousScrolling(bool f);
 			void scrollbarsVisible(bool f);
-- 
2.32.0.93.g670b81a890