Permalink
Browse files

Formatting clean up

  • Loading branch information...
sanmadjack committed Sep 7, 2012
1 parent e944f0e commit edb3ef3132965bee232718fa5898ff39268115fb
Showing with 705 additions and 1,302 deletions.
  1. BIN Dependencies/Fluent.dll
  2. +1 −1 Libs/Config
  3. +1 −1 Libs/Email
  4. +1 −1 Libs/Email.WPF
  5. +1 −1 Libs/Exceptions
  6. +1 −1 Libs/GameSave.Info
  7. +1 −1 Libs/Logger
  8. +1 −1 Libs/MVC
  9. +1 −1 Libs/MVC.Translator
  10. +1 −1 Libs/MVC.WPF
  11. +1 −1 Libs/Translator
  12. +1 −1 Libs/Translator.WPF
  13. +1 −1 Libs/Updater
  14. +1 −1 Libs/WPF
  15. +1 −1 Libs/XmlData
  16. +4 −4 MASGAU.Common/AMainProgramHandler.cs
  17. +6 −7 MASGAU.Common/AProgramHandler.cs
  18. +3 −4 MASGAU.Common/Analyzer/AAnalyzer.cs
  19. +5 −5 MASGAU.Common/Analyzer/APCAnalyzer.cs
  20. +1 −5 MASGAU.Common/AppMode.cs
  21. +14 −14 MASGAU.Common/Archive/Archive.cs
  22. +3 −3 MASGAU.Common/Archive/ArchiveID.cs
  23. +2 −2 MASGAU.Common/Archive/Archives.cs
  24. +2 −2 MASGAU.Common/BackgroundWorker.cs
  25. +4 −4 MASGAU.Common/Backup/BackupProgramHandler.cs
  26. +22 −41 MASGAU.Common/Core.cs
  27. +1 −1 MASGAU.Common/Data
  28. +1 −5 MASGAU.Common/ElevationResult.cs
  29. +1 −5 MASGAU.Common/Enums/MASGAURequestTypes.cs
  30. +1 −5 MASGAU.Common/Enums/Program.cs
  31. +5 −8 MASGAU.Common/Game/Custom/CustomGame.cs
  32. +3 −7 MASGAU.Common/Game/Custom/CustomGameEntry.cs
  33. +7 −10 MASGAU.Common/Game/Custom/CustomGameVersion.cs
  34. +2 −7 MASGAU.Common/Game/Custom/CustomGameXmlFile.cs
  35. +40 −43 MASGAU.Common/Game/GameEntry.cs
  36. +2 −3 MASGAU.Common/Game/GameID.cs
  37. +15 −15 MASGAU.Common/Game/GameXmlFiles.cs
  38. +30 −30 MASGAU.Common/Game/Games.cs
  39. +2 −7 MASGAU.Common/IWindow.cs
  40. +5 −5 MASGAU.Common/Location/ALocationHandler.cs
  41. +4 −6 MASGAU.Common/Location/ALocationsHandler.cs
  42. +1 −1 MASGAU.Common/Location/APlaystationLocationHandler.cs
  43. +2 −2 MASGAU.Common/Location/AScummVMLocationHandler.cs
  44. +2 −2 MASGAU.Common/Location/ASystemLocationHandler.cs
  45. +1 −4 MASGAU.Common/Location/DetectedLocations.cs
  46. +6 −9 MASGAU.Common/Location/EvFolder.cs
  47. +3 −3 MASGAU.Common/Location/Holders/DetectedFile.cs
  48. +1 −1 MASGAU.Common/Location/Holders/DetectedFiles.cs
  49. +6 −5 MASGAU.Common/Location/Holders/DetectedLocationPathHolder.cs
  50. +0 −2 MASGAU.Common/Location/ILocationsHandler.cs
  51. +4 −5 MASGAU.Common/Location/UserData.cs
  52. +3 −2 MASGAU.Common/MASGAU.Common.csproj
  53. +153 −156 MASGAU.Common/Monitor/Monitor.cs
  54. +21 −21 MASGAU.Common/Monitor/MonitorFile.cs
  55. +63 −68 MASGAU.Common/Monitor/MonitorPath.cs
  56. +7 −7 MASGAU.Common/Monitor/Origin.cs
  57. +2 −5 MASGAU.Common/QuickHash.cs
  58. +22 −23 MASGAU.Common/Restore/ARestoreProgramHandler.cs
  59. +6 −7 MASGAU.Common/SecurityHandler.cs
  60. +10 −13 MASGAU.Common/Settings/Settings.cs
  61. +3 −7 MASGAU.Common/StartupHelper.cs
  62. +0 −363 MASGAU.Common/Sync/Synchronizer.cs
  63. BIN MASGAU.NET.suo
  64. +1 −2 MASGAU.WPF/App.xaml.cs
  65. +4 −7 MASGAU.WPF/ArchiveListViewItem.cs
  66. +5 −9 MASGAU.WPF/GameListViewItem.cs
  67. +3 −0 MASGAU.WPF/MASGAU.WPF.csproj
  68. +12 −15 MASGAU.WPF/MainWindowAddGame.cs
  69. +1 −9 MASGAU.WPF/MainWindowAnalyzer.cs
  70. +6 −10 MASGAU.WPF/MainWindowBackup.cs
  71. +2 −5 MASGAU.WPF/MainWindowCommunication.cs
  72. +10 −14 MASGAU.WPF/MainWindowEnableDisable.cs
  73. +9 −11 MASGAU.WPF/MainWindowGameList.cs
  74. +1 −2 MASGAU.WPF/MainWindowJumpList.cs
  75. +1 −10 MASGAU.WPF/MainWindowMonitor.cs
  76. +10 −16 MASGAU.WPF/MainWindowNew.xaml.cs
  77. +4 −9 MASGAU.WPF/MainWindowPreferences.cs
  78. +5 −9 MASGAU.WPF/MainWindowRestore.cs
  79. +1 −1 MASGAU.WPF/MainWindowUpdate.cs
  80. +7 −11 MASGAU.WPF/NotifierIcon.cs
  81. +1 −6 MASGAU.WPF/Program.cs
  82. +1 −11 MASGAU.WPF/ReportProblemWindow.xaml.cs
  83. +4 −8 MASGAU.WPF/ReportWindow.xaml.cs
  84. +14 −15 MASGAU.WPF/RestoreWindow.xaml.cs
  85. +1 −2 MASGAU.WPF/WPF/AProgramWindow.cs
  86. +1 −7 MASGAU.WPF/WPF/AWindow.cs
  87. +2 −6 MASGAU.WPF/WPF/BetterRibbonComboBox.cs
  88. +1 −11 MASGAU.WPF/WPF/ChromeButton.xaml.cs
  89. +1 −3 MASGAU.WPF/WPF/ControlFlipper.cs
  90. +1 −5 MASGAU.WPF/WPF/FixedRibbonTextBox.cs
  91. +1 −4 MASGAU.WPF/WPF/GlassHelper.cs
  92. +3 −7 MASGAU.WPF/WPF/IWPFWindow.cs
  93. +48 −54 MASGAU.WPF/WPF/NewWindow.cs
  94. +4 −7 MASGAU.WPF/WPF/RibbonComboItem.cs
  95. +1 −7 MASGAU.WPF/WPF/RibbonComboSource.cs
  96. +4 −16 MASGAU.WPF/WPF/RibbonSpinner.xaml.cs
  97. +1 −3 MASGAU.WPF/WPF/WPFHelpers.cs
  98. +4 −6 MASGAU.Windows/Analyzer/PCAnalyzer.cs
  99. +3 −3 MASGAU.Windows/Location/PlaystationLocationHandler.cs
  100. +1 −2 MASGAU.Windows/Location/ScummVMLocationHandler.cs
  101. +1 −1 MASGAU.Windows/Location/SteamLocationHandler.cs
  102. +10 −10 MASGAU.Windows/Location/SystemLocationHandler.cs
