This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch WIP
in repository aghermann.
commit 018cf120fc55b32cc1a28641b0acd093ad9c505d
Author: Andrei Zavada <hmmr at ra>
Date: Sun Jun 14 01:50:37 2015 +0300
deal with some GTK deprecations, and then some
---
upstream/data/mw-dialogs.glade | 468 ++--
upstream/data/mw.glade | 3865 +++++++++++-------------------
upstream/src/aghermann/ui/mw/populate.cc | 17 +-
3 files changed, 1633 insertions(+), 2717 deletions(-)
diff --git a/upstream/data/mw-dialogs.glade b/upstream/data/mw-dialogs.glade
index 5e6515a..38cc2bc 100644
--- a/upstream/data/mw-dialogs.glade
+++ b/upstream/data/mw-dialogs.glade
@@ -39,7 +39,7 @@
<object class="GtkBox" id="dialog-vbox11">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">10</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area11">
<property name="can_focus">False</property>
@@ -592,7 +592,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">10</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area15">
<property name="visible">True</property>
@@ -638,19 +638,11 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="cGlobalFilterMain">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">6</property>
- <property name="n_columns">5</property>
<property name="row_spacing">10</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkSpinButton" id="eGlobalFiltersLowPassCutoff">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -668,11 +660,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -696,75 +684,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">Low pass:</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">High pass:</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label27">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">Hz</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label28">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">Hz</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -777,11 +697,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -802,11 +718,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -819,11 +731,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -847,64 +755,84 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="lFilterCaption">
+ <object class="GtkComboBox" id="eGlobalFiltersNotchFilter">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b><big>Global filters</big></b></property>
- <property name="use_markup">True</property>
+ <property name="valign">center</property>
+ <property name="model">mGlobalFiltersNotchFilter</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label28">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">Hz</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="right_attach">5</property>
- <property name="y_options">GTK_SHRINK</property>
- <property name="y_padding">4</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label31">
+ <object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">10</property>
- <property name="label" translatable="yes">Notch filter:</property>
+ <property name="label" translatable="yes">High pass:</property>
<property name="xalign">1</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="eGlobalFiltersNotchFilter">
+ <object class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="model">mGlobalFiltersNotchFilter</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Low pass:</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator10">
+ <object class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">Hz</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="right_attach">5</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Notch filter:</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -915,11 +843,45 @@
<property name="margin_bottom">5</property>
</object>
<packing>
- <property name="right_attach">5</property>
+ <property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="width">5</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="lFilterCaption">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b><big>Global filters</big></b></property>
+ <property name="use_markup">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">5</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1024,7 +986,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">10</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area4">
<property name="visible">True</property>
@@ -1137,7 +1099,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">10</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
@@ -1198,35 +1160,17 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkGrid" id="cEdfImportMain">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel" id="lEdfImportCaption">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">5</property>
- <property name="ypad">8</property>
- <property name="use_markup">True</property>
- <property name="ellipsize">middle</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkSeparator" id="separator2">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">6</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -1235,80 +1179,15 @@
<property name="can_focus">True</property>
<property name="show_border">False</property>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkGrid" id="cEdfImportDetails">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="n_rows">6</property>
- <property name="n_columns">3</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
+ <property name="margin_top">10</property>
+ <property name="margin_bottom">10</property>
<property name="row_spacing">15</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">_Group: </property>
- <property name="use_underline">True</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">Subject: </property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">_Session: </property>
- <property name="use_underline">True</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">_Episode: </property>
- <property name="use_underline">True</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="lEdfImportSubject">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1317,28 +1196,13 @@
</object>
<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>
- <property name="y_options"/>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label11">
+ <object class="GtkGrid" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
<child>
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
@@ -1348,9 +1212,8 @@
<property name="xalign">1</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1364,9 +1227,8 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1381,9 +1243,8 @@
<property name="group">bEdfImportAttachCopy</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1398,18 +1259,14 @@
<property name="group">bEdfImportAttachCopy</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -1426,9 +1283,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -1445,7 +1300,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1462,23 +1317,78 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkHSeparator" id="hseparator2">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">_Episode: </property>
+ <property name="use_underline">True</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">_Session: </property>
+ <property name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Subject: </property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">_Group: </property>
+ <property name="use_underline">True</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"/>
+ <property name="width">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
@@ -1500,6 +1410,10 @@
<property name="height_request">300</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
+ <property name="margin_top">10</property>
+ <property name="margin_bottom">10</property>
<property name="cursor_visible">False</property>
<property name="buffer">tEDFFileDetailsReport</property>
</object>
@@ -1522,9 +1436,23 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lEdfImportCaption">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">5</property>
+ <property name="ypad">8</property>
+ <property name="use_markup">True</property>
+ <property name="ellipsize">middle</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -1562,7 +1490,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">10</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
@@ -1657,7 +1585,7 @@
<big><b>Aghermann</b> is developed by Andrei Zavada <a href="mailto:johnhommer at gmail.com">johnhommer at gmail.com</a> and distributed under GPL-2+.</big>
-With bug reports, either send yours to <a href="mailto:aghermann-users at lists.sourceforge.net">aghermann-users at lists.sourceforge.net</a>, or open an issue on <a href="http://github.com/hmmr/aghermann/issues">http://github.com/hmmr/aghermann/issues</a>.</property>
+With bug reports, open an issue on <a href="http://github.com/hmmr/aghermann/issues">http://github.com/hmmr/aghermann/issues</a>.</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
@@ -1776,8 +1704,10 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<object class="GtkLabel" id="label161">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
+ <property name="margin_top">10</property>
+ <property name="margin_bottom">10</property>
<property name="label" translatable="yes"><b>ChangeLog</b></property>
<property name="use_markup">True</property>
<property name="xalign">0</property>
@@ -1825,7 +1755,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<object class="GtkBox" id="dialog-vbox8">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">10</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area8">
<property name="can_focus">False</property>
@@ -1960,7 +1890,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<object class="GtkBox" id="dialog-vbox14">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">10</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area14">
<property name="can_focus">False</property>
@@ -2156,7 +2086,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<object class="GtkBox" id="dialog-vbox17">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">10</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area17">
<property name="can_focus">False</property>
@@ -2353,7 +2283,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<object class="GtkBox" id="dialog-vbox12">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">10</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area12">
<property name="can_focus">False</property>
@@ -2610,7 +2540,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">10</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area5">
<property name="visible">True</property>
diff --git a/upstream/data/mw.glade b/upstream/data/mw.glade
index cc51c68..0f0d744 100644
--- a/upstream/data/mw.glade
+++ b/upstream/data/mw.glade
@@ -611,11 +611,11 @@
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkVBox" id="cMeasurements">
+ <object class="GtkGrid" id="cMeasurements">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
<property name="border_width">1</property>
- <property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lLoading">
<property name="visible">True</property>
@@ -629,9 +629,8 @@
</attributes>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -641,9 +640,8 @@
<property name="pixbuf">idle-bg.svg</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
@@ -908,28 +906,26 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="hexpand">True</property>
<property name="spacing">5</property>
<child>
- <object class="GtkHBox" id="cMsmtViewSelectors">
+ <object class="GtkGrid" id="cMsmtViewSelectors">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">2</property>
- <property name="spacing">3</property>
<child>
<object class="GtkLabel" id="label39">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">Sessio_n:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eMsmtSession</property>
+ <property name="xalign">1</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -940,9 +936,8 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="has_frame">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -950,18 +945,17 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">C_hannel:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eMsmtChannel</property>
+ <property name="xalign">1</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -972,9 +966,8 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="has_frame">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -1093,9 +1086,9 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">F: </property>
<property name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1168,9 +1161,9 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"> wide</property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1184,8 +1177,8 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
- <property name="xalign">0.89999997615814209</property>
<property name="xpad">5</property>
+ <property name="xalign">0.89999997615814209</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1212,10 +1205,10 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes"><i>F</i><sub>0</sub>: </property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1267,8 +1260,8 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
- <property name="xalign">0.89999997615814209</property>
<property name="xpad">5</property>
+ <property name="xalign">0.89999997615814209</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1295,10 +1288,10 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="valign">center</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes"><i>F</i><sub>0</sub>: </property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1350,8 +1343,8 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
- <property name="xalign">0.89999997615814209</property>
<property name="xpad">5</property>
+ <property name="xalign">0.89999997615814209</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1448,8 +1441,8 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="margin_right">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
- <property name="row_spacing">10</property>
- <property name="column_spacing">10</property>
+ <property name="row_spacing">20</property>
+ <property name="column_spacing">20</property>
<child>
<object class="GtkFrame" id="fScoreCodes">
<property name="visible">True</property>
@@ -1460,14 +1453,12 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table19">
+ <object class="GtkGrid" id="table19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="n_rows">9</property>
- <property name="n_columns">2</property>
+ <property name="row_spacing">10</property>
<property name="column_spacing">15</property>
- <property name="row_spacing">2</property>
<child>
<object class="GtkLabel" id="label57">
<property name="visible">True</property>
@@ -1475,12 +1466,16 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Try this string verbatim first...</property>
<property name="tooltip_text" translatable="yes">Try this string verbatim first...</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"><b><small>Stage</small></b></property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eFFTParamsWindowType</property>
+ <property name="xalign">1</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label126">
@@ -1489,110 +1484,14 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">... failing which, any of these characters will indicate the corresponding stage.</property>
<property name="tooltip_text" translatable="yes">... failing which, any of these characters will indicate the corresponding stage.</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"><b><small>Code(s)</small></b></property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label127">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">NREM1</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label128">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">NREM2</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label129">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">NREM3</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label131">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">NREM4</property>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label132">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">REM</property>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label133">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Wake</property>
- </object>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label135">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Unscored</property>
- </object>
- <packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- </packing>
- </child>
- <child>
- <object class="GtkHSeparator" id="hseparator6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
</object>
<packing>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_padding">5</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1608,9 +1507,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -1626,9 +1523,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -1644,9 +1539,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
</packing>
</child>
<child>
@@ -1662,9 +1555,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
</packing>
</child>
<child>
@@ -1680,9 +1571,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
</packing>
</child>
<child>
@@ -1698,9 +1587,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
</packing>
</child>
<child>
@@ -1716,9 +1603,102 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label127">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">NREM1</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label128">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">NREM2</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label129">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">NREM3</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label131">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">NREM4</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label132">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">REM</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label133">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Wake</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label135">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Unscored</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
@@ -1749,14 +1729,12 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table24">
+ <object class="GtkGrid" id="table24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="n_rows">7</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">5</property>
<property name="row_spacing">10</property>
+ <property name="column_spacing">5</property>
<child>
<object class="GtkLabel" id="label25">
<property name="visible">True</property>
@@ -1764,6 +1742,10 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="label" translatable="yes"><b><small>Band</small></b></property>
<property name="use_markup">True</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label45">
@@ -1774,7 +1756,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1786,84 +1768,34 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label69">
+ <object class="GtkSpinButton" id="eBandDeltaFrom">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">δ</span></property>
- <property name="use_markup">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_frame">False</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0.50</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="overwrite_mode">True</property>
+ <property name="caps_lock_warning">False</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">jBandDeltaFrom</property>
+ <property name="digits">2</property>
+ <property name="numeric">True</property>
+ <property name="value">0.5</property>
</object>
<packing>
+ <property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label71">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">β</span></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label72">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">γ</span></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label75">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">α</span></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eBandDeltaFrom">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_frame">False</property>
- <property name="invisible_char">•</property>
- <property name="text" translatable="yes">0.50</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="overwrite_mode">True</property>
- <property name="caps_lock_warning">False</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="adjustment">jBandDeltaFrom</property>
- <property name="digits">2</property>
- <property name="numeric">True</property>
- <property name="value">0.5</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eBandAlphaFrom">
+ <object class="GtkSpinButton" id="eBandAlphaFrom">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_frame">False</property>
@@ -1882,9 +1814,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
</packing>
</child>
<child>
@@ -1907,9 +1837,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
</packing>
</child>
<child>
@@ -1932,9 +1860,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
</packing>
</child>
<child>
@@ -1957,9 +1883,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -1982,9 +1906,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
</packing>
</child>
<child>
@@ -2007,9 +1929,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
</packing>
</child>
<child>
@@ -2032,21 +1952,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label73">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">θ</span></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -2068,9 +1974,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -2092,9 +1996,67 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label69">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">δ</span></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label73">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">θ</span></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label75">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">α</span></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label71">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">β</span></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label72">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">γ</span></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
@@ -2103,9 +2065,9 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="can_focus">False</property>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="width">3</property>
</packing>
</child>
</object>
@@ -2134,27 +2096,26 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
+ <property name="row_spacing">15</property>
<property name="column_spacing">10</property>
- <property name="row_spacing">10</property>
- <child>
- <placeholder/>
- </child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">A factor to multiply some siman parameters</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">_NREM-REM detection accuracy</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eArtifDampenFactor</property>
+ <property name="xalign">1</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkSpinButton" id="eUltradianCycleDetectionAccuracy">
@@ -2172,23 +2133,22 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Fitting function (clamped to 0):</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="scale" value="0.80000000000000004"/>
</attributes>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -2198,10 +2158,14 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="pixbuf">equation-uc.png</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="label">
@@ -2216,6 +2180,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -2233,26 +2198,25 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table29">
+ <object class="GtkGrid" id="table29">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">10</property>
<property name="row_spacing">10</property>
- <child>
- <placeholder/>
- </child>
+ <property name="column_spacing">10</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">_Max threads to use: </property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eSMPMaxThreads</property>
+ <property name="xalign">1</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkSpinButton" id="eSMPMaxThreads">
@@ -2268,7 +2232,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2282,9 +2246,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -2316,13 +2278,12 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table10">
+ <object class="GtkGrid" id="table10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="n_rows">2</property>
- <property name="column_spacing">10</property>
<property name="row_spacing">10</property>
+ <property name="column_spacing">10</property>
<child>
<object class="GtkCheckButton" id="eScanTreeStrict">
<property name="label" translatable="yes">Strict EDF header check</property>
@@ -2335,6 +2296,10 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkCheckButton" id="eScanTreeSuppressReport">
@@ -2348,8 +2313,8 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
</object>
@@ -2405,28 +2370,14 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTable" id="table20">
+ <object class="GtkGrid" id="table20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="border_width">20</property>
- <property name="n_rows">3</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">40</property>
<property name="row_spacing">40</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="column_spacing">40</property>
<child>
<object class="GtkFrame" id="fCommon">
<property name="height_request">94</property>
@@ -2438,14 +2389,12 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table25">
+ <object class="GtkGrid" id="table25">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">10</property>
<property name="row_spacing">5</property>
+ <property name="column_spacing">10</property>
<child>
<object class="GtkComboBox" id="eFFTParamsPageSize">
<property name="visible">True</property>
@@ -2456,40 +2405,39 @@ rm */*/*/.*.{psd,mc,swu}</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label162">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">Page si_ze</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eFFTParamsPageSize</property>
+ <property name="xalign">1</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
<property name="label" translatable="yes"><small>Scoring can only be done when the page size
in scoring facility matches this value.</small></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
<child type="label">
@@ -2502,7 +2450,8 @@ in scoring facility matches this value.</small></property>
</child>
</object>
<packing>
- <property name="y_options"/>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2515,20 +2464,12 @@ in scoring facility matches this value.</small></property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table12">
+ <object class="GtkGrid" id="table12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">10</property>
<property name="row_spacing">10</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="column_spacing">10</property>
<child>
<object class="GtkComboBox" id="eArtifDampenWindowType">
<property name="visible">True</property>
@@ -2537,53 +2478,54 @@ in scoring facility matches this value.</small></property>
</object>
<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>
- <property name="y_options"/>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label24">
+ <object class="GtkSpinButton" id="eArtifDampenFactor">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="has_frame">False</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0.95</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">D_ampening window type</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eArtifDampenWindowType</property>
+ <property name="shadow_type">none</property>
+ <property name="adjustment">jArtifDampFactor</property>
+ <property name="digits">2</property>
+ <property name="numeric">True</property>
+ <property name="value">0.94999999999999996</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label118">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">_Dampening factor</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eArtifDampenFactor</property>
+ <property name="xalign">1</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
- <object class="GtkSpinButton" id="eArtifDampenFactor">
+ <object class="GtkLabel" id="label24">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_frame">False</property>
- <property name="invisible_char">•</property>
- <property name="text" translatable="yes">0.95</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">D_ampening window type</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eArtifDampenWindowType</property>
<property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="adjustment">jArtifDampFactor</property>
- <property name="digits">2</property>
- <property name="numeric">True</property>
- <property name="value">0.94999999999999996</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
@@ -2598,8 +2540,8 @@ in scoring facility matches this value.</small></property>
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -2614,32 +2556,14 @@ in scoring facility matches this value.</small></property>
<property name="can_focus">True</property>
<property name="border_width">5</property>
<child>
- <object class="GtkTable" id="table11">
+ <object class="GtkGrid" id="table11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">10</property>
<property name="row_spacing">5</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkLabel" id="label49">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">_Window type</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eFFTParamsWindowType</property>
- </object>
- </child>
+ <property name="column_spacing">10</property>
<child>
<object class="GtkComboBox" id="eFFTParamsWindowType">
<property name="visible">True</property>
@@ -2648,64 +2572,71 @@ in scoring facility matches this value.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label53">
+ <object class="GtkComboBox" id="eFFTParamsBinSize">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">_Collect into bins of</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eFFTParamsBinSize</property>
+ <property name="model">mFFTParamsBinSize</property>
</object>
<packing>
+ <property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="eFFTParamsBinSize">
+ <object class="GtkComboBox" id="eFFTParamsPlanType">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">mFFTParamsBinSize</property>
+ <property name="model">mFFTParamsPlanType</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"/>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label14">
+ <object class="GtkLabel" id="label49">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">FFTW plan type</property>
+ <property name="label" translatable="yes">_Window type</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eFFTParamsBinSize</property>
+ <property name="mnemonic_widget">eFFTParamsWindowType</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="eFFTParamsPlanType">
+ <object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">mFFTParamsPlanType</property>
+ <property name="label" translatable="yes">FFTW plan type</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eFFTParamsBinSize</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label53">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Collect into bins of</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eFFTParamsBinSize</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -2714,9 +2645,9 @@ in scoring facility matches this value.</small></property>
<property name="can_focus">False</property>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
@@ -2736,72 +2667,14 @@ in scoring facility matches this value.</small></property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">10</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">10</property>
<property name="row_spacing">5</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkLabel" id="label141">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">IIR backpo_late</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eMCParamIIRBackpolate</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label166">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Gai_n</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eMCParamMCGain</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label175">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">_Band width</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eMCParamBandWidth</property>
- </object>
- </child>
+ <property name="column_spacing">10</property>
<child>
<object class="GtkSpinButton" id="eMCParamIIRBackpolate">
<property name="visible">True</property>
@@ -2818,9 +2691,7 @@ in scoring facility matches this value.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -2839,9 +2710,7 @@ in scoring facility matches this value.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -2860,152 +2729,197 @@ in scoring facility matches this value.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator10">
+ <object class="GtkSpinButton" id="eMCParamFreqInc">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="has_frame">False</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0.50</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="adjustment">jMCParamFreqInc</property>
+ <property name="digits">2</property>
+ <property name="numeric">True</property>
+ <property name="value">0.5</property>
</object>
<packing>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator12">
+ <object class="GtkSpinButton" id="eMCParamNBins">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_frame">False</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">5</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="adjustment">jMCParamNBins</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="value">5</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label87">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes"> Hz</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="right_attach">3</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label124">
+ <object class="GtkLabel" id="label101">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> Hz</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><small>Read more <a href="http://johnhommer.com/academic/code/aghermann/mc.html">here</a>.</small></property>
- <property name="use_markup">True</property>
</object>
<packing>
- <property name="right_attach">3</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator3">
+ <object class="GtkLabel" id="label175">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Band width</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eMCParamBandWidth</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label15">
+ <object class="GtkSeparator" id="separator10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label141">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">IIR backpo_late</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eMCParamIIRBackpolate</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Freq. inc</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label166">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Gai_n</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eMCParamMCGain</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="eMCParamFreqInc">
+ <object class="GtkSeparator" id="separator3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_frame">False</property>
- <property name="invisible_char">•</property>
- <property name="text" translatable="yes">0.50</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="adjustment">jMCParamFreqInc</property>
- <property name="digits">2</property>
- <property name="numeric">True</property>
- <property name="value">0.5</property>
+ <property name="can_focus">False</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label21">
+ <object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes"># bins</property>
+ <property name="label" translatable="yes">Freq. inc</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eMCParamMCGain</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="eMCParamNBins">
+ <object class="GtkLabel" id="label21">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_frame">False</property>
- <property name="invisible_char">•</property>
- <property name="text" translatable="yes">5</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"># bins</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eMCParamMCGain</property>
<property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="adjustment">jMCParamNBins</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <property name="value">5</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label87">
+ <object class="GtkSeparator" id="separator12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> Hz</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label101">
+ <object class="GtkLabel" id="label124">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes"><small>Read more <a href="http://johnhommer.com/academic/code/aghermann/mc.html">here</a>.</small></property>
+ <property name="use_markup">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"> Hz</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">3</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -3027,25 +2941,27 @@ in scoring facility matches this value.</small></property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table30">
+ <object class="GtkGrid" id="table30">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">10</property>
<property name="row_spacing">5</property>
+ <property name="column_spacing">10</property>
<child>
<object class="GtkLabel" id="label54">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">Min upswing duration</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eMCParamBandWidth</property>
+ <property name="xalign">1</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkSpinButton" id="eSWUParamMinUpswingDuration">
@@ -3063,7 +2979,7 @@ in scoring facility matches this value.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -3072,21 +2988,21 @@ in scoring facility matches this value.</small></property>
<property name="can_focus">False</property>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label102">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"> sec</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -3098,9 +3014,9 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="use_markup">True</property>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="width">3</property>
</packing>
</child>
</object>
@@ -3135,11 +3051,13 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">4</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -3174,7 +3092,7 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTable" id="table18">
+ <object class="GtkGrid" id="table18">
<property name="width_request">0</property>
<property name="height_request">0</property>
<property name="visible">True</property>
@@ -3182,13 +3100,8 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="halign">start</property>
<property name="valign">start</property>
<property name="border_width">20</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">40</property>
<property name="row_spacing">40</property>
- <child>
- <placeholder/>
- </child>
+ <property name="column_spacing">40</property>
<child>
<object class="GtkFrame" id="fDAHeights">
<property name="width_request">100</property>
@@ -3201,26 +3114,23 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table26">
+ <object class="GtkGrid" id="table26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="n_rows">10</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">5</property>
<property name="row_spacing">10</property>
+ <property name="column_spacing">5</property>
<child>
<object class="GtkLabel" id="label121">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">Signals apart:</property>
<property name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
</packing>
</child>
<child>
@@ -3243,24 +3153,21 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="value">3</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label123">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">Hypnogram (h):</property>
<property name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
</packing>
</child>
<child>
@@ -3282,24 +3189,21 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="value">35</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
<property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label125">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">EMG (h):</property>
<property name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
</packing>
</child>
<child>
@@ -3321,10 +3225,8 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="value">3</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
<property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
</packing>
</child>
<child>
@@ -3332,16 +3234,16 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Montage:</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="style" value="italic"/>
</attributes>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -3349,28 +3251,16 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Overview:</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="style" value="italic"/>
</attributes>
</object>
<packing>
- <property name="right_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Pixels per hour:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -3393,24 +3283,8 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="value">30</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label113">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Timeline (h):</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -3435,10 +3309,8 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="value">80</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -3447,9 +3319,9 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="can_focus">False</property>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -3458,27 +3330,51 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="can_focus">False</property>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
<property name="label" translatable="yes"><small>This is the default value; adjust by
dragging individual signals with <i>Alt</i>.</small></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Pixels per hour:</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label113">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Timeline (h):</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
</object>
@@ -3493,8 +3389,8 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -3529,116 +3425,99 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">True</property>
<property name="border_width">10</property>
<child>
- <object class="GtkTable" id="table5">
+ <object class="GtkGrid" id="table5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
<child>
- <object class="GtkColorButton" id="bColourMWProfile">
+ <object class="GtkColorButton" id="bColourMWDay">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
- <property name="use_alpha">True</property>
- <property name="title" translatable="yes">Profile</property>
- <property name="color">#081d6d2e1621</property>
+ <property name="title" translatable="yes">Day</property>
+ <property name="rgba">rgb(169,209,130)</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label78">
+ <object class="GtkColorButton" id="bColourMWNight">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Profile</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="title" translatable="yes">Night</property>
+ <property name="rgba">rgb(106,118,255)</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourMWNight">
+ <object class="GtkColorButton" id="bColourMWProfile">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
- <property name="title" translatable="yes">Night</property>
- <property name="color">#743b75b8d0ce</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Profile</property>
+ <property name="rgba">rgb(92,53,102)</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label114">
+ <object class="GtkSeparator" id="separator7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Night</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label115">
+ <object class="GtkLabel" id="label114">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Night</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Day</property>
</object>
<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>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourMWDay">
+ <object class="GtkLabel" id="label115">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="title" translatable="yes">Day</property>
- <property name="color">#3f6dbc6fe795</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Day</property>
+ <property name="xalign">0</property>
</object>
<packing>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator7">
+ <object class="GtkLabel" id="label78">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Profile</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
</object>
@@ -3654,13 +3533,26 @@ dragging individual signals with <i>Alt</i>.</small></property
</packing>
</child>
<child>
- <object class="GtkTable" id="table7">
+ <object class="GtkGrid" id="table7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkColorButton" id="bColourMWLabels">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Labels (overview)</property>
+ <property name="rgba">rgb(0,0,0)</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
<child>
<object class="GtkColorButton" id="bColourMWTicks">
<property name="visible">True</property>
@@ -3669,58 +3561,35 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Ticks (overview)</property>
- <property name="color">#3b993b993b99</property>
+ <property name="rgba">rgb(138,226,52)</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label84">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Ticks</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label85">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Labels</property>
+ <property name="xalign">0</property>
</object>
<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>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkColorButton" id="bColourMWLabels">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="use_alpha">True</property>
- <property name="title" translatable="yes">Labels (overview)</property>
- <property name="color">#ffffffffffff</property>
- </object>
- <packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -3761,13 +3630,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">True</property>
<property name="border_width">10</property>
<child>
- <object class="GtkTable" id="table8">
+ <object class="GtkGrid" id="table8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">7</property>
- <property name="n_columns">2</property>
<child>
<object class="GtkColorButton" id="bColourScoreNREM1">
<property name="visible">True</property>
@@ -3775,109 +3642,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage NREM1</property>
- <property name="color">#6a8f76b4ffff</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label91">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">NREM1</property>
+ <property name="rgba">rgb(178,177,233)</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label92">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">NREM2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label138">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">NREM3</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label93">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">NREM4</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label94">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">REM</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label95">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Wake</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
@@ -3887,13 +3656,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage NREM2</property>
- <property name="color">#568f5f4bc28f</property>
+ <property name="rgba">rgb(130,128,207)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -3903,13 +3670,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage NREM3</property>
- <property name="color">#414145457c7c</property>
+ <property name="rgba">rgb(80,107,177)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -3919,13 +3684,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage NREM4</property>
- <property name="color">#1e1e22225656</property>
+ <property name="rgba">rgb(10,45,95)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -3935,13 +3698,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage REM</property>
- <property name="color">#ffffbb44eff7</property>
+ <property name="rgba">rgb(243,106,62)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -3951,13 +3712,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage Wake</property>
- <property name="color">#b5f8ffffd401</property>
+ <property name="rgba">rgb(138,226,52)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -3967,142 +3726,192 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Unscored page</property>
- <property name="color">#fec6ffffe209</property>
+ <property name="rgba">rgb(191,64,64)</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label79">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">(unscored)</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">0</property>
</packing>
</child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label96">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Sleep stages</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="border_width">10</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
<child>
- <object class="GtkColorButton" id="bColourBandDelta">
+ <object class="GtkLabel" id="label91">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="title" translatable="yes">Delta band</property>
- <property name="color">#6a8f76b4ffff</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">NREM1</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label65">
+ <object class="GtkLabel" id="label92">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">NREM2</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label138">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">NREM3</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label93">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">NREM4</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label94">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">REM</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label95">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Wake</property>
<property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label96">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Sleep stages</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="table4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="border_width">10</property>
+ <child>
+ <object class="GtkColorButton" id="bColourBandDelta">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="title" translatable="yes">Delta band</property>
+ <property name="rgba">rgb(114,159,207)</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label65">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">δ</span></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label67">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">θ</span></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<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>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label74">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">α</span></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label77">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">β</span></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label76">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">γ</span></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
@@ -4112,13 +3921,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Theta band</property>
- <property name="color">#568f5f4bc28f</property>
+ <property name="rgba">rgb(138,226,52)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -4128,13 +3935,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Alpha band</property>
- <property name="color">#bb1a2f3d8e13</property>
+ <property name="rgba">rgb(239,41,41)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -4144,13 +3949,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Beta band</property>
- <property name="color">#5a72a5f292c0</property>
+ <property name="rgba">rgb(233,185,110)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -4160,13 +3963,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Gamma band</property>
- <property name="color">#ffffbb44eff7</property>
+ <property name="rgba">rgb(173,127,168)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -4186,43 +3987,33 @@ dragging individual signals with <i>Alt</i>.</small></property
</packing>
</child>
<child>
- <object class="GtkTable" id="table31">
+ <object class="GtkGrid" id="table31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">6</property>
- <property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label48">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">EMG</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label55">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Hypnogram</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
@@ -4233,13 +4024,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">EMG</property>
- <property name="color">#108f6e4d178b</property>
+ <property name="rgba">rgba(25,180,213,0.91666666666666663)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -4249,43 +4038,47 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Hypnogram paper</property>
- <property name="color">#fdefffffdbfc</property>
+ <property name="rgba">rgb(250,243,172)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label112">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">PSD</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label140">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">µContinuity</property>
+ <property name="xalign">0</property>
</object>
<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>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label58">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">SWU</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -4296,14 +4089,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">EEG Microcontinuity</property>
- <property name="color">#1a1a8282bebe</property>
- <property name="rgba">rgba(26,130,190,0.80496453900709219)</property>
+ <property name="rgba">rgba(26,190,140,0.84057971014492749)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -4314,11 +4104,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">EEG PSD</property>
- <property name="color">#49421305b258</property>
+ <property name="rgba">rgba(80,107,177,0.8188405797101449)</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -4329,30 +4119,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">SWU</property>
- <property name="color">#d8d80d0d0d0d</property>
- <property name="rgba">rgba(216,13,13,0.80000000000000004)</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label58">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">SWU</property>
+ <property name="rgba">rgba(216,13,75,0.89130434782608692)</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
@@ -4361,9 +4132,9 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">False</property>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
@@ -4383,272 +4154,207 @@ dragging individual signals with <i>Alt</i>.</small></property
</packing>
</child>
<child>
- <object class="GtkTable" id="table9">
+ <object class="GtkGrid" id="table9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">11</property>
- <property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label100">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Artifacts</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkColorButton" id="bColourSFArtifacts">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="use_alpha">True</property>
- <property name="title" translatable="yes">Artifacts</property>
- <property name="color">#db3c1ab939cf</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourSFAnnotations">
+ <object class="GtkLabel" id="label86">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="use_alpha">True</property>
- <property name="title" translatable="yes">Annotations</property>
- <property name="color">#3da9846af6c2</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Annotations</property>
+ <property name="xalign">0</property>
</object>
<packing>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label86">
+ <object class="GtkLabel" id="label105">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Ticks</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Annotations</property>
</object>
<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>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourSFSelection">
+ <object class="GtkLabel" id="label28">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="use_alpha">True</property>
- <property name="title" translatable="yes">Selection</property>
- <property name="color">#6b57e4d75206</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Cursor</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label116">
+ <object class="GtkLabel" id="label107">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Labels</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Selection</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourSFTicks">
+ <object class="GtkLabel" id="label68">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="use_alpha">True</property>
- <property name="title" translatable="yes">Ticks (scoring facility)</property>
- <property name="color">#3e8effff42d7</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Spindle</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label105">
+ <object class="GtkLabel" id="label97">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">K-complex</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Ticks</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">9</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourSFCursor">
+ <object class="GtkLabel" id="label98">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="use_alpha">True</property>
- <property name="title" translatable="yes">Cursor</property>
- <property name="color">#d8d80d0d0d0d</property>
- <property name="rgba">rgba(216,13,13,0.80000000000000004)</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Eye blink</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">10</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label28">
+ <object class="GtkLabel" id="label99">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Embedded annotations</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Cursor</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourSFLabels">
+ <object class="GtkColorButton" id="bColourSFArtifacts">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
- <property name="title" translatable="yes">Labels (scoring facility)</property>
- <property name="color">#4e4e9a9a0606</property>
+ <property name="title" translatable="yes">Artifacts</property>
+ <property name="rgba">rgba(204,0,0,0.62681159420289856)</property>
</object>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label107">
+ <object class="GtkColorButton" id="bColourSFAnnotations">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Labels</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Annotations</property>
+ <property name="rgba">rgba(128,139,113,0.62318840579710144)</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourSFPhasicSpindle">
+ <object class="GtkColorButton" id="bColourSFEmbeddedAnnotations">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
- <property name="title" translatable="yes">Spindle</property>
- <property name="color">#adad7f7fa8a8</property>
+ <property name="title" translatable="yes">Embedded annotations</property>
+ <property name="rgba">rgba(109,144,62,0.62318840579710144)</property>
</object>
<packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourSFPhasicKComplex">
+ <object class="GtkColorButton" id="bColourSFCursor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
- <property name="title" translatable="yes">K-complex</property>
- <property name="color">#e9e9b9b96e6e</property>
+ <property name="title" translatable="yes">Cursor</property>
+ <property name="rgba">rgba(216,13,13,0.80000000000000004)</property>
</object>
<packing>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label68">
+ <object class="GtkColorButton" id="bColourSFTicks">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Spindle</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Ticks (scoring facility)</property>
+ <property name="rgba">rgb(138,226,52)</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label97">
+ <object class="GtkColorButton" id="bColourSFLabels">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">K-complex</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Labels (scoring facility)</property>
+ <property name="rgba">rgb(0,0,0)</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
@@ -4657,75 +4363,81 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">False</property>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label98">
+ <object class="GtkColorButton" id="bColourSFPhasicSpindle">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Eye blink</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Spindle</property>
+ <property name="rgba">rgba(117,80,123,0.76449275362318836)</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourSFPhasicEyeBlink">
+ <object class="GtkColorButton" id="bColourSFPhasicKComplex">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
- <property name="title" translatable="yes">Eyeblink</property>
- <property name="color">#fcfce9e94f4f</property>
+ <property name="title" translatable="yes">K-complex</property>
+ <property name="rgba">rgba(44,75,121,0.83333333333333337)</property>
</object>
<packing>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="bColourSFEmbeddedAnnotations">
+ <object class="GtkColorButton" id="bColourSFPhasicEyeBlink">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
- <property name="title" translatable="yes">Embedded annotations</property>
- <property name="color">#75cf9f9dc7ad</property>
+ <property name="title" translatable="yes">Eyeblink</property>
+ <property name="rgba">rgba(196,160,130,0.84420289855072461)</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label99">
+ <object class="GtkLabel" id="label116">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Selection</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Embedded annotations</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkColorButton" id="bColourSFSelection">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Selection</property>
+ <property name="rgba">rgba(18,171,190,0.57246376811594202)</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
</object>
@@ -4770,13 +4482,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">True</property>
<property name="border_width">10</property>
<child>
- <object class="GtkTable" id="table16">
+ <object class="GtkGrid" id="table16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
<child>
<object class="GtkColorButton" id="bColourMFSWA">
<property name="visible">True</property>
@@ -4784,73 +4494,59 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">SWA line</property>
- <property name="color">#000092d411cf</property>
+ <property name="rgba">rgb(32,74,135)</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label31">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">SWA</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label81">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">SWA simulated</property>
+ <property name="xalign">0</property>
</object>
<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>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label82">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Process S</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label83">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Paper</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
@@ -4860,13 +4556,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">SWA simulated line</property>
- <property name="color">#71e9e85e71c6</property>
+ <property name="rgba">rgb(78,154,6)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -4876,13 +4570,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Process S line</property>
- <property name="color">#e6ee4573ffff</property>
+ <property name="rgba">rgb(196,160,0)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -4892,13 +4584,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Simulations paper</property>
- <property name="color">#dd7cdf65ba81</property>
+ <property name="rgba">rgb(238,238,236)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -4914,41 +4604,33 @@ dragging individual signals with <i>Alt</i>.</small></property
</packing>
</child>
<child>
- <object class="GtkTable" id="table3">
+ <object class="GtkGrid" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label106">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Ticks</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label109">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Labels</property>
+ <property name="xalign">0</property>
</object>
<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>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
</packing>
</child>
<child>
@@ -4959,11 +4641,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Ticks (simulation facility)</property>
- <property name="color">#3253ffff3976</property>
+ <property name="rgba">rgb(138,226,52)</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -4974,13 +4656,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Labels (simulation facility)</property>
- <property name="color">#bcd4ffffbea1</property>
+ <property name="rgba">rgb(46,52,54)</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -5031,11 +4711,8 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -5058,7 +4735,7 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="left_padding">5</property>
<property name="right_padding">5</property>
<child>
- <object class="GtkTable" id="table17">
+ <object class="GtkGrid" id="table17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
@@ -5074,6 +4751,10 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="invisible_char">•</property>
<property name="text" translatable="yes">thunar</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
</child>
@@ -5089,10 +4770,8 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -5105,25 +4784,25 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table32">
+ <object class="GtkGrid" id="table32">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">10</property>
<property name="row_spacing">10</property>
- <child>
- <placeholder/>
- </child>
+ <property name="column_spacing">10</property>
<child>
<object class="GtkLabel" id="label108">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">Factor: </property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eScrollSpeedFactor</property>
+ <property name="xalign">1</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkSpinButton" id="eScrollSpeedFactor">
@@ -5141,7 +4820,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -5156,10 +4835,16 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
</object>
<packing>
+ <property name="left_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -5405,7 +5090,7 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkGrid" id="table6">
<property name="width_request">100</property>
<property name="height_request">80</property>
<property name="visible">True</property>
@@ -5413,19 +5098,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="halign">start</property>
<property name="valign">start</property>
<property name="border_width">20</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">40</property>
<property name="row_spacing">40</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="column_spacing">40</property>
<child>
<object class="GtkFrame" id="fSimParamCtlParm">
<property name="visible">True</property>
@@ -5436,38 +5110,12 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table27">
+ <object class="GtkGrid" id="table27">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="n_rows">7</property>
- <property name="n_columns">5</property>
<property name="row_spacing">5</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkSpinButton" id="eCtlParamAnnlNTries">
<property name="width_request">80</property>
<property name="visible">True</property>
@@ -5486,27 +5134,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label89">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">The number of points to try for each step</property>
- <property name="xalign">1</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes"># tries</property>
- <property name="use_markup">True</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">eCtlParamAnnlNTries</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -5526,31 +5154,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label80">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Iterations at fixed T</property>
- <property name="xalign">1</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">Fixed T iters</property>
- <property name="use_markup">True</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">eCtlParamAnnlItersFixedT</property>
- </object>
- <packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
@@ -5571,30 +5175,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label90">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">Step size</property>
- <property name="use_markup">True</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">eCtlParamAnnlStepSize</property>
- </object>
- <packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
@@ -5615,30 +5196,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">Boktzmann <i>k</i></property>
- <property name="use_markup">True</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">eCtlParamAnnlBoltzmannk</property>
- </object>
- <packing>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
@@ -5659,29 +5217,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label36">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes"><i>T</i> initial</property>
- <property name="use_markup">True</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eCtlParamAnnlTInitialMantissa</property>
- </object>
- <packing>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
@@ -5702,51 +5238,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label37">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="xalign">1</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">Damping factor <i>μ</i></property>
- <property name="use_markup">True</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">eCtlParamAnnlDampingMu</property>
- </object>
- <packing>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label41">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="xalign">1</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes"><i>T</i> min</property>
- <property name="use_markup">True</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">eCtlParamAnnlTMinMantissa</property>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
@@ -5767,11 +5259,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
@@ -5788,47 +5276,37 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="numeric">True</property>
</object>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
+ <property name="left_attach">3</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label44">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="xpad">3</property>
<property name="label" translatable="yes">e</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label63">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="xpad">3</property>
<property name="label" translatable="yes">e</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkSpinButton" id="eCtlParamAnnlTInitialExponent">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -5843,14 +5321,160 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="value">2</property>
</object>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
+ <property name="left_attach">3</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label89">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">The number of points to try for each step</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes"># tries</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">eCtlParamAnnlNTries</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label80">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Iterations at fixed T</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Fixed T iters</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">eCtlParamAnnlItersFixedT</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label90">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Step size</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">eCtlParamAnnlStepSize</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Boltzmann <i>k</i></property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">eCtlParamAnnlBoltzmannk</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label36">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes"><i>T</i> initial</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eCtlParamAnnlTInitialMantissa</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
+ <object class="GtkLabel" id="label37">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Damping factor <i>μ</i></property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">eCtlParamAnnlDampingMu</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label41">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes"><i>T</i> min</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">eCtlParamAnnlTMinMantissa</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<placeholder/>
</child>
</object>
@@ -5864,6 +5488,10 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
</child>
</object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkFrame" id="fSimParamScores">
@@ -5880,25 +5508,24 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table15">
+ <object class="GtkGrid" id="table15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
<property name="row_spacing">2</property>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label88">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">Treat <i>unscored</i> as:</property>
<property name="use_markup">True</property>
+ <property name="xalign">1</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkRadioButton" id="eCtlParamScoreUnscoredAsWake">
@@ -5912,7 +5539,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -5927,11 +5554,12 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<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>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -5947,9 +5575,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<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>
<child>
@@ -5967,45 +5593,12 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table21">
+ <object class="GtkGrid" id="table21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="n_rows">6</property>
- <property name="n_columns">4</property>
<property name="row_spacing">5</property>
<child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkHSeparator" id="hseparator7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_padding">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="eCtlParamDBAmendment1">
- <property name="label" translatable="yes">_DB Amendment 1</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="eCtlParamDBAmendment2">
<property name="label" translatable="yes">D_B Amendment 2</property>
<property name="visible">True</property>
@@ -6018,177 +5611,185 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="eCtlParamAZAmendment1">
- <property name="label" translatable="yes">_AZ Amendment 1</property>
+ <object class="GtkSpinButton" id="eCtlParamNSWAPpBeforeSimStart">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="max_length">4</property>
+ <property name="invisible_char">•</property>
+ <property name="activates_default">True</property>
+ <property name="text" translatable="yes">0</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="overwrite_mode">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">jCtlParamNSWAPpBeforeSimStart</property>
+ <property name="numeric">True</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="eCtlParamNSWAPpBeforeSimStart">
+ <object class="GtkSpinButton" id="eCtlParamReqScoredPercent">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="max_length">4</property>
+ <property name="max_length">3</property>
<property name="invisible_char">•</property>
<property name="activates_default">True</property>
- <property name="text" translatable="yes">0</property>
+ <property name="text" translatable="yes">90</property>
<property name="xalign">1</property>
<property name="shadow_type">none</property>
<property name="overwrite_mode">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="adjustment">jCtlParamNSWAPpBeforeSimStart</property>
+ <property name="adjustment">jCtlParamReqScoredPercent</property>
<property name="numeric">True</property>
+ <property name="value">90</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="eCtlParamAZAmendment1">
+ <property name="label" translatable="yes">_AZ Amendment 1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label50">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="xpad">10</property>
<property name="label" translatable="yes"># SWA-laden pages before SWA<sub>0</sub></property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="justify">right</property>
<property name="mnemonic_widget">eCtlParamAnnlDampingMu</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label51">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="xpad">10</property>
<property name="label" translatable="yes">Require episodes scored at least</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="justify">right</property>
<property name="mnemonic_widget">eCtlParamAnnlDampingMu</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="eCtlParamReqScoredPercent">
+ <object class="GtkLabel" id="label137">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">3</property>
- <property name="invisible_char">•</property>
- <property name="activates_default">True</property>
- <property name="text" translatable="yes">90</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="overwrite_mode">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="adjustment">jCtlParamReqScoredPercent</property>
- <property name="numeric">True</property>
- <property name="value">90</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">4</property>
+ <property name="label" translatable="yes">%</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label137">
+ <object class="GtkCheckButton" id="eCtlParamDBAmendment1">
+ <property name="label" translatable="yes">_DB Amendment 1</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="xpad">4</property>
- <property name="label" translatable="yes">%</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lCtlParamDBAmendment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> </property>
- <property name="use_markup">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lCtlParamDBAmendment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lCtlParamAZAmendment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -6204,9 +5805,18 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -6236,7 +5846,7 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTable" id="table13">
+ <object class="GtkGrid" id="table13">
<property name="width_request">0</property>
<property name="height_request">0</property>
<property name="visible">True</property>
@@ -6244,32 +5854,13 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="halign">start</property>
<property name="valign">start</property>
<property name="border_width">20</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
<property name="column_spacing">40</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkTable" id="table28">
+ <object class="GtkGrid" id="table28">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">8</property>
- <property name="n_columns">6</property>
- <property name="column_spacing">7</property>
<property name="row_spacing">5</property>
+ <property name="column_spacing">7</property>
<child>
<object class="GtkSpinButton" id="eTunable_S0">
<property name="visible">True</property>
@@ -6283,11 +5874,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6300,28 +5887,22 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label61">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">✕10<sup>−2</sup> min<sup>−1</sup></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6334,10 +5915,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6355,11 +5934,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6377,11 +5952,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6389,18 +5960,14 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="width_request">120</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">✕10<sup>−3</sup> min<sup>−1</sup></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6414,10 +5981,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6436,11 +6001,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6459,11 +6020,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6481,29 +6038,21 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label142">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">%</property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6516,10 +6065,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6535,11 +6082,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6557,29 +6100,21 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label144">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">%</property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6590,10 +6125,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6612,11 +6145,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6635,11 +6164,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6647,18 +6172,14 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="width_request">90</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">min<sup>−1</sup></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6671,10 +6192,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6692,11 +6211,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6714,29 +6229,21 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label148">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">min<sup>−1</sup></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6751,9 +6258,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -6765,9 +6270,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -6785,11 +6288,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6808,11 +6307,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -6828,654 +6323,202 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eTunable_SU_max">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eTunable_fcW_max">
- <property name="width_request">60</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="text" translatable="yes">0.00</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="digits">2</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eTunable_rc_max">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="text" translatable="yes">0.000</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="digits">3</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label151">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Max</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eTunable_gc_min">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="text" translatable="yes">0.000</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="digits">3</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eTunable_rs_min">
- <property name="width_request">65</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="text" translatable="yes">0.000</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="digits">3</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eTunable_S0_min">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eTunable_SU_min">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eTunable_fcW_min">
- <property name="width_request">60</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="text" translatable="yes">0.00</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="digits">2</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eTunable_rc_min">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="text" translatable="yes">0.000</property>
- <property name="xalign">1</property>
- <property name="shadow_type">none</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="digits">3</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label150">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Min</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="right_attach">6</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
+ <property name="top_attach">5</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSpinButton" id="eTunable_SU_max">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">6</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSpinButton" id="eTunable_fcW_max">
+ <property name="width_request">60</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0.00</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="digits">2</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">7</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSpinButton" id="eTunable_rc_max">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0.000</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="digits">3</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">4</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkLabel" id="label151">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Max</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSpinButton" id="eTunable_gc_min">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0.000</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="digits">3</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSpinButton" id="eTunable_rs_min">
+ <property name="width_request">65</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0.000</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="digits">3</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSpinButton" id="eTunable_S0_min">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">5</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSpinButton" id="eTunable_SU_min">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">6</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSpinButton" id="eTunable_fcW_min">
+ <property name="width_request">60</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0.00</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="digits">2</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">7</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSpinButton" id="eTunable_rc_min">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0.000</property>
+ <property name="xalign">1</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="digits">3</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">4</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkLabel" id="label150">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Min</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSeparator" id="separator14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">6</property>
+ </packing>
</child>
<child>
<placeholder/>
@@ -7484,36 +6527,34 @@ dragging individual signals with <i>Alt</i>.</small></property
<placeholder/>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkExpander" id="expander2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkTable" id="table23">
+ <object class="GtkGrid" id="table23">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">4</property>
- <property name="n_columns">6</property>
- <property name="column_spacing">7</property>
<property name="row_spacing">5</property>
+ <property name="column_spacing">7</property>
<child>
<object class="GtkLabel" id="label153">
<property name="width_request">90</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">min</property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -7532,11 +6573,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -7555,11 +6592,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -7570,28 +6603,22 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label155">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">min</property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -7609,11 +6636,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -7631,25 +6654,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label156">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><i>rem</i><sub>pre</sub></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -7657,16 +6662,14 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="width_request">120</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">min<sup>−1</sup></property>
<property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -7685,9 +6688,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -7706,22 +6707,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label158">
- <property name="width_request">40</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><i>fc</i><sub>R</sub></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -7740,11 +6726,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -7762,11 +6744,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -7785,9 +6763,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -7806,11 +6782,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -7828,11 +6800,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -7851,9 +6819,32 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label158">
+ <property name="width_request">40</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><i>fc</i><sub>R</sub></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label156">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><i>rem</i><sub>pre</sub></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -7862,10 +6853,9 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">False</property>
</object>
<packing>
- <property name="right_attach">6</property>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_padding">5</property>
+ <property name="width">6</property>
</packing>
</child>
</object>
@@ -7879,8 +6869,8 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -7892,8 +6882,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="use_underline">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -7905,10 +6895,16 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="pixbuf">equations1.png</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -8018,25 +7014,6 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup2">
- <widgets>
- <widget name="label24"/>
- <widget name="label53"/>
- <widget name="label49"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="sizegroup3">
- <widgets>
- <widget name="label139"/>
- <widget name="label62"/>
- <widget name="label147"/>
- <widget name="label143"/>
- <widget name="label145"/>
- <widget name="label158"/>
- <widget name="label156"/>
- <widget name="label154"/>
- </widgets>
- </object>
<object class="GtkSizeGroup" id="zMenuBar">
<property name="mode">vertical</property>
<widgets>
@@ -8079,6 +7056,8 @@ dragging individual signals with <i>Alt</i>.</small></property
</row>
</data>
</object>
+ <object class="GtkSizeGroup" id="sizegroup2"/>
+ <object class="GtkSizeGroup" id="sizegroup3"/>
<object class="GtkSizeGroup" id="sizegroup4"/>
<object class="GtkTextBuffer" id="tEDFFileDetailsReport"/>
</interface>
diff --git a/upstream/src/aghermann/ui/mw/populate.cc b/upstream/src/aghermann/ui/mw/populate.cc
index b211316..d5cfe32 100644
--- a/upstream/src/aghermann/ui/mw/populate.cc
+++ b/upstream/src/aghermann/ui/mw/populate.cc
@@ -459,6 +459,7 @@ populate_1()
tl_left_margin = tl_right_margin = 0;
// walk again thoroughly, set timeline drawing area length
+ gint main_grid_row = 0;
for ( auto &G : groups ) {
// convert avg episode times
ostringstream ss;
@@ -497,19 +498,25 @@ populate_1()
g_signal_connect( expander, "activate",
(GCallback)cGroupExpander_activate_cb,
&G);
- gtk_box_pack_start( (GtkBox*)cMeasurements,
- (GtkWidget*)expander, FALSE, TRUE, 3);
+ gtk_grid_insert_row( (GtkGrid*)cMeasurements,
+ ++main_grid_row);
+ gtk_grid_attach( (GtkGrid*)cMeasurements,
+ (GtkWidget*)expander,
+ 0, main_grid_row, 1, 1);
+
GtkWidget *vbox;
gtk_container_add( (GtkContainer*)expander,
- vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL, 1));
+ vbox = gtk_grid_new());
g_object_set( (GObject*)vbox,
"height-request", -1,
NULL);
+ gint sub_grid_row = 0;
for ( auto &J : G ) {
J.da = gtk_drawing_area_new();
- gtk_box_pack_start( (GtkBox*)vbox,
- J.da, TRUE, TRUE, 2);
+ gtk_grid_insert_row( (GtkGrid*)vbox, ++sub_grid_row);
+ gtk_grid_attach( (GtkGrid*)vbox,
+ J.da, 0, sub_grid_row, 1, 1);
// determine tl_left_margin
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git