Commit 9ed7b99b authored by rswindell's avatar rswindell
Browse files

Improve multi-monitor support in Synchronet Control Panel by setting each

undockable form's DefaultMonitor property to dmPrimary (rather than
dmActiveForm) and save/restore the value from the registry (and export-to
import-from .ini file) allowing over-ride of default monitor for undocked
windows to be customized on a per-form basis (very advanced use).
For sysops not using undockable forms in the control panel (the vast majority),
this enhancement has no effect.
parent 05f51d03
...@@ -5,47 +5,48 @@ object ClientForm: TClientForm ...@@ -5,47 +5,48 @@ object ClientForm: TClientForm
Height = 345 Height = 345
Caption = 'Clients' Caption = 'Clients'
Color = clBtnFace Color = clBtnFace
DefaultMonitor = dmPrimary
DragKind = dkDock DragKind = dkDock
DragMode = dmAutomatic DragMode = dmAutomatic
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -13 Font.Height = -10
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Font.Style = [] Font.Style = []
OldCreateOrder = False OldCreateOrder = False
OnHide = FormHide OnHide = FormHide
PixelsPerInch = 120 PixelsPerInch = 96
TextHeight = 16 TextHeight = 13
object ListView: TListView object ListView: TListView
Left = 0 Left = 0
Top = 0 Top = 0
Width = 623 Width = 615
Height = 312 Height = 307
Align = alClient Align = alClient
Columns = < Columns = <
item item
Caption = 'Socket' Caption = 'Socket'
Width = 60 Width = 49
end end
item item
Caption = 'Protocol' Caption = 'Protocol'
Width = 65 Width = 53
end end
item item
Caption = 'User' Caption = 'User'
Width = 90 Width = 73
end end
item item
Caption = 'Address' Caption = 'Address'
Width = 100 Width = 81
end end
item item
Caption = 'Host Name' Caption = 'Host Name'
Width = 100 Width = 81
end end
item item
Caption = 'Port' Caption = 'Port'
Width = 55 Width = 45
end end
item item
AutoSize = True AutoSize = True
......
...@@ -5,26 +5,27 @@ object EventsForm: TEventsForm ...@@ -5,26 +5,27 @@ object EventsForm: TEventsForm
Height = 391 Height = 391
Caption = 'Events' Caption = 'Events'
Color = clBtnFace Color = clBtnFace
DefaultMonitor = dmPrimary
DragKind = dkDock DragKind = dkDock
DragMode = dmAutomatic DragMode = dmAutomatic
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -13 Font.Height = -10
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Font.Style = [] Font.Style = []
OldCreateOrder = False OldCreateOrder = False
OnHide = FormHide OnHide = FormHide
PixelsPerInch = 120 PixelsPerInch = 96
TextHeight = 16 TextHeight = 13
object Log: TRichEdit object Log: TRichEdit
Left = 0 Left = 0
Top = 0 Top = 0
Width = 551 Width = 543
Height = 358 Height = 353
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -14 Font.Height = -12
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Font.Style = [] Font.Style = []
HideScrollBars = False HideScrollBars = False
......
object FtpForm: TFtpForm object FtpForm: TFtpForm
Left = 446 Left = 519
Top = 759 Top = 664
Width = 525 Width = 525
Height = 150 Height = 150
Caption = 'FTP Server' Caption = 'FTP Server'
Color = clBtnFace Color = clBtnFace
DefaultMonitor = dmPrimary
DragKind = dkDock DragKind = dkDock
DragMode = dmAutomatic DragMode = dmAutomatic
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -13 Font.Height = -10
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Font.Style = [] Font.Style = []
OldCreateOrder = False OldCreateOrder = False
OnHide = FormHide OnHide = FormHide
PixelsPerInch = 120 PixelsPerInch = 96
TextHeight = 16 TextHeight = 13
object ToolBar: TToolBar object ToolBar: TToolBar
Left = 0 Left = 0
Top = 0 Top = 0
Width = 517 Width = 509
Height = 25 Height = 25
Caption = 'ToolBar' Caption = 'ToolBar'
EdgeBorders = [] EdgeBorders = []
...@@ -139,12 +140,12 @@ object FtpForm: TFtpForm ...@@ -139,12 +140,12 @@ object FtpForm: TFtpForm
object Log: TRichEdit object Log: TRichEdit
Left = 0 Left = 0
Top = 25 Top = 25
Width = 517 Width = 509
Height = 92 Height = 87
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -14 Font.Height = -12
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Font.Style = [] Font.Style = []
HideScrollBars = False HideScrollBars = False
......
...@@ -6,22 +6,23 @@ object MailForm: TMailForm ...@@ -6,22 +6,23 @@ object MailForm: TMailForm
Caption = 'Mail Server' Caption = 'Mail Server'
Color = clBtnFace Color = clBtnFace
UseDockManager = True UseDockManager = True
DefaultMonitor = dmPrimary
DragKind = dkDock DragKind = dkDock
DragMode = dmAutomatic DragMode = dmAutomatic
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -14 Font.Height = -11
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Font.Style = [] Font.Style = []
OldCreateOrder = False OldCreateOrder = False
Position = poDefault Position = poDefault
OnHide = FormHide OnHide = FormHide
PixelsPerInch = 120 PixelsPerInch = 96
TextHeight = 16 TextHeight = 13
object ToolBar: TToolBar object ToolBar: TToolBar
Left = 0 Left = 0
Top = 0 Top = 0
Width = 472 Width = 464
Height = 25 Height = 25
Caption = 'ToolBar' Caption = 'ToolBar'
EdgeBorders = [] EdgeBorders = []
...@@ -142,12 +143,12 @@ object MailForm: TMailForm ...@@ -142,12 +143,12 @@ object MailForm: TMailForm
object Log: TRichEdit object Log: TRichEdit
Left = 0 Left = 0
Top = 25 Top = 25
Width = 472 Width = 464
Height = 92 Height = 87
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -14 Font.Height = -12
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Font.Style = [] Font.Style = []
HideScrollBars = False HideScrollBars = False
......
...@@ -1810,6 +1810,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -1810,6 +1810,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
TelnetForm->Width=Registry->ReadInteger("TelnetFormWidth"); TelnetForm->Width=Registry->ReadInteger("TelnetFormWidth");
if(Registry->ValueExists("TelnetFormHeight")) if(Registry->ValueExists("TelnetFormHeight"))
TelnetForm->Height=Registry->ReadInteger("TelnetFormHeight"); TelnetForm->Height=Registry->ReadInteger("TelnetFormHeight");
if(Registry->ValueExists("TelnetFormMonitor"))
TelnetForm->DefaultMonitor=(TDefaultMonitor)Registry->ReadInteger("TelnetFormMonitor");
if(Registry->ValueExists("EventsFormTop")) if(Registry->ValueExists("EventsFormTop"))
EventsForm->Top=Registry->ReadInteger("EventsFormTop"); EventsForm->Top=Registry->ReadInteger("EventsFormTop");
...@@ -1819,6 +1821,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -1819,6 +1821,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
EventsForm->Width=Registry->ReadInteger("EventsFormWidth"); EventsForm->Width=Registry->ReadInteger("EventsFormWidth");
if(Registry->ValueExists("EventsFormHeight")) if(Registry->ValueExists("EventsFormHeight"))
EventsForm->Height=Registry->ReadInteger("EventsFormHeight"); EventsForm->Height=Registry->ReadInteger("EventsFormHeight");
if(Registry->ValueExists("EventsFormMonitor"))
EventsForm->DefaultMonitor=(TDefaultMonitor)Registry->ReadInteger("EventsFormMonitor");
if(Registry->ValueExists("ServicesFormTop")) if(Registry->ValueExists("ServicesFormTop"))
ServicesForm->Top=Registry->ReadInteger("ServicesFormTop"); ServicesForm->Top=Registry->ReadInteger("ServicesFormTop");
...@@ -1828,6 +1832,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -1828,6 +1832,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
ServicesForm->Width=Registry->ReadInteger("ServicesFormWidth"); ServicesForm->Width=Registry->ReadInteger("ServicesFormWidth");
if(Registry->ValueExists("ServicesFormHeight")) if(Registry->ValueExists("ServicesFormHeight"))
ServicesForm->Height=Registry->ReadInteger("ServicesFormHeight"); ServicesForm->Height=Registry->ReadInteger("ServicesFormHeight");
if(Registry->ValueExists("ServicesFormMonitor"))
ServicesForm->DefaultMonitor=(TDefaultMonitor)Registry->ReadInteger("ServicesFormMonitor");
if(Registry->ValueExists("FtpFormTop")) if(Registry->ValueExists("FtpFormTop"))
FtpForm->Top=Registry->ReadInteger("FtpFormTop"); FtpForm->Top=Registry->ReadInteger("FtpFormTop");
...@@ -1837,6 +1843,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -1837,6 +1843,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
FtpForm->Width=Registry->ReadInteger("FtpFormWidth"); FtpForm->Width=Registry->ReadInteger("FtpFormWidth");
if(Registry->ValueExists("FtpFormHeight")) if(Registry->ValueExists("FtpFormHeight"))
FtpForm->Height=Registry->ReadInteger("FtpFormHeight"); FtpForm->Height=Registry->ReadInteger("FtpFormHeight");
if(Registry->ValueExists("FtpFormMonitor"))
FtpForm->DefaultMonitor=(TDefaultMonitor)Registry->ReadInteger("FtpFormMonitor");
if(Registry->ValueExists("WebFormTop")) if(Registry->ValueExists("WebFormTop"))
WebForm->Top=Registry->ReadInteger("WebFormTop"); WebForm->Top=Registry->ReadInteger("WebFormTop");
...@@ -1846,6 +1854,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -1846,6 +1854,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
WebForm->Width=Registry->ReadInteger("WebFormWidth"); WebForm->Width=Registry->ReadInteger("WebFormWidth");
if(Registry->ValueExists("WebFormHeight")) if(Registry->ValueExists("WebFormHeight"))
WebForm->Height=Registry->ReadInteger("WebFormHeight"); WebForm->Height=Registry->ReadInteger("WebFormHeight");
if(Registry->ValueExists("WebFormMonitor"))
WebForm->DefaultMonitor=(TDefaultMonitor)Registry->ReadInteger("WebFormMonitor");
if(Registry->ValueExists("MailFormTop")) if(Registry->ValueExists("MailFormTop"))
MailForm->Top=Registry->ReadInteger("MailFormTop"); MailForm->Top=Registry->ReadInteger("MailFormTop");
...@@ -1855,6 +1865,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -1855,6 +1865,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
MailForm->Width=Registry->ReadInteger("MailFormWidth"); MailForm->Width=Registry->ReadInteger("MailFormWidth");
if(Registry->ValueExists("MailFormHeight")) if(Registry->ValueExists("MailFormHeight"))
MailForm->Height=Registry->ReadInteger("MailFormHeight"); MailForm->Height=Registry->ReadInteger("MailFormHeight");
if(Registry->ValueExists("MailFormMonitor"))
MailForm->DefaultMonitor=(TDefaultMonitor)Registry->ReadInteger("MailFormMonitor");
if(Registry->ValueExists("NodeFormTop")) if(Registry->ValueExists("NodeFormTop"))
NodeForm->Top=Registry->ReadInteger("NodeFormTop"); NodeForm->Top=Registry->ReadInteger("NodeFormTop");
...@@ -1864,6 +1876,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -1864,6 +1876,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
NodeForm->Width=Registry->ReadInteger("NodeFormWidth"); NodeForm->Width=Registry->ReadInteger("NodeFormWidth");
if(Registry->ValueExists("NodeFormHeight")) if(Registry->ValueExists("NodeFormHeight"))
NodeForm->Height=Registry->ReadInteger("NodeFormHeight"); NodeForm->Height=Registry->ReadInteger("NodeFormHeight");
if(Registry->ValueExists("NodeFormMonitor"))
NodeForm->DefaultMonitor=(TDefaultMonitor)Registry->ReadInteger("NodeFormMonitor");
if(Registry->ValueExists("StatsFormTop")) if(Registry->ValueExists("StatsFormTop"))
StatsForm->Top=Registry->ReadInteger("StatsFormTop"); StatsForm->Top=Registry->ReadInteger("StatsFormTop");
...@@ -1873,6 +1887,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -1873,6 +1887,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
StatsForm->Width=Registry->ReadInteger("StatsFormWidth"); StatsForm->Width=Registry->ReadInteger("StatsFormWidth");
if(Registry->ValueExists("StatsFormHeight")) if(Registry->ValueExists("StatsFormHeight"))
StatsForm->Height=Registry->ReadInteger("StatsFormHeight"); StatsForm->Height=Registry->ReadInteger("StatsFormHeight");
if(Registry->ValueExists("StatsFormMonitor"))
StatsForm->DefaultMonitor=(TDefaultMonitor)Registry->ReadInteger("StatsFormMonitor");
if(Registry->ValueExists("ClientFormTop")) if(Registry->ValueExists("ClientFormTop"))
ClientForm->Top=Registry->ReadInteger("ClientFormTop"); ClientForm->Top=Registry->ReadInteger("ClientFormTop");
...@@ -1882,6 +1898,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -1882,6 +1898,8 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
ClientForm->Width=Registry->ReadInteger("ClientFormWidth"); ClientForm->Width=Registry->ReadInteger("ClientFormWidth");
if(Registry->ValueExists("ClientFormHeight")) if(Registry->ValueExists("ClientFormHeight"))
ClientForm->Height=Registry->ReadInteger("ClientFormHeight"); ClientForm->Height=Registry->ReadInteger("ClientFormHeight");
if(Registry->ValueExists("ClientFormMonitor"))
ClientForm->DefaultMonitor=(TDefaultMonitor)Registry->ReadInteger("ClientFormMonitor");
for(int i=0;i<ClientForm->ListView->Columns->Count;i++) { for(int i=0;i<ClientForm->ListView->Columns->Count;i++) {
char str[128]; char str[128];
...@@ -2366,16 +2384,19 @@ void __fastcall TMainForm::SaveRegistrySettings(TObject* Sender) ...@@ -2366,16 +2384,19 @@ void __fastcall TMainForm::SaveRegistrySettings(TObject* Sender)
Registry->WriteInteger("NodeFormLeft",NodeForm->Left); Registry->WriteInteger("NodeFormLeft",NodeForm->Left);
Registry->WriteInteger("NodeFormHeight",NodeForm->Height); Registry->WriteInteger("NodeFormHeight",NodeForm->Height);
Registry->WriteInteger("NodeFormWidth",NodeForm->Width); Registry->WriteInteger("NodeFormWidth",NodeForm->Width);
Registry->WriteInteger("NodeFormMonitor",NodeForm->DefaultMonitor);
Registry->WriteInteger("StatsFormTop",StatsForm->Top); Registry->WriteInteger("StatsFormTop",StatsForm->Top);
Registry->WriteInteger("StatsFormLeft",StatsForm->Left); Registry->WriteInteger("StatsFormLeft",StatsForm->Left);
Registry->WriteInteger("StatsFormHeight",StatsForm->Height); Registry->WriteInteger("StatsFormHeight",StatsForm->Height);
Registry->WriteInteger("StatsFormWidth",StatsForm->Width); Registry->WriteInteger("StatsFormWidth",StatsForm->Width);
Registry->WriteInteger("StatsFormMonitor",StatsForm->DefaultMonitor);
Registry->WriteInteger("ClientFormTop",ClientForm->Top); Registry->WriteInteger("ClientFormTop",ClientForm->Top);
Registry->WriteInteger("ClientFormLeft",ClientForm->Left); Registry->WriteInteger("ClientFormLeft",ClientForm->Left);
Registry->WriteInteger("ClientFormHeight",ClientForm->Height); Registry->WriteInteger("ClientFormHeight",ClientForm->Height);
Registry->WriteInteger("ClientFormWidth",ClientForm->Width); Registry->WriteInteger("ClientFormWidth",ClientForm->Width);
Registry->WriteInteger("ClientFormMonitor",ClientForm->DefaultMonitor);
for(int i=0;i<ClientForm->ListView->Columns->Count;i++) { for(int i=0;i<ClientForm->ListView->Columns->Count;i++) {
char str[128]; char str[128];
...@@ -2388,31 +2409,37 @@ void __fastcall TMainForm::SaveRegistrySettings(TObject* Sender) ...@@ -2388,31 +2409,37 @@ void __fastcall TMainForm::SaveRegistrySettings(TObject* Sender)
Registry->WriteInteger("TelnetFormLeft",TelnetForm->Left); Registry->WriteInteger("TelnetFormLeft",TelnetForm->Left);
Registry->WriteInteger("TelnetFormHeight",TelnetForm->Height); Registry->WriteInteger("TelnetFormHeight",TelnetForm->Height);
Registry->WriteInteger("TelnetFormWidth",TelnetForm->Width); Registry->WriteInteger("TelnetFormWidth",TelnetForm->Width);
Registry->WriteInteger("TelnetFormMonitor",TelnetForm->DefaultMonitor);
Registry->WriteInteger("EventsFormTop",EventsForm->Top); Registry->WriteInteger("EventsFormTop",EventsForm->Top);
Registry->WriteInteger("EventsFormLeft",EventsForm->Left); Registry->WriteInteger("EventsFormLeft",EventsForm->Left);
Registry->WriteInteger("EventsFormHeight",EventsForm->Height); Registry->WriteInteger("EventsFormHeight",EventsForm->Height);
Registry->WriteInteger("EventsFormWidth",EventsForm->Width); Registry->WriteInteger("EventsFormWidth",EventsForm->Width);
Registry->WriteInteger("EventsFormMonitor",EventsForm->DefaultMonitor);
Registry->WriteInteger("ServicesFormTop",ServicesForm->Top); Registry->WriteInteger("ServicesFormTop",ServicesForm->Top);
Registry->WriteInteger("ServicesFormLeft",ServicesForm->Left); Registry->WriteInteger("ServicesFormLeft",ServicesForm->Left);
Registry->WriteInteger("ServicesFormHeight",ServicesForm->Height); Registry->WriteInteger("ServicesFormHeight",ServicesForm->Height);
Registry->WriteInteger("ServicesFormWidth",ServicesForm->Width); Registry->WriteInteger("ServicesFormWidth",ServicesForm->Width);
Registry->WriteInteger("ServicesFormMonitor",ServicesForm->DefaultMonitor);
Registry->WriteInteger("FtpFormTop",FtpForm->Top); Registry->WriteInteger("FtpFormTop",FtpForm->Top);
Registry->WriteInteger("FtpFormLeft",FtpForm->Left); Registry->WriteInteger("FtpFormLeft",FtpForm->Left);
Registry->WriteInteger("FtpFormHeight",FtpForm->Height); Registry->WriteInteger("FtpFormHeight",FtpForm->Height);
Registry->WriteInteger("FtpFormWidth",FtpForm->Width); Registry->WriteInteger("FtpFormWidth",FtpForm->Width);
Registry->WriteInteger("FtpFormMonitor",FtpForm->DefaultMonitor);
Registry->WriteInteger("WebFormTop",WebForm->Top); Registry->WriteInteger("WebFormTop",WebForm->Top);
Registry->WriteInteger("WebFormLeft",WebForm->Left); Registry->WriteInteger("WebFormLeft",WebForm->Left);
Registry->WriteInteger("WebFormHeight",WebForm->Height); Registry->WriteInteger("WebFormHeight",WebForm->Height);
Registry->WriteInteger("WebFormWidth",WebForm->Width); Registry->WriteInteger("WebFormWidth",WebForm->Width);
Registry->WriteInteger("WebFormMonitor",WebForm->DefaultMonitor);
Registry->WriteInteger("MailFormTop",MailForm->Top); Registry->WriteInteger("MailFormTop",MailForm->Top);
Registry->WriteInteger("MailFormLeft",MailForm->Left); Registry->WriteInteger("MailFormLeft",MailForm->Left);
Registry->WriteInteger("MailFormHeight",MailForm->Height); Registry->WriteInteger("MailFormHeight",MailForm->Height);
Registry->WriteInteger("MailFormWidth",MailForm->Width); Registry->WriteInteger("MailFormWidth",MailForm->Width);
Registry->WriteInteger("MailFormMonitor",MailForm->DefaultMonitor);
Registry->WriteInteger("TopPanelHeight",TopPanel->Height); Registry->WriteInteger("TopPanelHeight",TopPanel->Height);
Registry->WriteInteger("UpperLeftPageControlWidth" Registry->WriteInteger("UpperLeftPageControlWidth"
...@@ -2563,6 +2590,7 @@ void __fastcall TMainForm::ImportFormSettings(TMemIniFile* IniFile, const char* ...@@ -2563,6 +2590,7 @@ void __fastcall TMainForm::ImportFormSettings(TMemIniFile* IniFile, const char*
Form->Left=IniFile->ReadInteger(section,"Left",Form->Left); Form->Left=IniFile->ReadInteger(section,"Left",Form->Left);
Form->Width=IniFile->ReadInteger(section,"Width",Form->Width); Form->Width=IniFile->ReadInteger(section,"Width",Form->Width);
Form->Height=IniFile->ReadInteger(section,"Height",Form->Height); Form->Height=IniFile->ReadInteger(section,"Height",Form->Height);
Form->DefaultMonitor=(TDefaultMonitor)IniFile->ReadInteger(section,"Monitor",Form->DefaultMonitor);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TMainForm::ExportFormSettings(TMemIniFile* IniFile, const char* section, TForm* Form) void __fastcall TMainForm::ExportFormSettings(TMemIniFile* IniFile, const char* section, TForm* Form)
...@@ -2573,6 +2601,7 @@ void __fastcall TMainForm::ExportFormSettings(TMemIniFile* IniFile, const char* ...@@ -2573,6 +2601,7 @@ void __fastcall TMainForm::ExportFormSettings(TMemIniFile* IniFile, const char*
IniFile->WriteInteger(section,"Height",Form->Height); IniFile->WriteInteger(section,"Height",Form->Height);
IniFile->WriteInteger(section,"Page",PageNum((TPageControl*)Form->HostDockSite)); IniFile->WriteInteger(section,"Page",PageNum((TPageControl*)Form->HostDockSite));
IniFile->WriteBool(section,"Floating",Form->Floating); IniFile->WriteBool(section,"Floating",Form->Floating);
IniFile->WriteInteger(section,"Monitor",Form->DefaultMonitor);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TMainForm::ImportFont(TMemIniFile* IniFile, const char* section, AnsiString prefix, TFont* Font) void __fastcall TMainForm::ImportFont(TMemIniFile* IniFile, const char* section, AnsiString prefix, TFont* Font)
......
...@@ -13498,7 +13498,7 @@ object MainForm: TMainForm ...@@ -13498,7 +13498,7 @@ object MainForm: TMainForm
object TopPanel: TPanel object TopPanel: TPanel
Left = 0 Left = 0
Top = 30 Top = 30
Width = 632 Width = 624
Height = 134 Height = 134
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
...@@ -13528,7 +13528,7 @@ object MainForm: TMainForm ...@@ -13528,7 +13528,7 @@ object MainForm: TMainForm
object UpperRightPageControl: TPageControl object UpperRightPageControl: TPageControl
Left = 237 Left = 237
Top = 0 Top = 0
Width = 395 Width = 387
Height = 134 Height = 134
Align = alClient Align = alClient
DockSite = True DockSite = True
...@@ -13540,8 +13540,8 @@ object MainForm: TMainForm ...@@ -13540,8 +13540,8 @@ object MainForm: TMainForm
object BottomPanel: TPanel object BottomPanel: TPanel
Left = 0 Left = 0
Top = 165 Top = 165
Width = 632 Width = 624
Height = 164 Height = 152
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
TabOrder = 2 TabOrder = 2
...@@ -13550,7 +13550,7 @@ object MainForm: TMainForm ...@@ -13550,7 +13550,7 @@ object MainForm: TMainForm
Left = 235 Left = 235
Top = 0 Top = 0
Width = 2 Width = 2
Height = 164 Height = 152
Cursor = crHSplit Cursor = crHSplit
MinSize = 1 MinSize = 1
end end
...@@ -13558,7 +13558,7 @@ object MainForm: TMainForm ...@@ -13558,7 +13558,7 @@ object MainForm: TMainForm
Left = 0 Left = 0
Top = 0 Top = 0
Width = 235 Width = 235
Height = 164 Height = 152
Align = alLeft Align = alLeft
DockSite = True DockSite = True
TabOrder = 0 TabOrder = 0
...@@ -13568,8 +13568,8 @@ object MainForm: TMainForm ...@@ -13568,8 +13568,8 @@ object MainForm: TMainForm
object LowerRightPageControl: TPageControl object LowerRightPageControl: TPageControl
Left = 237 Left = 237
Top = 0 Top = 0
Width = 395 Width = 387
Height = 164 Height = 152
Align = alClient Align = alClient
DockSite = True DockSite = True
TabOrder = 1 TabOrder = 1
...@@ -13579,8 +13579,8 @@ object MainForm: TMainForm ...@@ -13579,8 +13579,8 @@ object MainForm: TMainForm
end end
object StatusBar: TStatusBar object StatusBar: TStatusBar
Left = 0 Left = 0
Top = 329 Top = 317
Width = 632 Width = 624
Height = 25 Height = 25
Panels = < Panels = <
item item
...@@ -6,22 +6,23 @@ object NodeForm: TNodeForm