New CMake build option to avoid version conflicts : CACHE_NAME_SUFFIX By default, append the latesttag value, but the developper may override it by specifying -DCACHE_NAME_SUFFIX:STRING=MySuffix in the cmake command line

With this new mechanism, the cache name will then be RawTherapee3.0, RawTherapee3.1, etc... The cache is now located in %LOCALAPPDATA% on Windows Options.xxx template files has also been reduced to essential values, other ones are set in options.cc
2011-05-22 19:24:25 +02:00
parent 33c8254b87
commit 25463094a6
12 changed files with 134 additions and 325 deletions
--- a/rtdata/options/options.lin
+++ b/rtdata/options/options.lin
@@ -1,111 +1,23 @@
+# Only important or pre-first run parameters are left in this global option file.
+# After the first run, all the parameters will be available in this global option file
+# or in a new local option file, depending on the MultiUser value below
+
+# Most ot the options are modifiable through the Preference window

 [General]
-TabbedEditor=true
-StoreLastProfile=true
-StartupDirectory=last
-StartupPath=
-DateFormat=%y/%m/%d
-AdjusterDelay=0
-DualProcSupport=true
+# Setting MultiUser to false will use the application's installation directory as cache directory,
+# which can be usefull if you want to keep the application and all the cache datas in a single place,
+# an external HD for example
 MultiUser=true
-Language=English (US)
-Theme=Focus
-UseSystemTheme=false
-Version=300
-FirstRun=true
-
-[External Editor]
-EditorKind=1
-GimpDir=
-PhotoshopDir=
-CustomEditor=

 [File Browser]
-BrowseOnlyRaw=false
-BrowserShowsDate=true
-BrowserShowsExif=true
-BrowserShowsHidden=false
-ThumbnailSize=240
-MaxPreviewHeight=400
-MaxCacheEntries=20000
-ThumbnailFormat=5
-CacheMemPolicy=0
 ParseExtensions=jpg;tif;tiff;png;crw;cr2;crf;nef;raf;pef;dng;arw;sr2;mrw;raw;orf;kdc;rwz;rw2;mef;
 ParseExtensionsEnabled=1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;
-ThumbnailArrangement=2
-ThumbnailInterpolation=1
-LiveThumbnails=true
-FavoriteDirs=
-RenameTemplates=
-RenameUseTemplates=false
-ThumbnailZoomRatios=0.2;0.3;0.45;0.6;0.8;1;
-OverlayedFileNames=true
-
-# if TRUE, only fast, internal preview images are taken if the image is not edited yet
-InternalThumbIfUntouched=true
-
-[Clipping Indication]
-HighlightThreshold=253
-ShadowThreshold=8
-BlinkClipped=false

 [Output]
-Format=jpg
-JpegQuality=100
-PngCompression=6
-PngBps=8
-TiffBps=8
-SaveProcParams=true
 PathTemplate=%p1/converted/%f
-PathFolder=
-UsePathTemplate=true
-LastSaveAsPath=
-
-# if TRUE, existing output JPGs/PNGs are overwritten, instead of adding ..-1.jpg, -2.jpg etc.
-OverwriteOutputFile=false

 [Profiles]
-Directory=profiles
-RawDefault=default
-ImgDefault=neutral
-SaveParamsWithFile=false
-SaveParamsToCache=true
-LoadParamsFromLocation=0
-
 # if this is set to a path of a custom program, it will receive the EXIFs as parameters and must generate a PP3 preset file for the given RAW/JPG
 # Parameters: <Path to RAW/JPG> <Path to default profile> <fNumber> <expose in seconds> <focal length in mm> <ISO> <Lens> <Camera>
 CustomProfileBuilder=
