Skip to content

Commit

Permalink
Code formatting, v. 1.3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@VioletGiraffe
VioletGiraffe committed Mar 19, 2019
1 parent ccda294 commit af31e35
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 138 deletions.
196 changes: 98 additions & 98 deletions CPPCheckPlugin/MainToolWindowUI.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ public class OpenProblemInEditorEventArgs : EventArgs

private static int iconSize = 20;

private GridViewColumnHeader listViewSortCol = null;
private SortAdorner listViewSortAdorner = null;
private GridViewColumnHeader listViewSortCol = null;
private SortAdorner listViewSortAdorner = null;

public MainToolWindowUI()
{
Expand Down Expand Up @@ -127,54 +127,54 @@ public static TParent FindVisualParent<TParent, TLimit>(DependencyObject obj) wh
return obj as TParent;
}

private void problemColumnHeader_Click(object sender, RoutedEventArgs e)
{
GridViewColumnHeader column = (sender as GridViewColumnHeader);
string sortBy = column.Tag.ToString();

ClearSorting();

ListSortDirection newDir = ListSortDirection.Ascending;
if (listViewSortCol == column && listViewSortAdorner.Direction == newDir)
{
newDir = ListSortDirection.Descending;
}

listViewSortCol = column;
listViewSortAdorner = new SortAdorner(listViewSortCol, newDir);
AdornerLayer.GetAdornerLayer(listViewSortCol).Add(listViewSortAdorner);

if (sortBy == "Severity")
{
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
listView.Items.SortDescriptions.Add(new SortDescription("FileName", ListSortDirection.Ascending));
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
}
else if (sortBy == "FileName")
{
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
}
else if (sortBy == "Message")
{
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
listView.Items.SortDescriptions.Add(new SortDescription("FileName", ListSortDirection.Ascending));
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
}
else
{
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
}
}

public void ClearSorting()
{
if(listViewSortCol != null)
{
AdornerLayer.GetAdornerLayer(listViewSortCol).Remove(listViewSortAdorner);
listView.Items.SortDescriptions.Clear();
}
}
private void problemColumnHeader_Click(object sender, RoutedEventArgs e)
{
GridViewColumnHeader column = (sender as GridViewColumnHeader);
string sortBy = column.Tag.ToString();

ClearSorting();

ListSortDirection newDir = ListSortDirection.Ascending;
if (listViewSortCol == column && listViewSortAdorner.Direction == newDir)
{
newDir = ListSortDirection.Descending;
}

listViewSortCol = column;
listViewSortAdorner = new SortAdorner(listViewSortCol, newDir);
AdornerLayer.GetAdornerLayer(listViewSortCol).Add(listViewSortAdorner);

if (sortBy == "Severity")
{
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
listView.Items.SortDescriptions.Add(new SortDescription("FileName", ListSortDirection.Ascending));
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
}
else if (sortBy == "FileName")
{
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
}
else if (sortBy == "Message")
{
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
listView.Items.SortDescriptions.Add(new SortDescription("FileName", ListSortDirection.Ascending));
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
}
else
{
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
}
}

public void ClearSorting()
{
if (listViewSortCol != null)
{
AdornerLayer.GetAdornerLayer(listViewSortCol).Remove(listViewSortAdorner);
listView.Items.SortDescriptions.Clear();
}
}

public class ProblemsListItem
{
Expand All @@ -199,10 +199,10 @@ public int Line
get { return _problem.Line; }
}

public Problem.SeverityLevel Severity
{
get { return _problem.Severity; }
}
public Problem.SeverityLevel Severity
{
get { return _problem.Severity; }
}

public ImageSource Icon
{
Expand Down Expand Up @@ -259,15 +259,15 @@ public Problem Problem

Problem _problem;
}
private void ListView_SelectionChanged()
{
}
private void ListView_SelectionChanged_1(object sender, SelectionChangedEventArgs e)
{
}
private void ListView_SelectionChanged_2(object sender, SelectionChangedEventArgs e)
{
}
private void ListView_SelectionChanged()
{
}
private void ListView_SelectionChanged_1(object sender, SelectionChangedEventArgs e)
{
}
private void ListView_SelectionChanged_2(object sender, SelectionChangedEventArgs e)
{
}
}

public class DeleteObjectInvoker
Expand All @@ -276,39 +276,39 @@ public class DeleteObjectInvoker
public static extern bool DeleteObject(IntPtr hObject);
}

