Integrate notes on linux
This commit is contained in:
parent
02ec2faf93
commit
32e93cad28
|
@ -113,7 +113,7 @@ namespace SparkleShare {
|
||||||
if (this.selected_log != null &&
|
if (this.selected_log != null &&
|
||||||
!SparkleShare.Controller.Folders.Contains (this.selected_log)) {
|
!SparkleShare.Controller.Folders.Contains (this.selected_log)) {
|
||||||
|
|
||||||
this.selected_log = null;// todo on linux
|
this.selected_log = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.popup_button.Activated += delegate {
|
this.popup_button.Activated += delegate {
|
||||||
|
|
|
@ -84,7 +84,6 @@ namespace SparkleShare {
|
||||||
LinkStatus = args.Link;
|
LinkStatus = args.Link;
|
||||||
};
|
};
|
||||||
|
|
||||||
// FIXME: Use the right event, waiting for newer webkit bindings: NavigationPolicyDecisionRequested
|
|
||||||
WebView.NavigationRequested += delegate (object o, WebKit.NavigationRequestedArgs args) {
|
WebView.NavigationRequested += delegate (object o, WebKit.NavigationRequestedArgs args) {
|
||||||
if (args.Request.Uri == LinkStatus) {
|
if (args.Request.Uri == LinkStatus) {
|
||||||
Process process = new Process ();
|
Process process = new Process ();
|
||||||
|
@ -92,9 +91,26 @@ namespace SparkleShare {
|
||||||
process.StartInfo.Arguments = args.Request.Uri.Replace (" ", "\\ "); // Escape space-characters
|
process.StartInfo.Arguments = args.Request.Uri.Replace (" ", "\\ "); // Escape space-characters
|
||||||
process.Start ();
|
process.Start ();
|
||||||
|
|
||||||
// Don't follow HREFs (as this would cause a page refresh)
|
} else {
|
||||||
args.RetVal = 1;
|
Regex regex = new Regex (@"(.+)~(.+)~(.+)");
|
||||||
|
Match match = regex.Match (args.Request.Uri);
|
||||||
|
|
||||||
|
if (match.Success) {
|
||||||
|
string folder_name = match.Groups [1].Value;
|
||||||
|
string revision = match.Groups [2].Value;
|
||||||
|
string note = match.Groups [3].Value.Replace ("%20", " ");
|
||||||
|
|
||||||
|
Thread thread = new Thread (new ThreadStart (delegate {
|
||||||
|
SparkleShare.Controller.AddNoteToFolder (folder_name, revision, note);
|
||||||
|
}));
|
||||||
|
|
||||||
|
thread.Start ();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Don't follow HREFs (as this would cause a page refresh)
|
||||||
|
if (!args.Request.Uri.Equals ("file:"))
|
||||||
|
args.RetVal = 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
ScrolledWindow.Add (WebView);
|
ScrolledWindow.Add (WebView);
|
||||||
|
@ -142,6 +158,12 @@ namespace SparkleShare {
|
||||||
return (item == "---");
|
return (item == "---");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (this.selected_log != null &&
|
||||||
|
!SparkleShare.Controller.Folders.Contains (this.selected_log)) {
|
||||||
|
|
||||||
|
this.selected_log = null;
|
||||||
|
}
|
||||||
|
|
||||||
this.combo_box.Changed += delegate {
|
this.combo_box.Changed += delegate {
|
||||||
TreeIter iter;
|
TreeIter iter;
|
||||||
this.combo_box.GetActiveIter (out iter);
|
this.combo_box.GetActiveIter (out iter);
|
||||||
|
|
|
@ -166,8 +166,13 @@ namespace SparkleShare {
|
||||||
get {
|
get {
|
||||||
string path = SparkleHelpers.CombineMore (Defines.PREFIX,
|
string path = SparkleHelpers.CombineMore (Defines.PREFIX,
|
||||||
"share", "sparkleshare", "html", "event-log.html");
|
"share", "sparkleshare", "html", "event-log.html");
|
||||||
|
|
||||||
|
string html = String.Join (Environment.NewLine, File.ReadAllLines (path));
|
||||||
|
|
||||||
|
html = html.Replace ("<!-- $jquery-url -->", "file://" +
|
||||||
|
SparkleHelpers.CombineMore (Defines.PREFIX, "share", "sparkleshare", "html", "jquery.js"));
|
||||||
|
|
||||||
return String.Join (Environment.NewLine, File.ReadAllLines (path));
|
return html;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue