Skip to content

Sort sourcelist #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
artemanufrij wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Sort sourcelist #23

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
809f360
sort sourcelist items
artemanufrij Aug 16, 2017
6a0cafd
sort sourcelist items
artemanufrij Aug 16, 2017
1e14117
fixed folder<->folder/item<->item compare
artemanufrij Aug 16, 2017
350caf2
fixed folder<->folder/item<->item compare
artemanufrij Aug 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/Widgets/SourceList.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,30 @@
*/

public class SourceList : Granite.Widgets.SourceList {
public class FileItem : Granite.Widgets.SourceList.Item {
public string filename { get; set; }
public class Item : Granite.Widgets.SourceList.ExpandableItem, Granite.Widgets.SourceListSortable {
public string filename { get; construct set; }
public int compare (Granite.Widgets.SourceList.Item a, Granite.Widgets.SourceList.Item b) {
if (a is FolderItem && b is FileItem) {
return -1;
} else if (a is FileItem && b is FolderItem) {
return 1;
}
return strcmp ((a as Item).filename, (b as Item).filename);
}
public bool allow_dnd_sorting () {
return false;
}
}

public class FileItem : Item {
public FileItem (string filename, string name, string icon_name) {
this.filename = filename;
this.name = name;
icon = new ThemedIcon (icon_name);
}
}

public class FolderItem : Granite.Widgets.SourceList.ExpandableItem {
public string filename { get; set; }

public class FolderItem : Item {
public FolderItem (string filename, string name) {
this.filename = filename;
this.name = name;
Expand Down Expand Up @@ -73,7 +84,7 @@ public class SourceList : Granite.Widgets.SourceList {
if (info.get_file_type () == FileType.DIRECTORY) {
var expandable_item = new FolderItem (subfile.get_path (), info.get_name ());
if (prev_item != null) {
prev_item.add (expandable_item);
prev_item.add (expandable_item);
} else {
project_root.add (expandable_item);
}
Expand All @@ -92,7 +103,7 @@ public class SourceList : Granite.Widgets.SourceList {

var item = new FileItem (subfile.get_path (), info.get_name (), icon_name);
if (prev_item != null) {
prev_item.add (item);
prev_item.add (item);
} else {
project_root.add (item);
}
Expand Down