View
Binary file not shown.
Submodule Logger updated 1 files
+4 −4 Logger.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using MVC.Translator;
using MASGAU.Location;
using Translator;
using MVC.Communication;
using MVC.Translator;
using Translator;
namespace MASGAU.Main {
public class MainProgramHandler : AProgramHandler {
public bool disable_resize = false;
@@ -18,7 +18,7 @@ public MainProgramHandler(ALocationsHandler loc)
else
mode = Strings.GetSourceString("SingleUserMode");
_program_title = Strings.GetLabelString("MASGAUWindowTitle",Core.version.ToString(),mode);
_program_title = Strings.GetLabelString("MASGAUWindowTitle", Core.version.ToString(), mode);
}
protected override void doWork(object sender, System.ComponentModel.DoWorkEventArgs e) {
@@ -58,7 +58,7 @@ public MainProgramHandler(ALocationsHandler loc)
#endregion
#region Methods for downloading updates
#region Methods for downloading updates
public void downloadDataUpdates() {
ProgressHandler.value = 0;
ProgressHandler.max = Core.updater.Data.UpdateCount;
@@ -1,13 +1,12 @@
using System;
using System.ComponentModel;
using MVC.Translator;
using MASGAU.Location;
using MASGAU.Monitor;
using Translator;
using MVC.Communication;
using MVC.Translator;
using Translator;
namespace MASGAU {
public abstract class AProgramHandler: Core, INotifyPropertyChanged {
public abstract class AProgramHandler : Core, INotifyPropertyChanged {
// The title of the program's window
public String program_title {
@@ -21,10 +20,10 @@ public abstract class AProgramHandler: Core, INotifyPropertyChanged {
public AProgramHandler(ALocationsHandler locations)
: base() {
if (!Core.Ready)
return;
if (!Core.Ready)
return;
if (Core.Mode>= Config.ConfigMode.Portable)
if (Core.Mode >= Config.ConfigMode.Portable)
_program_title = Strings.GetLabelString("PortableMode", _program_title);
if (Core.locations == null) {
@@ -3,10 +3,9 @@
using System.ComponentModel;
using System.IO;
using System.Text;
using MVC.Communication;
using MASGAU.Location.Holders;
using MASGAU.Location;
using MVC;
using MVC.Communication;
namespace MASGAU.Analyzer {
public abstract class AAnalyzer : AWorker {
public static string LastSavePath = null;
@@ -26,7 +25,7 @@ public abstract class AAnalyzer : AWorker {
protected AAnalyzer(CustomGameEntry game, RunWorkerCompletedEventHandler when_done)
: base(when_done) {
this.game = game;
this.game = game;
}
protected void outputLine() { outputLine(""); }
@@ -118,7 +117,7 @@ protected AAnalyzer(CustomGameEntry game, RunWorkerCompletedEventHandler when_do
}
protected bool outputPath(String path) {
return outputFile(path)||outputDirectory(path);
return outputFile(path) || outputDirectory(path);
}
private bool outputFile(FileInfo file) {
@@ -1,16 +1,16 @@
using System;
using System.IO;
using System.ComponentModel;
using MVC.Communication;
using MVC.Translator;
using System.IO;
using GameSaveInfo;
using MASGAU.Location;
using MASGAU.Location.Holders;
using GameSaveInfo;
using MVC.Communication;
using MVC.Translator;
namespace MASGAU.Analyzer {
public class APCAnalyzer : AAnalyzer {
protected DetectedLocationPathHolder path;
protected APCAnalyzer(CustomGameEntry game, RunWorkerCompletedEventHandler when_done)
: base(game,when_done) {
: base(game, when_done) {
}
protected override void analyzerWork() {
View
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace MASGAU {
public enum AppMode {
Main,
@@ -6,13 +6,13 @@
using System.Text;
using System.Threading;
using System.Xml;
using MVC.Communication;
using MVC.Translator;
using MASGAU.Location.Holders;
using MASGAU.Restore;
using MVC;
using XmlData;
using MVC.Communication;
using MVC.Translator;
using Translator;
using XmlData;
namespace MASGAU {
public class Archive : AModelItem<ArchiveID> {
#region Archive identification stuff
@@ -28,12 +28,12 @@ public class Archive : AModelItem<ArchiveID> {
}
public System.Drawing.Color BackgroundColor {
public override System.Drawing.Color BackgroundColor {
get {
return id.Game.BackgroundColor;
}
}
public System.Drawing.Color SelectedColor {
public override System.Drawing.Color SelectedColor {
get {
return id.Game.SelectedColor;
}
@@ -156,7 +156,7 @@ public class Archive : AModelItem<ArchiveID> {
try {
purgeTemp();
Directory.CreateDirectory(TempFolder);
} catch(TranslateableException e) {
} catch (TranslateableException e) {
throw e;
} catch (Exception e) {
throw new TranslateableException("FolderPrepError", e, TempFolder);
@@ -197,7 +197,7 @@ public Archive(FileInfo archive)
zipper.StartInfo.WorkingDirectory = Core.ExecutablePath;
if (!ready)
throw new TranslateableException("FileNotFoundCritical",ZipExecutable);
throw new TranslateableException("FileNotFoundCritical", ZipExecutable);
// If the archive is new, then the following won't apply
@@ -210,7 +210,7 @@ public Archive(FileInfo archive)
extract(xml_file, false);
if (File.Exists(Path.Combine(TempFolder, "masgau.xml"))) {
XmlFile file = new XmlFile(new FileInfo(Path.Combine(TempFolder, "masgau.xml")),false);
XmlFile file = new XmlFile(new FileInfo(Path.Combine(TempFolder, "masgau.xml")), false);
XmlElement root = file.DocumentElement;
id = new ArchiveID(root);
@@ -275,7 +275,7 @@ public Archive(FileInfo archive)
// Copies the particular file to a relative path inside the temp folder
FileInfo source;
FileInfo destination;
if (file.Path == ""||file.Path==null) {
if (file.Path == "" || file.Path == null) {
source = new FileInfo(Path.Combine(file.AbsoluteRoot, file.Name));
destination = new FileInfo(Path.Combine(TempFolder, file.Name));
} else {
@@ -357,7 +357,7 @@ public Archive(FileInfo archive)
if (!SecurityHandler.amAdmin()) {
// If we aren't we elevate ourselves
RestoreResult res = restoreElevation(destination.FullName);
if(res!= RestoreResult.Success) {
if (res != RestoreResult.Success) {
return res;
}
} else {
@@ -413,16 +413,16 @@ public Archive(FileInfo archive)
}
private RestoreResult restoreElevation(string destination) {
try {
// if (SecurityHandler.amAdmin()) {
// TranslatingMessageHandler.SendError("UnableToCreateOutputFolderAdmin", destination);
// return false;
// if (SecurityHandler.amAdmin()) {
// TranslatingMessageHandler.SendError("UnableToCreateOutputFolderAdmin", destination);
// return false;
//}
MVC.Communication.Interface.InterfaceHandler.disableInterface();
if (!TranslatingRequestHandler.Request(RequestType.Question, "UnableToCreateOutputFolderRequest", destination).Cancelled) {
try {
MVC.Communication.Interface.InterfaceHandler.disableInterface();
ElevationResult res = SecurityHandler.elevation(Core.ExecutableName, "\"" + ArchiveFile.FullName + "\"",true);
ElevationResult res = SecurityHandler.elevation(Core.ExecutableName, "\"" + ArchiveFile.FullName + "\"", true);
switch (res) {
case ElevationResult.Success:
return RestoreResult.Success;
@@ -1,10 +1,10 @@
using System;
using System.IO;
using System.Text;
using System.Xml;
using System.IO;
using MVC;
using GameSaveInfo;
using MASGAU.Location.Holders;
using MVC;
namespace MASGAU {
public class ArchiveID : AIdentifier {
public readonly String Owner;
@@ -138,7 +138,7 @@ public class ArchiveID : AIdentifier {
DetectedLocationPathHolder loc = first_file.OriginalLocation;
OriginalLocation = loc.full_dir_path ;
OriginalLocation = loc.full_dir_path;
OriginalEV = loc.EV;
OriginalRelativePath = loc.Path;
}
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.IO;
using MASGAU.Location.Holders;
using MVC;
using MVC.Communication;
using MVC.Translator;
using MVC;
using MASGAU.Location.Holders;
namespace MASGAU {
public class Archives : StaticModel<ArchiveID, Archive> {
private Archives() { }
@@ -1,6 +1,6 @@
using System.ComponentModel;
using MVC.Translator;
using MVC;
using MVC.Translator;
namespace MASGAU {
public class BackgroundWorker : System.ComponentModel.BackgroundWorker, INotifyPropertyChanged, ICancellable {
@@ -26,7 +26,7 @@ public BackgroundWorker()
public void Cancel() {
this.CancelAsync();
this.CancelAsync();
}
@@ -3,10 +3,10 @@
using System.ComponentModel;
using System.IO;
using Collections;
using MVC.Communication;
using MVC.Translator;
using MASGAU.Location;
using MASGAU.Location.Holders;
using MVC.Communication;
using MVC.Translator;
namespace MASGAU.Backup {
public class BackupProgramHandler : AProgramHandler {
public string archive_name_override = null;
@@ -111,7 +111,7 @@ public BackupProgramHandler(ALocationsHandler loc)
if (archive_name_override != null) {
if (override_archive == null)
file.Type = null;
override_archive = new Archive(new FileInfo(archive_name_override), new ArchiveID(game.id, file));
override_archive = new Archive(new FileInfo(archive_name_override), new ArchiveID(game.id, file));
archive = override_archive;
} else {
if (Archives.Get(archive_id) == null) {
@@ -127,7 +127,7 @@ public BackupProgramHandler(ALocationsHandler loc)
foreach (KeyValuePair<Archive, List<DetectedFile>> backup_file in backup_files) {
if (override_archive == null)
backup_file.Key.backup(backup_file.Value, false,false);
backup_file.Key.backup(backup_file.Value, false, false);
else
backup_file.Key.backup(backup_file.Value, true, false);
}
Oops, something went wrong.

0 comments on commit edb3ef3

Please sign in to comment.