[chronojump] Deleted Statusbar
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Deleted Statusbar
- Date: Tue, 5 Apr 2011 14:03:43 +0000 (UTC)
commit f87a8b8ed41b12752f22bcaa004004798437ab37
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Apr 2 01:29:58 2011 +0200
Deleted Statusbar
glade/chronojump.glade | 7 +----
src/execute/event.cs | 2 +-
src/execute/jump.cs | 24 ++++++++--------
src/execute/multiChronopic.cs | 27 +++---------------
src/execute/pulse.cs | 12 ++++----
src/execute/reactionTime.cs | 12 ++++----
src/execute/run.cs | 22 +++++++-------
src/exportSession.cs | 18 +++++-------
src/gui/chronojump.cs | 59 ++++++++++++++---------------------------
src/gui/stats.cs | 4 +-
10 files changed, 71 insertions(+), 116 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index e1d6c3e..6e20999 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -22687,12 +22687,7 @@ Evaluator can use real name or nickname.</property>
<widget class="GtkHBox" id="hbox27">
<property name="visible">True</property>
<child>
- <widget class="GtkStatusbar" id="appbar2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
+ <placeholder/>
</child>
<child>
<widget class="GtkCheckButton" id="checkbutton_volume">
diff --git a/src/execute/event.cs b/src/execute/event.cs
index 898eb0b..018ab55 100644
--- a/src/execute/event.cs
+++ b/src/execute/event.cs
@@ -105,7 +105,7 @@ public class EventExecute
protected States loggedState; //log of last state
//protected Gtk.ProgressBar progressBar;
- protected Gtk.Statusbar appbar;
+ protected Gtk.TextView event_execute_textview_message;
protected Gtk.Window app;
protected int pDN;
diff --git a/src/execute/jump.cs b/src/execute/jump.cs
index 72869dc..79ef982 100644
--- a/src/execute/jump.cs
+++ b/src/execute/jump.cs
@@ -49,7 +49,7 @@ public class JumpExecute : EventExecute
//jump execution
public JumpExecute(int personID, string personName, int sessionID, string type, double fall, double weight,
- Chronopic cp, Gtk.Statusbar appbar, Gtk.Window app, int pDN, bool volumeOn,
+ Chronopic cp, Gtk.TextView event_execute_textview_message, Gtk.Window app, int pDN, bool volumeOn,
double progressbarLimit, ExecutingGraphData egd
)
{
@@ -61,7 +61,7 @@ public class JumpExecute : EventExecute
this.weight = weight;
this.cp = cp;
- this.appbar = appbar;
+ this.event_execute_textview_message = event_execute_textview_message;
this.app = app;
this.pDN = pDN;
@@ -125,7 +125,7 @@ public class JumpExecute : EventExecute
if (platformState==Chronopic.Plataforma.ON) {
- appbar.Push( 1,Catalog.GetString("You are IN, JUMP when prepared!!") );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Catalog.GetString("You are IN, JUMP when prepared!!") );
Util.PlaySound(Constants.SoundTypes.CAN_START, volumeOn);
loggedState = States.ON;
@@ -175,7 +175,7 @@ public class JumpExecute : EventExecute
if (platformState==Chronopic.Plataforma.OFF) {
- appbar.Push( 1,Catalog.GetString("You are OUT, JUMP when prepared!!") );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Catalog.GetString("You are OUT, JUMP when prepared!!") );
Util.PlaySound(Constants.SoundTypes.CAN_START, volumeOn);
loggedState = States.OFF;
@@ -389,9 +389,9 @@ Log.Write("wb ");
myStringPush = myStringPush + "(" + weight.ToString() + "%)";
}
if(simulated)
- appbar.Push(1, Constants.SimulatedMessage);
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Constants.SimulatedMessage);
else
- appbar.Push( 1,myStringPush );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(myStringPush );
uniqueID = SqliteJump.Insert(false, Constants.JumpTable, "NULL", personID, sessionID,
type, tv, tc, fall, //type, tv, tc, fall
@@ -469,7 +469,7 @@ public class JumpRjExecute : JumpExecute
public JumpRjExecute(int personID, string personName,
int sessionID, string type, double fall, double weight,
double limitAsDouble, bool jumpsLimited,
- Chronopic cp, Gtk.Statusbar appbar, Gtk.Window app, int pDN, bool allowFinishAfterTime,
+ Chronopic cp, Gtk.TextView event_execute_textview_message, Gtk.Window app, int pDN, bool allowFinishAfterTime,
bool volumeOn, RepetitiveConditionsWindow repetitiveConditionsWin,
double progressbarLimit, ExecutingGraphData egd
)
@@ -490,7 +490,7 @@ public class JumpRjExecute : JumpExecute
}
this.cp = cp;
- this.appbar = appbar;
+ this.event_execute_textview_message = event_execute_textview_message;
this.app = app;
this.pDN = pDN;
@@ -544,11 +544,11 @@ public class JumpRjExecute : JumpExecute
bool success = false;
if (platformState==Chronopic.Plataforma.OFF && hasFall ) {
- appbar.Push( 1,Catalog.GetString("You are OUT, JUMP when prepared!!") );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Catalog.GetString("You are OUT, JUMP when prepared!!") );
Util.PlaySound(Constants.SoundTypes.CAN_START, volumeOn);
success = true;
} else if (platformState==Chronopic.Plataforma.ON && ! hasFall ) {
- appbar.Push( 1,Catalog.GetString("You are IN, JUMP when prepared!!") );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Catalog.GetString("You are IN, JUMP when prepared!!") );
Util.PlaySound(Constants.SoundTypes.CAN_START, volumeOn);
success = true;
} else {
@@ -989,9 +989,9 @@ public class JumpRjExecute : JumpExecute
" " + Catalog.GetString("AVG TF") + ": " + Util.TrimDecimals( Util.GetAverage (tvString).ToString(), pDN ) +
" " + Catalog.GetString("AVG TC") + ": " + Util.TrimDecimals( Util.GetAverage (tcString).ToString(), pDN ) ;
if(simulated)
- appbar.Push(1, Constants.SimulatedMessage);
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Constants.SimulatedMessage);
else
- appbar.Push(1, myStringPush );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(myStringPush );
//event will be raised, and managed in chronojump.cs
diff --git a/src/execute/multiChronopic.cs b/src/execute/multiChronopic.cs
index c11fe1e..e310f86 100644
--- a/src/execute/multiChronopic.cs
+++ b/src/execute/multiChronopic.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2009 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
*/
using System;
@@ -76,7 +76,7 @@ public class MultiChronopicExecute : EventExecute
//execution
public MultiChronopicExecute(int personID, string personName, int sessionID, string type,
- Chronopic cp, bool syncFirst, bool deleteFirst, string vars, Gtk.Statusbar appbar, Gtk.Window app,
+ Chronopic cp, bool syncFirst, bool deleteFirst, string vars, Gtk.Window app,
//double progressbarLimit,
ExecutingGraphData egd
) {
@@ -90,7 +90,6 @@ public class MultiChronopicExecute : EventExecute
this.deleteFirst = deleteFirst;
this.vars = vars;
- this.appbar = appbar;
this.app = app;
// this.progressbarLimit = progressbarLimit;
this.egd = egd;
@@ -100,7 +99,7 @@ public class MultiChronopicExecute : EventExecute
}
public MultiChronopicExecute(int personID, string personName, int sessionID, string type,
- Chronopic cp, Chronopic cp2, bool syncFirst, bool deleteFirst, string vars, Gtk.Statusbar appbar, Gtk.Window app,
+ Chronopic cp, Chronopic cp2, bool syncFirst, bool deleteFirst, string vars, Gtk.Window app,
//double progressbarLimit,
ExecutingGraphData egd
) {
@@ -115,7 +114,6 @@ public class MultiChronopicExecute : EventExecute
this.deleteFirst = deleteFirst;
this.vars = vars;
- this.appbar = appbar;
this.app = app;
// this.progressbarLimit = progressbarLimit;
this.egd = egd;
@@ -126,7 +124,7 @@ public class MultiChronopicExecute : EventExecute
public MultiChronopicExecute(int personID, string personName, int sessionID, string type,
Chronopic cp, Chronopic cp2, Chronopic cp3, bool syncFirst, bool deleteFirst, string vars,
- Gtk.Statusbar appbar, Gtk.Window app,
+ Gtk.Window app,
//double progressbarLimit,
ExecutingGraphData egd
) {
@@ -142,7 +140,6 @@ public class MultiChronopicExecute : EventExecute
this.deleteFirst = deleteFirst;
this.vars = vars;
- this.appbar = appbar;
this.app = app;
// this.progressbarLimit = progressbarLimit;
this.egd = egd;
@@ -153,7 +150,7 @@ public class MultiChronopicExecute : EventExecute
public MultiChronopicExecute(int personID, string personName, int sessionID, string type,
Chronopic cp, Chronopic cp2, Chronopic cp3, Chronopic cp4, bool syncFirst, bool deleteFirst, string vars,
- Gtk.Statusbar appbar, Gtk.Window app,
+ Gtk.Window app,
//double progressbarLimit,
ExecutingGraphData egd
) {
@@ -170,7 +167,6 @@ public class MultiChronopicExecute : EventExecute
this.deleteFirst = deleteFirst;
this.vars = vars;
- this.appbar = appbar;
this.app = app;
// this.progressbarLimit = progressbarLimit;
this.egd = egd;
@@ -614,20 +610,7 @@ public class MultiChronopicExecute : EventExecute
cp3InStr, cp3OutStr, cp4InStr, cp4OutStr,
vars, //distance
description, Util.BoolToNegativeInt(simulated));
-
-
- /* //TODO
- string myStringPush =
- //Catalog.GetString("Last jump: ") +
- personName + " " +
- type + " (" + limitString + ") " +
- " " + Catalog.GetString("AVG TF") + ": " + Util.TrimDecimals( Util.GetAverage (tvString).ToString(), pDN ) +
- " " + Catalog.GetString("AVG TC") + ": " + Util.TrimDecimals( Util.GetAverage (tcString).ToString(), pDN ) ;
- appbar.Push( 1,myStringPush );
- */
}
-
-
}
diff --git a/src/execute/pulse.cs b/src/execute/pulse.cs
index b86a51a..8ba0a2b 100644
--- a/src/execute/pulse.cs
+++ b/src/execute/pulse.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2009 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
*/
using System;
@@ -54,7 +54,7 @@ public class PulseExecute : EventExecute
//execution
public PulseExecute(int personID, string personName, int sessionID, string type, double fixedPulse, int totalPulsesNum,
- Chronopic cp, Gtk.Statusbar appbar, Gtk.Window app, int pDN, bool volumeOn,
+ Chronopic cp, Gtk.TextView event_execute_textview_message, Gtk.Window app, int pDN, bool volumeOn,
//double progressbarLimit,
ExecutingGraphData egd
)
@@ -68,7 +68,7 @@ public class PulseExecute : EventExecute
this.cp = cp;
- this.appbar = appbar;
+ this.event_execute_textview_message = event_execute_textview_message;
this.app = app;
this.pDN = pDN;
@@ -137,7 +137,7 @@ public class PulseExecute : EventExecute
//if confirmWin.Button_cancel is pressed retuen
confirmWin.Button_cancel.Clicked += new EventHandler(cancel_event_before_start);
} else if (platformState==Chronopic.Plataforma.OFF) {
- appbar.Push( 1, Catalog.GetString("You are OUT, start when prepared!!") );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Catalog.GetString("You are OUT, start when prepared!!") );
Util.PlaySound(Constants.SoundTypes.CAN_START, volumeOn);
loggedState = States.OFF;
@@ -346,9 +346,9 @@ public class PulseExecute : EventExecute
string myStringPush = Catalog.GetString("Last pulse") + ": " + personName + " " + type ;
if(simulated)
- appbar.Push(1, Constants.SimulatedMessage);
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Constants.SimulatedMessage);
else
- appbar.Push( 1, myStringPush );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(myStringPush );
//event will be raised, and managed in chronojump.cs
diff --git a/src/execute/reactionTime.cs b/src/execute/reactionTime.cs
index 840fd65..5b7683d 100644
--- a/src/execute/reactionTime.cs
+++ b/src/execute/reactionTime.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2009 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
*/
using System;
@@ -41,7 +41,7 @@ public class ReactionTimeExecute : EventExecute
//reactionTime execution
public ReactionTimeExecute(int personID, string personName, int sessionID,
- Chronopic cp, Gtk.Statusbar appbar, Gtk.Window app, int pDN, bool volumeOn,
+ Chronopic cp, Gtk.TextView event_execute_textview_message, Gtk.Window app, int pDN, bool volumeOn,
double progressbarLimit, ExecutingGraphData egd
)
{
@@ -50,7 +50,7 @@ public class ReactionTimeExecute : EventExecute
this.sessionID = sessionID;
this.cp = cp;
- this.appbar = appbar;
+ this.event_execute_textview_message = event_execute_textview_message;
this.app = app;
this.pDN = pDN;
@@ -102,7 +102,7 @@ public class ReactionTimeExecute : EventExecute
if (platformState==Chronopic.Plataforma.ON) {
- appbar.Push( 1,Catalog.GetString("You are IN, RELEASE when prepared!!") );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Catalog.GetString("You are IN, RELEASE when prepared!!") );
Util.PlaySound(Constants.SoundTypes.CAN_START, volumeOn);
@@ -246,9 +246,9 @@ Log.Write("wb ");
type + " " + Catalog.GetString("Time") + ": " + Util.TrimDecimals( time.ToString(), pDN ) ;
if(simulated)
- appbar.Push(1, Constants.SimulatedMessage);
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Constants.SimulatedMessage);
else
- appbar.Push( 1,myStringPush );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(myStringPush );
uniqueID = SqliteReactionTime.Insert(
false, Constants.ReactionTimeTable,
diff --git a/src/execute/run.cs b/src/execute/run.cs
index 103189b..b3c6cda 100644
--- a/src/execute/run.cs
+++ b/src/execute/run.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2009 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
*/
using System;
@@ -49,7 +49,7 @@ public class RunExecute : EventExecute
//run execution
public RunExecute(int personID, int sessionID, string type, double distance,
- Chronopic cp, Gtk.Statusbar appbar, Gtk.Window app, int pDN, bool metersSecondsPreferred, bool volumeOn,
+ Chronopic cp, Gtk.TextView event_execute_textview_message, Gtk.Window app, int pDN, bool metersSecondsPreferred, bool volumeOn,
double progressbarLimit, ExecutingGraphData egd
)
{
@@ -59,7 +59,7 @@ public class RunExecute : EventExecute
this.distance = distance;
this.cp = cp;
- this.appbar = appbar;
+ this.event_execute_textview_message = event_execute_textview_message;
this.app = app;
this.pDN = pDN;
@@ -114,14 +114,14 @@ Log.WriteLine("MANAGE(b)!!!!");
//you can start ON or OFF the platform,
//we record always de TF (or time between we abandonate the platform since we arrive)
if (platformState==Chronopic.Plataforma.ON) {
- appbar.Push( 1,Catalog.GetString("You are IN, RUN when prepared!!") );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Catalog.GetString("You are IN, RUN when prepared!!") );
Util.PlaySound(Constants.SoundTypes.CAN_START, volumeOn);
loggedState = States.ON;
startIn = true;
runPhase = runPhases.PLATFORM_INI;
} else if (platformState==Chronopic.Plataforma.OFF) {
- appbar.Push( 1,Catalog.GetString("You are OUT, RUN when prepared!!") );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Catalog.GetString("You are OUT, RUN when prepared!!") );
Util.PlaySound(Constants.SoundTypes.CAN_START, volumeOn);
loggedState = States.OFF;
@@ -301,9 +301,9 @@ Log.WriteLine("MANAGE(3)!!!!");
type + " " + Catalog.GetString("time") + ": " + Util.TrimDecimals( time.ToString(), pDN ) +
" " + Catalog.GetString("speed") + ": " + Util.TrimDecimals ( (distance/time).ToString(), pDN );
if(simulated)
- appbar.Push(1, Constants.SimulatedMessage);
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Constants.SimulatedMessage);
else
- appbar.Push( 1,myStringPush );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(myStringPush );
string description = "";
@@ -370,7 +370,7 @@ public class RunIntervalExecute : RunExecute
//run execution
public RunIntervalExecute(int personID, int sessionID, string type, double distanceInterval, double limitAsDouble, bool tracksLimited,
- Chronopic cp, Gtk.Statusbar appbar, Gtk.Window app, int pDN, bool metersSecondsPreferred,
+ Chronopic cp, Gtk.TextView event_execute_textview_message, Gtk.Window app, int pDN, bool metersSecondsPreferred,
bool volumeOn, RepetitiveConditionsWindow repetitiveConditionsWin,
double progressbarLimit, ExecutingGraphData egd
)
@@ -398,7 +398,7 @@ public class RunIntervalExecute : RunExecute
this.cp = cp;
- this.appbar = appbar;
+ this.event_execute_textview_message = event_execute_textview_message;
this.app = app;
this.metersSecondsPreferred = metersSecondsPreferred;
@@ -819,9 +819,9 @@ public class RunIntervalExecute : RunExecute
timeTotal.ToString(), metersSecondsPreferred )
, pDN ) ;
if(simulated)
- appbar.Push(1, Constants.SimulatedMessage);
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(Constants.SimulatedMessage);
else
- appbar.Push( 1,myStringPush );
+ event_execute_textview_message.Buffer = UtilGtk.TextViewPrint(myStringPush );
//event will be raised, and managed in chronojump.cs
diff --git a/src/exportSession.cs b/src/exportSession.cs
index 4422182..7f8a566 100644
--- a/src/exportSession.cs
+++ b/src/exportSession.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2009 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
*/
using System;
@@ -39,7 +39,6 @@ public class ExportSession
protected Session mySession;
protected TextWriter writer;
protected static Gtk.Window app1;
- protected static Gtk.Statusbar myAppbar;
protected string fileName;
protected int prefsDigitsNumber;
@@ -51,12 +50,10 @@ public class ExportSession
public ExportSession() {
}
- //public ExportSession(Session mySession, Gtk.Window app1, Gnome.AppBar mainAppbar)
- public ExportSession(Session mySession, Gtk.Window app1, Gtk.Statusbar mainAppbar, int prefsDigitsNumber)
+ public ExportSession(Session mySession, Gtk.Window app1, int prefsDigitsNumber)
{
this.mySession = mySession;
this.prefsDigitsNumber = prefsDigitsNumber;
- myAppbar = mainAppbar;
spreadsheetString = "";
@@ -117,7 +114,7 @@ public class ExportSession
Log.WriteLine("cancelled");
//report does not currently send the appBar reference
if(formatFile != "report") {
- myAppbar.Push ( 1, Catalog.GetString ("Cancelled") );
+ new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Cancelled."));
}
fc.Hide ();
return ;
@@ -847,11 +844,10 @@ public class ExportSession
public class ExportSessionCSV : ExportSession
{
- public ExportSessionCSV(Session mySession, Gtk.Window app1, Gtk.Statusbar mainAppbar, int prefsDigitsNumber)
+ public ExportSessionCSV(Session mySession, Gtk.Window app1, int prefsDigitsNumber)
{
this.mySession = mySession;
this.prefsDigitsNumber = prefsDigitsNumber;
- myAppbar = mainAppbar;
spreadsheetString = "\n\n" + Catalog.GetString("When import from your spreadsheet (OpenOffice, R, MS Excel, ...)\nremember the separator character is semicolon: <b>;</b>");
@@ -887,7 +883,8 @@ public class ExportSessionCSV : ExportSession
protected override void printFooter()
{
Log.WriteLine( "Correctly exported" );
- myAppbar.Push ( 1, Catalog.GetString ("Exported to file: ") + fileName );
+ string myString = Catalog.GetString ("Exported to file: ") + fileName;
+ new DialogMessage(Constants.MessageTypes.INFO, myString);
}
~ExportSessionCSV() {}
@@ -897,13 +894,12 @@ public class ExportSessionXML : ExportSession
{
private XmlTextWriter xr;
- public ExportSessionXML(Session mySession, Gtk.Window app1, Gtk.Statusbar mainAppbar, int prefsDigitsNumber)
+ public ExportSessionXML(Session mySession, Gtk.Window app1, int prefsDigitsNumber)
//public ExportXML(Session mySession, Gtk.Window app1)
{
this.mySession = mySession;
this.prefsDigitsNumber = prefsDigitsNumber;
//this.app1 = app1;
- myAppbar = mainAppbar;
//xr = new XmlTextWriter(fileExport, null);
//xr.Formatting = Formatting.Indented;
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 86e95d0..11c9e91 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -64,7 +64,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_persons_open_1;
[Widget] Gtk.Image image_persons_open_plus;
- [Widget] Gtk.Statusbar appbar2;
[Widget] Gtk.TreeView treeview_persons;
[Widget] Gtk.TreeView treeview_jumps;
[Widget] Gtk.TreeView treeview_jumps_rj;
@@ -460,11 +459,6 @@ public partial class ChronoJumpWindow
sensitiveGuiNoSession();
definedSession = false;
- //if(recuperatedString == "")
- appbar2.Push ( 1, Catalog.GetString ("Ready.") );
- //else
- // appbar2.Push ( 1, recuperatedString );
-
rand = new Random(40);
putNonStandardIcons();
@@ -1032,7 +1026,7 @@ public partial class ChronoJumpWindow
else
evalMessage = Catalog.GetString("Please, first check evaluator data is ok.");
- appbar2.Push ( 1, evalMessage );
+// appbar2.Push ( 1, evalMessage );
server_evaluator_data_and_after_upload_session();
}
@@ -1089,7 +1083,7 @@ public partial class ChronoJumpWindow
//called when after that has to continue with upload session
private void server_evaluator_data_and_after_upload_session() {
- appbar2.Push ( 1, "" );
+// appbar2.Push ( 1, "" );
uploadSessionAfter = true;
server_evaluator_data ();
}
@@ -2137,10 +2131,7 @@ public partial class ChronoJumpWindow
//feedback (more in 1st session created)
string feedbackLoadUsers = Catalog.GetString ("Session created, now add or load persons.");
- if(currentSession.UniqueID == 1)
- new DialogMessage(Constants.MessageTypes.INFO, feedbackLoadUsers);
- else
- appbar2.Push ( 1, feedbackLoadUsers);
+ new DialogMessage(Constants.MessageTypes.INFO, feedbackLoadUsers);
}
}
@@ -2214,7 +2205,7 @@ public partial class ChronoJumpWindow
private void on_delete_session_accepted (object o, EventArgs args)
{
- appbar2.Push( 1, Catalog.GetString("Deleted session and all its tests") );
+ new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Deleted session and all its tests."));
SqliteSession.DeleteAllStuff(currentSession.UniqueID.ToString());
sensitiveGuiNoSession();
@@ -2225,9 +2216,9 @@ public partial class ChronoJumpWindow
private void on_export_session_activate(object o, EventArgs args) {
if (o == (object) menuitem_export_csv) {
- new ExportSessionCSV(currentSession, app1, appbar2, prefsDigitsNumber);
+ new ExportSessionCSV(currentSession, app1, prefsDigitsNumber);
} else if (o == (object) menuitem_export_xml) {
- new ExportSessionXML(currentSession, app1, appbar2, prefsDigitsNumber);
+ new ExportSessionXML(currentSession, app1, prefsDigitsNumber);
} else {
Log.WriteLine("Error exporting");
}
@@ -2319,7 +2310,7 @@ public partial class ChronoJumpWindow
treeview_persons_store,
rowToSelect);
sensitiveGuiYesPerson();
- appbar2.Push( 1, Catalog.GetString("Successfully added") + " " + currentPerson.Name );
+ //appbar2.Push( 1, Catalog.GetString("Successfully added") + " " + currentPerson.Name );
}
}
}
@@ -2359,7 +2350,7 @@ public partial class ChronoJumpWindow
"Successfully added {0} persons.",
personAddMultipleWin.PersonsCreatedCount),
personAddMultipleWin.PersonsCreatedCount);
- appbar2.Push( 1, Catalog.GetString(myString) );
+ //appbar2.Push( 1, Catalog.GetString(myString) );
}
}
}
@@ -2413,7 +2404,7 @@ public partial class ChronoJumpWindow
private void on_delete_current_person_from_session_clicked (object o, EventArgs args) {
Log.WriteLine("delete current person from this session");
ConfirmWindow confirmWin = ConfirmWindow.Show(
- Catalog.GetString("Are you sure you want to delete the current person and all his/her tests (jumps, runs, pulses, ...) from this session?\n(His/her personal data and tests in other sessions will remain intact)"), "",
+ Catalog.GetString("Are you sure you want to delete the current person and all his/her tests (jumps, runs, pulses, ...) from this session?\n(His/her personal data and tests in other sessions will remain intact.)"), "",
Catalog.GetString("Current Person: ") + currentPerson.Name);
confirmWin.Button_accept.Clicked += new EventHandler(on_delete_current_person_from_session_accepted);
@@ -2421,7 +2412,7 @@ public partial class ChronoJumpWindow
private void on_delete_current_person_from_session_accepted (object o, EventArgs args)
{
- appbar2.Push( 1, Catalog.GetString("Deleted person and all his/her tests on this session") );
+ new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Deleted person and all his/her tests on this session."));
SqlitePersonSession.DeletePersonFromSessionAndTests(
currentSession.UniqueID.ToString(), currentPerson.UniqueID.ToString());
@@ -3132,7 +3123,7 @@ Console.WriteLine("X");
//currentEventExecute = new JumpExecute(eventExecuteWin, currentPerson.UniqueID, currentPerson.Name,
currentEventExecute = new JumpExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentJumpType.Name, myFall, jumpWeight,
- chronopicWin.CP, appbar2, app1, prefsDigitsNumber, volumeOn,
+ chronopicWin.CP, event_execute_textview_message, app1, prefsDigitsNumber, volumeOn,
progressbarLimit, egd);
if (!chronopicWin.Connected)
@@ -3270,7 +3261,7 @@ Console.WriteLine("X");
currentEventExecute = new JumpRjExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentJumpRjType.Name, myFall, jumpWeight,
progressbarLimit, currentJumpRjType.JumpsLimited,
- chronopicWin.CP, appbar2, app1, prefsDigitsNumber, allowFinishRjAfterTime, volumeOn, repetitiveConditionsWin, progressbarLimit, egd);
+ chronopicWin.CP, event_execute_textview_message, app1, prefsDigitsNumber, allowFinishRjAfterTime, volumeOn, repetitiveConditionsWin, progressbarLimit, egd);
//suitable for limited by jump and time
@@ -3440,7 +3431,7 @@ Console.WriteLine("X");
//currentEventExecute = new RunExecute(eventExecuteWin, currentPerson.UniqueID, currentSession.UniqueID,
currentEventExecute = new RunExecute(currentPerson.UniqueID, currentSession.UniqueID,
currentRunType.Name, myDistance,
- chronopicWin.CP, appbar2, app1, prefsDigitsNumber, metersSecondsPreferred, volumeOn,
+ chronopicWin.CP, event_execute_textview_message, app1, prefsDigitsNumber, metersSecondsPreferred, volumeOn,
progressbarLimit, egd);
if (!chronopicWin.Connected)
@@ -3597,7 +3588,7 @@ Console.WriteLine("X");
//currentEventExecute = new RunIntervalExecute(eventExecuteWin, currentPerson.UniqueID, currentSession.UniqueID, currentRunIntervalType.Name,
currentEventExecute = new RunIntervalExecute(currentPerson.UniqueID, currentSession.UniqueID, currentRunIntervalType.Name,
distanceInterval, progressbarLimit, currentRunIntervalType.TracksLimited,
- chronopicWin.CP, appbar2, app1, prefsDigitsNumber, metersSecondsPreferred, volumeOn, repetitiveConditionsWin,
+ chronopicWin.CP, event_execute_textview_message, app1, prefsDigitsNumber, metersSecondsPreferred, volumeOn, repetitiveConditionsWin,
progressbarLimit, egd);
@@ -3726,7 +3717,7 @@ Console.WriteLine("X");
currentEventExecute = new ReactionTimeExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID,
//currentJumpType.Name,
- chronopicWin.CP, appbar2, app1, prefsDigitsNumber, volumeOn,
+ chronopicWin.CP, event_execute_textview_message, app1, prefsDigitsNumber, volumeOn,
progressbarLimit, egd);
if (!chronopicWin.Connected)
@@ -3860,7 +3851,7 @@ Console.WriteLine("X");
//currentEventExecute = new PulseExecute(eventExecuteWin, currentPerson.UniqueID, currentPerson.Name,
currentEventExecute = new PulseExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentPulseType.Name, pulseStep, totalPulses,
- chronopicWin.CP, appbar2, app1, prefsDigitsNumber, volumeOn,
+ chronopicWin.CP, event_execute_textview_message, app1, prefsDigitsNumber, volumeOn,
//progressbarLimit,
egd);
@@ -4047,7 +4038,7 @@ Log.WriteLine("CCCCC");
chronopicWin.CP,
syncAvailable, extra_window_check_multichronopic_delete_first.Active,
extra_window_spin_run_analysis_distance.Value.ToString(),
- appbar2, app1,
+ app1,
//progressbarlimit,
egd);
else if(numConnected == 2)
@@ -4058,7 +4049,7 @@ Log.WriteLine("CCCCC");
chronopicWin.CP, chronopicWin.CP2,
syncAvailable, extra_window_check_multichronopic_delete_first.Active,
extra_window_spin_run_analysis_distance.Value.ToString(),
- appbar2, app1,
+ app1,
//progressbarlimit,
egd);
else if(numConnected == 3)
@@ -4069,7 +4060,7 @@ Log.WriteLine("CCCCC");
chronopicWin.CP, chronopicWin.CP2, chronopicWin.CP3,
syncAvailable, extra_window_check_multichronopic_delete_first.Active,
extra_window_spin_run_analysis_distance.Value.ToString(),
- appbar2, app1,
+ app1,
//progressbarlimit,
egd);
else if(numConnected == 4)
@@ -4080,7 +4071,7 @@ Log.WriteLine("CCCCC");
chronopicWin.CP, chronopicWin.CP2, chronopicWin.CP3, chronopicWin.CP4,
syncAvailable, extra_window_check_multichronopic_delete_first.Active,
extra_window_spin_run_analysis_distance.Value.ToString(),
- appbar2, app1,
+ app1,
//progressbarlimit,
egd);
@@ -4708,7 +4699,6 @@ Console.WriteLine("X");
SqliteJump.Delete( "jump", id.ToString() );
- appbar2.Push( 1, Catalog.GetString ( "Deleted jump" ));
myTreeViewJumps.DelEvent(id);
showHideActionEventButtons(false, "Jump");
@@ -4730,7 +4720,6 @@ Console.WriteLine("X");
SqliteJump.Delete("jumpRj", id.ToString());
- appbar2.Push( 1, Catalog.GetString ( "Deleted reactive jump" ));
myTreeViewJumpsRj.DelEvent(id);
showHideActionEventButtons(false, "JumpRj");
@@ -4783,8 +4772,6 @@ Console.WriteLine("X");
SqliteRun.Delete( "run", id.ToString() );
- appbar2.Push( 1, Catalog.GetString ( "Deleted selected run" ));
-
myTreeViewRuns.DelEvent(id);
showHideActionEventButtons(false, "Run");
@@ -4802,8 +4789,6 @@ Console.WriteLine("X");
SqliteRun.Delete( Constants.RunIntervalTable, id.ToString() );
- appbar2.Push( 1, Catalog.GetString ( "Deleted intervallic run" ));
-
myTreeViewRunsInterval.DelEvent(id);
showHideActionEventButtons(false, "RunInterval");
@@ -4839,7 +4824,6 @@ Console.WriteLine("X");
SqliteJump.Delete( "reactiontime", id.ToString() );
- appbar2.Push( 1, Catalog.GetString ( "Deleted reaction time" ) );
myTreeViewReactionTimes.DelEvent(id);
showHideActionEventButtons(false, "ReactionTime");
@@ -4877,7 +4861,6 @@ Console.WriteLine("X");
SqliteJump.Delete( "pulse", id.ToString() );
- appbar2.Push( 1, Catalog.GetString ( "Deleted pulse" ) );
myTreeViewPulses.DelEvent(id);
showHideActionEventButtons(false, "Pulse");
@@ -4913,8 +4896,6 @@ Console.WriteLine("X");
SqliteMultiChronopic.Delete( id.ToString() );
- appbar2.Push( 1, Catalog.GetString ( "Deleted multi chronopic" ));
-
myTreeViewMultiChronopic.DelEvent(id);
showHideActionEventButtons(false, Constants.MultiChronopicName);
diff --git a/src/gui/stats.cs b/src/gui/stats.cs
index b3a0af3..f42d27e 100644
--- a/src/gui/stats.cs
+++ b/src/gui/stats.cs
@@ -1004,7 +1004,7 @@ public partial class ChronoJumpWindow {
return;
//blank statusbar
- appbar2.Push( 1, "");
+ //appbar2.Push( 1, "");
string statisticType = UtilGtk.ComboGetActive(combo_stats_stat_type);
string statisticSubType = UtilGtk.ComboGetActive(combo_stats_stat_subtype);
@@ -1279,7 +1279,7 @@ public partial class ChronoJumpWindow {
myStatType.MarkedRows, fillGraphROptions());
- appbar2.Push( 1, Catalog.GetString("Successfully added") + " " + statisticType + "-" + statisticSubType + "-" + statisticApplyTo);
+ //appbar2.Push( 1, Catalog.GetString("Successfully added") + " " + statisticType + "-" + statisticSubType + "-" + statisticApplyTo);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]