lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactored ResourceOptions handling.

Browse Source
This commit is contained in:
morkt
2014-07-27 07:39:58 +04:00
parent 5253f8c776
commit 1c33e4c9d5
7 changed files with 137 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ArcFormats/ArcXP3.cs
View File

@@ -242,7 +242,7 @@ NextEntry:
{
return new Xp3Options {
Version = Settings.Default.XP3Version,
Scheme = NoCryptAlgorithm,
Scheme = GetScheme (Settings.Default.XP3Scheme),
CompressIndex = Settings.Default.XP3CompressHeader,
CompressContents = Settings.Default.XP3CompressContents,
RetainDirs = Settings.Default.XP3RetainStructure,
@@ -251,13 +251,7 @@ NextEntry:
public override ResourceOptions GetOptions (object widget)
{
var options = this.GetDefaultOptions() as Xp3Options;
var w = widget as GUI.CreateXP3Widget;
if (null != w)
{
options.Scheme = w.EncryptionWidget.GetScheme();
}
return options;
return this.GetDefaultOptions();
}
public override object GetCreationWidget ()
@@ -272,17 +266,15 @@ NextEntry:
ICrypt QueryCryptAlgorithm ()
{
var widget = this.GetAccessWidget() as GUI.WidgetXP3;
var args = new ParametersRequestEventArgs
{
Notice = arcStrings.ArcEncryptedNotice,
InputWidget = widget,
};
FormatCatalog.Instance.InvokeParametersRequest (this, args);
if (!args.InputResult)
throw new OperationCanceledException();
return widget.GetScheme();
return GetOptions<Xp3Options> (args.Options).Scheme;
}
public static ICrypt GetScheme (string scheme)