Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-12-18 18:21:07 +01:00
2 changed files with 4 additions and 4 deletions

View File

@@ -356,10 +356,10 @@ void Options::setDefaults ()
profilePath = "profiles";
loadSaveProfilePath = ""; // will be corrected in load as otherwise construction fails
version = "0.0.0.0"; // temporary value; will be correctly set in RTWindow::on_realize
thumbSize = 240;
thumbSizeTab = 180;
thumbSize = 160;
thumbSizeTab = 160;
thumbSizeQueue = 160;
sameThumbSize = true; // preferring speed of switch between file browser and single editor tab
sameThumbSize = false; // preferring speed of switch between file browser and single editor tab
showHistory = true;
showFilePanelState = 0; // Not used anymore ; was the thumb strip state
showInfo = true;