diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 48663d36a0..212679880c 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -290,27 +290,27 @@ this.OnlineHelpMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ForumsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AboutMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.StatusSlot0 = new System.Windows.Forms.StatusStrip(); - this.DumpStatus = new System.Windows.Forms.ToolStripDropDownButton(); + this.MainStatusBar = new System.Windows.Forms.StatusStrip(); + this.DumpStatusButton = new System.Windows.Forms.ToolStripDropDownButton(); this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel(); - this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton(); - this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton(); + this.PlayRecordStatusButton = new System.Windows.Forms.ToolStripDropDownButton(); + this.PauseStatusButton = new System.Windows.Forms.ToolStripDropDownButton(); this.RebootStatusBarIcon = new System.Windows.Forms.ToolStripStatusLabel(); this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusBarLedLight = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot1 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot2 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot3 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot4 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot5 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot6 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot7 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot8 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot9 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot10 = new System.Windows.Forms.ToolStripStatusLabel(); - this.CheatStatus = new System.Windows.Forms.ToolStripStatusLabel(); - this.KeyPriorityStatusBarLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.LedLightStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.SaveSlotsStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.Slot1StatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.Slot2StatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.Slot3StatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.Slot4StatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.Slot5StatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.Slot6StatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.Slot7StatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.Slot8StatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.Slot9StatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.Slot0StatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.CheatStatusButton = new System.Windows.Forms.ToolStripStatusLabel(); + this.KeyPriorityStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.MainFormContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.OpenRomContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LoadLastRomContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -347,7 +347,7 @@ this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator(); this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MainformMenu.SuspendLayout(); - this.StatusSlot0.SuspendLayout(); + this.MainStatusBar.SuspendLayout(); this.MainFormContextMenu.SuspendLayout(); this.SuspendLayout(); // @@ -378,9 +378,9 @@ this.MainformMenu.Size = new System.Drawing.Size(470, 42); this.MainformMenu.TabIndex = 0; this.MainformMenu.Text = "menuStrip1"; - this.MainformMenu.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); - this.MainformMenu.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate); - this.MainformMenu.Leave += new System.EventHandler(this.menuStrip1_Leave); + this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate); + this.MainformMenu.MenuDeactivate += new System.EventHandler(this.MainformMenu_MenuDeactivate); + this.MainformMenu.Leave += new System.EventHandler(this.MainformMenu_Leave); // // FileSubMenu // @@ -2535,75 +2535,75 @@ this.AboutMenuItem.Text = "&About"; this.AboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click); // - // StatusSlot0 + // MainStatusBar // - this.StatusSlot0.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.DumpStatus, + this.MainStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.DumpStatusButton, this.EmuStatus, - this.PlayRecordStatus, - this.PauseStrip, + this.PlayRecordStatusButton, + this.PauseStatusButton, this.RebootStatusBarIcon, this.AVIStatusLabel, - this.StatusBarLedLight, - this.toolStripStatusLabel1, - this.StatusSlot1, - this.StatusSlot2, - this.StatusSlot3, - this.StatusSlot4, - this.StatusSlot5, - this.StatusSlot6, - this.StatusSlot7, - this.StatusSlot8, - this.StatusSlot9, - this.StatusSlot10, - this.CheatStatus, - this.KeyPriorityStatusBarLabel}); - this.StatusSlot0.Location = new System.Drawing.Point(0, 386); - this.StatusSlot0.Name = "StatusSlot0"; - this.StatusSlot0.ShowItemToolTips = true; - this.StatusSlot0.Size = new System.Drawing.Size(470, 22); - this.StatusSlot0.SizingGrip = false; - this.StatusSlot0.TabIndex = 1; - this.StatusSlot0.Text = "0"; + this.LedLightStatusLabel, + this.SaveSlotsStatusLabel, + this.Slot1StatusButton, + this.Slot2StatusButton, + this.Slot3StatusButton, + this.Slot4StatusButton, + this.Slot5StatusButton, + this.Slot6StatusButton, + this.Slot7StatusButton, + this.Slot8StatusButton, + this.Slot9StatusButton, + this.Slot0StatusButton, + this.CheatStatusButton, + this.KeyPriorityStatusLabel}); + this.MainStatusBar.Location = new System.Drawing.Point(0, 386); + this.MainStatusBar.Name = "MainStatusBar"; + this.MainStatusBar.ShowItemToolTips = true; + this.MainStatusBar.Size = new System.Drawing.Size(470, 22); + this.MainStatusBar.SizingGrip = false; + this.MainStatusBar.TabIndex = 1; + this.MainStatusBar.Text = "0"; // - // DumpStatus + // DumpStatusButton // - this.DumpStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.DumpStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; - this.DumpStatus.ImageTransparentColor = System.Drawing.Color.Magenta; - this.DumpStatus.Name = "DumpStatus"; - this.DumpStatus.ShowDropDownArrow = false; - this.DumpStatus.Size = new System.Drawing.Size(20, 20); - this.DumpStatus.Text = "No ROM loaded"; - this.DumpStatus.Click += new System.EventHandler(this.DumpStatus_Click); + this.DumpStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.DumpStatusButton.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.DumpStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.DumpStatusButton.Name = "DumpStatusButton"; + this.DumpStatusButton.ShowDropDownArrow = false; + this.DumpStatusButton.Size = new System.Drawing.Size(20, 20); + this.DumpStatusButton.Text = "No ROM loaded"; + this.DumpStatusButton.Click += new System.EventHandler(this.DumpStatusButton_Click); // // EmuStatus // this.EmuStatus.Name = "EmuStatus"; this.EmuStatus.Size = new System.Drawing.Size(0, 17); // - // PlayRecordStatus + // PlayRecordStatusButton // - this.PlayRecordStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PlayRecordStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; - this.PlayRecordStatus.ImageTransparentColor = System.Drawing.Color.Magenta; - this.PlayRecordStatus.Name = "PlayRecordStatus"; - this.PlayRecordStatus.ShowDropDownArrow = false; - this.PlayRecordStatus.Size = new System.Drawing.Size(20, 20); - this.PlayRecordStatus.Text = "No movie is active"; + this.PlayRecordStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.PlayRecordStatusButton.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.PlayRecordStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.PlayRecordStatusButton.Name = "PlayRecordStatusButton"; + this.PlayRecordStatusButton.ShowDropDownArrow = false; + this.PlayRecordStatusButton.Size = new System.Drawing.Size(20, 20); + this.PlayRecordStatusButton.Text = "No movie is active"; // - // PauseStrip + // PauseStatusButton // - this.PauseStrip.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.PauseStrip.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PauseStrip.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; - this.PauseStrip.ImageTransparentColor = System.Drawing.Color.Magenta; - this.PauseStrip.Name = "PauseStrip"; - this.PauseStrip.ShowDropDownArrow = false; - this.PauseStrip.Size = new System.Drawing.Size(20, 20); - this.PauseStrip.Text = "toolStripDropDownButton1"; - this.PauseStrip.ToolTipText = "Emulator is paused"; - this.PauseStrip.Click += new System.EventHandler(this.PauseStrip_Click); + this.PauseStatusButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.PauseStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.PauseStatusButton.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.PauseStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.PauseStatusButton.Name = "PauseStatusButton"; + this.PauseStatusButton.ShowDropDownArrow = false; + this.PauseStatusButton.Size = new System.Drawing.Size(20, 20); + this.PauseStatusButton.Text = "toolStripDropDownButton1"; + this.PauseStatusButton.ToolTipText = "Emulator is paused"; + this.PauseStatusButton.Click += new System.EventHandler(this.PauseMenuItem_Click); // // RebootStatusBarIcon // @@ -2614,7 +2614,7 @@ this.RebootStatusBarIcon.Size = new System.Drawing.Size(16, 17); this.RebootStatusBarIcon.Text = "Reboot"; this.RebootStatusBarIcon.ToolTipText = "A reboot of the core is needed for a setting change to take affect"; - this.RebootStatusBarIcon.Click += new System.EventHandler(this.toolStripStatusLabel2_Click); + this.RebootStatusBarIcon.Click += new System.EventHandler(this.PowerMenuItem_Click); // // AVIStatusLabel // @@ -2624,104 +2624,104 @@ this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17); this.AVIStatusLabel.Text = "AVI Capture"; // - // StatusBarLedLight + // LedLightStatusLabel // - this.StatusBarLedLight.Image = global::BizHawk.MultiClient.Properties.Resources.LightOff; - this.StatusBarLedLight.Name = "StatusBarLedLight"; - this.StatusBarLedLight.Size = new System.Drawing.Size(16, 17); - this.StatusBarLedLight.ToolTipText = "Disk Drive LED Light"; + this.LedLightStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.LightOff; + this.LedLightStatusLabel.Name = "LedLightStatusLabel"; + this.LedLightStatusLabel.Size = new System.Drawing.Size(16, 17); + this.LedLightStatusLabel.ToolTipText = "Disk Drive LED Light"; // - // toolStripStatusLabel1 + // SaveSlotsStatusLabel // - this.toolStripStatusLabel1.BackColor = System.Drawing.SystemColors.Control; - this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17); - this.toolStripStatusLabel1.Text = "Save slots"; + this.SaveSlotsStatusLabel.BackColor = System.Drawing.SystemColors.Control; + this.SaveSlotsStatusLabel.Name = "SaveSlotsStatusLabel"; + this.SaveSlotsStatusLabel.Size = new System.Drawing.Size(58, 17); + this.SaveSlotsStatusLabel.Text = "Save slots"; // - // StatusSlot1 + // Slot1StatusButton // - this.StatusSlot1.Name = "StatusSlot1"; - this.StatusSlot1.Size = new System.Drawing.Size(13, 17); - this.StatusSlot1.Text = "1"; - this.StatusSlot1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot1_MouseUp); + this.Slot1StatusButton.Name = "Slot1StatusButton"; + this.Slot1StatusButton.Size = new System.Drawing.Size(13, 17); + this.Slot1StatusButton.Text = "1"; + this.Slot1StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp); // - // StatusSlot2 + // Slot2StatusButton // - this.StatusSlot2.Name = "StatusSlot2"; - this.StatusSlot2.Size = new System.Drawing.Size(13, 17); - this.StatusSlot2.Text = "2"; - this.StatusSlot2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot2_MouseUp); + this.Slot2StatusButton.Name = "Slot2StatusButton"; + this.Slot2StatusButton.Size = new System.Drawing.Size(13, 17); + this.Slot2StatusButton.Text = "2"; + this.Slot2StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp); // - // StatusSlot3 + // Slot3StatusButton // - this.StatusSlot3.Name = "StatusSlot3"; - this.StatusSlot3.Size = new System.Drawing.Size(13, 17); - this.StatusSlot3.Text = "3"; - this.StatusSlot3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot3_MouseUp); + this.Slot3StatusButton.Name = "Slot3StatusButton"; + this.Slot3StatusButton.Size = new System.Drawing.Size(13, 17); + this.Slot3StatusButton.Text = "3"; + this.Slot3StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp); // - // StatusSlot4 + // Slot4StatusButton // - this.StatusSlot4.Name = "StatusSlot4"; - this.StatusSlot4.Size = new System.Drawing.Size(13, 17); - this.StatusSlot4.Text = "4"; - this.StatusSlot4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot4_MouseUp); + this.Slot4StatusButton.Name = "Slot4StatusButton"; + this.Slot4StatusButton.Size = new System.Drawing.Size(13, 17); + this.Slot4StatusButton.Text = "4"; + this.Slot4StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp); // - // StatusSlot5 + // Slot5StatusButton // - this.StatusSlot5.Name = "StatusSlot5"; - this.StatusSlot5.Size = new System.Drawing.Size(13, 17); - this.StatusSlot5.Text = "5"; - this.StatusSlot5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot5_MouseUp); + this.Slot5StatusButton.Name = "Slot5StatusButton"; + this.Slot5StatusButton.Size = new System.Drawing.Size(13, 17); + this.Slot5StatusButton.Text = "5"; + this.Slot5StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp); // - // StatusSlot6 + // Slot6StatusButton // - this.StatusSlot6.Name = "StatusSlot6"; - this.StatusSlot6.Size = new System.Drawing.Size(13, 17); - this.StatusSlot6.Text = "6"; - this.StatusSlot6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot6_MouseUp); + this.Slot6StatusButton.Name = "Slot6StatusButton"; + this.Slot6StatusButton.Size = new System.Drawing.Size(13, 17); + this.Slot6StatusButton.Text = "6"; + this.Slot6StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp); // - // StatusSlot7 + // Slot7StatusButton // - this.StatusSlot7.Name = "StatusSlot7"; - this.StatusSlot7.Size = new System.Drawing.Size(13, 17); - this.StatusSlot7.Text = "7"; - this.StatusSlot7.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot7_MouseUp); + this.Slot7StatusButton.Name = "Slot7StatusButton"; + this.Slot7StatusButton.Size = new System.Drawing.Size(13, 17); + this.Slot7StatusButton.Text = "7"; + this.Slot7StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp); // - // StatusSlot8 + // Slot8StatusButton // - this.StatusSlot8.Name = "StatusSlot8"; - this.StatusSlot8.Size = new System.Drawing.Size(13, 17); - this.StatusSlot8.Text = "8"; - this.StatusSlot8.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot8_MouseUp); + this.Slot8StatusButton.Name = "Slot8StatusButton"; + this.Slot8StatusButton.Size = new System.Drawing.Size(13, 17); + this.Slot8StatusButton.Text = "8"; + this.Slot8StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp); // - // StatusSlot9 + // Slot9StatusButton // - this.StatusSlot9.Name = "StatusSlot9"; - this.StatusSlot9.Size = new System.Drawing.Size(13, 17); - this.StatusSlot9.Text = "9"; - this.StatusSlot9.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot9_MouseUp); + this.Slot9StatusButton.Name = "Slot9StatusButton"; + this.Slot9StatusButton.Size = new System.Drawing.Size(13, 17); + this.Slot9StatusButton.Text = "9"; + this.Slot9StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp); // - // StatusSlot10 + // Slot0StatusButton // - this.StatusSlot10.Name = "StatusSlot10"; - this.StatusSlot10.Size = new System.Drawing.Size(13, 17); - this.StatusSlot10.Text = "0"; - this.StatusSlot10.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot10_MouseUp); + this.Slot0StatusButton.Name = "Slot0StatusButton"; + this.Slot0StatusButton.Size = new System.Drawing.Size(13, 17); + this.Slot0StatusButton.Text = "0"; + this.Slot0StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp); // // CheatStatus // - this.CheatStatus.Name = "CheatStatus"; - this.CheatStatus.Size = new System.Drawing.Size(0, 17); - this.CheatStatus.Click += new System.EventHandler(this.FreezeStatus_Click); + this.CheatStatusButton.Name = "CheatStatus"; + this.CheatStatusButton.Size = new System.Drawing.Size(0, 17); + this.CheatStatusButton.Click += new System.EventHandler(this.FreezeStatus_Click); // - // KeyPriorityStatusBarLabel + // KeyPriorityStatusLabel // - this.KeyPriorityStatusBarLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.KeyPriorityStatusBarLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Both; - this.KeyPriorityStatusBarLabel.Name = "KeyPriorityStatusBarLabel"; - this.KeyPriorityStatusBarLabel.Size = new System.Drawing.Size(16, 17); - this.KeyPriorityStatusBarLabel.Text = "KeyPriority"; - this.KeyPriorityStatusBarLabel.Click += new System.EventHandler(this.KeyPriorityStatusBarLabel_Click); + this.KeyPriorityStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.KeyPriorityStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Both; + this.KeyPriorityStatusLabel.Name = "KeyPriorityStatusLabel"; + this.KeyPriorityStatusLabel.Size = new System.Drawing.Size(16, 17); + this.KeyPriorityStatusLabel.Text = "KeyPriority"; + this.KeyPriorityStatusLabel.Click += new System.EventHandler(this.KeyPriorityStatusLabel_Click); // // MainFormContextMenu // @@ -2899,7 +2899,7 @@ // this.controllersToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.controllersToolStripMenuItem1.Name = "controllersToolStripMenuItem1"; - this.controllersToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + this.controllersToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.controllersToolStripMenuItem1.Text = "&Controllers..."; this.controllersToolStripMenuItem1.Click += new System.EventHandler(this.ControllersMenuItem_Click); // @@ -2907,7 +2907,7 @@ // this.hotkeysToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; this.hotkeysToolStripMenuItem1.Name = "hotkeysToolStripMenuItem1"; - this.hotkeysToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + this.hotkeysToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.hotkeysToolStripMenuItem1.Text = "&Hotkeys..."; this.hotkeysToolStripMenuItem1.Click += new System.EventHandler(this.HotkeysMenuItem_Click); // @@ -2915,7 +2915,7 @@ // this.messagesToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; this.messagesToolStripMenuItem1.Name = "messagesToolStripMenuItem1"; - this.messagesToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + this.messagesToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.messagesToolStripMenuItem1.Text = "&Messages..."; this.messagesToolStripMenuItem1.Click += new System.EventHandler(this.MessagesMenuItem_Click); // @@ -2923,7 +2923,7 @@ // this.pathsToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; this.pathsToolStripMenuItem1.Name = "pathsToolStripMenuItem1"; - this.pathsToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + this.pathsToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.pathsToolStripMenuItem1.Text = "Paths..."; this.pathsToolStripMenuItem1.Click += new System.EventHandler(this.PathsMenuItem_Click); // @@ -2931,7 +2931,7 @@ // this.soundToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; this.soundToolStripMenuItem1.Name = "soundToolStripMenuItem1"; - this.soundToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + this.soundToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.soundToolStripMenuItem1.Text = "&Sound..."; this.soundToolStripMenuItem1.Click += new System.EventHandler(this.SoundMenuItem_Click); // @@ -2939,34 +2939,34 @@ // this.autofireToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; this.autofireToolStripMenuItem1.Name = "autofireToolStripMenuItem1"; - this.autofireToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + this.autofireToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.autofireToolStripMenuItem1.Text = "&Autofire..."; // // rewindToolStripMenuItem // this.rewindToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; this.rewindToolStripMenuItem.Name = "rewindToolStripMenuItem"; - this.rewindToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rewindToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.rewindToolStripMenuItem.Text = "&Rewind"; this.rewindToolStripMenuItem.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click); // // firmwaresToolStripMenuItem1 // this.firmwaresToolStripMenuItem1.Name = "firmwaresToolStripMenuItem1"; - this.firmwaresToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + this.firmwaresToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.firmwaresToolStripMenuItem1.Text = "&Firmwares"; this.firmwaresToolStripMenuItem1.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); // // toolStripSeparator30 // this.toolStripSeparator30.Name = "toolStripSeparator30"; - this.toolStripSeparator30.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator30.Size = new System.Drawing.Size(138, 6); // // toolStripMenuItem6 // this.toolStripMenuItem6.Image = global::BizHawk.MultiClient.Properties.Resources.Save; this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem6.Size = new System.Drawing.Size(141, 22); this.toolStripMenuItem6.Text = "Save Config"; this.toolStripMenuItem6.Click += new System.EventHandler(this.SaveConfigMenuItem_Click); // @@ -2974,7 +2974,7 @@ // this.toolStripMenuItem7.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem7.Size = new System.Drawing.Size(141, 22); this.toolStripMenuItem7.Text = "Load Config"; this.toolStripMenuItem7.Click += new System.EventHandler(this.LoadConfigMenuItem_Click); // @@ -2999,7 +2999,7 @@ this.ClearSRAMContextMenuItem.Name = "ClearSRAMContextMenuItem"; this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(216, 22); this.ClearSRAMContextMenuItem.Text = "Close and Clear SRAM"; - this.ClearSRAMContextMenuItem.Click += new System.EventHandler(this.clearSRAMToolStripMenuItem_Click); + this.ClearSRAMContextMenuItem.Click += new System.EventHandler(this.ClearSRAMContextMenuItem_Click); // // ShowMenuContextMenuSeparator // @@ -3018,7 +3018,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(470, 408); - this.Controls.Add(this.StatusSlot0); + this.Controls.Add(this.MainStatusBar); this.Controls.Add(this.MainformMenu); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.MainMenuStrip = this.MainformMenu; @@ -3033,8 +3033,8 @@ this.Resize += new System.EventHandler(this.MainForm_Resize); this.MainformMenu.ResumeLayout(false); this.MainformMenu.PerformLayout(); - this.StatusSlot0.ResumeLayout(false); - this.StatusSlot0.PerformLayout(); + this.MainStatusBar.ResumeLayout(false); + this.MainStatusBar.PerformLayout(); this.MainFormContextMenu.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -3170,7 +3170,7 @@ private System.Windows.Forms.ToolStripMenuItem ToolBoxMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; private System.Windows.Forms.ToolStripMenuItem SwitchToFullscreenMenuItem; - private System.Windows.Forms.StatusStrip StatusSlot0; + private System.Windows.Forms.StatusStrip MainStatusBar; private System.Windows.Forms.ToolStripStatusLabel EmuStatus; private System.Windows.Forms.ToolStripMenuItem MessagesMenuItem; private System.Windows.Forms.ToolStripMenuItem TI83SubMenu; @@ -3209,23 +3209,23 @@ private System.Windows.Forms.ToolStripMenuItem BackupMovieContextMenuItem; private System.Windows.Forms.ToolStripMenuItem AutomaticallyBackupMoviesMenuItem; private System.Windows.Forms.ToolStripMenuItem StopMovieContextMenuItem; - private System.Windows.Forms.ToolStripDropDownButton PauseStrip; - private System.Windows.Forms.ToolStripDropDownButton PlayRecordStatus; - private System.Windows.Forms.ToolStripDropDownButton DumpStatus; + private System.Windows.Forms.ToolStripDropDownButton PauseStatusButton; + private System.Windows.Forms.ToolStripDropDownButton PlayRecordStatusButton; + private System.Windows.Forms.ToolStripDropDownButton DumpStatusButton; private System.Windows.Forms.ToolStripMenuItem ViewSubtitlesContextMenuItem; private MenuStripEx MainformMenu; private System.Windows.Forms.ToolStripMenuItem GBSubMenu; - private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; - private System.Windows.Forms.ToolStripStatusLabel StatusSlot1; - private System.Windows.Forms.ToolStripStatusLabel StatusSlot2; - private System.Windows.Forms.ToolStripStatusLabel StatusSlot3; - private System.Windows.Forms.ToolStripStatusLabel StatusSlot4; - private System.Windows.Forms.ToolStripStatusLabel StatusSlot5; - private System.Windows.Forms.ToolStripStatusLabel StatusSlot6; - private System.Windows.Forms.ToolStripStatusLabel StatusSlot7; - private System.Windows.Forms.ToolStripStatusLabel StatusSlot8; - private System.Windows.Forms.ToolStripStatusLabel StatusSlot9; - private System.Windows.Forms.ToolStripStatusLabel StatusSlot10; + private System.Windows.Forms.ToolStripStatusLabel SaveSlotsStatusLabel; + private System.Windows.Forms.ToolStripStatusLabel Slot1StatusButton; + private System.Windows.Forms.ToolStripStatusLabel Slot2StatusButton; + private System.Windows.Forms.ToolStripStatusLabel Slot3StatusButton; + private System.Windows.Forms.ToolStripStatusLabel Slot4StatusButton; + private System.Windows.Forms.ToolStripStatusLabel Slot5StatusButton; + private System.Windows.Forms.ToolStripStatusLabel Slot6StatusButton; + private System.Windows.Forms.ToolStripStatusLabel Slot7StatusButton; + private System.Windows.Forms.ToolStripStatusLabel Slot8StatusButton; + private System.Windows.Forms.ToolStripStatusLabel Slot9StatusButton; + private System.Windows.Forms.ToolStripStatusLabel Slot0StatusButton; private System.Windows.Forms.ToolStripMenuItem ViewCommentsContextMenuItem; private System.Windows.Forms.ToolStripMenuItem DisplayLogWindowMenuItem; private System.Windows.Forms.ToolStripMenuItem DisplaySubtitlesMenuItem; @@ -3234,7 +3234,7 @@ private System.Windows.Forms.ToolStripMenuItem StopAVIMenuItem; private System.Windows.Forms.ToolStripStatusLabel AVIStatusLabel; private System.Windows.Forms.ToolStripMenuItem RestartMovieContextMenuItem; - private System.Windows.Forms.ToolStripStatusLabel CheatStatus; + private System.Windows.Forms.ToolStripStatusLabel CheatStatusButton; private System.Windows.Forms.ToolStripMenuItem AutofireMenuItem; private System.Windows.Forms.ToolStripMenuItem AutoloadLastSlotMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator21; @@ -3328,14 +3328,14 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator28; private System.Windows.Forms.ToolStripMenuItem ColecoSubMenu; private System.Windows.Forms.ToolStripMenuItem ColecoSkipBiosMenuItem; - private System.Windows.Forms.ToolStripStatusLabel StatusBarLedLight; + private System.Windows.Forms.ToolStripStatusLabel LedLightStatusLabel; private System.Windows.Forms.ToolStripMenuItem GBASubMenu; private System.Windows.Forms.ToolStripMenuItem GbaGpuViewerMenuItem; private System.Windows.Forms.ToolStripMenuItem KeyPrioritySubMenu; private System.Windows.Forms.ToolStripMenuItem BothHkAndControllerMenuItem; private System.Windows.Forms.ToolStripMenuItem InputOverHkMenuItem; private System.Windows.Forms.ToolStripMenuItem HkOverInputMenuItem; - private System.Windows.Forms.ToolStripStatusLabel KeyPriorityStatusBarLabel; + private System.Windows.Forms.ToolStripStatusLabel KeyPriorityStatusLabel; private System.Windows.Forms.ToolStripMenuItem SnesOptionsMenuItem; private System.Windows.Forms.ToolStripMenuItem FullMovieLoadstatesMenuItem; private System.Windows.Forms.ToolStripMenuItem StopNoSaveContextMenuItem; diff --git a/BizHawk.MultiClient/MainForm.Events.cs b/BizHawk.MultiClient/MainForm.Events.cs index 7abe98d969..e2d34def96 100644 --- a/BizHawk.MultiClient/MainForm.Events.cs +++ b/BizHawk.MultiClient/MainForm.Events.cs @@ -683,7 +683,7 @@ namespace BizHawk.MultiClient if (!InFullscreen) { - StatusSlot0.Visible = Global.Config.DisplayStatusBar; + MainStatusBar.Visible = Global.Config.DisplayStatusBar; PerformLayout(); FrameBufferResized(); } @@ -1972,6 +1972,11 @@ namespace BizHawk.MultiClient GlobalWinF.OSD.AddMessage("Save slot " + Global.Config.SaveSlot + " restored."); } + private void ClearSRAMContextMenuItem_Click(object sender, EventArgs e) + { + CloseROM(clearSRAM: true); + } + private void ShowMenuContextMenuItem_Click(object sender, EventArgs e) { ShowHideMenu(); @@ -1979,33 +1984,86 @@ namespace BizHawk.MultiClient #endregion - private void DumpStatus_Click(object sender, EventArgs e) + #region Status Bar + + private void DumpStatusButton_Click(object sender, EventArgs e) { string details = Global.Emulator.CoreComm.RomStatusDetails; - if (string.IsNullOrEmpty(details)) return; - GlobalWinF.Sound.StopSound(); - LogWindow.ShowReport("Dump Status Report", details, this); - GlobalWinF.Sound.StartSound(); - } - - private void MainForm_Shown(object sender, EventArgs e) - { - HandlePlatformMenus(); - } - - public void MainForm_MouseClick(object sender, MouseEventArgs e) - { - if (Global.Config.ShowContextMenu && e.Button == MouseButtons.Right) + if (!String.IsNullOrEmpty(details)) { - Point p = new Point(e.X, e.Y + MainformMenu.Height); - Point po = PointToScreen(p); - MainFormContextMenu.Show(po); + GlobalWinF.Sound.StopSound(); + LogWindow.ShowReport("Dump Status Report", details, this); + GlobalWinF.Sound.StartSound(); } } - private void PauseStrip_Click(object sender, EventArgs e) + private void SlotStatusButtons_MouseUp(object sender, MouseEventArgs e) { - TogglePause(); + int slot = 0; + if (sender == Slot1StatusButton) slot = 1; + if (sender == Slot2StatusButton) slot = 2; + if (sender == Slot3StatusButton) slot = 3; + if (sender == Slot4StatusButton) slot = 4; + if (sender == Slot5StatusButton) slot = 5; + if (sender == Slot6StatusButton) slot = 6; + if (sender == Slot7StatusButton) slot = 7; + if (sender == Slot8StatusButton) slot = 8; + if (sender == Slot9StatusButton) slot = 9; + if (sender == Slot0StatusButton) slot = 0; + + if (e.Button == MouseButtons.Left) + { + if (StateSlots.HasSlot(slot)) + { + LoadState("QuickSave" + slot); + } + } + else if (e.Button == MouseButtons.Right) + { + SaveState("QuickSave" + slot); + } + } + + private void KeyPriorityStatusLabel_Click(object sender, EventArgs e) + { + switch (Global.Config.Input_Hotkey_OverrideOptions) + { + default: + case 0: + Global.Config.Input_Hotkey_OverrideOptions = 1; + break; + case 1: + Global.Config.Input_Hotkey_OverrideOptions = 2; + break; + case 2: + Global.Config.Input_Hotkey_OverrideOptions = 0; + break; + } + UpdateKeyPriorityIcon(); + } + + private void FreezeStatus_Click(object sender, EventArgs e) + { + if (CheatStatusButton.Visible) + { + LoadCheatsWindow(); + } + } + + #endregion + + #region Form Events + + private void MainForm_Activated(object sender, EventArgs e) + { + if (!Global.Config.RunInBackground) + { + if (!wasPaused) + { + UnpauseEmulator(); + } + wasPaused = false; + } } private void MainForm_Deactivate(object sender, EventArgs e) @@ -2020,203 +2078,59 @@ namespace BizHawk.MultiClient } } - private void MainForm_Activated(object sender, EventArgs e) - { - if (!Global.Config.RunInBackground) - { - - if (!wasPaused) - { - UnpauseEmulator(); - } - wasPaused = false; - } - } - - private void menuStrip1_MenuActivate(object sender, EventArgs e) - { - HandlePlatformMenus(); - if (Global.Config.PauseWhenMenuActivated) - { - if (EmulatorPaused) - wasPaused = true; - else - wasPaused = false; - didMenuPause = true; - PauseEmulator(); - } - } - - private void menuStrip1_MenuDeactivate(object sender, EventArgs e) + private void MainForm_Enter(object sender, EventArgs e) { GlobalWinF.DisplayManager.NeedsToPaint = true; - if (!wasPaused) + } + + public void MainForm_MouseClick(object sender, MouseEventArgs e) + { + if (Global.Config.ShowContextMenu && e.Button == MouseButtons.Right) { - UnpauseEmulator(); + MainFormContextMenu.Show( + PointToScreen(new Point(e.X, e.Y + MainformMenu.Height)) + ); } } + private void MainForm_Resize(object sender, EventArgs e) + { + GlobalWinF.RenderPanel.Resized = true; + } + + private void MainForm_Shown(object sender, EventArgs e) + { + HandlePlatformMenus(); + } + protected override void OnClosed(EventArgs e) { exit = true; base.OnClosed(e); } - private void FreezeStatus_Click(object sender, EventArgs e) + private void MainformMenu_Leave(object sender, EventArgs e) { - if (CheatStatus.Visible) + GlobalWinF.DisplayManager.NeedsToPaint = true; + } + + private void MainformMenu_MenuActivate(object sender, EventArgs e) + { + HandlePlatformMenus(); + if (Global.Config.PauseWhenMenuActivated) { - LoadCheatsWindow(); + EmulatorPaused = wasPaused; + didMenuPause = true; + PauseEmulator(); } } - private void StatusSlot1_MouseUp(object sender, MouseEventArgs e) + private void MainformMenu_MenuDeactivate(object sender, EventArgs e) { - if (e.Button == MouseButtons.Left) + GlobalWinF.DisplayManager.NeedsToPaint = true; + if (!wasPaused) { - if (StateSlots.HasSlot(1)) - { - LoadState("QuickSave1"); - } - } - else if (e.Button == MouseButtons.Right) - { - SaveState("QuickSave1"); - } - } - - private void StatusSlot2_MouseUp(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - if (StateSlots.HasSlot(2)) - { - LoadState("QuickSave2"); - } - } - else if (e.Button == MouseButtons.Right) - { - SaveState("QuickSave2"); - } - } - - private void StatusSlot3_MouseUp(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - if (StateSlots.HasSlot(3)) - { - LoadState("QuickSave3"); - } - } - else if (e.Button == MouseButtons.Right) - { - SaveState("QuickSave3"); - } - } - - private void StatusSlot4_MouseUp(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - if (StateSlots.HasSlot(4)) - { - LoadState("QuickSave4"); - } - } - else if (e.Button == MouseButtons.Right) - { - SaveState("QuickSave4"); - } - } - - private void StatusSlot5_MouseUp(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - if (StateSlots.HasSlot(5)) - { - LoadState("QuickSave5"); - } - } - else if (e.Button == MouseButtons.Right) - { - SaveState("QuickSave5"); - } - } - - private void StatusSlot6_MouseUp(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - if (StateSlots.HasSlot(6)) - { - LoadState("QuickSave6"); - } - } - else if (e.Button == MouseButtons.Right) - { - SaveState("QuickSave6"); - } - } - - private void StatusSlot7_MouseUp(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - if (StateSlots.HasSlot(7)) - { - LoadState("QuickSave7"); - } - } - else if (e.Button == MouseButtons.Right) - { - SaveState("QuickSave7"); - } - } - - private void StatusSlot8_MouseUp(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - if (StateSlots.HasSlot(8)) - { - LoadState("QuickSave8"); - } - } - else if (e.Button == MouseButtons.Right) - { - SaveState("QuickSave8"); - } - } - - private void StatusSlot9_MouseUp(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - if (StateSlots.HasSlot(9)) - { - LoadState("QuickSave9"); - } - } - else if (e.Button == MouseButtons.Right) - { - SaveState("QuickSave9"); - } - } - - private void StatusSlot10_MouseUp(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - if (StateSlots.HasSlot(0)) - { - LoadState("QuickSave0"); - } - } - else if (e.Button == MouseButtons.Right) - { - SaveState("QuickSave0"); + UnpauseEmulator(); } } @@ -2250,9 +2164,7 @@ namespace BizHawk.MultiClient } else if (IsValidMovieExtension(ext)) { - Movie m = new Movie(filePaths[0], GlobalWinF.MainForm.GetEmuVersion()); - StartNewMovie(m, false); - + StartNewMovie(new Movie(filePaths[0], GlobalWinF.MainForm.GetEmuVersion()), false); } else if (ext.ToUpper() == ".STATE") { @@ -2273,7 +2185,6 @@ namespace BizHawk.MultiClient else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0]))) { //tries to open a legacy movie format as if it were a BKM, by importing it - if (CurrentlyOpenRom == null) { OpenROM(); @@ -2285,7 +2196,7 @@ namespace BizHawk.MultiClient string errorMsg; string warningMsg; - Movie m = MovieImport.ImportFile(filePaths[0], GlobalWinF.MainForm.GetEmuVersion(), out errorMsg, out warningMsg); + Movie movie = MovieImport.ImportFile(filePaths[0], GlobalWinF.MainForm.GetEmuVersion(), out errorMsg, out warningMsg); if (errorMsg.Length > 0) { MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -2295,42 +2206,18 @@ namespace BizHawk.MultiClient //fix movie extension to something palatable for these purposes. //for instance, something which doesnt clobber movies you already may have had. //i'm evenly torn between this, and a file in %TEMP%, but since we dont really have a way to clean up this tempfile, i choose this: - m.Filename += ".autoimported." + Global.Config.MovieExtension; - m.WriteMovie(); - StartNewMovie(m, false); + movie.Filename += ".autoimported." + Global.Config.MovieExtension; + movie.WriteMovie(); + StartNewMovie(movie, false); } GlobalWinF.OSD.AddMessage(warningMsg); } else - LoadRom(filePaths[0]); - } - - private void MainForm_Resize(object sender, EventArgs e) - { - GlobalWinF.RenderPanel.Resized = true; - } - - private void toolStripStatusLabel2_Click(object sender, EventArgs e) - { - RebootCore(); - } - - private void KeyPriorityStatusBarLabel_Click(object sender, EventArgs e) - { - switch (Global.Config.Input_Hotkey_OverrideOptions) { - default: - case 0: - Global.Config.Input_Hotkey_OverrideOptions = 1; - break; - case 1: - Global.Config.Input_Hotkey_OverrideOptions = 2; - break; - case 2: - Global.Config.Input_Hotkey_OverrideOptions = 0; - break; + LoadRom(filePaths[0]); } - UpdateKeyPriorityIcon(); } + + #endregion } } diff --git a/BizHawk.MultiClient/MainForm.Movie.cs b/BizHawk.MultiClient/MainForm.Movie.cs index d189b54941..c89c6255de 100644 --- a/BizHawk.MultiClient/MainForm.Movie.cs +++ b/BizHawk.MultiClient/MainForm.Movie.cs @@ -66,23 +66,23 @@ namespace BizHawk.MultiClient if (Global.MovieSession.Movie.IsPlaying) { Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename); - PlayRecordStatus.Image = Properties.Resources.Play; - PlayRecordStatus.ToolTipText = "Movie is in playback mode"; - PlayRecordStatus.Visible = true; + PlayRecordStatusButton.Image = Properties.Resources.Play; + PlayRecordStatusButton.ToolTipText = "Movie is in playback mode"; + PlayRecordStatusButton.Visible = true; } else if (Global.MovieSession.Movie.IsRecording) { Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename); - PlayRecordStatus.Image = Properties.Resources.RecordHS; - PlayRecordStatus.ToolTipText = "Movie is in record mode"; - PlayRecordStatus.Visible = true; + PlayRecordStatusButton.Image = Properties.Resources.RecordHS; + PlayRecordStatusButton.ToolTipText = "Movie is in record mode"; + PlayRecordStatusButton.Visible = true; } else if (!Global.MovieSession.Movie.IsActive) { Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name; - PlayRecordStatus.Image = Properties.Resources.Blank; - PlayRecordStatus.ToolTipText = "No movie is active"; - PlayRecordStatus.Visible = false; + PlayRecordStatusButton.Image = Properties.Resources.Blank; + PlayRecordStatusButton.ToolTipText = "No movie is active"; + PlayRecordStatusButton.Visible = false; } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index bc66127ea0..05310a6915 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -425,7 +425,7 @@ namespace BizHawk.MultiClient if (Global.Config.DisplayStatusBar == false) { - StatusSlot0.Visible = false; + MainStatusBar.Visible = false; } else { @@ -738,15 +738,15 @@ namespace BizHawk.MultiClient { if (EmulatorPaused) { - PauseStrip.Image = Properties.Resources.Pause; - PauseStrip.Visible = true; - PauseStrip.ToolTipText = "Emulator Paused"; + PauseStatusButton.Image = Properties.Resources.Pause; + PauseStatusButton.Visible = true; + PauseStatusButton.ToolTipText = "Emulator Paused"; } else { - PauseStrip.Image = Properties.Resources.Blank; - PauseStrip.Visible = false; - PauseStrip.ToolTipText = ""; + PauseStatusButton.Image = Properties.Resources.Blank; + PauseStatusButton.Visible = false; + PauseStatusButton.ToolTipText = ""; } } @@ -1695,8 +1695,8 @@ namespace BizHawk.MultiClient private void UpdateDumpIcon() { - DumpStatus.Image = Properties.Resources.Blank; - DumpStatus.ToolTipText = ""; + DumpStatusButton.Image = Properties.Resources.Blank; + DumpStatusButton.ToolTipText = ""; if (Global.Emulator == null) return; if (Global.Game == null) return; @@ -1705,48 +1705,48 @@ namespace BizHawk.MultiClient string annotation; if (status == RomStatus.BadDump) { - DumpStatus.Image = Properties.Resources.ExclamationRed; + DumpStatusButton.Image = Properties.Resources.ExclamationRed; annotation = "Warning: Bad ROM Dump"; } else if (status == RomStatus.Overdump) { - DumpStatus.Image = Properties.Resources.ExclamationRed; + DumpStatusButton.Image = Properties.Resources.ExclamationRed; annotation = "Warning: Overdump"; } else if (status == RomStatus.NotInDatabase) { - DumpStatus.Image = Properties.Resources.RetroQuestion; + DumpStatusButton.Image = Properties.Resources.RetroQuestion; annotation = "Warning: Unknown ROM"; } else if (status == RomStatus.TranslatedRom) { - DumpStatus.Image = Properties.Resources.Translation; + DumpStatusButton.Image = Properties.Resources.Translation; annotation = "Translated ROM"; } else if (status == RomStatus.Homebrew) { - DumpStatus.Image = Properties.Resources.HomeBrew; + DumpStatusButton.Image = Properties.Resources.HomeBrew; annotation = "Homebrew ROM"; } else if (Global.Game.Status == RomStatus.Hack) { - DumpStatus.Image = Properties.Resources.Hack; + DumpStatusButton.Image = Properties.Resources.Hack; annotation = "Hacked ROM"; } else if (Global.Game.Status == RomStatus.Unknown) { - DumpStatus.Image = Properties.Resources.Hack; + DumpStatusButton.Image = Properties.Resources.Hack; annotation = "Warning: ROM of Unknown Character"; } else { - DumpStatus.Image = Properties.Resources.GreenCheck; + DumpStatusButton.Image = Properties.Resources.GreenCheck; annotation = "Verified good dump"; } if (!string.IsNullOrEmpty(Global.Emulator.CoreComm.RomStatusAnnotation)) annotation = Global.Emulator.CoreComm.RomStatusAnnotation; - DumpStatus.ToolTipText = annotation; + DumpStatusButton.ToolTipText = annotation; } @@ -3160,7 +3160,7 @@ namespace BizHawk.MultiClient MainMenuStrip.Visible = true; else MainMenuStrip.Visible = false; - StatusSlot0.Visible = false; + MainStatusBar.Visible = false; PerformLayout(); GlobalWinF.RenderPanel.Resized = true; InFullscreen = true; @@ -3170,7 +3170,7 @@ namespace BizHawk.MultiClient FormBorderStyle = FormBorderStyle.Sizable; WindowState = FormWindowState.Normal; MainMenuStrip.Visible = true; - StatusSlot0.Visible = Global.Config.DisplayStatusBar; + MainStatusBar.Visible = Global.Config.DisplayStatusBar; Location = _windowed_location; PerformLayout(); FrameBufferResized(); @@ -3555,124 +3555,124 @@ namespace BizHawk.MultiClient if (StateSlots.HasSlot(1)) { - StatusSlot1.ForeColor = Color.Black; + Slot1StatusButton.ForeColor = Color.Black; } else { - StatusSlot1.ForeColor = Color.Gray; + Slot1StatusButton.ForeColor = Color.Gray; } if (StateSlots.HasSlot(2)) { - StatusSlot2.ForeColor = Color.Black; + Slot2StatusButton.ForeColor = Color.Black; } else { - StatusSlot2.ForeColor = Color.Gray; + Slot2StatusButton.ForeColor = Color.Gray; } if (StateSlots.HasSlot(3)) { - StatusSlot3.ForeColor = Color.Black; + Slot3StatusButton.ForeColor = Color.Black; } else { - StatusSlot3.ForeColor = Color.Gray; + Slot3StatusButton.ForeColor = Color.Gray; } if (StateSlots.HasSlot(3)) { - StatusSlot3.ForeColor = Color.Black; + Slot3StatusButton.ForeColor = Color.Black; } else { - StatusSlot3.ForeColor = Color.Gray; + Slot3StatusButton.ForeColor = Color.Gray; } if (StateSlots.HasSlot(4)) { - StatusSlot4.ForeColor = Color.Black; + Slot4StatusButton.ForeColor = Color.Black; } else { - StatusSlot4.ForeColor = Color.Gray; + Slot4StatusButton.ForeColor = Color.Gray; } if (StateSlots.HasSlot(5)) { - StatusSlot5.ForeColor = Color.Black; + Slot5StatusButton.ForeColor = Color.Black; } else { - StatusSlot5.ForeColor = Color.Gray; + Slot5StatusButton.ForeColor = Color.Gray; } if (StateSlots.HasSlot(6)) { - StatusSlot6.ForeColor = Color.Black; + Slot6StatusButton.ForeColor = Color.Black; } else { - StatusSlot6.ForeColor = Color.Gray; + Slot6StatusButton.ForeColor = Color.Gray; } if (StateSlots.HasSlot(7)) { - StatusSlot7.ForeColor = Color.Black; + Slot7StatusButton.ForeColor = Color.Black; } else { - StatusSlot7.ForeColor = Color.Gray; + Slot7StatusButton.ForeColor = Color.Gray; } if (StateSlots.HasSlot(8)) { - StatusSlot8.ForeColor = Color.Black; + Slot8StatusButton.ForeColor = Color.Black; } else { - StatusSlot8.ForeColor = Color.Gray; + Slot8StatusButton.ForeColor = Color.Gray; } if (StateSlots.HasSlot(9)) { - StatusSlot9.ForeColor = Color.Black; + Slot9StatusButton.ForeColor = Color.Black; } else { - StatusSlot9.ForeColor = Color.Gray; + Slot9StatusButton.ForeColor = Color.Gray; } if (StateSlots.HasSlot(0)) { - StatusSlot0.ForeColor = Color.Black; + MainStatusBar.ForeColor = Color.Black; } else { - StatusSlot0.ForeColor = Color.Gray; + MainStatusBar.ForeColor = Color.Gray; } - StatusSlot1.BackColor = SystemColors.Control; - StatusSlot2.BackColor = SystemColors.Control; - StatusSlot3.BackColor = SystemColors.Control; - StatusSlot4.BackColor = SystemColors.Control; - StatusSlot5.BackColor = SystemColors.Control; - StatusSlot6.BackColor = SystemColors.Control; - StatusSlot7.BackColor = SystemColors.Control; - StatusSlot8.BackColor = SystemColors.Control; - StatusSlot9.BackColor = SystemColors.Control; - StatusSlot10.BackColor = SystemColors.Control; + Slot1StatusButton.BackColor = SystemColors.Control; + Slot2StatusButton.BackColor = SystemColors.Control; + Slot3StatusButton.BackColor = SystemColors.Control; + Slot4StatusButton.BackColor = SystemColors.Control; + Slot5StatusButton.BackColor = SystemColors.Control; + Slot6StatusButton.BackColor = SystemColors.Control; + Slot7StatusButton.BackColor = SystemColors.Control; + Slot8StatusButton.BackColor = SystemColors.Control; + Slot9StatusButton.BackColor = SystemColors.Control; + Slot0StatusButton.BackColor = SystemColors.Control; - if (Global.Config.SaveSlot == 0) StatusSlot10.BackColor = SystemColors.ControlDark; - if (Global.Config.SaveSlot == 1) StatusSlot1.BackColor = SystemColors.ControlDark; - if (Global.Config.SaveSlot == 2) StatusSlot2.BackColor = SystemColors.ControlDark; - if (Global.Config.SaveSlot == 3) StatusSlot3.BackColor = SystemColors.ControlDark; - if (Global.Config.SaveSlot == 4) StatusSlot4.BackColor = SystemColors.ControlDark; - if (Global.Config.SaveSlot == 5) StatusSlot5.BackColor = SystemColors.ControlDark; - if (Global.Config.SaveSlot == 6) StatusSlot6.BackColor = SystemColors.ControlDark; - if (Global.Config.SaveSlot == 7) StatusSlot7.BackColor = SystemColors.ControlDark; - if (Global.Config.SaveSlot == 8) StatusSlot8.BackColor = SystemColors.ControlDark; - if (Global.Config.SaveSlot == 9) StatusSlot9.BackColor = SystemColors.ControlDark; + if (Global.Config.SaveSlot == 0) Slot0StatusButton.BackColor = SystemColors.ControlDark; + if (Global.Config.SaveSlot == 1) Slot1StatusButton.BackColor = SystemColors.ControlDark; + if (Global.Config.SaveSlot == 2) Slot2StatusButton.BackColor = SystemColors.ControlDark; + if (Global.Config.SaveSlot == 3) Slot3StatusButton.BackColor = SystemColors.ControlDark; + if (Global.Config.SaveSlot == 4) Slot4StatusButton.BackColor = SystemColors.ControlDark; + if (Global.Config.SaveSlot == 5) Slot5StatusButton.BackColor = SystemColors.ControlDark; + if (Global.Config.SaveSlot == 6) Slot6StatusButton.BackColor = SystemColors.ControlDark; + if (Global.Config.SaveSlot == 7) Slot7StatusButton.BackColor = SystemColors.ControlDark; + if (Global.Config.SaveSlot == 8) Slot8StatusButton.BackColor = SystemColors.ControlDark; + if (Global.Config.SaveSlot == 9) Slot9StatusButton.BackColor = SystemColors.ControlDark; } #region AVI Stuff @@ -4053,7 +4053,7 @@ namespace BizHawk.MultiClient Text = "BizHawk" + (INTERIM ? " (interim) " : ""); //Hide Status bar icons - PlayRecordStatus.Visible = false; + PlayRecordStatusButton.Visible = false; AVIStatusLabel.Visible = false; SetPauseStatusbarIcon(); UpdateCheatStatus(); @@ -4212,28 +4212,28 @@ namespace BizHawk.MultiClient private void HandleToggleLight() { - if (StatusSlot0.Visible) + if (MainStatusBar.Visible) { if (Global.Emulator.CoreComm.UsesDriveLed) { - if (!StatusBarLedLight.Visible) + if (!LedLightStatusLabel.Visible) { - StatusBarLedLight.Visible = true; + LedLightStatusLabel.Visible = true; } if (Global.Emulator.CoreComm.DriveLED) { - StatusBarLedLight.Image = Properties.Resources.LightOn; + LedLightStatusLabel.Image = Properties.Resources.LightOn; } else { - StatusBarLedLight.Image = Properties.Resources.LightOff; + LedLightStatusLabel.Image = Properties.Resources.LightOff; } } else { - if (StatusBarLedLight.Visible) + if (LedLightStatusLabel.Visible) { - StatusBarLedLight.Visible = false; + LedLightStatusLabel.Visible = false; } } } @@ -4245,16 +4245,16 @@ namespace BizHawk.MultiClient { default: case 0: - KeyPriorityStatusBarLabel.Image = Properties.Resources.Both; - KeyPriorityStatusBarLabel.ToolTipText = "Key priority: Allow both hotkeys and controller buttons"; + KeyPriorityStatusLabel.Image = Properties.Resources.Both; + KeyPriorityStatusLabel.ToolTipText = "Key priority: Allow both hotkeys and controller buttons"; break; case 1: - KeyPriorityStatusBarLabel.Image = Properties.Resources.GameController; - KeyPriorityStatusBarLabel.ToolTipText = "Key priority: Controller buttons will override hotkeys"; + KeyPriorityStatusLabel.Image = Properties.Resources.GameController; + KeyPriorityStatusLabel.ToolTipText = "Key priority: Controller buttons will override hotkeys"; break; case 2: - KeyPriorityStatusBarLabel.Image = Properties.Resources.HotKeys; - KeyPriorityStatusBarLabel.ToolTipText = "Key priority: Hotkeys will override controller buttons"; + KeyPriorityStatusLabel.Image = Properties.Resources.HotKeys; + KeyPriorityStatusLabel.ToolTipText = "Key priority: Hotkeys will override controller buttons"; break; } } @@ -4284,16 +4284,6 @@ namespace BizHawk.MultiClient } } - private void menuStrip1_Leave(object sender, EventArgs e) - { - GlobalWinF.DisplayManager.NeedsToPaint = true; - } - - private void MainForm_Enter(object sender, EventArgs e) - { - GlobalWinF.DisplayManager.NeedsToPaint = true; - } - public void LoadRamWatch(bool load_dialog) { if (!RamWatch1.IsHandleCreated || RamWatch1.IsDisposed) @@ -4314,11 +4304,6 @@ namespace BizHawk.MultiClient } } - private void clearSRAMToolStripMenuItem_Click(object sender, EventArgs e) - { - CloseROM(clearSRAM: true); - } - public void ToggleBackgroundInput() { Global.Config.AcceptBackgroundInput ^= true; @@ -4383,15 +4368,15 @@ namespace BizHawk.MultiClient { if (Global.CheatList.ActiveCount > 0) { - CheatStatus.ToolTipText = "Cheats are currently active"; - CheatStatus.Image = Properties.Resources.Freeze; - CheatStatus.Visible = true; + CheatStatusButton.ToolTipText = "Cheats are currently active"; + CheatStatusButton.Image = Properties.Resources.Freeze; + CheatStatusButton.Visible = true; } else { - CheatStatus.ToolTipText = ""; - CheatStatus.Image = Properties.Resources.Blank; - CheatStatus.Visible = false; + CheatStatusButton.ToolTipText = ""; + CheatStatusButton.Image = Properties.Resources.Blank; + CheatStatusButton.Visible = false; } } diff --git a/BizHawk.MultiClient/MainForm.resx b/BizHawk.MultiClient/MainForm.resx index 5c7cb76b0c..9c2fa8d0b7 100644 --- a/BizHawk.MultiClient/MainForm.resx +++ b/BizHawk.MultiClient/MainForm.resx @@ -527,7 +527,7 @@ gg== - + 126, 17