X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=246d2d1bdf4ff603f07a86acccb73f6b95864774;hb=17f20398d8bb0e4b97b5884b999bbe8d58c5254f;hp=a2fede76dfbf0613903309dc169fc6402509fb29;hpb=58fa76a660afa51a05a08708c100e67e8f219ae1;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index a2fede7..246d2d1 100644
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.73 2001/02/09 22:22:04 kevin Exp $
+**  $Id: ctsim.cpp,v 1.78 2001/02/16 00:28:41 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -43,6 +43,9 @@
 #include "wx/image.h"
 #include "wx/filesys.h"
 #include "wx/fs_zip.h"
+#ifdef __WXMSW__
+#include "wx/msw/helpchm.h"
+#endif
 
 #if !wxUSE_DOC_VIEW_ARCHITECTURE
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
@@ -51,7 +54,6 @@
 
 #include "ct.h"
 #include "ctsim.h"
-#include "ctsim-map.h"
 #include "docs.h"
 #include "views.h"
 #include "dialogs.h"
@@ -70,7 +72,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.73 2001/02/09 22:22:04 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.78 2001/02/16 00:28:41 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -82,7 +84,8 @@ struct option CTSimApp::ctsimOptions[] =
 IMPLEMENT_APP(CTSimApp)
 
 CTSimApp::CTSimApp()
-: m_docManager(NULL), m_pFrame(NULL), m_pLog(0), m_pLogDoc(0)
+: m_docManager(NULL), m_pFrame(NULL), m_pLog(0), m_pLogDoc(0), m_pConfig(0),
+  m_bAdvancedOptions(false), m_bSetModifyNewDocs(true)
 {
 	theApp = this;
 }
@@ -102,8 +105,7 @@ CTSimApp::OnInit()
 	setpriority (PRIO_PROCESS, 0, 15);  // set to low scheduling priority
 #endif
 	
-	m_pConfig = new wxConfig("ctsim", _T(""), ".ctsim", "", wxCONFIG_USE_LOCAL_FILE);
-	wxConfigBase::Set(m_pConfig);
+	openConfig();
 	
 	g_bRunningWXWindows = true;
 	// process options
@@ -182,13 +184,13 @@ CTSimApp::OnInit()
 #endif
 	wxLog::SetActiveTarget (new wxLogTextCtrl(m_pLog));
 
-#ifdef CTSIM_WINHELP
-	if (! m_pFrame->getWinHelpController().Initialize("ctsim"))
-		*m_pLog << "Cannot initialize the Windows Help system" << "\n";
-#endif
 	wxString helpDir;
 	if (! m_pConfig->Read("HelpDir", &helpDir))
 		helpDir = ::wxGetCwd();
+#ifdef CTSIM_WINHELP
+	if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
+		*m_pLog << "Cannot initialize the Windows Help system" << "\n";
+#else
 	if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") &&
 		! m_pFrame->getHtmlHelpController().Initialize("/usr/local/man/ctsim"))
 		*m_pLog << "Cannot initialize the HTML Help system" << "\n";
@@ -197,6 +199,7 @@ CTSimApp::OnInit()
 		m_pFrame->getHtmlHelpController().SetTempDir(_T("/tmp"));
 	    m_pFrame->getHtmlHelpController().UseConfig (m_pConfig);
 	}
