[med-svn] [SCM] aghermann branch, master, updated. 551e213a23b59b71cba6a9c3a282d1b60e21b854
Andrei Zavada
johnhommer at gmail.com
Sun Apr 21 23:17:57 UTC 2013
The following commit has been merged in the master branch:
commit ce2e8a4be9d948f7130e5e1c2f42d5dafca253d8
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sat Apr 13 21:46:25 2013 +0300
WIP complete
diff --git a/data/mw-dialogs.glade b/data/mw-dialogs.glade
index 0905640..6d38469 100644
--- a/data/mw-dialogs.glade
+++ b/data/mw-dialogs.glade
@@ -293,9 +293,11 @@
<child>
<object class="GtkButton" id="button2">
<property name="label">_Dismiss</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -862,9 +864,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="button1">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -876,11 +880,13 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bBatchRunExecute">
<property name="label">gtk-execute</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -933,10 +939,12 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bEDFFileDetailsDismiss">
<property name="label">_Dismiss</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="is_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">half</property>
<property name="use_underline">True</property>
</object>
@@ -1044,8 +1052,10 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bEdfImportEdfhed">
<property name="label" translatable="yes">View/_Score separately</property>
+ <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
</object>
@@ -1058,9 +1068,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bEdfImportDrop">
<property name="label" translatable="yes">_Drop</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">half</property>
<property name="use_underline">True</property>
</object>
@@ -1073,11 +1085,13 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bEdfImportAdmit">
<property name="label" translatable="yes">_Admit</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">half</property>
<property name="use_underline">True</property>
</object>
@@ -1255,9 +1269,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkRadioButton" id="bEdfImportAttachCopy">
<property name="label" translatable="yes">Copy</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -1271,9 +1287,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkRadioButton" id="bEdfImportAttachMove">
<property name="label" translatable="yes">Move</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -1288,9 +1306,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkRadioButton" id="bEdfImportAttachLink">
<property name="label" translatable="yes">Link</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -1467,9 +1487,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="button6">
<property name="label" translatable="yes">_Dismiss</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -1554,11 +1576,13 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkCheckButton" id="eGlobalAnnotationsShowPhasicEvents">
<property name="label" translatable="yes">Show _phasic events</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -1653,9 +1677,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkCheckButton" id="eGlobalADKeepExisting">
<property name="label" translatable="yes">_Keep existing artifacts</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -1727,9 +1753,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="button7">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1742,9 +1770,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bGlobalADClearAll">
<property name="label" translatable="yes">Clea_r all</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -1756,11 +1786,13 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bGlobalADOK">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1810,9 +1842,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bFilterCancel">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1824,11 +1858,13 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bGlobalFiltersOK">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<accelerator key="Return" signal="activate"/>
</object>
@@ -2236,9 +2272,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkCheckButton" id="eMontageDefaultsShowPSD">
<property name="label" translatable="yes">_PSD</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -2253,9 +2291,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkCheckButton" id="eMontageDefaultsShowMC">
<property name="label" translatable="yes">_uCont</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -2270,9 +2310,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkCheckButton" id="eMontageDefaultsShowEMG">
<property name="label" translatable="yes">E_MG</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -2301,9 +2343,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkCheckButton" id="eMontageDefaultsShowPSDSpectrum">
<property name="label" translatable="yes">Sp_ectrum</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -2353,9 +2397,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="button5">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2367,9 +2413,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bGlobalMontageClearAll">
<property name="label" translatable="yes">Clea_r all</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -2381,11 +2429,13 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="bGlobalMontageOK">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2453,9 +2503,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<child>
<object class="GtkButton" id="button4">
<property name="label" translatable="yes">_Dismiss</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -2512,353 +2564,6 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<action-widget response="-5">button4</action-widget>
</action-widgets>
</object>
- <object class="GtkDialog" id="wSubjectDetails">
- <property name="can_focus">False</property>
- <property name="border_width">10</property>
- <property name="type_hint">dialog</property>
- <signal name="close" handler="gtk_widget_hide" swapped="no"/>
- <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
- <signal name="response" handler="gtk_widget_hide" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox7">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="label21">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="ypad">8</property>
- <property name="label" translatable="yes"><b><big>Subject details</big></b></property>
- <property name="use_markup">True</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="separator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">6</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">10</property>
- <property name="column_spacing">5</property>
- <child>
- <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">Full _name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eSubjectDetailsFullName</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Gender:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label20">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">_Age:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eSubjectDetailsAge</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="eSubjectDetailsAge">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="halign">end</property>
- <property name="invisible_char">•</property>
- <property name="xalign">1</property>
- <property name="adjustment">jSubjectDetailsAge</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="spacing">20</property>
- <child>
- <object class="GtkRadioButton" id="eSubjectDetailsGenderMale">
- <property name="label" translatable="yes">_Male</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="eSubjectDetailsGenderFemale">
- <property name="label" translatable="yes">_Female</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">eSubjectDetailsGenderMale</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="eSubjectDetailsFullName">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="can_default">True</property>
- <property name="invisible_char">•</property>
- <property name="activates_default">True</property>
- <property name="caps_lock_warning">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label58">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Com_ment:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eSubjectDetailsComment</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="eSubjectDetailsComment">
- <property name="width_request">220</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="invisible_char">•</property>
- <property name="activates_default">True</property>
- <property name="caps_lock_warning">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label68">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">years</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="eSubjectDetailsShortName">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="invisible_char">•</property>
- <property name="activates_default">True</property>
- <property name="invisible_char_set">True</property>
- <property name="caps_lock_warning">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">_Short name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">eSubjectDetailsFullName</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area7">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button3">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bSubjectDetailsOK">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">button3</action-widget>
- <action-widget response="-5">bSubjectDetailsOK</action-widget>
- </action-widgets>
- </object>
<object class="GtkSizeGroup" id="sizegroup2"/>
<object class="GtkSizeGroup" id="sizegroup3"/>
<object class="GtkSizeGroup" id="sizegroup4"/>
diff --git a/data/mw.glade b/data/mw.glade
index 830bc3c..f27f7f3 100644
--- a/data/mw.glade
+++ b/data/mw.glade
@@ -1,17 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAdjustment" id="jArtifDampFactor">
- <property name="upper">1</property>
- <property name="value">0.94999999999999996</property>
- <property name="step_increment">0.01</property>
- <property name="page_increment">0.10000000000000001</property>
- </object>
<object class="GtkMenu" id="iiSubjectTimeline">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="iSubjectTimelineScore">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Score this episode</property>
@@ -20,6 +15,7 @@
</child>
<child>
<object class="GtkMenuItem" id="iSubjectTimelineDetectUltradianCycle">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Detect NREM-REM cycle</property>
@@ -28,6 +24,7 @@
</child>
<child>
<object class="GtkMenuItem" id="iSubjectTimelineResetMontage">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@@ -38,21 +35,8 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="menuitem7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="iSubjectTimelineSubjectInfo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Subject _info</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="iSubjectTimelineEDFInfo">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Show _EDF file header</property>
@@ -67,6 +51,7 @@
</child>
<child>
<object class="GtkMenuItem" id="iSubjectTimelineSaveAsSVG">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Save this view as S_VG</property>
@@ -75,6 +60,7 @@
</child>
<child>
<object class="GtkMenuItem" id="iSubjectTimelineBrowse">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Browse in file manager</property>
@@ -87,6 +73,12 @@
<property name="can_focus">False</property>
<property name="icon_name">reload</property>
</object>
+ <object class="GtkAdjustment" id="jArtifDampFactor">
+ <property name="upper">1</property>
+ <property name="value">0.94999999999999996</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">0.10000000000000001</property>
+ </object>
<object class="GtkAdjustment" id="jBandAlphaFrom">
<property name="lower">6</property>
<property name="upper">10</property>
@@ -598,10 +590,12 @@
<child>
<object class="GtkButton" id="bAbout">
<property name="label" translatable="yes">✩</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">About</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<signal name="clicked" handler="gtk_widget_show" object="wAbout" swapped="yes"/>
@@ -668,6 +662,7 @@
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="iiMainMenu">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Experiment</property>
@@ -679,6 +674,7 @@
<child>
<object class="GtkImageMenuItem" id="iExpRefresh">
<property name="label" translatable="yes">_Rescan tree</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
@@ -688,6 +684,7 @@
</child>
<child>
<object class="GtkMenuItem" id="iExpPurgeComputed">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Remove cached computed files:
@@ -698,6 +695,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkMenuItem" id="iExpAnnotations">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">A_nnotations...</property>
@@ -712,6 +710,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkMenuItem" id="menuitem4">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Subject _order</property>
@@ -722,6 +721,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="can_focus">False</property>
<child>
<object class="GtkRadioMenuItem" id="iExpSubjectSortName">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Name</property>
@@ -732,6 +732,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkRadioMenuItem" id="iExpSubjectSortAge">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Age</property>
@@ -742,6 +743,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkRadioMenuItem" id="iExpSubjectSortAdmissionDate">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Ad_mission date</property>
@@ -752,6 +754,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkRadioMenuItem" id="iExpSubjectSortAvgPower">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Average _profile power</property>
@@ -768,6 +771,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkCheckMenuItem" id="iExpSubjectSortAscending">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">A_scending</property>
@@ -777,6 +781,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkCheckMenuItem" id="iExpSubjectSortSegregate">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">S_egregate by gender</property>
@@ -789,6 +794,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkMenuItem" id="iiExpGlobalOperations">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Global operations</property>
@@ -799,6 +805,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="iMontageSetDefaults">
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="label" translatable="yes">Set montage _defaults...</property>
@@ -807,6 +814,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkMenuItem" id="iExpGloballySetFilters">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Set _filter...</property>
@@ -821,6 +829,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkMenuItem" id="iExpGloballyDetectArtifacts">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Detect _artifacts...</property>
@@ -829,6 +838,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkMenuItem" id="iExpBasicSADetectUltradianCycles">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Detect NREM-REM _cycle</property>
@@ -847,6 +857,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkMenuItem" id="iHelpAbout">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_About</property>
@@ -855,6 +866,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkMenuItem" id="iHelpUsage">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Usage notes</property>
@@ -870,6 +882,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
<child>
<object class="GtkImageMenuItem" id="iExpClose">
<property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
@@ -879,6 +892,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
<child>
<object class="GtkImageMenuItem" id="iExpQuit">
<property name="label">gtk-quit</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
@@ -1270,12 +1284,14 @@ rm */*/*/.*.{psd,mc,swu}</property>
<child>
<object class="GtkToggleButton" id="eMsmtProfileAutoscale">
<property name="label" translatable="yes"> _Autoscale </property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
</object>
@@ -1287,10 +1303,12 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
<child>
<object class="GtkScaleButton" id="eMsmtProfileSmooth">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<property name="value">1</property>
@@ -1407,9 +1425,11 @@ rm */*/*/.*.{psd,mc,swu}</property>
<child>
<object class="GtkButton" id="bMainCloseThatSF">
<property name="label" translatable="yes">button</property>
+ <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">True</property>
@@ -3606,9 +3626,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="n_columns">2</property>
<child>
<object class="GtkColorButton" id="bColourMWProfile">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Profile</property>
@@ -3639,9 +3661,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourMWNight">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Night</property>
<property name="color">#743b75b8d0ce</property>
@@ -3683,9 +3707,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourMWDay">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Day</property>
<property name="color">#3f6dbc6fe795</property>
@@ -3731,9 +3757,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="n_columns">2</property>
<child>
<object class="GtkColorButton" id="bColourMWTicks">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Ticks (overview)</property>
@@ -3776,9 +3804,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourMWLabels">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Labels (overview)</property>
@@ -3838,9 +3868,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="n_columns">2</property>
<child>
<object class="GtkColorButton" id="bColourScoreNREM1">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage NREM1</property>
<property name="color">#6a8f76b4ffff</property>
@@ -3950,9 +3982,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourScoreNREM2">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage NREM2</property>
<property name="color">#568f5f4bc28f</property>
@@ -3966,9 +4000,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourScoreNREM3">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage NREM3</property>
<property name="color">#414145457c7c</property>
@@ -3982,9 +4018,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourScoreNREM4">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage NREM4</property>
<property name="color">#1e1e22225656</property>
@@ -3998,9 +4036,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourScoreREM">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage REM</property>
<property name="color">#ffffbb44eff7</property>
@@ -4014,9 +4054,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourScoreWake">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Stage Wake</property>
<property name="color">#b5f8ffffd401</property>
@@ -4030,9 +4072,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourScoreNONE">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Unscored page</property>
<property name="color">#fec6ffffe209</property>
@@ -4078,9 +4122,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="n_columns">2</property>
<child>
<object class="GtkColorButton" id="bColourBandDelta">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Delta band</property>
<property name="color">#6a8f76b4ffff</property>
@@ -4175,9 +4221,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourBandTheta">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Theta band</property>
<property name="color">#568f5f4bc28f</property>
@@ -4191,9 +4239,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourBandAlpha">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Alpha band</property>
<property name="color">#bb1a2f3d8e13</property>
@@ -4207,9 +4257,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourBandBeta">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Beta band</property>
<property name="color">#5a72a5f292c0</property>
@@ -4223,9 +4275,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourBandGamma">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Gamma band</property>
<property name="color">#ffffbb44eff7</property>
@@ -4295,9 +4349,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFEMG">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">EMG</property>
@@ -4312,9 +4368,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFHypnogram">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Hypnogram paper</property>
<property name="color">#fdefffffdbfc</property>
@@ -4358,9 +4416,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFProfileMC">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">EEG Microcontinuity</property>
@@ -4376,9 +4436,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFProfilePSD">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">EEG PSD</property>
@@ -4391,9 +4453,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFProfileSWU">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">SWU</property>
@@ -4474,9 +4538,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFArtifacts">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Artifacts</property>
@@ -4489,9 +4555,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFAnnotations">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Annotations</property>
@@ -4522,9 +4590,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFSelection">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Selection</property>
@@ -4555,9 +4625,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFTicks">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Ticks (scoring facility)</property>
@@ -4588,9 +4660,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFCursor">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Cursor</property>
@@ -4622,9 +4696,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFLabels">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Labels (scoring facility)</property>
@@ -4655,9 +4731,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFPhasicSpindle">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Spindle</property>
@@ -4672,9 +4750,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFPhasicKComplex">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">K-complex</property>
@@ -4748,9 +4828,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourSFPhasicEyeBlink">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Eyeblink</property>
@@ -4814,9 +4896,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="n_columns">2</property>
<child>
<object class="GtkColorButton" id="bColourMFSWA">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">SWA line</property>
<property name="color">#000092d411cf</property>
@@ -4890,9 +4974,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourMFSWASim">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">SWA simulated line</property>
<property name="color">#71e9e85e71c6</property>
@@ -4906,9 +4992,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourMFProcessS">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Process S line</property>
<property name="color">#e6ee4573ffff</property>
@@ -4922,9 +5010,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourMFPaper">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="title" translatable="yes">Simulations paper</property>
<property name="color">#dd7cdf65ba81</property>
@@ -4988,9 +5078,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourMFTicks">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Ticks (simulation facility)</property>
@@ -5003,9 +5095,11 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkColorButton" id="bColourMFLabels">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
<property name="title" translatable="yes">Labels (simulation facility)</property>
@@ -5214,6 +5308,7 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="menuitem2">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Simulations</property>
@@ -5224,6 +5319,7 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="iSimulationsRunBatch">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Batch...</property>
@@ -5232,6 +5328,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkMenuItem" id="iSimulationsRunClearAll">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Clear all</property>
@@ -5246,6 +5343,7 @@ dragging individual signals with <i>Alt</i>.</small></property
</child>
<child>
<object class="GtkMenuItem" id="iSimulationsReportGenerate">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Report...</property>
@@ -5871,9 +5969,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<child>
<object class="GtkRadioButton" id="eCtlParamScoreUnscoredAsWake">
<property name="label" translatable="yes">Wake</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -5886,9 +5986,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<child>
<object class="GtkRadioButton" id="eCtlParamScoreUnscoredAsPrevScore">
<property name="label" translatable="yes">Previous page</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">eCtlParamScoreUnscoredAsWake</property>
@@ -5960,9 +6062,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<child>
<object class="GtkCheckButton" id="eCtlParamDBAmendment1">
<property name="label" translatable="yes">_DB Amendment 1</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -5976,10 +6080,12 @@ dragging individual signals with <i>Alt</i>.</small></property
<child>
<object class="GtkCheckButton" id="eCtlParamDBAmendment2">
<property name="label" translatable="yes">D_B Amendment 2</property>
+ <property name="use_action_appearance">False</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_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -5995,10 +6101,12 @@ dragging individual signals with <i>Alt</i>.</small></property
<child>
<object class="GtkCheckButton" id="eCtlParamAZAmendment1">
<property name="label" translatable="yes">_AZ Amendment 1</property>
+ <property name="use_action_appearance">False</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_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -7342,6 +7450,12 @@ dragging individual signals with <i>Alt</i>.</small></property
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child>
@@ -7745,9 +7859,11 @@ dragging individual signals with <i>Alt</i>.</small></property
<child>
<object class="GtkButton" id="bSimParamRevertTunables">
<property name="label" translatable="yes">_Revert to defaults</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">half</property>
<property name="use_underline">True</property>
</object>
diff --git a/src/expdesign/primaries.cc b/src/expdesign/primaries.cc
index cff10e8..b04c3d8 100644
--- a/src/expdesign/primaries.cc
+++ b/src/expdesign/primaries.cc
@@ -11,6 +11,7 @@
#include <stdarg.h>
+#include <errno.h>
#include <cassert>
#include <string>
#include <fstream>
@@ -46,14 +47,14 @@ CExpDesign (const string& session_dir_,
SValidator<double>("ctl_param.damping_mu", &ctl_params0.siman_params.mu_t, SValidator<double>::SVFRangeEx( DBL_MIN, 1e9)),
SValidator<double>("ctl_param.t_min", &ctl_params0.siman_params.t_min, SValidator<double>::SVFRangeEx( DBL_MIN, 1e9)),
SValidator<double>("profile.req_scored_pc", &req_percent_scored, SValidator<double>::SVFRangeIn( 80., 100.)),
- SValidator<double>("fft_param.binsize", &fft_params.binsize, SValidator<double>::SVFRangeIn( .125, 1.)),
+ SValidator<double>("fft_param.binsize", &fft_params.binsize, SValidator<double>::SVFRangeIn( .125, 1.)),
SValidator<double>("artifacts.dampen_factor", &af_dampen_factor, SValidator<double>::SVFRangeIn( 0., 1.)),
SValidator<double>("mc_param.mc_gain", &mc_params.mc_gain, SValidator<double>::SVFRangeIn( 0., 100.)),
SValidator<double>("mc_param.f0fc", &mc_params.f0fc, SValidator<double>::SVFRangeEx( 0., 80.)),
SValidator<double>("mc_param.bandwidth", &mc_params.bandwidth, SValidator<double>::SVFRangeIn( 0.125, 2.)),
SValidator<double>("mc_param.iir_backpolate", &mc_params.iir_backpolate, SValidator<double>::SVFRangeIn( 0., 1.)),
SValidator<double>("swu_param.min_upswing_duration",
- &swu_params.min_upswing_duration, SValidator<double>::SVFRangeIn( 0.01, 1.)),
+ &swu_params.min_upswing_duration, SValidator<double>::SVFRangeIn( 0.01, 1.)),
}),
config_keys_d ({
SValidator<int>("fft_param.welch_window_type", (int*)&fft_params.welch_window_type, SValidator<int>::SVFRangeIn( 0, (int)sigproc::TWinType_total - 1)),
@@ -66,7 +67,7 @@ CExpDesign (const string& session_dir_,
SValidator<size_t>("smp.num_threads", &num_threads, SValidator<size_t>::SVFRangeIn( 0, 20)),
SValidator<size_t>("mc_params.n_bins", &mc_params.n_bins, SValidator<size_t>::SVFRangeIn( 1, 100)),
SValidator<size_t>("profile.swa_laden_pages_before_SWA_0",
- &swa_laden_pages_before_SWA_0, SValidator<size_t>::SVFRangeIn( 1, 100)),
+ &swa_laden_pages_before_SWA_0, SValidator<size_t>::SVFRangeIn( 1, 100)),
SValidator<size_t>("fft_param.pagesize", &fft_params.pagesize, SValidator<size_t>::SVFRangeIn( 4, 120)),
SValidator<size_t>("mc_param.smooth_side", &mc_params.smooth_side, SValidator<size_t>::SVFRangeIn( 0, 5)),
}),
@@ -393,6 +394,18 @@ used_samplerates( sigfile::SChannel::TType type) const
+float
+agh::CSubject::
+age_rel( time_t rel) const
+{
+ time_t now = time(NULL);
+ if ( unlikely (now == -1) ) {
+ perror( "What's wrong with localtime? ");
+ return 21.;
+ }
+ return (now - dob)/365.25/24/60/60;
+}
+
@@ -434,6 +447,7 @@ get_annotations() const
+
void
agh::CExpDesign::
remove_untried_modruns()
diff --git a/src/expdesign/primaries.hh b/src/expdesign/primaries.hh
index 1c46a39..ff1322d 100644
--- a/src/expdesign/primaries.hh
+++ b/src/expdesign/primaries.hh
@@ -48,10 +48,16 @@ class CSubject : public SSubjectId {
CSubject () = delete;
public:
- float age() const;
- string comment;
+ float age( const string& d) const
+ {
+ return age_rel(
+ measurements.at(d).episodes.front().start_time());
+ }
+ float age_rel( time_t) const;
- const string& dir() const { return _dir; }
+ const string&
+ dir() const
+ { return _dir; }
CSubject (const CSubject& rv)
: agh::SSubjectId (rv),
@@ -67,8 +73,6 @@ class CSubject : public SSubjectId {
_dir (dir)
{}
- ~CSubject ();
-
class SEpisodeSequence;
class SEpisode {
public:
diff --git a/src/ui/mw/construct.cc b/src/ui/mw/construct.cc
index 4d9e0a6..786cc1d 100644
--- a/src/ui/mw/construct.cc
+++ b/src/ui/mw/construct.cc
@@ -211,7 +211,6 @@ SExpDesignUIWidgets ()
if ( !(AGH_GBGETOBJ (GtkMenu, iiSubjectTimeline)) ||
!(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineScore)) ||
!(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineDetectUltradianCycle)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineSubjectInfo)) ||
!(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineEDFInfo)) ||
!(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineSaveAsSVG)) ||
!(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineResetMontage)) ||
@@ -221,7 +220,6 @@ SExpDesignUIWidgets ()
g_object_ref( (GObject*)iiSubjectTimeline);
g_object_ref( (GObject*)iSubjectTimelineScore);
g_object_ref( (GObject*)iSubjectTimelineDetectUltradianCycle);
- g_object_ref( (GObject*)iSubjectTimelineSubjectInfo);
g_object_ref( (GObject*)iSubjectTimelineEDFInfo);
g_object_ref( (GObject*)iSubjectTimelineSaveAsSVG);
g_object_ref( (GObject*)iSubjectTimelineResetMontage);
@@ -229,7 +227,6 @@ SExpDesignUIWidgets ()
G_CONNECT_1 (iSubjectTimelineScore, activate);
G_CONNECT_1 (iSubjectTimelineDetectUltradianCycle, activate);
- G_CONNECT_1 (iSubjectTimelineSubjectInfo, activate);
G_CONNECT_1 (iSubjectTimelineEDFInfo, activate);
G_CONNECT_1 (iSubjectTimelineSaveAsSVG, activate);
G_CONNECT_1 (iSubjectTimelineBrowse, activate);
@@ -696,7 +693,6 @@ aghui::SExpDesignUIWidgets::
g_object_unref( (GObject*)iiSubjectTimeline);
g_object_unref( (GObject*)iSubjectTimelineScore);
- g_object_unref( (GObject*)iSubjectTimelineSubjectInfo);
g_object_unref( (GObject*)iSubjectTimelineEDFInfo);
g_object_unref( (GObject*)iSubjectTimelineSaveAsSVG);
g_object_unref( (GObject*)iSubjectTimelineResetMontage);
diff --git a/src/ui/mw/measurements.cc b/src/ui/mw/measurements.cc
index 24a26af..5025bfe 100644
--- a/src/ui/mw/measurements.cc
+++ b/src/ui/mw/measurements.cc
@@ -287,7 +287,7 @@ draw_timeline( cairo_t *cr) const
cairo_set_font_size( cr, 9);
snprintf_buf( "%c %d y.o.",
csubject.gender_sign(),
- (int)csubject.age());
+ (int)csubject.age( *_p._p._AghDi));
cairo_set_source_rgb( cr, .1, .1, .1);
cairo_show_text( cr, __buf__);
}
diff --git a/src/ui/mw/populate.cc b/src/ui/mw/populate.cc
index ddeefc5..b08efe0 100644
--- a/src/ui/mw/populate.cc
+++ b/src/ui/mw/populate.cc
@@ -585,8 +585,8 @@ operator<( const SSubjectPresentation& rv) const
unsure = csubject.id == rv.csubject.id;
break;
case TSubjectSortBy::age:
- result = csubject.age() < rv.csubject.age();
- unsure = csubject.age() == rv.csubject.age();
+ result = csubject.age(*_p._p._AghDi) < rv.csubject.age(*_p._p._AghDi);
+ unsure = csubject.age(*_p._p._AghDi) == rv.csubject.age(*_p._p._AghDi);
break;
case TSubjectSortBy::admission_date:
result = tl_start < rv.tl_start;
diff --git a/src/ui/mw/widgets.hh b/src/ui/mw/widgets.hh
index 280ba7c..521b867 100644
--- a/src/ui/mw/widgets.hh
+++ b/src/ui/mw/widgets.hh
@@ -158,7 +158,6 @@ struct SExpDesignUIWidgets {
GtkMenuItem
*iSubjectTimelineScore,
*iSubjectTimelineDetectUltradianCycle,
- *iSubjectTimelineSubjectInfo,
*iSubjectTimelineEDFInfo,
*iSubjectTimelineSaveAsSVG,
*iSubjectTimelineBrowse,
--
Sleep experiment manager
More information about the debian-med-commit
mailing list