WebSVN – spk – Diff – /GameLauncher/src/Forms/Form1.h

 #include "ViewData.h"
 #include "EZ_LCD.h"
 #include "../LCDDisplay.h"
 #define LOGFILE		902
-#define VERSION		"1.30"
+#define VERSION		"1.31"
-#define DATE		"01/01/2012"
+#define DATE		"28/07/2015"
 #include "../../Direct3D-Hook/src/Hook/Direct3D-Hook.h"
 using namespace System;
+				}
 				catch (IO::IOException ^) { }
 				catch (System::Exception ^) {}
+			}
+		}
+	protected:
+		void _launchManager(bool bAdvanced);
 	private: System::Windows::Forms::ToolStripMenuItem^  resumeManagerToolStripMenuItem;
 	public:
 	private: System::Windows::Forms::ToolStripSeparator^  toolStripSeparator1;
 private: System::Windows::Forms::Label^  label2;
 private: System::Windows::Forms::Label^  label3;
 private: System::Windows::Forms::LinkLabel^  linkLabel1;
 private: System::Windows::Forms::Timer^  timerCheckGame;
 private: System::Windows::Forms::ToolStripMenuItem^  gUIOverlayToolStripMenuItem;
+private: System::Windows::Forms::ToolStripMenuItem^  launchManagerAdvancedToolStripMenuItem;
 		 bool	m_bNoLCD;
 		void ParseNewData(bool updated)
+		{
 			if ( m_bUpdateLCD && m_pLCD )
 			this->ContextResume = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->ContextAutoClose = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->toolStripSeparator3 = (gcnew System::Windows::Forms::ToolStripSeparator());
 			this->gameLogToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->updateLCDToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
+			this->gUIOverlayToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->resumeManagerToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->toolStripSeparator1 = (gcnew System::Windows::Forms::ToolStripSeparator());
 			this->ContextGames = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->gameDataToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->toolStripSeparator2 = (gcnew System::Windows::Forms::ToolStripSeparator());
 			this->label1 = (gcnew System::Windows::Forms::Label());
 			this->label2 = (gcnew System::Windows::Forms::Label());
 			this->label3 = (gcnew System::Windows::Forms::Label());
 			this->linkLabel1 = (gcnew System::Windows::Forms::LinkLabel());
 			this->timerCheckGame = (gcnew System::Windows::Forms::Timer(this->components));
-			this->gUIOverlayToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
+			this->launchManagerAdvancedToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->contextMenuStrip1->SuspendLayout();
 			this->SuspendLayout();
 			//
 			// notifyIcon1
 			//
 			this->notifyIcon1->Visible = true;
 			this->notifyIcon1->DoubleClick += gcnew System::EventHandler(this, &Form1::notifyIcon1_DoubleClick);
 			//
 			// contextMenuStrip1
 			//
-			this->contextMenuStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(9) {this->aboutToolStripMenuItem,
+			this->contextMenuStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(10) {this->aboutToolStripMenuItem,
-				this->toolStripSeparator4, this->settingsToolStripMenuItem, this->resumeManagerToolStripMenuItem, this->toolStripSeparator1,
+				this->toolStripSeparator4, this->settingsToolStripMenuItem, this->resumeManagerToolStripMenuItem, this->launchManagerAdvancedToolStripMenuItem,
-				this->ContextGames, this->gameDataToolStripMenuItem, this->toolStripSeparator2, this->closeToolStripMenuItem});
+				this->toolStripSeparator1, this->ContextGames, this->gameDataToolStripMenuItem, this->toolStripSeparator2, this->closeToolStripMenuItem});
 			this->contextMenuStrip1->Name = L"contextMenuStrip1";
-			this->contextMenuStrip1->Size = System::Drawing::Size(164, 176);
+			this->contextMenuStrip1->Size = System::Drawing::Size(228, 198);
 			//
 			// aboutToolStripMenuItem
 			//
 			this->aboutToolStripMenuItem->Name = L"aboutToolStripMenuItem";
-			this->aboutToolStripMenuItem->Size = System::Drawing::Size(163, 22);
+			this->aboutToolStripMenuItem->Size = System::Drawing::Size(227, 22);
 			this->aboutToolStripMenuItem->Text = L"About";
 			this->aboutToolStripMenuItem->Click += gcnew System::EventHandler(this, &Form1::aboutToolStripMenuItem_Click);
 			//
 			// toolStripSeparator4
 			//
 			this->toolStripSeparator4->Name = L"toolStripSeparator4";
-			this->toolStripSeparator4->Size = System::Drawing::Size(160, 6);
+			this->toolStripSeparator4->Size = System::Drawing::Size(224, 6);
 			//
 			// settingsToolStripMenuItem
 			//
 			this->settingsToolStripMenuItem->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(6) {this->ContextResume,
 				this->ContextAutoClose, this->toolStripSeparator3, this->gameLogToolStripMenuItem, this->updateLCDToolStripMenuItem, this->gUIOverlayToolStripMenuItem});
 			this->settingsToolStripMenuItem->Name = L"settingsToolStripMenuItem";
