Improve ListBox

Author: louislam

Properties/Resources.Designer.cs

@@ -62,4 +62,7 @@
   <data name="banner" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\banner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-</root>
+  <data name="icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>

Properties/Resources.resx

@@ -201,14 +201,14 @@
             <DependentUpon>Settings.settings</DependentUpon>
             <DesignTimeSharedInput>True</DesignTimeSharedInput>
         </Compile>
-        <None Include="Resources\icon.ico" />
     </ItemGroup>
     <ItemGroup>
         <None Include="App.config" />
     </ItemGroup>
     <ItemGroup>
       <Content Include="app.manifest" />
       <Content Include="Resources\banner.png" />
+      <Content Include="Resources\icon.ico" />
     </ItemGroup>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <Import Project="packages\Fody.6.6.4\build\Fody.targets" Condition="Exists('packages\Fody.6.6.4\build\Fody.targets')" />

rdp-portal.csproj

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=rdp_002Dportal_002FMainForm/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=rdp_002Dportal_002FProperties_002FResources/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/ShowOnlyErrors/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>

rdp-portal.sln.DotSettings.user

@@ -205,5 +205,39 @@ private void buttonAbout_Click(object sender, EventArgs e) {
         private void listBox_MouseDoubleClick(object sender, MouseEventArgs e) {
             buttonConnect_Click(sender, e);
         }
+
+        /**
+         * From https://stackoverflow.com/questions/8333282/how-can-i-include-icons-in-my-listbox
+         */
+        private void listBox_DrawItem(object sender, DrawItemEventArgs e) {
+            if (e.Index == -1)
+                return;
+
+            e.DrawBackground();
+            Brush myBrush = Brushes.Black;
+
+
+            var iconWidth = listBox.ItemHeight;
+            var iconMargin = 4;
+            var textMargin = (iconWidth - 18) / 2;
+            var rect = new Rectangle(e.Bounds.X + iconMargin, e.Bounds.Y, iconWidth, iconWidth);
+            //assuming the icon is already added to project resources
+
+            e.Graphics.DrawIcon(rdp_portal.Properties.Resources.icon, rect);
+
+            var profile = (Profile)listBox.Items[e.Index];
+
+            e.Graphics.DrawString(
+                profile.Name,
+                e.Font,
+                myBrush,
+                new Rectangle(e.Bounds.X + iconMargin * 2 + iconWidth, e.Bounds.Y + textMargin, e.Bounds.Width, e.Bounds.Height),
+                StringFormat.GenericDefault
+            );
+
+            // If the ListBox has focus, draw a focus rectangle around the selected item.
+            e.DrawFocusRectangle();
+        }
+
     }
 }