public class SortAdorner : Adorner
{
private static Geometry ascGeometry = Geometry.Parse("M 0 4 L 3.5 0 L 7 4 Z");
private static Geometry descGeometry = Geometry.Parse("M 0 0 L 3.5 4 L 7 0 Z");

public ListSortDirection Direction { get; private set; }

public SortAdorner(UIElement element, ListSortDirection dir)
: base(element)
{
this.Direction = dir;
}

protected override void OnRender(DrawingContext drawingContext)
{
base.OnRender(drawingContext);

if (AdornedElement.RenderSize.Width < 20)
{
return;
}

TranslateTransform transform = new TranslateTransform(AdornedElement.RenderSize.Width - 15, (AdornedElement.RenderSize.Height - 5) / 2);
drawingContext.PushTransform(transform);

Geometry geometry = ascGeometry;
if (this.Direction == ListSortDirection.Descending)
{
geometry = descGeometry;
}
drawingContext.DrawGeometry(System.Windows.Media.Brushes.Black, null, geometry);

drawingContext.Pop();
}
}
public class SortAdorner : Adorner
{
private static Geometry ascGeometry = Geometry.Parse("M 0 4 L 3.5 0 L 7 4 Z");
private static Geometry descGeometry = Geometry.Parse("M 0 0 L 3.5 4 L 7 0 Z");

public ListSortDirection Direction { get; private set; }

public SortAdorner(UIElement element, ListSortDirection dir)
: base(element)
{
this.Direction = dir;
}

protected override void OnRender(DrawingContext drawingContext)
{
base.OnRender(drawingContext);

if (AdornedElement.RenderSize.Width < 20)
{
return;
}

TranslateTransform transform = new TranslateTransform(AdornedElement.RenderSize.Width - 15, (AdornedElement.RenderSize.Height - 5) / 2);
drawingContext.PushTransform(transform);

Geometry geometry = ascGeometry;
if (this.Direction == ListSortDirection.Descending)
{
geometry = descGeometry;
}
drawingContext.DrawGeometry(System.Windows.Media.Brushes.Black, null, geometry);

drawingContext.Pop();
}
}
}
78 changes: 39 additions & 39 deletions CPPCheckPlugin/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="VSPackage.CPPCheckPlugin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<userSettings>
<VSPackage.CPPCheckPlugin.Properties.Settings>
<setting name="CPPcheckPath" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>C:\Program Files (x86)\Cppcheck\cppcheck.exe</string>
<string>C:\Program Files\Cppcheck\cppcheck.exe</string>
</ArrayOfString>
</value>
</setting>
<setting name="InconclusiveChecksEnabled" serializeAs="String">
<value>False</value>
</setting>
<setting name="DefaultArguments" serializeAs="String">
<value/>
</setting>
<setting name="ProjectOnlyCheckCurrentConfig" serializeAs="String">
<value>False</value>
</setting>
<setting name="FileOnlyCheckCurrentConfig" serializeAs="String">
<value>True</value>
</setting>
<setting name="SeveritiesString" serializeAs="String">
<value>style,information,warning,performance,portability</value>
</setting>
<setting name="SuppressionsString" serializeAs="String">
<value>unmatchedSuppression</value>
</setting>
<setting name="IgnoreIncludePaths" serializeAs="String">
<value>False</value>
</setting>
</VSPackage.CPPCheckPlugin.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="VSPackage.CPPCheckPlugin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<userSettings>
<VSPackage.CPPCheckPlugin.Properties.Settings>
<setting name="CPPcheckPath" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>C:\Program Files (x86)\Cppcheck\cppcheck.exe</string>
<string>C:\Program Files\Cppcheck\cppcheck.exe</string>
</ArrayOfString>
</value>
</setting>
<setting name="InconclusiveChecksEnabled" serializeAs="String">
<value>False</value>
</setting>
<setting name="DefaultArguments" serializeAs="String">
<value/>
</setting>
<setting name="ProjectOnlyCheckCurrentConfig" serializeAs="String">
<value>False</value>
</setting>
<setting name="FileOnlyCheckCurrentConfig" serializeAs="String">
<value>True</value>
</setting>
<setting name="SeveritiesString" serializeAs="String">
<value>style,information,warning,performance,portability</value>
</setting>
<setting name="SuppressionsString" serializeAs="String">
<value>unmatchedSuppression</value>
</setting>
<setting name="IgnoreIncludePaths" serializeAs="String">
<value>False</value>
</setting>
</VSPackage.CPPCheckPlugin.Properties.Settings>
</userSettings>
<startup/></configuration>
2 changes: 1 addition & 1 deletion CPPCheckPlugin/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="127d8bd3-8cd7-491a-9a63-9b4e89118da9" Version="1.3.5" Language="en-US" Publisher="VioletGiraffe et. al." />
<Identity Id="127d8bd3-8cd7-491a-9a63-9b4e89118da9" Version="1.3.6" Language="en-US" Publisher="VioletGiraffe et. al." />
<DisplayName>cppcheck add-in</DisplayName>
<Description xml:space="preserve">Integration for cppcheck - C/C++ code static analysis tool </Description>
<License>PackageInstallerLicense.txt</License>
Expand Down

0 comments on commit af31e35

Please sign in to comment.