Notation fixes, disable remote until defects fixed.

Author: owenduffy

CalibrationUnit.dfm

@@ -29,14 +29,14 @@ object CalibrationForm: TCalibrationForm
     559
     360)
   PixelsPerInch = 96
-  TextHeight = 13
+  TextHeight = 15
   object Label6: TLabel
-    Left = 8
+    Left = 19
     Top = 155
-    Width = 92
-    Height = 13
+    Width = 81
+    Height = 15
     Alignment = taRightJustify
-    Caption = 'Calibration file path '
+    Caption = 'Calibration file '
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clNavy
     Font.Height = -11
@@ -121,10 +121,10 @@ object CalibrationForm: TCalibrationForm
     Visible = False
   end
   object Label2: TLabel
-    Left = 14
+    Left = 10
     Top = 123
-    Width = 43
-    Height = 13
+    Width = 47
+    Height = 15
     Alignment = taRightJustify
     Caption = 'Average '
     Font.Charset = DEFAULT_CHARSET
@@ -137,8 +137,8 @@ object CalibrationForm: TCalibrationForm
   object AverageLabel: TLabel
     Left = 159
     Top = 123
-    Width = 21
-    Height = 13
+    Width = 24
+    Height = 15
     Caption = 'XXX'
     Font.Charset = ANSI_CHARSET
     Font.Color = clWindowText
@@ -150,8 +150,8 @@ object CalibrationForm: TCalibrationForm
   object SmoothingLabel: TLabel
     Left = 350
     Top = 123
-    Width = 21
-    Height = 13
+    Width = 24
+    Height = 15
     Caption = 'XXX'
     Font.Charset = ANSI_CHARSET
     Font.Color = clWindowText
@@ -161,10 +161,10 @@ object CalibrationForm: TCalibrationForm
     ParentFont = False
   end
   object Label40: TLabel
-    Left = 195
+    Left = 186
     Top = 123
-    Width = 53
-    Height = 13
+    Width = 62
+    Height = 15
     Alignment = taRightJustify
     Caption = 'Smoothing '
     Font.Charset = ANSI_CHARSET
@@ -177,8 +177,8 @@ object CalibrationForm: TCalibrationForm
   object MedianLabel: TLabel
     Left = 528
     Top = 123
-    Width = 21
-    Height = 13
+    Width = 24
+    Height = 15
     Caption = 'XXX'
     Font.Charset = ANSI_CHARSET
     Font.Color = clWindowText
@@ -188,10 +188,10 @@ object CalibrationForm: TCalibrationForm
     ParentFont = False
   end
   object Label4: TLabel
-    Left = 389
+    Left = 385
     Top = 123
-    Width = 37
-    Height = 13
+    Width = 41
+    Height = 15
     Alignment = taRightJustify
     Caption = 'Median '
     Font.Charset = ANSI_CHARSET
@@ -357,9 +357,9 @@ object CalibrationForm: TCalibrationForm
       OnClick = ClearCalibrationButtonClick
     end
     object LoadBitBtn: TBitBtn
-      Left = 327
+      Left = 328
       Top = 0
-      Width = 109
+      Width = 110
       Height = 37
       Cursor = crHandPoint
       Hint = 'Attach 50R LOAD cal-standards onto both S11 and S21 ports'
@@ -383,7 +383,7 @@ object CalibrationForm: TCalibrationForm
     object ShortBitBtn: TBitBtn
       Left = 109
       Top = 0
-      Width = 109
+      Width = 110
       Height = 37
       Cursor = crHandPoint
       Hint = 'Attach SHORT cal-standard onto S11 port'
@@ -405,7 +405,7 @@ object CalibrationForm: TCalibrationForm
       OnMouseDown = CalButtonBitBtnMouseDown
     end
     object OpenBitBtn: TBitBtn
-      Left = 218
+      Left = 219
       Top = 0
       Width = 109
       Height = 37
@@ -429,9 +429,9 @@ object CalibrationForm: TCalibrationForm
       OnMouseDown = CalButtonBitBtnMouseDown
     end
     object ThroughBitBtn: TBitBtn
-      Left = 436
+      Left = 438
       Top = 0
-      Width = 111
+      Width = 109
       Height = 37
       Cursor = crHandPoint
       Hint = 
@@ -459,7 +459,7 @@ object CalibrationForm: TCalibrationForm
     Left = 116
     Top = 152
     Width = 394
-    Height = 21
+    Height = 23
     Anchors = [akLeft, akTop, akRight]
     ReadOnly = True
     TabOrder = 5

CommsUnit.dfm

