commit 651507d251c2a6c512c14032a631294790e9de4d
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Oct 19 00:27:26 2016 +0200
Better chronopic contacts button (and multitest info)
glade/chronojump.glade | 126 +++++++++++++++++++++++++++++++-----------------
src/gui/chronojump.cs | 12 +++--
2 files changed, 89 insertions(+), 49 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 8f71428..9f6b766 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -4083,52 +4083,40 @@ Carles</property>
<property name="visible">True</property>
<property name="app_paintable">True</property>
<property name="can_focus">True</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkHBox" id="hbox91">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label_chronopics">
+ <widget class="GtkLabel"
id="label_chronopics_multitest">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="xpad">5</property>
- <property name="label"
translatable="yes">Chronopics</property>
- <property name="use_markup">True</property>
+ <property name="label">50</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_connected_chronopics">
+ <widget class="GtkButton"
id="button_activate_chronopics">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Connect Chronopics</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_chronopic_contacts_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox117">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">0</property>
- <property name="use_markup">True</property>
- <property name="ellipsize">end</property>
- <property name="max_width_chars">25</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_chronopics_multitest">
+ <widget class="GtkLabel" id="label250">
<property name="visible">True</property>
<property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="label"
translatable="yes">Chronopics</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -4137,23 +4125,19 @@ Carles</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_activate_chronopics">
- <property name="width_request">50</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Connect Chronopics</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_chronopic_contacts_clicked" swapped="no"/>
- <child>
<widget class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-connect</property>
<property name="icon-size">2</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -18395,6 +18379,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24234,6 +24221,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -25626,6 +25616,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -27510,6 +27503,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>
@@ -28451,6 +28447,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -42331,6 +42330,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>
@@ -45862,6 +45879,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -46898,9 +46927,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -48293,6 +48319,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>
@@ -53269,6 +53298,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -54325,6 +54357,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -55396,6 +55431,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 952a102..5542bda 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -3608,13 +3608,15 @@ public partial class ChronoJumpWindow
//TODO: this is debug info. Remove this for 1.6.3
if(changed == -1)
- label_chronopics_multitest.Text = "";
+ label_chronopics_multitest.Text = "??";
else if(changed == 50)
- label_chronopics_multitest.Text =
- "[" + Catalog.GetString("Jumps") + "]";
+ label_chronopics_multitest.Text = "50";
+ //"[" + Catalog.GetString("Jumps") + "]";
else if(changed == 10)
- label_chronopics_multitest.Text =
- "[" + Catalog.GetString("Runs") + "]";
+ label_chronopics_multitest.Text = "10";
+ //"[" + Catalog.GetString("Runs") + "]";
+
+ button_activate_chronopics.Show();
}
void on_button_execute_test_clicked (object o, EventArgs args)