make SelectedEmail a private property instead of passing it around all the time
This commit is contained in:
parent
0ca4bd07e3
commit
92407b2e83
|
@ -36,6 +36,7 @@ namespace SparkleShare {
|
||||||
private HBox LayoutHorizontal;
|
private HBox LayoutHorizontal;
|
||||||
private ScrolledWindow LogScrolledWindow;
|
private ScrolledWindow LogScrolledWindow;
|
||||||
private ScrolledWindow PeopleScrolledWindow;
|
private ScrolledWindow PeopleScrolledWindow;
|
||||||
|
private string SelectedEmail;
|
||||||
|
|
||||||
public SparkleWindow (SparkleRepo Repo) : base ("") {
|
public SparkleWindow (SparkleRepo Repo) : base ("") {
|
||||||
|
|
||||||
|
@ -45,18 +46,20 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CreateWindow () {
|
public void CreateWindow () {
|
||||||
|
|
||||||
SetSizeRequest (900, 480);
|
SetSizeRequest (900, 480);
|
||||||
SetPosition (WindowPosition.Center);
|
SetPosition (WindowPosition.Center);
|
||||||
BorderWidth = 6;
|
BorderWidth = 6;
|
||||||
Title = _("Happenings in ‘" + SparkleRepo.Name + "’");
|
Title = _("Happenings in ‘" + SparkleRepo.Name + "’");
|
||||||
IconName = "folder-sparkleshare";
|
IconName = "folder-sparkleshare";
|
||||||
|
|
||||||
|
SelectedEmail = "";
|
||||||
|
|
||||||
VBox LayoutVertical = new VBox (false, 0);
|
VBox LayoutVertical = new VBox (false, 0);
|
||||||
|
|
||||||
LayoutHorizontal = new HBox (true, 6);
|
LayoutHorizontal = new HBox (true, 6);
|
||||||
LayoutHorizontal.PackStart (CreatePeopleList (""));
|
LayoutHorizontal.PackStart (CreatePeopleList ());
|
||||||
LayoutHorizontal.PackStart (CreateEventLog (""));
|
LayoutHorizontal.PackStart (CreateEventLog ());
|
||||||
|
|
||||||
LayoutVertical.PackStart (LayoutHorizontal, true, true, 6);
|
LayoutVertical.PackStart (LayoutHorizontal, true, true, 6);
|
||||||
|
|
||||||
|
@ -81,23 +84,13 @@ namespace SparkleShare {
|
||||||
|
|
||||||
LayoutVertical.PackStart (DialogButtons, false, false, 0);
|
LayoutVertical.PackStart (DialogButtons, false, false, 0);
|
||||||
|
|
||||||
/* Timer RedrawTimer = new Timer ();
|
/* Timer RedrawTimer = new Timer ();
|
||||||
RedrawTimer.Interval = 5000;
|
RedrawTimer.Interval = 5000;
|
||||||
RedrawTimer.Elapsed += delegate {
|
RedrawTimer.Elapsed += delegate {
|
||||||
|
|
||||||
TreeSelection Selection = ReposView.Selection;;
|
|
||||||
TreeIter Iter = new TreeIter ();;
|
|
||||||
Selection.GetSelected (out Iter);
|
|
||||||
SparkleRepo SparkleRepo = (SparkleRepo)ReposStore.GetValue (Iter, 2);
|
|
||||||
Console.WriteLine(SparkleRepo.Name);
|
|
||||||
|
|
||||||
LayoutHorizontal.Remove (LayoutVerticalRight);
|
|
||||||
|
|
||||||
LayoutVerticalRight = CreateDetailedView (SparkleRepo);
|
UpdatePeopleList ("");
|
||||||
|
UpdateEventLog ("");
|
||||||
LayoutHorizontal.PackStart (LayoutVerticalRight, true, true, 12);
|
|
||||||
ShowAll ();
|
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -107,22 +100,22 @@ namespace SparkleShare {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateEventLog (string SelectedEmail) {
|
public void UpdateEventLog () {
|
||||||
LayoutHorizontal.Remove (LogScrolledWindow);
|
LayoutHorizontal.Remove (LogScrolledWindow);
|
||||||
LogScrolledWindow = CreateEventLog (SelectedEmail);
|
LogScrolledWindow = CreateEventLog ();
|
||||||
LayoutHorizontal.Add (LogScrolledWindow);
|
LayoutHorizontal.Add (LogScrolledWindow);
|
||||||
ShowAll ();
|
ShowAll ();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdatePeopleList (string SelectedEmail) {
|
public void UpdatePeopleList () {
|
||||||
LayoutHorizontal.Remove (PeopleScrolledWindow);
|
LayoutHorizontal.Remove (PeopleScrolledWindow);
|
||||||
PeopleScrolledWindow = CreatePeopleList (SelectedEmail);
|
PeopleScrolledWindow = CreatePeopleList ();
|
||||||
LayoutHorizontal.Add (PeopleScrolledWindow);
|
LayoutHorizontal.Add (PeopleScrolledWindow);
|
||||||
LayoutHorizontal.ReorderChild (PeopleScrolledWindow, 0);
|
LayoutHorizontal.ReorderChild (PeopleScrolledWindow, 0);
|
||||||
ShowAll ();
|
ShowAll ();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ScrolledWindow CreateEventLog(string SelectedEmail) {
|
public ScrolledWindow CreateEventLog () {
|
||||||
|
|
||||||
ListStore LogStore = new ListStore (typeof (Gdk.Pixbuf),
|
ListStore LogStore = new ListStore (typeof (Gdk.Pixbuf),
|
||||||
typeof (string),
|
typeof (string),
|
||||||
|
@ -182,10 +175,10 @@ namespace SparkleShare {
|
||||||
LogStore.SetValue (Iter, 0, ChangeIcon);
|
LogStore.SetValue (Iter, 0, ChangeIcon);
|
||||||
LogStore.SetValue (Iter, 1, Message);
|
LogStore.SetValue (Iter, 1, Message);
|
||||||
LogStore.SetValue (Iter, 2, " " + TimeAgo);
|
LogStore.SetValue (Iter, 2, " " + TimeAgo);
|
||||||
|
|
||||||
// We're not showing e-mail, it's only
|
// We're not showing e-mail, it's only
|
||||||
// there for lookup purposes
|
// there for lookup purposes
|
||||||
LogStore.SetValue (Iter, 3, UserEmail);
|
LogStore.SetValue (Iter, 3, UserEmail);
|
||||||
Console.WriteLine (UserEmail);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -212,11 +205,11 @@ namespace SparkleShare {
|
||||||
LogView.CursorChanged += delegate(object o, EventArgs args) {
|
LogView.CursorChanged += delegate(object o, EventArgs args) {
|
||||||
TreeModel model;
|
TreeModel model;
|
||||||
if (LogView.Selection.GetSelected (out model, out Iter)) {
|
if (LogView.Selection.GetSelected (out model, out Iter)) {
|
||||||
UpdatePeopleList ((string) LogStore.GetValue (Iter, 3));
|
SelectedEmail = (string) LogStore.GetValue (Iter, 3);
|
||||||
|
UpdatePeopleList ();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
LogScrolledWindow = new ScrolledWindow ();
|
LogScrolledWindow = new ScrolledWindow ();
|
||||||
LogScrolledWindow.AddWithViewport (LogView);
|
LogScrolledWindow.AddWithViewport (LogView);
|
||||||
|
|
||||||
|
@ -225,7 +218,7 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Creates a visual list of people working in the repo
|
// Creates a visual list of people working in the repo
|
||||||
public ScrolledWindow CreatePeopleList (string SelectedEmail) {
|
public ScrolledWindow CreatePeopleList () {
|
||||||
|
|
||||||
Process Process = new Process ();
|
Process Process = new Process ();
|
||||||
Process.EnableRaisingEvents = false;
|
Process.EnableRaisingEvents = false;
|
||||||
|
@ -276,7 +269,6 @@ namespace SparkleShare {
|
||||||
|
|
||||||
if (UserEmail.Equals (SelectedEmail)) {
|
if (UserEmail.Equals (SelectedEmail)) {
|
||||||
TreePath = PeopleStore.GetPath (Iter);
|
TreePath = PeopleStore.GetPath (Iter);
|
||||||
Console.WriteLine (TreePath.Indices [0]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -301,8 +293,9 @@ namespace SparkleShare {
|
||||||
PeopleView.SelectionChanged += delegate (object o, EventArgs args) {
|
PeopleView.SelectionChanged += delegate (object o, EventArgs args) {
|
||||||
if (PeopleView.SelectedItems.Length > 0) {
|
if (PeopleView.SelectedItems.Length > 0) {
|
||||||
PeopleStore.GetIter (out Iter, PeopleView.SelectedItems [0]);
|
PeopleStore.GetIter (out Iter, PeopleView.SelectedItems [0]);
|
||||||
UpdateEventLog ((string) PeopleStore.GetValue (Iter, 2));
|
SelectedEmail = (string) PeopleStore.GetValue (Iter, 2);
|
||||||
} else UpdateEventLog ("");
|
}
|
||||||
|
UpdateEventLog ();
|
||||||
};
|
};
|
||||||
|
|
||||||
PeopleScrolledWindow = new ScrolledWindow ();
|
PeopleScrolledWindow = new ScrolledWindow ();
|
||||||
|
|
Loading…
Reference in a new issue