[chronojump] Removed RDotNet test from GUI
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Removed RDotNet test from GUI
- Date: Thu, 15 Jan 2015 01:31:37 +0000 (UTC)
commit 753c52085fe2458cc66836bd14eef9f97062eec3
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Jan 15 02:31:21 2015 +0100
Removed RDotNet test from GUI
glade/chronojump.glade | 72 ++++++++++++++++++++++++++++++++++++++----------
src/gui/encoder.cs | 17 ++++++----
2 files changed, 67 insertions(+), 22 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 7b335bb..5a452a0 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -378,21 +378,6 @@
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menuitem_test_rdotnet">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Test RDotNet</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_menuitem_test_rdotnet_activate" swapped="no"/>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- </child>
- <child>
<widget class="GtkImageMenuItem" id="about1">
<property name="label" translatable="yes">_About</property>
<property name="visible">True</property>
@@ -6389,6 +6374,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7152,6 +7140,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -8167,6 +8158,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8823,6 +8817,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -19009,6 +19006,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -19573,6 +19573,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -20629,6 +20632,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -20742,6 +20748,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -29814,6 +29823,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -31758,6 +31785,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -32360,6 +32390,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -34928,6 +34961,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -35156,6 +35192,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -35399,6 +35438,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 95e7b49..a42bf45 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -305,13 +305,16 @@ public partial class ChronoJumpWindow
}
void on_menuitem_test_rdotnet_activate (object o, EventArgs args) {
- if(RInitialized == Constants.Status.UNSTARTED)
- rengine = UtilEncoder.RunEncoderCaptureCsharpInitializeR(rengine, out RInitialized);
+ if(useRDotNet) {
+ if(RInitialized == Constants.Status.UNSTARTED)
+ rengine = UtilEncoder.RunEncoderCaptureCsharpInitializeR(rengine, out
RInitialized);
- if(RInitialized == Constants.Status.OK)
- new DialogMessage(Constants.MessageTypes.INFO, "RDotNet OK");
- else
- new DialogMessage(Constants.MessageTypes.WARNING, "RDotNet does not work");
+ if(RInitialized == Constants.Status.OK)
+ new DialogMessage(Constants.MessageTypes.INFO, "RDotNet OK");
+ else
+ new DialogMessage(Constants.MessageTypes.WARNING, "RDotNet does not work");
+ } else
+ new DialogMessage(Constants.MessageTypes.INFO, "RDotNet is not being used anymore");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
