diff --git a/LilithPort/MainForm.cpp b/LilithPort/MainForm.cpp index 7e4a2ea..04c7e8a 100644 --- a/LilithPort/MainForm.cpp +++ b/LilithPort/MainForm.cpp @@ -1247,7 +1247,7 @@ void MainForm::ReceivePackets(IAsyncResult^ asyncResult) form->WriteMessage(L"Challenger is currently preparing for battle against another person.\n", SystemMessageColor); break; case 0xFE: - form->WriteMessage(L"ERROR: You and your challenger have a different game or game version.\n", ErrorMessageColor); + form->WriteMessage(L"ERROR: You and your challenger have a different game or game version. Make sure your game executable's file name is the same as that of your opponent.\n", ErrorMessageColor); break; default: form->WriteMessage(L"Challenger is currently not in a state for matchmaking.\n", SystemMessageColor); @@ -2968,7 +2968,7 @@ void MainForm::RunGame(Object^ obj) p2_win = i; } WriteTime(0, SystemMessageColor); - WriteMessage(String::Format(L"Scoreļ¼š {0} matches, {1} wins (P1) {2} wins (P2)\n", num_vs, p1_win, p2_win), SecretColor); + WriteMessage(String::Format(L"Score: {0} matches, {1} wins (P1), {2} wins (P2)\n", num_vs, p1_win, p2_win), SecretColor); } } else{ diff --git a/LilithPort/MainForm.h b/LilithPort/MainForm.h index 909a746..7d21673 100644 --- a/LilithPort/MainForm.h +++ b/LilithPort/MainForm.h @@ -39,15 +39,15 @@ namespace LilithPort { for(UINT i=0;i < MTOPTION.BOOKMARK_COUNT;i++) { tmpName = gcnew String(MTOPTION.BOOKMARK_SERVER_NAME[i]); - toolStripMenuItemBookMark = (gcnew System::Windows::Forms::ToolStripMenuItem()); - toolStripMenuItemBookMarkMenu->DropDownItems->Add(toolStripMenuItemBookMark); + toolStripMenuItemBookMark = (gcnew System::Windows::Forms::MenuItem()); + toolStripMenuItemBookMarkMenu->MenuItems->Add(toolStripMenuItemBookMark); toolStripMenuItemBookMark->Text = tmpName; toolStripMenuItemBookMark->Name = L"toolStripMenuItemBookMark" + i; toolStripMenuItemBookMark->Tag = i; toolStripMenuItemBookMark->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemBookMark_Click); - toolStripMenuItemDelBookMark = (gcnew System::Windows::Forms::ToolStripMenuItem()); - toolStripMenuItemBookMark->DropDownItems->Add(toolStripMenuItemDelBookMark); + toolStripMenuItemDelBookMark = (gcnew System::Windows::Forms::MenuItem()); + toolStripMenuItemBookMark->MenuItems->Add(toolStripMenuItemDelBookMark); toolStripMenuItemDelBookMark->Text = L"&Delete"; toolStripMenuItemDelBookMark->Tag = L"toolStripMenuItemBookMark" + i; toolStripMenuItemDelBookMark->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelBookMark_Click); @@ -75,101 +75,103 @@ namespace LilithPort { delete components; } } - private: System::Windows::Forms::MenuStrip^ menuStrip1; + private: System::Windows::Forms::MainMenu^ menuStrip1; private: System::Windows::Forms::SplitContainer^ splitContainer1; private: System::Windows::Forms::ListBox^ listBoxMember; private: System::Windows::Forms::RichTextBox^ richTextBoxLog; private: System::Windows::Forms::TextBox^ textBoxInput; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemFile; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemSaveLog; - private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator1; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemExit; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemFile; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemSaveLog; + private: System::Windows::Forms::MenuItem^ toolStripSeparator1; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemExit; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemOption; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemSetting; - private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator2; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelayAuto; - private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator4; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay2; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay3; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay4; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay5; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay6; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay7; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay8; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay9; - private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator3; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemRecordReplay; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAllowSpectator; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemOption; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemSetting; + private: System::Windows::Forms::MenuItem^ toolStripSeparator2; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelayAuto; + private: System::Windows::Forms::MenuItem^ toolStripSeparator4; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay2; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay3; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay4; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay5; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay6; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay7; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay8; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay9; + private: System::Windows::Forms::MenuItem^ toolStripSeparator3; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemRecordReplay; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemAllowSpectator; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemHelp; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemViewCommand; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemHelp; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemViewCommand; - private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator5; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemVersion; + private: System::Windows::Forms::MenuItem^ toolStripSeparator5; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemVersion; - private: System::Windows::Forms::ContextMenuStrip^ contextMenuStripMember; - private: System::Windows::Forms::ContextMenuStrip^ contextMenuStripLog; - private: System::Windows::Forms::ToolStripMenuItem^ contextMenuItemCopy; + private: System::Windows::Forms::ContextMenu^ contextMenuStripMember; + private: System::Windows::Forms::ContextMenu^ contextMenuStripLog; + private: System::Windows::Forms::MenuItem^ contextMenuItemCopy; - private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator6; - private: System::Windows::Forms::ToolStripMenuItem^ contxtMenuItemSaveLog; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemVS; + private: System::Windows::Forms::MenuItem^ toolStripSeparator6; + private: System::Windows::Forms::MenuItem^ contxtMenuItemSaveLog; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemVS; private: System::Windows::Forms::OpenFileDialog^ openFileDialog1; private: System::Windows::Forms::ToolTip^ toolTipMember; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemPing; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemReplay; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemPing; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemReplay; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWatch; - private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator7; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAfterRest; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemChangeList; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay10; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay11; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelay12; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemBookMarkMenu; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAddBookMark; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemBookMark; - private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemDelBookMark; - private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator8; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemWatch; + private: System::Windows::Forms::MenuItem^ toolStripSeparator7; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemAfterRest; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemChangeList; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay10; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay11; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelay12; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemBookMarkMenu; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemAddBookMark; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemBookMark; + private: System::Windows::Forms::MenuItem^ toolStripMenuItemDelBookMark; + private: System::Windows::Forms::MenuItem^ toolStripSeparator8; - private: System::Windows::Forms::ToolStripMenuItem^ CommandToolStripMenuItem; - private: System::Windows::Forms::ToolStripMenuItem^ GameStartToolStripMenuItem; - private: System::Windows::Forms::ToolStripMenuItem^ RestartToolStripMenuItem; - private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator9; - private: System::Windows::Forms::ToolStripMenuItem^ LeaveToolStripMenuItem; - private: System::Windows::Forms::ToolStripMenuItem^ RestToolStripMenuItem; - private: System::Windows::Forms::ToolStripMenuItem^ SeekToolStripMenuItem; - private: System::Windows::Forms::ToolStripMenuItem^ ClearToolStripMenuItem; - private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator10; + private: System::Windows::Forms::MenuItem^ CommandToolStripMenuItem; + private: System::Windows::Forms::MenuItem^ GameStartToolStripMenuItem; + private: System::Windows::Forms::MenuItem^ RestartToolStripMenuItem; + private: System::Windows::Forms::MenuItem^ toolStripSeparator9; + private: System::Windows::Forms::MenuItem^ LeaveToolStripMenuItem; + private: System::Windows::Forms::MenuItem^ RestToolStripMenuItem; + private: System::Windows::Forms::MenuItem^ SeekToolStripMenuItem; + private: System::Windows::Forms::MenuItem^ ClearToolStripMenuItem; + private: System::Windows::Forms::MenuItem^ toolStripSeparator10; -private: System::Windows::Forms::ToolStripMenuItem^ ToggleHitJudgeToolStripMenuItem; -private: System::Windows::Forms::ToolStripMenuItem^ LogLockToolStripMenuItem; +private: System::Windows::Forms::MenuItem^ ToggleHitJudgeToolStripMenuItem; +private: System::Windows::Forms::MenuItem^ LogLockToolStripMenuItem; -private: System::Windows::Forms::ToolStripMenuItem^ GetIPToolStripMenuItem; -private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator11; -private: System::Windows::Forms::ToolStripMenuItem^ GameStartNoReplayToolStripMenuItem; -private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator12; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemKick; +private: System::Windows::Forms::MenuItem^ GetIPToolStripMenuItem; +private: System::Windows::Forms::MenuItem^ toolStripSeparator11; +private: System::Windows::Forms::MenuItem^ GameStartNoReplayToolStripMenuItem; +private: System::Windows::Forms::MenuItem^ toolStripSeparator12; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemKick; private: System::Windows::Forms::StatusStrip^ statusStrip1; private: System::Windows::Forms::ToolStripStatusLabel^ toolStripStatusLabel; private: System::Windows::Forms::ToolStripDropDownButton^ toolStripDropDownButtonProfile; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemSeek; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAutoRest; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAutoRestEnable; -private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator13; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAutoRestTime5; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAutoRestTime10; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAutoRestTime15; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAutoRestTime20; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAutoRestTime30; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAutoRestTime60; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemAutoRestTime120; -private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemSeek; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemAutoRest; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemAutoRestEnable; +private: System::Windows::Forms::MenuItem^ toolStripSeparator13; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemAutoRestTime5; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemAutoRestTime10; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemAutoRestTime15; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemAutoRestTime20; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemAutoRestTime30; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemAutoRestTime60; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemAutoRestTime120; +private: System::Windows::Forms::MenuItem^ toolStripMenuItemWordWrap; +private: System::Windows::Forms::ContextMenu^ contextMenuStrip1; +private: System::Windows::Forms::ContextMenu^ contextMenuStrip2; @@ -191,557 +193,500 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; void InitializeComponent(void) { this->components = (gcnew System::ComponentModel::Container()); - System::Windows::Forms::ToolStripMenuItem^ ReloadListToolStripMenuItem; + System::Windows::Forms::MenuItem^ ReloadListToolStripMenuItem; System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(MainForm::typeid)); - this->menuStrip1 = (gcnew System::Windows::Forms::MenuStrip()); - this->toolStripMenuItemFile = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemReplay = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemSaveLog = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator1 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->toolStripMenuItemExit = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemBookMarkMenu = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemAddBookMark = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator8 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->CommandToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->GameStartToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->GameStartNoReplayToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator9 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->RestartToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->LeaveToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->RestToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->SeekToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator10 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->ClearToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->ToggleHitJudgeToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator11 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->GetIPToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemOption = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemSetting = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator2 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->toolStripMenuItemDelay = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelayAuto = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator4 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->toolStripMenuItemDelay2 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelay3 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelay4 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelay5 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelay6 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelay7 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelay8 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelay9 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelay10 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelay11 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemDelay12 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator3 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->toolStripMenuItemRecordReplay = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemAllowSpectator = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemWordWrap = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->LogLockToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator7 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->toolStripMenuItemAfterRest = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemAutoRest = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemAutoRestEnable = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator13 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->toolStripMenuItemAutoRestTime5 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemAutoRestTime10 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemAutoRestTime15 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemAutoRestTime20 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemAutoRestTime30 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemAutoRestTime60 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemAutoRestTime120 = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemHelp = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemViewCommand = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemChangeList = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator5 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->toolStripMenuItemVersion = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->menuStrip1 = (gcnew System::Windows::Forms::MainMenu(this->components)); + this->toolStripMenuItemFile = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemReplay = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemSaveLog = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator1 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemExit = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemBookMarkMenu = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAddBookMark = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator8 = (gcnew System::Windows::Forms::MenuItem()); + this->CommandToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->GameStartToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->GameStartNoReplayToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator9 = (gcnew System::Windows::Forms::MenuItem()); + this->RestartToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->LeaveToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->RestToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->SeekToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator10 = (gcnew System::Windows::Forms::MenuItem()); + this->ClearToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->ToggleHitJudgeToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator11 = (gcnew System::Windows::Forms::MenuItem()); + this->GetIPToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemOption = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemSetting = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator2 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelayAuto = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator4 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay2 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay3 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay4 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay5 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay6 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay7 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay8 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay9 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay10 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay11 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemDelay12 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator3 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemRecordReplay = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAllowSpectator = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemWordWrap = (gcnew System::Windows::Forms::MenuItem()); + this->LogLockToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator7 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAfterRest = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAutoRest = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAutoRestEnable = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator13 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAutoRestTime5 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAutoRestTime10 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAutoRestTime15 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAutoRestTime20 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAutoRestTime30 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAutoRestTime60 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemAutoRestTime120 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemHelp = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemViewCommand = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemChangeList = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator5 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemVersion = (gcnew System::Windows::Forms::MenuItem()); this->splitContainer1 = (gcnew System::Windows::Forms::SplitContainer()); this->listBoxMember = (gcnew System::Windows::Forms::ListBox()); - this->contextMenuStripMember = (gcnew System::Windows::Forms::ContextMenuStrip(this->components)); - this->toolStripMenuItemVS = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemWatch = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemSeek = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripMenuItemPing = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator12 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->toolStripMenuItemKick = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->contextMenuStrip1 = (gcnew System::Windows::Forms::ContextMenu()); + this->toolStripMenuItemVS = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemWatch = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemSeek = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemPing = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator12 = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripMenuItemKick = (gcnew System::Windows::Forms::MenuItem()); this->richTextBoxLog = (gcnew System::Windows::Forms::RichTextBox()); - this->contextMenuStripLog = (gcnew System::Windows::Forms::ContextMenuStrip(this->components)); - this->contextMenuItemCopy = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->toolStripSeparator6 = (gcnew System::Windows::Forms::ToolStripSeparator()); - this->contxtMenuItemSaveLog = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->contextMenuStrip2 = (gcnew System::Windows::Forms::ContextMenu()); + this->contextMenuItemCopy = (gcnew System::Windows::Forms::MenuItem()); + this->toolStripSeparator6 = (gcnew System::Windows::Forms::MenuItem()); + this->contxtMenuItemSaveLog = (gcnew System::Windows::Forms::MenuItem()); this->textBoxInput = (gcnew System::Windows::Forms::TextBox()); this->openFileDialog1 = (gcnew System::Windows::Forms::OpenFileDialog()); this->toolTipMember = (gcnew System::Windows::Forms::ToolTip(this->components)); this->statusStrip1 = (gcnew System::Windows::Forms::StatusStrip()); this->toolStripDropDownButtonProfile = (gcnew System::Windows::Forms::ToolStripDropDownButton()); this->toolStripStatusLabel = (gcnew System::Windows::Forms::ToolStripStatusLabel()); - ReloadListToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->menuStrip1->SuspendLayout(); + ReloadListToolStripMenuItem = (gcnew System::Windows::Forms::MenuItem()); (cli::safe_cast(this->splitContainer1))->BeginInit(); this->splitContainer1->Panel1->SuspendLayout(); this->splitContainer1->Panel2->SuspendLayout(); this->splitContainer1->SuspendLayout(); - this->contextMenuStripMember->SuspendLayout(); - this->contextMenuStripLog->SuspendLayout(); this->statusStrip1->SuspendLayout(); this->SuspendLayout(); // // ReloadListToolStripMenuItem // - ReloadListToolStripMenuItem->Name = L"ReloadListToolStripMenuItem"; - ReloadListToolStripMenuItem->ShortcutKeys = System::Windows::Forms::Keys::F5; - ReloadListToolStripMenuItem->Size = System::Drawing::Size(228, 22); + ReloadListToolStripMenuItem->Index = 7; + ReloadListToolStripMenuItem->Shortcut = System::Windows::Forms::Shortcut::F5; ReloadListToolStripMenuItem->Text = L"&Refresh player list"; ReloadListToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::ReloadListToolStripMenuItem_Click); // // menuStrip1 // - this->menuStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(5) { + this->menuStrip1->MenuItems->AddRange(gcnew cli::array< System::Windows::Forms::MenuItem^ >(5) { this->toolStripMenuItemFile, this->toolStripMenuItemBookMarkMenu, this->CommandToolStripMenuItem, this->toolStripMenuItemOption, this->toolStripMenuItemHelp }); - this->menuStrip1->Location = System::Drawing::Point(0, 0); - this->menuStrip1->Name = L"menuStrip1"; - this->menuStrip1->Size = System::Drawing::Size(528, 24); - this->menuStrip1->TabIndex = 0; - this->menuStrip1->Text = L"menuStrip1"; // // toolStripMenuItemFile // - this->toolStripMenuItemFile->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(4) { + this->toolStripMenuItemFile->Index = 0; + this->toolStripMenuItemFile->MenuItems->AddRange(gcnew cli::array< System::Windows::Forms::MenuItem^ >(4) { this->toolStripMenuItemReplay, this->toolStripMenuItemSaveLog, this->toolStripSeparator1, this->toolStripMenuItemExit }); - this->toolStripMenuItemFile->Name = L"toolStripMenuItemFile"; - this->toolStripMenuItemFile->Size = System::Drawing::Size(37, 20); this->toolStripMenuItemFile->Text = L"&File"; // // toolStripMenuItemReplay // - this->toolStripMenuItemReplay->Name = L"toolStripMenuItemReplay"; - this->toolStripMenuItemReplay->Size = System::Drawing::Size(171, 22); + this->toolStripMenuItemReplay->Index = 0; this->toolStripMenuItemReplay->Text = L"Open &Replay File..."; this->toolStripMenuItemReplay->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemReplay_Click); // // toolStripMenuItemSaveLog // - this->toolStripMenuItemSaveLog->Name = L"toolStripMenuItemSaveLog"; - this->toolStripMenuItemSaveLog->ShortcutKeys = static_cast((System::Windows::Forms::Keys::Control | System::Windows::Forms::Keys::S)); - this->toolStripMenuItemSaveLog->Size = System::Drawing::Size(171, 22); + this->toolStripMenuItemSaveLog->Index = 1; + this->toolStripMenuItemSaveLog->Shortcut = System::Windows::Forms::Shortcut::CtrlS; this->toolStripMenuItemSaveLog->Text = L"&Save Log"; this->toolStripMenuItemSaveLog->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemSaveLog_Click); // // toolStripSeparator1 // - this->toolStripSeparator1->Name = L"toolStripSeparator1"; - this->toolStripSeparator1->Size = System::Drawing::Size(168, 6); + this->toolStripSeparator1->Index = 2; + this->toolStripSeparator1->Text = L"-"; // // toolStripMenuItemExit // - this->toolStripMenuItemExit->Name = L"toolStripMenuItemExit"; - this->toolStripMenuItemExit->Size = System::Drawing::Size(171, 22); + this->toolStripMenuItemExit->Index = 3; this->toolStripMenuItemExit->Text = L"&Exit"; this->toolStripMenuItemExit->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemExit_Click); // // toolStripMenuItemBookMarkMenu // - this->toolStripMenuItemBookMarkMenu->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(2) { + this->toolStripMenuItemBookMarkMenu->Index = 1; + this->toolStripMenuItemBookMarkMenu->MenuItems->AddRange(gcnew cli::array< System::Windows::Forms::MenuItem^ >(2) { this->toolStripMenuItemAddBookMark, this->toolStripSeparator8 }); - this->toolStripMenuItemBookMarkMenu->Name = L"toolStripMenuItemBookMarkMenu"; - this->toolStripMenuItemBookMarkMenu->Size = System::Drawing::Size(78, 20); this->toolStripMenuItemBookMarkMenu->Text = L"&Bookmarks"; // // toolStripMenuItemAddBookMark // - this->toolStripMenuItemAddBookMark->Name = L"toolStripMenuItemAddBookMark"; - this->toolStripMenuItemAddBookMark->Size = System::Drawing::Size(152, 22); + this->toolStripMenuItemAddBookMark->Index = 0; this->toolStripMenuItemAddBookMark->Text = L"&Add server"; this->toolStripMenuItemAddBookMark->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAddBookMark_Click); // // toolStripSeparator8 // - this->toolStripSeparator8->Name = L"toolStripSeparator8"; - this->toolStripSeparator8->Size = System::Drawing::Size(149, 6); + this->toolStripSeparator8->Index = 1; + this->toolStripSeparator8->Text = L"-"; // // CommandToolStripMenuItem // - this->CommandToolStripMenuItem->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(13) { + this->CommandToolStripMenuItem->Index = 2; + this->CommandToolStripMenuItem->MenuItems->AddRange(gcnew cli::array< System::Windows::Forms::MenuItem^ >(13) { this->GameStartToolStripMenuItem, this->GameStartNoReplayToolStripMenuItem, this->toolStripSeparator9, this->RestartToolStripMenuItem, this->LeaveToolStripMenuItem, this->RestToolStripMenuItem, this->SeekToolStripMenuItem, ReloadListToolStripMenuItem, this->toolStripSeparator10, this->ClearToolStripMenuItem, this->ToggleHitJudgeToolStripMenuItem, this->toolStripSeparator11, this->GetIPToolStripMenuItem }); - this->CommandToolStripMenuItem->Name = L"CommandToolStripMenuItem"; - this->CommandToolStripMenuItem->Size = System::Drawing::Size(81, 20); this->CommandToolStripMenuItem->Text = L"&Commands"; // // GameStartToolStripMenuItem // - this->GameStartToolStripMenuItem->BackColor = System::Drawing::SystemColors::Control; - this->GameStartToolStripMenuItem->Name = L"GameStartToolStripMenuItem"; - this->GameStartToolStripMenuItem->Size = System::Drawing::Size(228, 22); + this->GameStartToolStripMenuItem->Index = 0; this->GameStartToolStripMenuItem->Text = L"Start &game"; this->GameStartToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::GameStartToolStripMenuItem_Click); // // GameStartNoReplayToolStripMenuItem // - this->GameStartNoReplayToolStripMenuItem->Name = L"GameStartNoReplayToolStripMenuItem"; - this->GameStartNoReplayToolStripMenuItem->Size = System::Drawing::Size(228, 22); + this->GameStartNoReplayToolStripMenuItem->Index = 1; this->GameStartNoReplayToolStripMenuItem->Text = L"S&tart game (no replay)"; this->GameStartNoReplayToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::GameStartNoReplayToolStripMenuItem_Click); // // toolStripSeparator9 // - this->toolStripSeparator9->Name = L"toolStripSeparator9"; - this->toolStripSeparator9->Size = System::Drawing::Size(225, 6); + this->toolStripSeparator9->Index = 2; + this->toolStripSeparator9->Text = L"-"; // // RestartToolStripMenuItem // - this->RestartToolStripMenuItem->Name = L"RestartToolStripMenuItem"; - this->RestartToolStripMenuItem->Size = System::Drawing::Size(228, 22); + this->RestartToolStripMenuItem->Index = 3; this->RestartToolStripMenuItem->Text = L"&Restart"; this->RestartToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::RestartToolStripMenuItem_Click); // // LeaveToolStripMenuItem // - this->LeaveToolStripMenuItem->Name = L"LeaveToolStripMenuItem"; - this->LeaveToolStripMenuItem->Size = System::Drawing::Size(228, 22); + this->LeaveToolStripMenuItem->Index = 4; this->LeaveToolStripMenuItem->Text = L"&Leave"; this->LeaveToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::LeaveToolStripMenuItem_Click); // // RestToolStripMenuItem // - this->RestToolStripMenuItem->Name = L"RestToolStripMenuItem"; - this->RestToolStripMenuItem->Size = System::Drawing::Size(228, 22); + this->RestToolStripMenuItem->Index = 5; this->RestToolStripMenuItem->Text = L"Toggle rest &mode"; this->RestToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::RestToolStripMenuItem_Click); // // SeekToolStripMenuItem // - this->SeekToolStripMenuItem->Name = L"SeekToolStripMenuItem"; - this->SeekToolStripMenuItem->Size = System::Drawing::Size(228, 22); + this->SeekToolStripMenuItem->Index = 6; this->SeekToolStripMenuItem->Text = L"Toggle &seek mode"; this->SeekToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::SeekToolStripMenuItem_Click); // // toolStripSeparator10 // - this->toolStripSeparator10->Name = L"toolStripSeparator10"; - this->toolStripSeparator10->Size = System::Drawing::Size(225, 6); + this->toolStripSeparator10->Index = 8; + this->toolStripSeparator10->Text = L"-"; // // ClearToolStripMenuItem // - this->ClearToolStripMenuItem->Name = L"ClearToolStripMenuItem"; - this->ClearToolStripMenuItem->Size = System::Drawing::Size(228, 22); + this->ClearToolStripMenuItem->Index = 9; this->ClearToolStripMenuItem->Text = L"&Clear chat"; this->ClearToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::ClearToolStripMenuItem_Click); // // ToggleHitJudgeToolStripMenuItem // - this->ToggleHitJudgeToolStripMenuItem->Name = L"ToggleHitJudgeToolStripMenuItem"; - this->ToggleHitJudgeToolStripMenuItem->ShortcutKeys = System::Windows::Forms::Keys::F1; - this->ToggleHitJudgeToolStripMenuItem->Size = System::Drawing::Size(228, 22); + this->ToggleHitJudgeToolStripMenuItem->Index = 10; + this->ToggleHitJudgeToolStripMenuItem->Shortcut = System::Windows::Forms::Shortcut::F1; this->ToggleHitJudgeToolStripMenuItem->Text = L"Switch player list view (&H)"; this->ToggleHitJudgeToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::ToggleHitJudgeToolStripMenuItem_Click); // // toolStripSeparator11 // - this->toolStripSeparator11->Name = L"toolStripSeparator11"; - this->toolStripSeparator11->Size = System::Drawing::Size(225, 6); + this->toolStripSeparator11->Index = 11; + this->toolStripSeparator11->Text = L"-"; // // GetIPToolStripMenuItem // - this->GetIPToolStripMenuItem->Name = L"GetIPToolStripMenuItem"; - this->GetIPToolStripMenuItem->Size = System::Drawing::Size(228, 22); + this->GetIPToolStripMenuItem->Index = 12; this->GetIPToolStripMenuItem->Text = L"Get &IP address"; this->GetIPToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::GetIPToolStripMenuItem_Click); // // toolStripMenuItemOption // - this->toolStripMenuItemOption->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(11) { + this->toolStripMenuItemOption->Index = 3; + this->toolStripMenuItemOption->MenuItems->AddRange(gcnew cli::array< System::Windows::Forms::MenuItem^ >(11) { this->toolStripMenuItemSetting, this->toolStripSeparator2, this->toolStripMenuItemDelay, this->toolStripSeparator3, this->toolStripMenuItemRecordReplay, this->toolStripMenuItemAllowSpectator, this->toolStripMenuItemWordWrap, this->LogLockToolStripMenuItem, this->toolStripSeparator7, this->toolStripMenuItemAfterRest, this->toolStripMenuItemAutoRest }); - this->toolStripMenuItemOption->Name = L"toolStripMenuItemOption"; - this->toolStripMenuItemOption->Size = System::Drawing::Size(61, 20); this->toolStripMenuItemOption->Text = L"&Options"; // // toolStripMenuItemSetting // - this->toolStripMenuItemSetting->Name = L"toolStripMenuItemSetting"; - this->toolStripMenuItemSetting->Size = System::Drawing::Size(178, 22); + this->toolStripMenuItemSetting->Index = 0; this->toolStripMenuItemSetting->Text = L"&Settings..."; this->toolStripMenuItemSetting->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemSetting_Click); // // toolStripSeparator2 // - this->toolStripSeparator2->Name = L"toolStripSeparator2"; - this->toolStripSeparator2->Size = System::Drawing::Size(175, 6); + this->toolStripSeparator2->Index = 1; + this->toolStripSeparator2->Text = L"-"; // // toolStripMenuItemDelay // - this->toolStripMenuItemDelay->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(13) { + this->toolStripMenuItemDelay->Index = 2; + this->toolStripMenuItemDelay->MenuItems->AddRange(gcnew cli::array< System::Windows::Forms::MenuItem^ >(13) { this->toolStripMenuItemDelayAuto, this->toolStripSeparator4, this->toolStripMenuItemDelay2, this->toolStripMenuItemDelay3, this->toolStripMenuItemDelay4, this->toolStripMenuItemDelay5, this->toolStripMenuItemDelay6, this->toolStripMenuItemDelay7, this->toolStripMenuItemDelay8, this->toolStripMenuItemDelay9, this->toolStripMenuItemDelay10, this->toolStripMenuItemDelay11, this->toolStripMenuItemDelay12 }); - this->toolStripMenuItemDelay->Name = L"toolStripMenuItemDelay"; - this->toolStripMenuItemDelay->Size = System::Drawing::Size(178, 22); this->toolStripMenuItemDelay->Text = L"&Delay"; // // toolStripMenuItemDelayAuto // this->toolStripMenuItemDelayAuto->Checked = true; - this->toolStripMenuItemDelayAuto->CheckState = System::Windows::Forms::CheckState::Checked; - this->toolStripMenuItemDelayAuto->Name = L"toolStripMenuItemDelayAuto"; - this->toolStripMenuItemDelayAuto->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelayAuto->Index = 0; this->toolStripMenuItemDelayAuto->Text = L"Auto"; this->toolStripMenuItemDelayAuto->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelayAuto_Click); // // toolStripSeparator4 // - this->toolStripSeparator4->Name = L"toolStripSeparator4"; - this->toolStripSeparator4->Size = System::Drawing::Size(97, 6); + this->toolStripSeparator4->Index = 1; + this->toolStripSeparator4->Text = L"-"; // // toolStripMenuItemDelay2 // - this->toolStripMenuItemDelay2->Name = L"toolStripMenuItemDelay2"; - this->toolStripMenuItemDelay2->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay2->Index = 2; this->toolStripMenuItemDelay2->Text = L"2"; this->toolStripMenuItemDelay2->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay2_Click); // // toolStripMenuItemDelay3 // - this->toolStripMenuItemDelay3->Name = L"toolStripMenuItemDelay3"; - this->toolStripMenuItemDelay3->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay3->Index = 3; this->toolStripMenuItemDelay3->Text = L"3"; this->toolStripMenuItemDelay3->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay3_Click); // // toolStripMenuItemDelay4 // - this->toolStripMenuItemDelay4->Name = L"toolStripMenuItemDelay4"; - this->toolStripMenuItemDelay4->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay4->Index = 4; this->toolStripMenuItemDelay4->Text = L"4"; this->toolStripMenuItemDelay4->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay4_Click); // // toolStripMenuItemDelay5 // - this->toolStripMenuItemDelay5->Name = L"toolStripMenuItemDelay5"; - this->toolStripMenuItemDelay5->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay5->Index = 5; this->toolStripMenuItemDelay5->Text = L"5"; this->toolStripMenuItemDelay5->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay5_Click); // // toolStripMenuItemDelay6 // - this->toolStripMenuItemDelay6->Name = L"toolStripMenuItemDelay6"; - this->toolStripMenuItemDelay6->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay6->Index = 6; this->toolStripMenuItemDelay6->Text = L"6"; this->toolStripMenuItemDelay6->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay6_Click); // // toolStripMenuItemDelay7 // - this->toolStripMenuItemDelay7->Name = L"toolStripMenuItemDelay7"; - this->toolStripMenuItemDelay7->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay7->Index = 7; this->toolStripMenuItemDelay7->Text = L"7"; this->toolStripMenuItemDelay7->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay7_Click); // // toolStripMenuItemDelay8 // - this->toolStripMenuItemDelay8->Name = L"toolStripMenuItemDelay8"; - this->toolStripMenuItemDelay8->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay8->Index = 8; this->toolStripMenuItemDelay8->Text = L"8"; this->toolStripMenuItemDelay8->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay8_Click); // // toolStripMenuItemDelay9 // - this->toolStripMenuItemDelay9->Name = L"toolStripMenuItemDelay9"; - this->toolStripMenuItemDelay9->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay9->Index = 9; this->toolStripMenuItemDelay9->Text = L"9"; this->toolStripMenuItemDelay9->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay9_Click); // // toolStripMenuItemDelay10 // - this->toolStripMenuItemDelay10->Name = L"toolStripMenuItemDelay10"; - this->toolStripMenuItemDelay10->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay10->Index = 10; this->toolStripMenuItemDelay10->Text = L"10"; this->toolStripMenuItemDelay10->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay10_Click); // // toolStripMenuItemDelay11 // - this->toolStripMenuItemDelay11->Name = L"toolStripMenuItemDelay11"; - this->toolStripMenuItemDelay11->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay11->Index = 11; this->toolStripMenuItemDelay11->Text = L"11"; this->toolStripMenuItemDelay11->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay11_Click); // // toolStripMenuItemDelay12 // - this->toolStripMenuItemDelay12->Name = L"toolStripMenuItemDelay12"; - this->toolStripMenuItemDelay12->Size = System::Drawing::Size(100, 22); + this->toolStripMenuItemDelay12->Index = 12; this->toolStripMenuItemDelay12->Text = L"12"; this->toolStripMenuItemDelay12->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelay12_Click); // // toolStripSeparator3 // - this->toolStripSeparator3->Name = L"toolStripSeparator3"; - this->toolStripSeparator3->Size = System::Drawing::Size(175, 6); + this->toolStripSeparator3->Index = 3; + this->toolStripSeparator3->Text = L"-"; // // toolStripMenuItemRecordReplay // this->toolStripMenuItemRecordReplay->Checked = true; - this->toolStripMenuItemRecordReplay->CheckState = System::Windows::Forms::CheckState::Checked; - this->toolStripMenuItemRecordReplay->Name = L"toolStripMenuItemRecordReplay"; - this->toolStripMenuItemRecordReplay->Size = System::Drawing::Size(178, 22); + this->toolStripMenuItemRecordReplay->Index = 4; this->toolStripMenuItemRecordReplay->Text = L"Save &replays"; this->toolStripMenuItemRecordReplay->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemRecordReplay_Click); // // toolStripMenuItemAllowSpectator // this->toolStripMenuItemAllowSpectator->Checked = true; - this->toolStripMenuItemAllowSpectator->CheckState = System::Windows::Forms::CheckState::Checked; - this->toolStripMenuItemAllowSpectator->Name = L"toolStripMenuItemAllowSpectator"; - this->toolStripMenuItemAllowSpectator->Size = System::Drawing::Size(178, 22); + this->toolStripMenuItemAllowSpectator->Index = 5; this->toolStripMenuItemAllowSpectator->Text = L"&Allow spectators"; this->toolStripMenuItemAllowSpectator->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAllowSpectator_Click); // // toolStripMenuItemWordWrap // - this->toolStripMenuItemWordWrap->Name = L"toolStripMenuItemWordWrap"; - this->toolStripMenuItemWordWrap->Size = System::Drawing::Size(178, 22); + this->toolStripMenuItemWordWrap->Index = 6; this->toolStripMenuItemWordWrap->Text = L"&Word wrap chat"; this->toolStripMenuItemWordWrap->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemWordWrap_Click); // // LogLockToolStripMenuItem // this->LogLockToolStripMenuItem->Checked = true; - this->LogLockToolStripMenuItem->CheckState = System::Windows::Forms::CheckState::Checked; - this->LogLockToolStripMenuItem->Name = L"LogLockToolStripMenuItem"; - this->LogLockToolStripMenuItem->ShortcutKeys = System::Windows::Forms::Keys::F3; - this->LogLockToolStripMenuItem->Size = System::Drawing::Size(178, 22); + this->LogLockToolStripMenuItem->Index = 7; + this->LogLockToolStripMenuItem->Shortcut = System::Windows::Forms::Shortcut::F3; this->LogLockToolStripMenuItem->Text = L"Auto-scro&ll chat"; this->LogLockToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainForm::LogLockToolStripMenuItem_Click); // // toolStripSeparator7 // - this->toolStripSeparator7->Name = L"toolStripSeparator7"; - this->toolStripSeparator7->Size = System::Drawing::Size(175, 6); + this->toolStripSeparator7->Index = 8; + this->toolStripSeparator7->Text = L"-"; // // toolStripMenuItemAfterRest // - this->toolStripMenuItemAfterRest->Name = L"toolStripMenuItemAfterRest"; - this->toolStripMenuItemAfterRest->Size = System::Drawing::Size(178, 22); + this->toolStripMenuItemAfterRest->Index = 9; this->toolStripMenuItemAfterRest->Text = L"Rest after &net battle"; this->toolStripMenuItemAfterRest->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAfterRest_Click); // // toolStripMenuItemAutoRest // - this->toolStripMenuItemAutoRest->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(9) { + this->toolStripMenuItemAutoRest->Index = 10; + this->toolStripMenuItemAutoRest->MenuItems->AddRange(gcnew cli::array< System::Windows::Forms::MenuItem^ >(9) { this->toolStripMenuItemAutoRestEnable, this->toolStripSeparator13, this->toolStripMenuItemAutoRestTime5, this->toolStripMenuItemAutoRestTime10, this->toolStripMenuItemAutoRestTime15, this->toolStripMenuItemAutoRestTime20, this->toolStripMenuItemAutoRestTime30, this->toolStripMenuItemAutoRestTime60, this->toolStripMenuItemAutoRestTime120 }); - this->toolStripMenuItemAutoRest->Name = L"toolStripMenuItemAutoRest"; - this->toolStripMenuItemAutoRest->Size = System::Drawing::Size(178, 22); this->toolStripMenuItemAutoRest->Text = L"Auto-rest after"; // // toolStripMenuItemAutoRestEnable // - this->toolStripMenuItemAutoRestEnable->Name = L"toolStripMenuItemAutoRestEnable"; - this->toolStripMenuItemAutoRestEnable->Size = System::Drawing::Size(138, 22); + this->toolStripMenuItemAutoRestEnable->Index = 0; this->toolStripMenuItemAutoRestEnable->Text = L"Enabled"; this->toolStripMenuItemAutoRestEnable->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAutoRestEnable_Click); // // toolStripSeparator13 // - this->toolStripSeparator13->Name = L"toolStripSeparator13"; - this->toolStripSeparator13->Size = System::Drawing::Size(135, 6); + this->toolStripSeparator13->Index = 1; + this->toolStripSeparator13->Text = L"-"; // // toolStripMenuItemAutoRestTime5 // - this->toolStripMenuItemAutoRestTime5->Name = L"toolStripMenuItemAutoRestTime5"; - this->toolStripMenuItemAutoRestTime5->Size = System::Drawing::Size(138, 22); + this->toolStripMenuItemAutoRestTime5->Index = 2; + this->toolStripMenuItemAutoRestTime5->RadioCheck = true; this->toolStripMenuItemAutoRestTime5->Text = L"5 minutes"; this->toolStripMenuItemAutoRestTime5->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAutoRestTime5_Click); // // toolStripMenuItemAutoRestTime10 // - this->toolStripMenuItemAutoRestTime10->Name = L"toolStripMenuItemAutoRestTime10"; - this->toolStripMenuItemAutoRestTime10->Size = System::Drawing::Size(138, 22); + this->toolStripMenuItemAutoRestTime10->Index = 3; + this->toolStripMenuItemAutoRestTime10->RadioCheck = true; this->toolStripMenuItemAutoRestTime10->Text = L"10 minutes"; this->toolStripMenuItemAutoRestTime10->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAutoRestTime10_Click); // // toolStripMenuItemAutoRestTime15 // - this->toolStripMenuItemAutoRestTime15->Name = L"toolStripMenuItemAutoRestTime15"; - this->toolStripMenuItemAutoRestTime15->Size = System::Drawing::Size(138, 22); + this->toolStripMenuItemAutoRestTime15->Index = 4; + this->toolStripMenuItemAutoRestTime15->RadioCheck = true; this->toolStripMenuItemAutoRestTime15->Text = L"15 minutes"; this->toolStripMenuItemAutoRestTime15->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAutoRestTime15_Click); // // toolStripMenuItemAutoRestTime20 // - this->toolStripMenuItemAutoRestTime20->Name = L"toolStripMenuItemAutoRestTime20"; - this->toolStripMenuItemAutoRestTime20->Size = System::Drawing::Size(138, 22); + this->toolStripMenuItemAutoRestTime20->Index = 5; + this->toolStripMenuItemAutoRestTime20->RadioCheck = true; this->toolStripMenuItemAutoRestTime20->Text = L"20 minutes"; this->toolStripMenuItemAutoRestTime20->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAutoRestTime20_Click); // // toolStripMenuItemAutoRestTime30 // - this->toolStripMenuItemAutoRestTime30->Name = L"toolStripMenuItemAutoRestTime30"; - this->toolStripMenuItemAutoRestTime30->Size = System::Drawing::Size(138, 22); + this->toolStripMenuItemAutoRestTime30->Index = 6; + this->toolStripMenuItemAutoRestTime30->RadioCheck = true; this->toolStripMenuItemAutoRestTime30->Text = L"30 minutes"; this->toolStripMenuItemAutoRestTime30->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAutoRestTime30_Click); // // toolStripMenuItemAutoRestTime60 // - this->toolStripMenuItemAutoRestTime60->Name = L"toolStripMenuItemAutoRestTime60"; - this->toolStripMenuItemAutoRestTime60->Size = System::Drawing::Size(138, 22); + this->toolStripMenuItemAutoRestTime60->Index = 7; + this->toolStripMenuItemAutoRestTime60->RadioCheck = true; this->toolStripMenuItemAutoRestTime60->Text = L"60 minutes"; this->toolStripMenuItemAutoRestTime60->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAutoRestTime60_Click); // // toolStripMenuItemAutoRestTime120 // - this->toolStripMenuItemAutoRestTime120->Name = L"toolStripMenuItemAutoRestTime120"; - this->toolStripMenuItemAutoRestTime120->Size = System::Drawing::Size(138, 22); + this->toolStripMenuItemAutoRestTime120->Index = 8; + this->toolStripMenuItemAutoRestTime120->RadioCheck = true; this->toolStripMenuItemAutoRestTime120->Text = L"120 minutes"; this->toolStripMenuItemAutoRestTime120->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemAutoRestTime120_Click); // // toolStripMenuItemHelp // - this->toolStripMenuItemHelp->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(4) { + this->toolStripMenuItemHelp->Index = 4; + this->toolStripMenuItemHelp->MenuItems->AddRange(gcnew cli::array< System::Windows::Forms::MenuItem^ >(4) { this->toolStripMenuItemViewCommand, this->toolStripMenuItemChangeList, this->toolStripSeparator5, this->toolStripMenuItemVersion }); - this->toolStripMenuItemHelp->Name = L"toolStripMenuItemHelp"; - this->toolStripMenuItemHelp->ShortcutKeyDisplayString = L"Ctrl+L"; - this->toolStripMenuItemHelp->Size = System::Drawing::Size(44, 20); this->toolStripMenuItemHelp->Text = L"&Help"; // // toolStripMenuItemViewCommand // - this->toolStripMenuItemViewCommand->Name = L"toolStripMenuItemViewCommand"; - this->toolStripMenuItemViewCommand->Size = System::Drawing::Size(175, 22); + this->toolStripMenuItemViewCommand->Index = 0; this->toolStripMenuItemViewCommand->Text = L"&Command List"; this->toolStripMenuItemViewCommand->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemViewCommand_Click); // // toolStripMenuItemChangeList // - this->toolStripMenuItemChangeList->Name = L"toolStripMenuItemChangeList"; - this->toolStripMenuItemChangeList->ShortcutKeys = System::Windows::Forms::Keys::F2; - this->toolStripMenuItemChangeList->Size = System::Drawing::Size(175, 22); + this->toolStripMenuItemChangeList->Index = 1; + this->toolStripMenuItemChangeList->Shortcut = System::Windows::Forms::Shortcut::F2; this->toolStripMenuItemChangeList->Text = L"Toggle &list view"; this->toolStripMenuItemChangeList->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemChangeList_Click); // // toolStripSeparator5 // - this->toolStripSeparator5->Name = L"toolStripSeparator5"; - this->toolStripSeparator5->Size = System::Drawing::Size(172, 6); + this->toolStripSeparator5->Index = 2; + this->toolStripSeparator5->Text = L"-"; // // toolStripMenuItemVersion // - this->toolStripMenuItemVersion->Name = L"toolStripMenuItemVersion"; - this->toolStripMenuItemVersion->Size = System::Drawing::Size(175, 22); + this->toolStripMenuItemVersion->Index = 3; this->toolStripMenuItemVersion->Text = L"&About..."; this->toolStripMenuItemVersion->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemVersion_Click); // @@ -751,7 +696,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; | System::Windows::Forms::AnchorStyles::Left) | System::Windows::Forms::AnchorStyles::Right)); this->splitContainer1->BorderStyle = System::Windows::Forms::BorderStyle::FixedSingle; - this->splitContainer1->Location = System::Drawing::Point(0, 28); + this->splitContainer1->Location = System::Drawing::Point(0, 0); this->splitContainer1->Name = L"splitContainer1"; // // splitContainer1.Panel1 @@ -760,77 +705,68 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; // // splitContainer1.Panel2 // - this->splitContainer1->Panel2->Controls->Add(this->richTextBoxLog); this->splitContainer1->Panel2->Controls->Add(this->textBoxInput); - this->splitContainer1->Size = System::Drawing::Size(528, 322); - this->splitContainer1->SplitterDistance = 90; + this->splitContainer1->Panel2->Controls->Add(this->richTextBoxLog); + this->splitContainer1->Size = System::Drawing::Size(656, 375); + this->splitContainer1->SplitterDistance = 96; this->splitContainer1->TabIndex = 2; this->splitContainer1->TabStop = false; // // listBoxMember // this->listBoxMember->BorderStyle = System::Windows::Forms::BorderStyle::None; - this->listBoxMember->ContextMenuStrip = this->contextMenuStripMember; + this->listBoxMember->ContextMenu = this->contextMenuStrip1; this->listBoxMember->Dock = System::Windows::Forms::DockStyle::Fill; this->listBoxMember->DrawMode = System::Windows::Forms::DrawMode::OwnerDrawFixed; this->listBoxMember->FormattingEnabled = true; this->listBoxMember->ItemHeight = 12; this->listBoxMember->Location = System::Drawing::Point(0, 0); this->listBoxMember->Name = L"listBoxMember"; - this->listBoxMember->Size = System::Drawing::Size(88, 320); + this->listBoxMember->Size = System::Drawing::Size(94, 373); this->listBoxMember->TabIndex = 2; this->listBoxMember->MouseClick += gcnew System::Windows::Forms::MouseEventHandler(this, &MainForm::listBoxMember_MouseClick); this->listBoxMember->DrawItem += gcnew System::Windows::Forms::DrawItemEventHandler(this, &MainForm::listBoxMember_DrawItem); this->listBoxMember->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &MainForm::listBoxMember_MouseDoubleClick); // - // contextMenuStripMember + // contextMenuStrip1 // - this->contextMenuStripMember->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(6) { + this->contextMenuStrip1->MenuItems->AddRange(gcnew cli::array< System::Windows::Forms::MenuItem^ >(6) { this->toolStripMenuItemVS, this->toolStripMenuItemWatch, this->toolStripMenuItemSeek, this->toolStripMenuItemPing, this->toolStripSeparator12, this->toolStripMenuItemKick }); - this->contextMenuStripMember->Name = L"contextMenuStrip1"; - this->contextMenuStripMember->ShowImageMargin = false; - this->contextMenuStripMember->Size = System::Drawing::Size(122, 120); - this->contextMenuStripMember->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &MainForm::contextMenuStripMember_Opening); // // toolStripMenuItemVS // - this->toolStripMenuItemVS->Name = L"toolStripMenuItemVS"; - this->toolStripMenuItemVS->Size = System::Drawing::Size(121, 22); + this->toolStripMenuItemVS->Index = 0; this->toolStripMenuItemVS->Text = L"Fight"; this->toolStripMenuItemVS->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemVS_Click); // // toolStripMenuItemWatch // - this->toolStripMenuItemWatch->Name = L"toolStripMenuItemWatch"; - this->toolStripMenuItemWatch->Size = System::Drawing::Size(121, 22); + this->toolStripMenuItemWatch->Index = 1; this->toolStripMenuItemWatch->Text = L"Spectate"; this->toolStripMenuItemWatch->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemWatch_Click); // // toolStripMenuItemSeek // - this->toolStripMenuItemSeek->Name = L"toolStripMenuItemSeek"; - this->toolStripMenuItemSeek->Size = System::Drawing::Size(121, 22); - this->toolStripMenuItemSeek->Text = L"Seek/Challenge"; //åÆ¾ęˆ¦å‹Ÿé›†ć™ć‚‹ + this->toolStripMenuItemSeek->Index = 2; + this->toolStripMenuItemSeek->Text = L"Seek/Challenge"; this->toolStripMenuItemSeek->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemSeek_Click); // // toolStripMenuItemPing // - this->toolStripMenuItemPing->Name = L"toolStripMenuItemPing"; - this->toolStripMenuItemPing->Size = System::Drawing::Size(121, 22); + this->toolStripMenuItemPing->Index = 3; this->toolStripMenuItemPing->Text = L"Ping"; this->toolStripMenuItemPing->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemPing_Click); // // toolStripSeparator12 // - this->toolStripSeparator12->Name = L"toolStripSeparator12"; - this->toolStripSeparator12->Size = System::Drawing::Size(118, 6); + this->toolStripSeparator12->Index = 4; + this->toolStripSeparator12->Text = L"-"; // // toolStripMenuItemKick // - this->toolStripMenuItemKick->Name = L"toolStripMenuItemKick"; - this->toolStripMenuItemKick->Size = System::Drawing::Size(121, 22); + this->toolStripMenuItemKick->Index = 5; this->toolStripMenuItemKick->Text = L"Kick"; this->toolStripMenuItemKick->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemKick_Click); // @@ -838,46 +774,41 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; // this->richTextBoxLog->BackColor = System::Drawing::SystemColors::Window; this->richTextBoxLog->BorderStyle = System::Windows::Forms::BorderStyle::None; - this->richTextBoxLog->ContextMenuStrip = this->contextMenuStripLog; + this->richTextBoxLog->ContextMenu = this->contextMenuStrip2; this->richTextBoxLog->Dock = System::Windows::Forms::DockStyle::Fill; this->richTextBoxLog->Location = System::Drawing::Point(0, 0); this->richTextBoxLog->Name = L"richTextBoxLog"; this->richTextBoxLog->ReadOnly = true; - this->richTextBoxLog->Size = System::Drawing::Size(432, 300); + this->richTextBoxLog->Size = System::Drawing::Size(554, 373); this->richTextBoxLog->TabIndex = 0; this->richTextBoxLog->TabStop = false; this->richTextBoxLog->Text = L""; this->richTextBoxLog->WordWrap = false; this->richTextBoxLog->LinkClicked += gcnew System::Windows::Forms::LinkClickedEventHandler(this, &MainForm::richTextBoxLog_LinkClicked); // - // contextMenuStripLog + // contextMenuStrip2 // - this->contextMenuStripLog->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(3) { + this->contextMenuStrip2->MenuItems->AddRange(gcnew cli::array< System::Windows::Forms::MenuItem^ >(3) { this->contextMenuItemCopy, this->toolStripSeparator6, this->contxtMenuItemSaveLog }); - this->contextMenuStripLog->Name = L"contextMenuStrip2"; - this->contextMenuStripLog->ShowImageMargin = false; - this->contextMenuStripLog->Size = System::Drawing::Size(164, 54); // // contextMenuItemCopy // - this->contextMenuItemCopy->Name = L"contextMenuItemCopy"; - this->contextMenuItemCopy->ShortcutKeys = static_cast((System::Windows::Forms::Keys::Control | System::Windows::Forms::Keys::C)); - this->contextMenuItemCopy->Size = System::Drawing::Size(163, 22); + this->contextMenuItemCopy->Index = 0; + this->contextMenuItemCopy->Shortcut = System::Windows::Forms::Shortcut::CtrlC; this->contextMenuItemCopy->Text = L"&Copy"; this->contextMenuItemCopy->Click += gcnew System::EventHandler(this, &MainForm::contextMenuItemCopy_Click); // // toolStripSeparator6 // - this->toolStripSeparator6->Name = L"toolStripSeparator6"; - this->toolStripSeparator6->Size = System::Drawing::Size(160, 6); + this->toolStripSeparator6->Index = 1; + this->toolStripSeparator6->Text = L"-"; // // contxtMenuItemSaveLog // - this->contxtMenuItemSaveLog->Name = L"contxtMenuItemSaveLog"; - this->contxtMenuItemSaveLog->ShortcutKeys = static_cast((System::Windows::Forms::Keys::Control | System::Windows::Forms::Keys::S)); - this->contxtMenuItemSaveLog->Size = System::Drawing::Size(163, 22); + this->contxtMenuItemSaveLog->Index = 2; + this->contxtMenuItemSaveLog->Shortcut = System::Windows::Forms::Shortcut::CtrlS; this->contxtMenuItemSaveLog->Text = L"&Save log"; this->contxtMenuItemSaveLog->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemSaveLog_Click); // @@ -885,10 +816,10 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; // this->textBoxInput->BackColor = System::Drawing::SystemColors::Window; this->textBoxInput->Dock = System::Windows::Forms::DockStyle::Bottom; - this->textBoxInput->Location = System::Drawing::Point(0, 300); - this->textBoxInput->MaxLength = 127; + this->textBoxInput->Location = System::Drawing::Point(0, 353); + this->textBoxInput->MaxLength = 255; this->textBoxInput->Name = L"textBoxInput"; - this->textBoxInput->Size = System::Drawing::Size(432, 20); + this->textBoxInput->Size = System::Drawing::Size(554, 20); this->textBoxInput->TabIndex = 0; this->textBoxInput->KeyDown += gcnew System::Windows::Forms::KeyEventHandler(this, &MainForm::textBoxInput_KeyDown); // @@ -903,10 +834,10 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; this->toolStripDropDownButtonProfile, this->toolStripStatusLabel }); - this->statusStrip1->Location = System::Drawing::Point(0, 357); + this->statusStrip1->Location = System::Drawing::Point(0, 378); this->statusStrip1->Name = L"statusStrip1"; this->statusStrip1->RightToLeft = System::Windows::Forms::RightToLeft::No; - this->statusStrip1->Size = System::Drawing::Size(528, 22); + this->statusStrip1->Size = System::Drawing::Size(658, 22); this->statusStrip1->TabIndex = 3; this->statusStrip1->Text = L"statusStrip1"; // @@ -934,12 +865,11 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; this->AllowDrop = true; this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; - this->ClientSize = System::Drawing::Size(528, 379); + this->ClientSize = System::Drawing::Size(658, 400); this->Controls->Add(this->statusStrip1); this->Controls->Add(this->splitContainer1); - this->Controls->Add(this->menuStrip1); this->Icon = (cli::safe_cast(resources->GetObject(L"$this.Icon"))); - this->MainMenuStrip = this->menuStrip1; + this->Menu = this->menuStrip1; this->Name = L"MainForm"; this->Text = L"LilithPort"; this->FormClosing += gcnew System::Windows::Forms::FormClosingEventHandler(this, &MainForm::MainForm_FormClosing); @@ -948,15 +878,11 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; this->Shown += gcnew System::EventHandler(this, &MainForm::MainForm_Shown); this->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &MainForm::MainForm_DragDrop); this->DragEnter += gcnew System::Windows::Forms::DragEventHandler(this, &MainForm::MainForm_DragEnter); - this->menuStrip1->ResumeLayout(false); - this->menuStrip1->PerformLayout(); this->splitContainer1->Panel1->ResumeLayout(false); this->splitContainer1->Panel2->ResumeLayout(false); this->splitContainer1->Panel2->PerformLayout(); (cli::safe_cast(this->splitContainer1))->EndInit(); this->splitContainer1->ResumeLayout(false); - this->contextMenuStripMember->ResumeLayout(false); - this->contextMenuStripLog->ResumeLayout(false); this->statusStrip1->ResumeLayout(false); this->statusStrip1->PerformLayout(); this->ResumeLayout(false); @@ -2690,16 +2616,16 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; String^ tmpIP = ConnectIP; UINT tmpInt = MTOPTION.BOOKMARK_COUNT; - toolStripMenuItemBookMark = (gcnew System::Windows::Forms::ToolStripMenuItem()); - toolStripMenuItemBookMarkMenu->DropDownItems->Add(toolStripMenuItemBookMark); + toolStripMenuItemBookMark = (gcnew System::Windows::Forms::MenuItem()); + toolStripMenuItemBookMarkMenu->MenuItems->Add(toolStripMenuItemBookMark); toolStripMenuItemBookMark->Text = ServerName; toolStripMenuItemBookMark->Name = L"toolStripMenuItemBookMark" + MTOPTION.BOOKMARK_COUNT; toolStripMenuItemBookMark->Tag = MTOPTION.BOOKMARK_COUNT; toolStripMenuItemBookMark->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemBookMark_Click); // å‰Šé™¤ćƒ”ćƒ‹ćƒ„ćƒ¼ - toolStripMenuItemDelBookMark = (gcnew System::Windows::Forms::ToolStripMenuItem()); - toolStripMenuItemBookMark->DropDownItems->Add(toolStripMenuItemDelBookMark); + toolStripMenuItemDelBookMark = (gcnew System::Windows::Forms::MenuItem()); + toolStripMenuItemBookMark->MenuItems->Add(toolStripMenuItemDelBookMark); toolStripMenuItemDelBookMark->Text = L"&Delete"; toolStripMenuItemDelBookMark->Tag = L"toolStripMenuItemBookMark" + MTOPTION.BOOKMARK_COUNT; toolStripMenuItemDelBookMark->Click += gcnew System::EventHandler(this, &MainForm::toolStripMenuItemDelBookMark_Click); @@ -2721,9 +2647,9 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; } // 惖惃ć‚Æćƒžćƒ¼ć‚Æꎄē¶š System::Void toolStripMenuItemBookMark_Click(System::Object^ sender, System::EventArgs^ e) { - UINT tmpInt = (UINT)((ToolStripMenuItem^)sender)->Tag; + UINT tmpInt = (UINT)((MenuItem^)sender)->Tag; - if(MessageBox::Show(L"Connect to "+((ToolStripMenuItem^)sender)->Text+ L"?\n", L"Connect from Bookmark", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == ::DialogResult::Yes){ + if(MessageBox::Show(L"Connect to "+((MenuItem^)sender)->Text+ L"?\n", L"Connect from Bookmark", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == ::DialogResult::Yes){ }else{ return; } @@ -2737,10 +2663,10 @@ private: System::Windows::Forms::ToolStripMenuItem^ toolStripMenuItemWordWrap; // 惖惃ć‚Æćƒžćƒ¼ć‚Æ削除 System::Void toolStripMenuItemDelBookMark_Click(System::Object^ sender, System::EventArgs^ e) { Object^ tmpTag; - tmpTag = ((ToolStripMenuItem^)sender)->Tag; - UINT tmpInt = (UINT)toolStripMenuItemBookMarkMenu->DropDownItems[(String^)tmpTag]->Tag; - if(MessageBox::Show((String^)toolStripMenuItemBookMarkMenu->DropDownItems[(String^)tmpTag]->Text+ L" will be deleted.\nContinue?", L"Delete Bookmark", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == ::DialogResult::Yes){ - toolStripMenuItemBookMarkMenu->DropDownItems->Remove(toolStripMenuItemBookMarkMenu->DropDownItems[(String^)tmpTag]); + tmpTag = ((MenuItem^)sender)->Tag; + UINT tmpInt = (UINT)toolStripMenuItemBookMarkMenu->MenuItems[(String^)tmpTag]->Tag; + if(MessageBox::Show((String^)toolStripMenuItemBookMarkMenu->MenuItems[(String^)tmpTag]->Text+ L" will be deleted.\nContinue?", L"Delete Bookmark", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == ::DialogResult::Yes){ + toolStripMenuItemBookMarkMenu->MenuItems->Remove(toolStripMenuItemBookMarkMenu->MenuItems[(String^)tmpTag]); MTOPTION.BOOKMARK_DELETED_COUNT++; ZeroMemory(MTOPTION.BOOKMARK_SERVER_NAME[tmpInt], sizeof(MTOPTION.BOOKMARK_SERVER_NAME[tmpInt])); diff --git a/LilithPort/MainForm.resX b/LilithPort/MainForm.resX index 4951484..14b688a 100644 --- a/LilithPort/MainForm.resX +++ b/LilithPort/MainForm.resX @@ -121,22 +121,22 @@ False + 327, 17 + + 17, 17 - - 127, 17 - - - 277, 17 + + 172, 17 - 439, 17 + 442, 17 - 571, 17 + 582, 17 - 713, 17 + 718, 17 diff --git a/LilithPort/OptionForm.h b/LilithPort/OptionForm.h index b6b8dae..92f3ffd 100644 --- a/LilithPort/OptionForm.h +++ b/LilithPort/OptionForm.h @@ -409,8 +409,9 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonOK // + this->buttonOK->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Right)); this->buttonOK->DialogResult = System::Windows::Forms::DialogResult::OK; - this->buttonOK->Location = System::Drawing::Point(165, 371); + this->buttonOK->Location = System::Drawing::Point(194, 381); this->buttonOK->Name = L"buttonOK"; this->buttonOK->Size = System::Drawing::Size(64, 26); this->buttonOK->TabIndex = 7; @@ -420,18 +421,20 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonApply // - this->buttonApply->Location = System::Drawing::Point(305, 371); + this->buttonApply->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Right)); + this->buttonApply->Location = System::Drawing::Point(334, 381); this->buttonApply->Name = L"buttonApply"; this->buttonApply->Size = System::Drawing::Size(64, 26); this->buttonApply->TabIndex = 8; - this->buttonApply->Text = L"&Apply"; + this->buttonApply->Text = L"Apply"; this->buttonApply->UseVisualStyleBackColor = true; this->buttonApply->Click += gcnew System::EventHandler(this, &OptionForm::buttonApply_Click); // // buttonCancel // + this->buttonCancel->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Right)); this->buttonCancel->DialogResult = System::Windows::Forms::DialogResult::Cancel; - this->buttonCancel->Location = System::Drawing::Point(235, 371); + this->buttonCancel->Location = System::Drawing::Point(264, 381); this->buttonCancel->Name = L"buttonCancel"; this->buttonCancel->Size = System::Drawing::Size(64, 26); this->buttonCancel->TabIndex = 9; @@ -461,13 +464,15 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->tabPageSound->Location = System::Drawing::Point(4, 22); this->tabPageSound->Name = L"tabPageSound"; this->tabPageSound->Padding = System::Windows::Forms::Padding(3); - this->tabPageSound->Size = System::Drawing::Size(369, 339); + this->tabPageSound->Size = System::Drawing::Size(398, 349); this->tabPageSound->TabIndex = 3; this->tabPageSound->Text = L"Sounds"; this->tabPageSound->UseVisualStyleBackColor = true; // // groupBoxKeywordSound // + this->groupBoxKeywordSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxKeywordSound->Controls->Add(this->buttonKeywordSoundPlay); this->groupBoxKeywordSound->Controls->Add(this->checkBoxKeywordSound); this->groupBoxKeywordSound->Controls->Add(this->buttonKeywordSound); @@ -476,14 +481,15 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->groupBoxKeywordSound->Controls->Add(this->textBoxKeyword); this->groupBoxKeywordSound->Location = System::Drawing::Point(9, 375); this->groupBoxKeywordSound->Name = L"groupBoxKeywordSound"; - this->groupBoxKeywordSound->Size = System::Drawing::Size(335, 104); + this->groupBoxKeywordSound->Size = System::Drawing::Size(364, 104); this->groupBoxKeywordSound->TabIndex = 7; this->groupBoxKeywordSound->TabStop = false; this->groupBoxKeywordSound->Text = L"Play on keyword(s)"; // // buttonKeywordSoundPlay // - this->buttonKeywordSoundPlay->Location = System::Drawing::Point(260, 67); + this->buttonKeywordSoundPlay->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonKeywordSoundPlay->Location = System::Drawing::Point(289, 67); this->buttonKeywordSoundPlay->Name = L"buttonKeywordSoundPlay"; this->buttonKeywordSoundPlay->Size = System::Drawing::Size(65, 22); this->buttonKeywordSoundPlay->TabIndex = 5; @@ -493,8 +499,9 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // checkBoxKeywordSound // + this->checkBoxKeywordSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->checkBoxKeywordSound->AutoSize = true; - this->checkBoxKeywordSound->Location = System::Drawing::Point(197, 70); + this->checkBoxKeywordSound->Location = System::Drawing::Point(226, 70); this->checkBoxKeywordSound->Name = L"checkBoxKeywordSound"; this->checkBoxKeywordSound->Size = System::Drawing::Size(65, 17); this->checkBoxKeywordSound->TabIndex = 4; @@ -504,7 +511,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonKeywordSound // - this->buttonKeywordSound->Location = System::Drawing::Point(166, 67); + this->buttonKeywordSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonKeywordSound->Location = System::Drawing::Point(195, 67); this->buttonKeywordSound->Name = L"buttonKeywordSound"; this->buttonKeywordSound->Size = System::Drawing::Size(24, 22); this->buttonKeywordSound->TabIndex = 3; @@ -515,9 +523,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // textBoxKeywordSoundPath // this->textBoxKeywordSoundPath->AllowDrop = true; + this->textBoxKeywordSoundPath->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxKeywordSoundPath->Location = System::Drawing::Point(10, 68); this->textBoxKeywordSoundPath->Name = L"textBoxKeywordSoundPath"; - this->textBoxKeywordSoundPath->Size = System::Drawing::Size(150, 20); + this->textBoxKeywordSoundPath->Size = System::Drawing::Size(179, 20); this->textBoxKeywordSoundPath->TabIndex = 2; this->textBoxKeywordSoundPath->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); this->textBoxKeywordSoundPath->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &OptionForm::textBoxKeywordSound_DragDrop); @@ -534,28 +544,33 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // textBoxKeyword // + this->textBoxKeyword->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxKeyword->Location = System::Drawing::Point(10, 38); this->textBoxKeyword->Name = L"textBoxKeyword"; - this->textBoxKeyword->Size = System::Drawing::Size(315, 20); + this->textBoxKeyword->Size = System::Drawing::Size(344, 20); this->textBoxKeyword->TabIndex = 0; this->textBoxKeyword->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); // // groupBoxSeekSound // + this->groupBoxSeekSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxSeekSound->Controls->Add(this->buttonSeekSoundPlay); this->groupBoxSeekSound->Controls->Add(this->checkBoxSeekSound); this->groupBoxSeekSound->Controls->Add(this->buttonSeekSound); this->groupBoxSeekSound->Controls->Add(this->textBoxSeekSound); this->groupBoxSeekSound->Location = System::Drawing::Point(8, 311); this->groupBoxSeekSound->Name = L"groupBoxSeekSound"; - this->groupBoxSeekSound->Size = System::Drawing::Size(336, 56); + this->groupBoxSeekSound->Size = System::Drawing::Size(365, 56); this->groupBoxSeekSound->TabIndex = 6; this->groupBoxSeekSound->TabStop = false; this->groupBoxSeekSound->Text = L"Challenge request"; // // buttonSeekSoundPlay // - this->buttonSeekSoundPlay->Location = System::Drawing::Point(261, 21); + this->buttonSeekSoundPlay->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonSeekSoundPlay->Location = System::Drawing::Point(290, 21); this->buttonSeekSoundPlay->Name = L"buttonSeekSoundPlay"; this->buttonSeekSoundPlay->Size = System::Drawing::Size(65, 22); this->buttonSeekSoundPlay->TabIndex = 3; @@ -565,8 +580,9 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // checkBoxSeekSound // + this->checkBoxSeekSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->checkBoxSeekSound->AutoSize = true; - this->checkBoxSeekSound->Location = System::Drawing::Point(197, 23); + this->checkBoxSeekSound->Location = System::Drawing::Point(226, 23); this->checkBoxSeekSound->Name = L"checkBoxSeekSound"; this->checkBoxSeekSound->Size = System::Drawing::Size(65, 17); this->checkBoxSeekSound->TabIndex = 2; @@ -576,7 +592,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonSeekSound // - this->buttonSeekSound->Location = System::Drawing::Point(167, 20); + this->buttonSeekSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonSeekSound->Location = System::Drawing::Point(196, 20); this->buttonSeekSound->Name = L"buttonSeekSound"; this->buttonSeekSound->Size = System::Drawing::Size(24, 22); this->buttonSeekSound->TabIndex = 1; @@ -587,9 +604,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // textBoxSeekSound // this->textBoxSeekSound->AllowDrop = true; + this->textBoxSeekSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxSeekSound->Location = System::Drawing::Point(10, 21); this->textBoxSeekSound->Name = L"textBoxSeekSound"; - this->textBoxSeekSound->Size = System::Drawing::Size(151, 20); + this->textBoxSeekSound->Size = System::Drawing::Size(180, 20); this->textBoxSeekSound->TabIndex = 0; this->textBoxSeekSound->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); this->textBoxSeekSound->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &OptionForm::textBoxSeekSound_DragDrop); @@ -597,20 +616,23 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxTalkSound // + this->groupBoxTalkSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxTalkSound->Controls->Add(this->buttonTalkSoundPlay); this->groupBoxTalkSound->Controls->Add(this->checkBoxTalkSound); this->groupBoxTalkSound->Controls->Add(this->buttonTalkSound); this->groupBoxTalkSound->Controls->Add(this->textBoxTalkSound); this->groupBoxTalkSound->Location = System::Drawing::Point(8, 247); this->groupBoxTalkSound->Name = L"groupBoxTalkSound"; - this->groupBoxTalkSound->Size = System::Drawing::Size(336, 56); + this->groupBoxTalkSound->Size = System::Drawing::Size(365, 56); this->groupBoxTalkSound->TabIndex = 5; this->groupBoxTalkSound->TabStop = false; this->groupBoxTalkSound->Text = L"Chat"; // // buttonTalkSoundPlay // - this->buttonTalkSoundPlay->Location = System::Drawing::Point(261, 21); + this->buttonTalkSoundPlay->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonTalkSoundPlay->Location = System::Drawing::Point(290, 21); this->buttonTalkSoundPlay->Name = L"buttonTalkSoundPlay"; this->buttonTalkSoundPlay->Size = System::Drawing::Size(65, 22); this->buttonTalkSoundPlay->TabIndex = 3; @@ -620,8 +642,9 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // checkBoxTalkSound // + this->checkBoxTalkSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->checkBoxTalkSound->AutoSize = true; - this->checkBoxTalkSound->Location = System::Drawing::Point(197, 23); + this->checkBoxTalkSound->Location = System::Drawing::Point(226, 23); this->checkBoxTalkSound->Name = L"checkBoxTalkSound"; this->checkBoxTalkSound->Size = System::Drawing::Size(65, 17); this->checkBoxTalkSound->TabIndex = 2; @@ -631,7 +654,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonTalkSound // - this->buttonTalkSound->Location = System::Drawing::Point(167, 20); + this->buttonTalkSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonTalkSound->Location = System::Drawing::Point(196, 20); this->buttonTalkSound->Name = L"buttonTalkSound"; this->buttonTalkSound->Size = System::Drawing::Size(24, 22); this->buttonTalkSound->TabIndex = 1; @@ -642,9 +666,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // textBoxTalkSound // this->textBoxTalkSound->AllowDrop = true; + this->textBoxTalkSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxTalkSound->Location = System::Drawing::Point(10, 21); this->textBoxTalkSound->Name = L"textBoxTalkSound"; - this->textBoxTalkSound->Size = System::Drawing::Size(151, 20); + this->textBoxTalkSound->Size = System::Drawing::Size(180, 20); this->textBoxTalkSound->TabIndex = 0; this->textBoxTalkSound->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); this->textBoxTalkSound->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &OptionForm::textBoxTalkSound_DragDrop); @@ -652,20 +678,23 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxName // + this->groupBoxName->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxName->Controls->Add(this->buttonNameSoundPlay); this->groupBoxName->Controls->Add(this->checkBoxNameSound); this->groupBoxName->Controls->Add(this->buttonNameSound); this->groupBoxName->Controls->Add(this->textBoxNameSound); this->groupBoxName->Location = System::Drawing::Point(8, 187); this->groupBoxName->Name = L"groupBoxName"; - this->groupBoxName->Size = System::Drawing::Size(336, 56); + this->groupBoxName->Size = System::Drawing::Size(365, 56); this->groupBoxName->TabIndex = 4; this->groupBoxName->TabStop = false; this->groupBoxName->Text = L"When nickname is mentioned"; // // buttonNameSoundPlay // - this->buttonNameSoundPlay->Location = System::Drawing::Point(261, 21); + this->buttonNameSoundPlay->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonNameSoundPlay->Location = System::Drawing::Point(290, 21); this->buttonNameSoundPlay->Name = L"buttonNameSoundPlay"; this->buttonNameSoundPlay->Size = System::Drawing::Size(65, 22); this->buttonNameSoundPlay->TabIndex = 5; @@ -675,8 +704,9 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // checkBoxNameSound // + this->checkBoxNameSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->checkBoxNameSound->AutoSize = true; - this->checkBoxNameSound->Location = System::Drawing::Point(197, 23); + this->checkBoxNameSound->Location = System::Drawing::Point(226, 23); this->checkBoxNameSound->Name = L"checkBoxNameSound"; this->checkBoxNameSound->Size = System::Drawing::Size(65, 17); this->checkBoxNameSound->TabIndex = 4; @@ -686,7 +716,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonNameSound // - this->buttonNameSound->Location = System::Drawing::Point(167, 20); + this->buttonNameSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonNameSound->Location = System::Drawing::Point(196, 20); this->buttonNameSound->Name = L"buttonNameSound"; this->buttonNameSound->Size = System::Drawing::Size(24, 22); this->buttonNameSound->TabIndex = 3; @@ -697,9 +728,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // textBoxNameSound // this->textBoxNameSound->AllowDrop = true; + this->textBoxNameSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxNameSound->Location = System::Drawing::Point(11, 21); this->textBoxNameSound->Name = L"textBoxNameSound"; - this->textBoxNameSound->Size = System::Drawing::Size(150, 20); + this->textBoxNameSound->Size = System::Drawing::Size(179, 20); this->textBoxNameSound->TabIndex = 2; this->textBoxNameSound->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); this->textBoxNameSound->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &OptionForm::textBoxNameSound_DragDrop); @@ -707,20 +740,23 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxEnterSound // + this->groupBoxEnterSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxEnterSound->Controls->Add(this->buttonEnterSoundPlay); this->groupBoxEnterSound->Controls->Add(this->checkBoxEnterSound); this->groupBoxEnterSound->Controls->Add(this->textBoxEnterSound); this->groupBoxEnterSound->Controls->Add(this->buttonEnterSound); this->groupBoxEnterSound->Location = System::Drawing::Point(8, 128); this->groupBoxEnterSound->Name = L"groupBoxEnterSound"; - this->groupBoxEnterSound->Size = System::Drawing::Size(336, 56); + this->groupBoxEnterSound->Size = System::Drawing::Size(365, 56); this->groupBoxEnterSound->TabIndex = 3; this->groupBoxEnterSound->TabStop = false; this->groupBoxEnterSound->Text = L"Player join"; // // buttonEnterSoundPlay // - this->buttonEnterSoundPlay->Location = System::Drawing::Point(261, 22); + this->buttonEnterSoundPlay->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonEnterSoundPlay->Location = System::Drawing::Point(290, 22); this->buttonEnterSoundPlay->Name = L"buttonEnterSoundPlay"; this->buttonEnterSoundPlay->Size = System::Drawing::Size(65, 22); this->buttonEnterSoundPlay->TabIndex = 4; @@ -730,8 +766,9 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // checkBoxEnterSound // + this->checkBoxEnterSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->checkBoxEnterSound->AutoSize = true; - this->checkBoxEnterSound->Location = System::Drawing::Point(197, 24); + this->checkBoxEnterSound->Location = System::Drawing::Point(226, 24); this->checkBoxEnterSound->Name = L"checkBoxEnterSound"; this->checkBoxEnterSound->Size = System::Drawing::Size(65, 17); this->checkBoxEnterSound->TabIndex = 3; @@ -742,9 +779,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // textBoxEnterSound // this->textBoxEnterSound->AllowDrop = true; + this->textBoxEnterSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxEnterSound->Location = System::Drawing::Point(11, 22); this->textBoxEnterSound->Name = L"textBoxEnterSound"; - this->textBoxEnterSound->Size = System::Drawing::Size(150, 20); + this->textBoxEnterSound->Size = System::Drawing::Size(179, 20); this->textBoxEnterSound->TabIndex = 1; this->textBoxEnterSound->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); this->textBoxEnterSound->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &OptionForm::textBoxEnterSound_DragDrop); @@ -752,7 +791,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonEnterSound // - this->buttonEnterSound->Location = System::Drawing::Point(167, 21); + this->buttonEnterSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonEnterSound->Location = System::Drawing::Point(196, 21); this->buttonEnterSound->Name = L"buttonEnterSound"; this->buttonEnterSound->Size = System::Drawing::Size(24, 22); this->buttonEnterSound->TabIndex = 2; @@ -762,20 +802,23 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxNoticeSound // + this->groupBoxNoticeSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxNoticeSound->Controls->Add(this->buttonNoticeSoundPlay); this->groupBoxNoticeSound->Controls->Add(this->checkBoxNoticeSound); this->groupBoxNoticeSound->Controls->Add(this->textBoxNoticeSound); this->groupBoxNoticeSound->Controls->Add(this->buttonNoticeSound); this->groupBoxNoticeSound->Location = System::Drawing::Point(8, 68); this->groupBoxNoticeSound->Name = L"groupBoxNoticeSound"; - this->groupBoxNoticeSound->Size = System::Drawing::Size(336, 56); + this->groupBoxNoticeSound->Size = System::Drawing::Size(365, 56); this->groupBoxNoticeSound->TabIndex = 2; this->groupBoxNoticeSound->TabStop = false; this->groupBoxNoticeSound->Text = L"Announcement"; // // buttonNoticeSoundPlay // - this->buttonNoticeSoundPlay->Location = System::Drawing::Point(261, 22); + this->buttonNoticeSoundPlay->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonNoticeSoundPlay->Location = System::Drawing::Point(290, 22); this->buttonNoticeSoundPlay->Name = L"buttonNoticeSoundPlay"; this->buttonNoticeSoundPlay->Size = System::Drawing::Size(65, 22); this->buttonNoticeSoundPlay->TabIndex = 4; @@ -785,8 +828,9 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // checkBoxNoticeSound // + this->checkBoxNoticeSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->checkBoxNoticeSound->AutoSize = true; - this->checkBoxNoticeSound->Location = System::Drawing::Point(197, 24); + this->checkBoxNoticeSound->Location = System::Drawing::Point(226, 24); this->checkBoxNoticeSound->Name = L"checkBoxNoticeSound"; this->checkBoxNoticeSound->Size = System::Drawing::Size(65, 17); this->checkBoxNoticeSound->TabIndex = 3; @@ -797,9 +841,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // textBoxNoticeSound // this->textBoxNoticeSound->AllowDrop = true; + this->textBoxNoticeSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxNoticeSound->Location = System::Drawing::Point(11, 22); this->textBoxNoticeSound->Name = L"textBoxNoticeSound"; - this->textBoxNoticeSound->Size = System::Drawing::Size(150, 20); + this->textBoxNoticeSound->Size = System::Drawing::Size(179, 20); this->textBoxNoticeSound->TabIndex = 1; this->textBoxNoticeSound->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); this->textBoxNoticeSound->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &OptionForm::textBoxNoticeSound_DragDrop); @@ -807,7 +853,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonNoticeSound // - this->buttonNoticeSound->Location = System::Drawing::Point(167, 21); + this->buttonNoticeSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonNoticeSound->Location = System::Drawing::Point(196, 21); this->buttonNoticeSound->Name = L"buttonNoticeSound"; this->buttonNoticeSound->Size = System::Drawing::Size(24, 22); this->buttonNoticeSound->TabIndex = 2; @@ -817,20 +864,23 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxVSSound // + this->groupBoxVSSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxVSSound->Controls->Add(this->buttonVSSoundPlay); this->groupBoxVSSound->Controls->Add(this->checkBoxVSSound); this->groupBoxVSSound->Controls->Add(this->textBoxVSSound); this->groupBoxVSSound->Controls->Add(this->buttonVSSound); this->groupBoxVSSound->Location = System::Drawing::Point(8, 9); this->groupBoxVSSound->Name = L"groupBoxVSSound"; - this->groupBoxVSSound->Size = System::Drawing::Size(336, 56); + this->groupBoxVSSound->Size = System::Drawing::Size(365, 56); this->groupBoxVSSound->TabIndex = 1; this->groupBoxVSSound->TabStop = false; this->groupBoxVSSound->Text = L"Challenge notification"; // // buttonVSSoundPlay // - this->buttonVSSoundPlay->Location = System::Drawing::Point(261, 21); + this->buttonVSSoundPlay->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonVSSoundPlay->Location = System::Drawing::Point(290, 21); this->buttonVSSoundPlay->Name = L"buttonVSSoundPlay"; this->buttonVSSoundPlay->Size = System::Drawing::Size(65, 22); this->buttonVSSoundPlay->TabIndex = 4; @@ -840,8 +890,9 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // checkBoxVSSound // + this->checkBoxVSSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->checkBoxVSSound->AutoSize = true; - this->checkBoxVSSound->Location = System::Drawing::Point(197, 24); + this->checkBoxVSSound->Location = System::Drawing::Point(226, 24); this->checkBoxVSSound->Name = L"checkBoxVSSound"; this->checkBoxVSSound->Size = System::Drawing::Size(65, 17); this->checkBoxVSSound->TabIndex = 3; @@ -852,9 +903,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // textBoxVSSound // this->textBoxVSSound->AllowDrop = true; + this->textBoxVSSound->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxVSSound->Location = System::Drawing::Point(11, 22); this->textBoxVSSound->Name = L"textBoxVSSound"; - this->textBoxVSSound->Size = System::Drawing::Size(150, 20); + this->textBoxVSSound->Size = System::Drawing::Size(179, 20); this->textBoxVSSound->TabIndex = 1; this->textBoxVSSound->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); this->textBoxVSSound->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &OptionForm::textBoxVSSound_DragDrop); @@ -862,7 +915,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonVSSound // - this->buttonVSSound->Location = System::Drawing::Point(167, 21); + this->buttonVSSound->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonVSSound->Location = System::Drawing::Point(196, 21); this->buttonVSSound->Name = L"buttonVSSound"; this->buttonVSSound->Size = System::Drawing::Size(24, 22); this->buttonVSSound->TabIndex = 2; @@ -881,13 +935,15 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->tabPagePath->Location = System::Drawing::Point(4, 22); this->tabPagePath->Name = L"tabPagePath"; this->tabPagePath->Padding = System::Windows::Forms::Padding(3); - this->tabPagePath->Size = System::Drawing::Size(369, 339); + this->tabPagePath->Size = System::Drawing::Size(427, 371); this->tabPagePath->TabIndex = 0; this->tabPagePath->Text = L"General"; this->tabPagePath->UseVisualStyleBackColor = true; // // groupBoxProfile // + this->groupBoxProfile->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxProfile->Controls->Add(this->buttonSaveProfile); this->groupBoxProfile->Controls->Add(this->buttonAddProfile); this->groupBoxProfile->Controls->Add(this->labelProfileName); @@ -897,14 +953,15 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->groupBoxProfile->Controls->Add(this->comboBoxProfile); this->groupBoxProfile->Location = System::Drawing::Point(8, 9); this->groupBoxProfile->Name = L"groupBoxProfile"; - this->groupBoxProfile->Size = System::Drawing::Size(330, 92); + this->groupBoxProfile->Size = System::Drawing::Size(405, 92); this->groupBoxProfile->TabIndex = 4; this->groupBoxProfile->TabStop = false; this->groupBoxProfile->Text = L"Profile"; // // buttonSaveProfile // - this->buttonSaveProfile->Location = System::Drawing::Point(275, 54); + this->buttonSaveProfile->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Right)); + this->buttonSaveProfile->Location = System::Drawing::Point(350, 54); this->buttonSaveProfile->Name = L"buttonSaveProfile"; this->buttonSaveProfile->Size = System::Drawing::Size(45, 24); this->buttonSaveProfile->TabIndex = 7; @@ -914,7 +971,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonAddProfile // - this->buttonAddProfile->Location = System::Drawing::Point(223, 54); + this->buttonAddProfile->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Right)); + this->buttonAddProfile->Location = System::Drawing::Point(298, 54); this->buttonAddProfile->Name = L"buttonAddProfile"; this->buttonAddProfile->Size = System::Drawing::Size(45, 24); this->buttonAddProfile->TabIndex = 6; @@ -924,6 +982,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // labelProfileName // + this->labelProfileName->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->labelProfileName->AutoSize = true; this->labelProfileName->Location = System::Drawing::Point(10, 60); this->labelProfileName->Name = L"labelProfileName"; @@ -933,7 +993,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonDeleteProfile // - this->buttonDeleteProfile->Location = System::Drawing::Point(275, 20); + this->buttonDeleteProfile->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonDeleteProfile->Location = System::Drawing::Point(350, 20); this->buttonDeleteProfile->Name = L"buttonDeleteProfile"; this->buttonDeleteProfile->Size = System::Drawing::Size(45, 24); this->buttonDeleteProfile->TabIndex = 4; @@ -943,16 +1004,19 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // textBoxProfileName // + this->textBoxProfileName->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxProfileName->Location = System::Drawing::Point(51, 56); this->textBoxProfileName->MaxLength = 63; this->textBoxProfileName->Name = L"textBoxProfileName"; - this->textBoxProfileName->Size = System::Drawing::Size(161, 20); + this->textBoxProfileName->Size = System::Drawing::Size(236, 20); this->textBoxProfileName->TabIndex = 3; this->textBoxProfileName->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); // // buttonCopyProfile // - this->buttonCopyProfile->Location = System::Drawing::Point(223, 20); + this->buttonCopyProfile->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonCopyProfile->Location = System::Drawing::Point(298, 20); this->buttonCopyProfile->Name = L"buttonCopyProfile"; this->buttonCopyProfile->Size = System::Drawing::Size(45, 24); this->buttonCopyProfile->TabIndex = 2; @@ -962,24 +1026,29 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // comboBoxProfile // + this->comboBoxProfile->Anchor = static_cast((((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Bottom) + | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->comboBoxProfile->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList; this->comboBoxProfile->FormattingEnabled = true; this->comboBoxProfile->ItemHeight = 13; this->comboBoxProfile->Location = System::Drawing::Point(12, 21); this->comboBoxProfile->MaxDropDownItems = 64; this->comboBoxProfile->Name = L"comboBoxProfile"; - this->comboBoxProfile->Size = System::Drawing::Size(200, 21); + this->comboBoxProfile->Size = System::Drawing::Size(275, 21); this->comboBoxProfile->TabIndex = 0; this->comboBoxProfile->SelectedIndexChanged += gcnew System::EventHandler(this, &OptionForm::comboBoxProfile_SelectedIndexChanged); // // groupBoxReplayFolder // + this->groupBoxReplayFolder->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxReplayFolder->Controls->Add(this->textBoxReplayFolder); this->groupBoxReplayFolder->Controls->Add(this->buttonReplayFolder); this->groupBoxReplayFolder->Controls->Add(this->checkBoxDivide); this->groupBoxReplayFolder->Location = System::Drawing::Point(8, 170); this->groupBoxReplayFolder->Name = L"groupBoxReplayFolder"; - this->groupBoxReplayFolder->Size = System::Drawing::Size(330, 87); + this->groupBoxReplayFolder->Size = System::Drawing::Size(405, 87); this->groupBoxReplayFolder->TabIndex = 2; this->groupBoxReplayFolder->TabStop = false; this->groupBoxReplayFolder->Text = L"Replay folder"; @@ -987,9 +1056,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // textBoxReplayFolder // this->textBoxReplayFolder->AllowDrop = true; + this->textBoxReplayFolder->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxReplayFolder->Location = System::Drawing::Point(12, 22); this->textBoxReplayFolder->Name = L"textBoxReplayFolder"; - this->textBoxReplayFolder->Size = System::Drawing::Size(278, 20); + this->textBoxReplayFolder->Size = System::Drawing::Size(353, 20); this->textBoxReplayFolder->TabIndex = 1; this->textBoxReplayFolder->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); this->textBoxReplayFolder->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &OptionForm::textBoxReplayFolder_DragDrop); @@ -997,7 +1068,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonReplayFolder // - this->buttonReplayFolder->Location = System::Drawing::Point(296, 22); + this->buttonReplayFolder->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonReplayFolder->Location = System::Drawing::Point(371, 22); this->buttonReplayFolder->Name = L"buttonReplayFolder"; this->buttonReplayFolder->Size = System::Drawing::Size(24, 22); this->buttonReplayFolder->TabIndex = 2; @@ -1018,29 +1090,33 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxNet // + this->groupBoxNet->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxNet->Controls->Add(this->labelComment); this->groupBoxNet->Controls->Add(this->numericUpDownMaxConnection); this->groupBoxNet->Controls->Add(this->textBoxComment); this->groupBoxNet->Controls->Add(this->label5); this->groupBoxNet->Location = System::Drawing::Point(8, 263); this->groupBoxNet->Name = L"groupBoxNet"; - this->groupBoxNet->Size = System::Drawing::Size(330, 87); + this->groupBoxNet->Size = System::Drawing::Size(405, 87); this->groupBoxNet->TabIndex = 3; this->groupBoxNet->TabStop = false; this->groupBoxNet->Text = L"Connection"; // // labelComment // + this->labelComment->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Left)); this->labelComment->AutoSize = true; this->labelComment->Location = System::Drawing::Point(10, 55); this->labelComment->Name = L"labelComment"; - this->labelComment->Size = System::Drawing::Size(60, 13); + this->labelComment->Size = System::Drawing::Size(63, 13); this->labelComment->TabIndex = 0; - this->labelComment->Text = L"Description"; + this->labelComment->Text = L"Description:"; // // numericUpDownMaxConnection // - this->numericUpDownMaxConnection->Location = System::Drawing::Point(104, 22); + this->numericUpDownMaxConnection->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->numericUpDownMaxConnection->Location = System::Drawing::Point(355, 22); this->numericUpDownMaxConnection->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 0 }); this->numericUpDownMaxConnection->Name = L"numericUpDownMaxConnection"; this->numericUpDownMaxConnection->Size = System::Drawing::Size(40, 20); @@ -1050,9 +1126,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // textBoxComment // - this->textBoxComment->Location = System::Drawing::Point(104, 52); + this->textBoxComment->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); + this->textBoxComment->Location = System::Drawing::Point(137, 52); this->textBoxComment->Name = L"textBoxComment"; - this->textBoxComment->Size = System::Drawing::Size(183, 20); + this->textBoxComment->Size = System::Drawing::Size(258, 20); this->textBoxComment->TabIndex = 2; this->textBoxComment->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); // @@ -1061,17 +1139,19 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->label5->AutoSize = true; this->label5->Location = System::Drawing::Point(10, 24); this->label5->Name = L"label5"; - this->label5->Size = System::Drawing::Size(88, 13); + this->label5->Size = System::Drawing::Size(91, 13); this->label5->TabIndex = 0; - this->label5->Text = L"Max connections"; + this->label5->Text = L"Max connections:"; // // groupBoxGameExe // + this->groupBoxGameExe->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxGameExe->Controls->Add(this->textBoxGameExe); this->groupBoxGameExe->Controls->Add(this->buttonGameExe); this->groupBoxGameExe->Location = System::Drawing::Point(8, 107); this->groupBoxGameExe->Name = L"groupBoxGameExe"; - this->groupBoxGameExe->Size = System::Drawing::Size(330, 56); + this->groupBoxGameExe->Size = System::Drawing::Size(405, 56); this->groupBoxGameExe->TabIndex = 1; this->groupBoxGameExe->TabStop = false; this->groupBoxGameExe->Text = L"Game executable path"; @@ -1079,9 +1159,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // textBoxGameExe // this->textBoxGameExe->AllowDrop = true; + this->textBoxGameExe->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxGameExe->Location = System::Drawing::Point(12, 22); this->textBoxGameExe->Name = L"textBoxGameExe"; - this->textBoxGameExe->Size = System::Drawing::Size(278, 20); + this->textBoxGameExe->Size = System::Drawing::Size(353, 20); this->textBoxGameExe->TabIndex = 1; this->textBoxGameExe->TextChanged += gcnew System::EventHandler(this, &OptionForm::ApplyButtonEnable); this->textBoxGameExe->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &OptionForm::textBoxGameExe_DragDrop); @@ -1089,7 +1171,8 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // buttonGameExe // - this->buttonGameExe->Location = System::Drawing::Point(296, 22); + this->buttonGameExe->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); + this->buttonGameExe->Location = System::Drawing::Point(371, 22); this->buttonGameExe->Name = L"buttonGameExe"; this->buttonGameExe->Size = System::Drawing::Size(24, 22); this->buttonGameExe->TabIndex = 2; @@ -1099,9 +1182,10 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxSave // + this->groupBoxSave->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxSave->Controls->Add(this->radioButtonReplayVersion1); this->groupBoxSave->Controls->Add(this->radioButtonReplayVersion2); - this->groupBoxSave->Location = System::Drawing::Point(195, 216); + this->groupBoxSave->Location = System::Drawing::Point(253, 216); this->groupBoxSave->Name = L"groupBoxSave"; this->groupBoxSave->Size = System::Drawing::Size(166, 46); this->groupBoxSave->TabIndex = 4; @@ -1134,6 +1218,9 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // tabControlOption // + this->tabControlOption->Anchor = static_cast((((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Bottom) + | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->tabControlOption->Controls->Add(this->tabPagePath); this->tabControlOption->Controls->Add(this->tabPageSound); this->tabControlOption->Controls->Add(this->tabPageGame); @@ -1141,11 +1228,10 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->tabControlOption->Controls->Add(this->tabPageVolume); this->tabControlOption->Controls->Add(this->tabPageIP); this->tabControlOption->Controls->Add(this->tabPageDetails); - this->tabControlOption->Dock = System::Windows::Forms::DockStyle::Top; this->tabControlOption->Location = System::Drawing::Point(0, 0); this->tabControlOption->Name = L"tabControlOption"; this->tabControlOption->SelectedIndex = 0; - this->tabControlOption->Size = System::Drawing::Size(377, 365); + this->tabControlOption->Size = System::Drawing::Size(406, 375); this->tabControlOption->TabIndex = 0; // // tabPageGame @@ -1160,18 +1246,20 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->tabPageGame->Location = System::Drawing::Point(4, 22); this->tabPageGame->Name = L"tabPageGame"; this->tabPageGame->Padding = System::Windows::Forms::Padding(3); - this->tabPageGame->Size = System::Drawing::Size(369, 339); + this->tabPageGame->Size = System::Drawing::Size(427, 371); this->tabPageGame->TabIndex = 4; this->tabPageGame->Text = L"Game"; this->tabPageGame->UseVisualStyleBackColor = true; // // groupBoxTeamOption // + this->groupBoxTeamOption->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxTeamOption->Controls->Add(this->labelTeamRoundHP); this->groupBoxTeamOption->Controls->Add(this->checkBoxTeamRoundHP); this->groupBoxTeamOption->Location = System::Drawing::Point(9, 268); this->groupBoxTeamOption->Name = L"groupBoxTeamOption"; - this->groupBoxTeamOption->Size = System::Drawing::Size(353, 65); + this->groupBoxTeamOption->Size = System::Drawing::Size(410, 65); this->groupBoxTeamOption->TabIndex = 6; this->groupBoxTeamOption->TabStop = false; this->groupBoxTeamOption->Text = L"Team play"; @@ -1198,9 +1286,10 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxSimulate // + this->groupBoxSimulate->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxSimulate->Controls->Add(this->numericUpDownSimDelay); this->groupBoxSimulate->Controls->Add(this->labelSimDelay); - this->groupBoxSimulate->Location = System::Drawing::Point(195, 161); + this->groupBoxSimulate->Location = System::Drawing::Point(253, 161); this->groupBoxSimulate->Name = L"groupBoxSimulate"; this->groupBoxSimulate->Size = System::Drawing::Size(166, 48); this->groupBoxSimulate->TabIndex = 5; @@ -1259,12 +1348,13 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxView // + this->groupBoxView->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxView->Controls->Add(this->checkBoxShowResult); this->groupBoxView->Controls->Add(this->checkBoxVersus); this->groupBoxView->Controls->Add(this->checkBoxName); this->groupBoxView->Controls->Add(this->checkBoxFramerate); this->groupBoxView->Controls->Add(this->checkBoxRand); - this->groupBoxView->Location = System::Drawing::Point(195, 9); + this->groupBoxView->Location = System::Drawing::Point(253, 9); this->groupBoxView->Name = L"groupBoxView"; this->groupBoxView->Size = System::Drawing::Size(166, 145); this->groupBoxView->TabIndex = 4; @@ -1426,17 +1516,18 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->tabPageColor->Location = System::Drawing::Point(4, 22); this->tabPageColor->Name = L"tabPageColor"; this->tabPageColor->Padding = System::Windows::Forms::Padding(3); - this->tabPageColor->Size = System::Drawing::Size(369, 339); + this->tabPageColor->Size = System::Drawing::Size(398, 349); this->tabPageColor->TabIndex = 5; this->tabPageColor->Text = L"Colors"; this->tabPageColor->UseVisualStyleBackColor = true; // // groupBoxMessageColor // + this->groupBoxMessageColor->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxMessageColor->Controls->Add(this->buttonDebugMessage); this->groupBoxMessageColor->Controls->Add(this->buttonErrorMessage); this->groupBoxMessageColor->Controls->Add(this->buttonSystemMessage); - this->groupBoxMessageColor->Location = System::Drawing::Point(192, 9); + this->groupBoxMessageColor->Location = System::Drawing::Point(221, 9); this->groupBoxMessageColor->Name = L"groupBoxMessageColor"; this->groupBoxMessageColor->Size = System::Drawing::Size(168, 117); this->groupBoxMessageColor->TabIndex = 3; @@ -1481,10 +1572,11 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxOthersColor // + this->groupBoxOthersColor->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxOthersColor->Controls->Add(this->buttonSecret); this->groupBoxOthersColor->Controls->Add(this->buttonCommentBack); this->groupBoxOthersColor->Controls->Add(this->buttonNoticeBack); - this->groupBoxOthersColor->Location = System::Drawing::Point(192, 139); + this->groupBoxOthersColor->Location = System::Drawing::Point(221, 139); this->groupBoxOthersColor->Name = L"groupBoxOthersColor"; this->groupBoxOthersColor->Size = System::Drawing::Size(168, 117); this->groupBoxOthersColor->TabIndex = 4; @@ -1643,18 +1735,20 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->tabPageVolume->Location = System::Drawing::Point(4, 22); this->tabPageVolume->Name = L"tabPageVolume"; this->tabPageVolume->Padding = System::Windows::Forms::Padding(3); - this->tabPageVolume->Size = System::Drawing::Size(369, 339); + this->tabPageVolume->Size = System::Drawing::Size(427, 371); this->tabPageVolume->TabIndex = 6; this->tabPageVolume->Text = L"Volume"; this->tabPageVolume->UseVisualStyleBackColor = true; // // groupBoxMidi // + this->groupBoxMidi->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxMidi->Controls->Add(this->labelMidi); this->groupBoxMidi->Controls->Add(this->trackBarMidi); - this->groupBoxMidi->Location = System::Drawing::Point(8, 199); + this->groupBoxMidi->Location = System::Drawing::Point(8, 132); this->groupBoxMidi->Name = L"groupBoxMidi"; - this->groupBoxMidi->Size = System::Drawing::Size(352, 56); + this->groupBoxMidi->Size = System::Drawing::Size(410, 56); this->groupBoxMidi->TabIndex = 3; this->groupBoxMidi->TabStop = false; this->groupBoxMidi->Text = L"Software synthesizer (MIDI)"; @@ -1670,12 +1764,14 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // trackBarMidi // + this->trackBarMidi->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->trackBarMidi->AutoSize = false; this->trackBarMidi->LargeChange = 10; this->trackBarMidi->Location = System::Drawing::Point(48, 13); this->trackBarMidi->Maximum = 100; this->trackBarMidi->Name = L"trackBarMidi"; - this->trackBarMidi->Size = System::Drawing::Size(296, 35); + this->trackBarMidi->Size = System::Drawing::Size(354, 35); this->trackBarMidi->TabIndex = 1; this->trackBarMidi->TickFrequency = 10; this->trackBarMidi->TickStyle = System::Windows::Forms::TickStyle::TopLeft; @@ -1683,11 +1779,13 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxSE // + this->groupBoxSE->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxSE->Controls->Add(this->labelSE); this->groupBoxSE->Controls->Add(this->trackBarSE); - this->groupBoxSE->Location = System::Drawing::Point(8, 74); + this->groupBoxSE->Location = System::Drawing::Point(8, 69); this->groupBoxSE->Name = L"groupBoxSE"; - this->groupBoxSE->Size = System::Drawing::Size(352, 56); + this->groupBoxSE->Size = System::Drawing::Size(410, 56); this->groupBoxSE->TabIndex = 2; this->groupBoxSE->TabStop = false; this->groupBoxSE->Text = L"SE"; @@ -1703,12 +1801,14 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // trackBarSE // + this->trackBarSE->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->trackBarSE->AutoSize = false; this->trackBarSE->LargeChange = 2; this->trackBarSE->Location = System::Drawing::Point(48, 13); this->trackBarSE->Maximum = 20; this->trackBarSE->Name = L"trackBarSE"; - this->trackBarSE->Size = System::Drawing::Size(296, 35); + this->trackBarSE->Size = System::Drawing::Size(354, 35); this->trackBarSE->TabIndex = 1; this->trackBarSE->TickFrequency = 2; this->trackBarSE->TickStyle = System::Windows::Forms::TickStyle::TopLeft; @@ -1716,11 +1816,13 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // groupBoxBGM // + this->groupBoxBGM->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxBGM->Controls->Add(this->labelBGM); this->groupBoxBGM->Controls->Add(this->trackBarBGM); - this->groupBoxBGM->Location = System::Drawing::Point(8, 9); + this->groupBoxBGM->Location = System::Drawing::Point(8, 6); this->groupBoxBGM->Name = L"groupBoxBGM"; - this->groupBoxBGM->Size = System::Drawing::Size(352, 56); + this->groupBoxBGM->Size = System::Drawing::Size(410, 56); this->groupBoxBGM->TabIndex = 1; this->groupBoxBGM->TabStop = false; this->groupBoxBGM->Text = L"BGM"; @@ -1736,12 +1838,14 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // trackBarBGM // + this->trackBarBGM->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->trackBarBGM->AutoSize = false; this->trackBarBGM->LargeChange = 2; this->trackBarBGM->Location = System::Drawing::Point(48, 13); this->trackBarBGM->Maximum = 20; this->trackBarBGM->Name = L"trackBarBGM"; - this->trackBarBGM->Size = System::Drawing::Size(296, 35); + this->trackBarBGM->Size = System::Drawing::Size(354, 35); this->trackBarBGM->TabIndex = 1; this->trackBarBGM->TickFrequency = 2; this->trackBarBGM->TickStyle = System::Windows::Forms::TickStyle::TopLeft; @@ -1757,14 +1861,15 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->tabPageIP->Location = System::Drawing::Point(4, 22); this->tabPageIP->Name = L"tabPageIP"; this->tabPageIP->Padding = System::Windows::Forms::Padding(3); - this->tabPageIP->Size = System::Drawing::Size(369, 339); + this->tabPageIP->Size = System::Drawing::Size(398, 349); this->tabPageIP->TabIndex = 7; this->tabPageIP->Text = L"IP conversion"; this->tabPageIP->UseVisualStyleBackColor = true; // // AddPortbutton // - this->AddPortbutton->Location = System::Drawing::Point(169, 252); + this->AddPortbutton->Anchor = System::Windows::Forms::AnchorStyles::Top; + this->AddPortbutton->Location = System::Drawing::Point(184, 252); this->AddPortbutton->Name = L"AddPortbutton"; this->AddPortbutton->Size = System::Drawing::Size(126, 26); this->AddPortbutton->TabIndex = 4; @@ -1774,18 +1879,20 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // discriptionlabel // - this->discriptionlabel->AutoSize = true; + this->discriptionlabel->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->discriptionlabel->Location = System::Drawing::Point(6, 11); this->discriptionlabel->Name = L"discriptionlabel"; - this->discriptionlabel->Size = System::Drawing::Size(350, 39); + this->discriptionlabel->Size = System::Drawing::Size(379, 39); this->discriptionlabel->TabIndex = 3; - this->discriptionlabel->Text = L"By obfuscating your IP address, you can reduce security risks associated\r\nwith pu" - L"blishing a server. When you create a server, you should use your\r\nconverted IP a" - L"ddress rather than your real one."; + this->discriptionlabel->Text = L"By obfuscating your IP address, you can reduce security risks associated with pub" + L"lishing a server. When you create a server, you should use your converted IP add" + L"ress rather than your real one."; // // Convertbutton // - this->Convertbutton->Location = System::Drawing::Point(99, 252); + this->Convertbutton->Anchor = System::Windows::Forms::AnchorStyles::Top; + this->Convertbutton->Location = System::Drawing::Point(114, 252); this->Convertbutton->Name = L"Convertbutton"; this->Convertbutton->Size = System::Drawing::Size(64, 26); this->Convertbutton->TabIndex = 2; @@ -1795,13 +1902,15 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // Base64groupBox // + this->Base64groupBox->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->Base64groupBox->Controls->Add(this->labelAddrMT); this->Base64groupBox->Controls->Add(this->textBoxMTAddr); this->Base64groupBox->Controls->Add(this->labelAddrBase64); this->Base64groupBox->Controls->Add(this->Base64textBox); this->Base64groupBox->Location = System::Drawing::Point(7, 141); this->Base64groupBox->Name = L"Base64groupBox"; - this->Base64groupBox->Size = System::Drawing::Size(352, 91); + this->Base64groupBox->Size = System::Drawing::Size(381, 91); this->Base64groupBox->TabIndex = 1; this->Base64groupBox->TabStop = false; this->Base64groupBox->Text = L"Converted IP address"; @@ -1817,10 +1926,12 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // textBoxMTAddr // + this->textBoxMTAddr->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxMTAddr->Location = System::Drawing::Point(75, 54); this->textBoxMTAddr->Name = L"textBoxMTAddr"; this->textBoxMTAddr->ReadOnly = true; - this->textBoxMTAddr->Size = System::Drawing::Size(271, 20); + this->textBoxMTAddr->Size = System::Drawing::Size(300, 20); this->textBoxMTAddr->TabIndex = 2; // // labelAddrBase64 @@ -1834,19 +1945,23 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // Base64textBox // + this->Base64textBox->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->Base64textBox->Location = System::Drawing::Point(75, 20); this->Base64textBox->MaxLength = 100; this->Base64textBox->Name = L"Base64textBox"; this->Base64textBox->ReadOnly = true; - this->Base64textBox->Size = System::Drawing::Size(271, 20); + this->Base64textBox->Size = System::Drawing::Size(300, 20); this->Base64textBox->TabIndex = 0; // // IPgroupBox // + this->IPgroupBox->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->IPgroupBox->Controls->Add(this->IPtextBox); this->IPgroupBox->Location = System::Drawing::Point(7, 76); this->IPgroupBox->Name = L"IPgroupBox"; - this->IPgroupBox->Size = System::Drawing::Size(352, 56); + this->IPgroupBox->Size = System::Drawing::Size(381, 56); this->IPgroupBox->TabIndex = 0; this->IPgroupBox->TabStop = false; this->IPgroupBox->Text = L"IP address"; @@ -1854,10 +1969,12 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // IPtextBox // this->IPtextBox->AccessibleDescription = L""; + this->IPtextBox->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->IPtextBox->Location = System::Drawing::Point(7, 21); this->IPtextBox->MaxLength = 20; this->IPtextBox->Name = L"IPtextBox"; - this->IPtextBox->Size = System::Drawing::Size(339, 20); + this->IPtextBox->Size = System::Drawing::Size(368, 20); this->IPtextBox->TabIndex = 0; this->IPtextBox->TextChanged += gcnew System::EventHandler(this, &OptionForm::IPtextBox_TextChanged); // @@ -1867,20 +1984,23 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->tabPageDetails->Location = System::Drawing::Point(4, 22); this->tabPageDetails->Name = L"tabPageDetails"; this->tabPageDetails->Padding = System::Windows::Forms::Padding(3); - this->tabPageDetails->Size = System::Drawing::Size(369, 339); + this->tabPageDetails->Size = System::Drawing::Size(427, 371); this->tabPageDetails->TabIndex = 8; this->tabPageDetails->Text = L"Miscellaneous"; this->tabPageDetails->UseVisualStyleBackColor = true; // // groupBoxDetails // + this->groupBoxDetails->Anchor = static_cast((((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Bottom) + | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxDetails->Controls->Add(this->checkBoxShowGameOption); this->groupBoxDetails->Controls->Add(this->checkBoxNameFlash); this->groupBoxDetails->Controls->Add(this->checkBoxGetIP); this->groupBoxDetails->Controls->Add(this->checkBoxTalkFlash); this->groupBoxDetails->Location = System::Drawing::Point(9, 8); this->groupBoxDetails->Name = L"groupBoxDetails"; - this->groupBoxDetails->Size = System::Drawing::Size(351, 306); + this->groupBoxDetails->Size = System::Drawing::Size(409, 338); this->groupBoxDetails->TabIndex = 0; this->groupBoxDetails->TabStop = false; this->groupBoxDetails->Text = L"Miscellaneous"; @@ -1931,10 +2051,12 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; // // OptionForm // + this->AcceptButton = this->buttonOK; this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; this->AutoScroll = true; - this->ClientSize = System::Drawing::Size(377, 405); + this->CancelButton = this->buttonCancel; + this->ClientSize = System::Drawing::Size(406, 415); this->Controls->Add(this->tabControlOption); this->Controls->Add(this->buttonApply); this->Controls->Add(this->buttonCancel); @@ -1942,7 +2064,9 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->Icon = (cli::safe_cast(resources->GetObject(L"$this.Icon"))); this->MaximizeBox = false; this->MinimizeBox = false; + this->MinimumSize = System::Drawing::Size(398, 452); this->Name = L"OptionForm"; + this->ShowIcon = false; this->ShowInTaskbar = false; this->Text = L"Options"; this->FormClosed += gcnew System::Windows::Forms::FormClosedEventHandler(this, &OptionForm::OptionForm_FormClosed); @@ -2008,7 +2132,6 @@ private: System::Windows::Forms::CheckBox^ checkBoxShowResult; this->groupBoxBGM->PerformLayout(); (cli::safe_cast(this->trackBarBGM))->EndInit(); this->tabPageIP->ResumeLayout(false); - this->tabPageIP->PerformLayout(); this->Base64groupBox->ResumeLayout(false); this->Base64groupBox->PerformLayout(); this->IPgroupBox->ResumeLayout(false); diff --git a/LilithPort/StartupForm.h b/LilithPort/StartupForm.h index 5e27262..f567929 100644 --- a/LilithPort/StartupForm.h +++ b/LilithPort/StartupForm.h @@ -124,6 +124,7 @@ namespace LilithPort { // // radioButtonHost // + this->radioButtonHost->Anchor = System::Windows::Forms::AnchorStyles::Top; this->radioButtonHost->AutoSize = true; this->radioButtonHost->Location = System::Drawing::Point(101, 19); this->radioButtonHost->Name = L"radioButtonHost"; @@ -135,6 +136,7 @@ namespace LilithPort { // // radioButtonClient // + this->radioButtonClient->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->radioButtonClient->AutoSize = true; this->radioButtonClient->Location = System::Drawing::Point(178, 19); this->radioButtonClient->Name = L"radioButtonClient"; @@ -171,6 +173,7 @@ namespace LilithPort { // // numericUpDownOpenPort // + this->numericUpDownOpenPort->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->numericUpDownOpenPort->Location = System::Drawing::Point(176, 68); this->numericUpDownOpenPort->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 65535, 0, 0, 0 }); this->numericUpDownOpenPort->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1024, 0, 0, 0 }); @@ -181,6 +184,8 @@ namespace LilithPort { // // buttonOK // + this->buttonOK->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Right)); + this->buttonOK->DialogResult = System::Windows::Forms::DialogResult::OK; this->buttonOK->Location = System::Drawing::Point(233, 223); this->buttonOK->Name = L"buttonOK"; this->buttonOK->Size = System::Drawing::Size(99, 26); @@ -191,6 +196,7 @@ namespace LilithPort { // // buttonCancel // + this->buttonCancel->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Right)); this->buttonCancel->DialogResult = System::Windows::Forms::DialogResult::Cancel; this->buttonCancel->Location = System::Drawing::Point(338, 223); this->buttonCancel->Name = L"buttonCancel"; @@ -202,6 +208,8 @@ namespace LilithPort { // // textBoxComment // + this->textBoxComment->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxComment->Location = System::Drawing::Point(80, 47); this->textBoxComment->Name = L"textBoxComment"; this->textBoxComment->Size = System::Drawing::Size(94, 20); @@ -218,6 +226,8 @@ namespace LilithPort { // // textBoxName // + this->textBoxName->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxName->Location = System::Drawing::Point(80, 20); this->textBoxName->Name = L"textBoxName"; this->textBoxName->Size = System::Drawing::Size(94, 20); @@ -244,6 +254,7 @@ namespace LilithPort { // // numericUpDownMaxConnection // + this->numericUpDownMaxConnection->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->numericUpDownMaxConnection->Location = System::Drawing::Point(189, 95); this->numericUpDownMaxConnection->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 0 }); this->numericUpDownMaxConnection->Name = L"numericUpDownMaxConnection"; @@ -262,6 +273,7 @@ namespace LilithPort { // // groupBoxStartMode // + this->groupBoxStartMode->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxStartMode->Controls->Add(this->textBoxServerName); this->groupBoxStartMode->Controls->Add(this->radioButtonServer); this->groupBoxStartMode->Controls->Add(this->labelOpenPort); @@ -271,15 +283,17 @@ namespace LilithPort { this->groupBoxStartMode->Controls->Add(this->numericUpDownOpenPort); this->groupBoxStartMode->Controls->Add(this->radioButtonHost); this->groupBoxStartMode->Controls->Add(this->radioButtonClient); - this->groupBoxStartMode->Location = System::Drawing::Point(201, 14); + this->groupBoxStartMode->Location = System::Drawing::Point(201, 12); this->groupBoxStartMode->Name = L"groupBoxStartMode"; - this->groupBoxStartMode->Size = System::Drawing::Size(235, 125); + this->groupBoxStartMode->Size = System::Drawing::Size(235, 127); this->groupBoxStartMode->TabIndex = 0; this->groupBoxStartMode->TabStop = false; this->groupBoxStartMode->Text = L"Mode"; // // textBoxServerName // + this->textBoxServerName->Anchor = static_cast(((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxServerName->Location = System::Drawing::Point(85, 41); this->textBoxServerName->Name = L"textBoxServerName"; this->textBoxServerName->Size = System::Drawing::Size(144, 20); @@ -287,13 +301,14 @@ namespace LilithPort { // // groupBoxConnection // + this->groupBoxConnection->Anchor = static_cast((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxConnection->Controls->Add(this->labelAccessPort); this->groupBoxConnection->Controls->Add(this->labelIP); this->groupBoxConnection->Controls->Add(this->textBoxIP); this->groupBoxConnection->Controls->Add(this->numericUpDownPort); this->groupBoxConnection->Location = System::Drawing::Point(201, 145); this->groupBoxConnection->Name = L"groupBoxConnection"; - this->groupBoxConnection->Size = System::Drawing::Size(235, 72); + this->groupBoxConnection->Size = System::Drawing::Size(235, 69); this->groupBoxConnection->TabIndex = 2; this->groupBoxConnection->TabStop = false; this->groupBoxConnection->Text = L"Destination"; @@ -318,19 +333,25 @@ namespace LilithPort { // // groupBoxProfile // + this->groupBoxProfile->Anchor = static_cast((((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Bottom) + | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxProfile->Controls->Add(this->labelComment); this->groupBoxProfile->Controls->Add(this->textBoxComment); this->groupBoxProfile->Controls->Add(this->textBoxName); this->groupBoxProfile->Controls->Add(this->labelName); - this->groupBoxProfile->Location = System::Drawing::Point(12, 13); + this->groupBoxProfile->Location = System::Drawing::Point(12, 12); this->groupBoxProfile->Name = L"groupBoxProfile"; - this->groupBoxProfile->Size = System::Drawing::Size(183, 73); + this->groupBoxProfile->Size = System::Drawing::Size(183, 75); this->groupBoxProfile->TabIndex = 1; this->groupBoxProfile->TabStop = false; this->groupBoxProfile->Text = L"Profile"; // // groupBoxWelcome // + this->groupBoxWelcome->Anchor = static_cast((((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Bottom) + | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->groupBoxWelcome->Controls->Add(this->textBoxWelcome); this->groupBoxWelcome->Location = System::Drawing::Point(12, 92); this->groupBoxWelcome->Name = L"groupBoxWelcome"; @@ -341,13 +362,15 @@ namespace LilithPort { // // textBoxWelcome // + this->textBoxWelcome->Anchor = static_cast((((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Bottom) + | System::Windows::Forms::AnchorStyles::Left) + | System::Windows::Forms::AnchorStyles::Right)); this->textBoxWelcome->Location = System::Drawing::Point(8, 21); this->textBoxWelcome->MaxLength = 254; this->textBoxWelcome->Name = L"textBoxWelcome"; this->textBoxWelcome->Size = System::Drawing::Size(167, 93); this->textBoxWelcome->TabIndex = 0; this->textBoxWelcome->Text = L""; - this->textBoxWelcome->WordWrap = false; // // StartupForm // @@ -362,9 +385,11 @@ namespace LilithPort { this->Controls->Add(this->groupBoxStartMode); this->Controls->Add(this->buttonOK); this->Controls->Add(this->buttonCancel); + this->FormBorderStyle = System::Windows::Forms::FormBorderStyle::FixedDialog; this->Icon = (cli::safe_cast(resources->GetObject(L"$this.Icon"))); this->MaximizeBox = false; this->MinimizeBox = false; + this->MinimumSize = System::Drawing::Size(464, 299); this->Name = L"StartupForm"; this->ShowInTaskbar = false; this->StartPosition = System::Windows::Forms::FormStartPosition::CenterParent;