[chronojump] Fixed being able to change person on encoder/force sensor/run encoder load set since colorized
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed being able to change person on encoder/force sensor/run encoder load set since colorized
- Date: Thu, 1 Oct 2020 15:34:23 +0000 (UTC)
commit 0d0550eab0cec3388670e48f71714f28292e6e12
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Oct 1 17:32:49 2020 +0200
Fixed being able to change person on encoder/force sensor/run encoder load set since colorized
glade/generic_window.glade | 222 ++++++++++++++++++++++----------------------
src/gui/app1/encoder.cs | 5 +-
src/gui/app1/forceSensor.cs | 5 +-
src/gui/app1/runEncoder.cs | 5 +-
src/gui/genericWindow.cs | 3 +
5 files changed, 123 insertions(+), 117 deletions(-)
---
diff --git a/glade/generic_window.glade b/glade/generic_window.glade
index ec0b5787..5903fe7d 100644
--- a/glade/generic_window.glade
+++ b/glade/generic_window.glade
@@ -592,116 +592,6 @@
<property name="position">13</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="hbox_edit_row">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkHBox" id="hbox_combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="hbox_combo_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Comment</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_edit_row">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
- <signal name="changed" handler="on_entries_changed" swapped="no"/>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</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="GtkButton" id="hbox_combo_button_apply">
- <property name="label">gtk-apply</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="hbox_combo_button_cancel">
- <property name="label">Cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_hbox_combo_button_cancel_clicked"
swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">14</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -719,6 +609,116 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox_edit_row">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="hbox_combo_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_comment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Comment</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_edit_row">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ <signal name="changed" handler="on_entries_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</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="GtkButton" id="hbox_combo_button_apply">
+ <property name="label">gtk-apply</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="hbox_combo_button_cancel">
+ <property name="label">Cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_hbox_combo_button_cancel_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
<child>
<widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
@@ -830,7 +830,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 43a3113b..3c2be0a0 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -1661,8 +1661,9 @@ public partial class ChronoJumpWindow
foreach (Person p in personsPre)
persons[count++] = p.UniqueID.ToString() + ":" + p.Name;
genericWin.SetComboValues(persons, currentPerson.UniqueID + ":" + currentPerson.Name);
- genericWin.SetComboLabel(Catalog.GetString("Change the owner of selected set") +
- " (" + Catalog.GetString("code") + ":" + Catalog.GetString("name") + ")");
+ //genericWin.SetComboLabel(Catalog.GetString("Change the owner of selected set") +
+ // " (" + Catalog.GetString("code") + ":" + Catalog.GetString("name") + ")");
+ genericWin.SetComboLabel(Catalog.GetString("Change person"));
genericWin.ShowEditRow(false);
//select row corresponding to current signal
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index dec1e894..96943e0b 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -1702,8 +1702,9 @@ LogB.Information(" fs R ");
foreach (Person p in personsPre)
persons[count++] = p.UniqueID.ToString() + ":" + p.Name;
genericWin.SetComboValues(persons, currentPerson.UniqueID + ":" + currentPerson.Name);
- genericWin.SetComboLabel(Catalog.GetString("Change the owner of selected set") +
- " (" + Catalog.GetString("code") + ":" + Catalog.GetString("name") + ")");
+ //genericWin.SetComboLabel(Catalog.GetString("Change the owner of selected set") +
+ // " (" + Catalog.GetString("code") + ":" + Catalog.GetString("name") + ")");
+ genericWin.SetComboLabel(Catalog.GetString("Change person"));
genericWin.ShowEditRow(false);
//select row corresponding to current signal
diff --git a/src/gui/app1/runEncoder.cs b/src/gui/app1/runEncoder.cs
index 95178c6a..43ad2947 100644
--- a/src/gui/app1/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -692,8 +692,9 @@ public partial class ChronoJumpWindow
foreach (Person p in personsPre)
persons[count++] = p.UniqueID.ToString() + ":" + p.Name;
genericWin.SetComboValues(persons, currentPerson.UniqueID + ":" + currentPerson.Name);
- genericWin.SetComboLabel(Catalog.GetString("Change the owner of selected set") +
- " (" + Catalog.GetString("code") + ":" + Catalog.GetString("name") + ")");
+ //genericWin.SetComboLabel(Catalog.GetString("Change the owner of selected set") +
+ // " (" + Catalog.GetString("code") + ":" + Catalog.GetString("name") + ")");
+ genericWin.SetComboLabel(Catalog.GetString("Change person"));
genericWin.ShowEditRow(false);
//select row corresponding to current signal
diff --git a/src/gui/genericWindow.cs b/src/gui/genericWindow.cs
index b3622e8a..e2d0e45f 100644
--- a/src/gui/genericWindow.cs
+++ b/src/gui/genericWindow.cs
@@ -58,6 +58,7 @@ public class GenericWindow
//Edit row
[Widget] Gtk.Box hbox_edit_row;
[Widget] Gtk.Label hbox_combo_label;
+ [Widget] Gtk.Label label_comment;
[Widget] Gtk.Box hbox_combo;
[Widget] Gtk.ComboBox combo;
[Widget] Gtk.Button hbox_combo_button_apply;
@@ -138,6 +139,8 @@ public class GenericWindow
UtilGtk.WindowColor(generic_window, Config.ColorBackground);
UtilGtk.ContrastLabelsLabel (Config.ColorBackgroundIsDark, label_header);
UtilGtk.ContrastLabelsLabel (Config.ColorBackgroundIsDark, label_error);
+ UtilGtk.ContrastLabelsLabel (Config.ColorBackgroundIsDark, hbox_combo_label);
+ UtilGtk.ContrastLabelsLabel (Config.ColorBackgroundIsDark, label_comment);
}
generic_window.Resizable = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
