Use windows setting for visibility of hidden files/folders, closes #5185

This commit is contained in:
heckflosse 2019-02-26 13:21:11 +01:00
parent 05bc7b2451
commit cd6da9db0c

View File

@ -352,7 +352,14 @@ void Options::setDefaults()
fbShowDateTime = true; fbShowDateTime = true;
fbShowBasicExif = true; fbShowBasicExif = true;
fbShowExpComp = false; fbShowExpComp = false;
#ifdef WIN32
// use windows setting for visibility of hidden files/folders
SHELLFLAGSTATE sft = { 0 };
SHGetSettings(&sft, SSF_SHOWALLOBJECTS);
fbShowHidden = sft.fShowAllObjects;
#else
fbShowHidden = false; fbShowHidden = false;
#endif
fbArrangement = 2; // was 0 fbArrangement = 2; // was 0
navRGBUnit = NavigatorUnit::PERCENT; navRGBUnit = NavigatorUnit::PERCENT;
navHSVUnit = NavigatorUnit::PERCENT; navHSVUnit = NavigatorUnit::PERCENT;
@ -930,9 +937,11 @@ void Options::readFromFile(Glib::ustring fname)
fbShowExpComp = keyFile.get_boolean("File Browser", "BrowserShowsExpComp"); fbShowExpComp = keyFile.get_boolean("File Browser", "BrowserShowsExpComp");
} }
#ifndef WIN32
if (keyFile.has_key("File Browser", "BrowserShowsHidden")) { if (keyFile.has_key("File Browser", "BrowserShowsHidden")) {
fbShowHidden = keyFile.get_boolean("File Browser", "BrowserShowsHidden"); fbShowHidden = keyFile.get_boolean("File Browser", "BrowserShowsHidden");
} }
#endif
if (keyFile.has_key("File Browser", "MaxPreviewHeight")) { if (keyFile.has_key("File Browser", "MaxPreviewHeight")) {
maxThumbnailHeight = keyFile.get_integer("File Browser", "MaxPreviewHeight"); maxThumbnailHeight = keyFile.get_integer("File Browser", "MaxPreviewHeight");
@ -1887,7 +1896,9 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_boolean("File Browser", "BrowserShowsDate", fbShowDateTime); keyFile.set_boolean("File Browser", "BrowserShowsDate", fbShowDateTime);
keyFile.set_boolean("File Browser", "BrowserShowsExif", fbShowBasicExif); keyFile.set_boolean("File Browser", "BrowserShowsExif", fbShowBasicExif);
keyFile.set_boolean("File Browser", "BrowserShowsExpComp", fbShowExpComp); keyFile.set_boolean("File Browser", "BrowserShowsExpComp", fbShowExpComp);
#ifndef WIN32
keyFile.set_boolean("File Browser", "BrowserShowsHidden", fbShowHidden); keyFile.set_boolean("File Browser", "BrowserShowsHidden", fbShowHidden);
#endif
keyFile.set_integer("File Browser", "ThumbnailSize", thumbSize); keyFile.set_integer("File Browser", "ThumbnailSize", thumbSize);
keyFile.set_integer("File Browser", "ThumbnailSizeTab", thumbSizeTab); keyFile.set_integer("File Browser", "ThumbnailSizeTab", thumbSizeTab);
keyFile.set_integer("File Browser", "ThumbnailSizeQueue", thumbSizeQueue); keyFile.set_integer("File Browser", "ThumbnailSizeQueue", thumbSizeQueue);