Skip to content

GitLab

Commit e2c62df4 authored by rswindell's avatar rswindell
Browse files

Eliminate FormShow event and MainForm class member (not needed).

parent 8dbe153e
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 133 deletions
src/sbbs3/ctrl/ClientFormUnit.cpp
View file @ e2c62df4
......@@ -6,7 +6,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
* Copyright 2000 Rob Swindell - http://www.synchro.net/copyright.html *
* Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
......@@ -56,11 +56,6 @@ __fastcall TClientForm::TClientForm(TComponent* Owner)
ListMutex=CreateMutex(NULL,false,NULL);
}
//---------------------------------------------------------------------------
void __fastcall TClientForm::FormShow(TObject *Sender)
{
MainForm->ViewClients->Checked=true;
}
//---------------------------------------------------------------------------
void __fastcall TClientForm::FormHide(TObject *Sender)
{
MainForm->ViewClients->Checked=false;
......
src/sbbs3/ctrl/ClientFormUnit.dfm
View file @ e2c62df4
......@@ -14,14 +14,13 @@ object ClientForm: TClientForm
Font.Style = []
OldCreateOrder = False
OnHide = FormHide
OnShow = FormShow
PixelsPerInch = 120
TextHeight = 16
object ListView: TListView
Left = 0
Top = 0
Width = 623
Height = 317
Height = 312
Align = alClient
Columns = <
item
......
src/sbbs3/ctrl/ClientFormUnit.h
View file @ e2c62df4
......@@ -6,7 +6,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
* Copyright 2000 Rob Swindell - http://www.synchro.net/copyright.html *
* Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
......@@ -55,7 +55,6 @@ __published: // IDE-managed Components
TPopupMenu *PopupMenu;
TMenuItem *CloseSocketMenuItem;
TMenuItem *FilterIpMenuItem;
void __fastcall FormShow(TObject *Sender);
void __fastcall FormHide(TObject *Sender);
void __fastcall TimerTimer(TObject *Sender);
void __fastcall CloseSocketMenuItemClick(TObject *Sender);
......@@ -63,7 +62,6 @@ __published: // IDE-managed Components
private: // User declarations
public: // User declarations
__fastcall TClientForm(TComponent* Owner);
TMainForm* MainForm;
HANDLE ListMutex;
};
//---------------------------------------------------------------------------
......
src/sbbs3/ctrl/EventsFormUnit.cpp
View file @ e2c62df4
......@@ -6,7 +6,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
* Copyright 2000 Rob Swindell - http://www.synchro.net/copyright.html *
* Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
......@@ -47,16 +47,10 @@ TEventsForm *EventsForm;
__fastcall TEventsForm::TEventsForm(TComponent* Owner)
: TForm(Owner)
{
}
//---------------------------------------------------------------------------
void __fastcall TEventsForm::FormShow(TObject *Sender)
{
MainForm->ViewEventsMenuItem->Checked=true;
}
//---------------------------------------------------------------------------
void __fastcall TEventsForm::FormHide(TObject *Sender)
{
MainForm->ViewEventsMenuItem->Checked=false;
MainForm->ViewEvents->Checked=false;
}
//---------------------------------------------------------------------------
src/sbbs3/ctrl/EventsFormUnit.dfm
View file @ e2c62df4
......@@ -14,14 +14,13 @@ object EventsForm: TEventsForm
Font.Style = []
OldCreateOrder = False
OnHide = FormHide
OnShow = FormShow
PixelsPerInch = 120
TextHeight = 16
object Log: TMemo
Left = 0
Top = 0
Width = 551
Height = 359
Height = 358
Align = alClient
ReadOnly = True
ScrollBars = ssBoth
......
src/sbbs3/ctrl/EventsFormUnit.h
View file @ e2c62df4
......@@ -47,7 +47,6 @@ class TEventsForm : public TForm
{
__published: // IDE-managed Components
TMemo *Log;
void __fastcall FormShow(TObject *Sender);
void __fastcall FormHide(TObject *Sender);
private: // User declarations
public: // User declarations
......
src/sbbs3/ctrl/FtpFormUnit.cpp
View file @ e2c62df4
......@@ -6,7 +6,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
* Copyright 2000 Rob Swindell - http://www.synchro.net/copyright.html *
* Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
......@@ -46,21 +46,12 @@ TFtpForm *FtpForm;
__fastcall TFtpForm::TFtpForm(TComponent* Owner)
: TForm(Owner)
{
MainForm=(TMainForm*)Application->MainForm;
// ManualDock(MainForm->Panel, MainForm->Panel, alClient);
}
//---------------------------------------------------------------------------
void __fastcall TFtpForm::FormShow(TObject *Sender)
{
MainForm->ViewFtpServerMenuItem->Checked=true;
MainForm->ViewFtpServerButton->Down=true;
}
//---------------------------------------------------------------------------
void __fastcall TFtpForm::FormHide(TObject *Sender)
{
MainForm->ViewFtpServerMenuItem->Checked=false;
MainForm->ViewFtpServerButton->Down=false;
MainForm->ViewFtpServer->Checked=false;
}
//---------------------------------------------------------------------------
......
src/sbbs3/ctrl/FtpFormUnit.dfm
View file @ e2c62df4
object FtpForm: TFtpForm
Left = 475
Top = 427
Left = 856
Top = 689
Width = 350
Height = 150
Caption = 'FTP Server'
......@@ -14,7 +14,6 @@ object FtpForm: TFtpForm
Font.Style = []
OldCreateOrder = False
OnHide = FormHide
OnShow = FormShow
PixelsPerInch = 120
TextHeight = 16
object ToolBar: TToolBar
......
src/sbbs3/ctrl/FtpFormUnit.h
View file @ e2c62df4
......@@ -6,7 +6,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
* Copyright 2000 Rob Swindell - http://www.synchro.net/copyright.html *
* Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
......@@ -61,12 +61,10 @@ __published: // IDE-managed Components
TProgressBar *ProgressBar;
TMemo *Log;
TToolButton *RecycleButton;
void __fastcall FormShow(TObject *Sender);
void __fastcall FormHide(TObject *Sender);
private: // User declarations
public: // User declarations
__fastcall TFtpForm(TComponent* Owner);
TMainForm* MainForm;
};
//---------------------------------------------------------------------------
extern PACKAGE TFtpForm *FtpForm;
......
src/sbbs3/ctrl/MailFormUnit.cpp
View file @ e2c62df4
......@@ -6,7 +6,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
* Copyright 2000 Rob Swindell - http://www.synchro.net/copyright.html *
* Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
......@@ -46,21 +46,11 @@ TMailForm *MailForm;
__fastcall TMailForm::TMailForm(TComponent* Owner)
: TForm(Owner)
{
MainForm=(TMainForm*)Application->MainForm;
// ManualDock(MainForm->Panel, MainForm->Panel, alClient);
}
//---------------------------------------------------------------------------
void __fastcall TMailForm::FormShow(TObject *Sender)
{
MainForm->ViewMailServerMenuItem->Checked=true;
MainForm->ViewMailServerButton->Down=true;
}
//---------------------------------------------------------------------------
void __fastcall TMailForm::FormHide(TObject *Sender)
{
MainForm->ViewMailServerMenuItem->Checked=false;
MainForm->ViewMailServerButton->Down=false;
MainForm->ViewMailServer->Checked=false;
}
//---------------------------------------------------------------------------
......
src/sbbs3/ctrl/MailFormUnit.dfm
View file @ e2c62df4
......@@ -16,7 +16,6 @@ object MailForm: TMailForm
OldCreateOrder = False
Position = poDefault
OnHide = FormHide
OnShow = FormShow
PixelsPerInch = 120
TextHeight = 16
object ToolBar: TToolBar
......
src/sbbs3/ctrl/MailFormUnit.h
View file @ e2c62df4
......@@ -6,7 +6,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
* Copyright 2000 Rob Swindell - http://www.synchro.net/copyright.html *
* Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
......@@ -61,12 +61,10 @@ __published: // IDE-managed Components
TProgressBar *ProgressBar;
TMemo *Log;
TToolButton *RecycleButton;
void __fastcall FormShow(TObject *Sender);
void __fastcall FormHide(TObject *Sender);
private: // User declarations
public: // User declarations
__fastcall TMailForm(TComponent* Owner);
TMainForm* MainForm;
};
//---------------------------------------------------------------------------
extern PACKAGE TMailForm *MailForm;
......
src/sbbs3/ctrl/MainFormUnit.cpp
View file @ e2c62df4
......@@ -967,8 +967,7 @@ void __fastcall TMainForm::FormShow(TObject *Sender)
void __fastcall TMainForm::ViewToolbarMenuItemClick(TObject *Sender)
{
Toolbar->Visible=!ViewToolbarMenuItem->Checked;
ViewToolbarMenuItem->Checked=Toolbar->Visible;
Toolbar->Visible=ViewToolbarMenuItem->Checked;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::FormClose(TObject *Sender, TCloseAction &Action)
......@@ -1194,41 +1193,50 @@ void __fastcall TMainForm::MailStopExecute(TObject *Sender)
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewTelnetExecute(TObject *Sender)
{
TelnetForm->Visible=!TelnetForm->Visible;
ViewTelnet->Checked=TelnetForm->Visible;
TelnetForm->Visible=ViewTelnet->Checked;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewEventsExecute(TObject *Sender)
{
EventsForm->Visible=!EventsForm->Visible;
ViewEvents->Checked=EventsForm->Visible;
EventsForm->Visible=ViewEvents->Checked;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewNodesExecute(TObject *Sender)
{
NodeForm->Visible=!NodeForm->Visible;
ViewNodes->Checked=NodeForm->Visible;
NodeForm->Visible=ViewNodes->Checked;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewMailServerExecute(TObject *Sender)
{
MailForm->Visible=!MailForm->Visible;
ViewMailServer->Checked=MailForm->Visible;
MailForm->Visible=ViewMailServer->Checked;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewFtpServerExecute(TObject *Sender)
{
FtpForm->Visible=!FtpForm->Visible;
ViewFtpServer->Checked=FtpForm->Visible;
FtpForm->Visible=ViewFtpServer->Checked;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewWebServerExecute(TObject *Sender)
{
WebForm->Visible=!WebForm->Visible;
ViewWebServer->Checked=WebForm->Visible;
WebForm->Visible=ViewWebServer->Checked;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewServicesExecute(TObject *Sender)
{
ServicesForm->Visible=ViewServices->Checked;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewStatsExecute(TObject *Sender)
{
StatsForm->Visible=ViewStats->Checked;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewClientsExecute(TObject *Sender)
{
ClientForm->Visible=ViewClients->Checked;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::FtpStartExecute(TObject *Sender)
......@@ -1393,14 +1401,6 @@ void __fastcall TMainForm::StatsTimerTick(TObject *Sender)
counter++;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewStatsExecute(TObject *Sender)
{
StatsForm->Visible=!StatsForm->Visible;
ViewStats->Checked=StatsForm->Visible;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::StatsCloseButtonClick(TObject *Sender)
{
ViewStatsExecute(Sender);
......@@ -1525,8 +1525,18 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
int EventsFormPage=PAGE_LOWERLEFT;
int MailFormPage=PAGE_UPPERRIGHT;
int FtpFormPage=PAGE_LOWERRIGHT;
int WebFormPage=PAGE_LOWERRIGHT;
int WebFormPage=PAGE_LOWERRIGHT;
int ServicesFormPage=PAGE_LOWERRIGHT;
bool TelnetFormVisible=true;
bool EventsFormVisible=true;
bool ServicesFormVisible=true;
bool NodeFormVisible=true;
bool StatsFormVisible=true;
bool ClientFormVisible=true;
bool MailFormVisible=true;
bool FtpFormVisible=true;
bool WebFormVisible=true;
AnsiString Str;
......@@ -1577,6 +1587,25 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
WebFormFloating=Registry->ReadBool("WebFormFloating");
}
if(Registry->ValueExists("TelnetFormVisible"))
TelnetFormVisible=Registry->ReadBool("TelnetFormVisible");
if(Registry->ValueExists("EventsFormVisible"))
EventsFormVisible=Registry->ReadBool("EventsFormVisible");
if(Registry->ValueExists("ServicesFormVisible"))
ServicesFormVisible=Registry->ReadBool("ServicesFormVisible");
if(Registry->ValueExists("NodeFormVisible"))
NodeFormVisible=Registry->ReadBool("NodeFormVisible");
if(Registry->ValueExists("StatsFormVisible"))
StatsFormVisible=Registry->ReadBool("StatsFormVisible");
if(Registry->ValueExists("ClientFormVisible"))
ClientFormVisible=Registry->ReadBool("ClientFormVisible");
if(Registry->ValueExists("MailFormVisible"))
MailFormVisible=Registry->ReadBool("MailFormVisible");
if(Registry->ValueExists("FtpFormVisible"))
FtpFormVisible=Registry->ReadBool("FtpFormVisible");
if(Registry->ValueExists("WebFormVisible"))
WebFormVisible=Registry->ReadBool("WebFormVisible");
if(Registry->ValueExists("TelnetFormPage"))
TelnetFormPage=Registry->ReadInteger("TelnetFormPage");
if(Registry->ValueExists("EventsFormPage"))
......@@ -2062,14 +2091,24 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
WebForm->ManualDock(PageControl(WebFormPage),NULL,alClient);
NodeForm->Show();
// ViewNodes->Checked=NodeFormVisible, ViewNodesExecute(Sender);
ClientForm->Show();
// ViewClients->Checked=ClientFormVisible, ViewClientsExecute(Sender);
StatsForm->Show();
// ViewStats->Checked=StatsFormVisible, ViewStatsExecute(Sender);
TelnetForm->Show();
// ViewTelnet->Checked=TelnetFormVisible, ViewTelnetExecute(Sender);
EventsForm->Show();
// ViewEvents->Checked=EventsFormVisible, ViewEventsExecute(Sender);
FtpForm->Show();
// ViewFtpServer->Checked=FtpFormVisible, ViewFtpServerExecute(Sender);
WebForm->Show();
ServicesForm->Show();
// ViewWebServer->Checked=WebFormVisible;
// WebForm->Visible=ViewWebServer->Checked;
MailForm->Show();
// ViewMailServer->Checked=MailFormVisible,ViewMailServerExecute(Sender);
ServicesForm->Show();
// ViewServices->Checked=ServicesFormVisible,ViewServicesExecute(Sender);
UpperLeftPageControl->Visible=true;
UpperRightPageControl->Visible=true;
......@@ -2217,6 +2256,16 @@ void __fastcall TMainForm::SaveSettings(TObject* Sender)
Registry->WriteBool("WebFormFloating",WebForm->Floating);
Registry->WriteBool("MailFormFloating",MailForm->Floating);
Registry->WriteBool("TelnetFormVisible",TelnetForm->Visible);
Registry->WriteBool("EventsFormVisible",EventsForm->Visible);
Registry->WriteBool("ServicesFormVisible",ServicesForm->Visible);
Registry->WriteBool("NodeFormVisible",NodeForm->Visible);
Registry->WriteBool("StatsFormVisible",StatsForm->Visible);
Registry->WriteBool("ClientFormVisible",ClientForm->Visible);
Registry->WriteBool("FtpFormVisible",FtpForm->Visible);
Registry->WriteBool("WebFormVisible",WebForm->Visible);
Registry->WriteBool("MailFormVisible",MailForm->Visible);
Registry->WriteInteger("TelnetFormPage"
,PageNum((TPageControl*)TelnetForm->HostDockSite));
Registry->WriteInteger("EventsFormPage"
......@@ -3070,15 +3119,6 @@ void __fastcall TMainForm::ChatToggleExecute(TObject *Sender)
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::ViewClientsExecute(TObject *Sender)
{
ClientForm->Visible=!ClientForm->Visible;
ViewClients->Checked=ClientForm->Visible;
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::UserEditExecute(TObject *Sender)
{
char str[256];
......@@ -3736,4 +3776,3 @@ void __fastcall TMainForm::ViewFile(AnsiString filename, AnsiString Caption)
}
//---------------------------------------------------------------------------
src/sbbs3/ctrl/MainFormUnit.dfm
View file @ e2c62df4
......@@ -2571,6 +2571,32 @@ object MainForm: TMainForm
end
end
end
object WebMenuItem: TMenuItem
Caption = '&Web'
object Configure1: TMenuItem
Action = WebConfigure
end
object Start1: TMenuItem
Action = WebStart
end
object Stop1: TMenuItem
Action = WebStop
end
object Recycle4: TMenuItem
Action = WebRecycle
end
object N11: TMenuItem
Caption = '-'
end
object WebEditMenuItem: TMenuItem
Caption = 'Edit'
object WebEditMimeTypesMenuItem: TMenuItem
Caption = 'MIME Types'
Hint = 'mime_types.cfg'
OnClick = CtrlMenuItemEditClick
end
end
end
object ServicesMenuItem: TMenuItem
Caption = 'Services'
object ServicesConfigureMenuItem: TMenuItem
......@@ -2585,34 +2611,57 @@ object MainForm: TMainForm
object Recycle3: TMenuItem
Action = ServicesRecycle
end
object N12: TMenuItem
Caption = '-'
end
object ServicesEditMenuItem: TMenuItem
Caption = 'Edit'
object ServicesEditIniMenuOption: TMenuItem
Caption = 'services.ini'
Hint = 'services.ini'
OnClick = CtrlMenuItemEditClick
end
end
end
object ViewMenuItem: TMenuItem
Caption = '&View'
object ViewNodesMenuItem: TMenuItem
Action = ViewNodes
AutoCheck = True
end
object ViewStatsMenuItem: TMenuItem
Action = ViewStats
AutoCheck = True
Caption = 'BBS &Statistics'
end
object ViewTelnetMenuItem: TMenuItem
Action = ViewTelnet
AutoCheck = True
end
object ViewEventsMenuItem: TMenuItem
Action = ViewEvents
AutoCheck = True
Caption = 'BBS &Events'
end
object ViewMailServerMenuItem: TMenuItem
Action = ViewMailServer
AutoCheck = True
end
object ViewFtpServerMenuItem: TMenuItem
Action = ViewFtpServer
AutoCheck = True
end
object ViewWebServerMenuItem: TMenuItem
Action = ViewWebServer
Hint = 'View Web Server Window'
AutoCheck = True
end
object ViewEventsMenuItem: TMenuItem
Action = ViewEvents
object ViewServicesMenuItem: TMenuItem
Action = ViewServices
AutoCheck = True
end
object Clients1: TMenuItem
Action = ViewClients
AutoCheck = True
end
object ViewToolbarMenuItem: TMenuItem
Caption = 'Tool&bar'
......@@ -2716,38 +2765,74 @@ object MainForm: TMainForm
OnExecute = MailConfigureExecute
end
object ViewTelnet: TAction
AutoCheck = True
Caption = '&Telnet Server'
Checked = True
Hint = 'View Telnet Server Window'
ImageIndex = 9
OnExecute = ViewTelnetExecute
end
object ViewEvents: TAction
AutoCheck = True
Caption = '&Events'
Checked = True
ImageIndex = 49
OnExecute = ViewEventsExecute
end
object ViewStats: TAction
AutoCheck = True
Caption = '&Stats'
Checked = True
ImageIndex = 13
OnExecute = ViewStatsExecute
end
object ViewNodes: TAction
AutoCheck = True
Caption = 'BBS &Nodes'
Checked = True
Hint = 'View Node Status Window'
ImageIndex = 5
OnExecute = ViewNodesExecute
end
object ViewMailServer: TAction
AutoCheck = True
Caption = '&Mail Server'
Checked = True
Hint = 'View Mail Server Window'
ImageIndex = 7
OnExecute = ViewMailServerExecute
end
object ViewStats: TAction
Caption = '&Stats'
ImageIndex = 13
OnExecute = ViewStatsExecute
end
object ViewFtpServer: TAction
AutoCheck = True
Caption = '&FTP Server'
Checked = True
Hint = 'View FTP Server Window'
ImageIndex = 11
OnExecute = ViewFtpServerExecute
end
object ViewWebServer: TAction
AutoCheck = True
Caption = '&Web Server'
Checked = True
Hint = 'View Web Server Window'
ImageIndex = 59
OnExecute = ViewWebServerExecute
end
object ViewServices: TAction
AutoCheck = True
Caption = '&Services'
Checked = True
Hint = 'View Services Window'
OnExecute = ViewServicesExecute
end
object ViewClients: TAction
AutoCheck = True
Caption = '&Clients'
Checked = True
Hint = 'View Active Clients Window'
ImageIndex = 35
OnExecute = ViewClientsExecute
end
object FtpStart: TAction
Hint = 'Start FTP Server'
ImageIndex = 0
......@@ -2783,12 +2868,6 @@ object MainForm: TMainForm
ImageIndex = 33
OnExecute = ChatToggleExecute
end
object ViewClients: TAction
Caption = '&Clients'