Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow proxy to not exit on command args errors.

Browse Source 
Validate port in Gtk GridProxy. Persist it
This commit is contained in:
Latif Khalifa
2013-12-21 19:08:26 +01:00
parent 67bc3d6df0
commit a7c3e18cd8
5 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Programs/GridProxyGUI/MainWindow.Persistance.cs
View File

@@ -75,10 +75,21 @@ public partial class MainWindow
cbLoginURL.Active = selected;
}
int port = 8080;
if (Options.Instance.ContainsKey("listen_port"))
{
port = Options.Instance["listen_port"];
}
txtPort.Text = port.ToString();
}
void SaveSettings()
{
int port = 8080;
int.TryParse(txtPort.Text, out port);
Options.Instance["listen_port"] = port;
var currentServer = cbLoginURL.ActiveText.Trim();
Uri uriResult;
if (Uri.TryCreate(currentServer, UriKind.Absolute, out uriResult)

16
Programs/GridProxyGUI/MainWindow.cs
View File

@@ -61,6 +61,16 @@ public partial class MainWindow : Gtk.Window
font = "monospace 9";
}
btnLoadPlugin.Sensitive = false;
txtPort.TextInserted += (object o, TextInsertedArgs args) =>
{
if (args.Length != 1) return;
if (!char.IsDigit(args.Text[0]))
{
txtPort.DeleteText(args.Position - 1, args.Position);
}
};
txtRequest.ModifyFont(Pango.FontDescription.FromString(font));
CreateTags(txtRequest.Buffer);
txtRequestRaw.ModifyFont(Pango.FontDescription.FromString(font));
@@ -297,10 +307,11 @@ public partial class MainWindow : Gtk.Window
{
proxy = new ProxyManager(txtPort.Text, cbListen.ActiveText, cbLoginURL.ActiveText);
proxy.Start();
btnLoadPlugin.Sensitive = true;
}
catch
catch (Exception ex)
{
Logger.Log("Failed to start proxy", OpenMetaverse.Helpers.LogLevel.Error);
Logger.Log("Failed to start proxy: " + ex.Message, OpenMetaverse.Helpers.LogLevel.Error);
try
{
proxy.Stop();
@@ -321,6 +332,7 @@ public partial class MainWindow : Gtk.Window
containerFilterUDP.Remove(child);
}
plugins.Store.Clear();
btnLoadPlugin.Sensitive = false;
}
protected void OnDeleteEvent(object sender, DeleteEventArgs a)

2
Programs/GridProxyGUI/ProxyManager.cs
View File

@@ -99,7 +99,7 @@ namespace GridProxyGUI
quiet
*/
ProxyConfig pc = new ProxyConfig("WinGridProxy", "Jim Radford", args);
ProxyConfig pc = new ProxyConfig("WinGridProxy", "Jim Radford", args, false);
Proxy = new ProxyFrame(args, pc);