Skip to content

Commit f34dea8

Browse files
AptiviCEOAptiviCEO
committed
imp - bkp - Remove redundant prompt
--- We've removed the redundant message from all infoboxes that asked users to press any key. - Backportable for 0.1.1 - Backportable for 0.1.0 --- Type: imp Breaking: False Doc Required: False Backport Required: True Part: 1/1
1 parent 5c43072 commit f34dea8

File tree

8 files changed

+1
-46
lines changed

8 files changed

+1
-46
lines changed

‎public/Nitrocid.Addons/Nitrocid.Extras.Contacts/Contacts/Interactives/ContactsManagerCli.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@ internal void ShowContactInfo(int index)
186186
string finalRenderedContactNotes = GetContactNotesFinal(index);
187187
finalInfoRendered.AppendLine(finalRenderedContactNotes);
188188

189-
// Add a prompt to close
190-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
191-
192189
// Now, render the info box
193190
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), KernelColorTools.GetColor(KernelColorType.TuiBoxForeground), KernelColorTools.GetColor(KernelColorType.TuiBoxBackground));
194191
}
@@ -200,8 +197,7 @@ internal void ShowContactRawInfo(int index)
200197
var card = ContactsManager.GetContact(index);
201198

202199
string finalRenderedContactVcardInfo = card.SaveToString();
203-
finalInfoRendered.AppendLine(finalRenderedContactVcardInfo);
204-
finalInfoRendered.Append(Translate.DoTranslation("Press any key to close this window."));
200+
finalInfoRendered.Append(finalRenderedContactVcardInfo);
205201

206202
// Now, render the info box
207203
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), KernelColorTools.GetColor(KernelColorType.TuiBoxForeground), KernelColorTools.GetColor(KernelColorType.TuiBoxBackground));

‎public/Nitrocid.Addons/Nitrocid.Extras.RssShell/RSS/Interactive/RssReaderCli.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ internal void ShowArticleInfo(RSSArticle? item)
120120
finalInfoRendered.AppendLine(finalRenderedArticleTitle);
121121
finalInfoRendered.AppendLine(finalRenderedArticleBody);
122122
finalInfoRendered.AppendLine(finalRenderedArticleVars);
123-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
124123

125124
// Now, render the info box
126125
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), KernelColorTools.GetColor(KernelColorType.TuiBoxForeground), KernelColorTools.GetColor(KernelColorType.TuiBoxBackground));

‎public/Nitrocid/Misc/Interactives/FileManagerCli.cs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ internal void Open(FileSystemEntry? entry1, FileSystemEntry? entry2)
211211
{
212212
var finalInfoRendered = new StringBuilder();
213213
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't open file or folder") + TextTools.FormatString(": {0}", ex.Message));
214-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
215214
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
216215
}
217216
}
@@ -303,7 +302,6 @@ internal void PrintFileSystemEntry(FileSystemEntry? entry1, FileSystemEntry? ent
303302
finalInfoRendered.AppendLine(handler.InfoHandler(fullPath));
304303
}
305304
}
306-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
307305

308306
// Now, render the info box
309307
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
@@ -312,7 +310,6 @@ internal void PrintFileSystemEntry(FileSystemEntry? entry1, FileSystemEntry? ent
312310
{
313311
var finalInfoRendered = new StringBuilder();
314312
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't get file system info") + TextTools.FormatString(": {0}", ex.Message));
315-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
316313
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
317314
}
318315
}
@@ -342,7 +339,6 @@ internal void CopyFileOrDir(FileSystemEntry? entry1, FileSystemEntry? entry2)
342339
{
343340
var finalInfoRendered = new StringBuilder();
344341
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't copy file or directory") + TextTools.FormatString(": {0}", ex.Message));
345-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
346342
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
347343
}
348344
}
@@ -370,7 +366,6 @@ internal void MoveFileOrDir(FileSystemEntry? entry1, FileSystemEntry? entry2)
370366
{
371367
var finalInfoRendered = new StringBuilder();
372368
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't move file or directory") + TextTools.FormatString(": {0}", ex.Message));
373-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
374369
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
375370
}
376371
}
@@ -396,7 +391,6 @@ internal void RemoveFileOrDir(FileSystemEntry? entry1, FileSystemEntry? entry2)
396391
{
397392
var finalInfoRendered = new StringBuilder();
398393
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't remove file or directory") + TextTools.FormatString(": {0}", ex.Message));
399-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
400394
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
401395
}
402396
}
@@ -461,7 +455,6 @@ internal void CopyTo(FileSystemEntry? entry1, FileSystemEntry? entry2)
461455
{
462456
var finalInfoRendered = new StringBuilder();
463457
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't copy file or directory") + TextTools.FormatString(": {0}", ex.Message));
464-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
465458
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
466459
}
467460
}
@@ -499,7 +492,6 @@ internal void MoveTo(FileSystemEntry? entry1, FileSystemEntry? entry2)
499492
{
500493
var finalInfoRendered = new StringBuilder();
501494
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't move file or directory") + TextTools.FormatString(": {0}", ex.Message));
502-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
503495
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
504496
}
505497
}
@@ -537,7 +529,6 @@ internal void Rename(FileSystemEntry? entry1, FileSystemEntry? entry2)
537529
{
538530
var finalInfoRendered = new StringBuilder();
539531
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't move file or directory") + TextTools.FormatString(": {0}", ex.Message));
540-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
541532
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
542533
}
543534
}

