[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461
andrei zavada
johnhommer at gmail.com
Fri Nov 16 00:50:39 UTC 2012
The following commit has been merged in the master branch:
commit 2a73379f636907596e24dccd1f754ff7c42727c4
Author: andrei zavada <johnhommer at gmail.com>
Date: Sun Oct 28 23:00:41 2012 +0200
UI widget tweaks
diff --git a/data/dialogs.glade b/data/dialogs.glade
index d98ceb6..0fab5c8 100644
--- a/data/dialogs.glade
+++ b/data/dialogs.glade
@@ -468,6 +468,8 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
* MF: preserve tunables when reopening a previous
model run.
* Allow freq_from == 0 for profiles.
+ * Preserve expanded state of subject groups across
+ refresh events.
* Distinguish full_pages and total_pages in EDF sources
(fixed many a crash).
* Run ICA on original signal (not filtered).
@@ -991,6 +993,33 @@ 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>
<child>
+ <object class="GtkLabel" id="label32">
+ <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>EDF header</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="separator11">
+ <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="GtkScrolledWindow" id="scrolledwindow1">
<property name="width_request">445</property>
<property name="height_request">295</property>
@@ -1010,7 +1039,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -1503,7 +1532,31 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <placeholder/>
+ <object class="GtkLabel" id="label33">
+ <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>Annotated regions</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="separator12">
+ <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="GtkScrolledWindow" id="scrolledwindow9">
@@ -1532,7 +1585,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -2380,6 +2433,21 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="label34">
+ <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>Recordings not included</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 internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area5">
<property name="visible">True</property>
@@ -2408,6 +2476,18 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</packing>
</child>
<child>
+ <object class="GtkSeparator" id="separator13">
+ <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">2</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkScrolledWindow" id="scrolledwindow8">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2426,7 +2506,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
diff --git a/data/main.glade b/data/main.glade
index ef7b7b7..0fa971e 100644
--- a/data/main.glade
+++ b/data/main.glade
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">reload</property>
- </object>
<object class="GtkMenu" id="iiSubjectTimeline">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -81,6 +76,11 @@
</object>
</child>
</object>
+ <object class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <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>
@@ -1041,7 +1041,7 @@ rm */*/*/.*.{psd,mc}</property>
</child>
<child>
<object class="GtkToggleButton" id="eMsmtProfileAutoscale">
- <property name="label" translatable="yes">_Autoscale</property>
+ <property name="label" translatable="yes"> _Autoscale </property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1498,42 +1498,6 @@ rm */*/*/.*.{psd,mc}</property>
<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>
<object class="GtkFrame" id="fFreqConventionalRanges">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2320,10 +2284,14 @@ rm */*/*/.*.{psd,mc}</property>
<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>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2354,16 +2322,21 @@ rm */*/*/.*.{psd,mc}</property>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">(0 = all available)</property>
+ <property name="label" translatable="yes">(0 = # CPU cores)</property>
<attributes>
- <attribute name="scale" value="0.90000000000000002"/>
+ <attribute name="scale" value="0.80000000000000004"/>
</attributes>
</object>
<packing>
- <property name="left_attach">2</property>
+ <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>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="label">
@@ -2427,18 +2400,15 @@ rm */*/*/.*.{psd,mc}</property>
<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>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkComboBox" id="eFFTParamsPageSize">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Takes effect for the PSD and MC; also, scoring can only be done when the page size in scoring facility matches this value.</property>
<property name="model">mFFTParamsPageSize</property>
<property name="has_frame">False</property>
</object>
@@ -2458,6 +2428,26 @@ rm */*/*/.*.{psd,mc}</property>
<property name="mnemonic_widget">eFFTParamsPageSize</property>
</object>
</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>Takes effect for the PSD and MC; also, 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="wrap">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="label">
@@ -2484,7 +2474,7 @@ rm */*/*/.*.{psd,mc}</property>
<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_rows">3</property>
<property name="n_columns">3</property>
<property name="column_spacing">10</property>
<property name="row_spacing">5</property>
@@ -2495,6 +2485,15 @@ rm */*/*/.*.{psd,mc}</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label49">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2707,8 +2706,8 @@ rm */*/*/.*.{psd,mc}</property>
<object class="GtkLabel" id="label124">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Note:</b> This is not the full implementation of the
-EEG microcontinuity algorithm. Read more <a href="http://johnhommer.com/academic/code/aghermann/mc.html">here</a>.</property>
+ <property name="label" translatable="yes"><small>This is not the complete implementation of the
+EEG microcontinuity algorithm. Read more <a href="http://johnhommer.com/academic/code/aghermann/mc.html">here</a>.</small></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -4704,26 +4703,11 @@ EEG microcontinuity algorithm. Read more <a href="http://johnhommer.com/acade
</object>
</child>
<child>
- <object class="GtkMenuItem" id="menuitem4">
+ <object class="GtkMenuItem" id="iSimulationsReportGenerate">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">R_eport</property>
+ <property name="label" translatable="yes">_Report...</property>
<property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="iSimulationsReportGenerate">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Generate...</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- </object>
- </child>
</object>
</child>
</object>
@@ -5632,9 +5616,9 @@ EEG microcontinuity algorithm. Read more <a href="http://johnhommer.com/acade
<child>
<object class="GtkCheckButton" id="eCtlParamAZAmendment2">
<property name="label" translatable="yes">A_Z Amendment 2</property>
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="no_show_all">True</property>
<property name="has_tooltip">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
@@ -6714,6 +6698,24 @@ EEG microcontinuity algorithm. Read more <a href="http://johnhommer.com/acade
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child>
diff --git a/data/sf.glade b/data/sf.glade
index fc9d4d5..5ce370c 100644
--- a/data/sf.glade
+++ b/data/sf.glade
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAdjustment" id="jHighPassOrder">
- <property name="upper">5</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkAdjustment" id="jLowPassCutoff">
<property name="upper">100</property>
<property name="step_increment">0.25</property>
@@ -109,6 +104,11 @@
<property name="step_increment">0.25</property>
<property name="page_increment">1</property>
</object>
+ <object class="GtkAdjustment" id="jHighPassOrder">
+ <property name="upper">5</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkAdjustment" id="jSFADBackpolate">
<property name="upper">1</property>
<property name="value">0.5</property>
@@ -2281,18 +2281,17 @@ on individual parameters:</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
- <object class="GtkCheckButton" id="ePatternNameSaveGlobally">
- <property name="label" translatable="yes">_Globally</property>
+ <object class="GtkLabel" id="label42">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="label" translatable="yes">Pattern _name:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">ePatternNameName</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -2315,6 +2314,22 @@ on individual parameters:</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="ePatternNameSaveGlobally">
+ <property name="label" translatable="yes">_Globally</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area14">
<property name="visible">True</property>
@@ -2358,7 +2373,7 @@ on individual parameters:</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -2372,7 +2387,7 @@ on individual parameters:</property>
<property name="width_request">200</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="title" translatable="yes">AD profile name</property>
+ <property name="title" translatable="yes">New AD profile</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
@@ -2388,6 +2403,21 @@ on individual parameters:</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
+ <object class="GtkLabel" id="label43">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Profile _name:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eSFADSaveProfileNameName</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkEntry" id="eSFADSaveProfileNameName">
<property name="width_request">130</property>
<property name="visible">True</property>
@@ -2402,7 +2432,7 @@ on individual parameters:</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
@@ -2448,7 +2478,7 @@ on individual parameters:</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -2923,15 +2953,15 @@ on individual parameters:</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="bScoreClear">
- <property name="label" translatable="yes">⌫</property>
+ <object class="GtkButton" id="bScoreWake">
+ <property name="label" translatable="yes">☺</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">Clear (<b>q</b>)</property>
+ <property name="tooltip_markup" translatable="yes">Wake (<b>w</b>)</property>
<property name="valign">center</property>
<property name="focus_on_click">False</property>
- <accelerator key="q" signal="activate"/>
+ <accelerator key="w" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -2940,15 +2970,15 @@ on individual parameters:</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="bScoreWake">
- <property name="label" translatable="yes">☺</property>
+ <object class="GtkButton" id="bScoreClear">
+ <property name="label" translatable="yes">⌫</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">Wake (<b>w</b>)</property>
+ <property name="tooltip_markup" translatable="yes">Clear (<b>q</b>)</property>
<property name="valign">center</property>
<property name="focus_on_click">False</property>
- <accelerator key="w" signal="activate"/>
+ <accelerator key="q" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -3183,18 +3213,17 @@ on individual parameters:</property>
</packing>
</child>
<child>
- <object class="GtkToggleButton" id="bSFShowFindDialog">
- <property name="label" translatable="yes">_Find</property>
+ <object class="GtkToggleButton" id="bSFShowPhaseDiffDialog">
+ <property name="label" translatable="yes">Δφ</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Find/manage patterns (<b>F3</b>)</property>
- <property name="tooltip_text" translatable="yes">Find/manage patterns (F3)</property>
+ <property name="tooltip_markup" translatable="yes">Interchannel signal shift (<b>F4</b>)</property>
+ <property name="tooltip_text" translatable="yes">Interchannel signal shift (F4)</property>
<property name="valign">center</property>
- <property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <accelerator key="F3" signal="activate"/>
+ <accelerator key="F4" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -3204,17 +3233,18 @@ on individual parameters:</property>
</packing>
</child>
<child>
- <object class="GtkToggleButton" id="bSFShowPhaseDiffDialog">
- <property name="label" translatable="yes">Δφ</property>
+ <object class="GtkToggleButton" id="bSFShowFindDialog">
+ <property name="label" translatable="yes">_Find</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Interchannel signal shift (<b>F4</b>)</property>
- <property name="tooltip_text" translatable="yes">Interchannel signal shift (F4)</property>
+ <property name="tooltip_markup" translatable="yes">Find/manage patterns (<b>F3</b>)</property>
+ <property name="tooltip_text" translatable="yes">Find/manage patterns (F3)</property>
<property name="valign">center</property>
+ <property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <accelerator key="F4" signal="activate"/>
+ <accelerator key="F3" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -4005,7 +4035,7 @@ skew: 𝑔(𝑢) = 𝑢2</property>
<object class="GtkDialog" id="wSFArtifactDetection">
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="title" translatable="yes">Artifact Autodetect</property>
+ <property name="title" translatable="yes">Artifact Detection</property>
<property name="type_hint">dialog</property>
<property name="transient_for">wScoringFacility</property>
<child internal-child="vbox">
@@ -4977,6 +5007,7 @@ skew: 𝑔(𝑢) = 𝑢2</property>
<object class="GtkDialog" id="wSFICAMatrix">
<property name="can_focus">False</property>
<property name="border_width">5</property>
+ <property name="title" translatable="yes">Matrix</property>
<property name="resizable">False</property>
<property name="window_position">mouse</property>
<property name="destroy_with_parent">True</property>
--
Sleep experiment manager
More information about the debian-med-commit
mailing list