-			this->settingsToolStripMenuItem->Size = System::Drawing::Size(163, 22);
+			this->settingsToolStripMenuItem->Size = System::Drawing::Size(227, 22);
 			this->settingsToolStripMenuItem->Text = L"Settings";
 			//
 			// ContextResume
 			//
 			this->ContextResume->Checked = true;
 			this->ContextResume->CheckOnClick = true;
 			this->ContextResume->CheckState = System::Windows::Forms::CheckState::Checked;
 			this->ContextResume->Name = L"ContextResume";
-			this->ContextResume->Size = System::Drawing::Size(152, 22);
+			this->ContextResume->Size = System::Drawing::Size(145, 22);
 			this->ContextResume->Text = L"Auto Resume";
 			this->ContextResume->CheckedChanged += gcnew System::EventHandler(this, &Form1::ContextResume_CheckedChanged);
 			//
 			// ContextAutoClose
 			//
 			this->ContextAutoClose->Checked = true;
 			this->ContextAutoClose->CheckOnClick = true;
 			this->ContextAutoClose->CheckState = System::Windows::Forms::CheckState::Checked;
 			this->ContextAutoClose->Name = L"ContextAutoClose";
-			this->ContextAutoClose->Size = System::Drawing::Size(152, 22);
+			this->ContextAutoClose->Size = System::Drawing::Size(145, 22);
 			this->ContextAutoClose->Text = L"Auto Close";
 			this->ContextAutoClose->Click += gcnew System::EventHandler(this, &Form1::ContextAutoClose_Click);
 			//
 			// toolStripSeparator3
 			//
 			this->toolStripSeparator3->Name = L"toolStripSeparator3";
-			this->toolStripSeparator3->Size = System::Drawing::Size(149, 6);
+			this->toolStripSeparator3->Size = System::Drawing::Size(142, 6);
 			//
 			// gameLogToolStripMenuItem
 			//
 			this->gameLogToolStripMenuItem->Name = L"gameLogToolStripMenuItem";
-			this->gameLogToolStripMenuItem->Size = System::Drawing::Size(152, 22);
+			this->gameLogToolStripMenuItem->Size = System::Drawing::Size(145, 22);
 			this->gameLogToolStripMenuItem->Text = L"Game Log";
 			this->gameLogToolStripMenuItem->Click += gcnew System::EventHandler(this, &Form1::gameLogToolStripMenuItem_Click);
 			//
 			// updateLCDToolStripMenuItem
 			//
 			this->updateLCDToolStripMenuItem->Checked = true;
 			this->updateLCDToolStripMenuItem->CheckOnClick = true;
 			this->updateLCDToolStripMenuItem->CheckState = System::Windows::Forms::CheckState::Checked;
 			this->updateLCDToolStripMenuItem->Name = L"updateLCDToolStripMenuItem";
-			this->updateLCDToolStripMenuItem->Size = System::Drawing::Size(152, 22);
+			this->updateLCDToolStripMenuItem->Size = System::Drawing::Size(145, 22);
 			this->updateLCDToolStripMenuItem->Text = L"Update LCD";
 			this->updateLCDToolStripMenuItem->Click += gcnew System::EventHandler(this, &Form1::updateLCDToolStripMenuItem_Click);
+			//
+			// gUIOverlayToolStripMenuItem
+			//
+			this->gUIOverlayToolStripMenuItem->Checked = true;
+			this->gUIOverlayToolStripMenuItem->CheckOnClick = true;
+			this->gUIOverlayToolStripMenuItem->CheckState = System::Windows::Forms::CheckState::Checked;
+			this->gUIOverlayToolStripMenuItem->Name = L"gUIOverlayToolStripMenuItem";
+			this->gUIOverlayToolStripMenuItem->Size = System::Drawing::Size(145, 22);
+			this->gUIOverlayToolStripMenuItem->Text = L"GUI Overlay";
+			this->gUIOverlayToolStripMenuItem->Click += gcnew System::EventHandler(this, &Form1::gUIOverlayToolStripMenuItem_Click);
 			//
 			// resumeManagerToolStripMenuItem
 			//
 			this->resumeManagerToolStripMenuItem->Name = L"resumeManagerToolStripMenuItem";
-			this->resumeManagerToolStripMenuItem->Size = System::Drawing::Size(163, 22);
+			this->resumeManagerToolStripMenuItem->Size = System::Drawing::Size(227, 22);
-			this->resumeManagerToolStripMenuItem->Text = L"Launch Manager";
+			this->resumeManagerToolStripMenuItem->Text = L"Launch Manager (Lite)";
 			this->resumeManagerToolStripMenuItem->Click += gcnew System::EventHandler(this, &Form1::resumeManagerToolStripMenuItem_Click);
 			//
 			// toolStripSeparator1
 			//
 			this->toolStripSeparator1->Name = L"toolStripSeparator1";
