Upstream

Optimizer/Controls/MoonRadio.cs

@@ -4,9 +4,9 @@ using System.Windows.Forms;
 
 namespace Optimizer
 {
-    public class MoonnRadio : RadioButton
+    public class MoonRadio : RadioButton
     {
-        public MoonnRadio()
+        public MoonRadio()
         {
             DoubleBuffered = true;
         }

Optimizer/Controls/ToggleCard.Designer.cs

@@ -43,6 +43,8 @@ namespace Optimizer
             this.Label.Size = new System.Drawing.Size(45, 19);
             this.Label.TabIndex = 1;
             this.Label.Text = "label1";
+            this.Label.MouseEnter += new System.EventHandler(this.Label_MouseEnter);
+            this.Label.MouseHover += new System.EventHandler(this.Label_MouseHover);
             // 
             // Panel
             // 
@@ -52,7 +54,9 @@ namespace Optimizer
             this.Panel.Location = new System.Drawing.Point(0, 0);
             this.Panel.Name = "Panel";
             this.Panel.Size = new System.Drawing.Size(334, 25);
-            this.Panel.TabIndex = 2;
+            this.Panel.TabIndex = 0;
+            this.Panel.MouseEnter += new System.EventHandler(this.Panel_MouseEnter);
+            this.Panel.MouseHover += new System.EventHandler(this.Panel_MouseHover);
             // 
             // Toggle
             // 
@@ -62,7 +66,7 @@ namespace Optimizer
             this.Toggle.MinimumSize = new System.Drawing.Size(46, 22);
             this.Toggle.Name = "Toggle";
             this.Toggle.Size = new System.Drawing.Size(46, 22);
-            this.Toggle.TabIndex = 0;
+            this.Toggle.TabIndex = 2;
             this.Toggle.UseVisualStyleBackColor = true;
             this.Toggle.CheckedChanged += new System.EventHandler(this.Toggle_CheckedChanged);
             // 

Optimizer/Controls/ToggleCard.cs

@@ -11,8 +11,20 @@ namespace Optimizer
         {
             InitializeComponent();
 
-            this.AccessibleRole = AccessibleRole.CheckButton;
+            this.IsAccessible = true;
+            Label.IsAccessible = true;
+            Toggle.IsAccessible = true;
+            Panel.IsAccessible = true;
+
+            this.AccessibleRole = AccessibleRole.StaticText;
+            Label.AccessibleRole = AccessibleRole.StaticText;
+            Toggle.AccessibleRole = AccessibleRole.StaticText;
+            Panel.AccessibleRole = AccessibleRole.StaticText;
+
             this.AccessibleName = LabelText;
+            Label.AccessibleName = LabelText;
+            Toggle.AccessibleName = LabelText;
+            Panel.AccessibleName = LabelText;
         }
 
         public string LabelText
@@ -22,6 +34,9 @@ namespace Optimizer
             {
                 Label.Text = value;
                 this.AccessibleName = value;
+                Label.AccessibleName = value;
+                Toggle.AccessibleName = value;
+                Panel.AccessibleName = LabelText;
             }
         }
 
@@ -35,5 +50,27 @@ namespace Optimizer
         {
             if (ToggleClicked != null) ToggleClicked(sender, e);
         }
+
+        private void Label_MouseEnter(object sender, EventArgs e)
+        {
+            //Label.Focus();
+            //Label.Select();
+        }
+
+        private void Label_MouseHover(object sender, EventArgs e)
+        {
+            //Label.Focus();
+            //Label.Select();
+        }
+
+        private void Panel_MouseEnter(object sender, EventArgs e)
+        {
+
+        }
+
+        private void Panel_MouseHover(object sender, EventArgs e)
+        {
+
+        }
     }
 }

Optimizer/Forms/FirstRunForm.Designer.cs

@@ -44,22 +44,22 @@ namespace Optimizer
             this.pictureBox8 = new System.Windows.Forms.PictureBox();
             this.pictureBox9 = new System.Windows.Forms.PictureBox();
             this.pictureBox10 = new System.Windows.Forms.PictureBox();