@@ -28,38 +28,36 @@ object CommsForm: TCommsForm
     469
     397)
   PixelsPerInch = 96
-  TextHeight = 13
+  TextHeight = 15
   object Label1: TLabel
-    Left = 15
     Top = 344
-    Width = 74
-    Height = 13
+    Left = 8
+    Width = 55
+    Height = 15
     Alignment = taRightJustify
     Anchors = [akLeft, akBottom]
-    Caption = 'User command '
+    Caption = 'User cmd '
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clNavy
     Font.Height = -11
     Font.Name = 'Lucida Sans Unicode'
     Font.Style = []
     ParentFont = False
-    ExplicitTop = 437
   end
   object Label2: TLabel
-    Left = 10
+    Left = 8
     Top = 374
-    Width = 79
-    Height = 13
+    Width = 61
+    Height = 15
     Alignment = taRightJustify
     Anchors = [akLeft, akBottom]
-    Caption = 'User commands '
+    Caption = 'User cmds '
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clNavy
     Font.Height = -11
     Font.Name = 'Lucida Sans Unicode'
     Font.Style = []
     ParentFont = False
-    ExplicitTop = 467
   end
   object Memo1: TMemo
     Left = 6
@@ -136,7 +134,7 @@ object CommsForm: TCommsForm
     Left = 95
     Top = 340
     Width = 369
-    Height = 21
+    Height = 23
     Anchors = [akLeft, akRight, akBottom]
     TabOrder = 6
     OnChange = CommandEditChange
@@ -147,7 +145,7 @@ object CommsForm: TCommsForm
   object PauseCommsToggleSwitch: TToggleSwitch
     Left = 112
     Top = 8
-    Width = 98
+    Width = 106
     Height = 20
     FrameColor = clBtnFace
     StateCaptions.CaptionOn = 'Paused'
@@ -161,7 +159,7 @@ object CommsForm: TCommsForm
   object ScrollToggleSwitch: TToggleSwitch
     Left = 16
     Top = 8
-    Width = 72
+    Width = 76
     Height = 20
     FrameColor = clBtnFace
     StateCaptions.CaptionOn = 'Hold'

ScreenCapture.cpp

@@ -41,6 +41,8 @@ void __fastcall TVNAScreenCaptureForm::FormCreate(TObject *Sender)
 	m_mouse.down = false;
 	m_title = Application->Title + " " + this->Caption;
 	Caption = m_title;
+	ToggleSwitch1->State = tssOff;
+	ToggleSwitch1->Enabled = false;
 
 	this->DoubleBuffered = true;
 
@@ -71,6 +73,7 @@ void __fastcall TVNAScreenCaptureForm::FormDestroy(TObject *Sender)
 void __fastcall TVNAScreenCaptureForm::FormClose(TObject *Sender, TCloseAction &Action)
 {
 	//
+    ToggleSwitch1->State = tssOff;
 }
 
 #define ABS(x)  (((x) >= 0) ? (x) : -(x))

ScreenCapture.dfm

@@ -33,19 +33,19 @@ object VNAScreenCaptureForm: TVNAScreenCaptureForm
     334
     288)
   PixelsPerInch = 96
-  TextHeight = 13
+  TextHeight = 15
   object ActualSize: TLabel
     Left = 142
     Top = 0
-    Width = 52
-    Height = 13
+    Width = 58
+    Height = 15
     Caption = 'Actual Size'
   end
   object Remote: TLabel
     Left = 229
     Top = 0
-    Width = 37
-    Height = 13
+    Width = 41
+    Height = 15
     Caption = 'Remote'
   end
   object ActualSizeToggleSwitch: TToggleSwitch

SettingsUnit.dfm

@@ -155,9 +155,9 @@ object SettingsForm: TSettingsForm
   object Label17: TLabel
     Left = 297
     Top = 338
-    Width = 111
+    Width = 99
     Height = 15
-    Caption = 'Auto scale peak hold'
+    Caption = 'Auto scale pk hold'
     Font.Charset = ANSI_CHARSET
     Font.Color = clNavy
     Font.Height = -11

Unit1.cpp

@@ -533,7 +533,7 @@ void __fastcall TForm1::FormCreate(TObject *Sender)
 		String windows_ver = common.windowsVer;
 		String local_name  = common.localName;
 
-		common.title = Application->Title + " by OneOfEleven et al " + s + " (+OD10) ";
+		common.title = Application->Title + " by OneOfEleven et al " + s + " (+OD11) ";
 
 		this->Caption = common.title;
 		StatusBar2->Panels->Items[0]->Text = windows_ver + " " + local_name + " '" + String(common.decimalPoint()) + "'";