-			this->toolStripSeparator1->Size = System::Drawing::Size(160, 6);
+			this->toolStripSeparator1->Size = System::Drawing::Size(224, 6);
 			//
 			// ContextGames
 			//
 			this->ContextGames->Name = L"ContextGames";
-			this->ContextGames->Size = System::Drawing::Size(163, 22);
+			this->ContextGames->Size = System::Drawing::Size(227, 22);
 			this->ContextGames->Text = L"Launch Game";
 			//
 			// gameDataToolStripMenuItem
 			//
 			this->gameDataToolStripMenuItem->Name = L"gameDataToolStripMenuItem";
-			this->gameDataToolStripMenuItem->Size = System::Drawing::Size(163, 22);
+			this->gameDataToolStripMenuItem->Size = System::Drawing::Size(227, 22);
 			this->gameDataToolStripMenuItem->Text = L"View Game Data";
 			this->gameDataToolStripMenuItem->Click += gcnew System::EventHandler(this, &Form1::gameDataToolStripMenuItem_Click);
 			//
 			// toolStripSeparator2
 			//
 			this->toolStripSeparator2->Name = L"toolStripSeparator2";
-			this->toolStripSeparator2->Size = System::Drawing::Size(160, 6);
+			this->toolStripSeparator2->Size = System::Drawing::Size(224, 6);
 			//
 			// closeToolStripMenuItem
 			//
 			this->closeToolStripMenuItem->Name = L"closeToolStripMenuItem";
-			this->closeToolStripMenuItem->Size = System::Drawing::Size(163, 22);
+			this->closeToolStripMenuItem->Size = System::Drawing::Size(227, 22);
 			this->closeToolStripMenuItem->Text = L"Close";
 			this->closeToolStripMenuItem->Click += gcnew System::EventHandler(this, &Form1::closeToolStripMenuItem_Click);
 			//
 			// timer1
 			//
 			//
 			this->timerCheckGame->Enabled = true;
 			this->timerCheckGame->Interval = 1000;
 			this->timerCheckGame->Tick += gcnew System::EventHandler(this, &Form1::timerCheckGame_Tick);
 			//
-			// gUIOverlayToolStripMenuItem
+			// launchManagerAdvancedToolStripMenuItem
 			//
-			this->gUIOverlayToolStripMenuItem->Checked = true;
-			this->gUIOverlayToolStripMenuItem->CheckOnClick = true;
-			this->gUIOverlayToolStripMenuItem->CheckState = System::Windows::Forms::CheckState::Checked;
-			this->gUIOverlayToolStripMenuItem->Name = L"gUIOverlayToolStripMenuItem";
+			this->launchManagerAdvancedToolStripMenuItem->Name = L"launchManagerAdvancedToolStripMenuItem";
-			this->gUIOverlayToolStripMenuItem->Size = System::Drawing::Size(152, 22);
+			this->launchManagerAdvancedToolStripMenuItem->Size = System::Drawing::Size(227, 22);
-			this->gUIOverlayToolStripMenuItem->Text = L"GUI Overlay";
+			this->launchManagerAdvancedToolStripMenuItem->Text = L"Launch Manager (Advanced)";
-			this->gUIOverlayToolStripMenuItem->Click += gcnew System::EventHandler(this, &Form1::gUIOverlayToolStripMenuItem_Click);
+			this->launchManagerAdvancedToolStripMenuItem->Click += gcnew System::EventHandler(this, &Form1::launchManagerAdvancedToolStripMenuItem_Click);
 			//
 			// Form1
 			//
 			this->AutoScaleDimensions = System::Drawing::SizeF(6, 13);
 			this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
 			RegistryKey ^searchKey = Registry::CurrentUser->CreateSubKey("Software\\Egosoft\\PluginManagerSettings");
 			if ( searchKey )
 				searchKey->SetValue("DontAutoResume", (m_bAutoResume) ? 0 : 1);
+		 }
 private: System::Void resumeManagerToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
-			 if ( m_bAutoClose )
-			 {
-				 m_bResume = true;
-				this->Close();
-			 }
-			 else
-				 LaunchManager(false);
+			 _launchManager(false);
+		 }
 private: System::Void notifyIcon1_DoubleClick(System::Object^  sender, System::EventArgs^  e) {
 			 m_bResume = true;
 			 if ( m_bAutoClose )
 				this->Close();
 private: System::Void gUIOverlayToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
 			m_bCustomGui = this->gUIOverlayToolStripMenuItem->Checked;
 			RegistryKey ^searchKey = Registry::CurrentUser->CreateSubKey("Software\\Egosoft\\PluginManagerSettings");
 			if ( searchKey )
 				searchKey->SetValue("DontDoGUI", (m_bCustomGui) ? 0 : 1);
+		 }
+private: System::Void launchManagerAdvancedToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
+			 _launchManager(true);
+		 }
 };
+}

Subversion Repositories spk

(root)/GameLauncher/src/Forms/Form1.h – Rev 85 → 105