From 63071b07ad74768ab65dcca000abd819bf51b79c Mon Sep 17 00:00:00 2001 From: Gustavo Martin Morcuende Date: Tue, 30 Dec 2014 19:13:49 +0100 Subject: [PATCH] Update GTK RemoteAgents --- Mono/RemoteAgents/GTKLinux/GTKLinux.csproj | 12 ++++-------- Mono/RemoteAgents/GTKLinux/MainWindow.cs | 5 ++--- Mono/RemoteAgents/GTKLinux/View/View.cs | 3 +-- Mono/RemoteAgents/GTKLinux/ViewModel/ViewModel.cs | 4 +--- .../gtk-gui/Example.RemoteAgents.GTKLinux.MainWindow.cs | 8 ++++++++ Mono/RemoteAgents/GTKLinux/packages.config | 4 ++++ 6 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 Mono/RemoteAgents/GTKLinux/packages.config diff --git a/Mono/RemoteAgents/GTKLinux/GTKLinux.csproj b/Mono/RemoteAgents/GTKLinux/GTKLinux.csproj index edf4071..fd0a975 100644 --- a/Mono/RemoteAgents/GTKLinux/GTKLinux.csproj +++ b/Mono/RemoteAgents/GTKLinux/GTKLinux.csproj @@ -3,8 +3,6 @@ Debug x86 - 12.0.0 - 2.0 {F58086C1-1E2F-459C-B8BE-269A245C09A2} WinExe GTKLinux @@ -53,20 +51,17 @@ through JSON API. False - ..\..\..\jsonrpc4net\jsonrpc4net\bin\Debug\jsonrpc4net.dll - - ..\..\..\ThirdParty\Libs\NLog\net45\NLog.dll - monodevelop True - - ..\..\..\..\..\..\..\usr\mymono\lib\mono\4.5\System.Net.Http.dll + + ..\packages\NLog.3.1.0.0\lib\net45\NLog.dll + @@ -97,5 +92,6 @@ through JSON API. PreserveNewest + diff --git a/Mono/RemoteAgents/GTKLinux/MainWindow.cs b/Mono/RemoteAgents/GTKLinux/MainWindow.cs index bc9d341..0cd70c4 100644 --- a/Mono/RemoteAgents/GTKLinux/MainWindow.cs +++ b/Mono/RemoteAgents/GTKLinux/MainWindow.cs @@ -1,6 +1,5 @@ using System; using Gtk; -using System.Threading.Tasks; using Example.RemoteAgents.GTKLinux.View; using NLog; @@ -32,7 +31,7 @@ namespace Example.RemoteAgents.GTKLinux } catch (Exception exception) { - logger.ErrorException("ButtonGetDateClicked error: ", exception); + logger.Error("ButtonGetDateClicked error: ", exception); } } @@ -44,7 +43,7 @@ namespace Example.RemoteAgents.GTKLinux } catch (Exception exception) { - logger.ErrorException("SendDataButtonClicked error: ", exception); + logger.Error("SendDataButtonClicked error: ", exception); } } } diff --git a/Mono/RemoteAgents/GTKLinux/View/View.cs b/Mono/RemoteAgents/GTKLinux/View/View.cs index dcfcc09..6e1009c 100644 --- a/Mono/RemoteAgents/GTKLinux/View/View.cs +++ b/Mono/RemoteAgents/GTKLinux/View/View.cs @@ -1,5 +1,4 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Example.RemoteAgents.GTKLinux.ViewModel; diff --git a/Mono/RemoteAgents/GTKLinux/ViewModel/ViewModel.cs b/Mono/RemoteAgents/GTKLinux/ViewModel/ViewModel.cs index 497c086..dfca7db 100644 --- a/Mono/RemoteAgents/GTKLinux/ViewModel/ViewModel.cs +++ b/Mono/RemoteAgents/GTKLinux/ViewModel/ViewModel.cs @@ -1,7 +1,5 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using GumartinM.JsonRPC4NET; -using System.ComponentModel; namespace Example.RemoteAgents.GTKLinux.ViewModel { diff --git a/Mono/RemoteAgents/GTKLinux/gtk-gui/Example.RemoteAgents.GTKLinux.MainWindow.cs b/Mono/RemoteAgents/GTKLinux/gtk-gui/Example.RemoteAgents.GTKLinux.MainWindow.cs index 6d358d3..86c8e07 100644 --- a/Mono/RemoteAgents/GTKLinux/gtk-gui/Example.RemoteAgents.GTKLinux.MainWindow.cs +++ b/Mono/RemoteAgents/GTKLinux/gtk-gui/Example.RemoteAgents.GTKLinux.MainWindow.cs @@ -5,13 +5,21 @@ namespace Example.RemoteAgents.GTKLinux public partial class MainWindow { private global::Gtk.VBox vbox3; + private global::Gtk.TextView RemoteDate; + private global::Gtk.HBox hbox1; + private global::Gtk.ScrolledWindow GtkScrolledWindow; + private global::Gtk.TextView TextToSend; + private global::Gtk.SpinButton SpinButtonNumbers; + private global::Gtk.HBox hbox2; + private global::Gtk.Button ButtonGetDate; + private global::Gtk.Button SendDataButton; protected virtual void Build () diff --git a/Mono/RemoteAgents/GTKLinux/packages.config b/Mono/RemoteAgents/GTKLinux/packages.config new file mode 100644 index 0000000..91befb6 --- /dev/null +++ b/Mono/RemoteAgents/GTKLinux/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file -- 2.1.4