development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-10-02 14:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added ignore-whitespace option for diff

Browse source
This commit is contained in:
Jesse van den Kieboom 2014-06-30 22:02:23 +02:00
parent 989218fe1a
commit c9b0d29949
2 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/org.gnome.gitg.gschema.xml.in.in
View file

@ -166,4 +166,9 @@
<default>false</default>
</key>
</schema>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gitg.state.diff" path="/org/gnome/gitg/state/diff/">
<key name="ignore-whitespace" type="b">
<default>false</default>
</key>
</schema>
</schemalist>

47
libgitg/gitg-diff-view.vala
View file

@ -104,6 +104,22 @@ namespace Gitg
public bool unstaged { get; set; default = false; }
public int tab_width { get; set; default = 4; }
public bool ignore_whitespace
{
get { return (options.flags & Ggit.DiffOption.IGNORE_WHITESPACE) != 0; }
set
{
if (value)
{
options.flags |= Ggit.DiffOption.IGNORE_WHITESPACE;
}
else
{
options.flags &= ~Ggit.DiffOption.IGNORE_WHITESPACE;
}
}
}
static construct
{
s_diff_map = new Gee.HashMap<string, DiffView>();
@ -483,6 +499,37 @@ namespace Gitg
return ret;
}
protected override bool context_menu(WebKit.ContextMenu menu,
Gdk.Event event,
WebKit.HitTestResult hit_test_result)
{
var m = new Gtk.Menu();
var item = new Gtk.CheckMenuItem.with_label(_("Ignore whitespace changes"));
item.active = ignore_whitespace;
item.toggled.connect((i) => {
ignore_whitespace = i.active;
});
m.append(item);
m.show_all();
m.attach_to_widget(this, null);
if (event.type == Gdk.EventType.BUTTON_PRESS ||
event.type == Gdk.EventType.BUTTON_RELEASE)
{
m.popup(null, null, null, event.button.button, event.button.time);
}
else
{
m.popup(null, null, null, 0, Gdk.CURRENT_TIME);
}
return true;
}
}
}