-
-[GUI]
-WindowWidth=900
-WindowHeight=560
-WindowMaximized=false
-FileBrowserHeight=250
-ToolPanelWidth=300
-BrowserToolPanelWidth=300
-HistoryPanelWidth=230
-LastPreviewScale=5
-LastCropSize=1
-ShowHistory=true
-ShowFilePanelState=2
-ShowInfo=true
-ShowClippedHighlights=false
-ShowClippedShadows=false
-FrameColor=0
-ProcessingQueueEnbled=false
-ToolPanelsExpanded=1;1;0;0;0;1;1;0;0;0;0;1;1;0;0;0;0;0;
-
-[Algorithms]
-DemosaicMethod=hphd
-DemosaicMethodBatch=hphd
-ColorCorrection=1
-
-[Crop Settings]
-Ratio=3:2
-FixRatio=true
-DPI=600
-
-[Color Management]
-ICCDirectory=
-MonitorProfile=
-Intent=1
--- a/rtdata/options/options.osx
+++ b/rtdata/options/options.osx
@@ -1,111 +1,23 @@
+# Only important or pre-first run parameters are left in this global option file.
+# After the first run, all the parameters will be available in this global option file
+# or in a new local option file, depending on the MultiUser value below
+
+# Most ot the options are modifiable through the Preference window

 [General]
-TabbedEditor=true
-StoreLastProfile=true
-StartupDirectory=last
-StartupPath=
-DateFormat=%y/%m/%d
-AdjusterDelay=0
-DualProcSupport=true
+# Setting MultiUser to false will use the application's installation directory as cache directory,
+# which can be usefull if you want to keep the application and all the cache datas in a single place,
+# an external HD for example
 MultiUser=true
-Language=English (US)
-Theme=Focus
-UseSystemTheme=false
-Version=300
-FirstRun=true
-
-[External Editor]
-EditorKind=1
-GimpDir=
-PhotoshopDir=
-CustomEditor=

 [File Browser]
-BrowseOnlyRaw=false
-BrowserShowsDate=true
-BrowserShowsExif=true
-BrowserShowsHidden=false
-ThumbnailSize=240
-MaxPreviewHeight=400
-MaxCacheEntries=20000
-ThumbnailFormat=5
-CacheMemPolicy=0
 ParseExtensions=jpg;tif;tiff;png;crw;cr2;crf;nef;raf;pef;dng;arw;sr2;mrw;raw;orf;kdc;rwz;rw2;mef;
 ParseExtensionsEnabled=1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;
-ThumbnailArrangement=2
-ThumbnailInterpolation=1
-LiveThumbnails=true
-FavoriteDirs=
-RenameTemplates=
-RenameUseTemplates=false
-ThumbnailZoomRatios=0.2;0.3;0.45;0.6;0.8;1;
-OverlayedFileNames=true
-
-# if TRUE, only fast, internal preview images are taken if the image is not edited yet
-InternalThumbIfUntouched=true
-
-[Clipping Indication]
-HighlightThreshold=253
-ShadowThreshold=8
-BlinkClipped=false

 [Output]
-Format=jpg
-JpegQuality=100
-PngCompression=6
-PngBps=8
-TiffBps=8
-SaveProcParams=true
 PathTemplate=%p1/converted/%f
-PathFolder=
-UsePathTemplate=true
-LastSaveAsPath=
-
-# if TRUE, existing output JPGs/PNGs are overwritten, instead of adding ..-1.jpg, -2.jpg etc.
-OverwriteOutputFile=false

 [Profiles]
-Directory=profiles
-RawDefault=default
-ImgDefault=neutral
-SaveParamsWithFile=false
-SaveParamsToCache=true
-LoadParamsFromLocation=0
-
 # if this is set to a path of a custom program, it will receive the EXIFs as parameters and must generate a PP3 preset file for the given RAW/JPG
 # Parameters: <Path to RAW/JPG> <Path to default profile> <fNumber> <expose in seconds> <focal length in mm> <ISO> <Lens> <Camera>
 CustomProfileBuilder=
-
-[GUI]
-WindowWidth=900
-WindowHeight=560
-WindowMaximized=false
-FileBrowserHeight=250
-ToolPanelWidth=300
-BrowserToolPanelWidth=300
-HistoryPanelWidth=200
-LastPreviewScale=5
-LastCropSize=1
-ShowHistory=true
-ShowFilePanelState=2
-ShowInfo=true
-ShowClippedHighlights=false
-ShowClippedShadows=false
-FrameColor=0
-ProcessingQueueEnbled=false
-ToolPanelsExpanded=1;1;0;0;0;1;1;0;0;0;0;1;1;0;0;0;0;0;
-
-[Algorithms]
-DemosaicMethod=hphd
-DemosaicMethodBatch=hphd
-ColorCorrection=1
-
-[Crop Settings]
-Ratio=3:2
-FixRatio=true
-DPI=600
-
-[Color Management]
-ICCDirectory=
-MonitorProfile=
-Intent=1
--- a/rtdata/options/options.win
+++ b/rtdata/options/options.win
@@ -1,112 +1,25 @@
+# Only important or pre-first run parameters are left in this global option file.
+# After the first run, all the parameters will be available in this global option file
+# or in a new local option file, depending on the MultiUser value below
+
+# Most ot the options are modifiable through the Preference window

 [General]
