Merge from default branch

This commit is contained in:
ffsup2
2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions

View File

@@ -50,7 +50,7 @@ JpegQuality=100
PngCompression=6
PngBps=8
TiffBps=8
SaveProcParams=false
SaveProcParams=true
PathTemplate=%p1/converted/%f
PathFolder=
UsePathTemplate=true
@@ -65,11 +65,13 @@ SaveParamsToCache=true
LoadParamsFromLocation=0
[GUI]
WindowWidth=1024
WindowHeight=700
WindowWidth=1000
WindowHeight=900
WindowMaximized=false
FileBrowserHeight=250
ToolPanelWidth=270
HistoryPanelWidth=230
ToolPanelWidth=300
BrowserToolPanelWidth=300
HistoryPanelWidth=200
LastPreviewScale=5
LastCropSize=1
ShowHistory=true