Skip to content

Commit

Permalink
squashed commit: toolbox icons, name and version change, misc refacto…
Browse files Browse the repository at this point in the history
…ring
  • Loading branch information
martynov authored and IlyaKhD committed Mar 9, 2015
1 parent 92b0634 commit 87c47be
Show file tree
Hide file tree
Showing 81 changed files with 72 additions and 49 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("Ajax Control Toolkit HtmlEditor Sanitizer")]
[assembly: AssemblyTitle("ASP.NET AJAX Control Toolkit HtmlEditor Sanitizer")]
[assembly: ComVisible(false)]
23 changes: 12 additions & 11 deletions AjaxControlToolkit.LinkStaticResources/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,41 @@
using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions;
using System.Reflection;

namespace AjaxControlToolkit.LinkStaticResources {

class Program {

static void Main(string[] args) {
// NOTE paths are relative to Bin
string solutionDirPath = Directory.GetParent(Directory.GetParent(Assembly.GetEntryAssembly().Location).FullName).FullName;

const string
outputDir = "../AjaxControlToolkit.StaticResources/",
string
outputDir = Path.Combine(solutionDirPath, @"AjaxControlToolkit.StaticResources\"),
scriptsDir = outputDir + "Scripts",
stylesDir = outputDir + "Styles",
imagesDir = outputDir + "Images",
samplesDir = "../AjaxControlToolkit.SampleSite/",
samplesScriptsDir = samplesDir + "Scripts/AjaxControlToolkit/",
samplesStylesDir = samplesDir + "Content/AjaxControlToolkit/Styles/",
samplesImagesDir = samplesDir + "Content/AjaxControlToolkit/Images/";
samplesDir = Path.Combine(solutionDirPath, @"AjaxControlToolkit.SampleSite\"),
samplesScriptsDir = samplesDir + @"Scripts\AjaxControlToolkit\",
samplesStylesDir = samplesDir + @"Content\AjaxControlToolkit\Styles\",
samplesImagesDir = samplesDir + @"Content\AjaxControlToolkit\Images\";

foreach(var path in Directory.EnumerateFiles("../AjaxControlToolkit/Scripts", "*.js")) {
foreach(var path in Directory.EnumerateFiles(Path.Combine(solutionDirPath, @"AjaxControlToolkit\Scripts"), "*.js")) {
LinkScript(scriptsDir, path);
LinkScript(samplesScriptsDir, path);
}

foreach(var path in Directory.EnumerateFiles("../AjaxControlToolkit/Scripts/Localization", "*.js")) {
foreach(var path in Directory.EnumerateFiles(Path.Combine(solutionDirPath, @"AjaxControlToolkit\Scripts\Localization"), "*.js")) {
LinkScript(scriptsDir, path, TransformLocalizationScriptName);
LinkScript(samplesScriptsDir, path, TransformLocalizationScriptName);
}

foreach(var path in Directory.EnumerateFiles("../AjaxControlToolkit/Styles", "*.css")) {
foreach(var path in Directory.EnumerateFiles(Path.Combine(solutionDirPath, @"AjaxControlToolkit\Styles"), "*.css")) {
LinkStyle(stylesDir, path);
LinkStyle(samplesStylesDir, path);
}

foreach(var path in Directory.EnumerateFiles("../AjaxControlToolkit/Images")) {
foreach(var path in Directory.EnumerateFiles(Path.Combine(solutionDirPath, @"AjaxControlToolkit\Images"))) {
if(Regex.IsMatch(path, @"\.(gif|jpg|png)$")) {
LinkStyle(imagesDir, path);
LinkStyle(samplesImagesDir, path);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
</p>
<br />
<p>
To use AjaxControlToolkit Sanitizer, install the AjaxControlToolkit.HtmlEditor.Sanitizer NuGet package.
To use the Toolkit Sanitizer, install the AjaxControlToolkit.HtmlEditor.Sanitizer NuGet package.
</p>
<br />
<p>
Expand Down
2 changes: 1 addition & 1 deletion AjaxControlToolkit.SampleSite/Twitter/Twitter.aspx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<Header><span id="twitterAPI">Twitter API</span></Header>
<Content>
<p>
AjaxControlToolkit Twitter Control using Twitter API v1.1. The Twitter API v1.1 requiring us to provide API keys which are <b>Consumer Key</b>, <b>Consumer Secret</b>, <b>Access token</b> and <b>Access token secret</b>.
The Toolkit Twitter Control uses Twitter API v1.1. The Twitter API v1.1 which is required to provide API keys which are <b>Consumer Key</b>, <b>Consumer Secret</b>, <b>Access token</b> and <b>Access token secret</b>.
You will need to create those keys through <a href="https://dev.twitter.com/apps/new">https://dev.twitter.com/apps/new</a> and supply those information into
your web config under <b>appSettings</b> tag. It should looks like this:
</p>
Expand Down
8 changes: 4 additions & 4 deletions AjaxControlToolkit.SampleSite/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<configSections>
<section name="ajaxControlToolkit" type="AjaxControlToolkit.AjaxControlToolkitConfigSection, AjaxControlToolkit" />
</configSections>
<ajaxControlToolkit useStaticResources="true" renderStyleLinks="false" htmlSanitizer="AjaxControlToolkit.HtmlEditor.Sanitizer.DefaultHtmlSanitizer, AjaxControlToolkit.HtmlEditor.Sanitizer"/>
<ajaxControlToolkit useStaticResources="true" renderStyleLinks="false" htmlSanitizer="AjaxControlToolkit.HtmlEditor.Sanitizer.DefaultHtmlSanitizer, AjaxControlToolkit.HtmlEditor.Sanitizer" />
<system.web>
<compilation debug="true" targetFramework="4.0">
<assemblies>
Expand All @@ -21,14 +21,14 @@
</siteMap>
<pages>
<controls>
<add assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" tagPrefix="ajaxToolkit"/>
<add namespace="InfoBlock" tagPrefix="samples"/>
<add assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" tagPrefix="ajaxToolkit" />
<add namespace="InfoBlock" tagPrefix="samples" />
</controls>
</pages>
</system.web>
<system.webServer>
<handlers>
<add name="AjaxFileUploadHandler" verb="*" path="AjaxFileUploadHandler.axd" type="AjaxControlToolkit.AjaxFileUploadHandler, AjaxControlToolkit"/>
<add name="AjaxFileUploadHandler" verb="*" path="AjaxFileUploadHandler.axd" type="AjaxControlToolkit.AjaxFileUploadHandler, AjaxControlToolkit" />
</handlers>
</system.webServer>
<runtime>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
..\packages\HtmlAgilityPack.1.4.9\lib\Net40\HtmlAgilityPack.dll
1 change: 1 addition & 0 deletions AjaxControlToolkit.SampleSite/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr" version="3.4.1.9004" targetFramework="net40" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net40" />
<package id="Microsoft.AspNet.ScriptManager.MSAjax" version="5.0.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
using System.Runtime.InteropServices;
using System.Web;

[assembly: AssemblyTitle("Ajax Control Toolkit Static Resources")]
[assembly: AssemblyTitle("ASP.NET AJAX Control Toolkit Static Resources")]
[assembly: ComVisible(false)]
[assembly: PreApplicationStartMethod(typeof(AjaxControlToolkit.StaticResources.PreApplicationStartCode), "Start")]
10 changes: 9 additions & 1 deletion AjaxControlToolkit/AjaxControlToolkit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,14 @@
</ItemGroup>
<ItemGroup>
<Content Include="Styles\README.txt" />
<EmbeddedResource Include="ToolboxIcons\AjaxFileUpload.ico" />
<EmbeddedResource Include="ToolboxIcons\AreaChart.ico" />
<EmbeddedResource Include="ToolboxIcons\AsyncFileUpload.ico" />
<EmbeddedResource Include="ToolboxIcons\BarChart.ico" />
<EmbeddedResource Include="ToolboxIcons\BubbleChart.ico" />
<EmbeddedResource Include="ToolboxIcons\LineChart.ico" />
<EmbeddedResource Include="ToolboxIcons\PieChart.ico" />
<EmbeddedResource Include="ToolboxIcons\Seadragon.ico" />
<EmbeddedResource Include="Images\AsyncFileUpload.Button.png" />
<EmbeddedResource Include="Images\BalloonPopup.CloudSprite.gif" />
<EmbeddedResource Include="Images\BalloonPopup.CloudSprite.png" />
Expand Down Expand Up @@ -1354,7 +1362,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>$(OutDir)LinkStaticResources</PostBuildEvent>
<PostBuildEvent>$(TargetDir)LinkStaticResources</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
2 changes: 2 additions & 0 deletions AjaxControlToolkit/AjaxFileUpload/AjaxFileUpload.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@
using System.Web.Script.Serialization;
using System.Web.UI;
using System.Web.UI.HtmlControls;
using System.Drawing;

namespace AjaxControlToolkit {

[Designer(typeof(AjaxFileUploadDesigner))]
[RequiredScript(typeof(CommonToolkitScripts))]
[ClientCssResource(Constants.AjaxFileUploadName)]
[ClientScriptResource("Sys.Extended.UI.AjaxFileUpload.Control", Constants.AjaxFileUploadName)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.AjaxFileUploadName + Constants.IconPostfix)]
public class AjaxFileUpload : ScriptControlBase {
internal const string ContextKey = "{DA8BEDC8-B952-4d5d-8CC2-59FE922E2923}";
const string TemporaryUploadFolderName = "_AjaxFileUpload";
Expand Down
2 changes: 2 additions & 0 deletions AjaxControlToolkit/AreaChart/AreaChart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
using System.Drawing.Design;
using System.Linq;
using System.Web.UI;
using System.Drawing;

namespace AjaxControlToolkit {

[ClientCssResource(Constants.AreaChartName)]
[ClientScriptResource("Sys.Extended.UI.AreaChart", Constants.AreaChartName)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.AreaChartName + Constants.IconPostfix)]
public class AreaChart : ChartBase {
List<AreaChartSeries> _series = new List<AreaChartSeries>();

Expand Down
1 change: 1 addition & 0 deletions AjaxControlToolkit/AsyncFileUpload/AsyncFileUpload.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ namespace AjaxControlToolkit {
[Designer(typeof(AsyncFileUploadDesigner))]
[RequiredScript(typeof(CommonToolkitScripts))]
[ClientScriptResource("Sys.Extended.UI.AsyncFileUpload", AjaxControlToolkit.Constants.AsyncFileUploadName)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), AjaxControlToolkit.Constants.AsyncFileUploadName + AjaxControlToolkit.Constants.IconPostfix)]
public class AsyncFileUpload : ScriptControlBase {

public static class Constants {
Expand Down
2 changes: 1 addition & 1 deletion AjaxControlToolkit/BalloonPopup/BalloonPopupExtender.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace AjaxControlToolkit {
[ClientCssResource(Constants.BalloonPopupName + ".Cloud")]
[ClientCssResource(Constants.BalloonPopupName + ".Rectangle")]
[Designer(typeof(BalloonPopupExtenderDesigner))]
[ToolboxBitmap(typeof(BalloonPopupExtender), Constants.BalloonPopupName + Constants.IconPostfix)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.BalloonPopupName + Constants.IconPostfix)]
public class BalloonPopupExtender : DynamicPopulateExtenderControlBase {
Animation _onHide;
Animation _onShow;
Expand Down
2 changes: 2 additions & 0 deletions AjaxControlToolkit/BarChart/BarChart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
using System.Web.UI;
using System.Drawing.Design;
using AjaxControlToolkit.Design;
using System.Drawing;

namespace AjaxControlToolkit {

[ClientCssResource(Constants.BarChartName)]
[ClientScriptResource("Sys.Extended.UI.BarChart", Constants.BarChartName)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.BarChartName + Constants.IconPostfix)]
public class BarChart : ChartBase {
List<BarChartSeries> _series = new List<BarChartSeries>();

Expand Down
2 changes: 2 additions & 0 deletions AjaxControlToolkit/BubbleChart/BubbleChart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
using System.Text;
using System.Web.UI;
using System.Web.UI.HtmlControls;
using System.Drawing;

namespace AjaxControlToolkit {

[ClientCssResource(Constants.BubbleChartName)]
[ClientScriptResource("Sys.Extended.UI.BubbleChart", Constants.BubbleChartName)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.BubbleChartName + Constants.IconPostfix)]
public class BubbleChart : ChartBase {
List<BubbleChartValue> _values = new List<BubbleChartValue>();

Expand Down
3 changes: 1 addition & 2 deletions AjaxControlToolkit/ColorPicker/ColorPickerExtender.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using AjaxControlToolkit.Design;
using AjaxControlToolkit.ToolboxIcons;
using System;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
Expand All @@ -15,7 +14,7 @@ namespace AjaxControlToolkit {
[TargetControlType(typeof(TextBox))]
[ClientCssResource(Constants.ColorPickerName)]
[ClientScriptResource("Sys.Extended.UI.ColorPickerBehavior", Constants.ColorPickerName)]
[ToolboxBitmap(typeof(Accessor), Constants.ColorPickerName + Constants.IconPostfix)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.ColorPickerName + Constants.IconPostfix)]
[Designer(typeof(ColorPickerExtenderDesigner))]
public class ColorPickerExtender : ExtenderControlBase {
[DefaultValue(true)]
Expand Down
2 changes: 1 addition & 1 deletion AjaxControlToolkit/ComboBox/ComboBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace AjaxControlToolkit {
[RequiredScript(typeof(ScriptControlBase), 2)]
[RequiredScript(typeof(PopupExtender), 3)]
[RequiredScript(typeof(CommonToolkitScripts), 4)]
[ToolboxBitmap(typeof(ComboBox), Constants.ComboBoxName + Constants.IconPostfix)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.ComboBoxName + Constants.IconPostfix)]
public class ComboBox : ListControl, IScriptControl, IPostBackDataHandler, INamingContainer, IControlResolver {
TextBox _textBoxControl;
ScriptManager _scriptManager;
Expand Down
9 changes: 7 additions & 2 deletions AjaxControlToolkit/ExtenderBase/Constants.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
namespace AjaxControlToolkit {
internal static class Constants {

public static class Constants {

public const string
CdnPrefix = "http://ajax.aspnetcdn.com/ajax/act/15.1.1/";

internal const string
CdnPrefix = "http://ajax.aspnetcdn.com/ajax/act/15_1/",
CdnScriptDebugPrefix = CdnPrefix + "Scripts/AjaxControlToolkit/Debug/",
CdnScriptReleasePrefix = CdnPrefix + "Scripts/AjaxControlToolkit/Release/",

Expand Down Expand Up @@ -350,4 +354,5 @@ internal const string
ValidatorCalloutAlertSmallImage = ValidatorCalloutName + ".Alert-Small.gif",
ValidatorCalloutCloseImage = ValidatorCalloutName + ".Close.gif";
}

}
2 changes: 1 addition & 1 deletion AjaxControlToolkit/Gravatar/Gravatar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace AjaxControlToolkit {
[ToolboxData("<{0}:Gravatar runat=\"server\"></{0}:Gravatar>")]
[RequiredScript(typeof(ScriptControlBase), 1)]
[RequiredScript(typeof(CommonToolkitScripts), 2)]
[ToolboxBitmap(typeof(Gravatar), Constants.GravatarName + Constants.IconPostfix)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.GravatarName + Constants.IconPostfix)]
public class Gravatar : WebControl {

public Gravatar() : base(HtmlTextWriterTag.Img) {
Expand Down
2 changes: 1 addition & 1 deletion AjaxControlToolkit/HtmlEditor/Editor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace AjaxControlToolkit.HtmlEditor {
[RequiredScript(typeof(AjaxControlToolkit.HtmlEditor.Popups.RegisteredField))]

[ClientScriptResource("Sys.Extended.UI.HtmlEditor.Editor", Constants.HtmlEditorEditorName)]
[ToolboxBitmap(typeof(AjaxControlToolkit.HtmlEditor.Editor), Constants.HtmlEditorName + Constants.IconPostfix)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.HtmlEditorName + Constants.IconPostfix)]

public class Editor : ScriptControlBase {
internal Toolbar _bottomToolbar;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace AjaxControlToolkit {
[RequiredScript(typeof(ColorPickerExtender), 1)]
[ClientScriptResource("Sys.Extended.UI.HtmlEditorExtenderBehavior", Constants.HtmlEditorExtenderName)]
[ClientCssResource(Constants.HtmlEditorExtenderName)]
[ToolboxBitmap(typeof(HtmlEditorExtender), Constants.HtmlEditorExtenderName + Constants.IconPostfix)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.HtmlEditorExtenderName + Constants.IconPostfix)]
public class HtmlEditorExtender : ExtenderControlBase {
internal const int ButtonWidthDef = 23;
internal const int ButtonHeightDef = 21;
Expand Down
2 changes: 2 additions & 0 deletions AjaxControlToolkit/LineChart/LineChart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
using System.Text;
using System.Web.UI;
using System.Web.UI.HtmlControls;
using System.Drawing;

namespace AjaxControlToolkit {

[ClientCssResource(Constants.LineChartName)]
[ClientScriptResource("Sys.Extended.UI.LineChart", Constants.LineChartName)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.LineChartName + Constants.IconPostfix)]
public class LineChart : ChartBase {
List<LineChartSeries> _series = new List<LineChartSeries>();

Expand Down
2 changes: 2 additions & 0 deletions AjaxControlToolkit/PieChart/PieChart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
using System.Web.UI;
using System.Drawing.Design;
using AjaxControlToolkit.Design;
using System.Drawing;

namespace AjaxControlToolkit {

[ClientCssResource(Constants.PieChartName)]
[ClientScriptResource("Sys.Extended.UI.PieChart", Constants.PieChartName)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.PieChartName + Constants.IconPostfix)]
public class PieChart : ChartBase {
List<PieChartValue> _values = new List<PieChartValue>();

Expand Down
3 changes: 1 addition & 2 deletions AjaxControlToolkit/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
using System.Security;
using System.Web.UI;

[assembly: AssemblyTitle("Ajax Control Toolkit")]
[assembly: AssemblyTitle("ASP.NET AJAX Control Toolkit")]

[assembly: AllowPartiallyTrustedCallers]
[assembly: ComVisible(false)]
[assembly: SecurityRules(SecurityRuleSet.Level1)]
[assembly: InternalsVisibleTo("AjaxControlToolkit.StaticResources, PublicKey=00240000048000009400000006020000002400005253413100040000010001008f2bd4c3c90ec88546137e913600741fdddd929f05d032d52fd1606b88609899b3f737a0e6881c5f3bba0a18fc60528790f652e64a418687fb538c3c86d325866d6db0721e16df48b1b7c6ebb07bc883d4a119e85eace1110842f59712385ebe6ae2a0229e205ef8e284cec0a217ce1eecbd63c1bf47478555fc9e36af1ef1b3")]

[assembly: WebResource(Constants.AccordionName + Constants.DebugJsPostfix, "text/javascript", CdnPath = Constants.CdnScriptDebugPrefix + Constants.AccordionName + Constants.DebugJsPostfix, CdnSupportsSecureConnection = true)]
[assembly: WebResource(Constants.AccordionName + Constants.JsPostfix, "text/javascript", CdnPath = Constants.CdnScriptReleasePrefix + Constants.AccordionName + Constants.JsPostfix, CdnSupportsSecureConnection = true)]
Expand Down
2 changes: 2 additions & 0 deletions AjaxControlToolkit/Seadragon/Seadragon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
using System.Drawing.Design;
using System.Collections;
using System;
using System.Drawing;

namespace AjaxControlToolkit {

[ClientScriptResource("Sys.Extended.UI.Seadragon.Viewer", Constants.SeadragonName)]
[ToolboxData("<{0}:Seadragon runat=server></{0}:Seadragon>")]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.SeadragonName + Constants.IconPostfix)]
public class Seadragon : ScriptControlBase {
List<SeadragonControl> _controls;
List<SeadragonOverlay> _overlays;
Expand Down
2 changes: 1 addition & 1 deletion AjaxControlToolkit/Tabs/TabContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace AjaxControlToolkit {
[RequiredScript(typeof(CommonToolkitScripts))]
[ClientCssResource(Constants.TabsName)]
[ClientScriptResource("Sys.Extended.UI.TabContainer", Constants.TabsName)]
[ToolboxBitmap(typeof(TabContainer), Constants.TabsName + Constants.IconPostfix)]
[ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.TabsName + Constants.IconPostfix)]
public class TabContainer : ScriptControlBase, IPostBackEventHandler {
static readonly object EventActiveTabChanged = new object();

Expand Down
Binary file modified AjaxControlToolkit/ToolboxIcons/Accordion.ico
Binary file not shown.
Binary file added AjaxControlToolkit/ToolboxIcons/AjaxFileUpload.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/AlwaysVisibleControl.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/Animation.ico
Binary file not shown.
Binary file added AjaxControlToolkit/ToolboxIcons/AreaChart.ico
Binary file not shown.
Binary file added AjaxControlToolkit/ToolboxIcons/AsyncFileUpload.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/AutoComplete.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/BalloonPopup.ico
Binary file not shown.
Binary file added AjaxControlToolkit/ToolboxIcons/BarChart.ico
Binary file not shown.
Binary file added AjaxControlToolkit/ToolboxIcons/BubbleChart.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/Calendar.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/CascadingDropDown.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/CollapsiblePanel.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/ColorPicker.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/ComboBox.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/ConfirmButton.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/DragPanel.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/DropDown.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/DropShadow.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/DynamicPopulate.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/FilteredTextBox.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/Gravatar.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/HoverMenu.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/HtmlEditor.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/HtmlEditorExtender.ico
Binary file not shown.
Binary file added AjaxControlToolkit/ToolboxIcons/LineChart.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/ListSearch.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/MaskedEdit.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/ModalPopup.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/MultiHandleSlider.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/MutuallyExclusiveCheckBox.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/NoBot.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/NumericUpDown.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/PagingBulletedList.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/PasswordStrength.ico
Binary file not shown.
Binary file added AjaxControlToolkit/ToolboxIcons/PieChart.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/PopupControl.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/Rating.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/ReorderList.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/ResizableControl.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/RoundedCorners.ico
Binary file not shown.
Binary file added AjaxControlToolkit/ToolboxIcons/Seadragon.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/SlideShow.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/Slider.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/Tabs.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/TextboxWatermark.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/ToggleButton.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/Twitter.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/UpdatePanelAnimation.ico
Binary file not shown.
Binary file modified AjaxControlToolkit/ToolboxIcons/ValidatorCallout.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion AjaxControlToolkit/Twitter/Twitter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace AjaxControlToolkit {
// search string.
[ClientCssResource(Constants.TwitterName)]
[Designer(typeof(TwitterDesigner))]
[System.Drawing.ToolboxBitmap(typeof(Accessor), Constants.TwitterName + Constants.IconPostfix)]
[System.Drawing.ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.TwitterName + Constants.IconPostfix)]
public class Twitter : CompositeControl {

ListView _listView;
Expand Down
4 changes: 2 additions & 2 deletions AjaxControlToolkitVsPackage/VSPackage.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="110" xml:space="preserve">
<value>AjaxControlToolkit</value>
<value>ASP.NET AJAX Control Toolkit</value>
</data>
<data name="112" xml:space="preserve">
<value>AjaxControlToolkit Visual Studio integration package</value>
<value>ASP.NET AJAX Control Toolkit Visual Studio integration package</value>
</data>
</root>
Loading

0 comments on commit 87c47be

Please sign in to comment.