-            this.radioKorean = new Optimizer.MoonnRadio();
-            this.radioTaiwan = new Optimizer.MoonnRadio();
-            this.radioCzech = new Optimizer.MoonnRadio();
-            this.radioChinese = new Optimizer.MoonnRadio();
-            this.radioItalian = new Optimizer.MoonnRadio();
-            this.radioFrench = new Optimizer.MoonnRadio();
-            this.radioPortuguese = new Optimizer.MoonnRadio();
-            this.radioSpanish = new Optimizer.MoonnRadio();
-            this.radioGerman = new Optimizer.MoonnRadio();
-            this.radioTurkish = new Optimizer.MoonnRadio();
-            this.radioHellenic = new Optimizer.MoonnRadio();
-            this.radioEnglish = new Optimizer.MoonnRadio();
-            this.radioRussian = new Optimizer.MoonnRadio();
-            this.radioPolish = new Optimizer.MoonnRadio();
+            this.radioKorean = new Optimizer.MoonRadio();
+            this.radioTaiwan = new Optimizer.MoonRadio();
+            this.radioCzech = new Optimizer.MoonRadio();
+            this.radioChinese = new Optimizer.MoonRadio();
+            this.radioItalian = new Optimizer.MoonRadio();
+            this.radioFrench = new Optimizer.MoonRadio();
+            this.radioPortuguese = new Optimizer.MoonRadio();
+            this.radioSpanish = new Optimizer.MoonRadio();
+            this.radioGerman = new Optimizer.MoonRadio();
+            this.radioTurkish = new Optimizer.MoonRadio();
+            this.radioHellenic = new Optimizer.MoonRadio();
+            this.radioEnglish = new Optimizer.MoonRadio();
+            this.radioRussian = new Optimizer.MoonRadio();
+            this.radioPolish = new Optimizer.MoonRadio();
             this.pictureBox11 = new System.Windows.Forms.PictureBox();
-            this.radioArabic = new Optimizer.MoonnRadio();
+            this.radioArabic = new Optimizer.MoonRadio();
             this.pictureBox12 = new System.Windows.Forms.PictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox88)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox87)).BeginInit();
@@ -567,35 +567,35 @@ namespace Optimizer
         #endregion
 
         private System.Windows.Forms.PictureBox pictureBox88;
-        private MoonnRadio radioHellenic;
+        private MoonRadio radioHellenic;
         private System.Windows.Forms.PictureBox pictureBox87;
-        private MoonnRadio radioEnglish;
-        private MoonnRadio radioRussian;
+        private MoonRadio radioEnglish;
+        private MoonRadio radioRussian;
         private System.Windows.Forms.PictureBox pictureBox86;
         private System.Windows.Forms.Button btnStart;
         private System.Windows.Forms.PictureBox pictureBox1;
-        private MoonnRadio radioTurkish;
-        private MoonnRadio radioGerman;
+        private MoonRadio radioTurkish;
+        private MoonRadio radioGerman;
         private System.Windows.Forms.PictureBox pictureBox2;
-        private MoonnRadio radioSpanish;
+        private MoonRadio radioSpanish;
         private System.Windows.Forms.PictureBox pictureBox3;
-        private MoonnRadio radioPortuguese;
+        private MoonRadio radioPortuguese;
         private System.Windows.Forms.PictureBox pictureBox4;
-        private MoonnRadio radioFrench;
+        private MoonRadio radioFrench;
         private System.Windows.Forms.PictureBox pictureBox5;
-        private MoonnRadio radioItalian;
+        private MoonRadio radioItalian;
         private System.Windows.Forms.PictureBox pictureBox6;
-        private MoonnRadio radioChinese;
+        private MoonRadio radioChinese;
         private System.Windows.Forms.PictureBox pictureBox7;
-        private MoonnRadio radioCzech;
+        private MoonRadio radioCzech;
         private System.Windows.Forms.PictureBox pictureBox8;
-        private MoonnRadio radioTaiwan;
+        private MoonRadio radioTaiwan;
         private System.Windows.Forms.PictureBox pictureBox9;
-        private MoonnRadio radioKorean;
+        private MoonRadio radioKorean;
         private System.Windows.Forms.PictureBox pictureBox10;
-        private MoonnRadio radioPolish;
+        private MoonRadio radioPolish;
         private System.Windows.Forms.PictureBox pictureBox11;
-        private MoonnRadio radioArabic;
+        private MoonRadio radioArabic;
         private System.Windows.Forms.PictureBox pictureBox12;
     }
 }

Optimizer/Forms/MainForm.Designer.cs

@@ -144,8 +144,8 @@ namespace Optimizer
             this.panelCommonApps = new System.Windows.Forms.Panel();
             this.cAutoInstall = new Optimizer.MoonCheck();
             this.progressDownloader = new Optimizer.MoonProgress();
