github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

Browse source
This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions
Download patch file Download diff file Expand all files Collapse all files

16
GreenshotPlugin/IniFile/IniConfig.cs
View file

@ -28,7 +28,7 @@ using log4net;
namespace Greenshot.IniFile {
public class IniConfig {
private static ILog LOG = LogManager.GetLogger(typeof(IniConfig));
private static readonly ILog LOG = LogManager.GetLogger(typeof(IniConfig));
private const string INI_EXTENSION = ".ini";
private const string DEFAULTS_POSTFIX = "-defaults";
private const string FIXED_POSTFIX = "-fixed";
@ -36,22 +36,22 @@ namespace Greenshot.IniFile {
/// <summary>
/// A lock object for the ini file saving
/// </summary>
private static object iniLock = new object();
private static readonly object iniLock = new object();
/// <summary>
/// As the ini implementation is kept someone generic, for reusing, this holds the name of the application
/// </summary>
private static string applicationName = null;
private static string applicationName;
/// <summary>
/// As the ini implementation is kept someone generic, for reusing, this holds the name of the configuration
/// </summary>
private static string configName = null;
private static string configName;
/// <summary>
/// A Dictionary with all the sections stored by section name
/// </summary>
private static Dictionary<string, IniSection> sectionMap = new Dictionary<string, IniSection>();
private static readonly Dictionary<string, IniSection> sectionMap = new Dictionary<string, IniSection>();
/// <summary>
/// A Dictionary with the properties for a section stored by section name
@ -61,17 +61,17 @@ namespace Greenshot.IniFile {
/// <summary>
/// A Dictionary with the fixed-properties for a section stored by section name
/// </summary>
private static Dictionary<string, Dictionary<string, string>> fixedProperties = null;
private static Dictionary<string, Dictionary<string, string>> fixedProperties;
/// <summary>
/// Stores if we checked for portable
/// </summary>
private static bool portableCheckMade = false;
private static bool portableCheckMade;
/// <summary>
/// Is the configuration portable (meaning we don't store it in the AppData directory)
/// </summary>
private static bool portable = false;
private static bool portable;
public static bool IsPortable {
get {
return portable;