development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-07-17 11:08:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Keep the selected navigation reference during reloading

Browse source
This commit is contained in:
Techlive Zheng 2013-06-01 03:08:07 +08:00
parent ef329ed44c
commit 3430656538
2 changed files with 59 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
plugins/history/gitg-history-navigation.vala
View file

@ -30,6 +30,7 @@ namespace GitgHistory
private enum Column
{
ICON_NAME,
NAME,
TEXT,
HEADER,
HINT,
@ -74,12 +75,15 @@ namespace GitgHistory
private uint d_sections;
private Activated[] d_callbacks;
private Gitg.Repository? d_repository;
private string? d_selected_head;
private Gtk.TreeIter? d_selected_iter;
public signal void ref_activated(Gitg.Ref? r);
public Navigation(Gitg.Repository repo)
{
set_column_types({typeof(string),
typeof(string),
typeof(string),
typeof(string),
typeof(uint),
@ -103,6 +107,12 @@ namespace GitgHistory
}
}
public Gtk.TreeIter? selected_iter
{
get { return d_selected_iter; }
set { d_selected_iter = value; }
}
private static int sort_refs(Gitg.Ref a, Gitg.Ref b)
{
return a.parsed_name.shortname.ascii_casecmp(b.parsed_name.shortname);
@ -174,11 +184,11 @@ namespace GitgHistory
if (CommandLine.all)
{
append_default(_("All commits"), null, (nc) => ref_activated(null));
append_default(_("All commits"), null, null, (nc) => activate_ref(null));
}
else
{
append(_("All commits"), null, (nc) => ref_activated(null));
append(_("All commits"), null, null, (nc) => activate_ref(null));
}
// Branches
@ -207,14 +217,16 @@ namespace GitgHistory
if (isdef)
{
append_default(item.parsed_name.shortname,
item.parsed_name.name,
icon,
(nc) => ref_activated(item));
(nc) => activate_ref(item));
}
else
{
append(item.parsed_name.shortname,
item.parsed_name.name,
icon,
(nc) => ref_activated(item));
(nc) => activate_ref(item));
}
}
@ -236,8 +248,9 @@ namespace GitgHistory
var it = rref;
append(rref.parsed_name.remote_branch,
rref.parsed_name.name,
null,
(nc) => ref_activated(it));
(nc) => activate_ref(it));
}
end_header();
@ -253,8 +266,9 @@ namespace GitgHistory
var it = item;
append(item.parsed_name.shortname,
item.parsed_name.name,
null,
(nc) => ref_activated(it));
(nc) => activate_ref(it));
}
end_header();
@ -283,6 +297,7 @@ namespace GitgHistory
}
private void append_one(string text,
string? name,
string? icon_name,
uint hint,
owned NavigationActivated? callback,
@ -299,31 +314,40 @@ namespace GitgHistory
@set(iter,
Column.ICON_NAME, icon_name,
Column.NAME, name,
hint == Hint.HEADER ? Column.HEADER : Column.TEXT, text,
Column.HINT, hint,
Column.SECTION, d_sections,
Column.OID, d_oid);
if (d_selected_head == name && name != null ||
d_selected_head == "--ALL REFS--" && text == _("All commits"))
{
d_selected_iter = iter;
}
d_callbacks += new Activated((owned)callback);
++d_oid;
}
public new Navigation append(string text,
string? name,
string? icon_name,
owned NavigationActivated? callback)
{
Gtk.TreeIter iter;
append_one(text, icon_name, Hint.NONE, (owned)callback, out iter);
append_one(text, name, icon_name, Hint.NONE, (owned)callback, out iter);
return this;
}
public new Navigation append_default(string text,
string? name,
string? icon_name,
owned NavigationActivated? callback)
{
Gtk.TreeIter iter;
append_one(text, icon_name, Hint.DEFAULT, (owned)callback, out iter);
append_one(text, name, icon_name, Hint.DEFAULT, (owned)callback, out iter);
return this;
}
@ -331,7 +355,7 @@ namespace GitgHistory
public new Navigation append_separator()
{
Gtk.TreeIter iter;
append_one("", null, Hint.SEPARATOR, null, out iter);
append_one("", null, null, Hint.SEPARATOR, null, out iter);
return this;
}
@ -341,7 +365,7 @@ namespace GitgHistory
{
Gtk.TreeIter iter;
append_one(text, icon_name, Hint.HEADER, null, out iter);
append_one(text, null, icon_name, Hint.HEADER, null, out iter);
d_parents.prepend(iter);
return this;
@ -429,6 +453,18 @@ namespace GitgHistory
d_callbacks[oid].activate(numclick);
}
}
private void activate_ref(Gitg.Ref? r) {
if (r != null)
{
d_selected_head = r.parsed_name.name;
}
else
{
d_selected_head = "--ALL REFS--";
}
ref_activated(r);
}
}
public class NavigationView : Gtk.TreeView
@ -558,6 +594,18 @@ namespace GitgHistory
select_first_in(null, true) || select_first_in(null, false);
}
public void select()
{
if (model.selected_iter != null) {
get_selection().select_iter(model.selected_iter);
model.selected_iter = null;
}
else
{
select_first();
}
}
protected override void row_activated(Gtk.TreePath path, Gtk.TreeViewColumn col)
{
Gtk.TreeIter iter;

2
plugins/history/gitg-history.vala
View file

@ -190,7 +190,7 @@ namespace GitgHistory
d_navigation_model.reload();
d_navigation.set_model(d_navigation_model);
d_navigation.expand_all();
d_navigation.select_first();
d_navigation.select();
}
private void build_ui()