From f567d4dce4a3036adba5fabafa3856bf4ee54800 Mon Sep 17 00:00:00 2001 From: RKrom Date: Tue, 24 Apr 2012 18:36:35 +0000 Subject: [PATCH] Removed ListViewColumnSorter git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1818 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- GreenshotImgurPlugin/Forms/ImgurHistory.cs | 4 +- .../Forms/ListViewColumnSorter.cs | 115 ------------------ .../GreenshotImgurPlugin.csproj | 1 - 3 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 GreenshotImgurPlugin/Forms/ListViewColumnSorter.cs diff --git a/GreenshotImgurPlugin/Forms/ImgurHistory.cs b/GreenshotImgurPlugin/Forms/ImgurHistory.cs index a2944c03a..dbca3eea6 100644 --- a/GreenshotImgurPlugin/Forms/ImgurHistory.cs +++ b/GreenshotImgurPlugin/Forms/ImgurHistory.cs @@ -33,7 +33,7 @@ namespace GreenshotImgurPlugin { /// public partial class ImgurHistory : Form { private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ImgurHistory)); - private ListViewColumnSorter columnSorter; + private GreenshotColumnSorter columnSorter; private static ImgurConfiguration config = IniConfig.GetIniSection(); private static ImgurHistory instance; @@ -55,7 +55,7 @@ namespace GreenshotImgurPlugin { this.Icon = GreenshotPlugin.Core.GreenshotResources.getGreenshotIcon(); // Init sorting - columnSorter = new ListViewColumnSorter(); + columnSorter = new GreenshotColumnSorter(); this.listview_imgur_uploads.ListViewItemSorter = columnSorter; columnSorter.SortColumn = 3; columnSorter.Order = SortOrder.Descending; diff --git a/GreenshotImgurPlugin/Forms/ListViewColumnSorter.cs b/GreenshotImgurPlugin/Forms/ListViewColumnSorter.cs deleted file mode 100644 index 08832ede0..000000000 --- a/GreenshotImgurPlugin/Forms/ListViewColumnSorter.cs +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Greenshot - a free and open source screenshot tool - * Copyright (C) 2007-2012 Thomas Braun, Jens Klingen, Robin Krom - * - * For more information see: http://getgreenshot.org/ - * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -using System.Collections; -using System.Windows.Forms; - -/// -/// This class is an implementation of the 'IComparer' interface. -/// -public class ListViewColumnSorter : IComparer { - /// - /// Specifies the column to be sorted - /// - private int ColumnToSort; - /// - /// Specifies the order in which to sort (i.e. 'Ascending'). - /// - private SortOrder OrderOfSort; - /// - /// Case insensitive comparer object - /// - private CaseInsensitiveComparer ObjectCompare; - - /// - /// Class constructor. Initializes various elements - /// - public ListViewColumnSorter() { - // Initialize the column to '0' - ColumnToSort = 0; - - // Initialize the sort order to 'none' - OrderOfSort = SortOrder.None; - - // Initialize the CaseInsensitiveComparer object - ObjectCompare = new CaseInsensitiveComparer(); - } - - /// - /// This method is inherited from the IComparer interface. It compares the two objects passed using a case insensitive comparison. - /// - /// First object to be compared - /// Second object to be compared - /// The result of the comparison. "0" if equal, negative if 'x' is less than 'y' and positive if 'x' is greater than 'y' - public int Compare(object x, object y) { - int compareResult; - ListViewItem listviewX, listviewY; - - if (x == null && y == null) { - return 0; - } else if (x == null && y != null) { - return -1; - } else if (x != null && y == null) { - return 1; - } - // Cast the objects to be compared to ListViewItem objects - listviewX = (ListViewItem)x; - listviewY = (ListViewItem)y; - - // Compare the two items - compareResult = ObjectCompare.Compare(listviewX.SubItems[ColumnToSort].Text, listviewY.SubItems[ColumnToSort].Text); - - // Calculate correct return value based on object comparison - if (OrderOfSort == SortOrder.Ascending) { - // Ascending sort is selected, return normal result of compare operation - return compareResult; - } else if (OrderOfSort == SortOrder.Descending) { - // Descending sort is selected, return negative result of compare operation - return (-compareResult); - } else { - // Return '0' to indicate they are equal - return 0; - } - } - - /// - /// Gets or sets the number of the column to which to apply the sorting operation (Defaults to '0'). - /// - public int SortColumn { - set { - ColumnToSort = value; - } - get { - return ColumnToSort; - } - } - - /// - /// Gets or sets the order of sorting to apply (for example, 'Ascending' or 'Descending'). - /// - public SortOrder Order { - set { - OrderOfSort = value; - } - get { - return OrderOfSort; - } - } -} diff --git a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj index 85000515f..a1a9ae059 100644 --- a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj +++ b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj @@ -63,7 +63,6 @@ ImgurHistory.cs - Form