-            this.c64 = new Optimizer.MoonnRadio();
-            this.c32 = new Optimizer.MoonnRadio();
+            this.c64 = new Optimizer.MoonRadio();
+            this.c32 = new Optimizer.MoonRadio();
             this.btnDownloadApps = new System.Windows.Forms.Button();
             this.setDownDirLbl = new System.Windows.Forms.Label();
             this.txtDownloadFolder = new System.Windows.Forms.TextBox();
@@ -275,9 +275,9 @@ namespace Optimizer
             this.security = new System.Windows.Forms.GroupBox();
             this.checkShift = new Optimizer.MoonCheck();
             this.itemposition = new System.Windows.Forms.GroupBox();
-            this.radioTop = new Optimizer.MoonnRadio();
-            this.radioMiddle = new Optimizer.MoonnRadio();
-            this.radioBottom = new Optimizer.MoonnRadio();
+            this.radioTop = new Optimizer.MoonRadio();
+            this.radioMiddle = new Optimizer.MoonRadio();
+            this.radioBottom = new Optimizer.MoonRadio();
             this.icontoaddgroup = new System.Windows.Forms.GroupBox();
             this.checkDefaultIcon = new Optimizer.MoonCheck();
             this.btnBrowseIcon = new System.Windows.Forms.Button();
@@ -286,11 +286,11 @@ namespace Optimizer
             this.btnBrowseItem = new System.Windows.Forms.Button();
             this.txtItem = new System.Windows.Forms.TextBox();
             this.itemtype = new System.Windows.Forms.GroupBox();
-            this.radioCommand = new Optimizer.MoonnRadio();
-            this.radioProgram = new Optimizer.MoonnRadio();
-            this.radioFolder = new Optimizer.MoonnRadio();
-            this.radioLink = new Optimizer.MoonnRadio();
-            this.radioFile = new Optimizer.MoonnRadio();
+            this.radioCommand = new Optimizer.MoonRadio();
+            this.radioProgram = new Optimizer.MoonRadio();
+            this.radioFolder = new Optimizer.MoonRadio();
+            this.radioLink = new Optimizer.MoonRadio();
+            this.radioFile = new Optimizer.MoonRadio();
             this.addItemL = new System.Windows.Forms.Label();
             this.tabPage9 = new System.Windows.Forms.TabPage();
             this.panel5 = new System.Windows.Forms.Panel();
@@ -5637,11 +5637,11 @@ namespace Optimizer
         private System.Windows.Forms.Button removeDIB;
         private System.Windows.Forms.Button removeAllIIB;
         private System.Windows.Forms.GroupBox itemtype;
-        private MoonnRadio radioCommand;
-        private MoonnRadio radioProgram;
-        private MoonnRadio radioFile;
-        private MoonnRadio radioFolder;
-        private MoonnRadio radioLink;
+        private MoonRadio radioCommand;
+        private MoonRadio radioProgram;
+        private MoonRadio radioFile;
+        private MoonRadio radioFolder;
+        private MoonRadio radioLink;
         private System.Windows.Forms.Label addItemL;
         private System.Windows.Forms.GroupBox icontoaddgroup;
         private MoonCheck checkDefaultIcon;
@@ -5653,9 +5653,9 @@ namespace Optimizer
         private System.Windows.Forms.GroupBox security;
         private MoonCheck checkShift;
         private System.Windows.Forms.GroupBox itemposition;
-        private MoonnRadio radioTop;
-        private MoonnRadio radioMiddle;
-        private MoonnRadio radioBottom;
+        private MoonRadio radioTop;
+        private MoonRadio radioMiddle;
+        private MoonRadio radioBottom;
         private System.Windows.Forms.GroupBox itemnamegroup;
         private System.Windows.Forms.TextBox txtItemName;
         private System.Windows.Forms.Button btnAddItem;
@@ -5707,7 +5707,7 @@ namespace Optimizer
         private System.Windows.Forms.Button changeDownDirB;
         private System.Windows.Forms.Label txtDownloadStatus;
         private System.Windows.Forms.Label bitPref;
-        private MoonnRadio c32;
+        private MoonRadio c32;
         private System.Windows.Forms.Button goToDownloadsB;
         private System.Windows.Forms.LinkLabel linkWarnings;
         private MoonCheck cAutoInstall;
@@ -5746,7 +5746,7 @@ namespace Optimizer
         private System.Windows.Forms.ToolStripMenuItem trayRestartExplorer;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.Button flushCacheB;
-        private MoonnRadio c64;
+        private MoonRadio c64;
         private System.Windows.Forms.Panel panel10;
         private Button backupStartupB;
         private Button restoreStartupB;