Skip to content

Commit df22c67

Browse files
committed
Small changes in messages and warnings!
1 parent 8227dfe commit df22c67

4 files changed

Lines changed: 33 additions & 11 deletions

File tree

Messenger.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,12 @@ private static int CheckDataFormat (ref char c, int i, string s)
206206

207207
//-------------------------------------------------------------------------
208208

209-
private static Formated Format (string msg, int mbw = -1 /* MaxBufferWidth*/)
210-
{
209+
private static Formated Format
210+
(
211+
string msg
212+
, int mbw = -1 /* MaxBufferWidth*/
213+
, int offset = 0
214+
){
211215
Formated r = new Formated();
212216
List<ConsoleColor> f = new List<ConsoleColor>();
213217
List<ConsoleColor> b = new List<ConsoleColor>();
@@ -222,7 +226,7 @@ private static Formated Format (string msg, int mbw = -1 /* MaxBufferWidth*/)
222226
b.Add(System.Console.BackgroundColor);
223227

224228
if (mbw < 0)
225-
mbw = MaxBufferWidth;
229+
mbw = MaxBufferWidth - offset;
226230

227231
msg += '\n';
228232
for (int n, l = mbw, i = 0, j = 0, k = 0, s = 0, t = 0, m = 0, p = 0; i < msg.Length; ++i)
@@ -557,7 +561,7 @@ Icon icn
557561
, bool bss // System sounds ('\a').
558562
, bool bnl // New line.
559563
){
560-
Formated _f = Messenger.Format("#### {t:5}" + msg);
564+
Formated _f = Messenger.Format("#### {t:6}" + msg, -1, 1);
561565
bool _b = Clean;
562566

563567
Clean = true;
@@ -573,7 +577,7 @@ Icon icn
573577
while ((i = msg.IndexOf(ColorChar)) != -1)
574578
msg = msg.Remove(i, 1);
575579

576-
StringBuilder sb = new StringBuilder("\n[");
580+
StringBuilder sb = new StringBuilder("\n [");
577581
ConsoleKeyInfo ki = new ConsoleKeyInfo();
578582
ConsoleColor[] cc;
579583

Program.cs

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10085,11 +10085,29 @@ static void Main (string[] args)
1008510085
break;
1008610086

1008710087
default:
10088+
saux = string.Empty;
10089+
10090+
if (!string.IsNullOrEmpty(ifn))
10091+
saux = ifn;
10092+
1008810093
ifn = Program.CheckArg(args, i, false);
1008910094

1009010095
if (ifn.Equals(BATCH, StringComparison.InvariantCultureIgnoreCase))
1009110096
ifn += Program.CheckArg(args, ++i, false);
1009210097

10098+
else if (!string.IsNullOrEmpty(saux))
10099+
{
10100+
Program.ShowBanner();
10101+
Messenger.Print
10102+
(
10103+
Messenger.Icon.WARNING
10104+
, "Exchange in the input file:\n\nOld < " +
10105+
saux + "\nNew > " + ifn
10106+
, false
10107+
, true
10108+
);
10109+
}
10110+
1009310111
break;
1009410112
}
1009510113
}
@@ -10588,7 +10606,7 @@ static void Main (string[] args)
1058810606
);
1058910607

1059010608
_private_key = _export_pvk;
10591-
_public_key = _export_pbk;
10609+
_public_key = _export_pbk;
1059210610

1059310611
Program.PgpECKeyPairGen
1059410612
(

Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
// You can specify all the values or you can default the Build and Revision Numbers
3636
// by using the '*' as shown below:
3737
// [assembly: AssemblyVersion("1.0.*")]
38-
[assembly: AssemblyVersion("1.1.6.8")]
39-
[assembly: AssemblyFileVersion("1.1.6.8")]
38+
[assembly: AssemblyVersion("1.1.6.10")]
39+
[assembly: AssemblyFileVersion("1.1.6.10")]
4040
[assembly: NeutralResourcesLanguageAttribute("en-US")]
4141

4242
#endif

core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp2.0</TargetFramework>
66
<ApplicationIcon>Main.ico</ApplicationIcon>
7-
<Version>1.1.6.5</Version>
7+
<Version>1.1.6.10</Version>
88
<Authors>José A. Rojo L.</Authors>
99
<Company />
1010
<Description>console crypto tool</Description>
@@ -16,8 +16,8 @@
1616
<PackageReleaseNotes>.Net Core 2.0</PackageReleaseNotes>
1717
<AssemblyName>crypto</AssemblyName>
1818
<RootNamespace>crypto</RootNamespace>
19-
<AssemblyVersion>1.1.6.8</AssemblyVersion>
20-
<FileVersion>1.1.6.8</FileVersion>
19+
<AssemblyVersion>1.1.6.10</AssemblyVersion>
20+
<FileVersion>1.1.6.10</FileVersion>
2121
</PropertyGroup>
2222

2323
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

0 commit comments

Comments
 (0)