Revision adfa4645
| b/trunk/Pithos.Client.WPF/App.xaml.cs | ||
|---|---|---|
| 49 | 49 |
using System.Threading.Tasks; |
| 50 | 50 |
using System.Windows; |
| 51 | 51 |
using Caliburn.Micro; |
| 52 |
using Pithos.Client.WPF.Configuration; |
|
| 52 | 53 |
using Pithos.Client.WPF.Properties; |
| 53 | 54 |
using log4net.Appender; |
| 54 | 55 |
using log4net.Core; |
| ... | ... | |
| 103 | 104 |
|
| 104 | 105 |
try |
| 105 | 106 |
{
|
| 106 |
var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); |
|
| 107 |
var pithosDataPath = Path.Combine(appDataPath, "GRNET"); |
|
| 107 |
var pithosDataPath = PithosSettings.PithosDataPath; |
|
| 108 | 108 |
if (!Directory.Exists(pithosDataPath)) |
| 109 | 109 |
Directory.CreateDirectory(pithosDataPath); |
| 110 | 110 |
|
| b/trunk/Pithos.Client.WPF/Configuration/PithosSettings.cs | ||
|---|---|---|
| 262 | 262 |
.FirstOrDefault(a => a.Name == "DebugFileAppender"); |
| 263 | 263 |
if (debugAppender != null) |
| 264 | 264 |
{
|
| 265 |
var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); |
|
| 266 |
var pithosDataPath = Path.Combine(appDataPath, "GRNET"); |
|
| 265 |
var pithosDataPath = PithosDataPath; |
|
| 267 | 266 |
debugAppender.File = Path.Combine(pithosDataPath, "debuglog.xml"); |
| 268 | 267 |
debugAppender.Threshold = !Settings.Default.DebugLoggingEnabled ? Level.Off : Level.All; |
| 269 | 268 |
debugAppender.ActivateOptions(); |
| 270 | 269 |
} |
| 271 | 270 |
} |
| 272 | 271 |
|
| 272 |
public static string PithosDataPath |
|
| 273 |
{
|
|
| 274 |
get |
|
| 275 |
{
|
|
| 276 |
var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); |
|
| 277 |
var pithosDataPath = Path.Combine(appDataPath, "GRNET\\PITHOS"); |
|
| 278 |
return pithosDataPath; |
|
| 279 |
} |
|
| 280 |
} |
|
| 281 |
|
|
| 273 | 282 |
public void Save() |
| 274 | 283 |
{
|
| 275 | 284 |
_settings.Save(); |
| b/trunk/Pithos.Client.WPF/LogConsole/LogConsoleViewModel.cs | ||
|---|---|---|
| 27 | 27 |
private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 28 | 28 |
|
| 29 | 29 |
private readonly MemoryAppender _memoryAppender; |
| 30 |
private IObservableCollection<LoggingEvent> _events;
|
|
| 30 |
private BindableCollection<LoggingEvent> _events;
|
|
| 31 | 31 |
|
| 32 | 32 |
public LogConsoleViewModel() |
| 33 | 33 |
{
|
| ... | ... | |
| 51 | 51 |
Events =new BindableCollection<LoggingEvent>(_memoryAppender.GetEvents()); |
| 52 | 52 |
} |
| 53 | 53 |
|
| 54 |
protected IObservableCollection<LoggingEvent> Events
|
|
| 54 |
protected BindableCollection<LoggingEvent> Events
|
|
| 55 | 55 |
{
|
| 56 | 56 |
get {
|
| 57 | 57 |
return _events; |
| b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml | ||
|---|---|---|
| 211 | 211 |
<extToolkit:IntegerUpDown x:Name="StartupDelay" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter number of tasks" Minimum="0" /> |
| 212 | 212 |
<CheckBox Content="Enable Debug Logging" Height="16" HorizontalAlignment="Left" Margin="5,10,5,5" Name="DebugLoggingEnabled" VerticalAlignment="Top"/> |
| 213 | 213 |
<Button x:Name="OpenLogPath" Content="Open Log Path" HorizontalAlignment="Left" Margin="5" Style="{StaticResource ButtonStyle}" Width="Auto"/>
|
| 214 |
<Button x:Name="OpenLogConsole" Content="Open Log Console" HorizontalAlignment="Left" Margin="5" Style="{StaticResource ButtonStyle}" Width="Auto" Visibility="Hidden"/>
|
|
| 214 |
<Button x:Name="OpenLogConsole" Content="Open Log Console" HorizontalAlignment="Left" Margin="5" Style="{StaticResource ButtonStyle}" Width="Auto" Visibility="Visible"/>
|
|
| 215 | 215 |
</WrapPanel> |
| 216 | 216 |
</TabItem> |
| 217 | 217 |
</TabControl> |
| b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs | ||
|---|---|---|
| 152 | 152 |
|
| 153 | 153 |
Proxy.SetFromSettings(settings); |
| 154 | 154 |
|
| 155 |
StatusMessage = "In Synch"; |
|
| 155 |
StatusMessage = Settings.Accounts.Count==0 |
|
| 156 |
? "No Accounts added. Please add an account" |
|
| 157 |
: "Starting"; |
|
| 156 | 158 |
|
| 157 | 159 |
_fileVersion= new Lazy<FileVersionInfo>(() => |
| 158 | 160 |
{
|
| ... | ... | |
| 456 | 458 |
|
| 457 | 459 |
public void OpenLogPath() |
| 458 | 460 |
{
|
| 459 |
var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); |
|
| 460 |
var pithosDataPath = Path.Combine(appDataPath, "GRNET"); |
|
| 461 |
var pithosDataPath = PithosSettings.PithosDataPath; |
|
| 461 | 462 |
|
| 462 | 463 |
Process.Start(pithosDataPath); |
| 463 | 464 |
} |
| b/trunk/Pithos.Client.WPF/app.config | ||
|---|---|---|
| 230 | 230 |
<appender-ref ref="TraceAppender"/> |
| 231 | 231 |
</logger> |
| 232 | 232 |
|
| 233 |
<!-- |
|
| 233 |
|
|
| 234 | 234 |
<logger name="Caliburn" additivity="false"> |
| 235 |
<level value="WARN"/>
|
|
| 235 |
<level value="DEBUG"/>
|
|
| 236 | 236 |
<appender-ref ref="TraceAppender"/> |
| 237 | 237 |
</logger> |
| 238 |
--> |
|
| 239 | 238 |
|
| 240 | 239 |
<logger name="Pithos" additivity="false"> |
| 241 | 240 |
<level value="DEBUG"/> |
| ... | ... | |
| 245 | 244 |
<root> |
| 246 | 245 |
<level value="DEBUG" /> |
| 247 | 246 |
<appender-ref ref="DebugFileAppender" /> |
| 248 |
<!-- |
|
| 249 | 247 |
<appender-ref ref="LossyFileAppender" /> |
| 248 |
<!-- |
|
| 250 | 249 |
<appender-ref ref="LossySmtpAppender" /> |
| 251 | 250 |
--> |
| 252 | 251 |
<appender-ref ref="TraceAppender" /> |
| b/trunk/Pithos.Core/Agents/StatusAgent.cs | ||
|---|---|---|
| 82 | 82 |
{
|
| 83 | 83 |
var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); |
| 84 | 84 |
|
| 85 |
_pithosDataPath = Path.Combine(appDataPath , "GRNET"); |
|
| 85 |
_pithosDataPath = Path.Combine(appDataPath , "GRNET\\PITHOS");
|
|
| 86 | 86 |
if (!Directory.Exists(_pithosDataPath)) |
| 87 | 87 |
Directory.CreateDirectory(_pithosDataPath); |
| 88 | 88 |
|
Also available in: Unified diff