Skip to content

Commit 13d1102

Browse files
wise0704wise0704
committed
ImageListManager update 1
Added support for easily retrieving 16x16 images.
1 parent f70a1bd commit 13d1102

File tree

15 files changed

+312
-151
lines changed

15 files changed

+312
-151
lines changed

‎External/Plugins/ASCompletion/PluginUI.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
*/
77

88
using System;
9-
using System.Windows.Forms;
10-
using System.Text;
119
using System.Collections.Generic;
12-
using PluginCore;
13-
using PluginCore.Managers;
14-
using ASCompletion.Model;
15-
using ASCompletion.Context;
16-
using ASCompletion.Settings;
17-
using PluginCore.Localization;
1810
using System.Drawing;
1911
using System.Reflection;
12+
using System.Text;
13+
using System.Windows.Forms;
14+
using ASCompletion.Context;
15+
using ASCompletion.Model;
16+
using ASCompletion.Settings;
17+
using PluginCore;
2018
using PluginCore.Helpers;
19+
using PluginCore.Localization;
20+
using PluginCore.Managers;
2121

2222
namespace ASCompletion
2323
{
@@ -72,7 +72,7 @@ public FixedTreeView OutlineTree
7272
}
7373
public ImageList TreeIcons
7474
{
75-
get { return treeIcons.ImageList; }
75+
get { return treeIcons; }
7676
}
7777

7878
public ToolStripMenuItem LookupMenuItem;
@@ -130,7 +130,7 @@ private void InitializeControls()
130130
outlineTree.Location = new System.Drawing.Point(0, toolStrip.Bottom);
131131
outlineTree.Size = new System.Drawing.Size(198, 300);
132132
outlineTree.Dock = DockStyle.Fill;
133-
outlineTree.ImageList = treeIcons.ImageList;
133+
outlineTree.ImageList = treeIcons;
134134
outlineTree.HotTracking = true;
135135
outlineTree.TabIndex = 1;
136136
outlineTree.NodeClicked += new FixedTreeView.NodeClickedHandler(ClassTreeSelect);

‎External/Plugins/BookmarkPanel/PluginUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ private void InitializeGraphics()
232232
this.imageList.ImageSize = ScaleHelper.Scale(new Size(16, 16));
233233
this.imageList.ColorDepth = ColorDepth.Depth32Bit;
234234
this.imageList.Initialize(ImageList_OnInitialize);
235-
this.listView.SmallImageList = this.imageList.ImageList;
235+
this.listView.SmallImageList = this.imageList;
236236
this.removeBookmarksItem.Image = PluginBase.MainForm.FindImage("402|4|4|4");
237237
this.searchButton.Image = PluginBase.MainForm.FindImage("484|26|-4|4");
238238
}

‎External/Plugins/FileExplorer/PluginUI.cs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
using System;
2+
using System.Collections.Specialized;
3+
using System.Drawing;
24
using System.IO;
35
using System.Text;
4-
using System.Drawing;
5-
using System.Security;
6-
using System.Diagnostics;
7-
using System.Collections;
86
using System.Windows.Forms;
9-
using System.ComponentModel;
10-
using System.Collections.Specialized;
11-
using PluginCore.Localization;
12-
using PluginCore.Utilities;
13-
using PluginCore.Managers;
7+
using PluginCore;
148
using PluginCore.Controls;
159
using PluginCore.Helpers;
16-
using PluginCore;
10+
using PluginCore.Localization;
11+
using PluginCore.Managers;
12+
using PluginCore.Utilities;
1713

1814
namespace FileExplorer
1915
{
@@ -300,7 +296,7 @@ private void InitializeGraphics()
300296
this.AddNonWin32Images();
301297
this.syncronizeButton.Image = PluginBase.MainForm.FindImage("203|9|-3|-3");
302298
this.browseButton.Image = PluginBase.MainForm.FindImage("203");
303-
this.fileView.SmallImageList = this.imageList.ImageList;
299+
this.fileView.SmallImageList = this.imageList;
304300
}
305301

306302
private void ImageList_Initialize(object sender, EventArgs e)