+#endif
 
 	for (int i = optind + 1; i <= argc; i++) {
 		wxString filename = argv [i - 1];
@@ -230,7 +233,7 @@ CTSimApp::usage(const char* program)
 int
 CTSimApp::OnExit()
 {
-	delete m_pConfig;
+  closeConfig();
 
 #ifdef HAVE_DMALLOC
 	dmalloc_shutdown();
@@ -238,6 +241,29 @@ CTSimApp::OnExit()
 	return 0;
 }
 
+void
+CTSimApp::openConfig()
+{
+#ifdef MSVC
+  m_pConfig = new wxConfig("ctsim", "Kevin Rosenberg", "", "", wxCONFIG_USE_LOCAL_FILE);
+#else
+  m_pConfig = new wxConfig("ctsim", "Kevin Rosenberg", ".ctsim", "", wxCONFIG_USE_LOCAL_FILE);
+#endif
+
+	wxConfigBase::Set(m_pConfig);
+  m_pConfig->Read ("AdvancedOptions", &m_bAdvancedOptions);
+  m_pConfig->Read ("SetModifyNewDocs", &m_bSetModifyNewDocs);
+}
+
+void
+CTSimApp::closeConfig()
+{
+  m_pConfig->Write ("AdvancedOptions", m_bAdvancedOptions);
+  m_pConfig->Write ("SetModifyNewDocs", m_bSetModifyNewDocs);
+	delete m_pConfig;
+}
+
+
 wxString
 CTSimApp::getUntitledFilename()
 {
@@ -262,9 +288,21 @@ IMPLEMENT_CLASS(MainFrame, wxDocParentFrame)
 BEGIN_EVENT_TABLE(MainFrame, wxDocParentFrame)
 #endif
 
+EVT_MENU(MAINMENU_FILE_PREFERENCES, MainFrame::OnPreferences)
 EVT_MENU(MAINMENU_HELP_ABOUT, MainFrame::OnAbout)
 EVT_MENU(MAINMENU_HELP_CONTENTS, MainFrame::OnHelpContents)
 EVT_MENU(MAINMENU_HELP_TOPICS, MainFrame::OnHelpTopics)
+EVT_BUTTON(IDH_DLG_RASTERIZE, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_PROJECTIONS, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_RECONSTRUCTION, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_FILTER, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_MINMAX, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_EXPORT, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_PHANTOM, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_COMPARISON, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_PREFERENCES, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_POLAR, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_AUTOSCALE, MainFrame::OnHelpButton)
 EVT_SIZE(MainFrame::OnSize)
 
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
@@ -317,6 +355,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 	file_menu->Append(wxID_OPEN, "&Open...\tCtrl-O");
 	
 	file_menu->AppendSeparator();
+  file_menu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
 	file_menu->Append(MAINMENU_FILE_EXIT, "E&xit");
 	
 	//  history of files visited
@@ -510,6 +549,12 @@ MainFrame::OnHelpContents (wxCommandEvent& event)
 	showHelp (event.GetId());
 }
 
+void 
+MainFrame::OnHelpButton (wxCommandEvent& event)
+{
+	showHelp (event.GetId());
+}
+
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
 void
 MainFrame::OnHelpSecondary (wxCommandEvent& event)
@@ -521,12 +566,6 @@ MainFrame::OnHelpSecondary (wxCommandEvent& event)
 void
 MainFrame::showHelp (int commandID)
 {
-#ifdef CTSIM_WINHELP
-	m_winHelp.LoadFile();
-#else
-	m_htmlHelp.LoadFile();
-#endif
-	
 	switch (commandID) {
 		
 	case MAINMENU_HELP_CONTENTS:
@@ -539,14 +578,18 @@ MainFrame::showHelp (int commandID)
 		
 	case MAINMENU_HELP_TOPICS:
 #ifdef CTSIM_WINHELP
-		m_winHelp.DisplaySection (introduction);
+		m_winHelp.DisplaySection (IDH_INTRODUCTION);
 #else
 		m_htmlHelp.DisplayIndex();
 #endif
 		break;
 		
 	default:
-		*theApp->getLog() << "Unknown help command # " << commandID << "\n";
+#ifdef CTSIM_WINHELP
+    m_winHelp.DisplaySection (commandID);
+#else
+    m_htmlHelp.DisplaySection (commandID);
+#endif
 		break;
 	}
 }
@@ -766,6 +809,18 @@ BitmapDialog::~BitmapDialog()
 {}
 
 
+void 
+MainFrame::OnPreferences (wxCommandEvent& WXUNUSED(event) )
+{
+  DialogPreferences dlg (this, "CTSim Preferences", theApp->getAdvancedOptions(), 
+    theApp->getAskDeleteNewDocs());
+  if (dlg.ShowModal() == wxID_OK) {
+    theApp->setAdvancedOptions (dlg.getAdvancedOptions());
+    theApp->setAskDeleteNewDocs (dlg.getAskDeleteNewDocs());
+  }
+}
+
+
 #include "./splash.xpm"
 void 
 MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )