From e55c431bde99eedc58092956cab081c7ec08528c Mon Sep 17 00:00:00 2001
From: Felix Kauselmann <2039670+selmf@users.noreply.github.com>
Date: Mon, 14 Sep 2015 09:52:30 +0200
Subject: [PATCH] Add unified fitmode to config

---
 YACReader/configuration.h | 17 +++++++++++++----
 common/yacreader_global.h |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/YACReader/configuration.h b/YACReader/configuration.h
index ba9e1531..4c3b4784 100644
--- a/YACReader/configuration.h
+++ b/YACReader/configuration.h
@@ -60,14 +60,24 @@ using namespace YACReader;
 		void setGotoSlideSize(const QSize & gss) { settings->setValue(GO_TO_FLOW_SIZE,gss);}
 		float getZoomLevel() { return settings->value(ZOOM_LEVEL).toFloat();}
 		void setZoomLevel(float zl) { settings->setValue(ZOOM_LEVEL,zl);}
+		
+		//Unified enum based fitmode
+		YACReader::FitMode getFitMode() { return static_cast<YACReader::FitMode>(settings->value(FITMODE).toInt()); }
+		void setFitMode ( YACReader::FitMode fitMode ){ settings->setValue(FITMODE, static_cast<int>(fitMode)); }
+		
+		//Old fitmodes
 		bool getAdjustToWidth() {return settings->value(FIT).toBool();}
 		void setAdjustToWidth(bool atw=true) {settings->setValue(FIT,atw);}
+		float getFitToWidthRatio(){return settings->value(FIT_TO_WIDTH_RATIO).toFloat();}
+		void setFitToWidthRatio(float r){settings->setValue(FIT_TO_WIDTH_RATIO,r);}
+		bool getAdjustToFullSize(){return settings->value(ADJUST_TO_FULL_SIZE).toBool();}
+		void setAdjustToFullSize(bool b){settings->setValue(ADJUST_TO_FULL_SIZE,b);}
+		
 		FlowType getFlowType(){return (FlowType)settings->value(FLOW_TYPE_SW).toInt();}
 		void setFlowType(FlowType type){settings->setValue(FLOW_TYPE_SW,type);}
 		bool getFullScreen(){return settings->value(FULLSCREEN).toBool();}
 		void setFullScreen(bool f){settings->setValue(FULLSCREEN,f);}
-		float getFitToWidthRatio(){return settings->value(FIT_TO_WIDTH_RATIO).toFloat();}
-		void setFitToWidthRatio(float r){settings->setValue(FIT_TO_WIDTH_RATIO,r);}
+		
 		QPoint getPos(){return settings->value(Y_WINDOW_POS).toPoint();}
 		void setPos(QPoint p){settings->setValue(Y_WINDOW_POS,p);}
 		QSize getSize(){return settings->value(Y_WINDOW_SIZE).toSize();}
@@ -78,8 +88,7 @@ using namespace YACReader;
 		void setDoublePage(bool b){settings->setValue(DOUBLE_PAGE,b);}
 		bool getDoubleMangaPage(){return settings->value(DOUBLE_MANGA_PAGE).toBool();}
 		void setDoubleMangaPage(bool b){settings->setValue(DOUBLE_MANGA_PAGE,b);}
-		bool getAdjustToFullSize(){return settings->value(ADJUST_TO_FULL_SIZE).toBool();}
-		void setAdjustToFullSize(bool b){settings->setValue(ADJUST_TO_FULL_SIZE,b);}
+		
 		QColor getBackgroundColor(){return settings->value(BACKGROUND_COLOR).value<QColor>();}
 		void setBackgroundColor(const QColor& color){settings->value(BACKGROUND_COLOR,color);}
 		bool getAlwaysOnTop(){return settings->value(ALWAYS_ON_TOP).toBool();}
diff --git a/common/yacreader_global.h b/common/yacreader_global.h
index 62c7093a..af0a4dea 100644
--- a/common/yacreader_global.h
+++ b/common/yacreader_global.h
@@ -19,6 +19,7 @@
 #define GO_TO_FLOW_SIZE "GO_TO_FLOW_SIZE"
 #define FLOW_TYPE_SW "FLOW_TYPE_SW"
 #define FIT "FIT"
+#define FITMODE "FITMODE"
 #define FLOW_TYPE "FLOW_TYPE"
 #define FULLSCREEN "FULLSCREEN"
 #define FIT_TO_WIDTH_RATIO "FIT_TO_WIDTH_RATIO"