diff --git a/Dizzy.csproj b/Dizzy.csproj
index 18bcfa5..0c709c2 100644
--- a/Dizzy.csproj
+++ b/Dizzy.csproj
@@ -77,7 +77,7 @@
<EmbeddedResource Include="gtk-gui\gui.stetic">
<LogicalName>gui.stetic</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="Dizzy\sqlite3.dll">
+ <EmbeddedResource Include="sqlite3.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
diff --git a/Dizzy.make b/Dizzy.make
index c96fca0..9a8037a 100644
--- a/Dizzy.make
+++ b/Dizzy.make
@@ -16,7 +16,7 @@ COMPILE_TARGET = exe
PROJECT_REFERENCES =
BUILD_DIR = bin/Debug
-SQLITE3_DLL_SOURCE=Dizzy/sqlite3.dll
+SQLITE3_DLL_SOURCE=sqlite3.dll
TAMIR_SHARPSSH_DLL_SOURCE=Libraries/Tamir.SharpSSH.dll
DIFFIEHELLMAN_DLL_SOURCE=Libraries/DiffieHellman.dll
ORG_MENTALIS_SECURITY_DLL_SOURCE=Libraries/Org.Mentalis.Security.dll
@@ -35,7 +35,7 @@ COMPILE_TARGET = exe
PROJECT_REFERENCES =
BUILD_DIR = bin/Release
-SQLITE3_DLL_SOURCE=Dizzy/sqlite3.dll
+SQLITE3_DLL_SOURCE=sqlite3.dll
TAMIR_SHARPSSH_DLL_SOURCE=Libraries/Tamir.SharpSSH.dll
DIFFIEHELLMAN_DLL_SOURCE=Libraries/DiffieHellman.dll
ORG_MENTALIS_SECURITY_DLL_SOURCE=Libraries/Org.Mentalis.Security.dll
@@ -47,10 +47,8 @@ endif
AL=al2
SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
-PROGRAMFILES_DIZZY = \
- $(SQLITE3_DLL)
-
PROGRAMFILES = \
+ $(SQLITE3_DLL) \
$(TAMIR_SHARPSSH_DLL) \
$(DIFFIEHELLMAN_DLL) \
$(ORG_MENTALIS_SECURITY_DLL) \
@@ -63,7 +61,7 @@ BINARIES = \
RESGEN=resgen2
-SQLITE3_DLL = $(BUILD_DIR)/Dizzy/sqlite3.dll
+SQLITE3_DLL = $(BUILD_DIR)/sqlite3.dll
TAMIR_SHARPSSH_DLL = $(BUILD_DIR)/Tamir.SharpSSH.dll
DIFFIEHELLMAN_DLL = $(BUILD_DIR)/DiffieHellman.dll
ORG_MENTALIS_SECURITY_DLL = $(BUILD_DIR)/Org.Mentalis.Security.dll
@@ -88,7 +86,7 @@ DATA_FILES =
RESOURCES = \
gtk-gui/gui.stetic \
- Dizzy/sqlite3.dll,Dizzy.Dizzy.sqlite3.dll
+ sqlite3.dll,Dizzy.sqlite3.dll
EXTRAS = \
Dizzy/app.desktop \
@@ -109,10 +107,10 @@ DLL_REFERENCES = \
Libraries/DiffieHellman.dll \
Libraries/System.Data.SQLite.dll
-CLEANFILES = $(PROGRAMFILES_DIZZY) $(PROGRAMFILES) $(BINARIES)
+CLEANFILES = $(PROGRAMFILES) $(BINARIES)
#Targets
-all-local: $(ASSEMBLY) $(PROGRAMFILES_DIZZY) $(PROGRAMFILES) $(BINARIES) $(top_srcdir)/config.make
+all-local: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES) $(top_srcdir)/config.make
@@ -144,8 +142,7 @@ install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
mkdir -p '$(DESTDIR)$(libdir)/$(PACKAGE)'
$(call cp,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call cp,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
- mkdir -p '$(DESTDIR)$(libdir)/$(PACKAGE)/Dizzy'
- $(call cp,$(SQLITE3_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)/Dizzy)
+ $(call cp,$(SQLITE3_DLL),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call cp,$(TAMIR_SHARPSSH_DLL),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call cp,$(DIFFIEHELLMAN_DLL),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call cp,$(ORG_MENTALIS_SECURITY_DLL),$(DESTDIR)$(libdir)/$(PACKAGE))
@@ -160,7 +157,7 @@ uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
make uninstall-satellite-assemblies prefix=$(prefix)
$(call rm,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call rm,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
- $(call rm,$(SQLITE3_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)/Dizzy)
+ $(call rm,$(SQLITE3_DLL),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call rm,$(TAMIR_SHARPSSH_DLL),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call rm,$(DIFFIEHELLMAN_DLL),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call rm,$(ORG_MENTALIS_SECURITY_DLL),$(DESTDIR)$(libdir)/$(PACKAGE))
diff --git a/Dizzy/MainWindow.cs b/Dizzy/MainWindow.cs
index 76e5959..90882d5 100644
--- a/Dizzy/MainWindow.cs
+++ b/Dizzy/MainWindow.cs
@@ -45,23 +45,19 @@ public partial class MainWindow : Gtk.Window
}
- protected void OnAuthenticationFailed () {
+ public void OnAuthenticationFailed () {
Console.WriteLine ("Auth Failed");
- return;
- Gtk.MessageDialog d = new Gtk.MessageDialog(this,
- DialogFlags.Modal,
- MessageType.Error,
- ButtonsType.Ok,
- true,"Errore di connessione");
-
- d.Markup = "Errore di autenticazione. Non è stato possibile connettersi" +
- "all'host <b>poisson.phc.unipi.it</b>.";
-
- d.Run ();
-
- d.Destroy ();
-
+ // return;
+ Gtk.MessageDialog dialog = new Gtk.MessageDialog(this,
+ DialogFlags.Modal,
+ MessageType.Error,
+ ButtonsType.Ok,
+ true,
+ "");
+ dialog.Markup = "Autenticazione fallita";
+ dialog.Run ();
+ // dialog.Destroy ();
}
diff --git a/Makefile.include b/Makefile.include
index 26a6545..766bd6a 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -65,8 +65,6 @@ DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/*
pkglib_SCRIPTS = $(ASSEMBLY)
bin_SCRIPTS = $(BINARIES)
-programfilesdizzydir = @libdir@/@PACKAGE@/Dizzy
-programfilesdizzy_DATA = $(PROGRAMFILES_DIZZY)
programfilesdir = @libdir@/@PACKAGE@
programfiles_DATA = $(PROGRAMFILES)
diff --git a/config.make b/config.make
index 6988b80..83b4f53 100644
--- a/config.make
+++ b/config.make
@@ -6,4 +6,4 @@ RUNTIME=mono
ASSEMBLY_VERSION=0.1.0.0
VERSION=0.1
PACKAGE=dizzy
-CONFIG=RELEASE_X86
+CONFIG=DEBUG_X86
diff --git a/configure b/configure
index 6f2bcdc..f1f50c5 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
VERSION=0.1
PACKAGE=dizzy
prefix=/usr/local
-config=RELEASE_X86
+config=DEBUG_X86
configurations=" DEBUG_X86 RELEASE_X86"
common_packages=" glade-sharp-2.0;2.12.9 glib-sharp-2.0;2.12.9 gtk-sharp-2.0;2.12.9"
diff --git a/gtk-gui/MainWindow.cs b/gtk-gui/MainWindow.cs
index ad7c9f3..ea99b78 100644
--- a/gtk-gui/MainWindow.cs
+++ b/gtk-gui/MainWindow.cs
@@ -54,6 +54,16 @@ public partial class MainWindow {
private Gtk.Label label3;
+ private Gtk.VBox vbox4;
+
+ private Gtk.HBox hbox1;
+
+ private Gtk.Button button261;
+
+ private Gtk.Button button262;
+
+ private Gtk.Label label7;
+
private Gtk.Statusbar statusbar2;
protected virtual void Build() {
@@ -82,8 +92,7 @@ public partial class MainWindow {
// Container child vbox1.Gtk.Box+BoxChild
this.notebook1 = new Gtk.Notebook();
this.notebook1.CanFocus = true;
- this.notebook1.Name = "notebook1";
- this.notebook1.CurrentPage = 0;
+ this.notebook1.CurrentPage = 2;
// Container child notebook1.Gtk.Notebook+NotebookChild
this.vbox3 = new Gtk.VBox();
this.vbox3.Name = "vbox3";
@@ -238,18 +247,64 @@ public partial class MainWindow {
this.label3.LabelProp = Mono.Unix.Catalog.GetString("Download");
this.notebook1.SetTabLabel(this.vbox2, this.label3);
this.label3.ShowAll();
+ // Container child notebook1.Gtk.Notebook+NotebookChild
+ this.vbox4 = new Gtk.VBox();
+ this.vbox4.Name = "vbox4";
+ this.vbox4.Spacing = 6;
+ // Container child vbox4.Gtk.Box+BoxChild
+ this.hbox1 = new Gtk.HBox();
+ this.hbox1.Name = "hbox1";
+ this.hbox1.Homogeneous = true;
+ this.hbox1.Spacing = 6;
+ this.hbox1.BorderWidth = ((uint)(5));
+ // Container child hbox1.Gtk.Box+BoxChild
+ this.button261 = new Gtk.Button();
+ this.button261.CanFocus = true;
+ this.button261.Name = "button261";
+ this.button261.UseUnderline = true;
+ this.button261.Label = Mono.Unix.Catalog.GetString("Aggiorna la lista dei file");
+ this.hbox1.Add(this.button261);
+ Gtk.Box.BoxChild w18 = ((Gtk.Box.BoxChild)(this.hbox1[this.button261]));
+ w18.Position = 0;
+ w18.Expand = false;
+ w18.Fill = false;
+ // Container child hbox1.Gtk.Box+BoxChild
+ this.button262 = new Gtk.Button();
+ this.button262.CanFocus = true;
+ this.button262.Name = "button262";
+ this.button262.UseUnderline = true;
+ this.button262.Label = Mono.Unix.Catalog.GetString("Disconnetti");
+ this.hbox1.Add(this.button262);
+ Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.hbox1[this.button262]));
+ w19.Position = 1;
+ w19.Expand = false;
+ w19.Fill = false;
+ this.vbox4.Add(this.hbox1);
+ Gtk.Box.BoxChild w20 = ((Gtk.Box.BoxChild)(this.vbox4[this.hbox1]));
+ w20.Position = 0;
+ w20.Expand = false;
+ w20.Fill = false;
+ this.notebook1.Add(this.vbox4);
+ Gtk.Notebook.NotebookChild w21 = ((Gtk.Notebook.NotebookChild)(this.notebook1[this.vbox4]));
+ w21.Position = 2;
+ // Notebook tab
+ this.label7 = new Gtk.Label();
+ this.label7.Name = "label7";
+ this.label7.LabelProp = Mono.Unix.Catalog.GetString("Strumenti");
+ this.notebook1.SetTabLabel(this.vbox4, this.label7);
+ this.label7.ShowAll();
this.vbox1.Add(this.notebook1);
- Gtk.Box.BoxChild w18 = ((Gtk.Box.BoxChild)(this.vbox1[this.notebook1]));
- w18.Position = 1;
+ Gtk.Box.BoxChild w22 = ((Gtk.Box.BoxChild)(this.vbox1[this.notebook1]));
+ w22.Position = 1;
// Container child vbox1.Gtk.Box+BoxChild
this.statusbar2 = new Gtk.Statusbar();
this.statusbar2.Name = "statusbar2";
this.statusbar2.Spacing = 6;
this.vbox1.Add(this.statusbar2);
- Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar2]));
- w19.Position = 2;
- w19.Expand = false;
- w19.Fill = false;
+ Gtk.Box.BoxChild w23 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar2]));
+ w23.Position = 2;
+ w23.Expand = false;
+ w23.Fill = false;
this.Add(this.vbox1);
if ((this.Child != null)) {
this.Child.ShowAll();
diff --git a/gtk-gui/gui.stetic b/gtk-gui/gui.stetic
index 2b9ee85..f98f3a6 100644
--- a/gtk-gui/gui.stetic
+++ b/gtk-gui/gui.stetic
@@ -37,7 +37,7 @@
<widget class="Gtk.Notebook" id="notebook1">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="CurrentPage">0</property>
+ <property name="CurrentPage">2</property>
<child>
<widget class="Gtk.VBox" id="vbox3">
<property name="MemberName" />
@@ -286,6 +286,71 @@ Libro</property>
<property name="type">tab</property>
</packing>
</child>
+ <child>
+ <widget class="Gtk.VBox" id="vbox4">
+ <property name="MemberName" />
+ <property name="Spacing">6</property>
+ <child>
+ <widget class="Gtk.HBox" id="hbox1">
+ <property name="MemberName" />
+ <property name="Homogeneous">True</property>
+ <property name="Spacing">6</property>
+ <property name="BorderWidth">5</property>
+ <child>
+ <widget class="Gtk.Button" id="button261">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="Type">TextOnly</property>
+ <property name="Label" translatable="yes">Aggiorna la lista dei file</property>
+ <property name="UseUnderline">True</property>
+ </widget>
+ <packing>
+ <property name="Position">0</property>
+ <property name="AutoSize">True</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Button" id="button262">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="Type">TextOnly</property>
+ <property name="Label" translatable="yes">Disconnetti</property>
+ <property name="UseUnderline">True</property>
+ </widget>
+ <packing>
+ <property name="Position">1</property>
+ <property name="AutoSize">True</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="Position">0</property>
+ <property name="AutoSize">True</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder />
+ </child>
+ </widget>
+ <packing>
+ <property name="Position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Label" id="label7">
+ <property name="MemberName" />
+ <property name="LabelProp" translatable="yes">Strumenti</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="Position">1</property>