[chronojump] Improvements on sensitivity on cancel finish contact events
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Improvements on sensitivity on cancel finish contact events
- Date: Mon, 16 Jun 2014 11:24:51 +0000 (UTC)
commit a7f894353c9038aa41c0f4d6cb93c5b3d3794bcf
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Jun 16 13:24:21 2014 +0200
Improvements on sensitivity on cancel finish contact events
glade/chronojump.glade | 173 +-----------------------------------------------
src/gui/chronojump.cs | 30 ++++++++-
src/gui/chronopic.cs | 3 +
3 files changed, 31 insertions(+), 175 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 968bb05..4da9d60 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -14628,176 +14628,6 @@ Evaluator can use real name or nickname.</property>
</widget>
</child>
</widget>
- <widget class="GtkWindow" id="chronopic_connection">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">10</property>
- <property name="title" translatable="yes">Connecting with Chronopic</property>
- <property name="modal">True</property>
- <property name="window_position">center-on-parent</property>
- <signal name="delete_event" handler="on_delete_event" swapped="no"/>
- <child>
- <widget class="GtkVBox" id="vbox109">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkHBox" id="hbox238">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label_title">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Please touch the platform or click Chronopic
<i>TEST</i> button</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkProgressBar" id="progressbar1">
- <property name="width_request">150</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pulse_step">0.10000000149</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_feedback">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_help">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Help with Chronopic port</property>
- <signal name="clicked" handler="on_button_help_clicked" swapped="no"/>
- <child>
- <widget class="GtkAlignment" id="alignment111">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox270">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image3130">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-help</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label512">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Port Help</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox38">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton" id="button_cancel">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">4</property>
- <property name="position">4</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
<widget class="GtkWindow" id="chronopic_window">
<property name="can_focus">False</property>
<property name="border_width">10</property>
@@ -15369,7 +15199,6 @@ Evaluator can use real name or nickname.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Please touch the platform
or click Chronopic <i>TEST</i> button</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</widget>
@@ -15381,7 +15210,7 @@ Evaluator can use real name or nickname.</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 364f147..88d31b8 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -3725,6 +3725,8 @@ Log.WriteLine("DDD 1");
showUpdateStatsAndHideData(true);
}
+ lastJumpIsSimple = true;
+
//unhide buttons for delete last jump
if(! execute_auto_doing)
sensitiveGuiYesEvent();
@@ -3733,9 +3735,10 @@ Log.WriteLine("DDD 1");
Log.WriteLine("DISCONNECTED gui/cj");
createChronopicWindow(true);
}
-
- lastJumpIsSimple = true;
+ if (currentEventExecute.Cancel)
+ sensitiveGuiEventDone();
+
//unhide buttons that allow jumping
if(execute_auto_doing) {
execute_auto_order_pos ++;
@@ -3751,6 +3754,9 @@ Log.WriteLine("DDD 2");
Log.WriteLine(" cantouch1 ");
sensitiveGuiEventDone();
Log.WriteLine(" cantouch3 ");
+
+ if ( ! currentEventExecute.Cancel )
+ event_execute_progressbar_time.Fraction = 1;
}
@@ -3907,6 +3913,9 @@ Log.WriteLine("DDD 2");
createChronopicWindow(true);
}
+ if (currentEventExecute.Cancel)
+ sensitiveGuiEventDone();
+
//delete the temp tables if exists
Sqlite.DeleteTempEvents("tempJumpRj");
}
@@ -4031,6 +4040,8 @@ Log.WriteLine("DDD 2");
showUpdateStatsAndHideData(true);
}
+ lastRunIsSimple = true;
+
//unhide buttons for delete last jump
sensitiveGuiYesEvent();
@@ -4042,7 +4053,8 @@ Log.WriteLine("DDD 2");
createChronopicWindow(true);
}
- lastRunIsSimple = true;
+ if (currentEventExecute.Cancel)
+ sensitiveGuiEventDone();
}
/* ---------------------------------------------------------
@@ -4185,6 +4197,9 @@ Log.WriteLine("DDD 2");
createChronopicWindow(true);
}
+ if (currentEventExecute.Cancel)
+ sensitiveGuiEventDone();
+
//delete the temp tables if exists
Sqlite.DeleteTempEvents("tempRunInterval");
}
@@ -4280,6 +4295,10 @@ Log.WriteLine("DDD 2");
Log.WriteLine("DISCONNECTED gui/cj");
createChronopicWindow(true);
}
+
+ if (currentEventExecute.Cancel)
+ sensitiveGuiEventDone();
+
}
@@ -4405,6 +4424,9 @@ Log.WriteLine("DDD 2");
Log.WriteLine("DISCONNECTED gui/cj");
createChronopicWindow(true);
}
+
+ if (currentEventExecute.Cancel)
+ sensitiveGuiEventDone();
}
/* ---------------------------------------------------------
@@ -4672,6 +4694,8 @@ Console.WriteLine("X");
Log.WriteLine("DISCONNECTED gui/cj");
createChronopicWindow(true);
}
+ if (currentEventExecute.Cancel)
+ sensitiveGuiEventDone();
}
diff --git a/src/gui/chronopic.cs b/src/gui/chronopic.cs
index d07adc6..8b090fc 100644
--- a/src/gui/chronopic.cs
+++ b/src/gui/chronopic.cs
@@ -683,6 +683,9 @@ Log.WriteLine("bbb");
void prepareChronopicConnection() {
frame_connection.Visible = true;
+ label_title.Text = Catalog.GetString("Please touch the platform or click Chronopic
<i>TEST</i> button");
+ label_title.UseMarkup = true;
+
button_cancel.Sensitive = true;
cancelledByUser = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
