# HG changeset patch
# User sarias
# Date 1254760172 -7200
# Node ID 9331c3dea17546d48bd611931169f6f39fec1b64
# Parent 192da585bee5eb035f4df0b7b2a01b8ff8743044
Close Control
diff -r 192da585bee5 -r 9331c3dea175 src/FingersDance.Control.Close/UserControlClose.xaml
--- a/src/FingersDance.Control.Close/UserControlClose.xaml Mon Oct 05 18:23:10 2009 +0200
+++ b/src/FingersDance.Control.Close/UserControlClose.xaml Mon Oct 05 18:29:32 2009 +0200
@@ -10,7 +10,7 @@
-
-
+
+
\ No newline at end of file
diff -r 192da585bee5 -r 9331c3dea175 src/FingersDance.Control.Close/UserControlClose.xaml.cs
--- a/src/FingersDance.Control.Close/UserControlClose.xaml.cs Mon Oct 05 18:23:10 2009 +0200
+++ b/src/FingersDance.Control.Close/UserControlClose.xaml.cs Mon Oct 05 18:29:32 2009 +0200
@@ -12,11 +12,52 @@
{
public partial class UserControlClose
{
- public UserControlClose()
+ public event EventHandler EH_SurfaceButtonClose_ContactDown;
+ public bool close;
+ public int Id = 0;
+
+ public UserControlClose(int closeid)
{
+ Id = closeid;
this.InitializeComponent();
// Insert code required on object creation below this point.
}
+
+ private void SurfaceButtonOK_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
+ {
+ if (EH_SurfaceButtonClose_ContactDown != null)
+ {
+ close = true;
+ EH_SurfaceButtonClose_ContactDown(this, new EventArgs());
+ }
+ }
+
+ private void SurfaceButtonNO_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
+ {
+ if (EH_SurfaceButtonClose_ContactDown != null)
+ {
+ close = false;
+ EH_SurfaceButtonClose_ContactDown(this, new EventArgs());
+ }
+ }
+
+ private void SurfaceButtonNO_Click(object sender, RoutedEventArgs e)
+ {
+ if (EH_SurfaceButtonClose_ContactDown != null)
+ {
+ close = false;
+ EH_SurfaceButtonClose_ContactDown(this, new EventArgs());
+ }
+ }
+
+ private void SurfaceButtonOK_Click(object sender, RoutedEventArgs e)
+ {
+ if (EH_SurfaceButtonClose_ContactDown != null)
+ {
+ close = true;
+ EH_SurfaceButtonClose_ContactDown(this, new EventArgs());
+ }
+ }
}
}
\ No newline at end of file
diff -r 192da585bee5 -r 9331c3dea175 src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs
--- a/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs Mon Oct 05 18:23:10 2009 +0200
+++ b/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs Mon Oct 05 18:29:32 2009 +0200
@@ -12,6 +12,8 @@
{
public partial class UserControlUserPanel
{
+ public int id = 0;
+
public UserControlUserPanel()
{
this.InitializeComponent();
diff -r 192da585bee5 -r 9331c3dea175 src/FingersDance/FingersDance.csproj
--- a/src/FingersDance/FingersDance.csproj Mon Oct 05 18:23:10 2009 +0200
+++ b/src/FingersDance/FingersDance.csproj Mon Oct 05 18:29:32 2009 +0200
@@ -134,8 +134,12 @@
Always
-
-
+
+ Always
+
+
+ Always
+
Always
@@ -155,6 +159,10 @@
{C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}
FingersDance.ActionFactory
+
+ {D579FDB5-D412-4797-A0FF-C5873AE08BB8}
+ FingersDance.Control.Close
+
{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}
FingersDance.Control.Menu
diff -r 192da585bee5 -r 9331c3dea175 src/FingersDance/MainSurfaceWindow.xaml.cs
--- a/src/FingersDance/MainSurfaceWindow.xaml.cs Mon Oct 05 18:23:10 2009 +0200
+++ b/src/FingersDance/MainSurfaceWindow.xaml.cs Mon Oct 05 18:29:32 2009 +0200
@@ -17,6 +17,7 @@
using FingersDance.Control.UserPanel;
using FingersDance.Control.Screen;
+using FingersDance.Control.Close;
namespace FingersDance
@@ -242,6 +243,13 @@
Screen.UC_Screen_NewSession += new System.EventHandler(this.SessionInput_EH_SurfaceButtonSubmit_ContactDown);
}
+ else //Affichage du message de confirmation
+ {
+ UserControlClose UCclose = new UserControlClose(1);
+ UCclose.Name = "CloseAlert1";
+ Grid1.Children.Add(UCclose);
+ UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+ }
break;
case 2:
if (Panel2 == null)
@@ -255,6 +263,13 @@
Screen.UC_Screen_NewSession += new System.EventHandler(this.SessionInput_EH_SurfaceButtonSubmit_ContactDown);
}
+ else //Affichage du message de confirmation
+ {
+ UserControlClose UCclose = new UserControlClose(2);
+ UCclose.Name = "CloseAlert2";
+ Grid2.Children.Add(UCclose);
+ UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+ }
break;
case 3:
if (Panel3 == null)
@@ -268,6 +283,13 @@
Screen.UC_Screen_NewSession += new System.EventHandler(this.SessionInput_EH_SurfaceButtonSubmit_ContactDown);
}
+ else //Affichage du message de confirmation
+ {
+ UserControlClose UCclose = new UserControlClose(3);
+ UCclose.Name = "CloseAlert3";
+ Grid3.Children.Add(UCclose);
+ UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+ }
break;
case 4:
if (Panel4 == null)
@@ -281,6 +303,13 @@
Screen.UC_Screen_NewSession += new System.EventHandler(this.SessionInput_EH_SurfaceButtonSubmit_ContactDown);
}
+ else //Affichage du message de confirmation
+ {
+ UserControlClose UCclose = new UserControlClose(4);
+ UCclose.Name = "CloseAlert4";
+ Grid4.Children.Add(UCclose);
+ UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+ }
break;
}
@@ -326,7 +355,30 @@
catch (Exception ex) { }
}
-
+ //Actions du boutton Alert selon l'action close OK ou NON
+ private void CloseAlert_EH_SurfaceButton_ContactDown(object sender, EventArgs e)
+ {
+ Grid root = (Grid)(((UserControlClose)sender).Parent);
+ if(((UserControlClose) sender).close)
+ {
+ switch(((UserControlClose)sender).Id)
+ {
+ case 1:
+ root.Children.Remove(Panel1);
+ break;
+ case 2:
+ root.Children.Remove(Panel2);
+ break;
+ case 3:
+ root.Children.Remove(Panel3);
+ break;
+ case 4:
+ root.Children.Remove(Panel4);
+ break;
+ }
+ }
+ root.Children.Remove(((UserControlClose)sender));
+ }
}
}
\ No newline at end of file
diff -r 192da585bee5 -r 9331c3dea175 src/FingersDance/Resources/videos.xml
--- a/src/FingersDance/Resources/videos.xml Mon Oct 05 18:23:10 2009 +0200
+++ b/src/FingersDance/Resources/videos.xml Mon Oct 05 18:29:32 2009 +0200
@@ -2,17 +2,17 @@
Butterfly
- C:\Users\Public\Public Dev\fingersdance\src\FingersDance\Resources\Butterfly.wmv
- C:\Users\Public\Public Dev\fingersdance\src\FingersDance\Resources\Butterfly.jpg
+ C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\Butterfly.wmv
+ C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\Butterfly.jpg
Lake
- C:\Users\Public\Public Dev\fingersdance\src\FingersDance\Resources\Lake.wmv
- C:\Users\Public\Public Dev\fingersdance\src\FingersDance\Resources\Lake.jpg
+ C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\Lake.wmv
+ C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\Lake.jpg
One Flat Thing
- C:\Users\Public\Public Dev\fingersdance\src\FingersDance\Resources\oneflat.wmv
- C:\Users\Public\Public Dev\fingersdance\src\FingersDance\Resources\oneflat.png
+ C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\oneflat.wmv
+ C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\oneflat.png
\ No newline at end of file