-TabbedEditor=true
-StoreLastProfile=true
-StartupDirectory=last
-StartupPath=
-DateFormat=%y/%m/%d
-AdjusterDelay=0
-DualProcSupport=true
+# Setting MultiUser to false will use the application's installation directory as cache directory,
+# which can be usefull if you want to keep the application and all the cache datas in a single place,
+# an external HD for example
 MultiUser=true
-Language=English (US)
-Theme=Focus
+# Windows users should not use the system theme : some composed widget won't be usable
 UseSystemTheme=false
-Version=300
-FirstRun=true
-
-[External Editor]
-EditorKind=1
-GimpDir=C:\\Program Files\\GIMP-2.0
-PhotoshopDir=C:\\Program Files\\Adobe\\Adobe Photoshop CS5
-CustomEditor=start

 [File Browser]
-BrowseOnlyRaw=false
-BrowserShowsDate=true
-BrowserShowsExif=true
-BrowserShowsHidden=false
-ThumbnailSize=240
-MaxPreviewHeight=400
-MaxCacheEntries=20000
-ThumbnailFormat=5
-CacheMemPolicy=0
 ParseExtensions=jpg;tif;tiff;png;crw;cr2;crf;nef;raf;pef;dng;arw;sr2;mrw;raw;orf;kdc;rwz;rw2;mef;
 ParseExtensionsEnabled=1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;
-ThumbnailArrangement=2
-ThumbnailInterpolation=1
-LiveThumbnails=true
-FavoriteDirs=
-RenameTemplates=
-RenameUseTemplates=false
-ThumbnailZoomRatios=0.2;0.3;0.45;0.6;0.8;1;
-OverlayedFileNames=true
-
-# if TRUE, only fast, internal preview images are taken if the image is not edited yet
-InternalThumbIfUntouched=true
-
-[Clipping Indication]
-HighlightThreshold=253
-ShadowThreshold=8
-BlinkClipped=false

 [Output]
-Format=jpg
-JpegQuality=100
-PngCompression=6
-PngBps=8
-TiffBps=8
-SaveProcParams=true
 PathTemplate=%p1/converted/%f
-PathFolder=
-UsePathTemplate=true
-LastSaveAsPath=
-
-# if TRUE, existing output JPGs/PNGs are overwritten, instead of adding ..-1.jpg, -2.jpg etc.
-OverwriteOutputFile=false

 [Profiles]
-Directory=profiles
-RawDefault=default
-ImgDefault=neutral
-SaveParamsWithFile=false
-SaveParamsToCache=true
-LoadParamsFromLocation=0
-
 # if this is set to a path of a custom program, it will receive the EXIFs as parameters and must generate a PP3 preset file for the given RAW/JPG
 # Parameters: <Path to RAW/JPG> <Path to default profile> <fNumber> <expose in seconds> <focal length in mm> <ISO> <Lens> <Camera>
 CustomProfileBuilder=
-
-
-[GUI]
-WindowWidth=900
-WindowHeight=560
-WindowMaximized=false
-FileBrowserHeight=250
-ToolPanelWidth=300
-BrowserToolPanelWidth=300
-HistoryPanelWidth=230
-LastPreviewScale=5
-LastCropSize=1
-ShowHistory=true
-ShowFilePanelState=2
-ShowInfo=true
-ShowClippedHighlights=false
-ShowClippedShadows=false
-FrameColor=0
-ProcessingQueueEnbled=false
-ToolPanelsExpanded=1;1;0;0;0;1;1;0;0;0;0;1;1;0;0;0;0;0;
-
-[Algorithms]
-DemosaicMethod=hphd
-DemosaicMethodBatch=hphd
-ColorCorrection=1
-
-[Crop Settings]
-Ratio=3:2
-FixRatio=true
-DPI=600
-
-[Color Management]
-ICCDirectory=C:\\WINDOWS\\System32\\spool\\drivers\\color
-MonitorProfile=
-Intent=1