Skip to content

Commit 7636ff8

Browse files
MeychiMeychi
committed
Little UI polish and icon updates...
1 parent aa7fd85 commit 7636ff8

File tree

8 files changed

+14
-292
lines changed

8 files changed

+14
-292
lines changed

‎External/Plugins/FlashDebugger/Controls/BreakPointUI.cs

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ private void init()
7474
{
7575
imageList = new ImageList();
7676
imageList.ColorDepth = ColorDepth.Depth32Bit;
77-
imageList.Images.Add("DeleteBreakpoint", PluginBase.MainForm.ImageSetAdjust(Resource.DeleteBreakpoint));
78-
imageList.Images.Add("DeleteBreakpoints", PluginBase.MainForm.ImageSetAdjust(Resource.DeleteBreakpoints));
79-
imageList.Images.Add("ToggleBreakpoints", PluginBase.MainForm.ImageSetAdjust(Resource.ToggleBreakpoints));
80-
imageList.Images.Add("ExportBreakpoints", PluginBase.MainForm.ImageSetAdjust(Resource.ExportBreakpoints));
81-
imageList.Images.Add("ImportBreakpoints", PluginBase.MainForm.ImageSetAdjust(Resource.ImportBreakpoints));
77+
imageList.Images.Add("DeleteBreakpoint", PluginBase.MainForm.FindImage("548|27|5|5"));
78+
imageList.Images.Add("DeleteBreakpoints", PluginBase.MainForm.FindImage("549|27|5|5"));
79+
imageList.Images.Add("ToggleBreakpoints", PluginBase.MainForm.FindImage("136|23|5|5"));
80+
imageList.Images.Add("ExportBreakpoints", PluginBase.MainForm.FindImage("549|22|4|4"));
81+
imageList.Images.Add("ImportBreakpoints", PluginBase.MainForm.FindImage("549|8|4|4"));
8282
}
8383

8484
this.dgv = new DataGridView();
@@ -260,7 +260,6 @@ private int ItemIndex(string filename, int line)
260260

261261
private void InitializeComponent()
262262
{
263-
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BreakPointUI));
264263
this.tsActions = new System.Windows.Forms.ToolStrip();
265264
this.tsbRemoveSelected = new System.Windows.Forms.ToolStripButton();
266265
this.tsbRemoveFiltered = new System.Windows.Forms.ToolStripButton();
@@ -294,7 +293,6 @@ private void InitializeComponent()
294293
// tsbRemoveSelected
295294
//
296295
this.tsbRemoveSelected.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
297-
this.tsbRemoveSelected.Image = ((System.Drawing.Image)(resources.GetObject("tsbRemoveSelected.Image")));
298296
this.tsbRemoveSelected.ImageTransparentColor = System.Drawing.Color.Magenta;
299297
this.tsbRemoveSelected.Name = "tsbRemoveSelected";
300298
this.tsbRemoveSelected.Size = new System.Drawing.Size(23, 24);
@@ -304,7 +302,6 @@ private void InitializeComponent()
304302
// tsbRemoveFiltered
305303
//
306304
this.tsbRemoveFiltered.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
307-
this.tsbRemoveFiltered.Image = ((System.Drawing.Image)(resources.GetObject("tsbRemoveFiltered.Image")));
308305
this.tsbRemoveFiltered.ImageTransparentColor = System.Drawing.Color.Magenta;
309306
this.tsbRemoveFiltered.Name = "tsbRemoveFiltered";
310307
this.tsbRemoveFiltered.Size = new System.Drawing.Size(23, 24);
@@ -314,7 +311,6 @@ private void InitializeComponent()
314311
// tsbAlternateFiltered
315312
//
316313
this.tsbAlternateFiltered.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
317-
this.tsbAlternateFiltered.Image = ((System.Drawing.Image)(resources.GetObject("tsbAlternateFiltered.Image")));
318314
this.tsbAlternateFiltered.ImageTransparentColor = System.Drawing.Color.Magenta;
319315
this.tsbAlternateFiltered.Name = "tsbAlternateFiltered";
320316
this.tsbAlternateFiltered.Size = new System.Drawing.Size(23, 24);
@@ -329,7 +325,6 @@ private void InitializeComponent()
329325
// tsbExportFiltered
330326
//
331327
this.tsbExportFiltered.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
332-
this.tsbExportFiltered.Image = ((System.Drawing.Image)(resources.GetObject("tsbExportFiltered.Image")));
333328
this.tsbExportFiltered.ImageTransparentColor = System.Drawing.Color.Magenta;
334329
this.tsbExportFiltered.Name = "tsbExportFiltered";
335330
this.tsbExportFiltered.Size = new System.Drawing.Size(23, 24);
@@ -339,7 +334,6 @@ private void InitializeComponent()
339334
// tsbImport
340335
//
341336
this.tsbImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
342-
this.tsbImport.Image = ((System.Drawing.Image)(resources.GetObject("tsbImport.Image")));
343337
this.tsbImport.ImageTransparentColor = System.Drawing.Color.Magenta;
344338
this.tsbImport.Name = "tsbImport";
345339
this.tsbImport.Size = new System.Drawing.Size(23, 24);
@@ -463,10 +457,7 @@ private void TsbAlternateFiltered_Click(object sender, EventArgs e)
463457
if (!m)
464458
{
465459
doc.SciControl.MarkerAdd(line, newMarker);
466-
doc.SciControl.MarkerDelete(line,
467-
value
468-
? ScintillaHelper.markerBPDisabled
469-
: ScintillaHelper.markerBPEnabled);
460+
doc.SciControl.MarkerDelete(line, value ? ScintillaHelper.markerBPDisabled : ScintillaHelper.markerBPEnabled);
470461
}
471462
}
472463
else
@@ -563,8 +554,7 @@ private void TstxtFilter_KeyDown(object sender, KeyEventArgs e)
563554
}
564555
catch (Exception ex)
565556
{
566-
ErrorManager.ShowWarning(
567-
"Error filtering list, please, ensure you've entered a valid RegEx pattern", ex);
557+
ErrorManager.ShowWarning("Error filtering list, please ensure you've entered a valid RegEx pattern", ex);
568558
}
569559
}
570560
}

‎External/Plugins/FlashDebugger/Controls/BreakPointUI.resx

Lines changed: 0 additions & 199 deletions
This file was deleted.

‎External/Plugins/FlashDebugger/FlashDebugger.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@
164164
<Compile Include="Utilities.cs" />
165165
</ItemGroup>
166166
<ItemGroup>
167-
<EmbeddedResource Include="Controls\BreakPointUI.resx">
168-
<DependentUpon>BreakPointUI.cs</DependentUpon>
169-
</EmbeddedResource>
170167
<EmbeddedResource Include="Properties\Resource.resx">
171168
<Generator>ResXFileCodeGenerator</Generator>
172169
<LastGenOutput>Resource.Designer.cs</LastGenOutput>

0 commit comments

Comments
 (0)