From 90552c453efc5e6a09ff6111ead432be72bd2e14 Mon Sep 17 00:00:00 2001
From: mysticbbs <mysticbbs@gmail.com>
Date: Mon, 6 Aug 2012 01:54:35 -0400
Subject: [PATCH] Msg/File scan settings now show in one column just like the
 message/file base selection (if configured)

---
 mystic/HISTORY.txt      | 6 ++++++
 mystic/bbs_filebase.pas | 4 ++--
 mystic/bbs_msgbase.pas  | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mystic/HISTORY.txt b/mystic/HISTORY.txt
index c0e63f9..2575d84 100644
--- a/mystic/HISTORY.txt
+++ b/mystic/HISTORY.txt
@@ -4515,3 +4515,9 @@
    Since the space key may need to be used in a search string, the hotkey
    used to mark items in a listbox has changed from the SPACE key to the TAB
    key.
+
+ + If Message base list columns is set to 1, the toggle newscan and qwkscan
+   message base lists will also now be 1 column.
+
+ + If file base list columns is set to 1, the toggle new scan list will now
+   also be shown in a single list.
diff --git a/mystic/bbs_filebase.pas b/mystic/bbs_filebase.pas
index 9b27c9a..cd72475 100644
--- a/mystic/bbs_filebase.pas
+++ b/mystic/bbs_filebase.pas
@@ -793,10 +793,10 @@ Var
         Session.io.PromptInfo[3] := Session.io.OutYN(FScan.NewScan > 0);
         Session.io.OutFull (Session.GetPrompt(201));
 
-        If (Total MOD 2 = 0) And (Total > 0) Then Session.io.OutRawLn('');
+        If (Total MOD Config.FColumns = 0) And (Total > 0) Then Session.io.OutRawLn('');
       End;
 
-      If EOF(FBaseFile) and (Total MOD 2 <> 0) Then Session.io.OutRawLn('');
+      If EOF(FBaseFile) and (Config.FColumns MOD 2 <> 0) Then Session.io.OutRawLn('');
 
       If (Session.io.PausePtr = Session.User.ThisUser.ScreenSize) and (Session.io.AllowPause) Then
         Case Session.io.MorePrompt of
diff --git a/mystic/bbs_msgbase.pas b/mystic/bbs_msgbase.pas
index 8e6df94..df7816e 100644
--- a/mystic/bbs_msgbase.pas
+++ b/mystic/bbs_msgbase.pas
@@ -515,10 +515,10 @@ Var
 
         Session.io.OutFull (Session.GetPrompt(93));
 
-        If (Total MOD 2 = 0) And (Total > 0) Then Session.io.OutRawLn('');
+        If (Total MOD Config.MColumns = 0) And (Total > 0) Then Session.io.OutRawLn('');
       End;
 
-      If EOF(MBaseFile) and (Total MOD 2 <> 0) Then Session.io.OutRawLn('');
+      If EOF(MBaseFile) and (Total MOD Config.MColumns <> 0) Then Session.io.OutRawLn('');
 
       If (Session.io.PausePtr = Session.User.ThisUser.ScreenSize) and (Session.io.AllowPause) Then
         Case Session.io.MorePrompt of