X-Git-Url: http://git.sourceforge.jp/view?p=applistation%2FAppliStation.git;a=blobdiff_plain;f=AppliStation%2FPackageListView.cs;h=484ceeb2ea0cf410152147ad837582c811f8c5e5;hp=2d4b1b18b68d8d9a28ec9d3ea959c67511fab0ef;hb=75dc11b85232808e0bb1a2e82ea3cae46936079f;hpb=0b276e34bc771e42865a9726a5ed4f88565affb9 diff --git a/AppliStation/PackageListView.cs b/AppliStation/PackageListView.cs index 2d4b1b1..484ceeb 100644 --- a/AppliStation/PackageListView.cs +++ b/AppliStation/PackageListView.cs @@ -165,7 +165,7 @@ namespace AppliStation // ソフトリストの中身のパッケージ if ((filteringType & PackageListViewPkgTypeFilter.NotInstalled) != 0) { foreach (Package pkg in pkgListMan.AvailablePkgList.Search(keyword)) { - if (Installation.GetPreferInstallerIndex(pkg) >= 0) { // インストール可能 + if (Installation.IsInstallablePackage(pkg)) { // インストール可能 bool isInstalledAS = (pkgListMan.InstalledPkgList.GetPackageForName(pkg.Name) != null); bool isInstalledSys = (pkgListMan.SystemInstalledPkgList.GetPackageForName(pkg.Name) != null); @@ -229,12 +229,26 @@ namespace AppliStation #region Sort関連 + /// + /// 選択しているコラムを設定あるいは取得を行う。 + /// + public ColumnHeader SortColumn { + get { + return sortComparer.Column; + } + set { + sortColumn(value); + } + } + protected void sortColumn(ColumnHeader column) { - int columnIndex = column.Index; + int columnIndex = (column != null)? column.Index : -1; SortOrder order = SortOrder.None; - if (sortComparer.ColumnIndex == columnIndex) { + if (columnIndex < 0) { + sortComparer.Order = order = SortOrder.None; + } else if (sortComparer.ColumnIndex == columnIndex) { order = (sortComparer.Order == SortOrder.Ascending)? SortOrder.Descending : SortOrder.Ascending; sortComparer.Order = order;