Revision f734ab5b trunk/Pithos.Client.WPF/Configuration/PithosSettings.cs
b/trunk/Pithos.Client.WPF/Configuration/PithosSettings.cs | ||
---|---|---|
21 | 21 |
[Export] |
22 | 22 |
public class PithosSettings : IPithosSettings |
23 | 23 |
{ |
24 |
private readonly Settings _settings = Settings.Default; |
|
25 |
|
|
24 | 26 |
public bool UseDefaultProxy |
25 | 27 |
{ |
26 |
get { return Settings.Default.UseDefaultProxy; }
|
|
27 |
set { Settings.Default.UseDefaultProxy = value; }
|
|
28 |
get { return _settings.UseDefaultProxy; }
|
|
29 |
set { _settings.UseDefaultProxy = value; }
|
|
28 | 30 |
} |
29 | 31 |
|
30 | 32 |
public bool UseManualProxy |
31 | 33 |
{ |
32 |
get { return Settings.Default.UseManualProxy; }
|
|
33 |
set { Settings.Default.UseManualProxy = value; }
|
|
34 |
get { return _settings.UseManualProxy; }
|
|
35 |
set { _settings.UseManualProxy = value; }
|
|
34 | 36 |
} |
35 | 37 |
|
36 | 38 |
public bool UseNoProxy |
37 | 39 |
{ |
38 |
get { return Settings.Default.UseNoProxy; }
|
|
39 |
set { Settings.Default.UseNoProxy = value; }
|
|
40 |
get { return _settings.UseNoProxy; }
|
|
41 |
set { _settings.UseNoProxy = value; }
|
|
40 | 42 |
} |
41 | 43 |
|
42 | 44 |
public string PithosPath |
43 | 45 |
{ |
44 |
get { return Settings.Default.PithosPath; }
|
|
45 |
set { Settings.Default.PithosPath = value; }
|
|
46 |
get { return _settings.PithosPath; }
|
|
47 |
set { _settings.PithosPath = value; }
|
|
46 | 48 |
} |
47 | 49 |
|
48 |
public string PithosSite |
|
50 |
/* public string PithosSite
|
|
49 | 51 |
{ |
50 |
get { return Settings.Default.PithosSite; }
|
|
51 |
} |
|
52 |
get { return _settings.PithosSite; }
|
|
53 |
}*/
|
|
52 | 54 |
|
53 | 55 |
public string PithosLoginUrl |
54 | 56 |
{ |
55 |
get { return Settings.Default.PithosLoginUrl; }
|
|
57 |
get { return _settings.PithosLoginUrl; }
|
|
56 | 58 |
} |
57 | 59 |
|
58 | 60 |
public string IconsPath |
59 | 61 |
{ |
60 |
get { return Settings.Default.IconPath; }
|
|
61 |
set { Settings.Default.IconPath = value; }
|
|
62 |
get { return _settings.IconPath; }
|
|
63 |
set { _settings.IconPath = value; }
|
|
62 | 64 |
} |
63 | 65 |
|
64 | 66 |
public string UserName |
65 | 67 |
{ |
66 |
get { return Settings.Default.UserName; }
|
|
67 |
set { Settings.Default.UserName = value; }
|
|
68 |
get { return _settings.UserName; }
|
|
69 |
set { _settings.UserName = value; }
|
|
68 | 70 |
} |
69 | 71 |
|
70 | 72 |
public string ApiKey |
71 | 73 |
{ |
72 |
get { return Settings.Default.ApiKey; }
|
|
73 |
set { Settings.Default.ApiKey = value; }
|
|
74 |
get { return _settings.ApiKey; }
|
|
75 |
set { _settings.ApiKey = value; }
|
|
74 | 76 |
} |
75 | 77 |
|
76 | 78 |
public AccountsCollection Accounts |
77 | 79 |
{ |
78 |
get { return Settings.Default.Accounts; } |
|
79 |
set { Settings.Default.Accounts = value; } |
|
80 |
get |
|
81 |
{ |
|
82 |
if (_settings.Accounts==null) |
|
83 |
_settings.Accounts=new AccountsCollection(); |
|
84 |
return _settings.Accounts; |
|
85 |
} |
|
86 |
set { _settings.Accounts = value; } |
|
80 | 87 |
} |
81 | 88 |
|
82 | 89 |
public string ProxyServer |
83 | 90 |
{ |
84 |
get { return Settings.Default.ProxyServer; }
|
|
85 |
set { Settings.Default.ProxyServer = value; }
|
|
91 |
get { return _settings.ProxyServer; }
|
|
92 |
set { _settings.ProxyServer = value; }
|
|
86 | 93 |
} |
87 | 94 |
|
88 | 95 |
public int ProxyPort |
89 | 96 |
{ |
90 |
get { return Settings.Default.ProxyPort; }
|
|
91 |
set { Settings.Default.ProxyPort = value; }
|
|
97 |
get { return _settings.ProxyPort; }
|
|
98 |
set { _settings.ProxyPort = value; }
|
|
92 | 99 |
} |
93 | 100 |
|
94 | 101 |
public string ProxyUsername |
95 | 102 |
{ |
96 |
get { return Settings.Default.ProxyUsername; }
|
|
97 |
set { Settings.Default.ProxyUsername = value; }
|
|
103 |
get { return _settings.ProxyUsername; }
|
|
104 |
set { _settings.ProxyUsername = value; }
|
|
98 | 105 |
} |
99 | 106 |
|
100 | 107 |
|
101 | 108 |
public string ProxyPassword |
102 | 109 |
{ |
103 |
get { return Settings.Default.ProxyPassword; }
|
|
104 |
set { Settings.Default.ProxyPassword = value; }
|
|
110 |
get { return _settings.ProxyPassword; }
|
|
111 |
set { _settings.ProxyPassword = value; }
|
|
105 | 112 |
} |
106 | 113 |
|
107 | 114 |
public bool ProxyAuthentication |
108 | 115 |
{ |
109 | 116 |
|
110 |
get { return Settings.Default.ProxyAuthentication; }
|
|
111 |
set { Settings.Default.ProxyAuthentication = value; }
|
|
117 |
get { return _settings.ProxyAuthentication; }
|
|
118 |
set { _settings.ProxyAuthentication = value; }
|
|
112 | 119 |
} |
113 | 120 |
|
114 | 121 |
|
... | ... | |
116 | 123 |
public bool ExtensionsActivated |
117 | 124 |
{ |
118 | 125 |
|
119 |
get { return Settings.Default.ExtensionsActivated; }
|
|
120 |
set { Settings.Default.ExtensionsActivated = value; }
|
|
126 |
get { return _settings.ExtensionsActivated; }
|
|
127 |
set { _settings.ExtensionsActivated = value; }
|
|
121 | 128 |
} |
122 | 129 |
|
123 | 130 |
public bool ShowDesktopNotifications |
124 | 131 |
{ |
125 |
get { return Settings.Default.ShowDesktopNotifications; }
|
|
126 |
set { Settings.Default.ShowDesktopNotifications = value; }
|
|
132 |
get { return _settings.ShowDesktopNotifications; }
|
|
133 |
set { _settings.ShowDesktopNotifications = value; }
|
|
127 | 134 |
} |
128 | 135 |
/* |
129 | 136 |
public override IEnumerable<string> GetDynamicMemberNames() |
130 | 137 |
{ |
131 |
return (from SettingsProperty property in Settings.Default.Properties
|
|
138 |
return (from SettingsProperty property in _settings.Properties
|
|
132 | 139 |
select property.Name); |
133 | 140 |
} |
134 | 141 |
|
135 | 142 |
|
136 | 143 |
private Lazy<ILookup<string, SettingsProperty>> _propertyNames = new Lazy<ILookup<string, SettingsProperty>>( |
137 | 144 |
() => (from SettingsProperty property in |
138 |
Settings.Default.Properties
|
|
145 |
_settings.Properties
|
|
139 | 146 |
select property).ToLookup(property => property.Name)); |
140 | 147 |
|
141 | 148 |
public override bool TryGetMember(GetMemberBinder binder, out object result) |
... | ... | |
143 | 150 |
result = null; |
144 | 151 |
if (!_propertyNames.Value.Contains(binder.Name)) |
145 | 152 |
return false; |
146 |
result=Settings.Default.Properties[binder.Name];
|
|
153 |
result=_settings.Properties[binder.Name];
|
|
147 | 154 |
return true; |
148 | 155 |
} |
149 | 156 |
*/ |
150 | 157 |
|
151 | 158 |
public void Save() |
152 | 159 |
{ |
153 |
Settings.Default.Save();
|
|
160 |
_settings.Save();
|
|
154 | 161 |
} |
155 | 162 |
|
156 | 163 |
public void Reload() |
157 | 164 |
{ |
158 |
Settings.Default.Reload();
|
|
165 |
_settings.Reload();
|
|
159 | 166 |
} |
160 | 167 |
} |
161 | 168 |
} |
Also available in: Unified diff