‎public/Nitrocid/Misc/Interactives/FileSelectorCli.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ internal void SelectOrGoTo(FileSystemEntry? currentFileSystemEntry)
203203
{
204204
var finalInfoRendered = new StringBuilder();
205205
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't open folder or select file") + TextTools.FormatString(": {0}", ex.Message));
206-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
207206
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
208207
}
209208
}
@@ -284,7 +283,6 @@ internal void PrintFileSystemEntry(FileSystemEntry? currentFileSystemEntry)
284283
finalInfoRendered.AppendLine(handler.InfoHandler(fullPath));
285284
}
286285
}
287-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
288286

289287
// Now, render the info box
290288
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
@@ -293,7 +291,6 @@ internal void PrintFileSystemEntry(FileSystemEntry? currentFileSystemEntry)
293291
{
294292
var finalInfoRendered = new StringBuilder();
295293
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't get file system info") + TextTools.FormatString(": {0}", ex.Message));
296-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
297294
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
298295
}
299296
}
@@ -313,7 +310,6 @@ internal void RemoveFileOrDir(FileSystemEntry? currentFileSystemEntry)
313310
{
314311
var finalInfoRendered = new StringBuilder();
315312
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't remove file or directory") + TextTools.FormatString(": {0}", ex.Message));
316-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
317313
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
318314
}
319315
}
@@ -363,7 +359,6 @@ internal void CopyTo(FileSystemEntry? currentFileSystemEntry)
363359
{
364360
var finalInfoRendered = new StringBuilder();
365361
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't copy file or directory") + TextTools.FormatString(": {0}", ex.Message));
366-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
367362
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
368363
}
369364
}
@@ -398,7 +393,6 @@ internal void MoveTo(FileSystemEntry? currentFileSystemEntry)
398393
{
399394
var finalInfoRendered = new StringBuilder();
400395
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't move file or directory") + TextTools.FormatString(": {0}", ex.Message));
401-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
402396
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
403397
}
404398
}
@@ -430,7 +424,6 @@ internal void Rename(FileSystemEntry? currentFileSystemEntry)
430424
{
431425
var finalInfoRendered = new StringBuilder();
432426
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't move file or directory") + TextTools.FormatString(": {0}", ex.Message));
433-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
434427
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
435428
}
436429
}

‎public/Nitrocid/Misc/Interactives/FilesSelectorCli.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ internal void SelectOrGoTo(FileSystemEntry? currentFileSystemEntry)
212212
{
213213
var finalInfoRendered = new StringBuilder();
214214
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't open folder or select file") + TextTools.FormatString(": {0}", ex.Message));
215-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
216215
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
217216
}
218217
}
@@ -293,7 +292,6 @@ internal void PrintFileSystemEntry(FileSystemEntry? currentFileSystemEntry)
293292
finalInfoRendered.AppendLine(handler.InfoHandler(fullPath));
294293
}
295294
}
296-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
297295

298296
// Now, render the info box
299297
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
@@ -302,7 +300,6 @@ internal void PrintFileSystemEntry(FileSystemEntry? currentFileSystemEntry)
302300
{
303301
var finalInfoRendered = new StringBuilder();
304302
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't get file system info") + TextTools.FormatString(": {0}", ex.Message));
305-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
306303
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
307304
}
308305
}
@@ -322,7 +319,6 @@ internal void RemoveFileOrDir(FileSystemEntry? currentFileSystemEntry)
322319
{
323320
var finalInfoRendered = new StringBuilder();
324321
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't remove file or directory") + TextTools.FormatString(": {0}", ex.Message));
325-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
326322
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
327323
}
328324
}
@@ -372,7 +368,6 @@ internal void CopyTo(FileSystemEntry? currentFileSystemEntry)
372368
{
373369
var finalInfoRendered = new StringBuilder();
374370
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't copy file or directory") + TextTools.FormatString(": {0}", ex.Message));
375-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
376371
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
377372
}
378373
}
@@ -407,7 +402,6 @@ internal void MoveTo(FileSystemEntry? currentFileSystemEntry)
407402
{
408403
var finalInfoRendered = new StringBuilder();
409404
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't move file or directory") + TextTools.FormatString(": {0}", ex.Message));
410-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
411405
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
412406
}
413407
}
@@ -439,7 +433,6 @@ internal void Rename(FileSystemEntry? currentFileSystemEntry)
439433
{
440434
var finalInfoRendered = new StringBuilder();
441435
finalInfoRendered.AppendLine(Translate.DoTranslation("Can't move file or directory") + TextTools.FormatString(": {0}", ex.Message));
442-
finalInfoRendered.AppendLine("\n" + Translate.DoTranslation("Press any key to close this window."));
443436
InfoBoxModalColor.WriteInfoBoxModalColorBack(finalInfoRendered.ToString(), Settings.BoxForegroundColor, Settings.BoxBackgroundColor);
444437
}
445438
}

0 commit comments

Comments
 (0)