‎External/Plugins/FlashDebugger/Helpers/MenusHelper.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Drawing;
43
using System.IO;
54
using System.Windows.Forms;
@@ -20,7 +19,7 @@ internal class MenusHelper
2019
private ToolStripMenuItem BreakOnAllMenu;
2120
private DebuggerState CurrentState = DebuggerState.Initializing;
2221
private Settings settingObject;
23-
22+
2423
/// <summary>
2524
/// Creates a menu item for the plugin and adds a ignored key
2625
/// </summary>
@@ -41,7 +40,7 @@ public MenusHelper(Image pluginImage, DebuggerManager debugManager, Settings set
4140
Image imgFinish = PluginBase.MainForm.GetAutoAdjustedImage(Resource.Finish);
4241

4342
ToolStripMenuItem tempItem;
44-
ToolStripMenuItem viewMenu = (ToolStripMenuItem) PluginBase.MainForm.FindMenuItem("ViewMenu");
43+
ToolStripMenuItem viewMenu = (ToolStripMenuItem)PluginBase.MainForm.FindMenuItem("ViewMenu");
4544
tempItem = new ToolStripMenuItem(TextHelper.GetString("Label.ViewBreakpointsPanel"), pluginImage, OpenBreakPointPanel);
4645
PluginBase.MainForm.RegisterShortcutItem("ViewMenu.ShowBreakpoints", tempItem);
4746
viewMenu.DropDownItems.Add(tempItem);

‎External/Plugins/FlashDebugger/Helpers/PanelsHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public PanelsHelper(PluginMain pluginMain, Image pluginImage)
4040
localsPanel = PluginBase.MainForm.CreateDockablePanel(localsUI, localsGuid, pluginImage, DockState.DockLeft);
4141
localsPanel.Hide();
4242

43-
stackframeUI = new StackframeUI(pluginMain, MenusHelper.imageList.ImageList);
43+
stackframeUI = new StackframeUI(pluginMain, MenusHelper.imageList);
4444
stackframeUI.Text = TextHelper.GetString("Title.StackTrace");
4545
stackframePanel = PluginBase.MainForm.CreateDockablePanel(stackframeUI, stackframeGuid, pluginImage, DockState.DockLeft);
4646
stackframePanel.Hide();
@@ -60,7 +60,7 @@ public PanelsHelper(PluginMain pluginMain, Image pluginImage)
6060
immediatePanel = PluginBase.MainForm.CreateDockablePanel(immediateUI, immediateGuid, pluginImage, DockState.DockLeft);
6161
immediatePanel.Hide();
6262

63-
threadsUI = new ThreadsUI(pluginMain, MenusHelper.imageList.ImageList);
63+
threadsUI = new ThreadsUI(pluginMain, MenusHelper.imageList);
6464
threadsUI.Text = TextHelper.GetString("Title.Threads");
6565
threadsPanel = PluginBase.MainForm.CreateDockablePanel(threadsUI, threadsGuid, pluginImage, DockState.DockLeft);
6666
threadsPanel.Hide();

‎External/Plugins/LayoutManager/PluginUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private void InitializeGraphics()
161161
this.imageList.ColorDepth = ColorDepth.Depth32Bit;
162162
this.imageList.TransparentColor = Color.Transparent;
163163
this.imageList.Initialize(ImageList_Initialize);
164-
this.layoutsListView.SmallImageList = this.imageList.ImageList;
164+
this.layoutsListView.SmallImageList = this.imageList;
165165
this.menuLoadButton.Image = PluginBase.MainForm.FindImage("42|24|3|2");
166166
this.loadStripButton.Image = PluginBase.MainForm.FindImage("42|24|3|2");
167167
this.menuDeleteButton.Image = PluginBase.MainForm.FindImage("153");

‎External/Plugins/ProjectManager/Controls/Icons.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public class Icons
9797
public static FDImage CommandPrompt;
9898
public static FDImage CollapseAll;
9999

100-
public static ImageList ImageList { get { return imageList.ImageList; } }
100+
public static ImageList ImageList { get { return imageList; } }
101101

102102
public static void Initialize(IMainForm mainForm)
103103
{

‎External/Plugins/ResultsPanel/PluginUI.cs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
using System;
2-
using System.IO;
3-
using System.Drawing;
4-
using System.Windows.Forms;
52
using System.Collections;
63
using System.Collections.Generic;
4+
using System.Drawing;
5+
using System.IO;
76
using System.Text.RegularExpressions;
8-
using WeifenLuo.WinFormsUI.Docking;
9-
using ScintillaNet.Configuration;
7+
using System.Windows.Forms;
8+
using PluginCore;
9+
using PluginCore.Helpers;
1010
using PluginCore.Localization;
11-
using PluginCore.Utilities;
1211
using PluginCore.Managers;
13-
using PluginCore.Helpers;
14-
using PluginCore.Controls;
12+
using PluginCore.Utilities;
1513
using ScintillaNet;
16-
using PluginCore;
14+
using ScintillaNet.Configuration;
15+
using WeifenLuo.WinFormsUI.Docking;
1716

1817
namespace ResultsPanel
1918
{
@@ -253,8 +252,8 @@ public void InitializeGraphics()
253252
imageList.TransparentColor = Color.Transparent;
254253
imageList.ImageSize = ScaleHelper.Scale(new Size(16, 16));
255254
imageList.Initialize(ImageList_Initialize);
256-
this.toolStripFilters.ImageList = imageList.ImageList;
257-
this.entriesView.SmallImageList = imageList.ImageList;
255+
this.toolStripFilters.ImageList = imageList;
256+
this.entriesView.SmallImageList = imageList;
258257
this.clearFilterButton.Image = PluginBase.MainForm.FindImage("153");
259258
this.toolStripButtonInfo.Image = PluginBase.MainForm.FindImage("131");
260259
this.toolStripButtonError.Image = PluginBase.MainForm.FindImage("197");

‎External/Plugins/TaskListPanel/PluginUI.cs

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
using System;
2-
using System.IO;
3-
using System.Text;
4-
using System.Drawing;
5-
using System.Threading;
6-
using System.Diagnostics;
72
using System.Collections;
8-
using System.Windows.Forms;
93
using System.Collections.Generic;
10-
using System.Windows.Forms.Layout;
11-
using System.Text.RegularExpressions;
12-
using PluginCore.Localization;
134
using System.ComponentModel;
14-
using WeifenLuo.WinFormsUI;
5+
using System.Drawing;
6+
using System.IO;
7+
using System.Text.RegularExpressions;
8+
using System.Threading;
9+
using System.Windows.Forms;
1510
using ASCompletion.Context;
11+
using PluginCore;
1612
using PluginCore.Helpers;
13+
using PluginCore.Localization;
1714
using PluginCore.Managers;
18-
using PluginCore.Controls;
1915
using ScintillaNet;
20-
using PluginCore;
2116

2217
namespace TaskListPanel
2318
{
@@ -655,7 +650,7 @@ private void InitGraphics()
655650
imageList = new ImageListManager();
656651
imageList.ColorDepth = ColorDepth.Depth32Bit;
657652
imageList.Initialize(ImageList_Initialize);
658-
this.listView.SmallImageList = imageList.ImageList;
653+
this.listView.SmallImageList = imageList;
659654
}
660655

661656
private void ImageList_Initialize(object sender, EventArgs e)

‎FlashDevelop/MainForm.cs

Lines changed: 48 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@
22
#region Imports
33

44
using System;
5-
using System.IO;
6-
using System.Text;
7-
using System.Drawing;
8-
using System.Reflection;
95
using System.Collections;
10-
using System.Diagnostics;
11-
using System.Windows.Forms;
12-
using System.ComponentModel;
136
using System.Collections.Generic;
7+
using System.ComponentModel;
8+
using System.Diagnostics;
9+
using System.Drawing;
10+
using System.IO;
11+
using System.Reflection;
12+
using System.Text;
1413
using System.Text.RegularExpressions;
15-
using ScintillaNet.Configuration;
16-
using PluginCore.Localization;
14+
using System.Windows.Forms;
15+
using CSScriptLibrary;
1716
using FlashDevelop.Controls;
17+
using FlashDevelop.Dialogs;
1818
using FlashDevelop.Docking;
19-
using FlashDevelop.Utilities;
20-
using FlashDevelop.Managers;
2119
using FlashDevelop.Helpers;
22-
using FlashDevelop.Dialogs;
20+
using FlashDevelop.Managers;
2321
using FlashDevelop.Settings;
24-
using WeifenLuo.WinFormsUI.Docking;
22+
using FlashDevelop.Utilities;
2523
using ICSharpCode.SharpZipLib.Zip;
26-
using PluginCore.Utilities;
27-
using PluginCore.Managers;
28-
using PluginCore.Helpers;
24+
using PluginCore;
2925
using PluginCore.Controls;
30-
using CSScriptLibrary;
26+
using PluginCore.Helpers;
27+
using PluginCore.Localization;
28+
using PluginCore.Managers;
29+
using PluginCore.Utilities;
3130
using ScintillaNet;
32-
using PluginCore;
31+
using ScintillaNet.Configuration;
32+
using WeifenLuo.WinFormsUI.Docking;
3333

3434
#endregion
3535

@@ -1699,10 +1699,36 @@ public Image FindImage(String data, Boolean autoAdjusted)
16991699
{
17001700
try
17011701
{
1702-
lock (this)
1703-
{
1704-
return ImageManager.GetComposedBitmap(data, autoAdjusted);
1705-
}
1702+
lock (this) return ImageManager.GetComposedBitmap(data, autoAdjusted);
1703+
}
1704+
catch (Exception ex)
1705+
{
1706+
ErrorManager.ShowError(ex);
1707+
return null;
1708+
}
1709+
}
1710+
1711+
/// <summary>
1712+
/// Finds the specified composed/ready image that is automatically adjusted according to the theme.
1713+
/// The image size is always 16x16.
1714+
/// <para/>
1715+
/// If you make a copy of the image returned by this method, the copy will not be automatically adjusted.
1716+
/// </summary>
1717+
public Image FindImage16(String data)
1718+
{
1719+
return FindImage16(data, true);
1720+
}
1721+
1722+
/// <summary>
1723+
/// Finds the specified composed/ready image. The image size is always 16x16.
1724+
/// <para/>
1725+
/// If you make a copy of the image returned by this method, the copy will not be automatically adjusted, even if <code>autoAdjusted</code> is <code>true</code>.
1726+
/// </summary>
1727+
public Image FindImage16(String data, Boolean autoAdjusted)
1728+
{
1729+
try
1730+
{
1731+
lock (this) return ImageManager.GetComposedBitmapSize16(data, autoAdjusted);
17061732
}
17071733
catch (Exception ex)
17081734
{

0 commit comments

Comments
 (0)